drakongen 1.4.4 → 1.4.6

package/browser/drakongen.js

@@ -376,7 +376,7 @@ function rewireSelect(nodes, selectNode, filename) {
             if (!caseNode.two) {
                 var errorId = caseNode.id + "-unexpected"
                 var errorAction = insertIcon(nodes, "error", errorId,  selectNode.content)
-                errorAction.message = "Unexpected case value"
+                errorAction.message = translate("Unexpected case value")
 
                 caseNode.two = errorId
                 errorAction.prev.push(caseNode.id)
@@ -1284,6 +1284,7 @@ var translationsRu = {
     "A Loop begin icon must have content": "Икона начала цикла ДЛЯ должна содержать данные",
     "A Question icon must have content": "Икона Вопрос должна содержать данные",
     "A Select icon must have content": "Икона Выбор должна содержать данные",
+    "Unexpected case value": "Неожиданное значение иконы Вариант",
     "Loop end expected here": "Здесь ожидается конец цикла",
     "An exit from the loop must lead to the point right after the loop end": "Выход из цикла должен вести в точку сразу за его концом",
     "A silhouette branch is not referenced": "Нет ссылок на ветку силуэта",
@@ -1314,6 +1315,7 @@ var translationsEn = {
     'A Loop begin icon must have content': 'A Loop begin icon must have content',
     'A Question icon must have content': 'A Question icon must have content',
     'A Select icon must have content': 'A Select icon must have content',
+    "Unexpected case value": "Unexpected case value",
     'Loop end expected here': 'Loop end expected here',
     'An exit from the loop must lead to the point right after the loop end': 'An exit from the loop must lead to the point right after the loop end',
     'A silhouette branch is not referenced': 'A silhouette branch is not referenced',
@@ -1344,6 +1346,7 @@ var translationsNo = {
     'A Loop begin icon must have content': 'Et Loop-startikon må ha innhold',
     'A Question icon must have content': 'Et Spørsmål-ikon må ha innhold',
     'A Select icon must have content': 'Et Velg-ikon må ha innhold',
+    "Unexpected case value": "Uventet tilfelle verdi",
     'Loop end expected here': 'Slutt på løkke forventet her',
     'An exit from the loop must lead to the point right after the loop end': 'En utgang fra løkken må føre til punktet rett etter løkkens slutt',
     'A silhouette branch is not referenced': 'En silhuettgren er ikke referert',
@@ -1403,6 +1406,7 @@ function optimizeTree(steps) {
 
 function optimizeLoop(step) {
     return {
+        id: step.id,
         type: step.type,
         content: step.content,
         body: optimizeTree(step.body)

package/exampleproject/.drakontech/history.json

@@ -0,0 +1,12 @@
+{
+    "history": [
+        {
+            "path": "/Users/stipan/Documents/drakongen/exampleproject/math/approximately equal.drakon",
+            "whenOpened": "2025-05-24T09:18:53.776Z"
+        },
+        {
+            "path": "/Users/stipan/Documents/drakongen/exampleproject/foo.drakon",
+            "whenOpened": "2025-05-24T09:18:44.471Z"
+        }
+    ]
+}

package/exampleproject/.drakontech/opened.txt

@@ -0,0 +1 @@
+2025-05-24T09:18:36.041Z

package/exampleproject/foo.drakon

@@ -10,42 +10,55 @@
         },
         "3": {
             "type": "action",
-            "content": "<p>return sqrt(x * x + y * y)</p>",
+            "content": "return sqrt(\n    x * x + y * y\n)",
             "one": "1"
         },
         "4": {
             "type": "question",
-            "content": "<p>x &gt; 0</p>",
+            "content": "x > 0",
             "one": "5",
             "two": "6",
             "flag1": 1
         },
         "5": {
             "type": "question",
-            "content": "<p>y &gt; 0</p>",
+            "content": "y > 0",
             "one": "7",
             "two": "6",
             "flag1": 1
         },
         "6": {
             "type": "action",
-            "content": "<p>return 0</p>",
+            "content": "return 0",
             "one": "1"
         },
         "7": {
             "type": "question",
-            "content": "<p>x is approx. equal y</p>",
-            "one": "3",
+            "content": "x is approx. equal y",
+            "one": "9",
             "two": "6",
             "flag1": 0
         },
         "8": {
             "type": "action",
-            "content": "<p>x = point.x</p><p>y = point.y</p>",
-            "one": "4"
+            "one": "4",
+            "content": "x = point.x\n\t\ty = point.y\n\t\tError:\tError\tinvoking remote method 'openFolder'.\n\nError:\t\tInvalid folder path\nLomma.js:\t11308"
+        },
+        "9": {
+            "type": "action",
+            "one": "3",
+            "content": ""
         }
     },
-    "params": "<ul><li>point: Point</li></ul><p><br /></p><p>returns: number</p>",
+    "params": "point: Point\n\nreturns: number",
     "type": "drakon",
-    "id": "foo.drakon"
+    "id": "foo.drakon",
+    "keywords": {
+        "function": false,
+        "machine": false,
+        "async": false,
+        "export": false,
+        "algoprop": false,
+        "lazy": false
+    }
 }

package/exampleproject/foo.txt

@@ -5,14 +5,15 @@ Use "undefined" instead of "null".
 
 ## Procedure "approximately equal"
 Parameters:
-- left: number
-- right: number
+left: number
+right: number
+
 returns: boolean
 
 Algorithm:
 threshold = 0.00001
 delta = left - right
-If Math.abs(delta) > threshold
+If Math.abs(delta) < threshold
     return true
 Else
     return false
@@ -29,15 +30,21 @@ y: number
 
 ## Procedure "foo"
 Parameters:
-- point: Point
+point: Point
 
 returns: number
 
 Algorithm:
 x = point.x
-y = point.y
+		y = point.y
+		Error:	Error	invoking remote method 'openFolder'.
+
+Error:		Invalid folder path
+Lomma.js:	11308
 If (x > 0 and y > 0) and not (x is approx. equal y)
-    return sqrt(x * x + y * y)
+    return sqrt(
+        x * x + y * y
+    )
 Else
     return 0
 

package/exampleproject/math/approximately equal.drakon

@@ -10,33 +10,41 @@
         },
         "3": {
             "type": "action",
-            "content": "<p>delta = left - right</p>",
+            "content": "delta = left - right",
             "one": "4"
         },
         "4": {
             "type": "question",
-            "content": "<p>Math.abs(delta) &gt; threshold</p>",
+            "content": "Math.abs(delta) < threshold",
             "one": "6",
             "two": "7",
             "flag1": 1
         },
         "5": {
             "type": "action",
-            "content": "<p>threshold = 0.00001</p>",
+            "content": "threshold = 0.00001",
             "one": "3"
         },
         "6": {
             "type": "action",
-            "content": "<p>return true</p>",
+            "content": "return true",
             "one": "1"
         },
         "7": {
             "type": "action",
-            "content": "<p>return false</p>",
+            "content": "return false",
             "one": "1"
         }
     },
-    "params": "<ul><li>left: number</li><li>right: number</li></ul><p>returns: boolean</p>",
+    "params": "left: number\nright: number\n\nreturns: boolean",
     "type": "drakon",
-    "id": "approximately equal.drakon"
+    "id": "approximately equal.drakon",
+    "keywords": {
+        "function": false,
+        "machine": false,
+        "async": false,
+        "export": false,
+        "algoprop": false,
+        "lazy": false
+    }
 }

package/exampleproject/solution.json

@@ -0,0 +1,3 @@
+{
+    "language": "LANG_HUMAN"
+}

package/examples/.drakontech/history.json

@@ -0,0 +1,124 @@
+{
+    "history": [
+        {
+            "path": "/home/stipan/drakongen/examples/Logical_Or_Inv.drakon",
+            "whenOpened": "2026-02-07T15:40:02.946Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/Logical_Or.drakon",
+            "whenOpened": "2026-02-07T15:39:53.917Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/Logical_And_Inv_x2.drakon",
+            "whenOpened": "2026-02-07T15:39:02.792Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/Logical_And_Inv.drakon",
+            "whenOpened": "2026-02-07T15:38:46.764Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/Logical_And.drakon",
+            "whenOpened": "2026-02-07T15:38:32.558Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/How to tune PID on a quadcopter.drakon",
+            "whenOpened": "2026-02-07T15:18:54.467Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/Find pointing nodes.drakon",
+            "whenOpened": "2026-02-07T15:18:28.442Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/DoubleArrow.drakon",
+            "whenOpened": "2026-02-07T15:18:00.111Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/Complex arrow.drakon",
+            "whenOpened": "2026-02-07T15:16:53.661Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/Comments.drakon",
+            "whenOpened": "2026-02-07T15:16:01.626Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/Arrow - double exit.drakon",
+            "whenOpened": "2026-02-07T15:15:40.894Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/ar12.drakon",
+            "whenOpened": "2026-02-07T15:15:28.846Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/ar11.drakon",
+            "whenOpened": "2026-02-07T15:15:01.649Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/ar10.drakon",
+            "whenOpened": "2026-02-07T15:14:43.081Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/ar09.drakon",
+            "whenOpened": "2026-02-07T15:14:06.640Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/ar08.drakon",
+            "whenOpened": "2026-02-07T15:13:34.919Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/ar07.drakon",
+            "whenOpened": "2026-02-07T15:13:19.193Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/ar06.drakon",
+            "whenOpened": "2026-02-07T15:11:34.033Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/ar05.drakon",
+            "whenOpened": "2026-02-07T15:11:09.130Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/ar04.drakon",
+            "whenOpened": "2026-02-07T15:10:58.595Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/ar03.drakon",
+            "whenOpened": "2026-02-07T15:10:43.814Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/ar02.drakon",
+            "whenOpened": "2026-02-07T15:10:29.966Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/ar01.drakon",
+            "whenOpened": "2026-02-07T15:10:20.409Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/And test.drakon",
+            "whenOpened": "2026-02-07T15:09:58.266Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/Adaptive design.drakon",
+            "whenOpened": "2026-02-07T15:05:47.582Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/19. Lilla.drakon",
+            "whenOpened": "2026-02-07T15:05:21.259Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/18. Стальной.drakon",
+            "whenOpened": "2026-02-07T14:53:44.235Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/17. Салатовый.drakon",
+            "whenOpened": "2026-02-07T14:53:31.683Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/16. Голубой.drakon",
+            "whenOpened": "2026-02-07T14:53:03.322Z"
+        },
+        {
+            "path": "/home/stipan/drakongen/examples/15. Синий.drakon",
+            "whenOpened": "2026-02-07T14:52:20.342Z"
+        }
+    ]
+}

package/examples/.drakontech/opened.txt

@@ -0,0 +1 @@
+2026-02-07T15:09:47.965Z

package/examples/01. /320/221/320/265/320/273/321/213/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "01. Белый"
+## Procedure "01. Белый"
 
 Algorithm:
 

package/examples/02. /320/247/321/221/321/200/320/275/321/213/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "02. Чёрный"
+## Procedure "02. Чёрный"
 
 Algorithm:
 3

package/examples/03. /320/241/320/265/321/200/321/213/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "03. Серый"
+## Procedure "03. Серый"
 
 Algorithm:
 If 3

package/examples/04. /320/221/321/203/321/200/321/213/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "04. Бурый"
+## Procedure "04. Бурый"
 
 Algorithm:
 If 3

package/examples/05. /320/226/321/221/320/273/321/202/321/213/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "05. Жёлтый"
+## Procedure "05. Жёлтый"
 
 Algorithm:
 If not (3)

package/examples/06. /320/221/320/260/320/263/321/200/320/276/320/262/321/213/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "06. Багровый"
+## Procedure "06. Багровый"
 
 Algorithm:
 If 3

package/examples/07. /320/244/320/270/320/276/320/273/320/265/321/202/320/276/320/262/321/213/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "07. Фиолетовый"
+## Procedure "07. Фиолетовый"
 
 Algorithm:
 If 3

package/examples/08. /320/221/320/270/321/200/321/216/320/267/320/276/320/262/321/213/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "08. Бирюзовый"
+## Procedure "08. Бирюзовый"
 
 Algorithm:
 If 3 and 4

package/examples/09. /320/236/321/200/320/260/320/275/320/266/320/265/320/262/321/213/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "09. Оранжевый"
+## Procedure "09. Оранжевый"
 
 Algorithm:
 If 3 and 4

package/examples/10. /320/240/320/276/320/267/320/276/320/262/321/213/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "10. Розовый"
+## Procedure "10. Розовый"
 
 Algorithm:
 If 3

package/examples/11. /320/227/320/260/321/211/320/270/321/202/320/275/321/213/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "11. Защитный"
+## Procedure "11. Защитный"
 
 Algorithm:
 If 3 or 4

package/examples/12. /320/221/320/276/320/273/320/276/321/202/320/275/321/213/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "12. Болотный"
+## Procedure "12. Болотный"
 
 Algorithm:
 If (3 or 4) or 7

package/examples/13. /320/241/320/260/320/273/320/260/321/202/320/276/320/262/321/213/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "13. Салатовый"
+## Procedure "13. Салатовый"
 
 Algorithm:
 If 3

package/examples/14. /320/227/320/276/320/273/320/276/321/202/320/276/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "14. Золотой"
+## Procedure "14. Золотой"
 
 Algorithm:
 If 3

package/examples/15. /320/241/320/270/320/275/320/270/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "15. Синий"
+## Procedure "15. Синий"
 
 Algorithm:
 If 3

package/examples/16. /320/223/320/276/320/273/321/203/320/261/320/276/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "16. Голубой"
+## Procedure "16. Голубой"
 
 Algorithm:
 If 3

package/examples/17. /320/241/320/260/320/273/320/260/321/202/320/276/320/262/321/213/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "17. Салатовый"
+## Procedure "17. Салатовый"
 
 Algorithm:
 If 3

package/examples/18. /320/241/321/202/320/260/320/273/321/214/320/275/320/276/320/271.txt"

@@ -1,4 +1,4 @@
-## Procedure "18. Стальной"
+## Procedure "18. Стальной"
 
 Algorithm:
 If 3

package/examples/How to tune PID on a quadcopter.txt

@@ -27,13 +27,13 @@ With good P, the control should feel precise
 Loop forever
     Cruise around
     Do some sharp turns
-    If not (Does the quad dip to one side (like a wobble)?) and not (Do slow oscillations occur?)
+    If Does the quad dip to one side (like a wobble)? or Do slow oscillations occur?
+        Increase P on Roll
+    Else
         If Do fast oscilations occur?
             Decrease P on Roll
         Else
             break
-    Else
-        Increase P on Roll
 When P is right, you should get minimum oscillations when doing sharp turns.
 Call subroutine "P on Pitch"
 End of subroutine
@@ -45,10 +45,10 @@ Loop forever
     If Does the quad pitch up more than it should?
         Increase P on Pitch
     Else
-        If not (Do fast oscilations occur?) and not (Are the motors making a twitching sound?)
-            break
-        Else
+        If Do fast oscilations occur? or Are the motors making a twitching sound?
             Decrease P on Pitch
+        Else
+            break
 The quad feels very responsive and nimble
 Call subroutine "TPA"
 End of subroutine
@@ -67,13 +67,13 @@ End of subroutine
 Subroutine: "D on Roll and Pitch"
 Loop forever
     Do aggressive maneuvers like flips and rolls
-    If not (Does the quad overshoot at the end of the move then bounce back?) and not (Does prop wash happen? (oscillation when you descent))
+    If Does the quad overshoot at the end of the move then bounce back? or Does prop wash happen? (oscillation when you descent)
+        Increase D on the affected axis
+    Else
         If Do fast oscillation happen at the end of a roll or flip?
             Decrease D on the affected axis
         Else
             break
-    Else
-        Increase D on the affected axis
 Note that to eliminate bounces at the end of a flip or roll, you can also use Setpoint Transition
 Call subroutine "I on Roll"
 End of subroutine
@@ -83,10 +83,10 @@ Loop forever
     Bank your quad to the left and right
     Release stick
     If Is the quad holding the angle well?
-        If not (Does the quad have stiff, robotic feeling?) and not (Does the quad have oscilations?)
-            break
-        Else
+        If Does the quad have stiff, robotic feeling? or Does the quad have oscilations?
             Decrease I on Roll
+        Else
+            break
     Else
         Increase I on Roll
 You might want to increase I a bit more on a windy day

package/examples/Logical_And.drakon

@@ -0,0 +1,37 @@
+{
+    "type": "drakon",
+    "items": {
+        "1": {
+            "type": "end"
+        },
+        "2": {
+            "type": "branch",
+            "branchId": 0,
+            "one": "4"
+        },
+        "3": {
+            "type": "action",
+            "one": "1",
+            "content": "C"
+        },
+        "4": {
+            "type": "question",
+            "one": "5",
+            "two": "6",
+            "flag1": 1,
+            "content": "A"
+        },
+        "5": {
+            "type": "question",
+            "one": "3",
+            "two": "6",
+            "flag1": 1,
+            "content": "B"
+        },
+        "6": {
+            "type": "action",
+            "one": "1",
+            "content": "D"
+        }
+    }
+}

package/examples/Logical_And.txt

@@ -0,0 +1,9 @@
+## Procedure "Logical_And"
+
+Algorithm:
+If A and B
+    C
+Else
+    D
+
+End of procedure

package/examples/Logical_And_Inv.drakon

@@ -0,0 +1,37 @@
+{
+    "type": "drakon",
+    "items": {
+        "1": {
+            "type": "end"
+        },
+        "2": {
+            "type": "branch",
+            "branchId": 0,
+            "one": "4"
+        },
+        "3": {
+            "type": "action",
+            "one": "1",
+            "content": "C"
+        },
+        "4": {
+            "type": "question",
+            "one": "5",
+            "two": "6",
+            "flag1": 0,
+            "content": "A"
+        },
+        "5": {
+            "type": "question",
+            "one": "3",
+            "two": "6",
+            "flag1": 0,
+            "content": "B"
+        },
+        "6": {
+            "type": "action",
+            "one": "1",
+            "content": "D"
+        }
+    }
+}

package/examples/Logical_And_Inv.txt

@@ -0,0 +1,9 @@
+## Procedure "Logical_And_Inv"
+
+Algorithm:
+If A or B
+    D
+Else
+    C
+
+End of procedure