@bablr/cli 0.10.2 → 0.11.1

package/bin/index.js

@@ -2,6 +2,7 @@
 
 /* global process */
 
+import { spam as m } from '@bablr/boot';
 import { program } from 'commander';
 import { streamParse } from 'bablr';
 import { embeddedSourceFrom, readFromStream, stripTrailingNewline } from '@bablr/helpers/source';
@@ -9,25 +10,16 @@ import { debugEnhancers } from '@bablr/helpers/enhancers';
 import colorSupport from 'color-support';
 import { evaluateIO } from '@bablr/io-vm-node';
 import { generateCSTML } from '../lib/syntax.js';
-import {
-  buildBasicNodeMatcher,
-  buildNodeFlags,
-  buildOpenNodeMatcher,
-  buildPropertyMatcher,
-} from '@bablr/helpers/builders';
+import { buildIdentifier } from '@bablr/helpers/builders';
 import { evaluateReturnAsync } from '@bablr/agast-helpers/tree';
-import { buildEmbeddedMatcher } from '@bablr/agast-vm-helpers/builders';
 import { o } from '@bablr/helpers/grammar';
 
 program
   .name('bablr')
   .option('-l, --language [URL]', 'The URL of the top BABLR language')
-  .option('-p, --production [type]', 'The name of the top production type')
+  .option('-p, --production [name]', 'Shorthand: sets the named node matcher as root matcher')
+  .option('-m, --matcher [matcher]', 'Sets the root matcher')
   .option('-f, --format', 'Pretty-format CSTML output', true)
-  .option('-g, --gaps', 'Sets hasGap flag on root matcher')
-  .option('-r, --fragment', 'Sets fragment flag on root matcher')
-  .option('-t --token', 'Sets token flag on root matcher')
-  .option('-o --cover', 'Sets cover flag on root matcher')
   .option('-F, --no-format')
   .option('-v, --verbose', 'Prints debugging information to stderr')
   .option(
@@ -51,26 +43,12 @@ const options = {
     programOpts.color.toLowerCase() === 'always',
 };
 
-const language = await import(options.language);
+const { default: language } = await import(options.language);
 
-const matcher = options.production
-  ? buildEmbeddedMatcher(
-      buildPropertyMatcher(
-        null,
-        null,
-        buildBasicNodeMatcher(
-          buildOpenNodeMatcher(
-            buildNodeFlags({
-              hasGap: options.gaps,
-              fragment: options.fragment,
-              token: options.token,
-              cover: options.cover,
-            }),
-            options.production,
-          ),
-        ),
-      ),
-    )
+const matcher = options.matcher
+  ? m({ raw: [options.matcher] })
+  : options.production
+  ? m`<${buildIdentifier(options.production)} />`
   : language.defaultMatcher;
 
 const logStderr = (...args) => {
@@ -81,6 +59,8 @@ const enhancers = options.verbose ? { ...debugEnhancers, agast: null } : {};
 
 const rawStream = process.stdin.setEncoding('utf-8');
 
+Error.stackTraceLimit = 20;
+
 const output = evaluateIO(() =>
   generateCSTML(
     streamParse(
@@ -100,7 +80,7 @@ const output = evaluateIO(() =>
     {
       color: options.color,
       format: options.format,
-      emitEffects: true,
+      verbose: options.verbose,
     },
   ),
 );

package/lib/syntax.js

@@ -1,11 +1,11 @@
 /* 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 cstml from '@bablr/language-en-cstml';
+import verboseOutput from '@bablr/language-en-bablr-cli-verbose-output';
 import { streamParse } from 'bablr/enhanceable';
 import { Coroutine } from '@bablr/coroutine';
-import { StreamIterable, getStreamIterator } from '@bablr/agast-helpers/stream';
+import { StreamIterable, getStreamIterator, wait } from '@bablr/agast-helpers/stream';
 import {
   generateAllOutput,
   writeCSTMLStrategy,
@@ -19,10 +19,11 @@ import {
 } from '@bablr/agast-vm-helpers/builders';
 import { OpenNodeTag, CloseNodeTag, ReferenceTag, LiteralTag } from '@bablr/agast-helpers/symbols';
 import {
-  buildBasicNodeMatcher,
+  buildTreeNodeMatcher,
   buildNodeFlags,
-  buildOpenNodeMatcher,
+  buildTreeNodeMatcherOpen,
   buildPropertyMatcher,
+  buildBoundNodeMatcher,
 } from '@bablr/helpers/builders';
 import { getFlagsWithGap, nodeFlags } from '@bablr/agast-helpers/builders';
 
@@ -31,7 +32,7 @@ let gapNodeFlags = getFlagsWithGap(nodeFlags);
 function* __higlightStrategy(tags) {
   const co = new Coroutine(getStreamIterator(tags));
 
-  let types = emptyStack;
+  let names = emptyStack;
 
   let currentRef;
 
@@ -39,7 +40,7 @@ function* __higlightStrategy(tags) {
 
   for (;;) {
     if (co.current instanceof Promise) {
-      co.current = yield co.current;
+      co.current = yield wait(co.current);
     }
 
     if (co.done) break;
@@ -47,53 +48,53 @@ function* __higlightStrategy(tags) {
     const tag = co.value;
 
     if (tag.type === OpenNodeTag) {
-      const tagType = tag.value.type;
-      const currentType = types.value;
+      const tagName = tag.value.name;
+      const currentName = names.value;
 
-      types = types.push(tagType);
+      names = names.push(tagName);
 
       if (
-        tagType === Symbol.for('LiteralTag') ||
-        (tagType === Symbol.for('String') && currentRef.name === 'literalValue')
+        tagName === Symbol.for('LiteralTag') ||
+        (tagName === Symbol.for('String') && currentRef.name === 'literalValue')
       ) {
-        if (tagType === Symbol.for('LiteralTag') || currentType === Symbol.for('OpenNodeTag')) {
+        if (tagName === Symbol.for('LiteralTag') || currentName === Symbol.for('OpenNodeTag')) {
           yield buildAnsiPushEffect('bold green');
-        } else if (currentType === Symbol.for('OpenNodeMatcher')) {
+        } else if (currentName === Symbol.for('TreeNodeMatcherOpen')) {
           yield buildAnsiPushEffect('bold orange');
         } else {
           yield buildAnsiPushEffect();
         }
-      } else if (tagType === Symbol.for('Pattern')) {
+      } else if (tagName === Symbol.for('Pattern')) {
         yield buildAnsiPushEffect('bold orange');
-      } else if (tagType === Symbol.for('EscapeSequence')) {
+      } else if (tagName === Symbol.for('EscapeSequence')) {
         yield buildAnsiPushEffect('bold cyan');
-      } else if (tagType === Symbol.for('Punctuator')) {
-        if (currentType === Symbol.for('ReferenceTag')) {
+      } else if (tagName === Symbol.for('Identifier')) {
+        if (currentName === Symbol.for('ReferenceTag')) {
           yield buildAnsiPushEffect('bold gray');
-        } else {
-          yield buildAnsiPushEffect();
-        }
-      } else if (tagType === Symbol.for('Identifier')) {
-        if (currentType === Symbol.for('ReferenceTag')) {
-          yield buildAnsiPushEffect('bold gray');
-        } else if (currentType === Symbol.for('Call')) {
+        } else if (currentName === Symbol.for('Call')) {
           yield buildAnsiPushEffect('magenta bold');
         } else {
           yield buildAnsiPushEffect();
         }
       } else if (
-        tagType === Symbol.for('EnterProductionLine') ||
-        tagType === Symbol.for('LeaveProductionLine')
+        tagName === Symbol.for('EnterProductionLine') ||
+        tagName === Symbol.for('LeaveProductionLine')
       ) {
         yield buildAnsiPushEffect('blue bold');
       } else if (
         (currentRef?.name === 'sigilToken' &&
-          (currentType === Symbol.for('ExecSpamexInstructionLine') ||
-            currentType === Symbol.for('ExecCSTMLInstructionLine'))) ||
-        (currentType === Symbol.for('Call') &&
+          (currentName === Symbol.for('ExecSpamexInstructionLine') ||
+            currentName === Symbol.for('ExecCSTMLInstructionLine'))) ||
+        (currentName === Symbol.for('Call') &&
           (currentRef.name === 'openToken' || currentRef.name === 'closeToken'))
       ) {
         yield buildAnsiPushEffect('magenta bold');
+      } else if (tagName === null && tag.value.flags.token) {
+        if (currentName === Symbol.for('ReferenceTag')) {
+          yield buildAnsiPushEffect('bold gray');
+        } else {
+          yield buildAnsiPushEffect();
+        }
       } else {
         yield buildAnsiPushEffect();
       }
@@ -112,7 +113,7 @@ function* __higlightStrategy(tags) {
     yield tag;
 
     if (tag.type === CloseNodeTag || (tag.type === OpenNodeTag && tag.value.selfClosing)) {
-      types = types.pop();
+      names = names.pop();
       yield buildAnsiPopEffect();
     }
 
@@ -131,16 +132,20 @@ export const generateCSTML = (tags, options = {}) => {
 
   if (options.color) {
     const input = generateAllOutput(outputInstructions);
-    const language = options.emitEffects ? verboseOutput : cstml;
-    const type = options.emitEffects ? 'Output' : 'Document';
+    const language = options.verbose ? verboseOutput : cstml;
+    const name = options.verbose ? 'Output' : 'Document';
 
     const tags = streamParse(
       language,
       buildEmbeddedMatcher(
         buildPropertyMatcher(
           null,
-          null,
-          buildBasicNodeMatcher(buildOpenNodeMatcher(buildNodeFlags(gapNodeFlags), type)),
+          buildBoundNodeMatcher(
+            [],
+            buildTreeNodeMatcher(
+              buildTreeNodeMatcherOpen(buildNodeFlags(gapNodeFlags), null, name),
+            ),
+          ),
         ),
       ),
       input,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/cli",
   "description": "CLI for running BABLR parsers",
-  "version": "0.10.2",
+  "version": "0.11.1",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -9,7 +9,7 @@
     "lib"
   ],
   "bin": {
-    "bablr": "./bin/index.js"
+    "bablr": "bin/index.js"
   },
   "exports": {
     ".": "./bin/index.js",
@@ -17,16 +17,16 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.9.0",
-    "@bablr/agast-vm-helpers": "0.9.0",
-    "@bablr/io-vm-node": "0.8.0",
-    "@bablr/boot": "0.10.0",
+    "@bablr/agast-helpers": "0.10.0",
+    "@bablr/agast-vm-helpers": "0.10.0",
+    "@bablr/io-vm-node": "0.9.0",
+    "@bablr/boot": "0.11.0",
     "@bablr/coroutine": "0.1.0",
-    "@bablr/helpers": "0.24.0",
-    "@bablr/language-en-cstml": "0.11.0",
-    "@bablr/language-en-bablr-cli-verbose-output": "0.9.0",
+    "@bablr/helpers": "0.25.0",
+    "@bablr/language-en-cstml": "0.12.0",
+    "@bablr/language-en-bablr-cli-verbose-output": "0.10.0",
     "@iter-tools/imm-stack": "1.2.0",
-    "bablr": "0.10.2",
+    "bablr": "0.11.1",
     "color-support": "1.1.3",
     "commander": "^12.0.0"
   },
@@ -39,7 +39,10 @@
     "iter-tools-es": "^7.3.1",
     "prettier": "^2.6.2"
   },
-  "repository": "github:bablr-lang/bablr-cli",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/bablr-lang/bablr-cli.git"
+  },
   "homepage": "https://github.com/bablr-lang/bablr-cli",
   "license": "MIT"
 }