tpmkms_4wp 9.5.1-beta.21 → 9.5.1-beta.24

package/common/people.instance.json

@@ -5525,32 +5525,6 @@
             0
           ]
         ],
-        [
-          [
-            "isEd",
-            0
-          ],
-          [
-            "means",
-            0
-          ],
-          [
-            "owned",
-            0
-          ],
-          [
-            "ownee",
-            0
-          ],
-          [
-            "owner",
-            0
-          ],
-          [
-            "owns",
-            0
-          ]
-        ],
         [
           [
             "means",
@@ -6914,8 +6888,7 @@
             "types": [
               "unknown"
             ],
-            "level": 0,
-            "concept": true
+            "level": 0
           },
           "two": {
             "value": "owneevar",
@@ -7002,10 +6975,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
-          "touchedBy": [
-            "people#call2"
-          ]
+          "context_id": 2
         }
       ],
       "generated": [
@@ -7362,7 +7332,7 @@
       "learned_contextual_priorities": [],
       "rtf_associations": [],
       "query": "ownervar is owneevar owned by",
-      "skipSemantics": false,
+      "skipSemantics": true,
       "key": {
         "query": "ownervar is owneevar owned by"
       }
@@ -7884,31 +7854,6 @@
           "isEder",
           false
         ],
-        [
-          "ownervar",
-          "isEdee",
-          false
-        ],
-        [
-          "ownervar",
-          "isEder",
-          false
-        ],
-        [
-          "ownervar",
-          "ownee",
-          false
-        ],
-        [
-          "ownervar",
-          "queryable",
-          false
-        ],
-        [
-          "ownervar",
-          "theAble",
-          false
-        ],
         [
           "owns",
           "canBeDoQuestion",
@@ -8136,7 +8081,7 @@
                 0
               ],
               [
-                "ownervar",
+                "unknown",
                 0
               ],
               [
@@ -8148,7 +8093,7 @@
           },
           {
             "op": [
-              "ownervar",
+              "unknown",
               0
             ],
             "ops": [
@@ -8165,7 +8110,7 @@
                 0
               ],
               [
-                "ownervar",
+                "unknown",
                 0
               ]
             ],
@@ -8262,6 +8207,10 @@
               "default": true,
               "word": "owned",
               "text": "owned",
+              "range": {
+                "start": 12,
+                "end": 16
+              },
               "types": [
                 "owned"
               ],
@@ -8275,6 +8224,10 @@
             "text": "owneevar",
             "marker": "unknown",
             "word": "owneevar",
+            "range": {
+              "start": 0,
+              "end": 7
+            },
             "dead": true,
             "types": [
               "ownee",
@@ -8284,23 +8237,32 @@
           },
           "owner": {
             "value": "ownervar",
-            "number": "one",
+            "unknown": true,
             "text": "ownervar",
-            "marker": "ownervar",
+            "marker": "unknown",
             "word": "ownervar",
+            "range": {
+              "start": 21,
+              "end": 28
+            },
             "dead": true,
             "types": [
-              "ownervar"
+              "unknown",
+              {
+                "marker": "or",
+                "value": [
+                  "by_after_isEder_owner",
+                  "isEder",
+                  "owner"
+                ]
+              }
             ],
             "level": 0
           },
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
-          "touchedBy": [
-            "people#call2"
-          ]
+          "context_id": 2
         }
       ],
       "generated": [
@@ -8405,7 +8367,7 @@
                 },
                 {
                   "marker": [
-                    "ownervar",
+                    "unknown",
                     0
                   ],
                   "range": {
@@ -8460,7 +8422,7 @@
                 },
                 {
                   "marker": [
-                    "ownervar",
+                    "unknown",
                     0
                   ],
                   "range": {
@@ -8515,7 +8477,7 @@
                 },
                 {
                   "marker": [
-                    "ownervar",
+                    "unknown",
                     0
                   ],
                   "range": {
@@ -8653,7 +8615,7 @@
       "learned_contextual_priorities": [],
       "rtf_associations": [],
       "query": "owneevar is owned by ownervar",
-      "skipSemantics": false,
+      "skipSemantics": true,
       "key": {
         "query": "owneevar is owned by ownervar"
       }
@@ -8831,32 +8793,6 @@
         0
       ]
     ],
-    [
-      [
-        "isEd",
-        0
-      ],
-      [
-        "means",
-        0
-      ],
-      [
-        "owned",
-        0
-      ],
-      [
-        "ownee",
-        0
-      ],
-      [
-        "owner",
-        0
-      ],
-      [
-        "owns",
-        0
-      ]
-    ],
     [
       [
         "isEd",
@@ -10464,7 +10400,7 @@
             },
             {
               "marker": [
-                "ownervar",
+                "unknown",
                 0
               ],
               "range": {
@@ -10519,7 +10455,7 @@
             },
             {
               "marker": [
-                "ownervar",
+                "unknown",
                 0
               ],
               "range": {
@@ -10574,7 +10510,7 @@
             },
             {
               "marker": [
-                "ownervar",
+                "unknown",
                 0
               ],
               "range": {

package/common/pipboy.instance.json

@@ -1716,20 +1716,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -10139,20 +10125,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -35461,34 +35433,6 @@
         0
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "is",

package/common/pressure.instance.json

@@ -3434,7 +3434,7 @@
         ],
         [
           "atmosphere",
-          "unit",
+          "unit_pressure",
           false
         ],
         [
@@ -4064,7 +4064,7 @@
         ],
         [
           "pascal",
-          "unit",
+          "unit_pressure",
           false
         ],
         [
@@ -4397,6 +4397,46 @@
           "theAble",
           false
         ],
+        [
+          "unit_pressure",
+          "hierarchyAble",
+          false
+        ],
+        [
+          "unit_pressure",
+          "isEdee",
+          false
+        ],
+        [
+          "unit_pressure",
+          "isEder",
+          false
+        ],
+        [
+          "unit_pressure",
+          "object",
+          false
+        ],
+        [
+          "unit_pressure",
+          "property",
+          false
+        ],
+        [
+          "unit_pressure",
+          "queryable",
+          false
+        ],
+        [
+          "unit_pressure",
+          "theAble",
+          false
+        ],
+        [
+          "unit_pressure",
+          "unit",
+          false
+        ],
         [
           "unknown",
           "hierarchyAble",
@@ -4447,7 +4487,7 @@
         "opChoices": [
           {
             "op": [
-              "integer",
+              "pascal",
               0
             ],
             "ops": [
@@ -4476,7 +4516,7 @@
           },
           {
             "op": [
-              "pascal",
+              "atmosphere",
               0
             ],
             "ops": [
@@ -4489,7 +4529,7 @@
                 0
               ],
               [
-                "pascal",
+                "integer",
                 0
               ],
               [
@@ -4501,16 +4541,16 @@
           },
           {
             "op": [
-              "atmosphere",
+              "integer",
               0
             ],
             "ops": [
               [
-                "atmosphere",
+                "equals",
                 0
               ],
               [
-                "equals",
+                "integer",
                 0
               ],
               [
@@ -4808,7 +4848,7 @@
                 {
                   "marker": [
                     "integer",
-                    1
+                    0
                   ],
                   "range": {
                     "start": 24,
@@ -4863,7 +4903,7 @@
                 {
                   "marker": [
                     "integer",
-                    1
+                    0
                   ],
                   "range": {
                     "start": 24,
@@ -5093,7 +5133,7 @@
         ],
         [
           "atmosphere",
-          "unit",
+          "unit_pressure",
           false
         ],
         [
@@ -5723,7 +5763,7 @@
         ],
         [
           "pascal",
-          "unit",
+          "unit_pressure",
           false
         ],
         [
@@ -6056,6 +6096,46 @@
           "theAble",
           false
         ],
+        [
+          "unit_pressure",
+          "hierarchyAble",
+          false
+        ],
+        [
+          "unit_pressure",
+          "isEdee",
+          false
+        ],
+        [
+          "unit_pressure",
+          "isEder",
+          false
+        ],
+        [
+          "unit_pressure",
+          "object",
+          false
+        ],
+        [
+          "unit_pressure",
+          "property",
+          false
+        ],
+        [
+          "unit_pressure",
+          "queryable",
+          false
+        ],
+        [
+          "unit_pressure",
+          "theAble",
+          false
+        ],
+        [
+          "unit_pressure",
+          "unit",
+          false
+        ],
         [
           "unknown",
           "hierarchyAble",
@@ -6106,7 +6186,7 @@
         "opChoices": [
           {
             "op": [
-              "integer",
+              "atmosphere",
               0
             ],
             "ops": [
@@ -6135,20 +6215,20 @@
           },
           {
             "op": [
-              "atmosphere",
+              "pascal",
               0
             ],
             "ops": [
               [
-                "atmosphere",
+                "divideByOperator",
                 0
               ],
               [
-                "divideByOperator",
+                "equals",
                 0
               ],
               [
-                "equals",
+                "integer",
                 0
               ],
               [
@@ -6160,7 +6240,7 @@
           },
           {
             "op": [
-              "pascal",
+              "integer",
               0
             ],
             "ops": [
@@ -6173,7 +6253,7 @@
                 0
               ],
               [
-                "pascal",
+                "integer",
                 0
               ]
             ],
@@ -6467,7 +6547,7 @@
                 {
                   "marker": [
                     "integer",
-                    1
+                    0
                   ],
                   "range": {
                     "start": 24,
@@ -6522,7 +6602,7 @@
                 {
                   "marker": [
                     "integer",
-                    1
+                    0
                   ],
                   "range": {
                     "start": 24,
@@ -7633,7 +7713,7 @@
             {
               "marker": [
                 "integer",
-                1
+                0
               ],
               "range": {
                 "start": 24,
@@ -7688,7 +7768,7 @@
             {
               "marker": [
                 "integer",
-                1
+                0
               ],
               "range": {
                 "start": 24,
@@ -7908,7 +7988,7 @@
             {
               "marker": [
                 "integer",
-                1
+                0
               ],
               "range": {
                 "start": 24,
@@ -7963,7 +8043,7 @@
             {
               "marker": [
                 "integer",
-                1
+                0
               ],
               "range": {
                 "start": 24,

package/common/properties.instance.json

@@ -598,10 +598,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
-          "touchedBy": [
-            "properties#call2"
-          ]
+          "context_id": 2
         }
       ],
       "generated": [
@@ -1108,7 +1105,7 @@
       "learned_contextual_priorities": [],
       "rtf_associations": [],
       "query": "the property1 of object1 is value1",
-      "skipSemantics": false,
+      "skipSemantics": true,
       "key": {
         "query": "the property1 of object1 is value1"
       }

package/common/properties.js

@@ -367,7 +367,7 @@ const config = {
       notes: 'the property of object',
       where: where(),
       // match: ({context}) => context.paraphrase && context.modifiers && context.object, 
-      match: ({context}) => context.paraphrase && !context.possession && context.object, 
+      match: ({context}) => context.paraphrase && !context.possession && context.object && !context.interpolate, 
       apply: async ({context, g, gs}) => {
                const base = { ...context }
                base.object = undefined;
@@ -400,7 +400,7 @@ const config = {
       notes: "object's property",
       where: where(),
       // match: ({context}) => context.paraphrase && !context.modifiers && context.object, 
-      match: ({context}) => !context.modifiers && context.object, 
+      match: ({context}) => !context.modifiers && context.object && !context.interpolate, 
       apply: async ({context, g, gs}) => {
                if (context.objects) {
                  const objects = [ ...context.objects ]
@@ -572,7 +572,7 @@ const config = {
         } catch (e) {
           log(`Error processing set property of an object: ${e}`)
           const config = km('properties')
-          const fragment = fragments("the property1 of object1 is value1")
+          const fragment = await fragments("the property1 of object1 is value1")
           const value = await api.getProperty(objectId, propertyId)
           if (value.value == context.same.value) {
             context.evalue = [