@flowscripter/dynamic-cli-framework 1.1.4 → 1.1.5

package/bun.lock

@@ -6,7 +6,7 @@
       "dependencies": {
         "emphasize": "^7.0.0",
         "fastest-levenshtein": "^1.0.16",
-        "figlet": "^1.8.0",
+        "figlet": "^1.8.1",
         "highlight.js": "^11.11.1",
         "prettier": "^3.5.3",
         "supports-color": "^10.0.0",
@@ -43,7 +43,7 @@
 
     "fastest-levenshtein": ["fastest-levenshtein@1.0.16", "", {}, "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="],
 
-    "figlet": ["figlet@1.8.0", "", { "bin": { "figlet": "bin/index.js" } }, "sha512-chzvGjd+Sp7KUvPHZv6EXV5Ir3Q7kYNpCr4aHrRW79qFtTefmQZNny+W1pW9kf5zeE6dikku2W50W/wAH2xWgw=="],
+    "figlet": ["figlet@1.8.1", "", { "bin": { "figlet": "bin/index.js" } }, "sha512-kEC3Sme+YvA8Hkibv0NR1oClGcWia0VB2fC1SlMy027cwe795Xx40Xiv/nw/iFAwQLupymWh+uhAAErn/7hwPg=="],
 
     "highlight.js": ["highlight.js@11.11.1", "", {}, "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w=="],
 

package/package.json

@@ -18,7 +18,7 @@
   ],
   "module": "index.ts",
   "type": "module",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "publishConfig": {
     "access": "public"
   },
@@ -31,7 +31,7 @@
   "dependencies": {
     "emphasize": "^7.0.0",
     "fastest-levenshtein": "^1.0.16",
-    "figlet": "^1.8.0",
+    "figlet": "^1.8.1",
     "highlight.js": "^11.11.1",
     "prettier": "^3.5.3",
     "supports-color": "^10.0.0",

package/src/api/service/core/PrinterService.ts

@@ -139,7 +139,7 @@ export default interface PrinterService {
    * Has no effect if {@link colorEnabled} is `false`.
    *
    * @param message the message to color.
-   * @param hexFormattedColor the color to use. This should be a valid hex formatted string e.g. "0xrrggbb".
+   * @param hexFormattedColor the color to use. This should be a valid hex formatted string e.g. "#rrggbb".
    */
   color(message: string, hexFormattedColor: string): string;
 

package/src/api/service/core/SyntaxHighlighterService.ts

@@ -8,7 +8,7 @@ export const SYNTAX_HIGHLIGHTER_SERVICE_ID =
  *
  * The keys are the names of the defined [highlight.js scopes](https://highlightjs.readthedocs.io/en/latest/css-classes-reference.html).
  *
- * The values are colors expressed as a hex formatted string e.g. "0xrrggbb".
+ * The values are colors expressed as a hex formatted string e.g. "#rrggbb".
  *
  * The scheme does not need to list all scopes exhaustively.
  */

package/src/service/printer/DefaultPrinterService.ts

@@ -163,13 +163,13 @@ export default class DefaultPrinterService implements PrinterService {
 
   public color(message: string, hexFormattedColor: string): string {
     if (
-      (hexFormattedColor.length !== 8) ||
-      (!hexFormattedColor.toLowerCase().startsWith("0x"))
+      (hexFormattedColor.length !== 7) ||
+      (!hexFormattedColor.toLowerCase().startsWith("#"))
     ) {
       throw new Error(`Invalid color: ${hexFormattedColor}`);
     }
 
-    const colorValue = parseInt(hexFormattedColor, 16);
+    const colorValue = parseInt(hexFormattedColor.slice(1), 16);
 
     if (isNaN(colorValue) || (colorValue < 0 || colorValue > 0xffffff)) {
       throw new Error(`Invalid color: ${hexFormattedColor}`);

package/src/service/syntaxHighlighter/DefaultSyntaxHighlighterService.ts

@@ -2,9 +2,9 @@ import type SyntaxHighlighterService from "../../api/service/core/SyntaxHighligh
 import type { LanguageFn as HighlightSyntax } from "highlight.js";
 import { createEmphasize } from "emphasize";
 import json from "highlight.js/lib/languages/json";
-import { ColorScheme } from "../../api/service/core/SyntaxHighlighterService.ts";
+import type { ColorScheme } from "../../api/service/core/SyntaxHighlighterService.ts";
 
-type Sheet = Record<string, (string) => string> | undefined;
+type Sheet = Record<string, (value: string) => string> | undefined;
 
 interface Emphasize {
   listLanguages(): ReadonlyArray<string>;
@@ -24,7 +24,8 @@ interface Emphasize {
 export default class DefaultSyntaxHighlighterService
   implements SyntaxHighlighterService {
   colorEnabled = true;
-  colorFunction: (text: string, hexFormattedColor: string) => string;
+  colorFunction: (text: string, hexFormattedColor: string) => string = (text) =>
+    text;
 
   emphasize: Emphasize;
 
@@ -58,9 +59,22 @@ export default class DefaultSyntaxHighlighterService
     if (colorScheme && this.colorFunction) {
       sheet = {};
       for (const [key, value] of Object.entries(colorScheme)) {
-        if (value) {
-          sheet[key] = (text: string) => this.colorFunction(text, value);
+        if (!value) {
+          throw new Error(`Invalid color for entry: ${key}`);
         }
+        if (
+          (value.length !== 7) ||
+          (!value.toLowerCase().startsWith("#"))
+        ) {
+          throw new Error(`Invalid color: ${value}`);
+        }
+
+        const colorValue = parseInt(value.slice(1), 16);
+
+        if (isNaN(colorValue) || (colorValue < 0 || colorValue > 0xffffff)) {
+          throw new Error(`Invalid color: ${value}`);
+        }
+        sheet[key] = (text: string) => this.colorFunction(text, value);
       }
     }
 

package/tests/service/printer/DefaultPrinterService.test.ts

@@ -122,7 +122,7 @@ describe("DefaultPrinterService tests", () => {
       new TtyStyler(3),
     );
     printerService.colorEnabled = true;
-    await printerService.info(printerService.color("hello", "0x000000"));
+    await printerService.info(printerService.color("hello", "#000000"));
     expectBytesEquals(
       dummyStderr.getString(),
       new Uint8Array([

package/tests/service/syntaxHighlighter/DefaultSyntaxHighlighterService.test.ts

@@ -93,7 +93,7 @@ describe("DefaultSyntaxHighlighterService tests", () => {
       "{ foo: 1 }",
       "json",
       {
-        "number": "0xFF0000",
+        "number": "#FF0000",
       },
     );
     expectBytesEquals(