theprogrammablemind 9.7.1-beta.5 → 9.7.1-beta.6

package/package.json

@@ -73,6 +73,6 @@
     "scriptjs": "^2.5.9",
     "uuid": "^8.3.2"
   },
-  "version": "9.7.1-beta.5",
+  "version": "9.7.1-beta.6",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -1655,6 +1655,7 @@ class Config {
     }
   }
 
+  // handler/listener
   updateBridge(id, updater) {
     const bridge = this.config.bridges.find((b) => b.id === id)
     updater({ config: this, bridge })

package/src/debug.js

@@ -27,6 +27,18 @@ const unhit = (name) => {
   hits[name] = false
 }
 
+const hitScoped = async (name, call) => {
+  hit(name)
+  try {
+    const result = await call()
+    unhit(name)
+    return result
+  } catch( e ) {
+    unhit(name)
+    throw e
+  }
+}
+
 const wasHit = (name) => {
   return hits[name]
 }
@@ -64,16 +76,19 @@ const _break = (name) => {
   }
 }
 
+const breakAt = _break;
+
 module.exports = {
   counter,
   get,
   _break, // break is a keyword
-
+  breakAt,
   // used for tests
   reset,
   hit,
   unhit,
   wasHit,
   getDb,
-  setDb
+  setDb,
+  hitScoped,
 }

package/src/fragments.js

@@ -1,6 +1,29 @@
 const _ = require('lodash')
 const helpers = require('./helpers')
 
+function createChangeTracker(obj) {
+  const changes = new Set();
+
+  const handler = {
+    set(target, prop, value) {
+      changes.add(prop);
+      target[prop] = value;
+      return true;
+    },
+    deleteProperty(target, prop) {
+      changes.add(prop);
+      delete target[prop];
+      return true;
+    }
+  };
+
+  return {
+    proxy: new Proxy(obj, handler),
+    getChanges: () => Array.from(changes)
+  };
+}
+
+
 function fragmentInstantiator (args, contexts) {
   return new Object({ 
     contexts: () => {
@@ -13,13 +36,15 @@ function fragmentInstantiator (args, contexts) {
       args.pathEquals = helpers.pathEquals
       while (todo.length > 0) {
         const { context, path } = todo.pop()
-        args.context = context
+        const { proxy, getChanges } = createChangeTracker(context);
+        args.context = proxy
         args.path = path
         for (const mapping of mappings) {
           if (await mapping.match(args)) {
             await mapping.apply(args)
           }
         }
+        const ignore = getChanges()
         for (const key of Object.keys(context)) {
           // if (['number', 'string', 'boolean'].includes(typeof (context[key]))) {
           if (!helpers.isCompound(context[key])) {
@@ -28,7 +53,9 @@ function fragmentInstantiator (args, contexts) {
           if (context[key].instantiated) {
             continue
           }
-          todo.push({ context: context[key], path: [...path, key] })
+          if (!ignore.includes(key)) {
+            todo.push({ context: context[key], path: [...path, key] })
+          }
         }
       }
       if (contexts.length == 1 && instantiated.length == 1) {

package/src/generators.js

@@ -1,6 +1,7 @@
 const { args: contextArgs, normalizeGenerator } = require('./helpers')
 const Lines = require('../lines')
 const helpers = require('./helpers')
+const debug = require('./debug')
 
 class Generator {
   // constructor ({ match, apply, uuid, index, km, priority, notes }) {
@@ -65,14 +66,16 @@ class Generator {
     }
     const args = Object.assign({}, baseArgs, moreArgs, (baseArgs.getUUIDScoped || (() => { return {} }))(this.uuid))
     // return this.match(args)
-    const matches = await this.match(args)
-    if ((matches && (options.debug || {}).match) ||
-        callId === this.callId) {
-      // next line is the matcher
-      debugger // eslint-disable-line no-debugger
-      await this.match(args)
-    }
-    return matches
+    return await debug.hitScoped(args.callId, async () => {
+      const matches = await this.match(args)
+      if ((matches && (options.debug || {}).match) ||
+          callId === this.callId) {
+        // next line is the matcher
+        debugger // eslint-disable-line no-debugger
+        await this.match(args)
+      }
+      return matches
+    })
   }
 
   // apply (baseArgs, objects, g, gs, context, hierarchy, config, response, log, options = {}) {
@@ -121,11 +124,13 @@ class Generator {
     if (this.property === 'generatorp') {
       args.g = args.gp
     }
-    if ((options.debug || {}).apply ||
-        callId === this.callId) {
-      debugger // eslint-disable-line no-debugger
-    }
-    return await this._apply(args)
+    return await debug.hitScoped(args.callId, async () => {
+      if ((options.debug || {}).apply ||
+          callId === this.callId) {
+        debugger // eslint-disable-line no-debugger
+      }
+      return await this._apply(args)
+    })
   }
 }
 
@@ -220,7 +225,7 @@ class Generators {
           lines.setElement(0, 2, stack)
           lines.newRow()
           lines.setElement(0, 1, 'DEBUG')
-          lines.setElement(0, 2, `To debug this use args.callId === '${args.calls.current()}'`)
+          lines.setElement(0, 2, `To debug this use debug.breakAt('${args.calls.current()}')`)
           lines.newRow()
           lines.setElement(0, 1, 'ERROR')
           lines.setElement(0, 2, errorMessage)
@@ -252,7 +257,7 @@ class Generators {
           lines.setElement(0, 2, stack)
           lines.newRow()
           lines.setElement(0, 1, 'DEBUG')
-          lines.setElement(0, 2, `To debug this use args.callId === '${args.calls.current()}'`)
+          lines.setElement(0, 2, `To debug this use debug.breakAt('${args.calls.current()}')`)
           lines.newRow()
           lines.setElement(0, 1, 'TO')
           lines.setElement(0, 2, `context_id: ${context.context_id}`)

package/src/semantics.js

@@ -75,13 +75,15 @@ class Semantic {
   async matches (args, context, options = {}) {
     args = {...args}
     this.fixUpArgs(args, context)
-    const matches = await this.matcher(args)
-    if (matches && (options.debug || {}).match || args.callId === this.callId) {
-      // next line is the matcher
-      debugger // eslint-disable-line no-debugger
-      await this.matcher(args)
-    }
-    return matches
+    return await debug.hitScoped(args.callId, async () => {
+      const matches = await this.matcher(args)
+      if (matches && (options.debug || {}).match || args.callId === this.callId) {
+        // next line is the matcher
+        debugger // eslint-disable-line no-debugger
+        await this.matcher(args)
+      }
+      return matches
+    })
   }
 
   async apply (args, context, s, options = {}) {
@@ -97,21 +99,24 @@ class Semantic {
     const contextPrime = Object.assign({}, context)
     this.fixUpArgs(args, contextPrime)
 
-    if ((options.debug || {}).apply || args.callId === this.callId) {
-      debugger // eslint-disable-line no-debugger
-    }
-    if (args.breakOnSemantics) {
-      debugger // eslint-disable-line no-debugger
-    }
-    try {
-      args.handlerStack.push(this)
-      await this._apply(args)
-      args.handlerStack.pop()
-    } catch( e ) {
-      args.handlerStack.pop()
-      throw e
-    }
-    return contextPrime
+    return await debug.hitScoped(args.callId, async () => {
+      if ((options.debug || {}).apply || args.callId === this.callId) {
+        debugger // eslint-disable-line no-debugger
+      }
+      if (args.breakOnSemantics) {
+        debugger // eslint-disable-line no-debugger
+      }
+
+      try {
+        args.handlerStack.push(this)
+        await this._apply(args)
+        args.handlerStack.pop()
+      } catch( e ) {
+        args.handlerStack.pop()
+        throw e
+      }
+      return contextPrime
+    })
   }
 }
 
@@ -253,7 +258,7 @@ class Semantics {
           lines.setElement(0, 2, semantic.toString())
           lines.newRow()
           lines.setElement(0, 1, 'DEBUG')
-          lines.setElement(0, 2, `To debug this use args.callId === '${args.calls.current()}'`)
+          lines.setElement(0, 2, `To debug this use debug.breakAt('${args.calls.current()}')`)
           lines.newRow()
           lines.setElement(0, 1, 'TO')
           lines.setElement(0, 2, `context_id: ${context.context_id}`)
@@ -288,7 +293,7 @@ class Semantics {
           lines.setElement(0, 2, semantic.toString())
           lines.newRow()
           lines.setElement(0, 1, 'DEBUG')
-          lines.setElement(0, 2, `To debug this use args.callId === '${args.calls.current()}'`)
+          lines.setElement(0, 2, `To debug this use debug.breakAt('${args.calls.current()}')`)
           lines.newRow()
           lines.setElement(0, 1, 'TO')
           lines.setElement(0, 2, `context_id: ${context.context_id}`)