theprogrammablemind 7.5.8-beta.30 → 7.5.8-beta.32

package/client.js

@@ -577,7 +577,7 @@ const setupProcessB = ({ config, initializer, allowDelta=false } = {}) => {
 }
 
 // instance template
-const processInstance = (config, instance) => {
+const loadInstance = (config, instance) => {
   const transitoryMode = global.transitoryMode
   global.transitoryMode = false
   const { /* data, generators, semantics, */ hierarchy } = setupProcessB({ config })
@@ -587,7 +587,7 @@ const processInstance = (config, instance) => {
     if (results.extraConfig) {
       // config.addInternal(results, useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false)
       // config.addInternal(config.template.queries[i], { handleCalculatedProps: true } )
-      config.addInternal(instance.template.queries[i], { handleCalculatedProps: true } )
+      config.addInternal(instance.template.queries[i], { addFirst: true, handleCalculatedProps: true } )
     } else {
       processContextsB({ config, hierarchy, json: results/*, generators, semantics */, commandLineArgs: {}, isInstance: `instance${i}` })
     }
@@ -1258,6 +1258,7 @@ entodicton.knowledgeModule( {
 `
 */
 
+// loadTemplate BuiltTemplate
 const rebuildTemplate = async ({ config, target, template, errorHandler = defaultErrorHandler }) => {
   const accumulators = {
     resultss: [],
@@ -2000,7 +2001,7 @@ module.exports = {
   Digraph,
   analyzeMetaData,
   processContextsB,
-  processInstance,
+  loadInstance,
   gs,
   flattens,
   writeTest

package/package.json

@@ -63,6 +63,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.8-beta.30",
+  "version": "7.5.8-beta.32",
   "license": "ISC"
 }

package/src/config.js

@@ -42,6 +42,7 @@ const validConfigProps = (config) => {
     'associations', 
     'name', 
     'version', 
+    'generatorp', 
     'generators', 
     'semantics', 
     'where', 
@@ -158,7 +159,7 @@ const contextual_priority_valid = (cp) => {
   )
 }
 
-const handleBridgeProps = (config, bridge) => {
+const handleBridgeProps = (config, bridge, addFirst) => {
   ecatch(`While processing the bridge for ${bridge.id}#${bridge.level}`,
     () => {
       if (!bridge.bridge) {
@@ -209,14 +210,24 @@ const handleBridgeProps = (config, bridge) => {
           }
         }
       }
+      /*
       if (bridge.generator) {
-        config.config.generators.unshift(bridge.generator)
+        if (addFirst) {
+          config.config.generators.unshift(bridge.generator)
+        } else {
+          config.config.generators.push(bridge.generator)
+        }
       }
+      */
       if (bridge.generators) {
         const generators = [...bridge.generators]
         generators.reverse()
         for (let generator of generators) {
-          config.config.generators.unshift(generator)
+          if (addFirst) {
+            config.config.generators.unshift(generator)
+          } else {
+            config.config.generators.push(generator)
+          }
         }
       }
       if (bridge.generatorpr) {
@@ -227,66 +238,76 @@ const handleBridgeProps = (config, bridge) => {
         const match = bridge.generatorp.match || (() => true)
         const apply = typeof bridge.generatorp == 'function' ? bridge.generatorp : bridge.generatorp.apply || bridge.generatorp
         const level = bridge.generatorp.level >= 0 ? bridge.generatorp.level : bridge.level + 1
-        config.config.generators.unshift({ 
+       
+        const generator = {
           where: bridge.generatorp.where || bridge.where || client.where(4),
           match: (args) => bridge.id == args.context.marker && args.context.level == level && args.context.paraphrase && match(args),
           apply: (args) => apply(args),
           applyWrapped: apply,
           property: 'generatorp',
-        })
+        }
+        if (addFirst) {
+          config.config.generators.unshift(generator)
+        } else {
+          config.config.generators.push(generator)
+        }
+
       }
       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
-        config.config.generators.unshift({ 
+        const generator = {
           where: bridge.generatorr.where || bridge.where || client.where(4),
           match: (args) => bridge.id == args.context.marker && args.context.level == level && !args.context.paraphrase && (args.context.response || args.context.isResponse) && match(args),
           apply: (args) => apply(args),
           applyWrapped: apply,
           property: 'generatorr',
-        })
-      }
-      /*
-      if (bridge.generatorr) {
-        config.config.generators.unshift({ 
-          // TODO merge response and isResponse
-          where: bridge.generatorr.where || bridge.where || client.where(3),
-          match: ({context}) => bridge.id == context.marker && !context.paraphrase && (context.response || context.isResponse),
-          apply: (args) => bridge.generatorr(args),
-          applyWrapped: bridge.generatorr,
-          property: 'generatorr',
-        })
+        }
+        if (addFirst) {
+          config.config.generators.unshift(generator)
+        } else {
+          config.config.generators.push(generator)
+        }
       }
-      */
       if (bridge.evaluator) {
-        config.config.semantics.unshift({ 
+        const semantic = {
           where: bridge.evaluator.where || bridge.where || client.where(3),
           match: ({context}) => bridge.id == context.marker && context.evaluate,
           apply: (args) => bridge.evaluator(args),
           applyWrapped: bridge.evaluator,
           property: 'evaluator',
-        })
+        }
+        if (addFirst) {
+          config.config.semantics.unshift(semantic)
+        } else {
+          config.config.semantics.push(semantic)
+        }
       }
       if (bridge.semantic) {
-        config.config.semantics.unshift({ 
+        const semantic = {
           where: bridge.semantic.where || bridge.where || client.where(3),
           match: ({context}) => bridge.id == context.marker,
           apply: (args) => bridge.semantic(args),
           applyWrapped: bridge.semantic,
           property: 'semantic',
-        })
+        }
+        if (addFirst) {
+          config.config.semantics.unshift(semantic)
+        } else {
+          config.config.semantics.push(semantic)
+        }
       }
     }
   )
 }
 
-const handleCalculatedProps = (baseConfig, moreConfig) => {
-  for (let bridge of moreConfig.bridges) {
+const handleCalculatedProps = (baseConfig, moreConfig, addFirst) => {
+  for (let bridge of (moreConfig.bridges || [])) {
     const valid = [ 'after', 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
                     'level', 'optional', 'selector', 'semantic',  'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where', 'uuid' ]
     helpers.validProps(valid, bridge, 'bridge')
-    handleBridgeProps(baseConfig, bridge)
+    handleBridgeProps(baseConfig, bridge, addFirst)
   }
   if (moreConfig.operators) {
     moreConfig.operators = moreConfig.operators.map((operator) => {
@@ -933,6 +954,7 @@ class Config {
     config_toServer(data)
   }
 
+  // loadTemplate
   load (template, instance, options = { rebuild: false } ) {
     this.validifyTemplate(template)
     instance.template = template
@@ -962,7 +984,7 @@ class Config {
         instance.name = this.name
         this.initInstances.push(instance)
         this.instances.push(instance)
-        client.processInstance(this, instance)
+        client.loadInstance(this, instance)
       }
     }
   }
@@ -1882,7 +1904,7 @@ class Config {
         this.initializerFn(setupInitializerFNArgs(this, { testConfig: this, currentConfig: this, objects, namespace, uuid }))
       }
     })
-    this.instances.forEach((instance) => client.processInstance(this, instance))
+    this.instances.forEach((instance) => client.loadInstance(this, instance))
   }
 
   initialize ({ force = true } = {}) {
@@ -2213,7 +2235,7 @@ class Config {
       for (let init of initAfterApis) {
         init.config.initializerFn({ ...init.args, kms: this.getConfigs(), isAfterApi: true })
       }
-      this.instances.forEach((instance) => client.processInstance(this, instance))
+      this.instances.forEach((instance) => client.loadInstance(this, instance))
     } else {
       const base = {
         operators: this.config.operators,
@@ -2253,7 +2275,7 @@ class Config {
         }
         const instance = this.instances.find((instance) => instance.name == name)
         if (instance) {
-          client.processInstance(this, instance)
+          client.loadInstance(this, instance)
         }
         this.hierarchy.edges = this.config.hierarchy
       }
@@ -2654,7 +2676,7 @@ class Config {
   }
 
   // TODO get rid of useOldVersion arg
-  addInternal (more, { useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false, handleCalculatedProps : hcps = false } = {}) {
+  addInternal (more, { addFirst = false, useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false, handleCalculatedProps : hcps = false } = {}) {
     validConfigProps(more)
     if (more instanceof Config) {
       more.initialize({ force: false })
@@ -2666,7 +2688,7 @@ class Config {
       }
     }
     if (hcps) {
-      handleCalculatedProps(this, more)
+      handleCalculatedProps(this, more, addFirst)
       applyUUID(more, this._uuid)
     }
     for (const key of Object.keys(more)) {
@@ -2691,7 +2713,11 @@ class Config {
           if (!configWords[word]) {
             configWords[word] = []
           }
-          configWords[word] = configWords[word].concat(moreWords[word])
+          if (addFirst) {
+            configWords[word] = moreWords[word].concat(configWords[word])
+          } else {
+            configWords[word] = configWords[word].concat(moreWords[word])
+          }
         }
       } else if (key === 'name') {
         /*
@@ -2759,7 +2785,11 @@ class Config {
         }
         // console.log('key', key, 'XXX')
         // console.log('more', JSON.stringify(more, null, 2))
-        this.config[key] = this.config[key].concat(more[key])
+        if (addFirst) {
+          this.config[key] = more[key].concat(this.config[key])
+        } else {
+          this.config[key] = this.config[key].concat(more[key])
+        }
       } else {
         if (!(key in this.config)) {
           throw new Error(`Unexpected property in config ${key}`)
@@ -2893,4 +2923,5 @@ module.exports = {
   Config,
   config_toServer,
   operatorKey_valid,
+  handleBridgeProps,
 }