theprogrammablemind_4wp 9.5.0-beta.0 → 9.5.1-beta.0

package/client.js

@@ -933,12 +933,15 @@ const defaultInnerProcess = (config, errorHandler, responses) => {
   }
 }
 
-const defaultProcess = ({ config, errorHandler }) => async (promise) => {
+const defaultProcess = ({ config, errorHandler, print }) => async (promise) => {
   try {
     const responses = await promise
     defaultInnerProcess(config, errorHandler, responses)
   } catch (error) {
     error.config = config
+    if (print) {
+      print()
+    }
     defaultErrorHandler(error)
   }
 }
@@ -963,7 +966,10 @@ const rebuildTemplate = async ({ config, instance, target, previousResultss, reb
     }
   }
   const fragmentToTodo = (query, index) => {
-    const pr = instance.fragments[index]
+    let pr = []
+    if (instance.fragments) {
+      pr = instance.fragments[index]
+    }
     return Object.assign({}, toProperties(query), { property: 'fragments', previousResults: pr, skipSemantics: false })
   }
 
@@ -973,7 +979,7 @@ const rebuildTemplate = async ({ config, instance, target, previousResultss, reb
       return
     }
     const { property, hierarchy, query: queryOrExtraConfig, previousResults, initializer, skipSemantics } = configs.shift()
-    // queries are strings or { query: "blah", development: true/false }
+    // queries are strings or { query: "blah", scope: "development" | "testing" }
     if (typeof queryOrExtraConfig === 'string' || queryOrExtraConfig.query || queryOrExtraConfig.isFragment) {
       let query = queryOrExtraConfig
       const isFragment = queryOrExtraConfig.isFragment
@@ -1253,8 +1259,8 @@ const knowledgeModuleImpl = async ({
     config.setTestConfig(testConfig)
   }
 
-  const createConfig = async () => {
-    const config = new Config(configStruct, moduleFromJSFile, _process, apiKMs)
+  const createConfig = async (rootIsProcess, testingModuleName) => {
+    const config = new Config(configStruct, moduleFromJSFile, _process, apiKMs, rootIsProcess, testingModuleName)
     if (sendObjectsToServer) {
       config.setSendObjectsToServer()
     }
@@ -1347,16 +1353,13 @@ const knowledgeModuleImpl = async ({
       if (args.rebuildTemplateFull) {
         args.rebuildTemplate = true
       }
-      config = await createConfig()
+      config = await createConfig(true, configStruct.name)
 
       // 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
       }
 
-      // setupConfig(config)
-      processResults = processResults({ config, errorHandler })
-
       if (args.rebuildTemplate) {
         global.pauseDebugging = false
       }
@@ -1549,14 +1552,18 @@ const knowledgeModuleImpl = async ({
               }
             }
           }
+
           if (hasArg('d')) {
+            console.log('objects (data) ================')
             console.log(JSON.stringify(config.config.objects, null, 2))
           }
+
           if (hasArg('p')) {
             for (const priority of config.config.priorities) {
               console.log(JSON.stringify(priority))
             }
           }
+
           if (hasArg('g')) {
             const easyToRead = _.cloneDeep(config.config.generators)
             for (const semantic of easyToRead) {
@@ -1568,6 +1575,7 @@ const knowledgeModuleImpl = async ({
             }
             console.dir(easyToRead)
           }
+
           if (hasArg('s')) {
             const easyToRead = _.cloneDeep(config.config.semantics)
             for (const semantic of easyToRead) {
@@ -1579,6 +1587,10 @@ const knowledgeModuleImpl = async ({
         }
       }
 
+      // setupConfig(config)
+      processResults = processResults({ config, errorHandler, print: printConfig })
+
+
       checkTemplate(template)
 
       if (template) {
@@ -1912,6 +1924,7 @@ const knowledgeModuleImpl = async ({
         try {
           await processResults(_process(config, args.query, { commandLineArgs: args, isProcess, isModule: !isProcess, dontAddAssociations: args.dontAddAssociations, writeTests: args.save || args.saveDeveloper, saveDeveloper: args.saveDeveloper, testConfig, testsFN: test }))
         } catch (error) {
+          printConfig()
           console.log('Error', error)
         }
       }
@@ -1949,33 +1962,17 @@ const knowledgeModuleImpl = async ({
 
       // remove test only stuff
       if (!isProcess && !loadForTesting) {
-        config.removeDevelopmentElements(config.config)
-        /*
-        config.config.operators = config.config.operators.filter((operator) => {
-          if (operator.development) {
-            return false
-          } else {
-            return true
-          }
-        })
-        config.config.bridges = config.config.bridges.filter((bridge) => {
-          if (bridge.development) {
-            return false
-          } else {
-            return true
-          }
-        })
-        */
+        config.removeDevelopmentElements(config.config, config.scope)
       }
     }
 
     // no cache 21 minutes + rebuild fails "node tester_rebuild -m colors"
     // cache okay
-    const createConfigExport = async (useCache = true) => {
+    const createConfigExport = async ({ useCache=true, rootIsProcess, testingModuleName } = {}) => {
       if (useCache && createConfig.cached) {
         return createConfig.cached
       }
-      const config = await createConfig()
+      const config = await createConfig(rootIsProcess, testingModuleName)
       await initConfig(config)
       // config.rebuild({ isModule: true })
       createConfig.cached = config

package/package.json

@@ -71,6 +71,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "9.5.0-beta.0",
+  "version": "9.5.1-beta.0",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -20,6 +20,8 @@ const bags = [
   'semantics'
 ]
 
+global.GORDO = true
+
 const indent = (string, indent) => {
   return string.replace(/^/gm, ' '.repeat(indent))
 }
@@ -287,9 +289,11 @@ const priority_valid = (cp) => {
 const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
   ecatch(`While processing the bridge for ${bridge.id}#${bridge.level}`,
     () => {
+      /*
       if (bridge.development && config.isModule) {
         return
       }
+      */
       if (false && !bridge.bridge) {
         bridge.bridge = '{ ...next(operator) }'
       }
@@ -439,13 +443,32 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
         if (semantic.apply && typeof semantic !== 'function') {
           apply = semantic.apply
         }
-        const semanticDef = {
-          where: semantic.where || bridge.where || helpers.where(4),
-          match: (args) => bridge.id === args.context.marker && !!args.context.evaluate === evaluate && match(args),
-          apply: (args) => apply(args),
-          applyWrapped: semantic,
-          property: evaluate ? 'evaluator' : 'semantic'
+        let semanticDef
+        if (semantic.raw) {
+          if (!semantic.match) {
+            throw new Error(`In the KM "${config.name}", for the bridge ${bridge.id} the semantic is missing the "match" property.`)
+          }
+          if (!semantic.apply) {
+            throw new Error(`In the KM "${config.name}", for the bridge ${bridge.id} the semantic is missing the "apply" property.`)
+          }
+          semanticDef = {
+            match: semantic.match,
+            apply: semantic.apply,
+            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'
+        if (semantic.priority) {
+          semanticDef.priority = semantic.priority
+        }
+
         if (addFirst) {
           config.config.semantics.unshift(addUUID(semanticDef))
         } else {
@@ -488,7 +511,7 @@ const handleCalculatedProps = (baseConfig, moreConfig, { addFirst, uuid } = {})
   if (moreConfig.bridges) {
     moreConfig.bridges = moreConfig.bridges.map((bridge) => {
       bridge = { ...bridge }
-      const valid = ['after', 'conditional', 'associations', 'before', 'bridge', 'check', 'disabled', 'development', 'skipable', 'return_type_selector', 'evaluator', 'evaluators', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'operator', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
+      const valid = ['after', 'conditional', 'associations', 'before', 'bridge', 'check', 'disabled', 'scope', 'skipable', 'return_type_selector', 'evaluator', 'evaluators', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'operator', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
         'level', 'optional', 'selector', 'separators', 'semantic', 'semantics', 'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where', 'uuid']
       helpers.validProps(valid, bridge, 'bridge')
       handleBridgeProps(baseConfig, bridge, { addFirst, uuid })
@@ -1867,20 +1890,39 @@ class Config {
     return kms
   }
 
+  // scope == 'testing' -> remove none
+  // scope == 'development' -> remove testing
+  // !scope -> remove 'testing' and 'development'
   removeDevelopmentElements (config) {
     if (!config) {
       return
     }
-    config.operators = config.operators.filter((element) => !element.development)
-    config.bridges = config.bridges.filter((element) => !element.development)
-    config.generators = config.generators.filter((element) => !element.development)
-    config.semantics = config.semantics.filter((element) => !element.development)
-    config.hierarchy = (config.hierarchy).filter((element) => !element.development)
+
+    const keep = (element) => {
+      const old_result = element.scope !== 'testing'
+      let new_result = false
+      if (!this.scope) {
+        new_result = !(element.scope === 'testing' || element.scope == 'development')
+      } else if (this.scope == 'development') {
+        new_result = !(element.scope === 'testing')
+      }
+      if (global.GORDO && old_result !== new_result) {
+        global.GORDO = false
+        debugger // greg23old
+      }
+      return old_result
+    }
+
+    config.operators = config.operators.filter((element) => keep(element))
+    config.bridges = config.bridges.filter((element) => keep(element))
+    config.generators = config.generators.filter((element) => keep(element))
+    config.semantics = config.semantics.filter((element) => keep(element))
+    config.hierarchy = (config.hierarchy).filter((element) => keep(element))
 
     const literals = config.words.literals
     for (const word in literals) {
       const defs = literals[word] || []
-      literals[word] = defs.filter((def) => !def.development)
+      literals[word] = defs.filter((def) => keep(def))
       if (literals[word].length === 0) {
         delete literals[word]
       }
@@ -1890,7 +1932,7 @@ class Config {
     const patternsPrime = []
     for (const pattern of patterns) {
       let defs = pattern.defs || []
-      defs = defs.filter((def) => !def.development)
+      defs = defs.filter((def) => keep(def))
       if (defs.length !== 0) {
         patternsPrime.push({ ...pattern, defs })
       }
@@ -1900,7 +1942,7 @@ class Config {
     const hierarchy = config.words.hierarchy || []
     const hierarchyPrime = []
     for (const pair of hierarchy) {
-      if (!pair.development) {
+      if (keep(pair)) {
         hierarchyPrime.push(pair)
       }
     }
@@ -1925,7 +1967,7 @@ class Config {
   }
 
   // configs = [ { config, namespace } ... ]
-  constructor (config, module, clientProcess, apiKMs) {
+  constructor (config, module, clientProcess, apiKMs, rootIsProcess, testingModuleName) {
     if (config instanceof Config) {
       throw new Error('Excepted the config argument to be a hash not a Config object')
     }
@@ -1965,9 +2007,26 @@ class Config {
         this.loadedForTesting = true
       }
     }
+    if (config) {
+      this.name = config.name
+    }
     this.isModule = !isProcess
+    this.scope = null
+    this.rootIsProcess = rootIsProcess
+    this.testingModuleName = testingModuleName
     if (this.isModule) {
+      if (rootIsProcess) {
+        if (testingModuleName == this.name) {
+          this.scope = 'testing'
+        } else {
+          this.scope = 'development'
+        }
+      }
       this.removeDevelopmentElements(config)
+    } else {
+      if (testingModuleName == this.name) {
+        this.scope = 'testing'
+      }
     }
     this.initInstances = []
     this.instances = []
@@ -1998,9 +2057,6 @@ class Config {
       }
     }
     this.terminatorFn = () => {}
-    if (config) {
-      this.name = config.name
-    }
     this.loadOrder = new DigraphInternal()
     this.wasInitialized = false
     this.configs = []
@@ -2290,6 +2346,10 @@ class Config {
     cp.hierarchy = new DigraphInternal(this.config.hierarchy)
     cp.sendObjectsToServer = this.sendObjectsToServer
 
+    cp.scope = this.scope
+    cp.rootIsProcess = this.rootIsProcess
+    cp.testingModuleName = this.testingModuleName
+
     cp.initConfig = _.cloneDeep(this.initConfig)
     cp.defaultConfig()
     // cp.wasInitialized = false;  // since default config GREG
@@ -3144,7 +3204,7 @@ class Config {
 
     const mores = []
     for (const createConfig of createConfigs) {
-      const more = await createConfig()
+      const more = await createConfig({ rootIsProcess: this.rootIsProcess, testingModuleName: this.testingModuleName })
       if (this.name && this.name === more.name) {
         throw new Error('Cannot add an object to itself for argument number ${index+1}.')
       }

package/src/helpers.js

@@ -462,5 +462,5 @@ module.exports = {
   where,
   w,
   suggestAssociationsFix,
-  suggestAssociationsFixFromSummaries
+  suggestAssociationsFixFromSummaries,
 }

package/src/semantics.js

@@ -226,6 +226,9 @@ class Semantics {
           lines.newRow()
           lines.setElement(0, 2, semantic.toString())
           lines.newRow()
+          lines.setElement(0, 1, 'DEBUG')
+          lines.setElement(0, 2, `To debug this use args.callId === '${args.calls.current()}'`)
+          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))
@@ -233,9 +236,6 @@ class Semantics {
           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 args.callId === '${args.calls.current()}'`)
-          lines.newRow()
           lines.setElement(0, 1, 'ERROR')
           lines.setElement(0, 2, errorMessage)
           this.logs.push(lines.toString())
@@ -248,7 +248,7 @@ class Semantics {
         args.calls.touch(contextPrime)
         // this.logs.push(`Semantics: applied ${semantic.toString()}\n to\n ${JSON.stringify(context)}\n the result was ${JSON.stringify(contextPrime)}\n`)
         if (((config || {}).config || {}).debug) {
-          const widths = [10, 10, 90]
+          const widths = [10, 10, 132]
           const lines = new Lines(widths)
           lines.setElement(0, 0, 'Semantic')
           if (semantic.index > -1 && semantic.km) {
@@ -261,6 +261,9 @@ class Semantics {
           lines.newRow()
           lines.setElement(0, 2, semantic.toString())
           lines.newRow()
+          lines.setElement(0, 1, 'DEBUG')
+          lines.setElement(0, 2, `To debug this use args.callId === '${args.calls.current()}'`)
+          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))
@@ -268,9 +271,6 @@ class Semantics {
           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 args.callId === '${args.calls.current()}'`)
-          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))