theprogrammablemind_4wp 7.5.7-beta.9 → 7.5.8-beta.0

package/client.js

@@ -58,10 +58,10 @@ const vimdiff = (actualJSON, expectedJSON) => {
   // console.log(`vimdiff ${path}/actual.json ${path}/expected.json`)
   {
     const editor = runtime.process.env.EDITOR || 'vimdiff'
-    const child = runtime.child_process.spawn(editor, [`${path}/expected.json`, `${path}/actual.json`], { stdio: 'inherit' })
-    child.on('exit', function (e, code) {
-      console.log('finished')
-    })
+    debugger
+    // const child = runtime.child_process.spawn(editor, [`${path}/expected.json`, `${path}/actual.json`], { stdio: 'inherit' })
+    console.log(`${editor} ${path}/expected.json ${path}/actual.json`)
+    runtime.child_process.execSync(`${editor} ${path}/expected.json ${path}/actual.json`, {stdio: 'inherit'})
   }
 }
 
@@ -100,10 +100,20 @@ const asList = (context) => {
   }
 }
 
+class ErrorReason extends Error {
+   constructor(context) {
+     super(JSON.stringify(context))
+     this.reason = context
+   }
+}
+
 const setupArgs = (args, config, logs, hierarchy) => {
   config.setArgs(args)
-  args.calls = new InitCalls()
+  args.calls = new InitCalls(config.name)
   args.km = (name) => config.getConfig(name)
+  args.error = (context) => {
+    throw new ErrorReason(context)
+  }
   args.kms = config.getConfigs()
   args.config = config
   args.hierarchy = hierarchy
@@ -395,7 +405,8 @@ const processContextsB = ({ config, hierarchy, semantics, generators, json, isTe
               const mostCalled = semantics.getMostCalled()
               e.message += `\nThe most called semantic was:\nnotes: ${mostCalled.notes}\nmatch: ${mostCalled.matcher.toString()}\napply: ${mostCalled._apply.toString()}\n`
             }
-            throw e;
+            // contextPrime = semantics.apply(args, { marker: 'error', context, error: e })
+            contextPrime = semantics.apply(args, { marker: 'error', context, reason: e.reason })
           }
         }
       }
@@ -1578,7 +1589,7 @@ 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.expected, result.actual)
+                vimdiff(result.actual, result.expected)
               }
             }
             let newError = false
@@ -1632,6 +1643,9 @@ const knowledgeModule = async ({
                     lines.setElement(1, 1, 'actual checked')
                     lines.setElement(2, 2, JSON.stringify(result.actual.checked, null, 2))
                     lines.log()
+                    if (args.vimdiff) {
+                      vimdiff(result.actual.checked, result.expected.checked)
+                    }
                     newError = true
                     headerShown = true
                   }

package/package.json

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

package/src/helpers.js

@@ -172,10 +172,11 @@ nextContextId = 0
 
 class InitCalls {
 
-  constructor() {
+  constructor(name) {
     this.nextCallId = 0
     this.nextContextId = 0
     this.stack = []
+    this.name = name
   }
 
   start() {
@@ -192,13 +193,13 @@ class InitCalls {
     // this.nextCallId += 1
     // this.stack.push(this.nextCallId)
     this.stack.push(this.nextCallId)
-    const calls = this.stack.map( (call) => `call${call}` )
+    const calls = this.stack.map( (call) => `${this.name}#call${call}` )
     // return `Context#${this.nextContextId}: ${calls}`
     return `Context#${nextContextId}: ${calls}`
   }
 
   current() {
-    return `call${this.stack[this.stack.length-1]}`
+    return `${this.name}#call${this.stack[this.stack.length-1]}`
   }
 
   touch(context) {

package/src/semantics.js

@@ -237,7 +237,7 @@ class Semantics {
           // this.logs.push(message)
           // return [message]
           args.calls.pop()
-          throw { error: [message], logs: this.logs }
+          throw { error: [message], logs: this.logs, reason: e.reason }
         }
         args.calls.touch(contextPrime)
         // this.logs.push(`Semantics: applied ${semantic.toString()}\n to\n ${JSON.stringify(context)}\n the result was ${JSON.stringify(contextPrime)}\n`)