theprogrammablemind_4wp 9.6.0 → 9.6.1-beta.0

package/client.js

@@ -292,7 +292,9 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
   if (rebuildingTemplate) {
     data.errors_ignore_contextual_priorities_non_existant_ops = true
   }
-  let queries = query.split('\\n')
+
+  // '\\n' from tests of '\n' from users. the former is because newline is not a valid json character so the testfile has it encoded
+  let queries = query.split(/\\n|\n/)
   const summaries = [] // for error
   try {
     const response = {
@@ -796,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
 }
@@ -1184,10 +1188,7 @@ const checkTemplate = (template) => {
   if (!template) {
     return
   }
-  if (template.checks) {
-    throw new Error("The 'checks' property should be in the 'test' property not the 'template' property")
-  }
-  validProps(['fragments', 'configs'], template.template, 'template.template')
+  validProps(['fragments', 'configs'], template, 'template.template')
 }
 
 const checkTest = (testConfig) => {
@@ -1221,9 +1222,11 @@ const knowledgeModuleImpl = async ({
   demo,
   test,
   template,
+  instance, // instance file
   errorHandler = defaultErrorHandler,
   process: processResults = defaultProcess,
   stopAtFirstFailure = true,
+  demoInitializer,
   ...rest
 } = {}) => {
   const unknownArgs = Object.keys(rest)
@@ -1273,13 +1276,13 @@ const knowledgeModuleImpl = async ({
     config.stop_auto_rebuild()
     await config.add(...(includes || []))
     if (api) {
-      config.setApi(api)
+      await config.setApi(api)
     }
     if (multiApiInitializer) {
       await config.setMultiApi(multiApiInitializer)
     }
     if (initializer) {
-      config.initializer(initializer)
+      await config.initializer(initializer)
     }
     await config.restart_auto_rebuild()
     return config
@@ -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
       }
 
@@ -1636,10 +1643,10 @@ const knowledgeModuleImpl = async ({
         let needsRebuild
         if (args.rebuildTemplate && !args.rebuildTemplateFull) {
           // get the startOfChanges for the partial rebuild
-          needsRebuild = config.needsRebuild(template.template, template.instance, { ...options, rebuild: false })
+          needsRebuild = config.needsRebuild(template, instance, { ...options, rebuild: false })
         } else {
           // do a check or full rebuild
-          needsRebuild = config.needsRebuild(template.template, template.instance, options)
+          needsRebuild = config.needsRebuild(template, instance, options)
         }
 
         if (needsRebuild.needsRebuild) {
@@ -1655,7 +1662,7 @@ const knowledgeModuleImpl = async ({
           config.config.rebuild = true
         }
         try {
-          await config.load(rebuildTemplate, template.template, template.instance, { rebuild: needsRebuild.needsRebuild || options.rebuild, previousResultss: needsRebuild.previousResultss, startOfChanges: needsRebuild.startOfChanges })
+          await config.load(rebuildTemplate, template, instance, { rebuild: needsRebuild.needsRebuild || options.rebuild, previousResultss: needsRebuild.previousResultss, startOfChanges: needsRebuild.startOfChanges })
           config.fixtures()
         } catch (e) {
           console.error(`Error loading template for ${config.name}. ${e.error ? e.error : e}${e.stack ? e.stack : ''}`)
@@ -1977,8 +1984,8 @@ const knowledgeModuleImpl = async ({
   } else {
     const initConfig = async (config) => {
       if (template) {
-        if (config.needsRebuild(template.template, template.instance, { isModule: !isProcess }).needsRebuild) {
-          config.needsRebuild(template.template, template.instance, { isModule: !isProcess })
+        if (config.needsRebuild(template, instance, { isModule: !isProcess }).needsRebuild) {
+          config.needsRebuild(template, instance, { isModule: !isProcess })
           const error = `This module "${config.name}" cannot be used because the instance file needs rebuilding. Run on the command line with no arguments or the -rt argument to rebuild.`
           throw new Error(error)
         }
@@ -1993,7 +2000,7 @@ const knowledgeModuleImpl = async ({
       }
       if (template) {
         try {
-          await config.load(rebuildTemplate, template.template, template.instance)
+          await config.load(rebuildTemplate, template, instance)
         } catch (e) {
           errorHandler(e)
         }
@@ -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

@@ -4,6 +4,7 @@
     "@typescript-eslint/eslint-plugin": "^4.28.4",
     "@typescript-eslint/parser": "^4.28.4",
     "argparse": "^2.0.1",
+    "baseline-browser-mapping": "^2.9.19",
     "eslint": "^7.32.0",
     "eslint-config-standard": "^16.0.3",
     "eslint-plugin-import": "^2.23.4",
@@ -72,6 +73,6 @@
     "scriptjs": "^2.5.9",
     "uuid": "^8.3.2"
   },
-  "version": "9.6.0",
+  "version": "9.6.1-beta.0",
   "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', 
@@ -553,7 +577,8 @@ const handleCalculatedProps = (baseConfig, moreConfig, { addFirst, uuid } = {})
         'skipable', 
         'uuid',
         'where', 
-        'words', /Bridge$/, 
+        'words', 
+        /Bridge$/, 
       ]
       helpers.validProps(valid, bridge, 'bridge')
       handleBridgeProps(baseConfig, bridge, { addFirst, uuid })
@@ -1093,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 () {
@@ -1223,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
     }
@@ -2139,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) {
@@ -2162,6 +2179,7 @@ class Config {
       config.priorities = config.priorities || []
     }
 
+    this.demoInitializer = null
     this.contextChecksFromBridges = []
 
     this._enable = []
@@ -2275,7 +2293,7 @@ class Config {
 
   async restart_auto_rebuild () {
     this._stop_auto_rebuild = false
-    await this.rebuild()
+    return await this.rebuild()
   }
 
   getAddedArgs (args) {
@@ -2478,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
@@ -2552,6 +2571,11 @@ class Config {
         cp.config.objects.namespaced[km._uuid] = {}
       })
     }
+
+    if (cp.demoInitializer) {
+      await cp.demoInitializer(cp)
+    }
+
     cp.valid()
     return cp
   }
@@ -2854,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) {
@@ -3076,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()
   }
@@ -3461,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
@@ -151,12 +174,22 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
       //   debugger
       // }
       const { assumed = {}, options = {} } = rest
+      // have it default to paraphrase
+      if (['number', 'string', 'boolean'].includes(typeof c)) {
+        return `${c}`
+      }
+      if (false && !(assumed.isResponse && assumed.response)) {
+        assumed.paraphrase = true
+      }
       return config.getGenerators(logs).apply(addAssumed(args, assumed), c, assumed, options)
     }
     args.gp = (c, rest = {}) => {
       // if (JSON.stringify(rest) !== '{}' && !(rest.assumed || rest.options)) {
       //   debugger
       // }
+      if (['number', 'string', 'boolean'].includes(typeof c)) {
+        return `${c}`
+      }
       const { assumed = {}, options = {} } = rest
       return config.getGenerators(logs).apply(addAssumed(args, assumed, { paraphrase: true, isResponse: false, response: false }), c, { paraphrase: true, isResponse: false, response: false }, options)
     }
@@ -164,6 +197,9 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
       // if (JSON.stringify(rest) !== '{}' && !(rest.assumed || rest.options)) {
       //   debugger
       // }
+      if (['number', 'string', 'boolean'].includes(typeof c)) {
+        return `${c}`
+      }
       const { assumed = {}, options = {} } = rest
       return config.getGenerators(logs).apply(addAssumed(args, assumed, { paraphrase: false, isResponse: true }), { ...c, paraphrase: false, isResponse: true }, options)
     }

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/digraph.js

@@ -80,6 +80,9 @@ class Digraph {
 */
 
   acdcs (s, from, to) {
+    if (!s) {
+      return new Set()
+    }
     const todo = [s]
     const seen = new Set([s])
     const acdcs = new Set([])

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/helpers.js

@@ -1,6 +1,31 @@
 const deepEqual = require('deep-equal')
 const stringify = require('json-stable-stringify')
 
+function watchProperty(obj, propName) {
+  let value = obj[propName];
+
+  Object.defineProperty(obj, propName, {
+    get() {
+      return value;
+    },
+    set(newValue) {
+      console.log(`%c${propName} changed →`, 'color: #e83', newValue);
+      debugger;           // ← Chrome/Firefox will pause here automatically
+      value = newValue;
+    },
+    configurable: true    // allows us to delete/restore later if needed
+  });
+}
+
+function assignAssumed(object, assumed) {
+  for (const key in assumed) {
+    if (object[key] == null) {
+      object[key] = assumed[key]
+    }
+  }
+  return object
+}
+
 function where (goUp = 2) {
   const e = new Error()
   const regexForm1 = /\((.*):(\d+):(\d+)\)$/
@@ -567,4 +592,6 @@ module.exports = {
   suggestAssociationsFixFromSummaries,
   getByPath,
   setByPath,
+  assignAssumed,
+  watchProperty,
 }

package/src/project2.js

@@ -11,7 +11,7 @@ function areFirstNEqual(arr1, arr2, n) {
 }
 
 function project(source, filters, path=[]) {
-  if (['string', 'number'].includes(typeof source)) {
+  if (['boolean', 'string', 'number'].includes(typeof source)) {
     return source
   }
   if (Array.isArray(source)) {
@@ -63,7 +63,9 @@ function project(source, filters, path=[]) {
   properties.forEach(prop => {
     if (prop.path && (prop.path.length === path.length + 1) && areFirstNEqual(path, prop.path, path.length) && source.hasOwnProperty(prop.path[path.length])) {
       const endProp = prop.path[path.length]
-      if (Array.isArray(source[endProp])) {
+      if (['boolean', 'string', 'number'].includes(typeof source[endProp])) {
+        result[endProp] = source[endProp]
+      } else if (Array.isArray(source[endProp])) {
         result[endProp] = []
         for (const key in source[endProp]) {
           result[endProp].push(project(source[endProp][key], filters, [...path, endProp, key]))

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)