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

package/common/stm.js

@@ -40,7 +40,16 @@ class API {
     return this._objects.mentioned.filter( (context) => this.isA(context.marker, type) )
   }
 
-  mentioned({ context:concept, value=null, frameOfReference } = {}) {
+  mentioned(args) {
+    let concept, value, frameOfReference
+    if (!args.context) {
+      concept = args
+    } else {
+      concept = args.context
+      value = args.value
+      frameOfReference = args.frameOfReference
+    }
+
     if (!frameOfReference) {
       frameOfReference = this._objects
     }
@@ -71,7 +80,6 @@ class API {
 
   mentions({ context, frameOfReference, useHierarchy=true, all, condition = (() => true) } = {}) {
     const mentioned = frameOfReference?.mentioned || this._objects.mentioned
-
     const findPrevious = !!context.stm_previous
     const forAll = []
     function addForAll(context) {
@@ -88,7 +96,7 @@ class API {
         if (findPrevious && findCounter < 2) {
           continue
         }
-        if (condition()) {
+        if (condition(m)) {
           if (all) {
             allForAll(m)
           } else {
@@ -162,19 +170,19 @@ class API {
     }
   }
 
-  getVariable(name) {
-    if (!name) {
+  getVariable(context) {
+    if (!context) {
       return
     }
-    let valueNew = this.mentions({ context: { marker: name, value: name }, useHierarchy: false }) || name
+    let valueNew = this.mentions({ context, useHierarchy: false, condition: (context) => context.isVariable })
     if (valueNew && valueNew.value) {
       valueNew = valueNew.value
     }
     return valueNew
   }
 
-  setVariable(name, value) {
-    this.mentioned({ context: { marker: name }, value })
+  setVariable(variableName, value) {
+    this.mentioned({ context: { marker: variableName, isVariable: true }, value })
   }
 }
 
@@ -183,8 +191,9 @@ const api = new API()
 const config = {
   name: 'stm',
   operators: [
-    "([stm_previous|previous] ([memorable]))",
-    "(([memorable]) [stm_before|before])",
+    "(<stm_current|current> ([memorable]))",
+    "(<stm_previous|previous> ([memorable]))",
+    "(([memorable]) <stm_before|before>)",
     "([remember] (memorable/*))",
   ],
   words: {
@@ -213,8 +222,14 @@ const config = {
     },
     { 
       id: 'stm_previous',
+      isA: ['adjective'],
       bridge: '{ ...after[0], modifiers: ["stm_previous"], stm_previous: operator, pullFromContext: true }',
     },  
+    { 
+      id: 'stm_current',
+      isA: ['adjective'],
+      bridge: '{ ...after[0], modifiers: ["stm_current"], stm_current: operator, pullFromContext: true }',
+    },  
     { 
       id: 'stm_before',
       isA: ['adjective'],
@@ -248,15 +263,15 @@ const config = {
 }
 
 function initializer({config}) {
-    config.addArgs(({kms}) => ({
-      mentioned: (args) => {
-        kms.stm.api.mentioned(args)
-      },
-      mentions: (args) => {
-        return kms.stm.api.mentions(args)
-      },
-    }))
-  }
+  config.addArgs(({kms}) => ({
+    mentioned: (args) => {
+      kms.stm.api.mentioned(args)
+    },
+    mentions: (args) => {
+      return kms.stm.api.mentions(args)
+    },
+  }))
+}
 
 knowledgeModule( { 
   config,
@@ -271,7 +286,9 @@ knowledgeModule( {
     contents: stm_tests,
     checks: {
              context: [defaultContextCheck({ extra: ['pullFromContext', 'stm_id'] })],
-            objects: [{ property: 'mentioned', filter: helpers.defaultContextCheckProperties }],
+             objects: [ { path: ['mentioned'] }],
+             // objects: [defaultContextCheck({ extra: ['mentioned'] })],
+             // objects: [{ property: 'mentioned', check: helpers.defaultContextCheckProperties }],
           },
   },
 })