@bablr/helpers 0.25.3 → 0.25.5

package/lib/builders.js

@@ -1,3 +1,4 @@
+import { re } from '@bablr/boot';
 import { interpolateFragment, buildFilledGapFunction } from '@bablr/agast-helpers/template';
 import { get, isEmpty, treeFromStreamSync as treeFromStream } from '@bablr/agast-helpers/tree';
 import { buildLiteralTag as agastBuildLiteralTag } from '@bablr/agast-helpers/builders';
@@ -5,7 +6,7 @@ import * as t from '@bablr/agast-helpers/shorthand';
 import * as Tags from '@bablr/agast-helpers/tags';
 import * as l from '@bablr/agast-vm-helpers/languages';
 import { concat } from '@bablr/agast-vm-helpers/iterable';
-import { buildNullNode } from '@bablr/agast-helpers/path';
+import { buildNullNode, getRoot } from '@bablr/agast-helpers/path';
 
 const { freeze } = Object;
 const { isArray } = Array;
@@ -1115,3 +1116,37 @@ export const buildRegexString = (content) => {
 export const buildGapNodeMatcher = () => {
   return buildToken('GapNodeMatcher', '<//>');
 };
+
+// problem: the concrete syntax is only right in some contexts (spans)
+const escaped = {
+  '\\': re.Character`\\`,
+  '/': re.Character`\/`,
+  '(': re.Character`\(`,
+  ')': re.Character`\)`,
+  '[': re.Character`\[`,
+  ']': re.Character`\]`,
+  '{': re.Character`\{`,
+  '}': re.Character`\}`,
+  '+': re.Character`\+`,
+  '*': re.Character`\*`,
+  '<': re.Character`\<`,
+  '>': re.Character`\>`,
+  '^': re.Character`\^`,
+  '|': re.Character`\|`,
+};
+
+export const buildLiteralElements = (chrs) => {
+  return buildElements(
+    [...chrs].map((chr) => {
+      if ('\\/(){}[]+*^$?|<>'.includes(chr)) {
+        return getRoot(escaped[chr]);
+      } else {
+        return getRoot(
+          re.Character({
+            raw: [chr],
+          }),
+        );
+      }
+    }),
+  );
+};

package/lib/grammar.js

@@ -135,7 +135,7 @@ const __buildDependentLanguages = (language, languages = new Map()) => {
       languages.has(dependentLanguage.canonicalURL) &&
       languages.get(dependentLanguage.canonicalURL) !== dependentLanguage
     ) {
-      throw new Error('url clash');
+      throw new Error('url clash: ' + dependentLanguage.canonicalURL);
     }
 
     __buildDependentLanguages(dependentLanguage, languages);
@@ -368,6 +368,10 @@ export const startSpan = (name, guard, props = {}) => {
   return __buildCall('startSpan', name, guard, o(props));
 };
 
+export const startSubspan = (name, guard, props = {}) => {
+  return __buildCall('startSubspan', name, guard, o(props));
+};
+
 export const endSpan = () => {
   return __buildCall('endSpan');
 };

package/lib/trivia.js

@@ -23,11 +23,11 @@ import {
 import { reifyExpression } from '@bablr/agast-vm-helpers';
 
 export const triviaEnhancer = (
-  { triviaIsAllowed, triviaIsRequired = () => false, triviaMatcher },
+  { triviaIsAllowed, triviaIsRequired = () => false, triviaMatcher, Trivia },
   grammar,
 ) => {
-  let Trivia_ = 'Trivia';
-  let Literal_ = 'Literal';
+  let Trivia_ = 'Trivia_';
+  let Literal_ = 'Literal_';
 
   while (grammar.prototype[Trivia_]) Trivia_ += '_';
   while (grammar.prototype[Literal_]) Literal_ += '_';
@@ -35,9 +35,13 @@ export const triviaEnhancer = (
   let tmi = eatMatch(triviaMatcher);
   let literalMatcher = get(['nodeMatcher', 'open', 'literalValue'], triviaMatcher.value);
 
+  function* DefaultTrivia() {
+    yield tmi;
+  }
+
   let resultGrammar = mapProductions((production) => {
     return function* (props) {
-      let co = new Coroutine(production(props));
+      let co = new Coroutine(production.call(this, props));
       let outerProps = props;
       let { type, getState, s, flags, isCover, isCoverBoundary: thisIsCoverBoundary } = props;
       let isRootFragment = type === Symbol.for('__') && !s().depths.path;
@@ -62,6 +66,7 @@ export const triviaEnhancer = (
             case 'guard': {
               let { 0: matcher, 1: props, 2: options } = args;
               let s = getState();
+              let isShift = verb === 'shiftMatch';
 
               let isCoverBoundary = co.done
                 ? thisIsCoverBoundary
@@ -72,7 +77,7 @@ export const triviaEnhancer = (
                     !isCover);
 
               if (matcher.type === Regex || typeof matcher === 'string') {
-                if (triviaIsAllowed(s) && !flags.token) {
+                if (triviaIsAllowed(s, matcher, props) && !flags.token) {
                   if (literalMatcher) {
                     let literalResult = yield buildCall(
                       'match',
@@ -104,6 +109,7 @@ export const triviaEnhancer = (
                       matchTrailing: false,
                     }),
                     o({
+                      allowEmpty: true,
                       suppressGap: true,
                     }),
                   );
@@ -121,8 +127,8 @@ export const triviaEnhancer = (
                   getCooked(get(['refMatcher', 'type'], matcher.value)) !== '#')
               ) {
                 if (
-                  triviaIsAllowed(s) &&
-                  !(getState().holding || co.done) &&
+                  triviaIsAllowed(s, matcher, props) &&
+                  !(getState().holding || co.done || isShift) &&
                   get(['valueMatcher', 'nodeMatcher'], matcher.value).value.name?.description ===
                     'TreeNodeMatcher'
                 ) {
@@ -162,9 +168,11 @@ export const triviaEnhancer = (
                     o({
                       matcher,
                       props,
-                      matchTrailing: isRootFragment,
                     }),
-                    ...(options ? [options] : []),
+                    o({
+                      suppressGap: true,
+                      ...options?.value,
+                    }),
                   );
                 }
               }
@@ -225,7 +233,11 @@ export const triviaEnhancer = (
       return grammar;
     }
 
-    *[Trivia_]({ props: { matchTrailing, matcher, props, options } }) {
+    Trivia(args) {
+      return Trivia ? Trivia(args) : DefaultTrivia(args);
+    }
+
+    *[Trivia_]({ props: { matcher, props, options } }) {
       yield tmi;
       let returnValue = yield eat(
         // TODO fixme binding tag
@@ -240,9 +252,8 @@ export const triviaEnhancer = (
         props,
         buildEmbeddedObject({ ...(options?.value || {}), shift: false }),
       );
-      if (matchTrailing || returnValue.value?.shift) {
-        yield tmi;
-      }
+      yield tmi;
+
       return returnValue.value;
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/helpers",
   "description": "Command helpers for use in writing BABLR grammars",
-  "version": "0.25.3",
+  "version": "0.25.5",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -24,12 +24,12 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/language_enhancer-debug-log": "0.12.3",
-    "@bablr/strategy_enhancer-debug-log": "0.11.2",
+    "@bablr/language_enhancer-debug-log": "0.12.4",
+    "@bablr/strategy_enhancer-debug-log": "0.11.3",
     "@bablr/stream-iterator": "2.0.0",
-    "@bablr/agast-helpers": "0.10.4",
-    "@bablr/agast-vm-helpers": "0.10.4",
-    "@bablr/boot": "0.11.3",
+    "@bablr/agast-helpers": "0.10.10",
+    "@bablr/agast-vm-helpers": "0.10.5",
+    "@bablr/boot": "0.11.4",
     "@bablr/coroutine": "0.1.0",
     "iter-tools-es": "^7.5.3"
   },