theprogrammablemind_4wp 9.6.0-beta.9 → 9.6.1

package/client.js

@@ -798,6 +798,8 @@ const defaultErrorHandler = async (error) => {
   if (typeof runtime.process.exit === 'function' && doErrorExit) {
     runtime.process.exit(-1)
   }
+  
+  error.config = null // otherwise it dumps to much on the console
 
   throw error
 }
@@ -1224,6 +1226,7 @@ const knowledgeModuleImpl = async ({
   errorHandler = defaultErrorHandler,
   process: processResults = defaultProcess,
   stopAtFirstFailure = true,
+  demoInitializer,
   ...rest
 } = {}) => {
   const unknownArgs = Object.keys(rest)
@@ -1308,7 +1311,7 @@ const knowledgeModuleImpl = async ({
       const helpDebugPriority = 'In order to get a debug break when a specific set of priorities is created set set DEBUG_PRIORITY environment variable to the JSON of the priorities that you want to break on. For example DEBUG_PRIORITY=\'[["verb", 0], ["article", 0]]\''
       const helpDebugContextualPriority = 'In order to get a debug break when a specific set of contextual priorities is created set set DEBUG_CONTEXTUAL_PRIORITY environment variable to the JSON of the priorities that you want to break on. For example DEBUG_CONTEXTUAL_PRIORITY=\'{ context: [["verb", 0], ["article", 0], select: 1}\''
       const helpDebugBridge = 'In order to get a debug break when a specific bridge is created set the DEBUG_BRIDGE environment variable to id to break on. For example DEBUG_BRIDGE=\'car\''
-      const helpDebugOperator = 'In order to get a debug break when a specific hierarcy is created set the DEBUG_OPERATOR environment variable to debug any config loaded. For example DEBUG_OPERATOR=\'([operator] ([arg]))\''
+      const helpDebugOperator = 'In order to get a debug break when a specific hierarchy is created set the DEBUG_OPERATOR environment variable to debug any config loaded. For example DEBUG_OPERATOR=\'([operator] ([arg]))\''
 
       parser.add_argument('-tmn', '--testModuleName', { help: 'When running tests instead of using the current modules tests use the specified modules tests' })
       parser.add_argument('-t', '--test', { action: 'store_true', help: 'Run the tests. Create tests by running with the --query + --save flag' })
@@ -1377,6 +1380,10 @@ const knowledgeModuleImpl = async ({
       }
       config = await createConfig(true, configStruct.name)
 
+      if (demoInitializer) {
+        await config.setDemoInitializer(demoInitializer)
+      }
+
       // dont debug the load of the KM's if rebuild template is on since we want to debug the template rebuild not the load
       if (args.rebuildTemplate) {
         global.pauseDebugging = true
@@ -1459,7 +1466,7 @@ const knowledgeModuleImpl = async ({
         let tests = JSON.parse(runtime.fs.readFileSync(testConfig.name))
         tests = tests.filter((test) => test.query !== args.deleteTest)
         writeTestFile(testConfig.name, tests)
-        console.log(`Remove the test for "${args.deleteTest}"`)
+        console.log(`Delete the test for "${args.deleteTest}"`)
         return
       }
 
@@ -2013,6 +2020,9 @@ const knowledgeModuleImpl = async ({
       }
       const config = await createConfig(rootIsProcess, testingModuleName)
       await initConfig(config)
+      if (demoInitializer) {
+        config.setDemoInitializer(demoInitializer)
+      }
       // config.rebuild({ isModule: true })
       createConfig.cached = config
       return createConfig.cached

package/package.json

@@ -73,6 +73,6 @@
     "scriptjs": "^2.5.9",
     "uuid": "^8.3.2"
   },
-  "version": "9.6.0-beta.9",
+  "version": "9.6.1",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -338,6 +338,7 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
 
       // done in setTestConfig
       if (bridge.check) {
+        /*
         if (!config.testConfig) {
           config.testConfig = {}
         }
@@ -347,6 +348,7 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
         if (!config.testConfig?.checks?.context) {
           config.testConfig.checks.context = []
         }
+        */
         config.contextChecksFromBridges.push({
           'bridge.id': bridge.id,
           'bridge.check': bridge.check,
@@ -405,9 +407,15 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
       if (bridge.generatorp) {
         const match = bridge.generatorp.match || (() => true)
         const apply = typeof bridge.generatorp === 'function' ? bridge.generatorp : bridge.generatorp.apply || bridge.generatorp
-        let level = bridge.generatorp.level >= 0 ? bridge.generatorp.level : bridge.level + 1
-        if (!bridge.bridge) {
-          level = 0
+
+        let level
+        if (bridge.generatorp.level >= 0) {
+          level = bridge.generatorp.level
+        } else {
+          level = bridge.level + 1
+          if (!bridge.bridge ) {
+            level = 0
+          }
         }
 
         const generator = {
@@ -427,11 +435,25 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
       if (bridge.generatorr) {
         const match = bridge.generatorr.match || (() => true)
         const apply = typeof bridge.generatorr === 'function' ? bridge.generatorr : bridge.generatorr.apply || bridge.generatorr
-        const level = bridge.generatorr.level >= 0 ? bridge.generatorr.level : bridge.level + 1
+        // const level = bridge.generatorr.level >= 0 ? bridge.generatorr.level : bridge.level + 1
+        let level
+        if (bridge.generatorr.level >= 0) {
+          level = bridge.generatorr.level
+        } else {
+          level = bridge.level + 1
+          if (!bridge.bridge ) {
+            level = 0
+          }
+        }
         const generator = {
           where: bridge.generatorr.where || bridge.where || helpers.where(4),
           // match: async (args) => bridge.id === args.context.marker && args.context.level === level && !args.context.paraphrase && (args.context.response || args.context.isResponse) && await match(args),
-          match: async (args) => args.isA(args.context.marker, bridge.id) && args.context.level === level && !args.context.paraphrase && (args.context.response || args.context.isResponse) && await match(args),
+          match: async (args) => {
+            if (bridge.callId == args.callId) {
+              debugger
+            }
+            return args.isA(args.context.marker, bridge.id) && args.context.level === level && !args.context.paraphrase && (args.context.response != null || args.context.isResponse) && await match(args)
+          },
           apply: (args) => apply(args),
           applyWrapped: apply,
           property: 'generatorr'
@@ -523,6 +545,7 @@ const handleCalculatedProps = (baseConfig, moreConfig, { addFirst, uuid } = {})
         'associations', 
         'before', 
         'bridge', 
+        'callId', 
         'check', 
         'children', 
         'conditional', 
@@ -536,6 +559,7 @@ const handleCalculatedProps = (baseConfig, moreConfig, { addFirst, uuid } = {})
         'generatorr', 
         'generators', 
         'id', 
+        'init', 
         'inverted', 
         'isA', 
         'level', 
@@ -1094,19 +1118,6 @@ class Config {
       this.testConfig.checks.context = []
     }
     this.testConfig.checks.context = this.contextChecksFromBridges.concat(this.testConfig.checks.context)
-    /*
-    const currentTestConfig = testConfig // add bridge has added check.context's
-
-    if (!this.testConfig.checks) {
-      debugger
-      // this.testConfig.checks = 
-    }
-
-    // set during bridge setup
-    if (currentTestConfig.checks?.context) {
-      this.testConfig.checks.context = currentTestConfig.checks.context.concat(this.testConfig.checks.context)
-    }
-    */
   }
 
   getTestConfig () {
@@ -1224,10 +1235,10 @@ class Config {
   async getEvaluator (s, calls, log, context, args) {
     const instance = await s({ ...args, ...context, evaluate: true })
     calls.touch(instance)
-    if (!instance.evalue && !instance.verbatim && !instance.value) {
+    if (instance.evalue == null && !instance.verbatim && !instance.value) {
       this.warningNotEvaluated(log, context)
     }
-    if (!instance.evalue) {
+    if (instance.evalue == null) {
       instance.evalue = instance.value
       instance.edefault = true
     }
@@ -2140,6 +2151,11 @@ class Config {
     }
   }
 
+  async setDemoInitializer(demoInitializer) {
+    this.demoInitializer = demoInitializer
+    // await this.demoInitializer(this)
+  }
+
   // configs = [ { config, namespace } ... ]
   constructor (config, module, clientProcess, apiKMs, rootIsProcess, testingModuleName) {
     if (config instanceof Config) {
@@ -2163,6 +2179,7 @@ class Config {
       config.priorities = config.priorities || []
     }
 
+    this.demoInitializer = null
     this.contextChecksFromBridges = []
 
     this._enable = []
@@ -2276,7 +2293,7 @@ class Config {
 
   async restart_auto_rebuild () {
     this._stop_auto_rebuild = false
-    await this.rebuild()
+    return await this.rebuild()
   }
 
   getAddedArgs (args) {
@@ -2479,6 +2496,7 @@ class Config {
     this.valid()
     const cp = new Config()
     cp.logs = []
+    cp.demoInitializer = this.demoInitializer
     cp.maxDepth = this.maxDepth
     cp.debugLoops = this.debugLoops
     cp.transitoryMode = this.transitoryMode
@@ -2553,6 +2571,11 @@ class Config {
         cp.config.objects.namespaced[km._uuid] = {}
       })
     }
+
+    if (cp.demoInitializer) {
+      await cp.demoInitializer(cp)
+    }
+
     cp.valid()
     return cp
   }
@@ -2855,7 +2878,11 @@ class Config {
     let defaults = () => []
     if (this.loadOrdering) {
       for (const name of this.loadOrdering) {
-        const checks = this.kms[name].testConfig?.checks?.context || []
+        const config = this.kms[name]
+        let checks = config.testConfig?.checks?.context || []
+        if (config.contextChecksFromBridges) {
+          checks = config.contextChecksFromBridges.concat(checks)
+        }
         const oldDefaults = defaults
         for (const check of checks) {
           if (!check.match) {
@@ -3077,6 +3104,15 @@ class Config {
       this.removeDevelopmentElements(this.config)
     }
 
+    if (this.testConfig?.testModuleName) {
+      const km = this.km(this.testConfig.testModuleName)
+      if (km.demoInitializer) {
+        await km.demoInitializer(km)
+      }
+    } else if (this.demoInitializer) {
+      await this.demoInitializer(this)
+    }
+
     this.valid()
     this.checks()
   }
@@ -3462,7 +3498,8 @@ class Config {
   }
 
   // TODO get rid of useOldVersion arg
-  addInternal (more, { uuid, km, addFirst = false, useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false, handleCalculatedProps: hcps = false } = {}) {
+  addInternal (more, 
+               { uuid, km, addFirst = false, useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false, handleCalculatedProps: hcps = false } = {}) {
     validConfigProps(more)
     if (more instanceof Config) {
       more.initialize({ force: false })

package/src/configHelpers.js

@@ -86,6 +86,28 @@ const cleanAssign = (dest, ...srcs) => {
   Object.assign(dest, ...srcs)
 }
 
+class ContextHierarchy {
+  constructor(contexts = []) {
+    this.contexts = [...contexts]
+  }
+
+  push(context) {
+    this.contexts.push(context)
+  }
+
+  pop() {
+    this.contexts.pop()
+  }
+
+  under(marker) {
+    for (let i = this.contexts.length - 1; i >= 0; --i) {
+      if (this.contexts[i].marker == marker) {
+        return true
+      }
+    }
+  }
+}
+
 const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   if (!args.objects) {
     args.objects = config.get('objects')
@@ -105,6 +127,7 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   if (global.theprogrammablemind && global.theprogrammablemind.loadForTesting) {
     args.calls = new InitCalls(Object.keys(global.theprogrammablemind.loadForTesting)[0])
   }
+  args.contextHierarchy = new ContextHierarchy()
   args.cleanAssign = cleanAssign
   args.km = (name) => config.getConfig(name)
   args.api = (name) => config.getConfig(name).api

package/src/debug.js

@@ -51,6 +51,7 @@ const counter = (name, { breakAt = [], debugBreak = true, tag = '' } = {}) => {
     hit(name)
     return true
   }
+  return counters[name]
 }
 
 const get = (name) => {

package/src/fragments.js

@@ -1,6 +1,18 @@
 const _ = require('lodash')
 const helpers = require('./helpers')
 
+function pathEquals (p1, p2) {
+  if (p1.length !== p2.length) {
+    return false
+  }
+  for (let i = 0; i < p1.length; ++i) {
+    if (p1[i] !== p2[i]) {
+      return false
+    }
+  }
+  return true
+}
+
 function fragmentInstantiator (args, contexts) {
   return new Object({ 
     contexts: () => {
@@ -10,6 +22,7 @@ function fragmentInstantiator (args, contexts) {
       const instantiated = _.cloneDeep(contexts)
       const todo = [{ context: instantiated, path: [] }]
       args = { ...args }
+      args.pathEquals = pathEquals
       while (todo.length > 0) {
         const { context, path } = todo.pop()
         args.context = context

package/src/semantics.js

@@ -156,11 +156,21 @@ class Semantics {
   }
 
   async applyToContext (args, context, options) {
+    args.contextHierarchy.push(context)
+    try {
+      return await this.applyToContextHelper(args, context, options)
+    } finally {
+      args.contextHierarchy.pop()
+    }
+  }
+
+  async applyToContextHelper (args, context, options) {
     // let context_prime = {}
     if (!(context instanceof Array || context instanceof Object)) {
       return context
     }
     args = { ...args }
+
     const config = args.config
     const debug = config.getDebug()
     let contextPrime = Object.assign({}, context)