@bablr/cli 0.4.6 → 0.6.0

package/README.md

@@ -24,7 +24,7 @@ Options:
 ## Example
 
 ```bash
-bablr -l @bablr/language-json -p Expression -f << 'EOF'
+bablr -l @bablr/language-en-json -p Expression -f << 'EOF'
 [
   1,
   true,
@@ -36,7 +36,7 @@ EOF
 Running the above command produces the following output. Note that this is a stream parse so lines of output will appear one by one as fast as the input can be read and parsed.
 
 ```cstml
-<!0:cstml bablr-language='https://github.com/bablr-lang/language-json'>
+<!0:cstml bablr-language='https://github.com/bablr-lang/language-en-json'>
 <>
   <Array>
     openToken:

package/lib/syntax.js

@@ -16,8 +16,9 @@ import {
   buildAnsiPopEffect,
 } from '@bablr/agast-helpers/builders';
 import { buildFullyQualifiedSpamMatcher } from '@bablr/agast-vm-helpers';
+import { OpenNodeTag, CloseNodeTag, ReferenceTag, LiteralTag } from '@bablr/agast-helpers/symbols';
 
-function* __higlightStrategy(context, tokens) {
+function* __higlightStrategy(tokens, options) {
   const co = new Coroutine(getStreamIterator(tokens));
 
   let types = emptyStack;
@@ -33,41 +34,50 @@ function* __higlightStrategy(context, tokens) {
 
     if (co.done) break;
 
-    const token = co.value;
+    const tag = co.value;
 
-    if (token.type === 'OpenNodeTag') {
-      const tagType = token.value.type;
+    if (tag.type === OpenNodeTag) {
+      const tagType = tag.value.type;
       const currentType = types.value;
 
       types = types.push(tagType);
 
-      if (tagType === 'Literal' || (tagType === 'String' && currentRef.name === 'intrinsicValue')) {
-        if (tagType === 'Literal' || currentType === 'OpenNodeTag') {
+      if (
+        tagType === Symbol.for('LiteralTag') ||
+        (tagType === Symbol.for('String') && currentRef.name === 'intrinsicValue')
+      ) {
+        if (tagType === Symbol.for('LiteralTag') || currentType === Symbol.for('OpenNodeTag')) {
           yield buildAnsiPushEffect('bold green');
-        } else if (currentType === 'NodeMatcher') {
+        } else if (currentType === Symbol.for('OpenNodeMatcher')) {
           yield buildAnsiPushEffect('bold orange');
         } else {
           yield buildAnsiPushEffect();
         }
-      } else if (tagType === 'Pattern') {
+      } else if (
+        tagType === Symbol.for('Pattern') &&
+        tag.value.language !== 'https://bablr.org/languages/core/en/spamex'
+      ) {
         yield buildAnsiPushEffect('bold orange');
-      } else if (tagType === 'EscapeSequence') {
+      } else if (tagType === Symbol.for('EscapeSequence')) {
         yield buildAnsiPushEffect('bold cyan');
-      } else if (tagType === 'Identifier') {
-        if (currentType === 'Reference') {
+      } else if (tagType === Symbol.for('Identifier')) {
+        if (currentType === Symbol.for('ReferenceTag')) {
           yield buildAnsiPushEffect('bold gray');
-        } else if (currentType === 'Call') {
+        } else if (currentType === Symbol.for('Call')) {
           yield buildAnsiPushEffect('magenta bold');
         } else {
           yield buildAnsiPushEffect();
         }
-      } else if (tagType === 'EnterProductionLine' || tagType === 'LeaveProductionLine') {
+      } else if (
+        tagType === Symbol.for('EnterProductionLine') ||
+        tagType === Symbol.for('LeaveProductionLine')
+      ) {
         yield buildAnsiPushEffect('blue bold');
       } else if (
         (currentRef?.name === 'sigilToken' &&
-          (currentType === 'ExecSpamexInstructionLine' ||
-            currentType === 'ExecCSTMLInstructionLine')) ||
-        (currentType === 'Tuple' &&
+          (currentType === Symbol.for('ExecSpamexInstructionLine') ||
+            currentType === Symbol.for('ExecCSTMLInstructionLine'))) ||
+        (currentType === Symbol.for('Tuple') &&
           (currentRef.name === 'openToken' || currentRef.name === 'closeToken'))
       ) {
         yield buildAnsiPushEffect('magenta bold');
@@ -76,19 +86,19 @@ function* __higlightStrategy(context, tokens) {
       }
     }
 
-    if (token.type === 'Reference') {
-      currentRef = token.value;
+    if (tag.type === ReferenceTag) {
+      currentRef = tag.value;
     }
 
-    if (token.type === 'CloseNodeTag') {
+    if (tag.type === CloseNodeTag) {
       types = types.pop();
       yield buildAnsiPopEffect();
     }
 
-    if (token.type === 'Literal') {
-      yield buildWriteEffect(token.value);
-    } else if (token.type === 'OpenNodeTag' && token.value.intrinsicValue) {
-      yield buildWriteEffect(token.value.intrinsicValue);
+    if (tag.type === LiteralTag) {
+      yield buildWriteEffect(tag.value);
+    } else if (tag.type === OpenNodeTag && tag.value.intrinsicValue) {
+      yield buildWriteEffect(tag.value.intrinsicValue);
       yield buildAnsiPopEffect();
     }
 
@@ -96,8 +106,8 @@ function* __higlightStrategy(context, tokens) {
   }
 }
 
-export const higlightStrategy = (context, tokens) => {
-  return new StreamIterable(__higlightStrategy(context, tokens));
+export const higlightStrategy = (tokens, options) => {
+  return new StreamIterable(__higlightStrategy(tokens, options));
 };
 
 export const createPrintCSTMLStrategy =
@@ -125,7 +135,7 @@ export const createPrintCSTMLStrategy =
         input,
       );
 
-      return higlightStrategy(context, tokens);
+      return higlightStrategy(tokens, { ctx: context });
     } else {
       return outputInstructions;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/cli",
   "description": "CLI for running BABLR parsers",
-  "version": "0.4.6",
+  "version": "0.6.0",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -17,18 +17,18 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.3.2",
-    "@bablr/agast-vm-helpers": "0.3.2",
-    "@bablr/io-vm-node": "0.3.0",
-    "@bablr/boot": "0.4.0",
+    "@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/coroutine": "0.1.0",
-    "@bablr/helpers": "0.18.2",
-    "@bablr/language-en-cstml": "0.4.3",
-    "@bablr/language-en-bablr-cli-verbose-output": "0.3.1",
+    "@bablr/helpers": "^0.20.0",
+    "@bablr/language-en-cstml": "^0.6.0",
+    "@bablr/language-en-bablr-cli-verbose-output": "^0.5.0",
     "@iter-tools/imm-stack": "1.1.0",
-    "bablr": "0.4.4",
+    "bablr": "^0.6.0",
     "color-support": "1.1.3",
-    "commander": "12.0.0"
+    "commander": "^12.0.0"
   },
   "devDependencies": {
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#49f5952efed27f94ee9b94340eb1563c440bf64e",