colorino 0.4.0 → 0.6.0

package/README.md

@@ -288,7 +288,7 @@ We welcome contributions! Here's exactly how to get started:
     # Run only Node.js tests
     npm run test:node
     
-    # Run only Browser tests (JSDOM)
+    # Run only Browser tests
     npm run test:browser
     
     # Watch mode with UI (great for dev!)

package/dist/browser.cjs

@@ -1,7 +1,6 @@
 'use strict';
 
-const determineBaseTheme = require('./shared/colorino.BUBv72sF.cjs');
-require('neverthrow');
+const determineBaseTheme = require('./shared/colorino.B9WUj1qg.cjs');
 
 class BrowserColorSupportDetector {
   constructor(_window, _navigator, _overrideTheme) {
@@ -69,5 +68,6 @@ function createColorino(palette = {}, options = {}) {
 }
 const colorino = createColorino();
 
+exports.themePalettes = determineBaseTheme.themePalettes;
 exports.colorino = colorino;
 exports.createColorino = createColorino;

package/dist/browser.d.cts

@@ -1,6 +1,5 @@
-import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.ODiKA7Gy.cjs';
-export { L as LogLevel, T as ThemeName } from './shared/colorino.ODiKA7Gy.cjs';
-import 'neverthrow';
+import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.DBw7jOfy.cjs';
+export { L as LogLevel, T as ThemeName, t as themePalettes } from './shared/colorino.DBw7jOfy.cjs';
 
 declare function createColorino(palette?: Partial<Palette>, options?: ColorinoOptions): Colorino;
 

package/dist/browser.d.mts

@@ -1,6 +1,5 @@
-import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.ODiKA7Gy.mjs';
-export { L as LogLevel, T as ThemeName } from './shared/colorino.ODiKA7Gy.mjs';
-import 'neverthrow';
+import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.DBw7jOfy.mjs';
+export { L as LogLevel, T as ThemeName, t as themePalettes } from './shared/colorino.DBw7jOfy.mjs';
 
 declare function createColorino(palette?: Partial<Palette>, options?: ColorinoOptions): Colorino;
 

package/dist/browser.d.ts

@@ -1,6 +1,5 @@
-import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.ODiKA7Gy.js';
-export { L as LogLevel, T as ThemeName } from './shared/colorino.ODiKA7Gy.js';
-import 'neverthrow';
+import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.DBw7jOfy.js';
+export { L as LogLevel, T as ThemeName, t as themePalettes } from './shared/colorino.DBw7jOfy.js';
 
 declare function createColorino(palette?: Partial<Palette>, options?: ColorinoOptions): Colorino;
 

package/dist/browser.mjs

@@ -1,5 +1,4 @@
-import { C as ColorLevel, t as themePalettes, a as Colorino, I as InputValidator, d as determineBaseTheme } from './shared/colorino.B16XJPJ-.mjs';
-import 'neverthrow';
+import { C as ColorLevel, t as themePalettes, a as Colorino, I as InputValidator, d as determineBaseTheme } from './shared/colorino.CsFoITs1.mjs';
 
 class BrowserColorSupportDetector {
   constructor(_window, _navigator, _overrideTheme) {
@@ -67,4 +66,4 @@ function createColorino(palette = {}, options = {}) {
 }
 const colorino = createColorino();
 
-export { colorino, createColorino };
+export { colorino, createColorino, themePalettes };

package/dist/node.cjs

@@ -1,16 +1,92 @@
 'use strict';
 
-const determineBaseTheme = require('./shared/colorino.BUBv72sF.cjs');
-const node_url = require('node:url');
-const node_child_process = require('node:child_process');
-const node_path = require('node:path');
-const neverthrow = require('neverthrow');
+const determineBaseTheme = require('./shared/colorino.B9WUj1qg.cjs');
+
+class OscThemeQuerier {
+  constructor(_stdin, _stdout, _timeout = 300, _cacheTtl = 36e5) {
+    this._stdin = _stdin;
+    this._stdout = _stdout;
+    this._timeout = _timeout;
+    this._cacheTtl = _cacheTtl;
+  }
+  _cachedResult;
+  _cacheTimestamp;
+  query() {
+    if (!this._stdout.isTTY || typeof this._stdin.setRawMode !== "function") {
+      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;
+    }
+    const result = this._performQuery();
+    this._cachedResult = result;
+    this._cacheTimestamp = now;
+    return result;
+  }
+  _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()) {
+          this._cleanup(originalRawMode);
+          return parseResult;
+        }
+      }
+      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 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 determineBaseTheme.ok(luminance < 0.5 ? "dark" : "light");
+  }
+  _normalizeHex(hexValue) {
+    const normalized = hexValue.padEnd(4, "0").slice(0, 2);
+    return parseInt(normalized, 16);
+  }
+  _calculateLuminance(red, green, blue) {
+    return (0.299 * red + 0.587 * green + 0.114 * blue) / 255;
+  }
+}
 
-var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 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"];
@@ -20,7 +96,20 @@ class NodeColorSupportDetector {
     this._envCliColorForce = processEnv["CLICOLOR_FORCE"];
     this._envWtSession = processEnv["WT_SESSION"];
     this._isTTY = !!_process.stdout.isTTY;
-    this._overrideTheme = overrideTheme;
+    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;
@@ -30,10 +119,13 @@ class NodeColorSupportDetector {
   _envCliColorForce;
   _envWtSession;
   _isTTY;
-  _overrideTheme;
+  _theme;
   isNodeEnv() {
     return typeof this._process !== "undefined";
   }
+  getTheme() {
+    return this._theme;
+  }
   getColorLevel() {
     if (this._envNoColor !== void 0) {
       return determineBaseTheme.ColorLevel.NO_COLOR;
@@ -85,31 +177,6 @@ class NodeColorSupportDetector {
     }
     return this._isTTY || isForced ? determineBaseTheme.ColorLevel.ANSI : determineBaseTheme.ColorLevel.NO_COLOR;
   }
-  getTheme() {
-    if (this._overrideTheme) return this._overrideTheme;
-    if (!this.isNodeEnv() || !this._isTTY) return "unknown";
-    const __dirname = node_path.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('node.cjs', document.baseURI).href))));
-    const scriptPath = node_path.join(__dirname, "./run-osc-querier.js");
-    const spawnResult = neverthrow.Result.fromThrowable(
-      () => node_child_process.spawnSync(process.execPath, [scriptPath], {
-        stdio: ["inherit", "pipe", "pipe"],
-        timeout: 1e3,
-        encoding: "utf-8"
-      }),
-      (error) => error
-    )();
-    if (spawnResult.isErr()) {
-      return "unknown";
-    }
-    const processOutput = spawnResult.value;
-    if (processOutput.status !== 0 || processOutput.error) {
-      return "unknown";
-    }
-    const output = processOutput.stdout?.trim();
-    if (output === "dark") return "dark";
-    if (output === "light") return "light";
-    return "unknown";
-  }
 }
 
 function createColorino(palette = {}, options = {}) {
@@ -139,5 +206,6 @@ function createColorino(palette = {}, options = {}) {
 }
 const colorino = createColorino();
 
+exports.themePalettes = determineBaseTheme.themePalettes;
 exports.colorino = colorino;
 exports.createColorino = createColorino;

package/dist/node.d.cts

@@ -1,6 +1,5 @@
-import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.ODiKA7Gy.cjs';
-export { L as LogLevel, T as ThemeName } from './shared/colorino.ODiKA7Gy.cjs';
-import 'neverthrow';
+import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.DBw7jOfy.cjs';
+export { L as LogLevel, T as ThemeName, t as themePalettes } from './shared/colorino.DBw7jOfy.cjs';
 
 declare function createColorino(palette?: Partial<Palette>, options?: ColorinoOptions): Colorino;
 

package/dist/node.d.mts

@@ -1,6 +1,5 @@
-import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.ODiKA7Gy.mjs';
-export { L as LogLevel, T as ThemeName } from './shared/colorino.ODiKA7Gy.mjs';
-import 'neverthrow';
+import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.DBw7jOfy.mjs';
+export { L as LogLevel, T as ThemeName, t as themePalettes } from './shared/colorino.DBw7jOfy.mjs';
 
 declare function createColorino(palette?: Partial<Palette>, options?: ColorinoOptions): Colorino;
 

package/dist/node.d.ts

@@ -1,6 +1,5 @@
-import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.ODiKA7Gy.js';
-export { L as LogLevel, T as ThemeName } from './shared/colorino.ODiKA7Gy.js';
-import 'neverthrow';
+import { P as Palette, C as ColorinoOptions, a as Colorino } from './shared/colorino.DBw7jOfy.js';
+export { L as LogLevel, T as ThemeName, t as themePalettes } from './shared/colorino.DBw7jOfy.js';
 
 declare function createColorino(palette?: Partial<Palette>, options?: ColorinoOptions): Colorino;
 

package/dist/node.mjs

@@ -1,13 +1,90 @@
-import { C as ColorLevel, d as determineBaseTheme, t as themePalettes, a as Colorino, I as InputValidator } from './shared/colorino.B16XJPJ-.mjs';
-import { fileURLToPath } from 'node:url';
-import { spawnSync } from 'node:child_process';
-import { dirname, join } from 'node:path';
-import { Result } 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) {
+    this._stdin = _stdin;
+    this._stdout = _stdout;
+    this._timeout = _timeout;
+    this._cacheTtl = _cacheTtl;
+  }
+  _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;
+    }
+    const result = this._performQuery();
+    this._cachedResult = result;
+    this._cacheTimestamp = now;
+    return result;
+  }
+  _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()) {
+          this._cleanup(originalRawMode);
+          return parseResult;
+        }
+      }
+      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(
+      /rgb:([0-9a-f]{2,4})\/([0-9a-f]{2,4})\/([0-9a-f]{2,4})/i
+    );
+    if (!rgbMatch) {
+      return err(new 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 ok(luminance < 0.5 ? "dark" : "light");
+  }
+  _normalizeHex(hexValue) {
+    const normalized = hexValue.padEnd(4, "0").slice(0, 2);
+    return parseInt(normalized, 16);
+  }
+  _calculateLuminance(red, green, blue) {
+    return (0.299 * red + 0.587 * green + 0.114 * blue) / 255;
+  }
+}
 
 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"];
@@ -17,7 +94,20 @@ class NodeColorSupportDetector {
     this._envCliColorForce = processEnv["CLICOLOR_FORCE"];
     this._envWtSession = processEnv["WT_SESSION"];
     this._isTTY = !!_process.stdout.isTTY;
-    this._overrideTheme = overrideTheme;
+    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;
@@ -27,10 +117,13 @@ class NodeColorSupportDetector {
   _envCliColorForce;
   _envWtSession;
   _isTTY;
-  _overrideTheme;
+  _theme;
   isNodeEnv() {
     return typeof this._process !== "undefined";
   }
+  getTheme() {
+    return this._theme;
+  }
   getColorLevel() {
     if (this._envNoColor !== void 0) {
       return ColorLevel.NO_COLOR;
@@ -82,31 +175,6 @@ class NodeColorSupportDetector {
     }
     return this._isTTY || isForced ? ColorLevel.ANSI : ColorLevel.NO_COLOR;
   }
-  getTheme() {
-    if (this._overrideTheme) return this._overrideTheme;
-    if (!this.isNodeEnv() || !this._isTTY) return "unknown";
-    const __dirname = dirname(fileURLToPath(import.meta.url));
-    const scriptPath = join(__dirname, "./run-osc-querier.js");
-    const spawnResult = Result.fromThrowable(
-      () => spawnSync(process.execPath, [scriptPath], {
-        stdio: ["inherit", "pipe", "pipe"],
-        timeout: 1e3,
-        encoding: "utf-8"
-      }),
-      (error) => error
-    )();
-    if (spawnResult.isErr()) {
-      return "unknown";
-    }
-    const processOutput = spawnResult.value;
-    if (processOutput.status !== 0 || processOutput.error) {
-      return "unknown";
-    }
-    const output = processOutput.stdout?.trim();
-    if (output === "dark") return "dark";
-    if (output === "light") return "light";
-    return "unknown";
-  }
 }
 
 function createColorino(palette = {}, options = {}) {
@@ -136,4 +204,4 @@ function createColorino(palette = {}, options = {}) {
 }
 const colorino = createColorino();
 
-export { colorino, createColorino };
+export { colorino, createColorino, themePalettes };