colorino 0.12.7 → 0.13.1

package/dist/shared/{colorino.BgxwS1Lc.cjs → colorino.Dcy2ipG7.cjs}

@@ -62,6 +62,8 @@ var ColorLevel = /* @__PURE__ */ ((ColorLevel2) => {
 function isConsoleMethod(level) {
   return ["log", "info", "warn", "error", "trace", "debug"].includes(level);
 }
+const ColorinoBrowserColorized = Symbol("colorino.browserColorized");
+const ColorinoBrowserObject = Symbol("colorino.browserObject");
 
 const catppuccinMochaPalette = {
   log: "#cdd6f4",
@@ -146,6 +148,33 @@ function determineBaseTheme(themeOpt, detectedBrowserTheme) {
   return baseThemeName;
 }
 
+class TypeValidator {
+  static isNull(value) {
+    return value === null;
+  }
+  static isObject(value) {
+    return typeof value === "object" && value !== null;
+  }
+  static isString(value) {
+    return typeof value === "string";
+  }
+  static isError(value) {
+    return value instanceof Error;
+  }
+  static isBrowserColorizedArg(value) {
+    return typeof value === "object" && value !== null && ColorinoBrowserColorized in value;
+  }
+  static isBrowserObjectArg(value) {
+    return typeof value === "object" && value !== null && ColorinoBrowserObject in value;
+  }
+  static isAnsiColoredString(value) {
+    return TypeValidator.isString(value) && /\x1b\[[0-9;]*m/.test(value);
+  }
+  static isFormattableObject(value) {
+    return TypeValidator.isObject(value) && !TypeValidator.isError(value) && !TypeValidator.isBrowserColorizedArg(value);
+  }
+}
+
 class MyColorino {
   constructor(initialPalette, _userPalette, _validator, _browserColorSupportDetector, _nodeColorSupportDetector, _options = {}) {
     this._userPalette = _userPalette;
@@ -164,7 +193,7 @@ class MyColorino {
     const themeOpt = this._options.theme ?? "auto";
     if (themeOpt === "auto" && this._nodeColorSupportDetector) {
       this._nodeColorSupportDetector.onTheme((resolvedTheme) => {
-        this._appllyResolvedTheme(resolvedTheme);
+        this._applyResolvedTheme(resolvedTheme);
       });
     }
   }
@@ -172,12 +201,6 @@ class MyColorino {
   _colorLevel;
   isBrowser;
   _palette;
-  _appllyResolvedTheme(resolvedTheme) {
-    const themeOpt = this._options.theme ?? "auto";
-    const baseThemeName = determineBaseTheme(themeOpt, resolvedTheme);
-    const basePalette = themePalettes[baseThemeName];
-    this._palette = { ...basePalette, ...this._userPalette };
-  }
   log(...args) {
     this._out("log", args);
   }
@@ -196,6 +219,32 @@ class MyColorino {
   debug(...args) {
     this._out("debug", args);
   }
+  colorize(text, hex) {
+    if (this._colorLevel === ColorLevel.NO_COLOR || this._colorLevel === "UnknownEnv") {
+      return text;
+    }
+    if (this.isBrowser) {
+      return {
+        [ColorinoBrowserColorized]: true,
+        text,
+        hex
+      };
+    }
+    const ansiPrefix = this._toAnsiPrefix(hex);
+    if (!ansiPrefix) {
+      return text;
+    }
+    return `${ansiPrefix}${text}\x1B[0m`;
+  }
+  _isAnsiColoredString(value) {
+    return typeof value === "string" && /\x1b\[[0-9;]*m/.test(value);
+  }
+  _applyResolvedTheme(resolvedTheme) {
+    const themeOpt = this._options.theme ?? "auto";
+    const baseThemeName = determineBaseTheme(themeOpt, resolvedTheme);
+    const basePalette = themePalettes[baseThemeName];
+    this._palette = { ...basePalette, ...this._userPalette };
+  }
   _detectColorSupport() {
     if (this.isBrowser) {
       return this._browserColorSupportDetector?.getColorLevel() ?? "UnknownEnv";
@@ -215,7 +264,7 @@ class MyColorino {
   _formatValue(value, maxDepth = this._options.maxDepth ?? 5) {
     const seen = /* @__PURE__ */ new WeakSet();
     const sanitize = (val, currentDepth) => {
-      if (val === null || typeof val !== "object") return val;
+      if (val == null || typeof val !== "object") return val;
       if (seen.has(val)) return "[Circular]";
       seen.add(val);
       if (currentDepth >= maxDepth) return "[Object]";
@@ -233,21 +282,36 @@ class MyColorino {
     };
     return JSON.stringify(sanitize(value, 0), null, 2);
   }
+  _normalizeString(value) {
+    if (value instanceof String) return value.valueOf();
+    return value;
+  }
   _processArgs(args) {
     const processedArgs = [];
     let previousWasObject = false;
-    for (const arg of args) {
-      const isFormattableObject = arg !== null && typeof arg === "object" && typeof arg !== "string" && !(arg instanceof Error);
-      const isError = arg instanceof Error;
-      if (isFormattableObject) {
-        processedArgs.push(`
+    for (const rawArg of args) {
+      const arg = this._normalizeString(rawArg);
+      if (TypeValidator.isBrowserColorizedArg(arg)) {
+        processedArgs.push(arg);
+        previousWasObject = false;
+        continue;
+      }
+      if (TypeValidator.isFormattableObject(arg)) {
+        if (this.isBrowser) {
+          processedArgs.push({
+            [ColorinoBrowserObject]: true,
+            value: arg
+          });
+        } else {
+          processedArgs.push(`
 ${this._formatValue(arg)}`);
+        }
         previousWasObject = true;
-      } else if (isError) {
+      } else if (TypeValidator.isError(arg)) {
         processedArgs.push("\n", this._cleanErrorStack(arg));
         previousWasObject = true;
       } else {
-        if (typeof arg === "string" && previousWasObject) {
+        if (TypeValidator.isString(arg) && previousWasObject) {
           processedArgs.push(`
 ${arg}`);
         } else {
@@ -259,48 +323,78 @@ ${arg}`);
     return processedArgs;
   }
   _applyBrowserColors(consoleMethod, args) {
-    const hex = this._palette[consoleMethod];
-    if (typeof args[0] === "string") {
-      return [`%c${args[0]}`, `color:${hex}`, ...args.slice(1)];
+    const formatParts = [];
+    const cssArgs = [];
+    const otherArgs = [];
+    const paletteHex = this._palette[consoleMethod];
+    for (const rawArg of args) {
+      const arg = this._normalizeString(rawArg);
+      if (TypeValidator.isBrowserColorizedArg(arg)) {
+        formatParts.push(`%c${arg.text}`);
+        cssArgs.push(`color:${arg.hex}`);
+        continue;
+      }
+      if (TypeValidator.isBrowserObjectArg(arg)) {
+        formatParts.push("%o");
+        otherArgs.push(arg.value);
+        continue;
+      }
+      if (TypeValidator.isString(arg)) {
+        formatParts.push(`%c${arg}`);
+        cssArgs.push(`color:${paletteHex}`);
+        continue;
+      }
+      formatParts.push("%o");
+      otherArgs.push(arg);
     }
-    return args;
+    if (formatParts.length === 0) {
+      return args;
+    }
+    return [formatParts.join(""), ...cssArgs, ...otherArgs];
   }
-  _applyNodeColors(consoleMethod, args) {
-    const hex = this._palette[consoleMethod];
-    let ansiCode;
+  _toAnsiPrefix(hex) {
+    if (this._colorLevel === ColorLevel.NO_COLOR || this._colorLevel === "UnknownEnv") {
+      return "";
+    }
     switch (this._colorLevel) {
       case ColorLevel.TRUECOLOR: {
         const [r, g, b] = colorConverter.hex.toRgb(hex);
-        ansiCode = `\x1B[38;2;${r};${g};${b}m`;
-        break;
+        return `\x1B[38;2;${r};${g};${b}m`;
       }
       case ColorLevel.ANSI256: {
         const code = colorConverter.hex.toAnsi256(hex);
-        ansiCode = `\x1B[38;5;${code}m`;
-        break;
+        return `\x1B[38;5;${code}m`;
       }
       case ColorLevel.ANSI:
       default: {
         const code = colorConverter.hex.toAnsi16(hex);
-        ansiCode = `\x1B[${code}m`;
-        break;
+        return `\x1B[${code}m`;
       }
     }
+  }
+  _applyNodeColors(consoleMethod, args) {
     const coloredArgs = [...args];
     const firstStringIndex = coloredArgs.findIndex(
       (arg) => typeof arg === "string"
     );
-    if (firstStringIndex !== -1) {
-      coloredArgs[firstStringIndex] = `${ansiCode}${coloredArgs[firstStringIndex]}\x1B[0m`;
+    if (firstStringIndex === -1) {
+      return coloredArgs;
+    }
+    const first = coloredArgs[firstStringIndex];
+    if (this._isAnsiColoredString(first)) {
+      return coloredArgs;
+    }
+    const hex = this._palette[consoleMethod];
+    const ansiPrefix = this._toAnsiPrefix(hex);
+    if (!ansiPrefix) {
+      return coloredArgs;
     }
+    coloredArgs[firstStringIndex] = `${ansiPrefix}${String(first)}\x1B[0m`;
     return coloredArgs;
   }
   _output(consoleMethod, args) {
-    if (consoleMethod === "trace") {
-      this._printCleanTrace(args);
-    } else {
-      console[consoleMethod](...args);
-    }
+    if (consoleMethod === "trace") this._printCleanTrace(args);
+    else console[consoleMethod](...args);
   }
   _out(level, args) {
     const consoleMethod = isConsoleMethod(level) ? level : "log";
@@ -822,11 +916,11 @@ class Err {
 }
 Result.fromThrowable;
 
-class ColorinoError extends Error {
+class InputValidationError extends Error {
   constructor(message) {
     super(message);
-    this.name = "ColorinoError";
-    Object.setPrototypeOf(this, ColorinoError.prototype);
+    this.name = "InputValidationError";
+    Object.setPrototypeOf(this, InputValidationError.prototype);
   }
 }
 
@@ -835,7 +929,7 @@ class InputValidator {
     const trimmedHex = hex.trim();
     const isHexValid = /^#[0-9A-F]{6}$/i.test(trimmedHex);
     if (!isHexValid) {
-      return err(new ColorinoError(`Invalid hex color: '${hex}'`));
+      return err(new InputValidationError(`Invalid hex color: '${hex}'`));
     }
     return ok(true);
   }

package/dist/shared/{colorino.DWWtObdr.d.ts → colorino.FdIbpxRG.d.cts}

@@ -16,6 +16,7 @@ interface Colorino {
     error(...args: unknown[]): void;
     debug(...args: unknown[]): void;
     trace(...args: unknown[]): void;
+    colorize(text: string, hex: string): void;
 }
 
 declare const themePalettes: Record<ThemeName, Palette>;

package/dist/shared/{colorino.DWWtObdr.d.cts → colorino.FdIbpxRG.d.mts}

@@ -16,6 +16,7 @@ interface Colorino {
     error(...args: unknown[]): void;
     debug(...args: unknown[]): void;
     trace(...args: unknown[]): void;
+    colorize(text: string, hex: string): void;
 }
 
 declare const themePalettes: Record<ThemeName, Palette>;

package/dist/shared/{colorino.DWWtObdr.d.mts → colorino.FdIbpxRG.d.ts}

@@ -16,6 +16,7 @@ interface Colorino {
     error(...args: unknown[]): void;
     debug(...args: unknown[]): void;
     trace(...args: unknown[]): void;
+    colorize(text: string, hex: string): void;
 }
 
 declare const themePalettes: Record<ThemeName, Palette>;

package/package.json

@@ -1,25 +1,33 @@
 {
   "name": "colorino",
-  "version": "0.12.7",
+  "version": "0.13.1",
   "description": "A super simple colorized logger that gets the most out of your terminal",
-  "type": "module",
-  "license": "MIT",
-  "author": "simwai",
   "keywords": [
+    "ansi",
     "color",
+    "console",
     "logger",
     "terminal",
-    "ansi",
-    "console"
+    "chalk",
+    "kuler"
   ],
   "homepage": "https://github.com/simwai/colorino",
+  "bugs": {
+    "url": "https://github.com/simwai/colorino/issues"
+  },
+  "license": "MIT",
+  "author": "simwai",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/simwai/colorino.git"
   },
-  "bugs": {
-    "url": "https://github.com/simwai/colorino/issues"
-  },
+  "files": [
+    "dist",
+    "LICENSE.md",
+    "package.json",
+    "README.md"
+  ],
+  "type": "module",
   "main": "./dist/node.cjs",
   "module": "./dist/browser.mjs",
   "types": "./dist/browser.d.ts",
@@ -35,12 +43,9 @@
       "require": "./dist/browser.cjs"
     }
   },
-  "files": [
-    "dist",
-    "README.md",
-    "package.json",
-    "LICENSE.md"
-  ],
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "bundle:browser": "node --loader ts-node/esm node_modules/rollup/dist/bin/rollup -c rollup.browser.config.ts",
     "build": "unbuild && npm run bundle:browser",
@@ -76,7 +81,7 @@
     "lint-staged": "^15.2.0",
     "md-toc-cli": "^3.1.1",
     "node-pty": "^1.1.0",
-    "oxfmt": "^0.9.0",
+    "oxfmt": "^0.23.0",
     "oxlint": "^0.2.0",
     "playwright": "^1.57.0",
     "rollup": "^4.54.0",
@@ -96,8 +101,5 @@
   "engines": {
     "node": ">=17.0.0",
     "npm": ">=8.0.0"
-  },
-  "publishConfig": {
-    "access": "public"
   }
 }