tpmkms_4wp 9.5.1-beta.9 → 9.6.0-beta.0

package/common/properties.instance.json

@@ -229,6 +229,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -444,7 +454,7 @@
             ],
             "ops": [
               [
-                "is",
+                "be",
                 0
               ],
               [
@@ -598,10 +608,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
-          "touchedBy": [
-            "properties#call2"
-          ]
+          "context_id": 2
         }
       ],
       "generated": [
@@ -663,10 +670,6 @@
           ]
         ],
         [
-          [
-            "is",
-            0
-          ],
           [
             "propertyOf",
             1
@@ -1019,7 +1022,7 @@
                 },
                 {
                   "marker": [
-                    "is",
+                    "be",
                     0
                   ],
                   "range": {
@@ -1112,7 +1115,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"
       }
@@ -1167,10 +1170,6 @@
       ]
     ],
     [
-      [
-        "is",
-        0
-      ],
       [
         "propertyOf",
         1
@@ -1523,7 +1522,7 @@
             },
             {
               "marker": [
-                "is",
+                "be",
                 0
               ],
               "range": {

package/common/properties.js

@@ -3,7 +3,7 @@ const { defaultContextCheck, words } = require('./helpers')
 const dialogues = require('./dialogues')
 const meta = require('./meta')
 const concept = require('./concept')
-const properties_instance = require('./properties.instance.json')
+const instance = require('./properties.instance.json')
 const properties_tests = require('./properties.test.json')
 const { API } = require('./helpers/properties')
 const { chooseNumber } = require('./helpers.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 = [
@@ -629,7 +629,10 @@ const config = {
           if (!objectContext.value) {
             return objectContext;
           }
-          const objectValue = kms.stm.api.getVariable(objectContext.value);
+          let objectValue = kms.stm.api.getVariable(objectContext);
+          if (!objectValue) {
+            objectValue = objectContext.value
+          }
           if (!await api.knownObject(objectValue)) {
             context.verbatim = `There is no object named "${await g({...objectContext, paraphrase: true})}"`
             return
@@ -711,8 +714,6 @@ knowledgeModule( {
       bridges: true,
     }
   },
-  template: {
-    template,
-    instance: properties_instance,
-  },
+  instance,
+  template,
 })