@bablr/bablr-vm 0.14.0 → 0.15.0

package/lib/source.js

@@ -168,6 +168,10 @@ export const SourceFacade = class BABLRSourceFacade {
     return actuals.get(this).done;
   }
 
+  get value() {
+    return actuals.get(this).value;
+  }
+
   get index() {
     return actuals.get(this).index;
   }

package/lib/state.js

@@ -33,6 +33,10 @@ export const StateFacade = class BABLRStateFacade {
     return actuals.get(this).node;
   }
 
+  get parentNode() {
+    return actuals.get(this).parentNode;
+  }
+
   get source() {
     return facades.get(actuals.get(this).source);
   }
@@ -85,6 +89,10 @@ export const State = class BABLRState extends WeakStackFrame {
     return this.agast.node;
   }
 
+  get parentNode() {
+    return this.agast.parentNode;
+  }
+
   get holding() {
     return this.agast.holding;
   }

package/lib/strategy.js

@@ -71,7 +71,7 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
                 intrinsicResult = yield intrinsicResult;
               }
 
-              updateSpans(ctx, s, intrinsicValue ? ctx.nodeForTag(openTag) : s.node, 'open');
+              updateSpans(ctx, s, ctx.nodeForTag(openTag), 'open');
 
               if (intrinsicValue) {
                 if (!intrinsicResult) {
@@ -192,7 +192,9 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
 
         s = s.push(source.branch(), agast, balanced, spans);
 
-        resolvedLanguages.set(s.node, resolvedLanguages.get(node));
+        if (node) {
+          resolvedLanguages.set(s.node, resolvedLanguages.get(node));
+        }
 
         returnValue = facades.get(s);
         break;
@@ -231,15 +233,17 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
         s = s.parent;
 
         if (s.path.depth && rejectedState.path.depth > s.path.depth) {
-          const didShift = rejectedState.node.at(s.node.depth) === s.node;
+          // const didShift = rejectedState.node.at(sNodeDepth) === s.node;
+          const didShift =
+            ctx.nodeForPath(s.path) && !ctx.nodeForPath(rejectedState.path.at(s.path.depth));
           const lowPath = rejectedState.path.at(
             Math.min(s.path.depth + (didShift ? 0 : 1), rejectedState.path.depth),
           );
-          const lowNode = s.node;
+          const lowNode = s.node || s.parentNode;
 
           const { name, isArray } = lowPath.reference?.value || {};
 
-          if (lowPath.depth === lowNode.depth + 1 && !lowNode.resolver.counters.has(name)) {
+          if (!didShift && !lowNode.resolver.counters.has(name)) {
             if (!lowNode.openTag?.value.flags.trivia && !lowNode.openTag?.value.flags.escape) {
               yield buildCall('advance', buildReference(name, isArray));
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/bablr-vm",
   "description": "A VM for parsing using BABLR languages",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -12,10 +12,10 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.1.6",
-    "@bablr/agast-vm-helpers": "0.1.5",
+    "@bablr/agast-helpers": "0.2.0",
+    "@bablr/agast-vm-helpers": "0.2.0",
     "@bablr/coroutine": "0.1.0",
-    "@bablr/helpers": "0.16.0",
+    "@bablr/helpers": "0.17.0",
     "@bablr/regex-vm": "0.5.1",
     "@bablr/weak-stack": "0.1.0",
     "@iter-tools/imm-stack": "1.1.0",