ekms 8.0.0-beta.0 → 8.0.0-beta.2

package/common/temperature.instance.json

@@ -244,6 +244,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -1200,6 +1204,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -1857,10 +1865,6 @@
               1
             ],
             "ops": [
-              [
-                "list",
-                1
-              ],
               [
                 "is",
                 0
@@ -1884,35 +1888,6 @@
             ],
             "counter": 5
           },
-          {
-            "op": [
-              "list",
-              1
-            ],
-            "ops": [
-              [
-                "is",
-                0
-              ],
-              [
-                "unit",
-                0
-              ],
-              [
-                "propertyOf",
-                0
-              ],
-              [
-                "temperature",
-                0
-              ],
-              [
-                "list",
-                1
-              ]
-            ],
-            "counter": 6
-          },
           {
             "op": [
               "unit",
@@ -1936,7 +1911,7 @@
                 0
               ]
             ],
-            "counter": 7
+            "counter": 6
           },
           {
             "op": [
@@ -1957,7 +1932,7 @@
                 0
               ]
             ],
-            "counter": 8
+            "counter": 7
           },
           {
             "op": [
@@ -1974,7 +1949,7 @@
                 0
               ]
             ],
-            "counter": 9
+            "counter": 8
           },
           {
             "op": [
@@ -1991,7 +1966,7 @@
                 1
               ]
             ],
-            "counter": 10
+            "counter": 9
           },
           {
             "op": [
@@ -2004,7 +1979,7 @@
                 0
               ]
             ],
-            "counter": 11
+            "counter": 10
           },
           {
             "op": [
@@ -2017,7 +1992,7 @@
                 1
               ]
             ],
-            "counter": 12
+            "counter": 11
           }
         ]
       },
@@ -2035,7 +2010,19 @@
           "one": {
             "number": "many",
             "marker": "list",
+            "default": true,
+            "word": "and",
+            "text": "celcius fahrenheit and kelvin",
+            "range": {
+              "start": 0,
+              "end": 53
+            },
+            "types": [
+              "list",
+              "unknown"
+            ],
             "listable": true,
+            "isList": true,
             "value": [
               {
                 "value": "celcius",
@@ -2061,7 +2048,7 @@
                   "end": 17
                 },
                 "dead": true,
-                "level": 2
+                "level": 1
               },
               {
                 "value": "kelvin",
@@ -2074,18 +2061,9 @@
                   "end": 28
                 },
                 "dead": true,
-                "level": 2
+                "level": 1
               }
             ],
-            "range": {
-              "start": 0,
-              "end": 53
-            },
-            "types": [
-              "list",
-              "unknown"
-            ],
-            "text": "celcius",
             "level": 1
           },
           "two": {
@@ -2638,6 +2616,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -3479,7 +3461,7 @@
       "trace": "undefined",
       "contexts": [
         {
-          "value": "=",
+          "value": "equals",
           "text": "fahrenheit = celcius*9/5 + 32",
           "marker": "equals",
           "word": "=",
@@ -3507,7 +3489,7 @@
           },
           "right": {
             "value": null,
-            "text": "celcius * 9 / 5 + 32",
+            "text": "celcius*9/5 + 32",
             "marker": "plusExpression",
             "word": "+",
             "range": {
@@ -3521,7 +3503,7 @@
             ],
             "x": {
               "value": null,
-              "text": "celcius * 9 / 5",
+              "text": "celcius*9/5",
               "marker": "divideByExpression",
               "word": "/",
               "range": {
@@ -3535,7 +3517,7 @@
               ],
               "x": {
                 "value": null,
-                "text": "celcius * 9",
+                "text": "celcius*9",
                 "marker": "timesExpression",
                 "word": "*",
                 "range": {
@@ -4043,6 +4025,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -4920,7 +4906,7 @@
       "trace": "undefined",
       "contexts": [
         {
-          "value": "=",
+          "value": "equals",
           "text": "celcius = (fahrenheit - 32)*5/8 + 32",
           "marker": "equals",
           "word": "=",
@@ -4948,7 +4934,7 @@
           },
           "right": {
             "value": null,
-            "text": "( fahrenheit - 32 ) * 5 / 8 + 32",
+            "text": "(fahrenheit - 32)*5/8 + 32",
             "marker": "plusExpression",
             "word": "+",
             "range": {
@@ -4962,7 +4948,7 @@
             ],
             "x": {
               "value": null,
-              "text": "( fahrenheit - 32 ) * 5 / 8",
+              "text": "(fahrenheit - 32)*5/8",
               "marker": "divideByExpression",
               "word": "/",
               "range": {
@@ -4976,7 +4962,7 @@
               ],
               "x": {
                 "value": null,
-                "text": "( fahrenheit - 32 ) * 5",
+                "text": "(fahrenheit - 32)*5",
                 "marker": "timesExpression",
                 "word": "*",
                 "range": {
@@ -4990,7 +4976,7 @@
                 ],
                 "x": {
                   "value": null,
-                  "text": "( fahrenheit - 32 )",
+                  "text": "(fahrenheit - 32)",
                   "marker": "minusExpression",
                   "word": "-",
                   "range": {

package/common/testing.js

@@ -15,7 +15,6 @@ let configStruct = {
       id: 'testingEvaluate',
       generatorp: ({context, g}) => `${context.word} ${g(context.value)}`,
       semantic: ({context, e}) => {
-        debugger
         context.evalue = e(context.value)
         context.isResponse = true
       },

package/common/tokenize.js

@@ -25,7 +25,8 @@ let configStruct = {
       ...'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split("").map((letter) => { return { child: letter, parent: 'upper' } }),
       { child: 'letter', parent: 'alphanumeric' },
       { child: 'digit', parent: 'alphanumeric' },
-      ...`~!@#$%^&*()_+-=[]{}\\|;:,<>/?'"`.split("").map((punctuation) => { return { child: punctuation, parent: 'punctuation' } }),
+      { child: '_', parent: 'alphanumeric' },
+      ...`~!@#$%^&*()+-=[]{}\\|;:,<>/?'"`.split("").map((punctuation) => { return { child: punctuation, parent: 'punctuation' } }),
     ],
   },
 };

package/common/tokenize.test.json

@@ -1,2 +1,87 @@
 [
-]
+  {
+    "associations": [
+    ],
+    "config": {
+    },
+    "contexts": [
+      {
+        "dead": true,
+        "level": 1,
+        "marker": "unknown",
+        "range": {
+          "end": 10,
+          "start": 0
+        },
+        "text": "hello_world",
+        "topLevel": true,
+        "unknown": true,
+        "value": "hello_world",
+        "word": "hello_world"
+      }
+    ],
+    "generatedParenthesized": [
+      ""
+    ],
+    "metadata": {
+      "opChoices": [
+        {
+          "counter": 1,
+          "op": [
+            "unknown",
+            0
+          ],
+          "ops": [
+            [
+              "unknown",
+              0
+            ]
+          ]
+        }
+      ]
+    },
+    "objects": {
+      "nameToUUID": {
+        "tokenize": "tokenize1"
+      },
+      "namespaced": {
+        "tokenize1": {
+        }
+      },
+      "processed": [
+        {
+          "context": {
+            "dead": true,
+            "level": 1,
+            "marker": "unknown",
+            "range": {
+              "end": 10,
+              "start": 0
+            },
+            "text": "hello_world",
+            "topLevel": true,
+            "unknown": true,
+            "value": "hello_world",
+            "word": "hello_world"
+          },
+          "generatedParenthesized": "",
+          "paraphrases": "",
+          "paraphrasesParenthesized": "()",
+          "responses": [
+            ""
+          ]
+        }
+      ]
+    },
+    "paraphrases": [
+      ""
+    ],
+    "paraphrasesParenthesized": [
+      "()"
+    ],
+    "query": "hello_world",
+    "responses": [
+      ""
+    ]
+  }
+]

package/common/ui.instance.json

@@ -196,6 +196,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "down",
           "direction"

package/common/ui.js

@@ -119,7 +119,6 @@ const configStruct = {
        bridge: "{ ...next(operator), action: after[0] }",
        generatorp: ({context, g}) => `stop ${g(context.action)}`,
        semantic: ({api, context}) => {
-         debugger
          api.stop(context.action.value)
        }
     },

package/common/weight.instance.json

@@ -252,6 +252,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -1123,6 +1127,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -2187,6 +2195,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -3331,7 +3343,7 @@
             "marker": "list",
             "default": true,
             "word": "and",
-            "text": "kilograms grams pounds ( troy ounces ) ounces and tons",
+            "text": "kilograms grams pounds (troy ounces) ounces and tons",
             "range": {
               "start": 0,
               "end": 71
@@ -3385,7 +3397,7 @@
               {
                 "value": "troy_ounce",
                 "number": "many",
-                "text": "( troy ounces )",
+                "text": "(troy ounces)",
                 "marker": "troy_ounce",
                 "word": "ounces",
                 "range": {
@@ -3398,6 +3410,7 @@
                 ],
                 "modifier_troy": {
                   "value": "troy",
+                  "number": "one",
                   "text": "troy",
                   "marker": "troy",
                   "word": "troy",
@@ -4117,6 +4130,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -4994,7 +5011,7 @@
       "trace": "undefined",
       "contexts": [
         {
-          "value": "=",
+          "value": "equals",
           "text": "ounces = 1.097 * troy ounces",
           "marker": "equals",
           "word": "=",
@@ -5067,6 +5084,7 @@
               ],
               "modifier_troy": {
                 "value": "troy",
+                "number": "one",
                 "text": "troy",
                 "marker": "troy",
                 "word": "troy",
@@ -5419,6 +5437,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -6288,7 +6310,7 @@
       "trace": "undefined",
       "contexts": [
         {
-          "value": "=",
+          "value": "equals",
           "text": "troy ounces = ounces / 1.097",
           "marker": "equals",
           "word": "=",
@@ -6314,6 +6336,7 @@
             ],
             "modifier_troy": {
               "value": "troy",
+              "number": "one",
               "text": "troy",
               "marker": "troy",
               "word": "troy",
@@ -6713,6 +6736,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -7578,7 +7605,7 @@
       "trace": "undefined",
       "contexts": [
         {
-          "value": "=",
+          "value": "equals",
           "text": "kilograms = pounds * 0.453592",
           "marker": "equals",
           "word": "=",
@@ -7984,6 +8011,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -8849,7 +8880,7 @@
       "trace": "undefined",
       "contexts": [
         {
-          "value": "=",
+          "value": "equals",
           "text": "grams = kilograms * 1000",
           "marker": "equals",
           "word": "=",
@@ -9255,6 +9286,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -10120,7 +10155,7 @@
       "trace": "undefined",
       "contexts": [
         {
-          "value": "=",
+          "value": "equals",
           "text": "kilograms = grams / 1000",
           "marker": "equals",
           "word": "=",
@@ -10526,6 +10561,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -11391,7 +11430,7 @@
       "trace": "undefined",
       "contexts": [
         {
-          "value": "=",
+          "value": "equals",
           "text": "pounds = kilograms * 2.20462",
           "marker": "equals",
           "word": "=",
@@ -11797,6 +11836,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -12662,7 +12705,7 @@
       "trace": "undefined",
       "contexts": [
         {
-          "value": "=",
+          "value": "equals",
           "text": "ounces = pounds * 16",
           "marker": "equals",
           "word": "=",
@@ -13068,6 +13111,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -13933,7 +13980,7 @@
       "trace": "undefined",
       "contexts": [
         {
-          "value": "=",
+          "value": "equals",
           "text": "ton = tonne * 0.907185",
           "marker": "equals",
           "word": "=",
@@ -14351,6 +14398,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -15216,7 +15267,7 @@
       "trace": "undefined",
       "contexts": [
         {
-          "value": "=",
+          "value": "equals",
           "text": "pounds = ton * 2000",
           "marker": "equals",
           "word": "=",