colorino 0.3.3 → 0.5.0

package/dist/node.cjs

@@ -1,7 +1,6 @@
 'use strict';
 
-const theme = require('./shared/colorino.gkk2eRGY.cjs');
-const neverthrow = require('neverthrow');
+const determineBaseTheme = require('./shared/colorino.B9WUj1qg.cjs');
 
 class OscThemeQuerier {
   constructor(_stdin, _stdout, _timeout = 300, _cacheTtl = 36e5) {
@@ -10,64 +9,67 @@ class OscThemeQuerier {
     this._timeout = _timeout;
     this._cacheTtl = _cacheTtl;
   }
-  cachedResult;
-  cacheTimestamp;
-  async query() {
+  _cachedResult;
+  _cacheTimestamp;
+  query() {
     if (!this._stdout.isTTY || typeof this._stdin.setRawMode !== "function") {
-      return neverthrow.err(new theme.OscQueryError("Not a TTY environment"));
+      return determineBaseTheme.err(new determineBaseTheme.OscQueryError("Not a TTY environment"));
     }
     const now = Date.now();
-    if (this.cachedResult !== void 0 && this.cacheTimestamp !== void 0 && now - this.cacheTimestamp < this._cacheTtl) {
-      return this.cachedResult;
+    if (this._cachedResult !== void 0 && this._cacheTimestamp !== void 0 && now - this._cacheTimestamp < this._cacheTtl) {
+      return this._cachedResult;
     }
-    const result = await this._performQuery();
-    this.cachedResult = result;
-    this.cacheTimestamp = now;
+    const result = this._performQuery();
+    this._cachedResult = result;
+    this._cacheTimestamp = now;
     return result;
   }
-  async _performQuery() {
-    return new Promise((resolve) => {
-      const originalRawMode = this._stdin.isRaw;
-      let buffer = "";
-      let isResolved = false;
-      const cleanup = () => {
-        if (isResolved) return;
-        isResolved = true;
-        clearTimeout(timer);
-        this._stdin.removeListener("data", onData);
-        this._stdin.setRawMode(originalRawMode);
-      };
-      const onData = (chunk) => {
+  _performQuery() {
+    const originalRawMode = this._stdin.isRaw;
+    let buffer = "";
+    this._stdin.setRawMode(true);
+    this._stdin.resume();
+    this._stdout.write("\x1B]11;?\x1B\\");
+    const startTime = Date.now();
+    const pollInterval = 10;
+    while (Date.now() - startTime < this._timeout) {
+      const chunk = this._stdin.read();
+      if (chunk !== null) {
         buffer += chunk.toString();
         const parseResult = this._parseResponse(buffer);
         if (parseResult.isOk()) {
-          cleanup();
-          resolve(parseResult);
+          this._cleanup(originalRawMode);
+          return parseResult;
         }
-      };
-      const timer = setTimeout(() => {
-        cleanup();
-        resolve(
-          neverthrow.err(new theme.OscQueryError("OSC query timeout - terminal did not respond"))
-        );
-      }, this._timeout);
-      this._stdin.setRawMode(true);
-      this._stdin.on("data", onData);
-      this._stdout.write("\x1B]11;?\x1B\\");
-    });
+      }
+      this._sleepSync(pollInterval);
+    }
+    this._cleanup(originalRawMode);
+    return determineBaseTheme.err(
+      new determineBaseTheme.OscQueryError("OSC query timeout - terminal did not respond")
+    );
+  }
+  _cleanup(originalRawMode) {
+    this._stdin.setRawMode(originalRawMode);
+    this._stdin.pause();
+  }
+  _sleepSync(ms) {
+    const buffer = new SharedArrayBuffer(4);
+    const view = new Int32Array(buffer);
+    Atomics.wait(view, 0, 0, ms);
   }
   _parseResponse(response) {
     const rgbMatch = response.match(
       /rgb:([0-9a-f]{2,4})\/([0-9a-f]{2,4})\/([0-9a-f]{2,4})/i
     );
     if (!rgbMatch) {
-      return neverthrow.err(new theme.OscQueryError("No valid OSC response found in buffer"));
+      return determineBaseTheme.err(new determineBaseTheme.OscQueryError("No valid OSC response found in buffer"));
     }
     const red = this._normalizeHex(rgbMatch[1]);
     const green = this._normalizeHex(rgbMatch[2]);
     const blue = this._normalizeHex(rgbMatch[3]);
     const luminance = this._calculateLuminance(red, green, blue);
-    return neverthrow.ok(luminance < 0.5 ? "dark" : "light");
+    return determineBaseTheme.ok(luminance < 0.5 ? "dark" : "light");
   }
   _normalizeHex(hexValue) {
     const normalized = hexValue.padEnd(4, "0").slice(0, 2);
@@ -81,7 +83,10 @@ class OscThemeQuerier {
 class NodeColorSupportDetector {
   constructor(_process, overrideTheme) {
     this._process = _process;
-    if (!this.isNodeEnv()) return;
+    if (!this.isNodeEnv()) {
+      this._theme = "unknown";
+      return;
+    }
     const processEnv = _process.env;
     this._envForceColor = processEnv["FORCE_COLOR"];
     this._envNoColor = processEnv["NO_COLOR"];
@@ -91,13 +96,20 @@ class NodeColorSupportDetector {
     this._envCliColorForce = processEnv["CLICOLOR_FORCE"];
     this._envWtSession = processEnv["WT_SESSION"];
     this._isTTY = !!_process.stdout.isTTY;
-    this._overrideTheme = overrideTheme;
-    if (!this._overrideTheme && this._isTTY && typeof this._process.stdin.setRawMode === "function") {
-      this._querier = new OscThemeQuerier(
-        this._process.stdin,
-        this._process.stdout
-      );
+    if (overrideTheme !== void 0) {
+      this._theme = overrideTheme;
+      return;
+    }
+    if (!this._isTTY) {
+      this._theme = "unknown";
+      return;
     }
+    const querier = new OscThemeQuerier(
+      _process.stdin,
+      _process.stdout
+    );
+    const result = querier.query();
+    this._theme = result.isOk() ? result.value : "unknown";
   }
   _envForceColor;
   _envTerm;
@@ -107,79 +119,82 @@ class NodeColorSupportDetector {
   _envCliColorForce;
   _envWtSession;
   _isTTY;
-  _querier;
-  _overrideTheme;
+  _theme;
   isNodeEnv() {
     return typeof this._process !== "undefined";
   }
+  getTheme() {
+    return this._theme;
+  }
   getColorLevel() {
     if (this._envNoColor !== void 0) {
-      return theme.ColorLevel.NO_COLOR;
+      return determineBaseTheme.ColorLevel.NO_COLOR;
     }
     if (this._envForceColor !== void 0) {
       if (this._envForceColor === "0" || this._envForceColor === "false") {
-        return theme.ColorLevel.NO_COLOR;
+        return determineBaseTheme.ColorLevel.NO_COLOR;
       }
       if (this._envForceColor === "1" || this._envForceColor === "true") {
-        return theme.ColorLevel.ANSI;
+        return determineBaseTheme.ColorLevel.ANSI;
       }
       const level = parseInt(this._envForceColor, 10);
       if (level >= 0 && level <= 3) {
         return level;
       }
-      return theme.ColorLevel.ANSI;
+      return determineBaseTheme.ColorLevel.ANSI;
     }
     const isForced = this._envCliColorForce !== void 0 && this._envCliColorForce !== "0";
     if (!this._isTTY && !isForced) {
-      return theme.ColorLevel.NO_COLOR;
+      return determineBaseTheme.ColorLevel.NO_COLOR;
     }
     if (this._envTerm === "dumb") {
-      return theme.ColorLevel.NO_COLOR;
+      return determineBaseTheme.ColorLevel.NO_COLOR;
     }
     if (this._envColorTerm === "truecolor" || this._envColorTerm === "24bit") {
-      return theme.ColorLevel.TRUECOLOR;
+      return determineBaseTheme.ColorLevel.TRUECOLOR;
     }
     if (this._envWtSession !== void 0) {
-      return theme.ColorLevel.TRUECOLOR;
+      return determineBaseTheme.ColorLevel.TRUECOLOR;
     }
     if (this._envTerm) {
-      if (/^xterm-kitty$/.test(this._envTerm) || /^xterm-ghostty$/.test(this._envTerm) || /^wezterm$/.test(this._envTerm) || /-truecolor$/.test(this._envTerm)) {
-        return theme.ColorLevel.TRUECOLOR;
+      if (/^xterm-kitty$/.test(this._envTerm) || /^xterm-ghostty$/.test(this._envTerm) || /^wezterm$/.test(this._envTerm) || this._envTerm.endsWith("-truecolor")) {
+        return determineBaseTheme.ColorLevel.TRUECOLOR;
       }
       if (/-256(color)?$/i.test(this._envTerm)) {
-        return theme.ColorLevel.ANSI256;
+        return determineBaseTheme.ColorLevel.ANSI256;
       }
       if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(
         this._envTerm
       )) {
-        return theme.ColorLevel.ANSI;
+        return determineBaseTheme.ColorLevel.ANSI;
       }
     }
     if (this._envColorTerm) {
-      return theme.ColorLevel.ANSI;
+      return determineBaseTheme.ColorLevel.ANSI;
     }
     if (this._envCliColor !== void 0 && this._envCliColor !== "0") {
-      return theme.ColorLevel.ANSI;
+      return determineBaseTheme.ColorLevel.ANSI;
     }
-    return this._isTTY || isForced ? theme.ColorLevel.ANSI : theme.ColorLevel.NO_COLOR;
-  }
-  async getTheme() {
-    if (this._overrideTheme) {
-      return this._overrideTheme;
-    }
-    if (!this.isNodeEnv() || !this._isTTY || !this._querier) {
-      return "unknown";
-    }
-    const result = await this._querier.query();
-    return result.unwrapOr("unknown");
+    return this._isTTY || isForced ? determineBaseTheme.ColorLevel.ANSI : determineBaseTheme.ColorLevel.NO_COLOR;
   }
 }
 
-function createColorino(palette, options = {}) {
-  const validator = new theme.InputValidator();
-  const nodeDetector = new NodeColorSupportDetector(process, options.theme);
-  const finalPalette = { ...theme.darkDraculaPalette, ...palette };
-  return new theme.Colorino(
+function createColorino(palette = {}, options = {}) {
+  const validator = new determineBaseTheme.InputValidator();
+  let detectorThemeOverride;
+  if (options.theme === "dark" || options.theme === "light") {
+    detectorThemeOverride = options.theme;
+  }
+  const nodeDetector = new NodeColorSupportDetector(
+    process,
+    detectorThemeOverride
+  );
+  const detectedTerminalTheme = nodeDetector.getTheme();
+  const themeOpt = options.theme ?? "auto";
+  const baseThemeName = determineBaseTheme.determineBaseTheme(themeOpt, detectedTerminalTheme);
+  const basePalette = determineBaseTheme.themePalettes[baseThemeName];
+  const finalPalette = { ...basePalette, ...palette };
+  return new determineBaseTheme.Colorino(
     finalPalette,
     validator,
     void 0,
@@ -189,7 +204,7 @@ function createColorino(palette, options = {}) {
     options
   );
 }
-const colorino = createColorino(theme.darkDraculaPalette);
+const colorino = createColorino();
 
 exports.colorino = colorino;
 exports.createColorino = createColorino;

package/dist/node.d.cts

@@ -1,8 +1,7 @@
-import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.Ddpe9uIB.cjs';
-export { L as LogLevel, T as TerminalTheme } from './shared/colorino.Ddpe9uIB.cjs';
-import 'neverthrow';
+import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.B1MNcUze.cjs';
+export { L as LogLevel, T as ThemeName } from './shared/colorino.B1MNcUze.cjs';
 
-declare function createColorino(palette: Partial<Palette>, options?: ColorinoOptions): Colorino;
+declare function createColorino(palette?: Partial<Palette>, options?: ColorinoOptions): Colorino;
 
 declare const colorino: Colorino;
 

package/dist/node.d.mts

@@ -1,8 +1,7 @@
-import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.Ddpe9uIB.mjs';
-export { L as LogLevel, T as TerminalTheme } from './shared/colorino.Ddpe9uIB.mjs';
-import 'neverthrow';
+import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.B1MNcUze.mjs';
+export { L as LogLevel, T as ThemeName } from './shared/colorino.B1MNcUze.mjs';
 
-declare function createColorino(palette: Partial<Palette>, options?: ColorinoOptions): Colorino;
+declare function createColorino(palette?: Partial<Palette>, options?: ColorinoOptions): Colorino;
 
 declare const colorino: Colorino;
 

package/dist/node.d.ts

@@ -1,8 +1,7 @@
-import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.Ddpe9uIB.js';
-export { L as LogLevel, T as TerminalTheme } from './shared/colorino.Ddpe9uIB.js';
-import 'neverthrow';
+import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.B1MNcUze.js';
+export { L as LogLevel, T as ThemeName } from './shared/colorino.B1MNcUze.js';
 
-declare function createColorino(palette: Partial<Palette>, options?: ColorinoOptions): Colorino;
+declare function createColorino(palette?: Partial<Palette>, options?: ColorinoOptions): Colorino;
 
 declare const colorino: Colorino;
 

package/dist/node.mjs

@@ -1,5 +1,4 @@
-import { O as OscQueryError, C as ColorLevel, d as darkDraculaPalette, a as Colorino, I as InputValidator } from './shared/colorino.iQv4mlpl.mjs';
-import { err, ok } from 'neverthrow';
+import { e as err, O as OscQueryError, o as ok, C as ColorLevel, d as determineBaseTheme, t as themePalettes, a as Colorino, I as InputValidator } from './shared/colorino.CsFoITs1.mjs';
 
 class OscThemeQuerier {
   constructor(_stdin, _stdout, _timeout = 300, _cacheTtl = 36e5) {
@@ -8,51 +7,54 @@ class OscThemeQuerier {
     this._timeout = _timeout;
     this._cacheTtl = _cacheTtl;
   }
-  cachedResult;
-  cacheTimestamp;
-  async query() {
+  _cachedResult;
+  _cacheTimestamp;
+  query() {
     if (!this._stdout.isTTY || typeof this._stdin.setRawMode !== "function") {
       return err(new OscQueryError("Not a TTY environment"));
     }
     const now = Date.now();
-    if (this.cachedResult !== void 0 && this.cacheTimestamp !== void 0 && now - this.cacheTimestamp < this._cacheTtl) {
-      return this.cachedResult;
+    if (this._cachedResult !== void 0 && this._cacheTimestamp !== void 0 && now - this._cacheTimestamp < this._cacheTtl) {
+      return this._cachedResult;
     }
-    const result = await this._performQuery();
-    this.cachedResult = result;
-    this.cacheTimestamp = now;
+    const result = this._performQuery();
+    this._cachedResult = result;
+    this._cacheTimestamp = now;
     return result;
   }
-  async _performQuery() {
-    return new Promise((resolve) => {
-      const originalRawMode = this._stdin.isRaw;
-      let buffer = "";
-      let isResolved = false;
-      const cleanup = () => {
-        if (isResolved) return;
-        isResolved = true;
-        clearTimeout(timer);
-        this._stdin.removeListener("data", onData);
-        this._stdin.setRawMode(originalRawMode);
-      };
-      const onData = (chunk) => {
+  _performQuery() {
+    const originalRawMode = this._stdin.isRaw;
+    let buffer = "";
+    this._stdin.setRawMode(true);
+    this._stdin.resume();
+    this._stdout.write("\x1B]11;?\x1B\\");
+    const startTime = Date.now();
+    const pollInterval = 10;
+    while (Date.now() - startTime < this._timeout) {
+      const chunk = this._stdin.read();
+      if (chunk !== null) {
         buffer += chunk.toString();
         const parseResult = this._parseResponse(buffer);
         if (parseResult.isOk()) {
-          cleanup();
-          resolve(parseResult);
+          this._cleanup(originalRawMode);
+          return parseResult;
         }
-      };
-      const timer = setTimeout(() => {
-        cleanup();
-        resolve(
-          err(new OscQueryError("OSC query timeout - terminal did not respond"))
-        );
-      }, this._timeout);
-      this._stdin.setRawMode(true);
-      this._stdin.on("data", onData);
-      this._stdout.write("\x1B]11;?\x1B\\");
-    });
+      }
+      this._sleepSync(pollInterval);
+    }
+    this._cleanup(originalRawMode);
+    return err(
+      new OscQueryError("OSC query timeout - terminal did not respond")
+    );
+  }
+  _cleanup(originalRawMode) {
+    this._stdin.setRawMode(originalRawMode);
+    this._stdin.pause();
+  }
+  _sleepSync(ms) {
+    const buffer = new SharedArrayBuffer(4);
+    const view = new Int32Array(buffer);
+    Atomics.wait(view, 0, 0, ms);
   }
   _parseResponse(response) {
     const rgbMatch = response.match(
@@ -79,7 +81,10 @@ class OscThemeQuerier {
 class NodeColorSupportDetector {
   constructor(_process, overrideTheme) {
     this._process = _process;
-    if (!this.isNodeEnv()) return;
+    if (!this.isNodeEnv()) {
+      this._theme = "unknown";
+      return;
+    }
     const processEnv = _process.env;
     this._envForceColor = processEnv["FORCE_COLOR"];
     this._envNoColor = processEnv["NO_COLOR"];
@@ -89,13 +94,20 @@ class NodeColorSupportDetector {
     this._envCliColorForce = processEnv["CLICOLOR_FORCE"];
     this._envWtSession = processEnv["WT_SESSION"];
     this._isTTY = !!_process.stdout.isTTY;
-    this._overrideTheme = overrideTheme;
-    if (!this._overrideTheme && this._isTTY && typeof this._process.stdin.setRawMode === "function") {
-      this._querier = new OscThemeQuerier(
-        this._process.stdin,
-        this._process.stdout
-      );
+    if (overrideTheme !== void 0) {
+      this._theme = overrideTheme;
+      return;
+    }
+    if (!this._isTTY) {
+      this._theme = "unknown";
+      return;
     }
+    const querier = new OscThemeQuerier(
+      _process.stdin,
+      _process.stdout
+    );
+    const result = querier.query();
+    this._theme = result.isOk() ? result.value : "unknown";
   }
   _envForceColor;
   _envTerm;
@@ -105,11 +117,13 @@ class NodeColorSupportDetector {
   _envCliColorForce;
   _envWtSession;
   _isTTY;
-  _querier;
-  _overrideTheme;
+  _theme;
   isNodeEnv() {
     return typeof this._process !== "undefined";
   }
+  getTheme() {
+    return this._theme;
+  }
   getColorLevel() {
     if (this._envNoColor !== void 0) {
       return ColorLevel.NO_COLOR;
@@ -141,7 +155,7 @@ class NodeColorSupportDetector {
       return ColorLevel.TRUECOLOR;
     }
     if (this._envTerm) {
-      if (/^xterm-kitty$/.test(this._envTerm) || /^xterm-ghostty$/.test(this._envTerm) || /^wezterm$/.test(this._envTerm) || /-truecolor$/.test(this._envTerm)) {
+      if (/^xterm-kitty$/.test(this._envTerm) || /^xterm-ghostty$/.test(this._envTerm) || /^wezterm$/.test(this._envTerm) || this._envTerm.endsWith("-truecolor")) {
         return ColorLevel.TRUECOLOR;
       }
       if (/-256(color)?$/i.test(this._envTerm)) {
@@ -161,22 +175,23 @@ class NodeColorSupportDetector {
     }
     return this._isTTY || isForced ? ColorLevel.ANSI : ColorLevel.NO_COLOR;
   }
-  async getTheme() {
-    if (this._overrideTheme) {
-      return this._overrideTheme;
-    }
-    if (!this.isNodeEnv() || !this._isTTY || !this._querier) {
-      return "unknown";
-    }
-    const result = await this._querier.query();
-    return result.unwrapOr("unknown");
-  }
 }
 
-function createColorino(palette, options = {}) {
+function createColorino(palette = {}, options = {}) {
   const validator = new InputValidator();
-  const nodeDetector = new NodeColorSupportDetector(process, options.theme);
-  const finalPalette = { ...darkDraculaPalette, ...palette };
+  let detectorThemeOverride;
+  if (options.theme === "dark" || options.theme === "light") {
+    detectorThemeOverride = options.theme;
+  }
+  const nodeDetector = new NodeColorSupportDetector(
+    process,
+    detectorThemeOverride
+  );
+  const detectedTerminalTheme = nodeDetector.getTheme();
+  const themeOpt = options.theme ?? "auto";
+  const baseThemeName = determineBaseTheme(themeOpt, detectedTerminalTheme);
+  const basePalette = themePalettes[baseThemeName];
+  const finalPalette = { ...basePalette, ...palette };
   return new Colorino(
     finalPalette,
     validator,
@@ -187,6 +202,6 @@ function createColorino(palette, options = {}) {
     options
   );
 }
-const colorino = createColorino(darkDraculaPalette);
+const colorino = createColorino();
 
 export { colorino, createColorino };