@bablr/cli 0.11.7 → 0.11.9

package/bin/index.js

@@ -4,7 +4,7 @@
 
 import { spam as m } from '@bablr/boot';
 import { program } from 'commander';
-import { streamParse } from 'bablr';
+import { buildModule } from 'bablr/enhanceable';
 import { embeddedSourceFrom, readFromStream, stripTrailingNewline } from '@bablr/helpers/source';
 import { debugEnhancers } from '@bablr/helpers/enhancers';
 import colorSupport from 'color-support';
@@ -19,6 +19,8 @@ program
   .option('-l, --language [URL]', 'The URL of the top BABLR language')
   .option('-p, --production [name]', 'Shorthand: sets the named node matcher as root matcher')
   .option('-m, --matcher [matcher]', 'Sets the root matcher')
+  .option('-s, --shift', 'Allows shifting')
+  .option('-S, --no-shift', 'Disallows shifting')
   .option('-f, --format', 'Pretty-format CSTML output', true)
   .option('-F, --no-format')
   .option('-v, --verbose', 'Prints debugging information to stderr')
@@ -57,6 +59,8 @@ const logStderr = (...args) => {
 
 const enhancers = options.verbose ? { ...debugEnhancers, agast: null } : {};
 
+let { streamParse } = buildModule(enhancers);
+
 const rawStream = process.stdin.setEncoding('utf-8');
 
 Error.stackTraceLimit = 20;
@@ -73,8 +77,9 @@ const output = evaluateIO(() =>
       {
         enhancers,
         emitEffects: true,
-        holdShiftedNodes: !options.gaps,
-        holdUndefinedAttributes: !options.gaps,
+        holdShiftedNodes: !options.shift,
+        // holdUndefinedAttributes: !options.gaps,
+        tree: false,
       },
     ),
     {

package/lib/syntax.js

@@ -3,7 +3,7 @@
 import emptyStack from '@iter-tools/imm-stack';
 import cstml from '@bablr/language-en-cstml';
 import verboseOutput from '@bablr/language-en-bablr-cli-verbose-output';
-import { streamParse } from 'bablr/enhanceable';
+import { streamParse } from 'bablr';
 import { Coroutine } from '@bablr/coroutine';
 import { StreamIterable, getStreamIterator, hoistTrivia, wait } from '@bablr/agast-helpers/stream';
 import {
@@ -26,6 +26,7 @@ import {
   buildBoundNodeMatcher,
 } from '@bablr/helpers/builders';
 import { getFlagsWithGap, nodeFlags } from '@bablr/agast-helpers/builders';
+import { o } from '@bablr/helpers/grammar';
 
 let gapNodeFlags = getFlagsWithGap(nodeFlags);
 
@@ -53,8 +54,12 @@ function* __higlightStrategy(tags) {
 
       names = names.push(tagName);
 
-      if (
-        tagName === Symbol.for('Pattern') ||
+      if (tagName === Symbol.for('Alternative')) {
+        yield buildAnsiPushEffect('reset');
+      } else if (
+        tagName === Symbol.for('Character') ||
+        (currentName === Symbol.for('Pattern') &&
+          ['openToken', 'closeToken', 'flags'].includes(currentRef?.name)) ||
         (tagName === Symbol.for('String') && currentName === Symbol.for('TreeNodeMatcherOpen'))
       ) {
         yield buildAnsiPushEffect('bold orange');
@@ -155,6 +160,8 @@ export const generateCSTML = (tags, options = {}) => {
         ),
       ),
       input,
+      o({}),
+      { tree: false },
     );
 
     return higlightStrategy(hoistTrivia(tags));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/cli",
   "description": "CLI for running BABLR parsers",
-  "version": "0.11.7",
+  "version": "0.11.9",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -17,16 +17,16 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.10.1",
-    "@bablr/agast-vm-helpers": "0.10.0",
-    "@bablr/io-vm-node": "0.9.0",
-    "@bablr/boot": "0.11.0",
+    "@bablr/agast-helpers": "0.10.2",
+    "@bablr/agast-vm-helpers": "0.10.2",
+    "@bablr/io-vm-node": "0.9.1",
+    "@bablr/boot": "0.11.1",
     "@bablr/coroutine": "0.1.0",
-    "@bablr/helpers": "0.25.0",
-    "@bablr/language-en-cstml": "0.12.0",
-    "@bablr/language-en-bablr-cli-verbose-output": "0.10.1",
+    "@bablr/helpers": "0.25.1",
+    "@bablr/language-en-cstml": "0.12.2",
+    "@bablr/language-en-bablr-cli-verbose-output": "0.10.3",
     "@iter-tools/imm-stack": "1.2.0",
-    "bablr": "0.11.1",
+    "bablr": "0.11.2",
     "color-support": "1.1.3",
     "commander": "^12.0.0"
   },