@sc-voice/tools 3.22.0 → 3.24.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sc-voice/tools",
-  "version": "3.22.0",
+  "version": "3.24.0",
   "description": "Utilities for SC-Voice",
   "main": "index.mjs",
   "files": [

package/src/defines.mjs

@@ -3,6 +3,7 @@ export const DBG = {
   ALIGN_LINE: 0,
   L2T_TO_STRING: 0,
   COLOR_CONSOLE: 0,
+  C10E_INSPECT: 0,
   I6L_CONTAINS: 0,
   I6L_OVERLAPS: 0,
   ML_DOC_VECTORS: 0, // 'mn8:3.4',

package/src/text/color-console.mjs

@@ -1,3 +1,4 @@
+import util from 'node:util';
 import { Unicode } from './unicode.mjs';
 
 const {
@@ -31,6 +32,8 @@ export class ColorConsole {
       fyiColor2 = BRIGHT_BLACK,
       okColor1 = BRIGHT_GREEN,
       okColor2 = GREEN,
+      tagColor1 = BRIGHT_MAGENTA,
+      tagColor2 = MAGENTA,
       valueColor = CYAN,
       dateFormat = new Intl.DateTimeFormat(undefined, {
         dateStyle: 'short',
@@ -47,6 +50,8 @@ export class ColorConsole {
       fyiColor2,
       okColor1,
       okColor2,
+      tagColor1,
+      tagColor2,
       precision,
       valueColor,
       write,
@@ -58,6 +63,57 @@ export class ColorConsole {
     return CC;
   }
 
+  static utilColor(ansiColor) {
+    switch (ansiColor) {
+      case BLACK: return 'black';
+      case WHITE: return 'white';
+      case RED: return 'red';
+      case GREEN: return 'green';
+      case BLUE: return 'blue';
+      case CYAN: return 'cyan';
+      case MAGENTA: return 'magenta';
+      case YELLOW: return 'yellow';
+      case BRIGHT_BLACK: return 'blackBright';
+      case BRIGHT_WHITE: return 'whiteBright';
+      case BRIGHT_RED: return 'redBright';
+      case BRIGHT_GREEN: return 'greenBright';
+      case BRIGHT_BLUE: return 'blueBright';
+      case BRIGHT_CYAN: return 'cyanBright';
+      case BRIGHT_MAGENTA: return 'magentaBright';
+      case BRIGHT_YELLOW: return 'yellowBright';
+      case NO_COLOR: return 'noColor';
+    }
+  }
+
+  writeColor(color, rest) {
+    let { styles, defaultOptions } = util?.inspect || {};
+    if (styles) {
+      let oldStyles = Object.assign({}, styles);
+      let oldColors = defaultOptions.colors;
+      defaultOptions.colors = true;
+      let valueColor = ColorConsole.utilColor(this.valueColor);
+      let textColor = ColorConsole.utilColor(color);
+      styles.bigint = valueColor;
+      styles.boolean = valueColor;
+      styles.date = valueColor;
+      //styles.name = textColor;
+      styles.module = 'underline';
+      styles.null = valueColor;
+      styles.number = valueColor;
+      styles.regexp = valueColor;
+      styles.special = valueColor;
+      styles.string = valueColor;
+      //styles.undefined = valueColor;
+
+      this.write(...this.color(color, ...rest));
+
+      Object.assign(util.inspect.styles, oldStyles);
+      defaultOptions.colors = oldColors;
+    } else {
+      this.write(...this.color(color, ...rest));
+    }
+  }
+
   valueOf(thing) {
     const msg = 'c10e.valueOf';
     let { precision } = this;
@@ -95,11 +151,24 @@ export class ColorConsole {
 
   color(textColor, ...things) {
     let { valueColor } = this;
+    let { styleText } = util;
     let label = '';
     let endColor = NO_COLOR;
+    let eol;
     return things.reduce((a, thing) => {
       let newLabel = '';
       let v = this.valueOf(thing);
+      let aLast = a.at(-1);
+      if (typeof aLast === 'string' && aLast.endsWith('\n' +  endColor)) {
+        if (aLast === textColor + '\n' + endColor) {
+          a.pop();
+        } else {
+          const iLast = aLast.lastIndexOf('\n');
+          a.pop();
+          a.push(aLast.substring(0, iLast) + aLast.substring(iLast + 1));
+        }
+        v = '\n' + v;
+      } 
       switch (typeof thing) {
         case 'object': {
           if (
@@ -138,11 +207,11 @@ export class ColorConsole {
   }
 
   fyi1(...rest) {
-    this.write(...this.color(this.fyiColor1, ...rest));
+    this.writeColor(this.fyiColor1, rest);
   }
 
   fyi2(...rest) {
-    this.write(...this.color(this.fyiColor2, ...rest));
+    this.writeColor(this.fyiColor2, rest);
   }
 
   ok(...rest) {
@@ -150,11 +219,11 @@ export class ColorConsole {
   }
 
   ok1(...rest) {
-    this.write(...this.color(this.okColor1, ...rest));
+    this.writeColor(this.okColor1, rest);
   }
 
   ok2(...rest) {
-    this.write(...this.color(this.okColor2, ...rest));
+    this.writeColor(this.okColor2, rest);
   }
 
   bad(...rest) {
@@ -162,10 +231,22 @@ export class ColorConsole {
   }
 
   bad1(...rest) {
-    this.write(...this.color(this.badColor1, ...rest));
+    this.writeColor(this.badColor1, rest);
   }
 
   bad2(...rest) {
-    this.write(...this.color(this.badColor2, ...rest));
+    this.writeColor(this.badColor2, rest);
+  }
+
+  tag(...rest) {
+    return this.tag2(...rest);
+  }
+
+  tag1(...rest) {
+    this.writeColor(this.tagColor1, rest);
+  }
+
+  tag2(...rest) {
+    this.writeColor(this.tagColor2, rest);
   }
 }

package/src/text/unicode.mjs

@@ -281,10 +281,31 @@ export class Unicode {
       BRIGHT_MAGENTA: '\u001b[95m',
       BRIGHT_CYAN: '\u001b[96m',
       BRIGHT_WHITE: '\u001b[97m',
-      NO_COLOR: '\u001b[0m',
+      NO_COLOR: '\u001b[39m',
     };
   }
 
+  static get LINUX_STYLE() {
+    return {
+      BOLD: '\u001b[1m',
+      DIM: '\u001b[2m',
+      NO_BOLD: '\u001b[22m',
+      ITALIC: '\u001b[3m',
+      NO_ITALIC: '\u001b[23m',
+      UNDERLINE: '\u001b[4m',
+      NO_UNDERLINE: '\u001b[24m',
+      BLINK: '\u001b[5m',
+      NO_BLINK: '\u001b[25m',
+      INVERSE: '\u001b[7m',
+      NO_INVERSE: '\u001b[27m',
+      HIDE: '\u001b[8m',
+      NO_HIDE: '\u001b[28m',
+      STRIKETHROUGH: '\u001b[9m',
+      NO_STRIKETHROUGH: '\u001b[29m',
+      RESET: '\u001b[0m',
+    }
+  }
+
   constructor(opts = {}) {
     if (opts.romanizeMap == null) {
       Object.defineProperty(this, 'romanizeMap', {