@bablr/helpers 0.20.6 → 0.21.1

package/lib/trivia.js

@@ -1,12 +1,14 @@
 import { Coroutine } from '@bablr/coroutine';
 import { reifyExpression } from '@bablr/agast-vm-helpers';
-import { mapProductions } from './enhancers.js';
-import { OpenNodeTag, CloseNodeTag, ReferenceTag } from './symbols.js';
+import { mapProductions } from './grammar.js';
+import { OpenNodeTag, CloseNodeTag, ReferenceTag, EmbeddedMatcher } from './symbols.js';
+import { getEmbeddedMatcher } from '@bablr/agast-vm-helpers/deembed';
+import { getCooked, isFragmentNode } from '@bablr/agast-helpers/tree';
 
 const lookbehind = (context, s) => {
-  let token = s.result;
+  let token = s.resultPath;
   while (token && [OpenNodeTag, CloseNodeTag, ReferenceTag].includes(token.type)) {
-    const prevToken = context.getPreviousTag(token);
+    const prevToken = context.getPreviousTagPath(token);
     if (!prevToken) break;
     token = prevToken;
   }
@@ -26,9 +28,8 @@ export const triviaEnhancer = ({ triviaIsAllowed, eatMatchTrivia }, grammar) =>
 
       try {
         while (!co.done) {
-          const sourceInstr = co.value;
-          const instr = reifyExpression(sourceInstr);
-          const { verb, arguments: { 0: matcher } = [] } = instr;
+          const instr = co.value;
+          const { verb, arguments: args = [] } = instr;
           let returnValue = undefined;
 
           switch (verb) {
@@ -36,33 +37,38 @@ export const triviaEnhancer = ({ triviaIsAllowed, eatMatchTrivia }, grammar) =>
             case 'eatMatch':
             case 'match':
             case 'guard': {
-              if (matcher && !matcher.flags?.trivia) {
+              const { 0: matcher, 1: props, 2: options } = args;
+              if (
+                matcher &&
+                matcher.type === EmbeddedMatcher &&
+                getCooked(matcher.value.properties.refMatcher?.node.properties.name.node) !== '#'
+              ) {
                 const previous = lookbehind(ctx, s);
                 if (triviaIsAllowed(s) && (!previous || !matchedResults.has(previous))) {
                   matchedResults.add(previous);
                   yield* eatMatchTrivia();
-                  matchedResults.add(s.result);
+                  matchedResults.add(s.resultPath);
                 }
               }
 
-              returnValue = returnValue || (yield sourceInstr);
+              returnValue = returnValue || (yield instr);
               break;
             }
 
             default:
-              returnValue = yield sourceInstr;
+              returnValue = yield instr;
               break;
           }
 
           co.advance(returnValue);
         }
 
-        if (!s.node?.flags.token) {
+        if (!s.node?.flags.token && s.node.isFragmentNode) {
           const previous = lookbehind(ctx, s);
           if (triviaIsAllowed(s) && !matchedResults.has(previous)) {
             matchedResults.add(previous);
             yield* eatMatchTrivia();
-            matchedResults.add(s.result);
+            matchedResults.add(s.resultPath);
           }
         }
 

package/package.json

@@ -1,16 +1,19 @@
 {
   "name": "@bablr/helpers",
   "description": "Command helpers for use in writing BABLR grammars",
-  "version": "0.20.6",
+  "version": "0.21.1",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
-  "files": ["lib"],
+  "files": [
+    "lib"
+  ],
   "exports": {
     "./builders": "./lib/builders.js",
     "./decorators": "./lib/decorators.js",
     "./enhancers": "./lib/enhancers.js",
     "./grammar": "./lib/grammar.js",
     "./object": "./lib/object.js",
+    "./path": "./lib/path.js",
     "./productions": "./lib/productions.js",
     "./shorthand": "./lib/shorthand.js",
     "./source": "./lib/source.js",
@@ -27,16 +30,16 @@
     "clean": "macrome clean"
   },
   "dependencies": {
-    "@bablr/language_enhancer-debug-log": "^0.7.0",
-    "@bablr/strategy_enhancer-debug-log": "^0.6.0",
-    "@bablr/agast-helpers": "^0.5.3",
-    "@bablr/agast-vm-helpers": "^0.5.0",
+    "@bablr/language_enhancer-debug-log": "0.8.0",
+    "@bablr/strategy_enhancer-debug-log": "0.7.0",
+    "@bablr/agast-helpers": "0.6.0",
+    "@bablr/agast-vm-helpers": "0.6.0",
     "@bablr/coroutine": "0.1.0",
     "@iter-tools/imm-stack": "1.1.0",
     "iter-tools-es": "^7.5.3"
   },
   "devDependencies": {
-    "@bablr/boot": "^0.6.3",
+    "@bablr/boot": "^0.6.0",
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#d834ccc52795d6c3b96ecc6c419960fceed221a6",
     "@bablr/macrome": "0.1.3",
     "@bablr/macrome-generator-bablr": "0.3.2",