theprogrammablemind 8.0.0-beta.49 → 8.0.0-beta.50

package/package.json

@@ -65,6 +65,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "8.0.0-beta.49",
+  "version": "8.0.0-beta.50",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -1012,7 +1012,7 @@ class Config {
     return instance
   }
 
-  fragmentInstantiator (contexts) {
+  fragmentInstantiator (args, contexts) {
     return new Object({
       contexts: () => contexts,
       instantiate: async (mappings) => {
@@ -1020,11 +1020,13 @@ class Config {
         // const todo = [...instantiated]
         // const todo = [...instantiated]
         const todo = _.clone(instantiated)
+        args = {...args}
         while (todo.length > 0) {
           const context = todo.pop()
+          args.context = context
           for (const mapping of mappings) {
-            if (await mapping.match({ context })) {
-              await mapping.apply({ context })
+            if (await mapping.match(args)) {
+              await mapping.apply(args)
             }
           }
           for (const key of Object.keys(context)) {
@@ -1043,21 +1045,21 @@ class Config {
     })
   }
 
-  fragment (query) {
+  fragment (args, query) {
     for (const instance of (this.instances || [])) {
       for (const fragment of (instance.fragments || [])) {
         if (fragment.query === query) {
-          return this.fragmentInstantiator(fragment.contexts)
+          return this.fragmentInstantiator(args, fragment.contexts)
         }
       }
       for (const fragment of (instance.resultss || [])) {
         if (fragment.isFragment && fragment.query === query) {
-          return this.fragmentInstantiator(fragment.contexts)
+          return this.fragmentInstantiator(args, fragment.contexts)
         }
       }
       for (const fragment of (this.fragmentsBeingBuilt || [])) {
         if (fragment.query === query) {
-          return this.fragmentInstantiator(fragment.contexts)
+          return this.fragmentInstantiator(args, fragment.contexts)
         }
       }
     }

package/src/configHelpers.js

@@ -77,6 +77,22 @@ const listable = (hierarchy) => (c, type) => {
   return false
 }
 
+const cleanAssign = (dest, ...srcs) => {
+  for (const key in dest) {
+    let found = false
+    for (const src of srcs) {
+      if (src[key]) {
+        found = true
+        break
+      }
+    }
+    if (!found) {
+      delete dest[key]
+    }
+  }
+  Object.assign(dest, ...srcs)
+}
+
 const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
 
   // callId
@@ -84,6 +100,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.cleanAssign = cleanAssign
   args.km = (name) => config.getConfig(name)
   args.api = (name) => config.getConfig(name).api
   args.error = (context) => {
@@ -96,7 +113,9 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   args.listable = listable(hierarchy)
   args.asList = asList
   args.retry = () => { throw new RetryError() }
-  args.fragments = (query) => config.fragment(query)
+  args.fragments = (query) => {
+    return config.fragment(args, query)
+  }
   args.breakOnSemantics = false
   args.theDebugger = {
     breakOnSemantics: (value) => args.breakOnSemantics = value