@bablr/cli 0.1.5 → 0.1.6

package/bin/index.js

@@ -11,23 +11,22 @@ import {
 } from '@bablr/helpers/source';
 import { buildDebugEnhancers } from '@bablr/helpers/enhancers';
 import colorSupport from 'color-support';
-import { pipeline } from 'node:stream/promises';
-import { generateCSTML, generateColorfulCSTML } from '../lib/syntax.js';
+import { generateCSTML } from '../lib/syntax.js';
+import { writeLinesToWritableStream } from '../lib/utils/node.js';
 
 program
   .option('-l, --language [URL]', 'The URL of the BABLR language to parse with')
   .option('-p, --production [type]', 'The top-level type for the parse')
-  .option('-f, --format', 'Pretty-format CSTML output')
   .option('-F, --no-format', 'Produce machine-readable CSTML output')
+  .option('-f, --format', 'Pretty-format CSTML output')
   .option('-v, --verbose', 'Prints debugging information to stderr')
   .option('-c, --color', 'Force colored output', true)
   .option('-C, --no-color', 'Do not color output')
   .option('-e, --embedded', 'Requires quoted input but enables gap parsing')
   .parse(process.argv);
 
-const options = program.opts();
-
-const enableAnsi = colorSupport.hasBasic && options.color;
+const programOpts = program.opts();
+const options = { ...programOpts, color: colorSupport.hasBasic && programOpts.color };
 
 const language = await import(options.language);
 
@@ -35,14 +34,20 @@ const logStderr = (...args) => {
   process.stderr.write(args.join(' ') + '\n');
 };
 
+if (options.verbose && options.color) {
+  // ANSI formatting escapes don't keep separate spanning stacks for stdin and sterr
+  // this means you NEED a parser that ingests a combination of log and output if you
+  // want to be able to highlight the complete output without breakage
+  // It can be built, but I haven't yet
+  throw new Error('Unsupported combination of options: verbose and color');
+}
+
 const enhancers = options.verbose ? { ...buildDebugEnhancers(logStderr), agastStrategy: null } : {};
 
 const rawStream = process.stdin.setEncoding('utf-8');
 
-const generateCSTML_ = enableAnsi ? generateColorfulCSTML : generateCSTML;
-
-pipeline(
-  generateCSTML_(
+await writeLinesToWritableStream(
+  generateCSTML(
     streamParse(
       language,
       options.production,
@@ -52,6 +57,7 @@ pipeline(
       {},
       enhancers,
     ),
+    options,
   ),
   process.stdout,
 );

package/lib/syntax.js

@@ -8,6 +8,7 @@ import {
   StreamIterable,
   getStreamIterator,
   generatePrettyCSTML as generatePrettyCSTMLStream,
+  generateCSTML as generateCSTMLStream,
 } from '@bablr/agast-helpers/stream';
 import { evaluate } from '@bablr/ansi-vm';
 import { buildString } from '@bablr/agast-vm-helpers';
@@ -63,7 +64,7 @@ function* __higlightStrategy(tokens) {
 
     if (token.type === 'Literal') {
       yield i`write(${buildString(token.value)})`;
-    } else if (token.type === 'OpenNodeTag' && token.value.flags.intrinsic) {
+    } else if (token.type === 'OpenNodeTag' && token.value.intrinsicValue) {
       yield i`write(${buildString(token.value.intrinsicValue)})`;
       yield i`pop()`;
     }
@@ -76,6 +77,22 @@ export const higlightStrategy = (tokens) => {
   return () => new StreamIterable(__higlightStrategy(tokens));
 };
 
-export const generateColorfulCSTML = (tokens) => evaluate(higlightStrategy(tokens));
+const generateColorfulCSTML = (tokens) => evaluate(higlightStrategy(tokens));
 
-export const generateCSTML = (tokens) => generatePrettyCSTMLStream(tokens);
+export const generateCSTML = (tokens, options) => {
+  if (options.format && options.color) {
+    return generateColorfulCSTML(tokens);
+  }
+
+  if (options.format && !options.color) {
+    return generatePrettyCSTMLStream(tokens);
+  }
+
+  if (!options.format && !options.color) {
+    return generateCSTMLStream(tokens);
+  }
+
+  if (!options.format && options.color) {
+    throw new Error("I don't know how to do this yet");
+  }
+};

package/lib/utils/node.js

@@ -0,0 +1,31 @@
+import { Coroutine } from '@bablr/coroutine';
+import { getStreamIterator } from '@bablr/agast-helpers/stream';
+
+export const writeLinesToWritableStream = async (from, to) => {
+  const co = new Coroutine(getStreamIterator(from));
+
+  let buf = '';
+
+  for (;;) {
+    co.advance();
+
+    if (co.current instanceof Promise) {
+      co.current = await co.current;
+    }
+
+    if (co.done) break;
+
+    const chr = co.value;
+
+    buf += chr;
+
+    if (chr === '\n') {
+      if (!to.write(buf)) {
+        await to.once('drain');
+      }
+      buf = '';
+    }
+  }
+
+  to.write(buf);
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/cli",
   "description": "CLI for running BABLR parsers",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -17,14 +17,14 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.1.3",
-    "@bablr/agast-vm-helpers": "0.1.1",
-    "@bablr/ansi-vm": "0.1.0",
-    "@bablr/boot": "0.2.1",
+    "@bablr/agast-helpers": "0.1.5",
+    "@bablr/agast-vm-helpers": "0.1.3",
+    "@bablr/ansi-vm": "0.1.1",
+    "@bablr/boot": "0.2.3",
     "@bablr/coroutine": "0.1.0",
-    "@bablr/helpers": "0.15.3",
-    "@bablr/language-cstml": "0.2.1",
-    "bablr": "0.1.2",
+    "@bablr/helpers": "0.15.4",
+    "@bablr/language-cstml": "0.2.2",
+    "bablr": "0.1.3",
     "color-support": "1.1.3",
     "commander": "12.0.0"
   },