@bablr/helpers 0.16.0 → 0.18.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);
       }
@@ -60,7 +60,7 @@ export const mapProductions = (fn, Grammar) => {
 };
 
 export const debugEnhancers = {
-  agast: (strategy) => logEmitted(strategy, '<<< '),
+  // agast: (strategy) => logEmitted(strategy, '<<< '),
   createBablrStrategy: (strategy) => logStrategy(strategy, '    >>> '),
   bablrProduction: createProductionLogger('>>> '),
 };

package/lib/grammar.js

@@ -1,12 +1,21 @@
 import every from 'iter-tools-es/methods/every';
 import isString from 'iter-tools-es/methods/is-string';
-import { objectEntries, getPrototypeOf } from './object.js';
+import objectEntries from 'iter-tools-es/methods/object-entries';
+import { getPrototypeOf } from './object.js';
 
 const { isArray } = Array;
 const isSymbol = (value) => typeof value === 'symbol';
 const isType = (value) => isString(value) || isSymbol(value);
 
-export const resolveLanguage = (language, path) => {
+export const resolveLanguage = (context, language, path) => {
+  if (isString(path)) {
+    if (language.canonicalURL === path) {
+      return language;
+    } else {
+      throw new Error('absolute path resolution not implemented');
+    }
+  }
+
   let l = language;
 
   if (!l) {
@@ -28,6 +37,20 @@ export const resolveLanguage = (language, path) => {
   return l;
 };
 
+export const unresolveLanguage = (context, baseLanguage, absoluteLanguage) => {
+  if (absoluteLanguage == null || absoluteLanguage === baseLanguage.canonicalURL) {
+    return null;
+  }
+
+  for (const { 0: key, 1: value } of objectEntries(baseLanguage.dependencies)) {
+    if (value.canonicalURL === absoluteLanguage) {
+      return [key];
+    }
+  }
+
+  throw new Error('Cannot currently unresolve nested deps');
+};
+
 export const explodeSubtypes = (aliases, exploded, types) => {
   for (const type of types) {
     const explodedTypes = aliases.get(type);

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,9 +141,9 @@ 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 iter = getStreamIterator(iterable);
   let holding = false;
 
   for (;;) {
@@ -183,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;
 
@@ -214,4 +213,5 @@ function* __stripTrailingNewline(stream) {
   }
 }
 
-export const stripTrailingNewline = (stream) => new StreamIterable(__stripTrailingNewline(stream));
+export const stripTrailingNewline = (iterable) =>
+  new StreamIterable(__stripTrailingNewline(iterable));

package/lib/stream.js

@@ -0,0 +1,85 @@
+import { Coroutine } from '@bablr/coroutine';
+import {
+  generatePrettyCSTMLStrategy as generatePrettyCSTML,
+  generateCSTMLStrategy as generateCSTML,
+  stringFromStream,
+  generateStandardOutput,
+  getStreamIterator,
+  StreamIterable,
+} from '@bablr/agast-helpers/stream';
+import isString from 'iter-tools-es/methods/is-string';
+import emptyStack from '@iter-tools/imm-stack';
+
+import { unresolveLanguage } from './grammar.js';
+
+// bad: wrecks tree by breaking weak linkages
+function* __resolveTerminals(ctx, terminals) {
+  const co = new Coroutine(getStreamIterator(terminals));
+  let languages = emptyStack;
+
+  for (;;) {
+    co.advance();
+
+    if (co.current instanceof Promise) {
+      co.current = yield co.current;
+    }
+
+    if (co.done) break;
+
+    const terminal = co.value;
+
+    if (terminal.type === 'DoctypeTag') {
+      languages = languages.push(ctx.languages.get(terminal.value.attributes['bablr-language']));
+    }
+
+    if (terminal.type === 'CloseNodeTag') {
+      languages = languages.pop();
+    }
+
+    if (terminal.type === 'OpenNodeTag') {
+      if (isString(terminal.value.language)) {
+        const currentLanguage = languages.value;
+        const nodeLanguageURL = terminal.value.language;
+        const nodeLanguage = ctx.languages.get(nodeLanguageURL);
+
+        languages = languages.push(nodeLanguage);
+
+        yield {
+          type: 'OpenNodeTag',
+          value: {
+            ...terminal.value,
+            language: unresolveLanguage(ctx, currentLanguage, nodeLanguageURL),
+          },
+        };
+      } else {
+        yield terminal;
+      }
+    } else {
+      yield terminal;
+    }
+  }
+}
+
+export const resolveTerminals = (ctx, terminals) => {
+  return new StreamIterable(__resolveTerminals(ctx, terminals));
+};
+
+export const generatePrettyCSTMLStrategy = (terminals, options = {}) => {
+  const { ctx } = options;
+
+  return generatePrettyCSTML(ctx ? resolveTerminals(ctx, terminals) : terminals, options);
+};
+
+export const printPrettyCSTML = (terminals, options = {}) => {
+  return stringFromStream(generateStandardOutput(generatePrettyCSTMLStrategy(terminals, options)));
+};
+
+export const generateCSTMLStrategy = (terminals, options = {}) => {
+  const { ctx } = options;
+
+  return generateCSTML(ctx ? resolveTerminals(ctx, terminals) : terminals, options);
+};
+
+export const printCSTML = (terminals, options = {}) => {
+  return stringFromStream(generateStandardOutput(generateCSTMLStrategy(terminals, options)));
+};

package/lib/tree.js

@@ -0,0 +1,8 @@
+import { streamFromTree } from '@bablr/agast-helpers/tree';
+
+import { printPrettyCSTML as printPrettyCSTMLFromStream } from './stream.js';
+
+export const printPrettyCSTML = (rootNode, options = {}) => {
+  // i need a context-aware streamFromTree here to build a stream with linked terminals...?
+  return printPrettyCSTMLFromStream(streamFromTree(rootNode), options);
+};

package/lib/trivia.js

@@ -7,7 +7,7 @@ const lookbehind = (context, s) => {
   while (
     token &&
     ['OpenNodeTag', 'CloseNodeTag', 'Reference'].includes(token.type) &&
-    (token.type !== 'OpenNodeTag' || !token.value.intrinsicValue)
+    (token.type !== 'OpenNodeTag' || !(token.value.flags.intrinsic && token.value.flags.token))
   ) {
     const prevToken = context.getPreviousTerminal(token);
     if (!prevToken) break;
@@ -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.16.0",
+  "version": "0.18.0",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -16,7 +16,9 @@
     "./productions": "./lib/productions.js",
     "./shorthand": "./lib/shorthand.js",
     "./source": "./lib/source.js",
+    "./stream": "./lib/stream.js",
     "./symbols": "./lib/symbols.js",
+    "./tree": "./lib/tree.js",
     "./trivia": "./lib/trivia.js"
   },
   "sideEffects": false,
@@ -26,17 +28,18 @@
     "clean": "macrome clean"
   },
   "dependencies": {
-    "@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/language_enhancer-debug-log": "0.5.0",
+    "@bablr/strategy_enhancer-debug-log": "0.4.0",
+    "@bablr/agast-helpers": "0.3.1",
+    "@bablr/agast-vm-helpers": "0.3.1",
     "@bablr/coroutine": "0.1.0",
+    "@iter-tools/imm-stack": "1.1.0",
     "iter-tools-es": "^7.5.3"
   },
   "devDependencies": {
-    "@bablr/boot": "0.2.4",
+    "@bablr/boot": "0.4.0",
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#d834ccc52795d6c3b96ecc6c419960fceed221a6",
-    "@bablr/macrome": "0.1.1",
+    "@bablr/macrome": "0.1.3",
     "@bablr/macrome-generator-bablr": "0.3.1",
     "enhanced-resolve": "^5.12.0",
     "eslint": "^7.32.0",