ekms 9.6.3-beta.2 → 9.6.3-beta.21

package/common/reports.js

@@ -38,7 +38,7 @@ function compareValue(property, v1, v2) {
 function newReport({km, objects}) {
   objects.tempReportId += 1
   const reportId = `tempReport${objects.tempReportId}`
-  km('stm').api.mentioned({ context: { marker: "report", text: reportId, types: [ "report" ], value: reportId, word: reportId } })
+  km('stm').api.remember({ context: { marker: "report", text: reportId, types: [ "report" ], value: reportId, word: reportId } })
   // name to listing
   objects.listings[reportId] = {
       columns: ['name', 'supplier'],
@@ -344,7 +344,7 @@ const config = {
         const name = context.name.map((n) => n.text).join('')
         objects.listings[name] = {...listing}
         config.addWord(`${name}`,  { id: 'report', initial: `{ value: "${name}" }` })
-        km('stm').api.mentioned({
+        km('stm').api.remember({
           context: {
                   marker: "report",
                   text: name,

package/common/scorekeeper.js

@@ -43,7 +43,7 @@ function setNextPlayer(km, objects) {
         word: "turn"
       }
   const api = km('stm').api
-  api.mentioned({ context: turn })
+  api.remember({ context: turn })
 }
 
 function addPlayer(objects, config, player) {

package/common/sdefaults.js

@@ -14,6 +14,33 @@ class API {
   }
 }
 
+// TODO generalize this for avoiding recusive call without changing the context properties
+
+function okay(args, condition) {
+  if (condition(args)) {
+    const { context } = args
+
+    if (!context.control) {
+      context.control = {
+        seen: [],
+        nextId: 2,
+      }
+      context.control_id = 1
+    }
+
+    if (!context.control_id) {
+      context.control_id = context.control.nextId
+      context.control.nextId += 1
+    }
+    if (context.control.seen.includes(context.control_id)) {
+      return false
+    }
+    context.control.seen.push(context.control_id)
+    return true
+  }
+  return false
+}
+
 const config = {
   name: 'sdefaults',
   semantics: [
@@ -22,13 +49,16 @@ const config = {
       where: where(),
       priority: -1,
       // match: ({context}) => context.flatten || context.listable && context.value[0].flatten,
-      match: ({context}) => context.flatten || context.listable && context.value.some((value) => value.flatten),
+      match: (args) => okay(args, ({context}) => (context.flatten || context.listable && context.value.some((value) => value.flatten))),
       // match: ({context}) => context.flatten || context.listable || (Array.isArray(context.value) && context.value.some((value) => value.flatten)),
-      apply: async ({config, km, context, s}) => {
+      apply: async ({config, km, context, s, _continue}) => {
         const [flats, wf] = flatten(['list'], context)
         const evalues = []
         for (const flat of flats) {
-          const result = await s({ ...flat, flatten: false })
+          if (!flat.control) {
+            flat.control = context.control
+          }
+          const result = await s(flat)
           if (result.evalue) {
             evalues.push(result.evalue)
           }
@@ -37,17 +67,22 @@ const config = {
           context.evalue = concats(evalues)
           context.isResponse = true
         }
+        context.control.seen.length = 0
       }
     },
     {
       notes: 'flatten relation',
       where: where(),
       priority: -1,
-      match: ({context}) => context.flatten && context.relation,
+      // match: ({context}) => context.flatten && context.relation,
+      match: (args) => okay(args, ({context}) => (context.flatten && context.relation)),
       apply: async ({config, km, context, s}) => {
         const [flats, wf] = flatten(['list'], context)
         for (const flat of flats) {
-          await s({ ...flat, flatten: false })
+          if (!flat.control) {
+            flat.control = context.control
+          }
+          await s(flat)
         }
       }
     },

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
@@ -51,6 +51,10 @@ class API {
       frameOfReference = args.frameOfReference
     }
 
+    if (concept.pullFromContext) {
+      return
+    }
+
     if (!frameOfReference) {
       frameOfReference = this._objects
     }
@@ -76,7 +80,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, stopCondition = (() => false), condition = (() => true), filter = ((result) => result) } = {}) {
     let mentioned = this._objects.mentioned
     let reversed = false
     if (frameOfReference) {
@@ -112,7 +116,7 @@ class API {
     // care about value first
     let findCounter = 0
     for (const m of mentioned) {
-      if (lastN === 0) {
+      if (stopCondition(m)) {
         break
       }
       if (context.value && (context.value == m.marker || context.value == m.value)) {
@@ -124,20 +128,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,7 +148,7 @@ class API {
     // care about marker second
     findCounter = 0
     for (const m of mentioned) {
-      if (lastN === 0) {
+      if (stopCondition(m)) {
         break
       }
       if (context.marker != 'unknown' && this.isA(m.marker, context.marker)) {
@@ -159,19 +160,19 @@ class API {
           continue
         }
         if (condition(m)) {
-          if (all || lastN) {
+          if (all) {
             addForAll(m)
-            if (lastN) {
-              lastN -= 1
-            }
           } else {
-            return m
+            return filter(m)
           }
         }
       }
       // if (context.types && context.types.includes(m.marker)) {
       if (context.types) {
         for (const parent of context.types) {
+          if (stopCondition(m)) {
+            break
+          }
           if (parent != 'unknown' && this.isA(m.marker, parent)) {
             findCounter += 1
             if (findPrevious && findCounter < 2) {
@@ -181,13 +182,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 +193,34 @@ 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 (stopCondition(m)) {
+            break
+          }
           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 +228,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 +236,7 @@ class API {
   }
 
   setVariable(variableName, value) {
-    this.mentioned({ context: { marker: variableName, isVariable: true }, value })
+    this.remember({ context: { marker: variableName, isVariable: true }, value })
   }
 }
 
@@ -276,7 +271,7 @@ const config = {
         if (value == context.rememberee.value) {
           value = context.rememberee
         }
-        api.mentioned({ context: value })
+        api.remember({ context: value })
       },
     },
     { 
@@ -296,11 +291,24 @@ const config = {
     },  
   ],
   semantics: [
+    {
+      where: where(),
+      match: ({context}) => context.marker == 'mentions' && context.evaluate && context.args?.context?.distributer,
+      apply: async ({callId, _continue, toList, context, kms, e, log, toArray, retry}) => {
+        context.args.filter ??= (r) => r
+        context.args.all = true
+        const oldFilter = context.args.filter
+        context.args.filter = (result) => {
+          return oldFilter(result)
+        }
+        _continue()
+      }
+    },
     {
       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 +316,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 +342,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 +357,7 @@ function initializer({config}) {
       }
     },
 
-    mentions: async (args) => {
+    recall: async (args) => {
       if (args.frameOfReference?.nameable_named) {
         const result = await e(args.frameOfReference)
         if (result.evalue) {