drakongen 1.1.0 → 1.2.0

package/README.md

@@ -15,7 +15,7 @@ Include the `drakongen.js` script on the web page.
 <script src="browser/drakongen.js"></script>
 ```
 
-Call `toPseudocode` or `toTree` functions.
+Call `drakongen.toPseudocode` or `drakongen.toTree` functions.
 
 ```html
 <script>
@@ -23,10 +23,10 @@ var drakon = ... // Get the drakon chart from DrakonWidget
 var name = "Diagram one"
 var filename = "Diagram one.drakon"
 
-var pseudo = toPseudocode(drakon, name, filename, "en")
+var pseudo = drakongen.toPseudocode(drakon, name, filename, "en")
 console.log(pseudo)
 
-var tree = toTree(drakon, name, filename, "en")
+var tree = drakongen.toTree(drakon, name, filename, "en")
 console.log(tree)
 
 </script>

package/browser/drakongen.js

@@ -502,20 +502,22 @@ function markLoopBody(nodes, start, filename) {
 module.exports = { drakonToStruct, drakonToGraph };
 },{"./structFlow":6,"./tools":8}],4:[function(require,module,exports){
 const { drakonToPseudocode } = require('./drakonToPromptStruct');
-const {htmlToString} = require("./browserTools")
+const { htmlToString } = require("./browserTools")
 const { setUpLanguage, translate } = require("./translate")
-const {drakonToStruct} = require("./drakonToStruct");
+const { drakonToStruct } = require("./drakonToStruct");
 
 
-window.toPseudocode = function(drakonJson, name, filename, language) {
-    setUpLanguage(language)
-    return drakonToPseudocode(drakonJson, name, filename, htmlToString, translate).text
-}
+window.drakongen = {
+    toPseudocode: function (drakonJson, name, filename, language) {
+        setUpLanguage(language)
+        return drakonToPseudocode(drakonJson, name, filename, htmlToString, translate).text
+    },
 
-window.toTree = function(drakonJson, name, filename, language) {
-    setUpLanguage(language)
-    var result = drakonToStruct(drakonJson, name, filename, translate)
-    return JSON.stringify(result, null, 4)
+    toTree: function (drakonJson, name, filename, language) {
+        setUpLanguage(language)
+        var result = drakonToStruct(drakonJson, name, filename, translate)
+        return JSON.stringify(result, null, 4)
+    }
 }
 },{"./browserTools":1,"./drakonToPromptStruct":2,"./drakonToStruct":3,"./translate":9}],5:[function(require,module,exports){
 var {addRange} = require("./tools")
@@ -648,21 +650,14 @@ function printPseudo(algorithm, translate, output, htmlToString) {
             yesBody.push(indent2 + translate("pass"))
         }
         var content = step.content
-        if (empty(yesBody)) {
-            content = {operator:"not",operand:step.content}
-        }
         var lines = printStructuredContentNoIdent(content)
         lines[0] = translate("if") + " " + lines[0]
         printWithIndent(lines, indent, output)
-        if (empty(yesBody)) {
-            addRange(output, noBody)           
-        } else {
-            addRange(output, yesBody)            
-            if (!empty(noBody)) {
-                output.push(indent + translate("else"))
-                addRange(output, noBody)
-            }
-        }    
+        addRange(output, yesBody)            
+        if (!empty(noBody)) {
+            output.push(indent + translate("else"))
+            addRange(output, noBody)
+        }
     }      
 
     function printLoop(step, depth, output) {
@@ -688,6 +683,7 @@ module.exports = {printPseudo}
 },{"./tools":8}],6:[function(require,module,exports){
 var {buildTree} = require("./technicalTree")
 const { createError, sortByProperty } = require("./tools");
+const { optimizeTree } = require("./treeTools")
 
 function redirectNode(nodes, node, from, to) {
     if (node.one === from) {
@@ -1058,7 +1054,8 @@ function structFlow(nodes, branches, filename, translate) {
                 name: branch.content,
                 branchId: branch.branchId,
                 start: branch.next,
-                body: body2
+                refs: branch.prev.length,
+                body: optimizeTree(body2)
             })
         }
 
@@ -1068,7 +1065,7 @@ function structFlow(nodes, branches, filename, translate) {
     return structMain()
 }
 module.exports = { structFlow, redirectNode };
-},{"./technicalTree":7,"./tools":8}],7:[function(require,module,exports){
+},{"./technicalTree":7,"./tools":8,"./treeTools":10}],7:[function(require,module,exports){
 function buildTree(nodes, nodeId, body, stopId) {
     while (nodeId) {
         if (nodeId === stopId) {return;}
@@ -1300,4 +1297,63 @@ function setUpLanguage(language) {
 
 
 module.exports = { setUpLanguage, translate };
+},{}],10:[function(require,module,exports){
+
+function optimizeTree(steps) {
+    var result = []
+
+    for (var step of steps) {
+        if (step.type === "end" || step.type === "branch" || step.type === "comment" || step.type === "loopend") { continue }
+        if (step.type === "action" && !step.content) { continue }
+        var copy
+        if (step.type === "question") {
+            copy = optimizeQuestion(step)
+        } else if (step.type === "loop") {
+            copy = optimizeLoop(step)
+        } else {
+            copy = step
+        }
+        result.push(copy)
+    }
+
+    return result
+}
+
+function optimizeLoop(step) {
+    return {
+        type: step.type,
+        content: step.content,
+        body: optimizeTree(step.body)
+    }
+}
+
+function optimizeQuestion(step) {
+    var yes = optimizeTree(step.yes)
+    var no = optimizeTree(step.no)
+    if (yes.length === 0 && no.length === 0) {
+        return {
+            type: step.type,
+            content: step.content,
+            yes: [],
+            no: []
+        }    
+    }
+    if (yes.length === 0) {
+        return {
+            type: step.type,
+            content: {operator:"not",operand:step.content},
+            yes: no,
+            no: []
+        }
+    }
+    return {
+        type: step.type,
+        content: step.content,
+        yes: yes,
+        no: no
+    }    
+}
+
+
+module.exports = {optimizeTree}
 },{}]},{},[4]);

package/browsertest.html

@@ -66,9 +66,9 @@
             try {
                 var content
                 if (format.value === "pseudo") {
-                    content = toPseudocode(input.value, "Drakongen browser test", "Drakongen browser test.drakon", language.value)
+                    content = drakongen.toPseudocode(input.value, "Drakongen browser test", "Drakongen browser test.drakon", language.value)
                 } else {
-                    content = toTree(input.value, "Drakongen browser test", "Drakongen browser test.drakon", language.value)
+                    content = drakongen.toTree(input.value, "Drakongen browser test", "Drakongen browser test.drakon", language.value)
                 }
                 setText(output, content)
             } catch (ex) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drakongen",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Generates pseudocode and AST from drakon flowcharts built with DrakonWidget or DrakonHub.",
   "main": "src/index.js",
   "bin": {

package/src/drakongen.js

@@ -1,16 +1,18 @@
 const { drakonToPseudocode } = require('./drakonToPromptStruct');
-const {htmlToString} = require("./browserTools")
+const { htmlToString } = require("./browserTools")
 const { setUpLanguage, translate } = require("./translate")
-const {drakonToStruct} = require("./drakonToStruct");
+const { drakonToStruct } = require("./drakonToStruct");
 
 
-window.toPseudocode = function(drakonJson, name, filename, language) {
-    setUpLanguage(language)
-    return drakonToPseudocode(drakonJson, name, filename, htmlToString, translate).text
-}
+window.drakongen = {
+    toPseudocode: function (drakonJson, name, filename, language) {
+        setUpLanguage(language)
+        return drakonToPseudocode(drakonJson, name, filename, htmlToString, translate).text
+    },
 
-window.toTree = function(drakonJson, name, filename, language) {
-    setUpLanguage(language)
-    var result = drakonToStruct(drakonJson, name, filename, translate)
-    return JSON.stringify(result, null, 4)
+    toTree: function (drakonJson, name, filename, language) {
+        setUpLanguage(language)
+        var result = drakonToStruct(drakonJson, name, filename, translate)
+        return JSON.stringify(result, null, 4)
+    }
 }