ekms 9.6.3-beta.2 → 9.6.3-beta.4

package/common/stm.js

@@ -41,7 +41,7 @@ class API {
     return this._objects.mentioned.filter( (context) => this.isA(context.marker, type) )
   }
 
-  mentioned(args) {
+  remember(args) {
     let concept, value, frameOfReference
     if (!args.context) {
       concept = args
@@ -76,7 +76,7 @@ class API {
     helpers.unshiftL(frameOfReference.mentioned, concept, this.maximumMentioned)
   }
 
-  mentions({ context, frameOfReference, useHierarchy=true, all, lastN, condition = (() => true) } = {}) {
+  recall({ context, frameOfReference, useHierarchy=true, all, condition = (() => true), filter = ((result) => result) } = {}) {
     let mentioned = this._objects.mentioned
     let reversed = false
     if (frameOfReference) {
@@ -112,9 +112,6 @@ class API {
     // care about value first
     let findCounter = 0
     for (const m of mentioned) {
-      if (lastN === 0) {
-        break
-      }
       if (context.value && (context.value == m.marker || context.value == m.value)) {
         findCounter += 1
         if (findPrevious && findCounter < 2) {
@@ -124,20 +121,17 @@ class API {
           continue
         }
         if (condition(m)) {
-          if (all || lastN) {
+          if (all) {
             addForAll(m)
-            if (lastN) {
-              lastN -= 1
-            }
           } else {
-            return m
+            return filter(m)
           }
         }
       }
     }
 
-    if (lastN === 0) {
-      return forAll
+    if (forAll.length > 0) {
+      return filter(forAll)
     }
 
     if (!useHierarchy) {
@@ -147,9 +141,6 @@ class API {
     // care about marker second
     findCounter = 0
     for (const m of mentioned) {
-      if (lastN === 0) {
-        break
-      }
       if (context.marker != 'unknown' && this.isA(m.marker, context.marker)) {
         findCounter += 1
         if (findPrevious && findCounter < 2) {
@@ -159,13 +150,10 @@ class API {
           continue
         }
         if (condition(m)) {
-          if (all || lastN) {
+          if (all) {
             addForAll(m)
-            if (lastN) {
-              lastN -= 1
-            }
           } else {
-            return m
+            return filter(m)
           }
         }
       }
@@ -181,13 +169,10 @@ class API {
               continue
             }
             if (condition(m)) {
-              if (all || lastN) {
-                if (lastN) {
-                  lastN -= 1
-                }
+              if (all) {
                 addForAll(m)
               } else {
-                return m
+                return filter(m)
               }
             }
           }
@@ -195,37 +180,31 @@ class API {
       }
     }
 
-    if (lastN === 0) {
-      return forAll
+    if (forAll.length > 0) {
+      return filter(forAll)
     }
 
     findCounter = 0
     if (context.types && context.types.length == 1) {
       for (const m of mentioned) {
-        if (lastN === 0) {
-          break
-        }
         if (context.unknown) {
           findCounter += 1
           if (findPrevious && findCounter < 2) {
             continue
           }
           if (condition(m)) {
-            if (all || lastN) {
+            if (all) {
               addForAll(m)
-              if (lastN) {
-                lastN -= 1
-              }
             } else {
-              return m
+              return filter(m)
             }
           }
         }
       }
     }
 
-    if (all || lastN) {
-      return forAll
+    if (forAll.length > 0) {
+      return filter(forAll)
     }
   }
 
@@ -233,7 +212,7 @@ class API {
     if (!context || context.marker == 'mentions') {
       return
     }
-    let valueNew = this.mentions({ context, useHierarchy: false, condition: (context) => context.isVariable })
+    let valueNew = this.recall({ context, useHierarchy: false, condition: (context) => context.isVariable })
     if (valueNew && valueNew.value) {
       valueNew = valueNew.value
     }
@@ -241,7 +220,7 @@ class API {
   }
 
   setVariable(variableName, value) {
-    this.mentioned({ context: { marker: variableName, isVariable: true }, value })
+    this.remember({ context: { marker: variableName, isVariable: true }, value })
   }
 }
 
@@ -276,7 +255,7 @@ const config = {
         if (value == context.rememberee.value) {
           value = context.rememberee
         }
-        api.mentioned({ context: value })
+        api.remember({ context: value })
       },
     },
     { 
@@ -300,7 +279,7 @@ const config = {
       where: where(),
       match: ({context}) => context.marker == 'mentions' && context.evaluate,
       apply: ({context, kms, toList, resolveEvaluate}) => {
-        resolveEvaluate(context, kms.stm.api.mentions(context.args))
+        resolveEvaluate(context, kms.stm.api.recall(context.args))
       }
     },
     { 
@@ -308,8 +287,8 @@ const config = {
       notes: 'pull from context',
       // match: ({context}) => context.marker == 'it' && context.pullFromContext, // && context.value,
       match: ({context, callId}) => context.pullFromContext && !context.same, // && context.value,
-      apply: async ({callId, mentions, toList, context, kms, e, log, retry}) => {
-        context.value = (await mentions({ context }))
+      apply: async ({callId, recall, toList, context, kms, e, log, retry}) => {
+        context.value = (await recall({ context }))
         if (Array.isArray(context.value)) {
           context.value = toList(context.value)
         }
@@ -334,8 +313,8 @@ const config = {
 
 function initializer({config}) {
   config.addArgs(({kms, e, toList}) => ({
-    mentioned: (args) => {
-      kms.stm.api.mentioned(args)
+    remember: (args) => {
+      kms.stm.api.remember(args)
     },
 
     frameOfReference: (context, { mentioned, reversed } = {}) => {
@@ -349,7 +328,7 @@ function initializer({config}) {
       }
     },
 
-    mentions: async (args) => {
+    recall: async (args) => {
       if (args.frameOfReference?.nameable_named) {
         const result = await e(args.frameOfReference)
         if (result.evalue) {

package/package.json

@@ -386,8 +386,8 @@
     "scriptjs": "^2.5.9",
     "table": "^6.7.1",
     "uuid": "^9.0.0",
-    "theprogrammablemind": "9.6.3-beta.2"
+    "theprogrammablemind": "9.6.3-beta.4"
   },
-  "version": "9.6.3-beta.2",
+  "version": "9.6.3-beta.4",
   "license": "UNLICENSED"
 }