theprogrammablemind 9.8.0-beta.0 → 9.8.0-beta.10

package/package.json

@@ -73,6 +73,6 @@
     "scriptjs": "^2.5.9",
     "uuid": "^8.3.2"
   },
-  "version": "9.8.0-beta.0",
+  "version": "9.8.0-beta.10",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -295,9 +295,6 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
       if (bridge.scope && config.isModule) {
         return
       }
-      if (false && !bridge.bridge) {
-        bridge.bridge = '{ ...next(operator) }'
-      }
       if (!bridge.level) {
         bridge.level = 0
       }
@@ -391,6 +388,13 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
       }
       */
 
+      if (!bridge.where) {
+        if (bridge.generator || bridge.generatorp || bridge.generatorr || bridge.generator ||
+            bridge.semantic || bridge.evaluator || bridge.evaluator2 || bridge.semantics) {
+          throw new Error(`In the KM "${config.name}", for the bridge ${bridge.id} the where property is missing. Use where: where().`)
+        }
+      }
+
       const addUUID = (obj) => { return { ...obj, uuid: uuid || config.uuid } }
 
       if (bridge.generators) {
@@ -469,7 +473,7 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
         }
       }
 
-      const addSemantic = (semantic, evaluate) => {
+      const addSemantic = (semantic, evaluate, property) => {
         const match = semantic.match || (() => true)
         let apply = semantic
         // if I do apply === semantic.apply or semantic there is one function that has apply defined for some reason even though not explicitly set
@@ -490,14 +494,22 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
             applyWrapped: semantic,
           }
         } else {
-          semanticDef = {
-            match: (args) => bridge.id === args.context.marker && !!args.context.evaluate === evaluate && match(args),
-            apply: (args) => apply(args),
-            applyWrapped: semantic,
+          if (property == 'evaluator2') {
+            semanticDef = {
+              match: (args) => bridge.id === args.context.marker && match(args),
+              apply: (args) => apply(args),
+              applyWrapped: semantic,
+            }
+          } else {
+            semanticDef = {
+              match: (args) => bridge.id === args.context.marker && !!args.context.evaluate === evaluate && match(args),
+              apply: (args) => apply(args),
+              applyWrapped: semantic,
+            }
           }
         }
         semanticDef.where = semantic.where || bridge.where || helpers.where(4)
-        semanticDef.property = evaluate ? 'evaluator' : 'semantic'
+        semanticDef.property = property
         if (semantic.priority) {
           semanticDef.priority = semantic.priority
         }
@@ -510,11 +522,15 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
       }
 
       if (bridge.evaluator) {
-        addSemantic(bridge.evaluator, true)
+        addSemantic(bridge.evaluator, true, 'evaluator')
+      }
+
+      if (bridge.evaluator2) {
+        addSemantic(bridge.evaluator2, false, 'evaluator2')
       }
 
       if (bridge.semantic) {
-        addSemantic(bridge.semantic, false)
+        addSemantic(bridge.semantic, false, 'semantic')
       }
 
       if (bridge.evaluators) {
@@ -522,7 +538,7 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
         evaluators.reverse()
         if (evaluators) {
           for (const evaluator of evaluators) {
-            addSemantic(evaluator, true)
+            addSemantic(evaluator, true, 'evaluator')
           }
         }
       }
@@ -557,6 +573,7 @@ const handleCalculatedProps = (baseConfig, moreConfig, { addFirst, uuid } = {})
         'disabled', 
         'enhanced_associations', 
         'evaluator', 
+        'evaluator2', 
         'evaluators', 
         'generatorp', 
         'generatorpr', 
@@ -996,9 +1013,10 @@ class Config {
 
   async fixtures () {
     if (this.testConfig?.fixtures) {
-      const args = {}
+      const args = {
+      }
       args.uuid = this._uuid
-      configHelpers.setupArgs(args, this)
+      configHelpers.setupArgs(args, this, this.logs)
       return this.testConfig.fixtures(args)
     }
   }
@@ -1043,6 +1061,7 @@ class Config {
       addPattern: (...args) => this.addPattern(...args, uuid),
       updateBridge: (...args) => this.updateBridge(...args),
       processContext: (...args) => this.processContext(...args),
+      logs: this.logs,
 
       semantics: () => this.config.semantics,
       getConfigs: () => this.configs,
@@ -1252,7 +1271,7 @@ class Config {
   // value is in response field
   // TODO maybe generalize out query+evaluate along the lines of set value and set reference
   async getEvaluator (s, calls, log, context, args) {
-    const instance = await s({ ...args, ...context, evaluate: true })
+    const instance = await s({ ...args, ...context })
     calls.touch(instance)
     if (instance.evalue == null && !instance.verbatim && !instance.value) {
       this.warningNotEvaluated(log, context)
@@ -1397,6 +1416,7 @@ class Config {
             delete bridge.generatorr
             delete bridge.generatorpr
             delete bridge.evaluator
+            delete bridge.evaluator2
             delete bridge.evaluators
             delete bridge.semantic
             delete bridge.semantics

package/src/configHelpers.js

@@ -100,6 +100,31 @@ class HandlerStack {
     this.handlers.pop()
   }
 
+  /*
+  async wrap(call, w) {
+    const s = w
+    this.push(w)
+    const p = call()
+    if (p) {
+      return p.finally(() => {
+        this.pop()
+      })
+    }
+  }
+  */
+
+  async wrap(call, w) {
+    this.push(w)
+    const p = call()
+    if (p && typeof p.finally === 'function') {
+      return p.finally(() => {
+        this.pop()
+      })
+    }
+    this.pop()
+  return p
+}
+
   toString() {
     let str = ''
     for (let i = this.handlers.length - 1; i >= 0; --i) {
@@ -205,8 +230,6 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   args.theDebugger = {
     breakOnSemantics: (value) => args.breakOnSemantics = value
   }
-  if (!logs) {
-  }
   args.log = (message) => logs.push(message)
 
   args.addWord = (word, def) => config.addWord(word, def, args.uuid)
@@ -221,7 +244,6 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
       return { ...args, assumed: Object.assign({}, assumed, (args.assumed || {}), ...moreAssumed) }
     }
 
-    args.s = (c, options = {}) => config.getSemantics(logs).apply(args, c, options)
     args.g = (c, rest = {}) => {
       // if (JSON.stringify(rest) !== '{}' && !(rest.assumed || rest.options)) {
       //   debugger
@@ -256,11 +278,23 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
       const { assumed = {}, options = {} } = rest
       return config.getGenerators(logs).apply(addAssumed(args, assumed, { paraphrase: false, isResponse: true }), { ...c, paraphrase: false, isResponse: true }, options)
     }
-    args.e = (c) => {
-      if (!c) {
-        return
+    if (true) {
+      args.s = (c, options = {}) => config.getSemantics(logs).apply(args, c, options)
+      args.e = (c) => {
+        if (!c) {
+          return
+        }
+        return config.getEvaluator(args.s, args.calls, logs, c, { isModule: args.isModule, isProcess: args.isProcess })
       }
-      return config.getEvaluator(args.s, args.calls, logs, c, { isModule: args.isModule, isProcess: args.isProcess })
+    } else {
+      args.e = (c) => {
+        if (!c) {
+          return
+        }
+        const s = (c, options = {}) => config.getSemantics(logs).apply(args, c, options)
+        return config.getEvaluator(s, args.calls, logs, c, { isModule: args.isModule, isProcess: args.isProcess })
+      }
+      args.s = args.e
     }
     args.gs = gs(args.g)
     args.gsp = gs(args.gp)
@@ -578,14 +612,14 @@ const loadInstance = async (config, instance) => {
       // used to do a CLONE
       config.addInternal(instance.template.configs[i], { uuid, km: instance.name, addFirst: true, handleCalculatedProps: true })
     } else if (results.apply) {
-      const objects = getObjects(config.get('objects'))(config.uuid)
+      const uuid = config.nameToUUID(instance.name)
+      const objects = getObjects(config.get('objects'))(uuid)
       const args = { objects, getObjects: getObjects(objects) }
       if (instance.configs) {
         args.isInstance = `instance${i}`
         args.instance = instance.configs[i]
       }
 
-      const uuid = config.nameToUUID(instance.name)
       setupArgs(args, config, config.logs, hierarchy, uuid)
       if (config.name == instance.name) {
         args.isModule = !!config.isModule
@@ -609,6 +643,7 @@ const loadInstance = async (config, instance) => {
       args.instance = ''
       args.isProcess = !config.isModule
       args.isModule = !!config.isModule
+      args.logs = config.logs
       if (instance.name == config.testConfig.testModuleName) {
         args.isTesting = true
       }

package/src/generators.js

@@ -125,7 +125,7 @@ class Generator {
       args.g = args.gp
     }
     return await debug.hitScoped(args.callId, async () => {
-      if ((options.debug || {}).apply || process.env.DEBUG_CALLID == args.callId || callId === this.callId) {
+      if ((options.debug || {}).apply || process.env.DEBUG_BREAKAT == args.callId || callId === this.callId) {
         debugger // eslint-disable-line no-debugger
       }
       return await this._apply(args)  // DEBUG: This is the line you want to step into
@@ -197,7 +197,7 @@ class Generators {
           console.error("TPMKMS_TRACE", debug.counter("TPMKMS_TRACE"))
           console.error(generator.toLabel())
           console.error(generator.toString())
-          console.log(`To debug this use debug.breakAt('${args.calls.current()}') or DEBUG_CALLID="${args.calls.current()}"`)
+          console.log(`To debug this use debug.breakAt('${args.calls.current()}') or DEBUG_BREAKAT="${args.calls.current()}"`)
         }
 
         try {
@@ -227,15 +227,15 @@ class Generators {
           lines.newRow()
           lines.setElement(0, 2, generator.toString())
           lines.newRow()
+          lines.setElement(0, 1, 'STACK')
+          lines.setElement(0, 2, stack)
+          lines.newRow()
           lines.setElement(0, 1, 'TO')
           lines.setElement(0, 2, `context_id: ${context.context_id}`)
           lines.setElement(1, 2, JSON.stringify(helpers.sortJson(context, { depth: 10 }), null, 2))
           lines.newRow()
-          lines.setElement(0, 1, 'STACK')
-          lines.setElement(0, 2, stack)
-          lines.newRow()
           lines.setElement(0, 1, 'DEBUG')
-          lines.setElement(0, 2, `To debug this use debug.breakAt('${args.calls.current()}') or DEBUG_CALLID="${args.calls.current()}"`)
+          lines.setElement(0, 2, `To debug this use debug.breakAt('${args.calls.current()}') or DEBUG_BREAKAT="${args.calls.current()}"`)
           lines.newRow()
           lines.setElement(0, 1, 'ERROR')
           lines.setElement(0, 2, errorMessage)

package/src/helpers.js

@@ -480,6 +480,9 @@ const functionsToStrings = (config) => {
       if (bridge.evaluator) {
         bridge.evaluator = bridge.evaluator.toString()
       }
+      if (bridge.evaluator2) {
+        bridge.evaluator2 = bridge.evaluator2.toString()
+      }
       if (bridge.evaluators) {
         bridge.evaluators = bridge.evaluators.toString()
       }

package/src/semantics.js

@@ -78,7 +78,7 @@ class Semantic {
     return await debug.hitScoped(args.callId, async () => {
       const matches = await this.matcher(args)
       if (matches) {
-        if ((options.debug || {}).match || args.callId === this.callId || process.env.DEBUG_CALLID == args.callId) {
+        if ((options.debug || {}).match || args.callId === this.callId || process.env.DEBUG_BREAKAT == args.callId) {
           debugger // eslint-disable-line no-debugger
           await this.matcher(args) // DEBUG: This is the line you step into
         }
@@ -101,7 +101,7 @@ class Semantic {
     this.fixUpArgs(args, contextPrime)
 
     return await debug.hitScoped(args.callId, async () => {
-      if ((options.debug || {}).apply || args.callId === this.callId || process.env.DEBUG_CALLID == args.callId) {
+      if ((options.debug || {}).apply || args.callId === this.callId || process.env.DEBUG_BREAKAT == args.callId) {
         debugger // eslint-disable-line no-debugger  // STEP ABOUT THREE TIMES TO THE DEBUG LINE
       }
       if (args.breakOnSemantics) {
@@ -262,15 +262,15 @@ class Semantics {
           lines.setElement(0, 2, semantic.toString())
           lines.newRow()
           lines.setElement(0, 1, 'DEBUG')
-          lines.setElement(0, 2, `To debug this use debug.breakAt('${args.calls.current()}') in the code or DEBUG_CALLID="${args.calls.current()}"`)
+          lines.setElement(0, 2, `To debug this use debug.breakAt('${args.calls.current()}') in the code or DEBUG_BREAKAT="${args.calls.current()}"`)
+          lines.newRow()
+          lines.setElement(0, 1, 'STACK')
+          lines.setElement(0, 2, stack)
           lines.newRow()
           lines.setElement(0, 1, 'TO')
           lines.setElement(0, 2, `context_id: ${context.context_id}`)
           lines.setElement(1, 2, JSON.stringify(helpers.sortJson(context, { depth: 25 }), null, 2))
           lines.newRow()
-          lines.setElement(0, 1, 'STACK')
-          lines.setElement(0, 2, stack)
-          lines.newRow()
           lines.setElement(0, 1, 'ERROR')
           lines.setElement(0, 2, errorMessage)
           this.logs.push(lines.toString())
@@ -298,15 +298,15 @@ class Semantics {
           lines.setElement(0, 2, semantic.toString())
           lines.newRow()
           lines.setElement(0, 1, 'DEBUG')
-          lines.setElement(0, 2, `To debug this use debug.breakAt('${args.calls.current()}') in the code or DEBUG_CALLID="${args.calls.current()}"`)
+          lines.setElement(0, 2, `To debug this use debug.breakAt('${args.calls.current()}') in the code or DEBUG_BREAKAT="${args.calls.current()}"`)
+          lines.newRow()
+          lines.setElement(0, 1, 'STACK')
+          lines.setElement(0, 2, stack)
           lines.newRow()
           lines.setElement(0, 1, 'TO')
           lines.setElement(0, 2, `context_id: ${context.context_id}`)
           lines.setElement(1, 2, JSON.stringify(helpers.sortJson(context, { depth: 25 }), null, 2))
           lines.newRow()
-          lines.setElement(0, 1, 'STACK')
-          lines.setElement(0, 2, stack)
-          lines.newRow()
           lines.setElement(0, 1, 'RESULT')
           lines.setElement(0, 2, `context_id: ${context.context_id}`)
           lines.setElement(1, 2, JSON.stringify(contextPrime, null, 2))