colorino 0.10.1 → 0.11.0

package/dist/browser.bundle.cjs

@@ -63,13 +63,115 @@ function isConsoleMethod(level) {
   return ["log", "info", "warn", "error", "trace", "debug"].includes(level);
 }
 
+const catppuccinMochaPalette = {
+  log: "#cdd6f4",
+  // Text
+  info: "#89b4fa",
+  // Blue
+  warn: "#f9e2af",
+  // Yellow
+  error: "#f38ba8",
+  // Red
+  debug: "#a6adc8",
+  // Subtext0
+  trace: "#9399b2"
+  // Subtext1
+};
+const catppuccinLattePalette = {
+  log: "#4c4f69",
+  // Text
+  info: "#1e66f5",
+  // Blue
+  warn: "#df8e1d",
+  // Yellow
+  error: "#d20f39",
+  // Red
+  debug: "#7c7f93",
+  // Subtext0
+  trace: "#8c8fa1"
+  // Subtext1
+};
+const draculaPalette = {
+  log: "#f8f8f2",
+  // Foreground
+  info: "#8be9fd",
+  // Cyan
+  warn: "#f1fa8c",
+  // Yellow
+  error: "#ff5555",
+  // Red
+  debug: "#bd93f9",
+  // Purple
+  trace: "#6272a4"
+  // Comment
+};
+const githubLightPalette = {
+  log: "#24292e",
+  // Text
+  info: "#0366d6",
+  // Blue
+  warn: "#f9a002",
+  // Yellow
+  error: "#d73a49",
+  // Red
+  debug: "#586069",
+  // Gray
+  trace: "#6a737d"
+  // Gray-light
+};
+const minimalDarkPalette = {
+  log: "#ffffff",
+  info: "#ffffff",
+  warn: "#ffffff",
+  error: "#ffffff",
+  debug: "#ffffff",
+  trace: "#ffffff"
+};
+const minimalLightPalette = {
+  log: "#000000",
+  info: "#000000",
+  warn: "#000000",
+  error: "#000000",
+  debug: "#000000",
+  trace: "#000000"
+};
+
+const themePalettes = {
+  "catppuccin-mocha": catppuccinMochaPalette,
+  "catppuccin-latte": catppuccinLattePalette,
+  dracula: draculaPalette,
+  "github-light": githubLightPalette,
+  "minimal-dark": minimalDarkPalette,
+  "minimal-light": minimalLightPalette
+};
+const defaultDarkTheme = "minimal-dark";
+const defaultLightTheme = "minimal-light";
+function isThemeName(theme) {
+  return theme in themePalettes;
+}
+
+function determineBaseTheme(themeOpt, detectedBrowserTheme) {
+  let baseThemeName;
+  if (isThemeName(themeOpt)) {
+    baseThemeName = themeOpt;
+  } else if (themeOpt === "light") {
+    baseThemeName = defaultLightTheme;
+  } else if (themeOpt === "dark") {
+    baseThemeName = defaultDarkTheme;
+  } else {
+    baseThemeName = detectedBrowserTheme === "light" ? defaultLightTheme : defaultDarkTheme;
+  }
+  return baseThemeName;
+}
+
 class MyColorino {
-  constructor(_palette, _validator, _browserColorSupportDetector, _nodeColorSupportDetector, _options = {}) {
-    this._palette = _palette;
+  constructor(initialPalette, _userPalette, _validator, _browserColorSupportDetector, _nodeColorSupportDetector, _options = {}) {
+    this._userPalette = _userPalette;
     this._validator = _validator;
     this._browserColorSupportDetector = _browserColorSupportDetector;
     this._nodeColorSupportDetector = _nodeColorSupportDetector;
     this._options = _options;
+    this._palette = initialPalette;
     this.isBrowser = !!this._browserColorSupportDetector;
     this._colorLevel = this._detectColorSupport();
     const validatePaletteResult = this._validator.validatePalette(this._palette);
@@ -77,10 +179,23 @@ class MyColorino {
     if (this._colorLevel !== ColorLevel.NO_COLOR && !this._options.disableWarnings && this._colorLevel === "UnknownEnv") {
       this._maybeWarnUser();
     }
+    const themeOpt = this._options.theme ?? "auto";
+    if (themeOpt === "auto" && this._nodeColorSupportDetector) {
+      this._nodeColorSupportDetector.onTheme((resolvedTheme) => {
+        this._appllyResolvedTheme(resolvedTheme);
+      });
+    }
   }
   _alreadyWarned = false;
   _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);
   }
@@ -112,10 +227,10 @@ class MyColorino {
     if (this._alreadyWarned) return;
     this._alreadyWarned = true;
     console.warn(
-      "[Colorino] No ANSI color support detected in this terminal. See [https://github.com/chalk/supports-color#support-matrix](https://github.com/chalk/supports-color#support-matrix) to learn how to enable terminal color."
+      "No ANSI color support detected in this terminal. See [https://github.com/chalk/supports-color#support-matrix](https://github.com/chalk/supports-color#support-matrix) to learn how to enable terminal color."
     );
   }
-  _formatValue(value, maxDepth = 5) {
+  _formatValue(value, maxDepth = this._options.maxDepth ?? 5) {
     const seen = /* @__PURE__ */ new WeakSet();
     const sanitize = (val, currentDepth) => {
       if (val === null || typeof val !== "object") return val;
@@ -200,7 +315,7 @@ ${arg}`);
   }
   _output(consoleMethod, args) {
     if (consoleMethod === "trace") {
-      this._printCleanTrace(args, consoleMethod);
+      this._printCleanTrace(args);
     } else {
       console[consoleMethod](...args);
     }
@@ -221,9 +336,7 @@ ${arg}`);
     this._output(consoleMethod, coloredArgs);
   }
   _filterStack(stack) {
-    return stack.split("\n").filter(
-      (line) => !line.includes("colorino.js") && !line.includes("Colorino._out") && !line.includes("Colorino.error") && !line.includes("Colorino.warn") && !line.includes("Colorino.debug") && !line.includes("Colorino.info") && !line.includes("Colorino.log") && !line.includes("Colorino.trace") && !line.includes("Colorino._cleanErrorStack") && !line.includes("Colorino._printCleanTrace") && !line.includes("Colorino._filterStack")
-    ).join("\n");
+    return stack.split("\n").filter((line) => !line.match(/.*colorino.*/gi)).join("\n");
   }
   _cleanErrorStack(error) {
     if (!error.stack) return error;
@@ -233,14 +346,14 @@ ${arg}`);
     cloned.stack = cleanStack;
     return cloned;
   }
-  _printCleanTrace(args, method) {
+  _printCleanTrace(args) {
     const error = new Error();
     if (error.stack) {
       const cleanStack = this._filterStack(error.stack);
-      console[method](...args, `
+      console.log(...args, `
 ${cleanStack}`);
     } else {
-      console[method](...args);
+      console.log(...args);
     }
   }
 }
@@ -756,107 +869,6 @@ class InputValidator {
   }
 }
 
-const catppuccinMochaPalette = {
-  log: "#cdd6f4",
-  // Text
-  info: "#89b4fa",
-  // Blue
-  warn: "#f9e2af",
-  // Yellow
-  error: "#f38ba8",
-  // Red
-  debug: "#a6adc8",
-  // Subtext0
-  trace: "#9399b2"
-  // Subtext1
-};
-const catppuccinLattePalette = {
-  log: "#4c4f69",
-  // Text
-  info: "#1e66f5",
-  // Blue
-  warn: "#df8e1d",
-  // Yellow
-  error: "#d20f39",
-  // Red
-  debug: "#7c7f93",
-  // Subtext0
-  trace: "#8c8fa1"
-  // Subtext1
-};
-const draculaPalette = {
-  log: "#f8f8f2",
-  // Foreground
-  info: "#8be9fd",
-  // Cyan
-  warn: "#f1fa8c",
-  // Yellow
-  error: "#ff5555",
-  // Red
-  debug: "#bd93f9",
-  // Purple
-  trace: "#6272a4"
-  // Comment
-};
-const githubLightPalette = {
-  log: "#24292e",
-  // Text
-  info: "#0366d6",
-  // Blue
-  warn: "#f9a002",
-  // Yellow
-  error: "#d73a49",
-  // Red
-  debug: "#586069",
-  // Gray
-  trace: "#6a737d"
-  // Gray-light
-};
-const minimalDarkPalette = {
-  log: "#ffffff",
-  info: "#ffffff",
-  warn: "#ffffff",
-  error: "#ffffff",
-  debug: "#ffffff",
-  trace: "#ffffff"
-};
-const minimalLightPalette = {
-  log: "#000000",
-  info: "#000000",
-  warn: "#000000",
-  error: "#000000",
-  debug: "#000000",
-  trace: "#000000"
-};
-
-const themePalettes = {
-  "catppuccin-mocha": catppuccinMochaPalette,
-  "catppuccin-latte": catppuccinLattePalette,
-  dracula: draculaPalette,
-  "github-light": githubLightPalette,
-  "minimal-dark": minimalDarkPalette,
-  "minimal-light": minimalLightPalette
-};
-const defaultDarkTheme = "minimal-dark";
-const defaultLightTheme = "minimal-light";
-function isThemeName(theme) {
-  return theme in themePalettes;
-}
-
-function determineBaseTheme(themeOpt, detectedBrowserTheme) {
-  let baseThemeName;
-  if (isThemeName(themeOpt)) {
-    baseThemeName = themeOpt;
-  } else if (themeOpt === "light") {
-    baseThemeName = defaultLightTheme;
-  } else if (themeOpt === "dark") {
-    baseThemeName = defaultDarkTheme;
-  } else {
-    baseThemeName = detectedBrowserTheme === "light" ? defaultLightTheme : defaultDarkTheme;
-  }
-  return baseThemeName;
-}
-
 class BrowserColorSupportDetector {
   constructor(_window, _navigator, _overrideTheme) {
     this._window = _window;
@@ -892,7 +904,7 @@ class BrowserColorSupportDetector {
   }
 }
 
-function createColorino(palette = {}, options = {}) {
+function createColorino(userPalette = {}, options = {}) {
   const validator = new InputValidator();
   let detectorThemeOverride;
   if (options.theme === "dark" || options.theme === "light") {
@@ -910,9 +922,10 @@ function createColorino(palette = {}, options = {}) {
     detectedBrowserTheme
   );
   const basePalette = themePalettes[baseThemeName];
-  const finalPalette = { ...basePalette, ...palette };
+  const finalPalette = { ...basePalette, ...userPalette };
   return new MyColorino(
     finalPalette,
+    userPalette,
     validator,
     browserDetector,
     // Always use browser detector
@@ -921,8 +934,6 @@ function createColorino(palette = {}, options = {}) {
     options
   );
 }
-const colorino = createColorino();
 
-exports.colorino = colorino;
 exports.createColorino = createColorino;
 exports.themePalettes = themePalettes;

package/dist/browser.bundle.mjs

@@ -61,13 +61,115 @@ function isConsoleMethod(level) {
   return ["log", "info", "warn", "error", "trace", "debug"].includes(level);
 }
 
+const catppuccinMochaPalette = {
+  log: "#cdd6f4",
+  // Text
+  info: "#89b4fa",
+  // Blue
+  warn: "#f9e2af",
+  // Yellow
+  error: "#f38ba8",
+  // Red
+  debug: "#a6adc8",
+  // Subtext0
+  trace: "#9399b2"
+  // Subtext1
+};
+const catppuccinLattePalette = {
+  log: "#4c4f69",
+  // Text
+  info: "#1e66f5",
+  // Blue
+  warn: "#df8e1d",
+  // Yellow
+  error: "#d20f39",
+  // Red
+  debug: "#7c7f93",
+  // Subtext0
+  trace: "#8c8fa1"
+  // Subtext1
+};
+const draculaPalette = {
+  log: "#f8f8f2",
+  // Foreground
+  info: "#8be9fd",
+  // Cyan
+  warn: "#f1fa8c",
+  // Yellow
+  error: "#ff5555",
+  // Red
+  debug: "#bd93f9",
+  // Purple
+  trace: "#6272a4"
+  // Comment
+};
+const githubLightPalette = {
+  log: "#24292e",
+  // Text
+  info: "#0366d6",
+  // Blue
+  warn: "#f9a002",
+  // Yellow
+  error: "#d73a49",
+  // Red
+  debug: "#586069",
+  // Gray
+  trace: "#6a737d"
+  // Gray-light
+};
+const minimalDarkPalette = {
+  log: "#ffffff",
+  info: "#ffffff",
+  warn: "#ffffff",
+  error: "#ffffff",
+  debug: "#ffffff",
+  trace: "#ffffff"
+};
+const minimalLightPalette = {
+  log: "#000000",
+  info: "#000000",
+  warn: "#000000",
+  error: "#000000",
+  debug: "#000000",
+  trace: "#000000"
+};
+
+const themePalettes = {
+  "catppuccin-mocha": catppuccinMochaPalette,
+  "catppuccin-latte": catppuccinLattePalette,
+  dracula: draculaPalette,
+  "github-light": githubLightPalette,
+  "minimal-dark": minimalDarkPalette,
+  "minimal-light": minimalLightPalette
+};
+const defaultDarkTheme = "minimal-dark";
+const defaultLightTheme = "minimal-light";
+function isThemeName(theme) {
+  return theme in themePalettes;
+}
+
+function determineBaseTheme(themeOpt, detectedBrowserTheme) {
+  let baseThemeName;
+  if (isThemeName(themeOpt)) {
+    baseThemeName = themeOpt;
+  } else if (themeOpt === "light") {
+    baseThemeName = defaultLightTheme;
+  } else if (themeOpt === "dark") {
+    baseThemeName = defaultDarkTheme;
+  } else {
+    baseThemeName = detectedBrowserTheme === "light" ? defaultLightTheme : defaultDarkTheme;
+  }
+  return baseThemeName;
+}
+
 class MyColorino {
-  constructor(_palette, _validator, _browserColorSupportDetector, _nodeColorSupportDetector, _options = {}) {
-    this._palette = _palette;
+  constructor(initialPalette, _userPalette, _validator, _browserColorSupportDetector, _nodeColorSupportDetector, _options = {}) {
+    this._userPalette = _userPalette;
     this._validator = _validator;
     this._browserColorSupportDetector = _browserColorSupportDetector;
     this._nodeColorSupportDetector = _nodeColorSupportDetector;
     this._options = _options;
+    this._palette = initialPalette;
     this.isBrowser = !!this._browserColorSupportDetector;
     this._colorLevel = this._detectColorSupport();
     const validatePaletteResult = this._validator.validatePalette(this._palette);
@@ -75,10 +177,23 @@ class MyColorino {
     if (this._colorLevel !== ColorLevel.NO_COLOR && !this._options.disableWarnings && this._colorLevel === "UnknownEnv") {
       this._maybeWarnUser();
     }
+    const themeOpt = this._options.theme ?? "auto";
+    if (themeOpt === "auto" && this._nodeColorSupportDetector) {
+      this._nodeColorSupportDetector.onTheme((resolvedTheme) => {
+        this._appllyResolvedTheme(resolvedTheme);
+      });
+    }
   }
   _alreadyWarned = false;
   _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);
   }
@@ -110,10 +225,10 @@ class MyColorino {
     if (this._alreadyWarned) return;
     this._alreadyWarned = true;
     console.warn(
-      "[Colorino] No ANSI color support detected in this terminal. See [https://github.com/chalk/supports-color#support-matrix](https://github.com/chalk/supports-color#support-matrix) to learn how to enable terminal color."
+      "No ANSI color support detected in this terminal. See [https://github.com/chalk/supports-color#support-matrix](https://github.com/chalk/supports-color#support-matrix) to learn how to enable terminal color."
     );
   }
-  _formatValue(value, maxDepth = 5) {
+  _formatValue(value, maxDepth = this._options.maxDepth ?? 5) {
     const seen = /* @__PURE__ */ new WeakSet();
     const sanitize = (val, currentDepth) => {
       if (val === null || typeof val !== "object") return val;
@@ -198,7 +313,7 @@ ${arg}`);
   }
   _output(consoleMethod, args) {
     if (consoleMethod === "trace") {
-      this._printCleanTrace(args, consoleMethod);
+      this._printCleanTrace(args);
     } else {
       console[consoleMethod](...args);
     }
@@ -219,9 +334,7 @@ ${arg}`);
     this._output(consoleMethod, coloredArgs);
   }
   _filterStack(stack) {
-    return stack.split("\n").filter(
-      (line) => !line.includes("colorino.js") && !line.includes("Colorino._out") && !line.includes("Colorino.error") && !line.includes("Colorino.warn") && !line.includes("Colorino.debug") && !line.includes("Colorino.info") && !line.includes("Colorino.log") && !line.includes("Colorino.trace") && !line.includes("Colorino._cleanErrorStack") && !line.includes("Colorino._printCleanTrace") && !line.includes("Colorino._filterStack")
-    ).join("\n");
+    return stack.split("\n").filter((line) => !line.match(/.*colorino.*/gi)).join("\n");
   }
   _cleanErrorStack(error) {
     if (!error.stack) return error;
@@ -231,14 +344,14 @@ ${arg}`);
     cloned.stack = cleanStack;
     return cloned;
   }
-  _printCleanTrace(args, method) {
+  _printCleanTrace(args) {
     const error = new Error();
     if (error.stack) {
       const cleanStack = this._filterStack(error.stack);
-      console[method](...args, `
+      console.log(...args, `
 ${cleanStack}`);
     } else {
-      console[method](...args);
+      console.log(...args);
     }
   }
 }
@@ -754,107 +867,6 @@ class InputValidator {
   }
 }
 
-const catppuccinMochaPalette = {
-  log: "#cdd6f4",
-  // Text
-  info: "#89b4fa",
-  // Blue
-  warn: "#f9e2af",
-  // Yellow
-  error: "#f38ba8",
-  // Red
-  debug: "#a6adc8",
-  // Subtext0
-  trace: "#9399b2"
-  // Subtext1
-};
-const catppuccinLattePalette = {
-  log: "#4c4f69",
-  // Text
-  info: "#1e66f5",
-  // Blue
-  warn: "#df8e1d",
-  // Yellow
-  error: "#d20f39",
-  // Red
-  debug: "#7c7f93",
-  // Subtext0
-  trace: "#8c8fa1"
-  // Subtext1
-};
-const draculaPalette = {
-  log: "#f8f8f2",
-  // Foreground
-  info: "#8be9fd",
-  // Cyan
-  warn: "#f1fa8c",
-  // Yellow
-  error: "#ff5555",
-  // Red
-  debug: "#bd93f9",
-  // Purple
-  trace: "#6272a4"
-  // Comment
-};
-const githubLightPalette = {
-  log: "#24292e",
-  // Text
-  info: "#0366d6",
-  // Blue
-  warn: "#f9a002",
-  // Yellow
-  error: "#d73a49",
-  // Red
-  debug: "#586069",
-  // Gray
-  trace: "#6a737d"
-  // Gray-light
-};
-const minimalDarkPalette = {
-  log: "#ffffff",
-  info: "#ffffff",
-  warn: "#ffffff",
-  error: "#ffffff",
-  debug: "#ffffff",
-  trace: "#ffffff"
-};
-const minimalLightPalette = {
-  log: "#000000",
-  info: "#000000",
-  warn: "#000000",
-  error: "#000000",
-  debug: "#000000",
-  trace: "#000000"
-};
-
-const themePalettes = {
-  "catppuccin-mocha": catppuccinMochaPalette,
-  "catppuccin-latte": catppuccinLattePalette,
-  dracula: draculaPalette,
-  "github-light": githubLightPalette,
-  "minimal-dark": minimalDarkPalette,
-  "minimal-light": minimalLightPalette
-};
-const defaultDarkTheme = "minimal-dark";
-const defaultLightTheme = "minimal-light";
-function isThemeName(theme) {
-  return theme in themePalettes;
-}
-
-function determineBaseTheme(themeOpt, detectedBrowserTheme) {
-  let baseThemeName;
-  if (isThemeName(themeOpt)) {
-    baseThemeName = themeOpt;
-  } else if (themeOpt === "light") {
-    baseThemeName = defaultLightTheme;
-  } else if (themeOpt === "dark") {
-    baseThemeName = defaultDarkTheme;
-  } else {
-    baseThemeName = detectedBrowserTheme === "light" ? defaultLightTheme : defaultDarkTheme;
-  }
-  return baseThemeName;
-}
-
 class BrowserColorSupportDetector {
   constructor(_window, _navigator, _overrideTheme) {
     this._window = _window;
@@ -890,7 +902,7 @@ class BrowserColorSupportDetector {
   }
 }
 
-function createColorino(palette = {}, options = {}) {
+function createColorino(userPalette = {}, options = {}) {
   const validator = new InputValidator();
   let detectorThemeOverride;
   if (options.theme === "dark" || options.theme === "light") {
@@ -908,9 +920,10 @@ function createColorino(palette = {}, options = {}) {
     detectedBrowserTheme
   );
   const basePalette = themePalettes[baseThemeName];
-  const finalPalette = { ...basePalette, ...palette };
+  const finalPalette = { ...basePalette, ...userPalette };
   return new MyColorino(
     finalPalette,
+    userPalette,
     validator,
     browserDetector,
     // Always use browser detector
@@ -919,6 +932,5 @@ function createColorino(palette = {}, options = {}) {
     options
   );
 }
-const colorino = createColorino();
 
-export { colorino, createColorino, themePalettes };
+export { createColorino, themePalettes };