theprogrammablemind_4wp 7.5.8-beta.0 → 7.5.8-beta.1

package/client.js

@@ -110,6 +110,9 @@ class ErrorReason extends Error {
 const setupArgs = (args, config, logs, hierarchy) => {
   config.setArgs(args)
   args.calls = new InitCalls(config.name)
+  if (global.theprogrammablemind && global.theprogrammablemind.loadForTesting) {
+    args.calls = new InitCalls(Object.keys(global.theprogrammablemind.loadForTesting)[0])
+  }
   args.km = (name) => config.getConfig(name)
   args.error = (context) => {
     throw new ErrorReason(context)
@@ -149,7 +152,10 @@ const setupArgs = (args, config, logs, hierarchy) => {
   args.g = (c) => config.getGenerators(logs).apply(args, c)
   args.gp = (c) => config.getGenerators(logs).apply(args, { ...c, paraphrase: true, isResponse: false, response: false})
   args.gr = (c) => config.getGenerators(logs).apply(args, { ...c, paraphrase: false, isResponse: true })
-  args.e = (c) => config.getEvaluator(args.s, logs, c)
+  if (!logs) {
+    debugger
+  }
+  args.e = (c) => config.getEvaluator(args.s, args.calls, logs, c)
   args.log = (message) => logs.push(message)
   // config.getAddedArgs(args)
   args.gs = gs(args.g)
@@ -359,6 +365,9 @@ const processContextsB = ({ config, hierarchy, semantics, generators, json, isTe
 
   const objects = config.get('objects')
   const args = { objects, isResponse: true, response: json, isTest, getObjects: getObjects(objects) }
+  if (!json.logs) {
+    json.logs = []
+  }
   setupArgs(args, config, json.logs, hierarchy)
   const toDo = [...contexts]
   args.insert = (context) => toDo.unshift(context)
@@ -857,10 +866,12 @@ const saveTest = async (testFile, config, test, expected, testConfig, saveDevelo
   const args = {
   }
   const saveObjects = {...config.config.objects}
+  /*
   saveObjects.nameToUUID = {}
   for (let km of config.configs) {
     saveObjects.nameToUUID[km.name] = km.uuid
   }
+  */
   writeTest(testFile, test, saveObjects, result.generated, result.paraphrases, result.responses, result.contexts, result.associations, result.metadata, actualConfig, saveDeveloper)
 }
 
@@ -1344,7 +1355,11 @@ const knowledgeModule = async ({
       if (config.needsRebuild(template.template, template.instance)) {
         throw `This module "${config.name}" cannot be used because the instance file needs rebuilding. Run on the command line with no arguements or the -rt argument to rebuild.`
       }
-      config.load(template.template, template.instance)
+      try {
+        config.load(template.template, template.instance)
+      } catch( e ) {
+        errorHandler(e)
+      }
     }
   }
   if (isProcess) {
@@ -1587,11 +1602,6 @@ const knowledgeModule = async ({
 
           }
           runTests(config, test, { debug: args.debug, testConfig: useTestConfig, verbose: args.testVerbose || args.testAllVerbose, stopAtFirstError: !args.testAllVerbose }).then((results) => {
-            if (results.length > 0 && args.vimdiff) {
-              for (const result of results) {
-                vimdiff(result.actual, result.expected)
-              }
-            }
             let newError = false
             if (results.length > 0) {
               let headerShown = false
@@ -1650,6 +1660,12 @@ const knowledgeModule = async ({
                     headerShown = true
                   }
                 }
+              } else {
+                if (results.length > 0 && args.vimdiff) {
+                  for (const result of results) {
+                    vimdiff(result.actual, result.expected)
+                  }
+                }
               }
               if (!headerShown) {
                 if (!(useTestConfig.check && useTestConfig.check.length > 0)) {

package/package.json

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

package/src/config.js

@@ -79,7 +79,8 @@ const handleBridgeProps = (config, bridge) => {
   if (bridge.generatorp) {
     config.config.generators.unshift({ 
       where: bridge.generatorp.where || bridge.where || client.where(4),
-      match: ({context}) => bridge.id == context.marker && context.paraphrase,
+      // match: ({context}) => bridge.id == context.marker && context.paraphrase,
+      match: ({context}) => bridge.id == context.marker && context.level == bridge.level + 1 && context.paraphrase,
       apply: (args) => bridge.generatorp(args),
       applyWrapped: bridge.generatorp,
       property: 'generatorp',
@@ -614,8 +615,9 @@ class Config {
     return instance
   }
   */
-  getEvaluator (s, log, context) {
+  getEvaluator (s, calls, log, context) {
     const instance = s({ ...context, evaluate: true })
+    calls.touch(instance)
     if (!instance.evalue && !instance.verbatim && !instance.value) {
       this.warningNotEvaluated(log, context);
     }