tpmkms_4wp 7.12.8 → 8.0.0-beta.1

package/common/stm.js

@@ -28,7 +28,12 @@ class API {
   }
 
   mentioned(concept, value = undefined) {
-    concept = { ...concept, pullFromContext: false }
+    // TODO value should perhaps have been called id as in concept id and then value could be value
+    if (value) {
+      concept = { ...concept, pullFromContext: false }
+    } else {
+      concept.pullFromContext = false
+    }
     if (value) {
       if (concept.marker == 'unknown') {
         if (concept.value) {
@@ -37,6 +42,7 @@ class API {
       }
       concept.value = value
     }
+    concept.fromSTM = true
     this._objects.mentioned.unshift(concept)
   }
 
@@ -44,7 +50,7 @@ class API {
     // care about value first
     for (let m of this._objects.mentioned) {
       if (context.value && context.value == m.marker) {
-        return { ...m, fromSTM: true }
+        return m
       }
     }
 
@@ -54,21 +60,22 @@ class API {
     // care about marker second
     for (let m of this._objects.mentioned) {
       if (context.marker != 'unknown' && this.isA(m.marker, context.marker)) {
-        return { ...m, fromSTM: true }
+        return m
       }
       // if (context.types && context.types.includes(m.marker)) {
       if (context.types) {
         for (let parent of context.types) {
           if (parent != 'unknown' && this.isA(m.marker, parent)) {
-            return { ...m, fromSTM: true }
+            return m
           }
         }
       }
     }
+
     if (context.types && context.types.length == 1) {
       for (let m of this._objects.mentioned) {
         if (context.unknown) {
-          return { ...m, fromSTM: true }
+          return m
         }
       }
     }
@@ -101,6 +108,9 @@ let createConfig = () => {
       mentioned: (context) => {
         kms.stm.api.mentioned(context)
       },
+      mentions: (context) => {
+        return kms.stm.api.mentions(context)
+      },
     }))
   })
   config.api = api
@@ -118,6 +128,7 @@ knowledgeModule( {
     contents: stm_tests,
     checks: {
             context: defaultContextCheck,
+            objects: ['mentioned'],
           },
   },
 })

package/common/tell.js

@@ -54,8 +54,10 @@ let configStruct = {
     { id: 'tell', level: 0, bridge: '{ ...next(operator), target: after[0], info: after[1], event: after[2] }' },
   ],
   words: {
-    "when": [{ id: 'info', level: 0, initial: "{ info: 'when' }" }],
-    "me": [{ id: 'person', level: 0, initial: "{ target: 'me' }" }],
+    "literals": {
+      "when": [{ id: 'info', level: 0, initial: "{ info: 'when' }" }],
+      "me": [{ id: 'person', level: 0, initial: "{ target: 'me' }" }],
+    }
   },
   hierarchy: [
     ['is', 'event'],