@bablr/cli 0.1.7 → 0.1.9

package/README.md

@@ -10,13 +10,13 @@ This package has no built-in language support, but rather expects you to supply
 Usage: bablr [options]
 
 Options:
-  -l, --language [URL]     The URL of the BABLR language to parse with
-  -p, --production [type]  The top-level type for the parse
-  -f, --format             Pretty-format CSTML output
+  -l, --language [URL]     The URL of the top BABLR language
+  -p, --production [type]  The name of the top production type
   -F, --no-format          Produce machine-readable CSTML output
+  -f, --format             Pretty-format CSTML output (default: true)
   -v, --verbose            Prints debugging information to stderr
-  -c, --color              Force colored output (default: true)
-  -C, --no-color           Do not color output
+  -c, --color [WHEN]       When to use ANSI escape colors
+    WHEN: auto | always | never (default: "auto")
   -e, --embedded           Requires quoted input but enables gap parsing
   -h, --help               display help for command
 ```

package/bin/index.js

@@ -15,18 +15,31 @@ 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('-l, --language [URL]', 'The URL of the top BABLR language')
+  .option('-p, --production [type]', 'The name of the top production type')
   .option('-F, --no-format', 'Produce machine-readable CSTML output')
-  .option('-f, --format', 'Pretty-format CSTML output')
+  .option('-f, --format', 'Pretty-format CSTML output', true)
   .option('-v, --verbose', 'Prints debugging information to stderr')
-  .option('-c, --color', 'Force colored output', true)
-  .option('-C, --no-color', 'Do not color output')
+  .option(
+    '-c, --color [WHEN]',
+    'When to use ANSI escape colors. \n  WHEN: auto | always | never',
+    'auto',
+  )
   .option('-e, --embedded', 'Requires quoted input but enables gap parsing')
   .parse(process.argv);
 
 const programOpts = program.opts();
-const options = { ...programOpts, color: colorSupport.hasBasic && programOpts.color };
+
+if (programOpts.color && !['auto', 'always', 'never'].includes(programOpts.color.toLowerCase())) {
+  throw new Error('invalid value for --color');
+}
+
+const options = {
+  ...programOpts,
+  color:
+    (programOpts.color.toLowerCase() === 'auto' && colorSupport.hasBasic) ||
+    programOpts.color.toLowerCase() === 'always',
+};
 
 const language = await import(options.language);
 

package/lib/syntax.js

@@ -38,13 +38,9 @@ function* __higlightStrategy(tokens) {
         (token.value.type === 'String' && currentRef.name === 'intrinsicValue')
       ) {
         yield i`push(bold green)`;
-      } else if (token.value.type === 'String') {
-        yield i`push(bold white)`;
       } else if (token.value.type === 'Identifier') {
-        if (currentType === 'Punctuator' && currentRef.name === 'type') {
-          yield i`push(whiteBright bold)`;
-        } else if (currentType === 'Reference') {
-          yield i`push(gray)`;
+        if (currentType === 'Reference') {
+          yield i`push(bold gray)`;
         } else {
           yield i`push()`;
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/cli",
   "description": "CLI for running BABLR parsers",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [