theprogrammablemind 7.5.4-beta.6 → 7.5.4-beta.8

package/client.js

@@ -515,10 +515,13 @@ const processInstance = (config, instance) => {
   const transitoryMode = global.transitoryMode
   global.transitoryMode = false
   const { /* data, generators, semantics, */ hierarchy } = setupProcessB({ config })
-  for (const results of (instance.resultss || [])) {
+  // for (const results of (instance.resultss || [])) {
+  for (const i in (instance.resultss || [])) {
+    const results = instance.resultss[i]
     if (results.extraConfig) {
       // config.addInternal(results, useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false)
-      config.addInternal(results, { handleCalculatedProps: true } )
+      // config.addInternal(config.template.queries[i], { handleCalculatedProps: true } )
+      config.addInternal(instance.template.queries[i], { handleCalculatedProps: true } )
     } else {
       processContextsB({ config, hierarchy, json: results/*, generators, semantics */ })
     }
@@ -1662,7 +1665,14 @@ function where(goUp = 2) {
   const e = new Error();
   const regexForm1 = /\((.*):(\d+):(\d+)\)$/
   const regexForm2 = /at (.*):(\d+):(\d+)$/
-  const line = e.stack.split("\n")[goUp];
+  const lines = e.stack.split("\n")
+  let line
+  for (line of lines.slice(1)) {
+    if (!(line.includes("config.js:") || line.includes("client.js:"))) {
+      break;
+    }
+  }
+  // const line = e.stack.split("\n")[goUp];
   const match = regexForm1.exec(line) || regexForm2.exec(line);
   if (match) {
     return `${match[1]}:${match[2]}`

package/package.json

@@ -62,6 +62,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.4-beta.6",
+  "version": "7.5.4-beta.8",
   "license": "ISC"
 }

package/src/config.js

@@ -74,31 +74,39 @@ const handleBridgeProps = (config, bridge) => {
   }
   if (bridge.generatorp) {
     config.config.generators.unshift({ 
-      where: bridge.generatorp.where || client.where(3),
+      where: bridge.generatorp.where || bridge.where || client.where(4),
       match: ({context}) => bridge.id == context.marker && context.paraphrase,
       apply: (args) => bridge.generatorp(args),
+      applyWrapped: bridge.generatorp,
+      property: 'generatorp',
     })
   }
   if (bridge.generatorr) {
     config.config.generators.unshift({ 
       // TODO merge response and isResponse
-      where: bridge.generatorr.where || client.where(3),
+      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 (bridge.evaluator) {
     config.config.semantics.unshift({ 
-      where: bridge.evaluator.where || client.where(3),
+      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 (bridge.semantic) {
     config.config.semantics.unshift({ 
-      where: bridge.semantic.where || client.where(3),
+      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',
     })
   }
 }
@@ -106,7 +114,7 @@ const handleBridgeProps = (config, bridge) => {
 const handleCalculatedProps = (baseConfig, moreConfig) => {
   for (let bridge of moreConfig.bridges) {
     const valid = [ 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generators', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
-                    'level', 'optional', 'selector', 'semantic',  'words', /Bridge$/, 'localHierarchy' ]
+                    'level', 'optional', 'selector', 'semantic',  'words', /Bridge$/, 'localHierarchy', 'where' ]
     helpers.validProps(valid, bridge, 'bridge')
     handleBridgeProps(baseConfig, bridge)
   }
@@ -669,7 +677,7 @@ class Config {
   }
 
   load (template, instance, options = { rebuild: false } ) {
-    this.template = template
+    instance.template = template
     this.logs.push(`loading template for ${this.name}`)
     if (instance && instance.associations && !options.rebuild) {
       this.addAssociations(instance.associations)

package/src/generators.js

@@ -6,9 +6,11 @@ class Generator {
   // constructor ({ match, apply, uuid, index, km, priority, notes }) {
   constructor (generator) {
     generator = normalizeGenerator(generator)
-    const { match, apply, uuid, index, km, priority, where, notes, debug } = generator
+    const { match, apply, uuid, index, km, priority, where, notes, debug, applyWrapped, property } = generator
     this.match = match
     this._apply = apply
+    this._applyWrapped = applyWrapped
+    this.property = property
     this.uuid = uuid
     this.index = index
     this.km = km
@@ -39,7 +41,7 @@ class Generator {
   }
 
   toString () {
-    return `Generator(${this.match}, ${this._apply})`
+    return `Generator(${this.match}, ${this._applyWrapped || this._apply})${this.property ? `\nsee the ${this.property} property` : ''}`
   }
 
   matches (baseArgs, objects, context, hierarchy, config, options = {}) {

package/src/semantics.js

@@ -6,9 +6,11 @@ class Semantic {
   // constructor ({match, apply, uuid, index, km, notes}) {
   constructor (semantic) {
     semantic = normalizeSemantic(semantic)
-    const { match, apply, uuid, index, km, notes, priority, debug, where } = semantic
+    const { match, apply, uuid, index, km, notes, priority, debug, where, applyWrapped, property } = semantic
     this.matcher = match
     this._apply = apply
+    this._applyWrapped = applyWrapped
+    this.property = property
     this.uuid = uuid
     this.index = index
     this.km = km
@@ -27,7 +29,7 @@ class Semantic {
   }
 
   toString () {
-    return `Semantic(${this.matcher}, ${this._apply})`
+    return `Semantic(${this.matcher}, ${this._applyWrapped || this._apply})${this.property ? `\nsee the ${this.property} property` : ''}`
   }
 
   getAPI (config) {