X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.document.server%2Fscl%2FDocument%2FAll.scl;h=d676e2a3b2a296bacb86094ebec20bb6695ec510;hb=refs%2Fheads%2Fprivate%2Fantin_tyomaa;hp=fa83a224acfc2d7076af4417e2f2e181680e93e7;hpb=e3f78a075fb589c0c940f6e13d92a45a39a3ac0f;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.document.server/scl/Document/All.scl b/bundles/org.simantics.document.server/scl/Document/All.scl
index fa83a224a..d676e2a3b 100644
--- a/bundles/org.simantics.document.server/scl/Document/All.scl
+++ b/bundles/org.simantics.document.server/scl/Document/All.scl
@@ -2,6 +2,9 @@ import "Simantics/DB"
 import "Simantics/Variables"
 import "JavaBuiltin" as Java
 
+importJava "org.simantics.document.server.DocumentProperties" where
+    data DocumentProperties
+
 importJava "org.simantics.document.server.io.IConsole" where
     data IConsole
     addMessage :: IConsole -> String -> <Proc> ()
@@ -85,6 +88,9 @@ instance Coercible CommandContextMutable CommandContext where
 cloneCommandContext :: CommandContext -> <Proc> CommandContextMutable
 cloneCommandContext context = merge (commandContext ()) context
 
+instance Show CommandContext where
+    show ctx = printContext ctx
+
 importJava "org.simantics.document.server.io.CommandResult" where
     data CommandResult
 
@@ -99,7 +105,7 @@ importJava "org.simantics.document.server.Functions" where
     putTuple :: CommandContextMutable -> String -> a -> CommandContextMutable
 
     @JavaName getTuples
-    getTuples :: CommandContext -> String -> [a]
+    getTuples :: CommandContext -> String -> [Dynamic]
 
     printContext :: CommandContext -> String
 
@@ -107,15 +113,18 @@ importJava "org.simantics.document.server.Functions" where
 
     dataDefinitions :: Variable -> <ReadGraph> [DataDefinition]
 
+    @JavaName "dataDefinitions"
+    computeDataDefinitions :: Variable -> <ReadGraph> [DataDefinition]
+
     emptyOnClick :: () -> <ReadGraph> AbstractEventHandler
     
     writeEventHandler :: Variable -> (Variable -> (String -> Maybe String) -> <WriteGraph> String) -> <ReadGraph> AbstractEventHandler
     readEventHandler :: Variable -> (Variable -> (String -> Maybe String) -> <ReadGraph> String) -> <ReadGraph> AbstractEventHandler
     eventHandler :: ((String -> Maybe String) -> String) -> <ReadGraph> AbstractEventHandler
 
-    readEventHandler2 :: (CommandContext -> <ReadGraph> Maybe CommandResult) -> <ReadGraph> AbstractEventHandler
-    writeEventHandler2 :: (CommandContext -> <WriteGraph> Maybe CommandResult) -> <ReadGraph> AbstractEventHandler
-    eventHandler2 :: (CommandContext -> Maybe CommandResult) -> <ReadGraph> AbstractEventHandler
+    readEventHandler2 :: (CommandContext -> <ReadGraph,Proc> Maybe CommandResult) -> <ReadGraph> AbstractEventHandler
+    writeEventHandler2 :: (CommandContext -> <WriteGraph,Proc> Maybe CommandResult) -> <ReadGraph> AbstractEventHandler
+    eventHandler2 :: (CommandContext -> <Proc> Maybe CommandResult) -> <ReadGraph> AbstractEventHandler
     
     responseHandler :: Variable -> String -> <ReadGraph> AbstractEventHandler
 
@@ -134,6 +143,14 @@ importJava "org.simantics.document.server.Functions" where
     
     stateVariable :: Variable -> <ReadGraph> Variable
     
+    compileDocumentSCLValueExpression :: Variable -> <ReadGraph> String
+    compileDocumentSCLHandlerValueExpression :: Variable -> <ReadGraph> String
+
+    primitiveProperties :: <Proc> DocumentProperties
+
+contextVariable :: Variable -> <ReadGraph> Variable
+contextVariable var = propertyValue (variableParent var) "input"
+    
 propertyValueCached :: Serializable a => Typeable a => Variable -> String -> <ReadGraph> a
 propertyValueCached var prop = propertyValueCached_ var prop binding
     
@@ -143,10 +160,10 @@ displayValue var str = propertyValue (property var str) "HasDisplayValue"
 displayValue0 :: Variable -> <ReadGraph> String
 displayValue0 var = propertyValue var "HasDisplayValue"
 
-consoleLog :: Variable -> String -> <ReadGraph> ()
-consoleLog state message = do
-    console = state#console
-    runProc $ addMessage console message
+consoleLog :: CommandContext -> String -> ()
+consoleLog context message = match possibleValue context "console" with
+  Nothing -> ()
+  Just console -> runProc $ addMessage console message
 
 contextDocument :: CommandContext -> <Proc> IDocument
 contextDocument ctx = justValue ctx "__document__"