@sc-voice/tools 3.3.0 → 3.5.0

package/index.mjs

@@ -18,9 +18,11 @@ import { WordSpace } from './src/text/word-space.mjs';
 import { WordVector } from './src/text/word-vector.mjs';
 import { TfidfSpace } from './src/text/tfidf-space.mjs';
 import { LogEntry, Logger } from './src/text/logger.mjs';
+import { ColorConsole} from './src/text/color-console.mjs';
 
 export const Text = {
   BilaraPath,
+  ColorConsole,
   Corpus,
   EbtDoc,
   LegacyDoc,

package/package.json

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

package/src/math/interval.mjs

@@ -1,4 +1,8 @@
 import { Unicode } from '../text/unicode.mjs';
+const { INFINITY } = Unicode;
+
+const MINUS_INFINITY = `-${INFINITY}`;
+const PLUS_INFINITY = `+${INFINITY}`;
 
 export class Interval {
   constructor(a, b) {
@@ -10,57 +14,60 @@ export class Interval {
     let an = typeof a === 'number' && !Number.isNaN(a);
     let bn = typeof b === 'number' && !Number.isNaN(b);
 
+    let isClosed = true;
     if (an && bn) {
       dbg && console.log(msg, 'an bn');
       lo = a;
       hi = b;
-      this.isClosed = true;
+      isClosed = true;
     } else if (an) {
       dbg && console.log(msg, 'an');
       lo = a;
-      hi = Interval.INFINITY;
-      this.isClosed = false;
+      hi = INFINITY;
+      isClosed = false;
     } else if (bn) {
       dbg && console.log(msg, 'bn');
-      lo = Interval.INFINITY;
+      lo = INFINITY;
       hi = b;
-      this.isClosed = false;
+      isClosed = false;
     } else {
       dbg && console.log(msg, '!an !bn');
-      this.isClosed = false;
+      isClosed = false;
     }
 
-    Object.defineProperty(this, 'lo', { value: lo });
-    Object.defineProperty(this, 'hi', { value: hi });
+    Object.defineProperty(this, 'isClosed', {
+      value: isClosed,
+    });
+    Object.defineProperty(this, 'lo', {
+      enumerable: true,
+      value: lo,
+    });
+    Object.defineProperty(this, 'hi', {
+      enumerable: true,
+      value: hi,
+    });
   }
 
   static get INFINITY() {
-    return Unicode.INFINITY;
+    return INFINITY;
   }
 
   get isEmpty() {
     if (this.lo === null && this.hi === null) {
       return true;
     }
-    if (
-      this.lo === Interval.INFINITY ||
-      this.hi === Interval.INFINITY
-    ) {
+    if (this.lo === INFINITY || this.hi === INFINITY) {
       return false;
     }
     return this.hi < this.lo;
   }
 
   get infimum() {
-    return this.lo === Interval.INFINITY
-      ? '-' + Interval.INFINITY
-      : this.lo;
+    return this.lo === INFINITY ? MINUS_INFINITY : this.lo;
   }
 
   get supremum() {
-    return this.hi === Interval.INFINITY
-      ? '+' + Interval.INFINITY
-      : this.hi;
+    return this.hi === INFINITY ? PLUS_INFINITY : this.hi;
   }
 
   contains(num) {
@@ -68,10 +75,10 @@ export class Interval {
       return false;
     }
     let { lo, hi } = this;
-    if (lo === Interval.INFINITY) {
+    if (lo === INFINITY) {
       throw new Error(`${msg}TBD`);
     }
-    if (hi === Interval.INFINITY) {
+    if (hi === INFINITY) {
       throw new Error(`${msg}TBD`);
     }
     if (lo < num && num < hi) {
@@ -80,5 +87,18 @@ export class Interval {
     if (num < lo || hi < num) {
       return false;
     }
+
+    return true;
+  }
+
+  toString() {
+    let { lo, hi } = this;
+    return [
+      lo === INFINITY ? '(' : '[',
+      lo === INFINITY ? MINUS_INFINITY : lo,
+      lo === hi ? '' : ',',
+      hi === INFINITY ? PLUS_INFINITY : hi,
+      hi === INFINITY ? ')' : ']',
+    ].join('');
   }
 }

package/src/text/color-console.mjs

@@ -0,0 +1,111 @@
+import { Unicode } from './unicode.mjs';
+
+const {
+  BLACK,
+  WHITE,
+  RED,
+  GREEN,
+  BLUE,
+  CYAN,
+  MAGENTA,
+  YELLOW,
+  BRIGHT_BLACK,
+  BRIGHT_WHITE,
+  BRIGHT_RED,
+  BRIGHT_GREEN,
+  BRIGHT_BLUE,
+  BRIGHT_CYAN,
+  BRIGHT_MAGENTA,
+  BRIGHT_YELLOW,
+  NO_COLOR,
+} = Unicode.LINUX_COLOR;
+
+export class ColorConsole {
+  constructor(opts = {}) {
+    let {
+      write = (...args) => console.log.call(null, ...args),
+      colorOk1 = BRIGHT_GREEN,
+      colorOk2 = GREEN,
+      colorFYI1 = BRIGHT_BLACK,
+      colorBad1 = BRIGHT_RED,
+      colorBad2 = RED,
+      colorTag1 = CYAN,
+      colorTag2 = BRIGHT_CYAN,
+      colorTag3 = MAGENTA,
+      colorTag4 = BRIGHT_MAGENTA,
+    } = opts;
+
+    Object.assign(this, {
+      write,
+      colorOk1,
+      colorOk2,
+      colorFYI1,
+      colorBad1,
+      colorBad2,
+      colorTag1,
+      colorTag2,
+      colorTag3,
+      colorTag4,
+    });
+  }
+
+  color(color, ...things) {
+    return things.map((thing) => {
+      switch (typeof thing) {
+        case 'object':
+          // TODO: pretty objects like console
+          return thing;
+        case 'string':
+          return `${color}${thing}${NO_COLOR}`;
+        case 'number':
+          return `${GREEN}${thing}${NO_COLOR}`;
+        default:
+          return `${color}${JSON.stringify(thing)}${NO_COLOR}`;
+      }
+    });
+  }
+
+  msgLvl(color, msg, lvl, rest) {
+    return this.color(color, msg + (lvl ? `@${lvl}` : ''), ...rest);
+  }
+
+  ok1(msg, lvl, ...rest) {
+    let color = this.colorOk1;
+    this.write(...this.msgLvl(color, msg, lvl, rest));
+  }
+
+  ok2(msg, lvl, ...rest) {
+    let color = this.colorOk2;
+    this.write(...this.msgLvl(color, msg, lvl, rest));
+  }
+
+  bad1(msg, lvl, ...rest) {
+    let color = this.colorBad1;
+    this.write(...this.msgLvl(color, msg, lvl, rest));
+  }
+
+  bad2(msg, lvl, ...rest) {
+    let color = this.colorBad2;
+    this.write(...this.msgLvl(color, msg, lvl, rest));
+  }
+
+  tag1(msg, lvl, ...rest) {
+    let color = this.colorTag1;
+    this.write(...this.msgLvl(color, msg, lvl, rest));
+  }
+
+  tag2(msg, lvl, ...rest) {
+    let color = this.colorTag2;
+    this.write(...this.msgLvl(color, msg, lvl, rest));
+  }
+
+  tag3(msg, lvl, ...rest) {
+    let color = this.colorTag3;
+    this.write(...this.msgLvl(color, msg, lvl, rest));
+  }
+
+  tag4(msg, lvl, ...rest) {
+    let color = this.colorTag4;
+    this.write(...this.msgLvl(color, msg, lvl, rest));
+  }
+}