@bablr/helpers 0.1.1 → 0.1.3

package/lib/grammar.js

@@ -1,6 +1,6 @@
 import every from 'iter-tools-es/methods/every';
 import isString from 'iter-tools-es/methods/is-string';
-import { objectEntries } from './object.js';
+import { objectEntries, getPrototypeOf } from './object.js';
 
 const { isArray } = Array;
 const isSymbol = (value) => typeof value === 'symbol';
@@ -38,3 +38,70 @@ export const buildCovers = (rawAliases) => {
 
   return new Map(aliases);
 };
+
+export const getProduction = (grammar, type) => {
+  return getPrototypeOf(grammar)[type];
+};
+
+export class Coroutine {
+  static from(grammar, type, props) {
+    const production = grammar.get(type);
+
+    if (!production) throw new Error(`Unknown production of {type: ${type}}`);
+
+    return new Coroutine(production.match(props));
+  }
+
+  constructor(generator) {
+    this.generator = generator;
+  }
+
+  get value() {
+    return this.current.value;
+  }
+
+  get done() {
+    return this.current?.done;
+  }
+
+  advance(value) {
+    if (this.done) {
+      throw new Error('Cannot advance a coroutine that is done');
+    }
+    this.current = this.generator.next(value);
+    return this;
+  }
+
+  return(value) {
+    if (!this.done) {
+      this.current = this.generator.return(value);
+    } else {
+      return this.current;
+    }
+  }
+
+  throw(value) {
+    if (!this.done) {
+      this.current = { value: undefined, done: true };
+
+      let caught = false;
+      try {
+        this.generator.throw(value);
+      } catch (e) {
+        caught = true;
+      }
+      if (!caught) {
+        throw new Error('Generator attempted to yield a command after failing');
+      }
+    } else {
+      throw value;
+    }
+  }
+
+  finalize() {
+    // ensures failures can be logged!
+    if (!this.done) {
+      this.throw('failure');
+    }
+  }
+}

package/lib/object.js

@@ -1,6 +1,6 @@
 import map from 'iter-tools-es/methods/map';
 
-export const { hasOwn, getOwnPropertySymbols, fromEntries } = Object;
+export const { hasOwn, getOwnPropertySymbols, getPrototypeOf, fromEntries } = Object;
 
 export const isObject = (obj) => obj !== null && typeof obj === 'object';
 export const { isArray } = Array;

package/lib/productions.generated.js

@@ -13,7 +13,7 @@ export function* List({
   for (;;) {
     it = yield _t.node("Instruction", "Call", [_t.ref`verb`, _t.ref`arguments`], {
       verb: _t.node("Instruction", "Identifier", [_t.lit`eatMatch`], {}, {}),
-      arguments: _t.node("Instruction", "Tuple", [_t.ref`open`, _t.ref`values`, _t.ref`close`], {
+      arguments: _t.node("Instruction", "Tuple", [_t.ref`open`, _t.ref`values[]`, _t.ref`close`], {
         open: _t.node("Instruction", "Punctuator", [_t.lit`(`], {}, {}),
         values: [..._interpolateArray(element)],
         close: _t.node("Instruction", "Punctuator", [_t.lit`)`], {}, {})
@@ -22,7 +22,7 @@ export function* List({
     if (it || allowTrailingSeparator) {
       sep = yield _t.node("Instruction", "Call", [_t.ref`verb`, _t.ref`arguments`], {
         verb: _t.node("Instruction", "Identifier", [_t.lit`eatMatch`], {}, {}),
-        arguments: _t.node("Instruction", "Tuple", [_t.ref`open`, _t.ref`values`, _t.ref`close`], {
+        arguments: _t.node("Instruction", "Tuple", [_t.ref`open`, _t.ref`values[]`, _t.ref`close`], {
           open: _t.node("Instruction", "Punctuator", [_t.lit`(`], {}, {}),
           values: [..._interpolateArray(separator)],
           close: _t.node("Instruction", "Punctuator", [_t.lit`)`], {}, {})
@@ -40,7 +40,7 @@ export function* Any({
   for (const matcher of matchers) {
     if (yield _t.node("Instruction", "Call", [_t.ref`verb`, _t.ref`arguments`], {
       verb: _t.node("Instruction", "Identifier", [_t.lit`eatMatch`], {}, {}),
-      arguments: _t.node("Instruction", "Tuple", [_t.ref`open`, _t.ref`values`, _t.ref`close`], {
+      arguments: _t.node("Instruction", "Tuple", [_t.ref`open`, _t.ref`values[]`, _t.ref`close`], {
         open: _t.node("Instruction", "Punctuator", [_t.lit`(`], {}, {}),
         values: [..._interpolateArray(matcher)],
         close: _t.node("Instruction", "Punctuator", [_t.lit`)`], {}, {})
@@ -56,7 +56,7 @@ export function* All({
   for (const matcher of matchers) {
     yield _t.node("Instruction", "Call", [_t.ref`verb`, _t.ref`arguments`], {
       verb: _t.node("Instruction", "Identifier", [_t.lit`eat`], {}, {}),
-      arguments: _t.node("Instruction", "Tuple", [_t.ref`open`, _t.ref`values`, _t.ref`close`], {
+      arguments: _t.node("Instruction", "Tuple", [_t.ref`open`, _t.ref`values[]`, _t.ref`close`], {
         open: _t.node("Instruction", "Punctuator", [_t.lit`(`], {}, {}),
         values: [..._interpolateArray(matcher)],
         close: _t.node("Instruction", "Punctuator", [_t.lit`)`], {}, {})
@@ -74,7 +74,7 @@ export function* Optional({
   }
   yield _t.node("Instruction", "Call", [_t.ref`verb`, _t.ref`arguments`], {
     verb: _t.node("Instruction", "Identifier", [_t.lit`eatMatch`], {}, {}),
-    arguments: _t.node("Instruction", "Tuple", [_t.ref`open`, _t.ref`values`, _t.ref`close`], {
+    arguments: _t.node("Instruction", "Tuple", [_t.ref`open`, _t.ref`values[]`, _t.ref`close`], {
       open: _t.node("Instruction", "Punctuator", [_t.lit`(`], {}, {}),
       values: [..._interpolateArray(matchers[0])],
       close: _t.node("Instruction", "Punctuator", [_t.lit`)`], {}, {})

package/lib/trivia.js

@@ -0,0 +1,84 @@
+import { getCooked } from './token.js';
+import { mapProductions } from './enhancers.js';
+import { Coroutine } from './grammar.js';
+
+const lookbehind = (context, s) => {
+  let token = s.result;
+  while (['OpenNode', 'CloseNode', 'OpenFragmentNode', 'Reference'].includes(token.type)) {
+    const prevToken = context.getPreviousTerminal(token);
+    if (!prevToken) break;
+    token = prevToken;
+  }
+  return token;
+};
+
+// eslint-disable-next-line no-undef
+const matchedResults = new WeakSet();
+
+export const triviaEnhancer = ({ spaceIsAllowed, eatMatchTrivia }, grammar) => {
+  return mapProductions((production) => {
+    return function* (props, s, ctx, ...args) {
+      const co = new Coroutine(production(props, s, ctx, ...args));
+
+      co.advance();
+
+      try {
+        while (!co.done) {
+          const instr = co.value;
+          let returnValue = undefined;
+
+          const {
+            verb: verbToken,
+            verbSuffix: verbSuffixToken,
+            arguments: {
+              properties: { values: { 0: matcher } = [] },
+            },
+          } = instr.properties;
+          const verb = getCooked(verbToken);
+          const verbSuffix = verbSuffixToken && getCooked(verbSuffixToken);
+
+          switch (verb) {
+            case 'eat':
+            case 'eatMatch':
+            case 'match':
+            case 'guard': {
+              if (
+                ((['String', 'Pattern'].includes(matcher.type) && !s.isTerminal) ||
+                  matcher.type === 'TerminalMatcher') &&
+                verbSuffix !== '#'
+              ) {
+                const previous = lookbehind(ctx, s);
+                if (spaceIsAllowed(s) && !matchedResults.has(previous)) {
+                  matchedResults.add(previous);
+                  yield eatMatchTrivia;
+                  matchedResults.add(s.result);
+                }
+              }
+
+              returnValue = returnValue || (yield instr);
+              break;
+            }
+
+            default:
+              returnValue = yield instr;
+              break;
+          }
+
+          co.advance(returnValue);
+        }
+
+        if (!s.isTerminal) {
+          const previous = lookbehind(ctx, s);
+          if (spaceIsAllowed(s) && !matchedResults.has(previous)) {
+            matchedResults.add(previous);
+            yield eatMatchTrivia;
+            matchedResults.add(s.result);
+          }
+        }
+      } catch (e) {
+        co.throw(e);
+        throw e;
+      }
+    };
+  }, grammar);
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/helpers",
   "description": "Command helpers for use in writing BABLR grammars",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -16,7 +16,8 @@
     "./productions": "./lib/productions.generated.js",
     "./shorthand": "./lib/shorthand.js",
     "./symbols": "./lib/symbols.js",
-    "./token": "./lib/token.js"
+    "./token": "./lib/token.js",
+    "./trivia": "./lib/trivia.js"
   },
   "sideEffects": false,
   "scripts": {
@@ -24,8 +25,8 @@
     "clean": "rm lib/productions.generated.js"
   },
   "dependencies": {
-    "@bablr/boot": "0.1.1",
-    "@bablr/boot-helpers": "0.1.1",
+    "@bablr/boot": "0.1.6",
+    "@bablr/boot-helpers": "0.1.3",
     "iter-tools-es": "^7.5.3"
   },
   "devDependencies": {