theprogrammablemind_4wp 7.4.0-beta.0 → 7.4.0-beta.1

package/client.js

@@ -12,14 +12,16 @@ const { appendNoDups, InitCalls } = require('./src/helpers')
 const runtime = require('./runtime')
 const sortJson = runtime.sortJson
 
-const ask = (config) => (asks) => {
+const getAsk = (config) => (uuid) => (asks) => {
   for (let ask of asks) {
     config.addMotivation({
+      uuid,
       match: (args) => ask.matchr(args),
       apply: (args) => ask.applyr(args)
     })
   }
   config.addMotivation({
+      uuid,
       match: ({context}) => context.marker == 'controlEnd' || context.marker == 'controlBetween',
       apply: (args) => {
         for (let ask of asks) {
@@ -100,7 +102,10 @@ const setupArgs = (args, config, logs, hierarchy) => {
   args.listable = listable(hierarchy)
   args.asList = asList
   args.retry = () => { throw new RetryError() }
-  args.ask = ask(config)
+  const scopedAsk = getAsk(config)
+  args.getUUIDScoped = (uuid) => {
+    return { ask: scopedAsk(uuid) }
+  }
   args.motivation = (m) => config.addMotivation(m)
   args.s = (c) => config.getSemantics(logs).apply(args, c)
   args.g = (c) => config.getGenerators(logs).apply(args, c)

package/package.json

@@ -61,6 +61,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.4.0-beta.0",
+  "version": "7.4.0-beta.1",
   "license": "ISC"
 }

package/src/config.js

@@ -1198,6 +1198,9 @@ class Config {
 
   // motivation === { match, apply, uuid }
   addMotivation (motivation) {
+    if (!motivation.uuid) {
+      motivation.uuid = this.uuid
+    }
     this.motivations.push(motivation)
   }
 
@@ -1207,11 +1210,13 @@ class Config {
 
   doMotivations (args, context) {
     args = Object.assign({}, args, { context })
-    args.objects = args.getObjects(this.uuid)
+    // console.log('src/config doMotivations this.uuid', this.uuid)
+    // args.objects = args.getObjects(this.uuid)
     const motivations = this.motivations
     this.motivations = []
     let done = false
     for (const motivation of motivations) {
+      args.objects = args.getObjects(motivation.uuid)
       if (!done && motivation.match(args)) {
         motivation.apply(args)
         if (args.context.controlKeepMotivation || motivation.repeat) {

package/src/generators.js

@@ -59,7 +59,7 @@ class Generator {
             api: this.getAPI(config),
             apis: this.getAPIs(config) 
           }
-    const args = Object.assign({}, baseArgs, moreArgs)
+    const args = Object.assign({}, baseArgs, moreArgs, (baseArgs.getUUIDScoped || (() => { return {} }))(this.uuid))
     // return this.match(args)
     const matches = this.match(args)
     if ((matches && (options.debug || {}).match)
@@ -106,7 +106,7 @@ class Generator {
             api: this.getAPI(config), 
             apis: this.getAPIs(config) 
           }
-    const args = Object.assign({}, baseArgs, moreArgs)
+    const args = Object.assign({}, baseArgs, moreArgs, (baseArgs.getUUIDScoped || (() => { return {} }))(this.uuid))
     // if (this.callId) {
     // greg
     /*

package/src/semantics.js

@@ -45,13 +45,16 @@ class Semantic {
   matches (baseArgs, context, options = {}) {
     const hierarchy = baseArgs.hierarchy
     const config = baseArgs.config
+
     const objects = baseArgs.getObjects(this.uuid)
+    // const ask = baseArgs.getAsk(this.uuid)
+
     // return this.matcher(Object.assign({}, argsBase, {args: contextArgs(context, hierarchy), objects: objects, global: objects, context: context, hierarchy: hierarchy, api: this.getAPI(config)})
     const callId = baseArgs.calls.current()
     const moreArgs = { 
             uuid: this.uuid, 
             args: contextArgs(context, hierarchy), 
-            objects: objects, 
+            objects,
             global: objects, 
             context: context, 
             // hierarchy: hierarchy, 
@@ -59,7 +62,7 @@ class Semantic {
             api: this.getAPI(config),
             apis: this.getAPIs(config)
           }
-    const args = Object.assign({}, baseArgs, moreArgs)
+    const args = Object.assign({}, baseArgs, moreArgs, (baseArgs.getUUIDScoped || (() => { return {} }))(this.uuid))
 
     const matches = this.matcher(args)
     if (matches && (options.debug || {}).match
@@ -74,6 +77,7 @@ class Semantic {
   apply (baseArgs, context, s, log, options = {}) {
     const { hierarchy, config, response } = baseArgs
     const objects = baseArgs.getObjects(this.uuid)
+    // const ask = baseArgs.getAsk(this.uuid)
     if (!log) {
       console.trace()
       throw 'log is a required argument'
@@ -99,7 +103,7 @@ class Semantic {
             api: this.getAPI(config),
             apis: this.getAPIs(config)
     }
-    const args = Object.assign({}, baseArgs, moreArgs)
+    const args = Object.assign({}, baseArgs, moreArgs, (baseArgs.getUUIDScoped || (() => { return {} }))(this.uuid))
     if ((options.debug || {}).apply
         ||
         callId == this.callId) {