@bablr/helpers 0.15.4 → 0.17.0

package/lib/enhancers.js

@@ -3,7 +3,7 @@ import {
   enhanceStrategyBuilderWithEmittedLogging as logEmitted,
 } from '@bablr/strategy_enhancer-debug-log';
 import { enhanceProductionWithDebugLogging as createProductionLogger } from '@bablr/language_enhancer-debug-log';
-import { getPrototypeOf } from './object.js';
+import { getOwnPropertySymbols, getPrototypeOf } from './object.js';
 
 const { getOwnPropertyNames, hasOwn } = Object;
 
@@ -47,8 +47,8 @@ export const mapProductions = (fn, Grammar) => {
 
   const mapped = MappedGrammar.prototype;
 
-  while (prototype) {
-    for (const key of getOwnPropertyNames(prototype)) {
+  while (prototype && prototype !== Object.prototype) {
+    for (const key of [...getOwnPropertyNames(prototype), ...getOwnPropertySymbols(prototype)]) {
       if (!hasOwn(mapped, key)) {
         mapped[key] = fn(prototype[key], key);
       }
@@ -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/productions.js

@@ -4,9 +4,7 @@
  * This file is autogenerated. Please do not edit it directly.
  * When editing run `npx macrome watch` then change the file this is generated from.
  */
-import { interpolateString as _interpolateString } from "@bablr/agast-helpers/template";
-import { interpolateArrayChildren as _interpolateArrayChildren } from "@bablr/agast-helpers/template";
-import { interpolateArray as _interpolateArray } from "@bablr/agast-helpers/template";
+import { interpolateArray as _interpolateArray, interpolateArrayChildren as _interpolateArrayChildren, interpolateString as _interpolateString } from "@bablr/agast-helpers/template";
 import * as _l from "@bablr/agast-vm-helpers/languages";
 import * as _t from "@bablr/agast-helpers/shorthand";
 export function* List({

package/lib/source.js

@@ -9,7 +9,7 @@ const escapables = {
   0: '\0',
 };
 
-function* __sourceFromReadStream(stream) {
+function* __readFromStream(stream) {
   let iter = stream[Symbol.asyncIterator]();
   let step;
 
@@ -26,12 +26,12 @@ function* __sourceFromReadStream(stream) {
   }
 }
 
-export const sourceFromReadStream = (stream) => new StreamIterable(__sourceFromReadStream(stream));
+export const readFromStream = (stream) => new StreamIterable(__readFromStream(stream));
 
 const gapStr = '<//>';
 
-function* __embeddedSourceFromReadStream(stream) {
-  let iter = getStreamIterator(sourceFromReadStream(stream));
+function* __embeddedSourceFrom(iterable) {
+  let iter = getStreamIterator(iterable);
   let step;
   let escape = false;
   let gapMatchIdx = 0;
@@ -89,8 +89,7 @@ function* __embeddedSourceFromReadStream(stream) {
   }
 }
 
-export const embeddedSourceFromReadStream = (stream) =>
-  new StreamIterable(__embeddedSourceFromReadStream(stream));
+export const embeddedSourceFrom = (iterable) => new StreamIterable(__embeddedSourceFrom(iterable));
 
 function* __sourceFromTokenStream(terminals) {
   let iter = getStreamIterator(terminals);
@@ -142,10 +141,10 @@ function* __sourceFromQuasis(quasis) {
 
 export const sourceFromQuasis = (quasis) => new StreamIterable(__sourceFromQuasis(quasis));
 
-export function* fillGapsWith(expressions, stream) {
+export function* fillGapsWith(expressions, iterable) {
   let exprIdx = 0;
-  let iter = getStreamIterator(stream);
-  let step;
+  let iter = getStreamIterator(iterable);
+  let holding = false;
 
   for (;;) {
     let step = iter.next();
@@ -158,10 +157,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;
     }
@@ -174,8 +182,8 @@ export function* fillGapsWith(expressions, stream) {
 
 const none = Symbol('none');
 
-function* __stripTrailingNewline(stream) {
-  const iter = getStreamIterator(stream);
+function* __stripTrailingNewline(iterable) {
+  const iter = getStreamIterator(iterable);
   let step = iter.next();
   let lastValue = none;
 
@@ -205,4 +213,5 @@ function* __stripTrailingNewline(stream) {
   }
 }
 
-export const stripTrailingNewline = (stream) => new StreamIterable(__stripTrailingNewline(stream));
+export const stripTrailingNewline = (iterable) =>
+  new StreamIterable(__stripTrailingNewline(iterable));

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);
@@ -39,7 +39,7 @@ export const triviaEnhancer = ({ triviaIsAllowed, eatMatchTrivia }, grammar) =>
             case 'eatMatch':
             case 'match':
             case 'guard': {
-              if (matcher && matcher.type && !matcher.flags.trivia) {
+              if (matcher && !matcher.flags?.trivia) {
                 const previous = lookbehind(ctx, s);
                 if (triviaIsAllowed(s) && (!previous || !matchedResults.has(previous))) {
                   matchedResults.add(previous);

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.17.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.4.0",
+    "@bablr/strategy_enhancer-debug-log": "0.3.0",
+    "@bablr/agast-helpers": "0.2.0",
+    "@bablr/agast-vm-helpers": "0.2.0",
     "@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.3.0",
     "@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" }]
-  ]
-}