theprogrammablemind_4wp 9.5.1-beta.11 → 9.5.1-beta.13

package/client.js

@@ -916,7 +916,7 @@ const defaultInnerProcess = (config, errorHandler, responses) => {
   console.log('')
   const screen_width = process.stdout.columns
   // || 0 for when running without a console
-  const widths = [70, 10, Math.max(80, screen_width - 71 || 0)]
+  const widths = Lines.addRemainder([70, 10])
   const lines = new Lines(widths)
   lines.setElement(0, 0, '--- The paraphrases are ----------')
   lines.setElement(0, 2, '--- The response strings are ----------')

package/lines.js

@@ -5,7 +5,7 @@ class Lines {
     this.rows = []
   }
 
-  static SCREEN_WIDTH = 132
+  static SCREEN_WIDTH = 164
 
   static addRemainder(widths) {
     const sum = widths.reduce((a, b) => a + b)

package/package.json

@@ -73,6 +73,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "9.5.1-beta.11",
+  "version": "9.5.1-beta.13",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -402,11 +402,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
-        const level = bridge.generatorp.level >= 0 ? bridge.generatorp.level : bridge.level + 1
+        let level = bridge.generatorp.level >= 0 ? bridge.generatorp.level : bridge.level + 1
+        if (!bridge.bridge) {
+          level = 0
+        }
 
         const generator = {
           where: bridge.generatorp.where || bridge.where || helpers.where(4),
-          match: async (args) => bridge.id === args.context.marker && args.context.level === level && args.context.paraphrase && await match(args),
+          // match: async (args) => bridge.id === args.context.marker && args.context.level === level && args.context.paraphrase && await match(args),
+          match: async (args) => args.isA(args.context.marker, bridge.id) && args.context.level === level && args.context.paraphrase && await match(args),
           apply: (args) => apply(args),
           applyWrapped: apply,
           property: 'generatorp'
@@ -423,7 +427,8 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
         const level = bridge.generatorr.level >= 0 ? bridge.generatorr.level : bridge.level + 1
         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) => 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),
           apply: (args) => apply(args),
           applyWrapped: apply,
           property: 'generatorr'
@@ -1506,6 +1511,11 @@ class Config {
     }
   }
 
+  updateBridge(id, updater) {
+    const bridge = this.config.bridges.find((b) => b.id === id)
+    updater({ config: this, bridge })
+  }
+
   addBridge (bridge, uuid) {
     if (!this.config.bridges) {
       this.config.bridges = []
@@ -1807,7 +1817,7 @@ class Config {
 
   // set the args in the api's
   setArgs (args) {
-    const setArgs = (config) => {
+    const setConfigArgs = (config) => {
       if (!config._api) {
         return
       }
@@ -1820,10 +1830,10 @@ class Config {
       }
     }
 
-    setArgs(this)
+    setConfigArgs(this)
     for (const config of this.configs) {
       if (config.config instanceof Config) {
-        setArgs(config.config)
+        setConfigArgs(config.config)
       }
     }
   }

package/src/configHelpers.js

@@ -144,15 +144,27 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
       return { ...args, assumed: Object.assign({}, assumed, (args.assumed || {}), ...moreAssumed) }
     }
 
-    args.s = (c) => config.getSemantics(logs).apply(args, c)
-    args.g = (c, a = {}) => {
-      return config.getGenerators(logs).apply(addAssumed(args, a), c, a)
+    args.s = (c, options = {}) => config.getSemantics(logs).apply(args, c, options)
+    args.g = (c, rest = {}) => {
+      // if (JSON.stringify(rest) !== '{}' && !(rest.assumed || rest.options)) {
+      //   debugger
+      // }
+      const { assumed = {}, options = {} } = rest
+      return config.getGenerators(logs).apply(addAssumed(args, assumed), c, assumed, options)
     }
-    args.gp = (c, a = {}) => {
-      return config.getGenerators(logs).apply(addAssumed(args, a, { paraphrase: true, isResponse: false, response: false }), c, { paraphrase: true, isResponse: false, response: false })
+    args.gp = (c, rest = {}) => {
+      // if (JSON.stringify(rest) !== '{}' && !(rest.assumed || rest.options)) {
+      //   debugger
+      // }
+      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)
     }
-    args.gr = (c, a = {}) => {
-      return config.getGenerators(logs).apply(addAssumed(args, a, { paraphrase: false, isResponse: true }), { ...c, paraphrase: false, isResponse: true })
+    args.gr = (c, rest  = {}) => {
+      // if (JSON.stringify(rest) !== '{}' && !(rest.assumed || rest.options)) {
+      //   debugger
+      // }
+      const { assumed = {}, options = {} } = rest
+      return config.getGenerators(logs).apply(addAssumed(args, assumed, { paraphrase: false, isResponse: true }), { ...c, paraphrase: false, isResponse: true }, options)
     }
     args.e = (c) => {
       if (!c) {
@@ -180,13 +192,14 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   args.getUUIDScoped = (uuid) => {
     return {
       api: getAPI(uuid),
-      apis: getAPIs(uuid)
+      // apis: getAPIs(uuid)
     }
   }
   config.getAddedArgs(args)
 
   Object.assign(args, args.getUUIDScoped(uuidForScoping || config.uuid))
   args.apis = args.apis || ((name) => config.getConfig(name).api)
+  // args.apis = (name) => config.getAPIs(name)
   /*
   if (uuidForScoping) {
     Object.assign(args, args.getUUIDScoped(uuidForScoping))
@@ -214,7 +227,6 @@ const run = async (config, handler) => {
 
   const hierarchy = new DigraphInternal((config.config || {}).hierarchy || [])
 
-  debugger
   const objects = config.config.objects.namespaced[config.uuid]
   const logs = []
   const args = {}

package/src/fragments.js

@@ -3,7 +3,9 @@ const helpers = require('./helpers')
 
 function fragmentInstantiator (args, contexts) {
   return new Object({ 
-    contexts: () => contexts,
+    contexts: () => {
+      return _.cloneDeep(contexts)
+    },
     instantiate: async (mappings) => {
       const instantiated = _.cloneDeep(contexts)
       const todo = [{ context: instantiated, path: [] }]

package/src/generators.js

@@ -1,4 +1,3 @@
-const { stringify } = require('flatted');
 const { args: contextArgs, normalizeGenerator } = require('./helpers')
 const Lines = require('../lines')
 const helpers = require('./helpers')
@@ -186,7 +185,7 @@ class Generators {
         // this.logs.push(`Generators: applied ${generator.toString()}\n to\n ${stringify(context)}`)
         let errorMessage = 'The apply function did not return a value'
         try {
-          generated = await generator.apply(args, objects, context, hierarchy, config, response, log)
+          generated = await generator.apply(args, objects, context, hierarchy, config, response, log, options)
         } catch (e) {
           // the next if handle this
           generated = null
@@ -213,7 +212,7 @@ class Generators {
           lines.newRow()
           lines.setElement(0, 1, 'TO')
           lines.setElement(0, 2, `context_id: ${context.context_id}`)
-          lines.setElement(1, 2, stringify(helpers.sortJson(context, { depth: 10 }), null, 2))
+          lines.setElement(1, 2, JSON.stringify(helpers.sortJson(context, { depth: 10 }), null, 2))
           lines.newRow()
           lines.setElement(0, 1, 'STACK')
           lines.setElement(0, 2, stack)
@@ -224,7 +223,7 @@ class Generators {
           lines.setElement(0, 1, 'ERROR')
           lines.setElement(0, 2, errorMessage)
           this.logs.push(lines.toString())
-          const message = `ERROR while applying (${source}) ${generator.toLabel()}\n to\n ${stringify(context, null, 2)}.\n${errorMessage}'`
+          const message = `ERROR while applying (${source}) ${generator.toLabel()}\n to\n ${JSON.stringify(context, null, 2)}.\n${errorMessage}'`
           // this.logs.push(message)
           // return [message]
           args.calls.pop()
@@ -255,7 +254,7 @@ class Generators {
           lines.newRow()
           lines.setElement(0, 1, 'TO')
           lines.setElement(0, 2, `context_id: ${context.context_id}`)
-          lines.setElement(1, 2, stringify(helpers.sortJson(context, { depth: 25 }), null, 2))
+          lines.setElement(1, 2, JSON.stringify(helpers.sortJson(context, { depth: 25 }), null, 2))
           this.logs.push(lines.toString())
         }
         applied = true
@@ -273,7 +272,7 @@ class Generators {
       lines.setElement(0, 2, stack)
       lines.newRow()
       lines.setElement(0, 1, 'TO')
-      lines.setElement(0, 2, stringify(context, null, 2))
+      lines.setElement(0, 2, JSON.stringify(context, null, 2))
       this.logs.push(lines.toString())
     }
     return ((config || {}).parenthesized ? '(' + generated + ')' : generated)

package/src/semantics.js

@@ -70,6 +70,7 @@ class Semantic {
   }
 
   async matches (args, context, options = {}) {
+    args = {...args}
     this.fixUpArgs(args, context)
     const matches = await this.matcher(args)
     if (matches && (options.debug || {}).match || args.callId === this.callId) {
@@ -81,6 +82,7 @@ class Semantic {
   }
 
   async apply (args, context, s, options = {}) {
+    args = {...args}
     const { config } = args
     if (config && config.debugLoops) {
       console.log('apply', this.toLabel())