@bablr/cli 0.6.4 → 0.7.0

package/bin/index.js

@@ -3,13 +3,18 @@
 /* global process */
 
 import { program } from 'commander';
-import { streamParse, Context, AgastContext } from 'bablr';
+import { streamParse, Context } 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/helpers/builders';
+import { generateCSTML } from '../lib/syntax.js';
+import {
+  buildBasicNodeMatcher,
+  buildOpenNodeMatcher,
+  buildPropertyMatcher,
+} from '@bablr/helpers/builders';
+import { buildEmbeddedMatcher, evaluateReturnAsync } from '@bablr/agast-helpers/tree';
 
 program
   .name('bablr')
@@ -42,10 +47,13 @@ const options = {
 
 const language = await import(options.language);
 
-const matcher = buildFullyQualifiedSpamMatcher(
-  { hasGap: options.gaps },
-  language.canonicalURL,
-  options.production,
+const matcher = buildEmbeddedMatcher(
+  buildPropertyMatcher(
+    null,
+    buildBasicNodeMatcher(
+      buildOpenNodeMatcher({ hasGap: options.gaps }, language.canonicalURL, options.production),
+    ),
+  ),
 );
 
 const logStderr = (...args) => {
@@ -54,12 +62,12 @@ const logStderr = (...args) => {
 
 const enhancers = options.verbose ? { ...debugEnhancers, agast: null } : {};
 
-const ctx = Context.from(AgastContext.create(), language, enhancers.bablrProduction);
+const ctx = Context.from(language, enhancers.bablrProduction);
 
 const rawStream = process.stdin.setEncoding('utf-8');
 
-await evaluateIO(
-  createPrintCSTMLStrategy(
+const output = evaluateIO(() =>
+  generateCSTML(
     streamParse(
       ctx,
       matcher,
@@ -71,9 +79,11 @@ await evaluateIO(
     ),
     {
       ctx,
-      emitEffects: !!options.verbose,
       color: options.color,
       format: options.format,
+      emitEffects: true,
     },
   ),
 );
+
+await evaluateReturnAsync(output);

package/lib/syntax.js

@@ -3,23 +3,30 @@
 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, Context, AgastContext } from 'bablr/enhanceable';
+import { streamParse, Context } from 'bablr/enhanceable';
 import { Coroutine } from '@bablr/coroutine';
-import { StreamIterable, getStreamIterator, generateAllOutput } from '@bablr/agast-helpers/stream';
 import {
-  generatePrettyCSTMLStrategy,
-  generateCSTMLStrategy as generatePlainCSTMLStrategy,
-} from '@bablr/helpers/stream';
+  StreamIterable,
+  generateAllOutput,
+  getStreamIterator,
+  writeCSTMLStrategy,
+  writePrettyCSTMLStrategy,
+} from '@bablr/agast-helpers/stream';
 import {
   buildWriteEffect,
   buildAnsiPushEffect,
   buildAnsiPopEffect,
+  buildEmbeddedMatcher,
 } from '@bablr/agast-helpers/builders';
-import { buildFullyQualifiedSpamMatcher } from '@bablr/helpers/builders';
 import { OpenNodeTag, CloseNodeTag, ReferenceTag, LiteralTag } from '@bablr/agast-helpers/symbols';
+import {
+  buildBasicNodeMatcher,
+  buildOpenNodeMatcher,
+  buildPropertyMatcher,
+} from '@bablr/helpers/builders';
 
-function* __higlightStrategy(tokens, options) {
-  const co = new Coroutine(getStreamIterator(tokens));
+function* __higlightStrategy(tags) {
+  const co = new Coroutine(getStreamIterator(tags));
 
   let types = emptyStack;
 
@@ -77,7 +84,7 @@ function* __higlightStrategy(tokens, options) {
         (currentRef?.name === 'sigilToken' &&
           (currentType === Symbol.for('ExecSpamexInstructionLine') ||
             currentType === Symbol.for('ExecCSTMLInstructionLine'))) ||
-        (currentType === Symbol.for('Tuple') &&
+        (currentType === Symbol.for('Call') &&
           (currentRef.name === 'openToken' || currentRef.name === 'closeToken'))
       ) {
         yield buildAnsiPushEffect('magenta bold');
@@ -102,41 +109,42 @@ function* __higlightStrategy(tokens, options) {
       yield buildAnsiPopEffect();
     }
 
+    yield tag;
+
     co.advance();
   }
 }
 
-export const higlightStrategy = (tokens, options) => {
-  return new StreamIterable(__higlightStrategy(tokens, options));
+export const higlightStrategy = (tags) => {
+  return new StreamIterable(__higlightStrategy(tags));
 };
 
-export const createPrintCSTMLStrategy =
-  (tokens, options = {}) =>
-  () => {
-    const strategyOptions = {
-      ctx: options.ctx,
-      emitEffects: options.emitEffects,
-    };
-    const outputInstructions = options.format
-      ? generatePrettyCSTMLStrategy(tokens, strategyOptions)
-      : generatePlainCSTMLStrategy(tokens, strategyOptions);
-
-    if (options.color) {
-      const input = generateAllOutput(outputInstructions);
-
-      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(tokens, { ctx: context });
-    } else {
-      return outputInstructions;
-    }
-  };
+export const generateCSTML = (tags, options = {}) => {
+  const strategyOptions = { ctx: options.ctx };
+  const outputInstructions = options.format
+    ? writePrettyCSTMLStrategy(tags, strategyOptions)
+    : writeCSTMLStrategy(tags, strategyOptions);
+
+  if (options.color) {
+    const input = generateAllOutput(outputInstructions);
+    const language = options.emitEffects ? verboseOutput : cstml;
+    const type = options.emitEffects ? 'Output' : 'Document';
+
+    const context = Context.from(language);
+
+    const tags = streamParse(
+      context,
+      buildEmbeddedMatcher(
+        buildPropertyMatcher(
+          null,
+          buildBasicNodeMatcher(buildOpenNodeMatcher({}, language.canonicalURL, type)),
+        ),
+      ),
+      input,
+    );
+
+    return higlightStrategy(tags, { ctx: context });
+  } else {
+    return outputInstructions;
+  }
+};

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@bablr/cli",
   "description": "CLI for running BABLR parsers",
-  "version": "0.6.4",
+  "version": "0.7.0",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
-  "files": ["bin", "lib"],
+  "files": [
+    "bin",
+    "lib"
+  ],
   "bin": {
     "bablr": "./bin/index.js"
   },
@@ -14,16 +17,16 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "^0.5.0",
-    "@bablr/agast-vm-helpers": "^0.5.0",
-    "@bablr/io-vm-node": "^0.5.0",
-    "@bablr/boot": "^0.6.0",
+    "@bablr/agast-helpers": "0.6.0",
+    "@bablr/agast-vm-helpers": "0.6.0",
+    "@bablr/io-vm-node": "0.6.0",
+    "@bablr/boot": "0.7.0",
     "@bablr/coroutine": "0.1.0",
-    "@bablr/helpers": "^0.20.0",
-    "@bablr/language-en-cstml": "^0.6.0",
-    "@bablr/language-en-bablr-cli-verbose-output": "^0.5.0",
+    "@bablr/helpers": "0.21.1",
+    "@bablr/language-en-cstml": "0.8.0",
+    "@bablr/language-en-bablr-cli-verbose-output": "0.6.0",
     "@iter-tools/imm-stack": "1.1.0",
-    "bablr": "^0.6.0",
+    "bablr": "0.7.0",
     "color-support": "1.1.3",
     "commander": "^12.0.0"
   },