theprogrammablemind_4wp 7.9.0 → 7.10.0-beta.0

package/client.js

@@ -146,7 +146,7 @@ class ErrorReason extends Error {
    }
 }
 
-const setupArgs = (args, config, logs, hierarchy) => {
+const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   config.setArgs(args)
   args.calls = new InitCalls(args.isInstance ? `${args.isInstance}#${config.name}` : config.name)
   if (global.theprogrammablemind && global.theprogrammablemind.loadForTesting) {
@@ -184,7 +184,7 @@ const setupArgs = (args, config, logs, hierarchy) => {
       apis: getAPIs(uuid)
     }
   }
-  Object.assign(args, args.getUUIDScoped(this.uuid))
+  Object.assign(args, args.getUUIDScoped(uuidForScoping))
   args.breakOnSemantics = false
   args.theDebugger = {
     breakOnSemantics: (value) => args.breakOnSemantics = value
@@ -636,7 +636,8 @@ const loadInstance = (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], { addFirst: true, handleCalculatedProps: true } )
+      const uuid = config.nameToUUID(instance.name)
+      config.addInternal(instance.template.queries[i], { uuid, addFirst: true, handleCalculatedProps: true } )
     } else if (results.apply) {
       const objects = config.get('objects')
       const args = { objects, getObjects: getObjects(objects) }
@@ -644,7 +645,9 @@ const loadInstance = (config, instance) => {
         args.isInstance = `instance${i}`
         args.instance = instance.queries[i]
       }
-      setupArgs(args, config, config.logs, hierarchy)
+
+      const uuid = config.nameToUUID(instance.name)
+      setupArgs(args, config, config.logs, hierarchy, uuid)
       results.apply(args)
     } else {
       if (results.skipSemantics) {

package/package.json

@@ -65,6 +65,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.9.0",
+  "version": "7.10.0-beta.0",
   "license": "ISC"
 }

package/src/config.js

@@ -23,6 +23,7 @@ const indent = (string, indent) => {
 }
 
 const config_toServer = (config) => {
+  // cant change things because copy breaks something
 }
 
 const debugPriority = (priority) => {
@@ -2401,6 +2402,9 @@ class Config {
     this.checkBridges()
   }
 
+  nameToUUID(name) {
+    return this.configs.find((km) => km._name == name)._uuid
+  }
   // name: namespace name
   // others
   //    if undefined namespace applies to first loaded config
@@ -2781,7 +2785,7 @@ class Config {
   }
 
   // TODO get rid of useOldVersion arg
-  addInternal (more, { addFirst = false, useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false, handleCalculatedProps : hcps = false } = {}) {
+  addInternal (more, { uuid, addFirst = false, useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false, handleCalculatedProps : hcps = false } = {}) {
     validConfigProps(more)
     if (more instanceof Config) {
       more.initialize({ force: false })
@@ -2796,7 +2800,7 @@ class Config {
 
     if (hcps) {
       handleCalculatedProps(this, more, addFirst)
-      applyUUID(more, this._uuid)
+      applyUUID(more, uuid || this._uuid)
     }
     for (const key of Object.keys(more)) {
       const value = more[key]