theprogrammablemind 9.6.0-beta.24 → 9.6.0-beta.26

package/package.json

@@ -73,6 +73,6 @@
     "scriptjs": "^2.5.9",
     "uuid": "^8.3.2"
   },
-  "version": "9.6.0-beta.24",
+  "version": "9.6.0-beta.26",
   "license": "UNLICENSED"
 }

package/src/configHelpers.js

@@ -86,6 +86,28 @@ const cleanAssign = (dest, ...srcs) => {
   Object.assign(dest, ...srcs)
 }
 
+class ContextHierarchy {
+  constructor(contexts = []) {
+    this.contexts = [...contexts]
+  }
+
+  push(context) {
+    this.contexts.push(context)
+  }
+
+  pop() {
+    this.contexts.pop()
+  }
+
+  under(marker) {
+    for (let i = this.contexts.length - 1; i >= 0; --i) {
+      if (this.contexts[i].marker == marker) {
+        return true
+      }
+    }
+  }
+}
+
 const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   if (!args.objects) {
     args.objects = config.get('objects')
@@ -105,6 +127,7 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   if (global.theprogrammablemind && global.theprogrammablemind.loadForTesting) {
     args.calls = new InitCalls(Object.keys(global.theprogrammablemind.loadForTesting)[0])
   }
+  args.contextHierarchy = new ContextHierarchy()
   args.cleanAssign = cleanAssign
   args.km = (name) => config.getConfig(name)
   args.api = (name) => config.getConfig(name).api

package/src/semantics.js

@@ -156,11 +156,21 @@ class Semantics {
   }
 
   async applyToContext (args, context, options) {
+    args.contextHierarchy.push(context)
+    try {
+      return await this.applyToContextHelper(args, context, options)
+    } finally {
+      args.contextHierarchy.pop()
+    }
+  }
+
+  async applyToContextHelper (args, context, options) {
     // let context_prime = {}
     if (!(context instanceof Array || context instanceof Object)) {
       return context
     }
     args = { ...args }
+
     const config = args.config
     const debug = config.getDebug()
     let contextPrime = Object.assign({}, context)