@bablr/cli 0.3.1 → 0.4.1

package/bin/index.js

@@ -3,12 +3,13 @@
 /* global process */
 
 import { program } from 'commander';
-import { streamParse } from 'bablr';
+import { streamParse, Context, AgastContext } from 'bablr';
 import { embeddedSourceFrom, readFromStream, stripTrailingNewline } from '@bablr/helpers/source';
 import { debugEnhancers } from '@bablr/helpers/enhancers';
 import colorSupport from 'color-support';
 import { evaluateIO } from '@bablr/io-vm-node';
 import { createPrintCSTMLStrategy } from '../lib/syntax.js';
+import { buildFullyQualifiedSpamMatcher } from '@bablr/agast-vm-helpers';
 
 program
   .option('-l, --language [URL]', 'The URL of the top BABLR language')
@@ -39,26 +40,31 @@ const options = {
 
 const language = await import(options.language);
 
+const matcher = buildFullyQualifiedSpamMatcher({}, language.canonicalURL, options.production);
+
 const logStderr = (...args) => {
   process.stderr.write(args.join(' ') + '\n');
 };
 
 const enhancers = options.verbose ? { ...debugEnhancers, agast: null } : {};
 
+const ctx = Context.from(AgastContext.create(), language, enhancers.bablrProduction);
+
 const rawStream = process.stdin.setEncoding('utf-8');
 
 await evaluateIO(
   createPrintCSTMLStrategy(
     streamParse(
-      language,
-      options.production,
+      ctx,
+      matcher,
       options.embedded
         ? embeddedSourceFrom(readFromStream(rawStream))
         : stripTrailingNewline(readFromStream(rawStream)),
       {},
       { enhancers, emitEffects: true },
-    ).tokens,
+    ),
     {
+      ctx,
       emitEffects: !!options.verbose,
       color: options.color,
       format: options.format,

package/lib/syntax.js

@@ -1,25 +1,27 @@
 /* global process Promise */
 
+import emptyStack from '@iter-tools/imm-stack';
 import * as cstml from '@bablr/language-en-cstml';
 import * as verboseOutput from '@bablr/language-en-bablr-cli-verbose-output';
-import { streamParse } from 'bablr/enhanceable';
+import { streamParse, Context, AgastContext } from 'bablr/enhanceable';
 import { Coroutine } from '@bablr/coroutine';
+import { StreamIterable, getStreamIterator, generateAllOutput } from '@bablr/agast-helpers/stream';
 import {
-  StreamIterable,
-  getStreamIterator,
-  generateCSTMLStrategy as generatePlainCSTMLStrategy,
   generatePrettyCSTMLStrategy,
-  generateAllOutput,
-} from '@bablr/agast-helpers/stream';
+  generateCSTMLStrategy as generatePlainCSTMLStrategy,
+} from '@bablr/helpers/stream';
 import {
   buildWriteEffect,
   buildAnsiPushEffect,
   buildAnsiPopEffect,
 } from '@bablr/agast-helpers/builders';
+import { buildFullyQualifiedSpamMatcher } from '@bablr/agast-vm-helpers';
 
 function* __higlightStrategy(context, tokens) {
   const co = new Coroutine(getStreamIterator(tokens));
 
+  let types = emptyStack;
+
   let currentRef;
 
   co.advance();
@@ -35,7 +37,9 @@ function* __higlightStrategy(context, tokens) {
 
     if (token.type === 'OpenNodeTag') {
       const tagType = token.value.type;
-      const currentType = context.agast.nodeForTag(token).parent?.type;
+      const currentType = types.value;
+
+      types = types.push(tagType);
 
       if (tagType === 'Literal' || (tagType === 'String' && currentRef.name === 'intrinsicValue')) {
         if (tagType === 'Literal' || currentType === 'OpenNodeTag') {
@@ -77,6 +81,7 @@ function* __higlightStrategy(context, tokens) {
     }
 
     if (token.type === 'CloseNodeTag') {
+      types = types.pop();
       yield buildAnsiPopEffect();
     }
 
@@ -98,7 +103,10 @@ export const higlightStrategy = (context, tokens) => {
 export const createPrintCSTMLStrategy =
   (tokens, options = {}) =>
   () => {
-    const strategyOptions = { emitEffects: options.emitEffects, inline: false };
+    const strategyOptions = {
+      ctx: options.ctx,
+      emitEffects: options.emitEffects,
+    };
     const outputInstructions = options.format
       ? generatePrettyCSTMLStrategy(tokens, strategyOptions)
       : generatePlainCSTMLStrategy(tokens, strategyOptions);
@@ -106,9 +114,16 @@ export const createPrintCSTMLStrategy =
     if (options.color) {
       const input = generateAllOutput(outputInstructions);
 
-      const { context, tokens } = options.emitEffects
-        ? streamParse(verboseOutput, 'Output', input)
-        : streamParse(cstml, 'Document', input);
+      const language = options.emitEffects ? verboseOutput : cstml;
+      const type = options.emitEffects ? 'Output' : 'Document';
+
+      const context = Context.from(AgastContext.create(), language);
+
+      const tokens = streamParse(
+        context,
+        buildFullyQualifiedSpamMatcher({}, language.canonicalURL, type),
+        input,
+      );
 
       return higlightStrategy(context, tokens);
     } else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/cli",
   "description": "CLI for running BABLR parsers",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -17,14 +17,16 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.2.0",
-    "@bablr/io-vm-node": "0.2.2",
-    "@bablr/boot": "0.3.0",
+    "@bablr/agast-helpers": "0.3.2",
+    "@bablr/agast-vm-helpers": "0.3.1",
+    "@bablr/io-vm-node": "0.3.0",
+    "@bablr/boot": "0.4.0",
     "@bablr/coroutine": "0.1.0",
-    "@bablr/helpers": "0.17.0",
-    "@bablr/language-en-cstml": "0.4.0",
-    "@bablr/language-en-bablr-cli-verbose-output": "0.2.0",
-    "bablr": "0.3.0",
+    "@bablr/helpers": "0.18.0",
+    "@bablr/language-en-cstml": "0.4.1",
+    "@bablr/language-en-bablr-cli-verbose-output": "0.3.0",
+    "@iter-tools/imm-stack": "1.1.0",
+    "bablr": "0.4.0",
     "color-support": "1.1.3",
     "commander": "12.0.0"
   },