ekms 7.12.8-beta.5 → 7.12.8-beta.6

package/common/fastfood.js

@@ -35,7 +35,7 @@ const fastfood_instance = require('./fastfood.instance.json')
 */
 
 const template = {
-  "queries": [
+  configs: [
     "food is countable",
     "drinks are countable",
     "bacon modifies deluxe",

package/common/formulas.instance.json

@@ -1,5 +1,5 @@
 {
-  "queries": [
+  "configs": [
     "formulas are concepts",
     {
       "name": "formulas",
@@ -757,13 +757,13 @@
           "one": {
             "number": "many",
             "marker": "unknown",
+            "value": "formulas",
+            "word": "formulas",
+            "text": "formulas",
             "range": {
               "start": 0,
               "end": 20
             },
-            "word": "formulas",
-            "text": "formulas",
-            "value": "formulas",
             "unknown": true,
             "dead": true,
             "types": [
@@ -773,13 +773,13 @@
           },
           "two": {
             "marker": "unknown",
+            "value": "concepts",
+            "word": "concepts",
+            "text": "concepts",
             "range": {
               "start": 13,
               "end": 20
             },
-            "word": "concepts",
-            "text": "concepts",
-            "value": "concepts",
             "unknown": true,
             "dead": true,
             "types": [

package/common/formulas.js

@@ -12,7 +12,7 @@ const instance = require('./formulas.instance.json')
 
 /*
 const template = {
-  queries: [
+  configs: [
     // { query: "x equals y + 4", development: true },
   ]
 }
@@ -186,7 +186,7 @@ let configStruct = {
 };
 
 const template = {
-  queries: [
+  configs: [
     "formulas are concepts",
     configStruct,
   ]

package/common/help.js

@@ -72,8 +72,10 @@ const configStruct = {
   debug: false,
   version: '3',
   words: {
-    // "km1": { "the": [{"id": "the", "initial": "{ modifiers: [] }" }],
-    'km1': [{id: "km", initial: "{ value: 'km1', word: 'km1' }", development: true }],
+    "literals": {
+      // "km1": { "the": [{"id": "the", "initial": "{ modifiers: [] }" }],
+      'km1': [{id: "km", initial: "{ value: 'km1', word: 'km1' }", development: true }],
+    }
   },
 };
 

package/common/helpers.js

@@ -33,6 +33,10 @@ const getCount = (context) => {
   }
 }
 
+const words = (base, additional = {}) => {
+  return [{ word: pluralize.singular(base), number: 'one', ...additional }, { word: pluralize.plural(base), number: 'many', ...additional }]
+}
+
 const isMany = (context) => {
   if (((context || {}).value || {}).marker == 'list' && (((context || {}).value || {}).value || []).length > 1) {
     return true
@@ -160,6 +164,7 @@ module.exports = {
   chooseNumber,
   zip,
   focus,
+  words,
   propertyToArray,
   wordNumber,
 }

package/common/javascript.js

@@ -18,12 +18,14 @@ let configStruct = {
   debug: false,
   version: '3',
   words: {
-    "=": [{"id": "assignment", "initial": "{ value: 1 }" }],
-    /*
-    " ([0-9]+)": [{"id": "number", "initial": "{ value: int(group[0]) }" }],
-    "one": [{"id": "number", "initial": "{ value: 1 }" }],
-    "ten": [{"id": "number", "initial": "{ value: 10 }" }],
-    */
+    "literals": {
+      "=": [{"id": "assignment", "initial": "{ value: 1 }" }],
+      /*
+      " ([0-9]+)": [{"id": "number", "initial": "{ value: int(group[0]) }" }],
+      "one": [{"id": "number", "initial": "{ value: 1 }" }],
+      "ten": [{"id": "number", "initial": "{ value: 10 }" }],
+      */
+    }
   },
 
   hierarchy: [

package/common/kirk.instance.json

@@ -1,5 +1,5 @@
 {
-  "queries": [
+  "configs": [
     "you are kirk"
   ],
   "resultss": [

package/common/kirk.js

@@ -5,7 +5,7 @@ const kirk_tests = require('./kirk.test.json')
 const kirk_instance = require('./kirk.instance.json')
 
 const template = {
-  "queries": [
+  configs: [
     "you are kirk",
   ]
 };

package/common/length.instance.json

@@ -1,5 +1,5 @@
 {
-  "queries": [
+  "configs": [
     "length is a dimension",
     "meter centimeter foot and inch are units of length",
     "meters = centimeters / 100",
@@ -2074,52 +2074,52 @@
             "value": [
               {
                 "marker": "unknown",
+                "value": "meter",
+                "word": "meter",
+                "text": "meter",
                 "range": {
                   "start": 0,
                   "end": 4
                 },
-                "word": "meter",
-                "text": "meter",
-                "value": "meter",
                 "unknown": true,
                 "dead": true,
                 "level": 1
               },
               {
                 "marker": "unknown",
+                "value": "centimeter",
+                "word": "centimeter",
+                "text": "centimeter",
                 "range": {
                   "start": 6,
                   "end": 15
                 },
-                "word": "centimeter",
-                "text": "centimeter",
-                "value": "centimeter",
                 "unknown": true,
                 "dead": true,
                 "level": 1
               },
               {
                 "marker": "unknown",
+                "value": "foot",
+                "word": "foot",
+                "text": "foot",
                 "range": {
                   "start": 17,
                   "end": 20
                 },
-                "word": "foot",
-                "text": "foot",
-                "value": "foot",
                 "unknown": true,
                 "dead": true,
                 "level": 2
               },
               {
                 "marker": "unknown",
+                "value": "inch",
+                "word": "inch",
+                "text": "inch",
                 "range": {
                   "start": 26,
                   "end": 29
                 },
-                "word": "inch",
-                "text": "inch",
-                "value": "inch",
                 "unknown": true,
                 "dead": true,
                 "level": 2
@@ -2408,16 +2408,6 @@
             "propertyOf",
             1
           ]
-        ],
-        [
-          [
-            "length",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
         ]
       ],
       "learned_contextual_priorities": [],
@@ -5669,13 +5659,13 @@
             ],
             "x": {
               "marker": "unknown",
+              "value": "millimeters",
+              "word": "millimeters",
+              "text": "millimeters",
               "range": {
                 "start": 14,
                 "end": 24
               },
-              "word": "millimeters",
-              "text": "millimeters",
-              "value": "millimeters",
               "unknown": true,
               "dead": true,
               "types": [
@@ -5724,16 +5714,6 @@
         ""
       ],
       "associations": [
-        [
-          [
-            "/",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "centimeter",
@@ -6783,13 +6763,13 @@
           "dead": true,
           "left": {
             "marker": "unknown",
+            "value": "millimeters",
+            "word": "millimeters",
+            "text": "millimeters",
             "range": {
               "start": 0,
               "end": 10
             },
-            "word": "millimeters",
-            "text": "millimeters",
-            "value": "millimeters",
             "unknown": true,
             "dead": true,
             "types": [
@@ -6869,16 +6849,6 @@
         ""
       ],
       "associations": [
-        [
-          [
-            "*",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "centimeter",
@@ -7938,13 +7908,13 @@
           "dead": true,
           "left": {
             "marker": "unknown",
+            "value": "millimeters",
+            "word": "millimeters",
+            "text": "millimeters",
             "range": {
               "start": 0,
               "end": 10
             },
-            "word": "millimeters",
-            "text": "millimeters",
-            "value": "millimeters",
             "unknown": true,
             "dead": true,
             "types": [
@@ -8024,16 +7994,6 @@
         ""
       ],
       "associations": [
-        [
-          [
-            "*",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "equals",
@@ -9124,13 +9084,13 @@
             ],
             "x": {
               "marker": "unknown",
+              "value": "millimeters",
+              "word": "millimeters",
+              "text": "millimeters",
               "range": {
                 "start": 9,
                 "end": 19
               },
-              "word": "millimeters",
-              "text": "millimeters",
-              "value": "millimeters",
               "unknown": true,
               "dead": true,
               "types": [
@@ -9179,16 +9139,6 @@
         ""
       ],
       "associations": [
-        [
-          [
-            "/",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "divideByOperator",
@@ -13590,13 +13540,13 @@
           "dead": true,
           "left": {
             "marker": "unknown",
+            "value": "miles",
+            "word": "miles",
+            "text": "miles",
             "range": {
               "start": 0,
               "end": 4
             },
-            "word": "miles",
-            "text": "miles",
-            "value": "miles",
             "unknown": true,
             "dead": true,
             "types": [
@@ -13675,16 +13625,6 @@
         ""
       ],
       "associations": [
-        [
-          [
-            "*",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "equals",
@@ -14761,13 +14701,13 @@
             ],
             "x": {
               "marker": "unknown",
+              "value": "miles",
+              "word": "miles",
+              "text": "miles",
               "range": {
                 "start": 7,
                 "end": 11
               },
-              "word": "miles",
-              "text": "miles",
-              "value": "miles",
               "unknown": true,
               "dead": true,
               "types": [
@@ -14816,16 +14756,6 @@
         ""
       ],
       "associations": [
-        [
-          [
-            "/",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "divideByOperator",
@@ -15875,13 +15805,13 @@
           "dead": true,
           "left": {
             "marker": "unknown",
+            "value": "kilometers",
+            "word": "kilometers",
+            "text": "kilometers",
             "range": {
               "start": 0,
               "end": 9
             },
-            "word": "kilometers",
-            "text": "kilometers",
-            "value": "kilometers",
             "unknown": true,
             "dead": true,
             "types": [
@@ -15961,16 +15891,6 @@
         ""
       ],
       "associations": [
-        [
-          [
-            "/",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "divideByOperator",
@@ -17061,13 +16981,13 @@
             ],
             "x": {
               "marker": "unknown",
+              "value": "kilometers",
+              "word": "kilometers",
+              "text": "kilometers",
               "range": {
                 "start": 9,
                 "end": 18
               },
-              "word": "kilometers",
-              "text": "kilometers",
-              "value": "kilometers",
               "unknown": true,
               "dead": true,
               "types": [
@@ -17116,16 +17036,6 @@
         ""
       ],
       "associations": [
-        [
-          [
-            "*",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "equals",
@@ -17213,86 +17123,6 @@
   "fragments": [],
   "semantics": [],
   "associations": [
-    [
-      [
-        "*",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "*",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "*",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "*",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "/",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "/",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "/",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "/",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "a",
@@ -18474,16 +18304,6 @@
         "propertyOf",
         1
       ]
-    ],
-    [
-      [
-        "length",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
     ]
   ],
   "learned_contextual_priorities": []

package/common/length.js

@@ -5,7 +5,7 @@ const length_tests = require('./length.test.json')
 const length_instance = require('./length.instance.json')
 
 const template = {
-  "queries": [
+  configs: [
     "length is a dimension",
     "meter centimeter foot and inch are units of length",
     "meters = centimeters / 100",