@bablr/helpers 0.15.4 → 0.16.0

package/lib/enhancers.js

@@ -59,16 +59,12 @@ export const mapProductions = (fn, Grammar) => {
   return MappedGrammar;
 };
 
-export const buildDebugEnhancers = (log) => {
-  return {
-    agast: (strategy) => logEmitted(strategy, '>>> ', log),
-    creeateBablrStrategy: (strategy) => logStrategy(strategy, '      ', log),
-    bablrProduction: createProductionLogger('    ', log),
-  };
+export const debugEnhancers = {
+  agast: (strategy) => logEmitted(strategy, '<<< '),
+  createBablrStrategy: (strategy) => logStrategy(strategy, '    >>> '),
+  bablrProduction: createProductionLogger('>>> '),
 };
 
-export const debugEnhancers = buildDebugEnhancers();
-
 export const stateEnhancer = (hooks, grammar) => {
   let state;
   return mapProductions((production) => {

package/lib/source.js

@@ -145,7 +145,7 @@ export const sourceFromQuasis = (quasis) => new StreamIterable(__sourceFromQuasi
 export function* fillGapsWith(expressions, stream) {
   let exprIdx = 0;
   let iter = getStreamIterator(stream);
-  let step;
+  let holding = false;
 
   for (;;) {
     let step = iter.next();
@@ -158,10 +158,19 @@ export function* fillGapsWith(expressions, stream) {
 
     const token = step.value;
 
+    if (token.type === 'Shift') {
+      holding = true;
+    }
+
     if (token.type === 'Gap') {
-      if (exprIdx >= expressions.length) throw new Error('not enough gaps for expressions');
-      yield* slice(2, -1, streamFromTree(expressions[exprIdx]));
-      exprIdx++;
+      if (holding) {
+        holding = false;
+        yield token;
+      } else {
+        if (exprIdx >= expressions.length) throw new Error('not enough gaps for expressions');
+        yield* slice(2, -1, streamFromTree(expressions[exprIdx]));
+        exprIdx++;
+      }
     } else {
       yield token;
     }

package/lib/trivia.js

@@ -6,7 +6,7 @@ const lookbehind = (context, s) => {
   let token = s.result;
   while (
     token &&
-    ['OpenNodeTag', 'CloseNodeTag', 'OpenFragmentTag', 'Reference'].includes(token.type) &&
+    ['OpenNodeTag', 'CloseNodeTag', 'Reference'].includes(token.type) &&
     (token.type !== 'OpenNodeTag' || !token.value.intrinsicValue)
   ) {
     const prevToken = context.getPreviousTerminal(token);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/helpers",
   "description": "Command helpers for use in writing BABLR grammars",
-  "version": "0.15.4",
+  "version": "0.16.0",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -26,25 +26,18 @@
     "clean": "macrome clean"
   },
   "dependencies": {
-    "@bablr/language_enhancer-debug-log": "0.2.1",
-    "@bablr/strategy_enhancer-debug-log": "0.1.1",
-    "@bablr/agast-helpers": "0.1.5",
-    "@bablr/agast-vm-helpers": "0.1.3",
+    "@bablr/language_enhancer-debug-log": "0.3.0",
+    "@bablr/strategy_enhancer-debug-log": "0.2.0",
+    "@bablr/agast-helpers": "0.1.6",
+    "@bablr/agast-vm-helpers": "0.1.5",
     "@bablr/coroutine": "0.1.0",
     "iter-tools-es": "^7.5.3"
   },
   "devDependencies": {
-    "@babel/cli": "7.22.15",
-    "@babel/core": "7.22.20",
-    "@babel/plugin-proposal-decorators": "7.22.15",
-    "@babel/plugin-transform-modules-commonjs": "^7.23.0",
-    "@babel/plugin-transform-runtime": "^7.22.15",
-    "@babel/runtime": "^7.23.2",
-    "@bablr/boot": "0.2.3",
+    "@bablr/boot": "0.2.4",
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#d834ccc52795d6c3b96ecc6c419960fceed221a6",
     "@bablr/macrome": "0.1.1",
-    "@bablr/macrome-generator-bablr": "0.2.0",
-    "babel-plugin-macros": "3.1.0",
+    "@bablr/macrome-generator-bablr": "0.3.1",
     "enhanced-resolve": "^5.12.0",
     "eslint": "^7.32.0",
     "eslint-import-resolver-enhanced-resolve": "^1.0.5",

package/lib/.babelrc.json

@@ -1,7 +0,0 @@
-{
-  "plugins": [
-    "babel-plugin-macros",
-    ["@babel/plugin-proposal-decorators", { "version": "2023-05" }],
-    ["@babel/plugin-transform-runtime", { "helpers": true, "version": "^7.22.15" }]
-  ]
-}