theprogrammablemind 9.3.0-beta.11 → 9.3.0-beta.12

package/client.js

@@ -260,7 +260,7 @@ const throwErrorHandler = (error) => {
   throw error
 }
 
-const _process = async (config, query, { initializer, commandLineArgs, credentials, writeTests, isTest, isProcess, isModule, saveDeveloper, rebuildingTemplate, testConfig, testsFN, errorHandler = throwErrorHandler } = {}) => {
+const _process = async (config, query, { initializer, commandLineArgs, credentials, writeTests, isProcess, isModule, isTest, saveDeveloper, rebuildingTemplate, testConfig, testsFN, errorHandler = throwErrorHandler } = {}) => {
   if (credentials) {
     config.server(credentials.server, credentials.key)
   }
@@ -624,7 +624,7 @@ const saveTest = async (testFile, config, test, expected, testConfig, saveDevelo
   await config.rebuild()
   const objects = getObjects(config.config.objects)(config.uuid)
   console.log(test)
-  const result = await _process(config, test, { isTest: true, isProcess: true, isModule: false })
+  const result = await _process(config, test, { isTest: true, isProcess: true, isModule: true })
   // const actualObjects = config.config.objects
   const actualConfig = getConfigForTest(config, testConfig)
   const args = {
@@ -1880,7 +1880,7 @@ const knowledgeModuleImpl = async ({
           global.beforeObjects = _.cloneDeep(objects)
         }
         try {
-          await processResults(_process(config, args.query, { isProcess, isModule: !isProcess, commandLineArgs: args, dontAddAssociations: args.dontAddAssociations, writeTests: args.save || args.saveDeveloper, saveDeveloper: args.saveDeveloper, testConfig, testsFN: test }))
+          await processResults(_process(config, args.query, { commandLineArgs: args, isProcess, isModule: !isProcess, dontAddAssociations: args.dontAddAssociations, writeTests: args.save || args.saveDeveloper, saveDeveloper: args.saveDeveloper, testConfig, testsFN: test }))
         } catch (error) {
           console.log('Error', error)
         }

package/package.json

@@ -69,6 +69,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "9.3.0-beta.11",
+  "version": "9.3.0-beta.12",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -1055,8 +1055,8 @@ class Config {
 
   // value is in response field
   // TODO maybe generalize out query+evaluate along the lines of set value and set reference
-  async getEvaluator (s, calls, log, context) {
-    const instance = await s({ ...context, evaluate: true })
+  async getEvaluator (s, calls, log, context, args) {
+    const instance = await s({ ...args, ...context, evaluate: true })
     calls.touch(instance)
     if (!instance.evalue && !instance.verbatim && !instance.value) {
       this.warningNotEvaluated(log, context)

package/src/configHelpers.js

@@ -140,7 +140,7 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
       if (!c) {
         return
       }
-      return config.getEvaluator(args.s, args.calls, logs, c)
+      return config.getEvaluator(args.s, args.calls, logs, c, { isModule: args.isModule, isProcess: args.isProcess })
     }
     args.gs = gs(args.g)
     args.gsp = gs(args.gp)
@@ -279,7 +279,7 @@ const setupContexts = (rawContexts) => {
   return contexts
 }
 
-const processContextsB = async ({ config, isProcess, isModule, hierarchy, semantics, generators, json, isTest, rebuildingTemplate, isInstance, instance, query, data, retries, url, commandLineArgs, forTemplate }) => {
+const processContextsB = async ({ config, hierarchy, semantics, generators, json, isTest, isProcess, isModule, rebuildingTemplate, isInstance, instance, query, data, retries, url, commandLineArgs, forTemplate }) => {
   // TODO fix this name to contextsPrime
   const contextsPrime = []
   const generatedPrime = []
@@ -468,6 +468,8 @@ const loadInstance = async (config, instance) => {
       const args = { config, hierarchy, json: results, commandLineArgs: {}, forTemplate: true }
       args.isInstance = `instance${i}`
       args.instance = ''
+      args.isProcess = !config.isModule
+      args.isModule = !!config.isModule
       await processContextsB(args)
       if (results.skipSemantics) {
         config.config.skipSemantics = null