@bablr/cli 0.1.11 → 0.2.0

package/bin/index.js

@@ -9,10 +9,10 @@ import {
   sourceFromReadStream,
   stripTrailingNewline,
 } from '@bablr/helpers/source';
-import { buildDebugEnhancers } from '@bablr/helpers/enhancers';
+import { debugEnhancers } from '@bablr/helpers/enhancers';
 import colorSupport from 'color-support';
-import { generateCSTML } from '../lib/syntax.js';
-import { writeLinesToWritableStream } from '../lib/utils/node.js';
+import { evaluateIO } from '@bablr/io-vm-node';
+import { createPrintCSTMLStrategy } from '../lib/syntax.js';
 
 program
   .option('-l, --language [URL]', 'The URL of the top BABLR language')
@@ -37,7 +37,7 @@ if (programOpts.color && !['auto', 'always', 'never'].includes(programOpts.color
 const options = {
   ...programOpts,
   color:
-    (programOpts.color.toLowerCase() === 'auto' && colorSupport.hasBasic && !programOpts.verbose) ||
+    (programOpts.color.toLowerCase() === 'auto' && colorSupport.hasBasic) ||
     programOpts.color.toLowerCase() === 'always',
 };
 
@@ -47,16 +47,12 @@ const logStderr = (...args) => {
   process.stderr.write(args.join(' ') + '\n');
 };
 
-if (options.verbose && options.color) {
-  throw new Error('TODO support this in a better way than turning off color');
-}
-
-const enhancers = options.verbose ? { ...buildDebugEnhancers(logStderr), agastStrategy: null } : {};
+const enhancers = options.verbose ? { ...debugEnhancers, agast: null } : {};
 
 const rawStream = process.stdin.setEncoding('utf-8');
 
-await writeLinesToWritableStream(
-  generateCSTML(
+await evaluateIO(
+  createPrintCSTMLStrategy(
     streamParse(
       language,
       options.production,
@@ -64,9 +60,8 @@ await writeLinesToWritableStream(
         ? embeddedSourceFromReadStream(rawStream)
         : stripTrailingNewline(sourceFromReadStream(rawStream)),
       {},
-      enhancers,
-    ),
+      { enhancers, emitEffects: true },
+    ).tokens,
     options,
   ),
-  process.stdout,
 );

package/lib/syntax.js

@@ -1,24 +1,25 @@
 /* global process Promise */
 
-import { i } from '@bablr/boot';
 import * as cstml from '@bablr/language-cstml';
+import * as verboseOutput from '@bablr/language-bablr-cli-verbose-output';
 import { streamParse } from 'bablr/enhanceable';
 import { Coroutine } from '@bablr/coroutine';
 import {
   StreamIterable,
   getStreamIterator,
-  generatePrettyCSTML as generatePrettyCSTMLStream,
-  generateCSTML as generateCSTMLStream,
+  generateCSTMLStrategy as generatePlainCSTMLStrategy,
+  generatePrettyCSTMLStrategy,
+  generateAllOutput,
 } from '@bablr/agast-helpers/stream';
-import { evaluate } from '@bablr/ansi-vm';
-import { buildString } from '@bablr/agast-vm-helpers';
+import {
+  buildWriteEffect,
+  buildAnsiPushEffect,
+  buildAnsiPopEffect,
+} from '@bablr/agast-helpers/builders';
 
-function* __higlightStrategy(tokens) {
-  const co = new Coroutine(
-    getStreamIterator(streamParse(cstml, 'Document', generatePrettyCSTMLStream(tokens))),
-  );
+function* __higlightStrategy(context, tokens) {
+  const co = new Coroutine(getStreamIterator(tokens));
 
-  let currentType;
   let currentRef;
 
   co.advance();
@@ -33,21 +34,42 @@ function* __higlightStrategy(tokens) {
     const token = co.value;
 
     if (token.type === 'OpenNodeTag') {
-      if (
-        currentType === 'Literal' ||
-        (token.value.type === 'String' && currentRef.name === 'intrinsicValue')
-      ) {
-        yield i`push(bold green)`;
-      } else if (token.value.type === 'Identifier') {
+      const tagType = token.value.type;
+      const currentType = context.agast.nodeForTag(token).parent?.type;
+
+      if (tagType === 'Literal' || (tagType === 'String' && currentRef.name === 'intrinsicValue')) {
+        if (tagType === 'Literal' || currentType === 'OpenNodeTag') {
+          yield buildAnsiPushEffect('bold green');
+        } else if (currentType === 'NodeMatcher') {
+          yield buildAnsiPushEffect('bold orange');
+        } else {
+          yield buildAnsiPushEffect();
+        }
+      } else if (tagType === 'Pattern') {
+        yield buildAnsiPushEffect('bold orange');
+      } else if (tagType === 'EscapeSequence') {
+        yield buildAnsiPushEffect('bold cyan');
+      } else if (tagType === 'Identifier') {
         if (currentType === 'Reference') {
-          yield i`push(bold gray)`;
+          yield buildAnsiPushEffect('bold gray');
+        } else if (currentType === 'Call') {
+          yield buildAnsiPushEffect('magenta bold');
         } else {
-          yield i`push()`;
+          yield buildAnsiPushEffect();
         }
+      } else if (tagType === 'EnterProductionLine' || tagType === 'LeaveProductionLine') {
+        yield buildAnsiPushEffect('blue bold');
+      } else if (
+        (currentRef?.name === 'sigilToken' &&
+          (currentType === 'ExecSpamexInstructionLine' ||
+            currentType === 'ExecCSTMLInstructionLine')) ||
+        (currentType === 'Tuple' &&
+          (currentRef.name === 'openToken' || currentRef.name === 'closeToken'))
+      ) {
+        yield buildAnsiPushEffect('magenta bold');
       } else {
-        yield i`push()`;
+        yield buildAnsiPushEffect();
       }
-      currentType = token.value.type;
     }
 
     if (token.type === 'Reference') {
@@ -55,40 +77,41 @@ function* __higlightStrategy(tokens) {
     }
 
     if (token.type === 'CloseNodeTag') {
-      yield i`pop()`;
+      yield buildAnsiPopEffect();
     }
 
     if (token.type === 'Literal') {
-      yield i`write(${buildString(token.value)})`;
+      yield buildWriteEffect(token.value);
     } else if (token.type === 'OpenNodeTag' && token.value.intrinsicValue) {
-      yield i`write(${buildString(token.value.intrinsicValue)})`;
-      yield i`pop()`;
+      yield buildWriteEffect(token.value.intrinsicValue);
+      yield buildAnsiPopEffect();
     }
 
     co.advance();
   }
 }
 
-export const higlightStrategy = (tokens) => {
-  return () => new StreamIterable(__higlightStrategy(tokens));
+export const higlightStrategy = (context, tokens) => {
+  return new StreamIterable(__higlightStrategy(context, tokens));
 };
 
-const generateColorfulCSTML = (tokens) => evaluate(higlightStrategy(tokens));
-
-export const generateCSTML = (tokens, options) => {
-  if (options.format && options.color) {
-    return generateColorfulCSTML(tokens);
-  }
+export const createPrintCSTMLStrategy =
+  (tokens, options = {}) =>
+  () => {
+    const agastOptions = { verbose: options.verbose, inline: false };
+    const outputInstructions = options.format
+      ? generatePrettyCSTMLStrategy(tokens, agastOptions)
+      : generatePlainCSTMLStrategy(tokens, agastOptions);
 
-  if (options.format && !options.color) {
-    return generatePrettyCSTMLStream(tokens);
-  }
+    if (options.color) {
+      const input = generateAllOutput(outputInstructions);
 
-  if (!options.format && !options.color) {
-    return generateCSTMLStream(tokens);
-  }
+      const { context, tokens } = options.verbose
+        ? streamParse(verboseOutput, 'Output', input)
+        : streamParse(cstml, 'Document', input);
 
-  if (!options.format && options.color) {
-    throw new Error("I don't know how to do this yet");
-  }
-};
+      return higlightStrategy(context, tokens);
+    } else {
+      return outputInstructions;
+    }
+  };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/cli",
   "description": "CLI for running BABLR parsers",
-  "version": "0.1.11",
+  "version": "0.2.0",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -17,14 +17,14 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@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/agast-helpers": "0.1.6",
+    "@bablr/io-vm-node": "0.2.0",
+    "@bablr/boot": "0.2.4",
     "@bablr/coroutine": "0.1.0",
-    "@bablr/helpers": "0.15.4",
-    "@bablr/language-cstml": "0.2.4",
-    "bablr": "0.1.3",
+    "@bablr/helpers": "0.16.0",
+    "@bablr/language-cstml": "0.3.0",
+    "@bablr/language-bablr-cli-verbose-output": "0.1.0",
+    "bablr": "0.2.1",
     "color-support": "1.1.3",
     "commander": "12.0.0"
   },

package/lib/utils/node.js

@@ -1,31 +0,0 @@
-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);
-};