tpmkms 7.12.8-beta.5 → 7.12.8-beta.7

package/common/pipboy.js

@@ -503,7 +503,7 @@ addWeapon('rifle')
 */
 
 const template = {
-  queries: [
+  configs: [
     "pistols rifles grenades mines and shotguns are weapons",
     "mines and grenades are explosives",
     "explosives are weapons",

package/common/pokemon.instance.json

@@ -1,5 +1,5 @@
 {
-  "queries": [
+  "configs": [
     "pokemon modifies type",
     "pokemon type is a type",
     "pikachu squirtle weedle and pidgeot are pokemon",
@@ -324,15 +324,15 @@
           "dead": true,
           "modifiers": [
             {
+              "value": "pokemon",
+              "unknown": true,
+              "text": "pokemon",
               "marker": "unknown",
+              "word": "pokemon",
               "range": {
                 "start": 0,
                 "end": 6
               },
-              "word": "pokemon",
-              "text": "pokemon",
-              "value": "pokemon",
-              "unknown": true,
               "dead": true,
               "level": 1
             }
@@ -1644,54 +1644,54 @@
             "listable": true,
             "value": [
               {
+                "value": "pikachu",
+                "unknown": true,
+                "text": "pikachu",
                 "marker": "unknown",
+                "word": "pikachu",
                 "range": {
                   "start": 0,
                   "end": 6
                 },
-                "word": "pikachu",
-                "text": "pikachu",
-                "value": "pikachu",
-                "unknown": true,
                 "dead": true,
                 "level": 1
               },
               {
+                "value": "squirtle",
+                "unknown": true,
+                "text": "squirtle",
                 "marker": "unknown",
+                "word": "squirtle",
                 "range": {
                   "start": 8,
                   "end": 15
                 },
-                "word": "squirtle",
-                "text": "squirtle",
-                "value": "squirtle",
-                "unknown": true,
                 "dead": true,
                 "level": 1
               },
               {
+                "value": "weedle",
+                "unknown": true,
+                "text": "weedle",
                 "marker": "unknown",
+                "word": "weedle",
                 "range": {
                   "start": 17,
                   "end": 22
                 },
-                "word": "weedle",
-                "text": "weedle",
-                "value": "weedle",
-                "unknown": true,
                 "dead": true,
                 "level": 2
               },
               {
+                "value": "pidgeot",
+                "unknown": true,
+                "text": "pidgeot",
                 "marker": "unknown",
+                "word": "pidgeot",
                 "range": {
                   "start": 28,
                   "end": 34
                 },
-                "word": "pidgeot",
-                "text": "pidgeot",
-                "value": "pidgeot",
-                "unknown": true,
                 "dead": true,
                 "level": 2
               }
@@ -1842,16 +1842,6 @@
             "unknown",
             1
           ]
-        ],
-        [
-          [
-            "pokemon",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
         ]
       ],
       "learned_contextual_priorities": [],
@@ -2413,15 +2403,15 @@
           "dead": true,
           "modifiers": [
             {
+              "value": "fire",
+              "unknown": true,
+              "text": "fire",
               "marker": "unknown",
+              "word": "fire",
               "range": {
                 "start": 0,
                 "end": 3
               },
-              "word": "fire",
-              "text": "fire",
-              "value": "fire",
-              "unknown": true,
               "dead": true,
               "level": 1
             }
@@ -3128,15 +3118,15 @@
           "dead": true,
           "modifiers": [
             {
+              "value": "water",
+              "unknown": true,
+              "text": "water",
               "marker": "unknown",
+              "word": "water",
               "range": {
                 "start": 0,
                 "end": 4
               },
-              "word": "water",
-              "text": "water",
-              "value": "water",
-              "unknown": true,
               "dead": true,
               "level": 1
             }
@@ -3915,15 +3905,15 @@
           "dead": true,
           "modifiers": [
             {
+              "value": "earth",
+              "unknown": true,
+              "text": "earth",
               "marker": "unknown",
+              "word": "earth",
               "range": {
                 "start": 0,
                 "end": 4
               },
-              "word": "earth",
-              "text": "earth",
-              "value": "earth",
-              "unknown": true,
               "dead": true,
               "level": 1
             }
@@ -4774,15 +4764,15 @@
           "dead": true,
           "modifiers": [
             {
+              "value": "electric",
+              "unknown": true,
+              "text": "electric",
               "marker": "unknown",
+              "word": "electric",
               "range": {
                 "start": 0,
                 "end": 7
               },
-              "word": "electric",
-              "text": "electric",
-              "value": "electric",
-              "unknown": true,
               "dead": true,
               "level": 1
             }
@@ -10158,24 +10148,6 @@
             "is",
             0
           ]
-        ],
-        [
-          [
-            "electric",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "pikachu",
-            0
-          ],
-          [
-            "type",
-            0
-          ]
         ]
       ],
       "learned_contextual_priorities": [],
@@ -11097,15 +11069,15 @@
           },
           "one": {
             "number": "one",
+            "value": "charmander",
+            "unknown": true,
+            "text": "charmander",
             "marker": "unknown",
+            "word": "charmander",
             "range": {
               "start": 0,
               "end": 24
             },
-            "word": "charmander",
-            "text": "charmander",
-            "value": "charmander",
-            "unknown": true,
             "dead": true,
             "types": [
               "unknown"
@@ -11611,24 +11583,6 @@
         1
       ]
     ],
-    [
-      [
-        "electric",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "pikachu",
-        0
-      ],
-      [
-        "type",
-        0
-      ]
-    ],
     [
       [
         "is",
@@ -11928,16 +11882,6 @@
         "unknown",
         1
       ]
-    ],
-    [
-      [
-        "pokemon",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
     ]
   ],
   "learned_contextual_priorities": []

package/common/pokemon.js

@@ -6,7 +6,7 @@ const pokemon_instance = require('./pokemon.instance.json')
 const pluralize = require('pluralize')
 
 const template = {
-  queries: [
+  configs: [
     "pokemon modifies type",
     "pokemon type is a type",
     "pikachu squirtle weedle and pidgeot are pokemon",

package/common/pressure.instance.json

@@ -1,5 +1,5 @@
 {
-  "queries": [
+  "configs": [
     "pressure is a dimension",
     "pascals and atmospheres are units of pressure",
     "pascals = atmospheres * 101325",
@@ -827,15 +827,15 @@
           },
           "one": {
             "number": "one",
+            "value": "pressure",
+            "unknown": true,
+            "text": "pressure",
             "marker": "unknown",
+            "word": "pressure",
             "range": {
               "start": 0,
               "end": 22
             },
-            "word": "pressure",
-            "text": "pressure",
-            "value": "pressure",
-            "unknown": true,
             "dead": true,
             "types": [
               "unknown"
@@ -1964,28 +1964,28 @@
             "listable": true,
             "value": [
               {
+                "value": "pascals",
+                "unknown": true,
+                "text": "pascals",
                 "marker": "unknown",
+                "word": "pascals",
                 "range": {
                   "start": 0,
                   "end": 6
                 },
-                "word": "pascals",
-                "text": "pascals",
-                "value": "pascals",
-                "unknown": true,
                 "dead": true,
                 "level": 2
               },
               {
+                "value": "atmospheres",
+                "unknown": true,
+                "text": "atmospheres",
                 "marker": "unknown",
+                "word": "atmospheres",
                 "range": {
                   "start": 12,
                   "end": 22
                 },
-                "word": "atmospheres",
-                "text": "atmospheres",
-                "value": "atmospheres",
-                "unknown": true,
                 "dead": true,
                 "level": 2
               }
@@ -2247,16 +2247,6 @@
             "propertyOf",
             1
           ]
-        ],
-        [
-          [
-            "pressure",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
         ]
       ],
       "learned_contextual_priorities": [],
@@ -4798,16 +4788,6 @@
         "unknown",
         1
       ]
-    ],
-    [
-      [
-        "pressure",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
     ]
   ],
   "learned_contextual_priorities": []

package/common/pressure.js

@@ -5,7 +5,7 @@ const pressure_tests = require('./pressure.test.json')
 const pressure_instance = require('./pressure.instance.json')
 
 const template = {
-  "queries": [
+  configs: [
     "pressure is a dimension",
     "pascals and atmospheres are units of pressure",
 

package/common/properties.instance.json

@@ -1,5 +1,5 @@
 {
-  "queries": [],
+  "configs": [],
   "resultss": [],
   "fragments": [
     {
@@ -406,15 +406,15 @@
           },
           "one": {
             "number": "one",
+            "value": "property1",
+            "unknown": true,
+            "text": "the property1 of object1",
             "marker": "property",
+            "word": "property1",
             "range": {
               "start": 0,
               "end": 33
             },
-            "word": "property1",
-            "text": "the property1 of object1",
-            "value": "property1",
-            "unknown": true,
             "dead": true,
             "types": [
               "property",
@@ -429,15 +429,15 @@
               "determiner"
             ],
             "object": {
+              "value": "object1",
+              "unknown": true,
+              "text": "object1",
               "marker": "unknown",
+              "word": "object1",
               "range": {
                 "start": 17,
                 "end": 23
               },
-              "word": "object1",
-              "text": "object1",
-              "value": "object1",
-              "unknown": true,
               "dead": true,
               "types": [
                 "unknown"
@@ -446,15 +446,15 @@
             },
             "objects": [
               {
+                "value": "property1",
+                "unknown": true,
+                "text": "the property1",
                 "marker": "property",
+                "word": "property1",
                 "range": {
                   "start": 0,
                   "end": 12
                 },
-                "word": "property1",
-                "text": "the property1",
-                "value": "property1",
-                "unknown": true,
                 "dead": true,
                 "types": [
                   "property",
@@ -471,15 +471,15 @@
                 "level": 1
               },
               {
+                "value": "object1",
+                "unknown": true,
+                "text": "object1",
                 "marker": "unknown",
+                "word": "object1",
                 "range": {
                   "start": 17,
                   "end": 23
                 },
-                "word": "object1",
-                "text": "object1",
-                "value": "object1",
-                "unknown": true,
                 "dead": true,
                 "types": [
                   "unknown"
@@ -490,15 +490,15 @@
             "level": 1
           },
           "two": {
+            "value": "value1",
+            "unknown": true,
+            "text": "value1",
             "marker": "unknown",
+            "word": "value1",
             "range": {
               "start": 28,
               "end": 33
             },
-            "word": "value1",
-            "text": "value1",
-            "value": "value1",
-            "unknown": true,
             "dead": true,
             "types": [
               "unknown"
@@ -611,20 +611,6 @@
             1
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "the",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -732,20 +718,6 @@
         1
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "the",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "is",

package/common/properties.js

@@ -172,14 +172,19 @@ let configStruct = {
     { id: "objectPrefix", level: 0, bridge: '{ ...after[0], object: operator, objects: [after[0], operator] }' },
   ],
   words: {
-    "<<possession>>": [{ id: 'possession', initial: "{ value: 'possession' }" }],
-    " 's": [{ id: 'possession', initial: "{ value: 'possession' }" }],
-    "have": [{ id: 'have', initial: "{ doesable: true, number: 'many' }" }],
-    "has": [{ id: 'have', initial: "{ doesable: true, number: 'one' }" }],
-    "dont": [{ id: 'doesnt', initial: "{ number: 'many' }" }],
-    "doesnt": [{ id: 'doesnt', initial: "{ number: 'one' }" }],
-    // "my": [{ id: 'objectPrefix', initial: "{ value: 'other' }" }],
-    // "your": [{ id: 'objectPrefix', initial: "{ value: 'self' }" }],
+    literals: {
+      "<<possession>>": [{ id: 'possession', initial: "{ value: 'possession' }" }],
+      " 's": [{ id: 'possession', initial: "{ value: 'possession' }" }],
+      "have": [{ id: 'have', initial: "{ doesable: true, number: 'many' }" }],
+      "has": [{ id: 'have', initial: "{ doesable: true, number: 'one' }" }],
+      "dont": [{ id: 'doesnt', initial: "{ number: 'many' }" }],
+      "doesnt": [{ id: 'doesnt', initial: "{ number: 'one' }" }],
+      // "my": [{ id: 'objectPrefix', initial: "{ value: 'other' }" }],
+      // "your": [{ id: 'objectPrefix', initial: "{ value: 'self' }" }],
+    },
+    patterns: [
+      { "pattern": ["'s"], defs: [{id: "possession", uuid: '1', initial: "{ value: 'possession' }" }]},
+    ],
   },
   priorities: [
     { "context": [['list', 0], ['between', 0], ], "choose": [0] },