tpmkms_4wp 7.12.8-beta.4 → 7.12.8-beta.6

package/common/math.instance.json

@@ -1,5 +1,5 @@
 {
-  "queries": [
+  "configs": [
     "mathematical modifies operator",
     "* + / and - are mathematical operators",
     {
@@ -542,13 +542,13 @@
           "modifiers": [
             {
               "marker": "unknown",
+              "value": "mathematical",
+              "word": "mathematical",
+              "text": "mathematical",
               "range": {
                 "start": 0,
                 "end": 11
               },
-              "word": "mathematical",
-              "text": "mathematical",
-              "value": "mathematical",
               "unknown": true,
               "dead": true,
               "level": 1
@@ -556,13 +556,13 @@
           ],
           "concept": {
             "marker": "unknown",
+            "value": "operator",
+            "word": "operator",
+            "text": "operator",
             "range": {
               "start": 22,
               "end": 29
             },
-            "word": "operator",
-            "text": "operator",
-            "value": "operator",
             "unknown": true,
             "dead": true,
             "level": 1
@@ -1359,52 +1359,52 @@
             "value": [
               {
                 "marker": "unknown",
+                "value": "*",
+                "word": "*",
+                "text": "*",
                 "range": {
                   "start": 0,
                   "end": 0
                 },
-                "word": "*",
-                "text": "*",
-                "value": "*",
                 "unknown": true,
                 "dead": true,
                 "level": 1
               },
               {
                 "marker": "unknown",
+                "value": "+",
+                "word": "+",
+                "text": "+",
                 "range": {
                   "start": 2,
                   "end": 2
                 },
-                "word": "+",
-                "text": "+",
-                "value": "+",
                 "unknown": true,
                 "dead": true,
                 "level": 1
               },
               {
                 "marker": "unknown",
+                "value": "/",
+                "word": "/",
+                "text": "/",
                 "range": {
                   "start": 4,
                   "end": 4
                 },
-                "word": "/",
-                "text": "/",
-                "value": "/",
                 "unknown": true,
                 "dead": true,
                 "level": 2
               },
               {
                 "marker": "unknown",
+                "value": "-",
+                "word": "-",
+                "text": "-",
                 "range": {
                   "start": 10,
                   "end": 10
                 },
-                "word": "-",
-                "text": "-",
-                "value": "-",
                 "unknown": true,
                 "dead": true,
                 "level": 2
@@ -1596,16 +1596,6 @@
             "unknown",
             1
           ]
-        ],
-        [
-          [
-            "mathematical",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
         ]
       ],
       "learned_contextual_priorities": [],
@@ -1931,16 +1921,6 @@
         1
       ]
     ],
-    [
-      [
-        "mathematical",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "modifies",

package/common/math.js

@@ -106,7 +106,7 @@ let configStruct = {
 };
 
 const template = {
-  queries: [
+  configs: [
     "mathematical modifies operator",
     "* + / and - are mathematical operators",
     configStruct,

package/common/meta.instance.json

@@ -1,5 +1,5 @@
 {
-  "queries": [],
+  "configs": [],
   "resultss": [],
   "fragments": [],
   "semantics": [],

package/common/meta.js

@@ -6,10 +6,10 @@ ensureTestFile(module, 'meta', 'instance')
 const meta_tests = require('./meta.test.json')
 const meta_instance = require('./meta.instance.json')
 const { hashIndexesGet, hashIndexesSet, translationMapping, translationMappings } = require('./helpers/meta.js')
-const { zip } = require('./helpers.js')
+const { zip, words } = require('./helpers.js')
 
 const template = {
-    queries: [
+    configs: [
 //      "if f then g",
       //"if e or f then g",
     ]
@@ -59,6 +59,23 @@ let configStruct = {
     { child: 'orAble', parent: 'ifAble' },
   ],
   bridges: [
+  /*
+    {
+      id: "synonym",
+      // implicit words in singular/plural
+      words: words('synonym'),
+      operator: "([synonym])",
+    },
+    {
+      id: 'synonymOfWord',
+      operator: "((synonym/*) [synonymOfWord|of] (word))",
+      bridge: "{ ...next(operator), word: after[0] }",
+      evaluator: ({context}) => {
+        debugger
+        debugger
+      }
+    },
+    */
     {id: "orList", level: 0, selector: {left: [{ marker: 'orAble' }], right: [{ marker: 'orAble' }], passthrough: true}, bridge: "{ ...next(operator), value: append(before, after) }"},
     {id: "orList", level: 1, selector: {left: [{ marker: 'orAble' }], passthrough: true}, bridge: "{ ...operator, value: append(before, operator.value) }"},
 
@@ -81,14 +98,16 @@ let configStruct = {
   ],
   version: '3',
   words: {
-    //  'testWord2': [{"id": "testWord2", "initial": "{ value: 'testWord2Value' }" }],
-    // TODO make this development and select out for module
-    // 'x': [{id: "x", initial: "{ value: 'x' }", development: true }],
-    // 'f': [{id: "ifAble", initial: "{ word: 'f' }", development: true }],
-    // 'g': [{id: "ifAble", initial: "{ word: 'g' }", development: true }],
-    'f': [{id: "f", initial: "{ value: 'f', word: 'f' }", development: true }],
-    'x': [{id: "x", initial: "{ value: 'x', word: 'x' }", development: true }],
-    'gq': [{id: "g", initial: "{ word: 'gq', query: true }", development: true }],
+    "literals": {
+      //  'testWord2': [{"id": "testWord2", "initial": "{ value: 'testWord2Value' }" }],
+      // TODO make this development and select out for module
+      // 'x': [{id: "x", initial: "{ value: 'x' }", development: true }],
+      // 'f': [{id: "ifAble", initial: "{ word: 'f' }", development: true }],
+      // 'g': [{id: "ifAble", initial: "{ word: 'g' }", development: true }],
+      'f': [{id: "f", initial: "{ value: 'f', word: 'f' }", development: true }],
+      'x': [{id: "x", initial: "{ value: 'x', word: 'x' }", development: true }],
+      'gq': [{id: "g", initial: "{ word: 'gq', query: true }", development: true }],
+    }
   },
   generators: [
     {

package/common/numbers.js

@@ -20,30 +20,37 @@ let configStruct = {
   debug: false,
   version: '3',
   words: {
-    // start with a space for regular expressions
-    " ([0-9]+$)": [{"id": "number", "initial": "{ value: int(group[0]), instance: true }" }],
-    " ([0-9]+[.][0-9]+$)": [{"id": "number", "initial": "{ value: float(group[0]), instance: true }" }],
-    " ([.][0-9]+$)": [{"id": "number", "initial": "{ value: float(group[0]), instance: true }" }],
-    "one": [{"id": "number", "initial": "{ value: 1, instance:true }" }],
-    "ones": [{"id": "number", "initial": "{ value: 1, number: 'many', instance:true }" }],
-    "two": [{"id": "number", "initial": "{ value: 2 , instance:true}" }],
-    "twos": [{"id": "number", "initial": "{ value: 2 , number: 'many', instance:true}" }],
-    "three": [{"id": "number", "initial": "{ value: 3, instance:true }" }],
-    "threes": [{"id": "number", "initial": "{ value: 3, number: 'many', instance:true }" }],
-    "four": [{"id": "number", "initial": "{ value: 4, instance:true }" }],
-    "fours": [{"id": "number", "initial": "{ value: 4, number: 'many', instance:true }" }],
-    "five": [{"id": "number", "initial": "{ value: 5, instance:true }" }],
-    "fives": [{"id": "number", "initial": "{ value: 5, number: 'many', instance:true }" }],
-    "six": [{"id": "number", "initial": "{ value: 6, instance:true }" }],
-    "sixes": [{"id": "number", "initial": "{ value: 6, number: 'many', instance:true }" }],
-    "seven": [{"id": "number", "initial": "{ value: 7, instance:true }" }],
-    "sevens": [{"id": "number", "initial": "{ value: 7, number: 'many', instance:true }" }],
-    "eight": [{"id": "number", "initial": "{ value: 8, instance:true }" }],
-    "eights": [{"id": "number", "initial": "{ value: 8, number: 'many', instance:true }" }],
-    "nine": [{"id": "number", "initial": "{ value: 9, instance:true }" }],
-    "nines": [{"id": "number", "initial": "{ value: 9, number: 'many', instance:true }" }],
-    "ten": [{"id": "number", "initial": "{ value: 10, instance:true }" }],
-    "tens": [{"id": "number", "initial": "{ value: 10, number: 'many', instance:true }" }],
+    "literals": {
+      // start with a space for regular expressions
+      " ([0-9]+$)": [{"id": "number", "initial": "{ value: int(group[0]), instance: true }" }],
+      " ([0-9]+[.][0-9]+$)": [{"id": "number", "initial": "{ value: float(group[0]), instance: true }" }],
+      " ([.][0-9]+$)": [{"id": "number", "initial": "{ value: float(group[0]), instance: true }" }],
+      "one": [{"id": "number", "initial": "{ value: 1, instance:true }" }],
+      "ones": [{"id": "number", "initial": "{ value: 1, number: 'many', instance:true }" }],
+      "two": [{"id": "number", "initial": "{ value: 2 , instance:true}" }],
+      "twos": [{"id": "number", "initial": "{ value: 2 , number: 'many', instance:true}" }],
+      "three": [{"id": "number", "initial": "{ value: 3, instance:true }" }],
+      "threes": [{"id": "number", "initial": "{ value: 3, number: 'many', instance:true }" }],
+      "four": [{"id": "number", "initial": "{ value: 4, instance:true }" }],
+      "fours": [{"id": "number", "initial": "{ value: 4, number: 'many', instance:true }" }],
+      "five": [{"id": "number", "initial": "{ value: 5, instance:true }" }],
+      "fives": [{"id": "number", "initial": "{ value: 5, number: 'many', instance:true }" }],
+      "six": [{"id": "number", "initial": "{ value: 6, instance:true }" }],
+      "sixes": [{"id": "number", "initial": "{ value: 6, number: 'many', instance:true }" }],
+      "seven": [{"id": "number", "initial": "{ value: 7, instance:true }" }],
+      "sevens": [{"id": "number", "initial": "{ value: 7, number: 'many', instance:true }" }],
+      "eight": [{"id": "number", "initial": "{ value: 8, instance:true }" }],
+      "eights": [{"id": "number", "initial": "{ value: 8, number: 'many', instance:true }" }],
+      "nine": [{"id": "number", "initial": "{ value: 9, instance:true }" }],
+      "nines": [{"id": "number", "initial": "{ value: 9, number: 'many', instance:true }" }],
+      "ten": [{"id": "number", "initial": "{ value: 10, instance:true }" }],
+      "tens": [{"id": "number", "initial": "{ value: 10, number: 'many', instance:true }" }],
+    },
+    patterns: [
+      { "pattern": [{ type: 'digit' }, { repeat: true }], defs: [{id: "number", uuid: '1', initial: "{ value: int(text), instance: true }" }]},
+      { "pattern": [{ type: 'digit' }, { repeat: true }, '.', { type: 'digit' }, { repeat: true }], defs: [{id: "number", uuid: '1', initial: "{ value: float(text), instance: true }" }]},
+      { "pattern": ['.', { type: 'digit' }, { repeat: true }], defs: [{id: "number", uuid: '1', initial: "{ value: float(text), instance: true }" }]},
+    ],
   },
 
   hierarchy: [

package/common/ordering.instance.json

@@ -1,5 +1,5 @@
 {
-  "queries": [
+  "configs": [
     "wants is xfx between wanter and wantee",
     "if x likes y or x loves y then x wants y"
   ],
@@ -518,13 +518,13 @@
           "one": {
             "number": "one",
             "marker": "unknown",
+            "value": "wants",
+            "word": "wants",
+            "text": "wants",
             "range": {
               "start": 0,
               "end": 37
             },
-            "word": "wants",
-            "text": "wants",
-            "value": "wants",
             "unknown": true,
             "dead": true,
             "types": [
@@ -564,26 +564,26 @@
               "value": [
                 {
                   "marker": "type",
+                  "value": "wanter",
+                  "word": "wanter",
+                  "text": "wanter",
                   "range": {
                     "start": 21,
                     "end": 26
                   },
-                  "word": "wanter",
-                  "text": "wanter",
-                  "value": "wanter",
                   "unknown": true,
                   "dead": true,
                   "level": 1
                 },
                 {
                   "marker": "type",
+                  "value": "wantee",
+                  "word": "wantee",
+                  "text": "wantee",
                   "range": {
                     "start": 32,
                     "end": 37
                   },
-                  "word": "wantee",
-                  "text": "wantee",
-                  "value": "wantee",
                   "unknown": true,
                   "dead": true,
                   "level": 1
@@ -719,24 +719,6 @@
             1
           ]
         ],
-        [
-          [
-            "between",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "xfx",
-            0
-          ]
-        ],
         [
           [
             "between",
@@ -1625,13 +1607,13 @@
                 },
                 "liker": {
                   "marker": "unknown",
+                  "value": "x",
+                  "word": "x",
+                  "text": "x",
                   "range": {
                     "start": 3,
                     "end": 3
                   },
-                  "word": "x",
-                  "text": "x",
-                  "value": "x",
                   "unknown": true,
                   "dead": true,
                   "types": [
@@ -1641,13 +1623,13 @@
                 },
                 "likee": {
                   "marker": "unknown",
+                  "value": "y",
+                  "word": "y",
+                  "text": "y",
                   "range": {
                     "start": 11,
                     "end": 11
                   },
-                  "word": "y",
-                  "text": "y",
-                  "value": "y",
                   "unknown": true,
                   "dead": true,
                   "types": [
@@ -1690,13 +1672,13 @@
                 },
                 "lover": {
                   "marker": "unknown",
+                  "value": "x",
+                  "word": "x",
+                  "text": "x",
                   "range": {
                     "start": 16,
                     "end": 16
                   },
-                  "word": "x",
-                  "text": "x",
-                  "value": "x",
                   "unknown": true,
                   "dead": true,
                   "types": [
@@ -1706,13 +1688,13 @@
                 },
                 "lovee": {
                   "marker": "unknown",
+                  "value": "y",
+                  "word": "y",
+                  "text": "y",
                   "range": {
                     "start": 24,
                     "end": 24
                   },
-                  "word": "y",
-                  "text": "y",
-                  "value": "y",
                   "unknown": true,
                   "dead": true,
                   "types": [
@@ -1761,13 +1743,13 @@
             },
             "wanter": {
               "marker": "unknown",
+              "value": "x",
+              "word": "x",
+              "text": "x",
               "range": {
                 "start": 31,
                 "end": 31
               },
-              "word": "x",
-              "text": "x",
-              "value": "x",
               "unknown": true,
               "dead": true,
               "types": [
@@ -1777,13 +1759,13 @@
             },
             "wantee": {
               "marker": "unknown",
+              "value": "y",
+              "word": "y",
+              "text": "y",
               "range": {
                 "start": 39,
                 "end": 39
               },
-              "word": "y",
-              "text": "y",
-              "value": "y",
               "unknown": true,
               "dead": true,
               "types": [
@@ -1882,6 +1864,10 @@
             "unknown",
             0
           ],
+          [
+            "unknown",
+            1
+          ],
           [
             "want",
             0
@@ -1910,7 +1896,7 @@
           ],
           [
             "unknown",
-            1
+            0
           ],
           [
             "want",
@@ -1924,7 +1910,7 @@
           ],
           [
             "like",
-            1
+            0
           ],
           [
             "love",
@@ -1958,7 +1944,7 @@
           ],
           [
             "love",
-            1
+            0
           ],
           [
             "orList",
@@ -1999,8 +1985,12 @@
             0
           ],
           [
-            "want",
+            "unknown",
             1
+          ],
+          [
+            "want",
+            0
           ]
         ],
         [
@@ -2008,6 +1998,10 @@
             "if",
             0
           ],
+          [
+            "like",
+            1
+          ],
           [
             "love",
             1
@@ -2031,18 +2025,12 @@
             0
           ],
           [
-            "orList",
+            "love",
             1
-          ]
-        ],
-        [
-          [
-            "if",
-            0
           ],
           [
             "orList",
-            1
+            0
           ],
           [
             "then",
@@ -2059,12 +2047,26 @@
             0
           ],
           [
-            "then",
+            "orList",
+            1
+          ]
+        ],
+        [
+          [
+            "if",
             0
           ],
           [
-            "unknown",
+            "orList",
+            1
+          ],
+          [
+            "then",
             0
+          ],
+          [
+            "want",
+            1
           ]
         ]
       ],
@@ -2187,7 +2189,7 @@
     [
       [
         "between",
-        0
+        1
       ],
       [
         "is",
@@ -2195,25 +2197,41 @@
       ],
       [
         "unknown",
+        1
+      ]
+    ],
+    [
+      [
+        "if",
         0
       ],
       [
-        "xfx",
+        "like",
         0
-      ]
-    ],
-    [
+      ],
       [
-        "between",
-        1
+        "love",
+        0
       ],
       [
-        "is",
+        "orList",
+        0
+      ],
+      [
+        "then",
+        0
+      ],
+      [
+        "unknown",
         0
       ],
       [
         "unknown",
         1
+      ],
+      [
+        "want",
+        0
       ]
     ],
     [
@@ -2446,20 +2464,6 @@
         1
       ]
     ],
-    [
-      [
-        "if",
-        0
-      ],
-      [
-        "then",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "is",

package/common/ordering.js

@@ -6,7 +6,7 @@ const ordering_instance = require('./ordering.instance.json')
 const { API } = require('./helpers/ordering')
 
 const template ={
-  "queries": [
+  configs: [
     "wants is xfx between wanter and wantee",
     // "if a likes or loves b then a wants b",
     "if x likes y or x loves y then x wants y",