@thi.ng/color 3.2.6 → 4.0.3

package/lab/lab-lab.d.ts

@@ -1,4 +1,4 @@
-import type { ColorOp } from "../api";
+import type { ColorOp } from "../api.js";
 export declare const labLabD50_65: ColorOp;
 export declare const labLabD65_50: ColorOp;
 //# sourceMappingURL=lab-lab.d.ts.map

package/lab/lab-lab.js

@@ -1,5 +1,5 @@
-import { xyzLab, xyzLabD65 } from "../xyz/xyz-lab";
-import { xyzXyzD50_65, xyzXyzD65_50 } from "../xyz/xyz-xyz";
-import { labXyz, labXyzD65 } from "./lab-xyz";
+import { xyzLab, xyzLabD65 } from "../xyz/xyz-lab.js";
+import { xyzXyzD50_65, xyzXyzD65_50 } from "../xyz/xyz-xyz.js";
+import { labXyz, labXyzD65 } from "./lab-xyz.js";
 export const labLabD50_65 = (out, src) => xyzLabD65(out, xyzXyzD50_65(out, labXyz(out, src)));
 export const labLabD65_50 = (out, src) => xyzLab(out, xyzXyzD65_50(out, labXyzD65(out, src)));

package/lab/lab-lch.d.ts

@@ -1,4 +1,4 @@
-import type { ColorOp } from "../api";
+import type { ColorOp } from "../api.js";
 export declare const labLch: ColorOp;
 export declare const lchLab: ColorOp;
 //# sourceMappingURL=lab-lch.d.ts.map

package/lab/lab-lch.js

@@ -1,14 +1,15 @@
-import { atan2Abs, INV_TAU, TAU } from "@thi.ng/math";
-import { setC4 } from "@thi.ng/vectors";
-import { ensureAlpha } from "../internal/ensure-alpha";
+import { atan2Abs } from "@thi.ng/math/angle";
+import { INV_TAU, TAU } from "@thi.ng/math/api";
+import { setC4 } from "@thi.ng/vectors/setc";
+import { __ensureAlpha } from "../internal/ensure.js";
 export const labLch = (out, src) => {
     const { 1: a, 2: b } = src;
-    return setC4(out || src, src[0], Math.hypot(a, b), a === 0 && b === 0 ? 0 : atan2Abs(b, a) * INV_TAU, ensureAlpha(src[3]));
+    return setC4(out || src, src[0], Math.hypot(a, b), a === 0 && b === 0 ? 0 : atan2Abs(b, a) * INV_TAU, __ensureAlpha(src[3]));
 };
 export const lchLab = (out, src) => {
     let { 1: c, 2: h } = src;
     h *= TAU;
-    const a = ensureAlpha(src[3]);
+    const a = __ensureAlpha(src[3]);
     return c > 0
         ? setC4(out || src, src[0], Math.cos(h) * c, Math.sin(h) * c, a)
         : setC4(out || src, src[0], 0, 0, a);

package/lab/lab-rgb.d.ts

@@ -1,4 +1,4 @@
-import type { ColorOp } from "../api";
+import type { ColorOp } from "../api.js";
 /**
  * Converts Lab to linear RGB (via XYZ) using {@link D50} white point.
  *

package/lab/lab-rgb.js

@@ -1,5 +1,5 @@
-import { labXyz, labXyzD65 } from "./lab-xyz";
-import { xyzRgb, xyzRgbD65 } from "../xyz/xyz-rgb";
+import { labXyz, labXyzD65 } from "./lab-xyz.js";
+import { xyzRgb, xyzRgbD65 } from "../xyz/xyz-rgb.js";
 /**
  * Converts Lab to linear RGB (via XYZ) using {@link D50} white point.
  *

package/lab/lab-xyz.d.ts

@@ -1,4 +1,4 @@
-import type { Color, ColorOp, ReadonlyColor } from "../api";
+import type { Color, ColorOp, ReadonlyColor } from "../api.js";
 /**
  * Converts Lab to XYZ using provided white point (default: {@link D50}). Also
  * see {@link labXyzD65}.

package/lab/lab-xyz.js

@@ -1,6 +1,6 @@
-import { setC4 } from "@thi.ng/vectors";
-import { D50, D65 } from "../api/constants";
-import { ensureAlpha } from "../internal/ensure-alpha";
+import { setC4 } from "@thi.ng/vectors/setc";
+import { D50, D65 } from "../api/constants.js";
+import { __ensureAlpha } from "../internal/ensure.js";
 const transform = (x) => {
     const y = x ** 3;
     return y > 0.008856 ? y : (x - 16 / 116) / 7.787;
@@ -15,7 +15,7 @@ const transform = (x) => {
  */
 export const labXyz = (out, src, white = D50) => {
     const y = (src[0] + 0.16) / 1.16;
-    return setC4(out || src, transform(src[1] / 5.0 + y) * white[0], transform(y) * white[1], transform(y - src[2] / 2.0) * white[2], ensureAlpha(src[3]));
+    return setC4(out || src, transform(src[1] / 5.0 + y) * white[0], transform(y) * white[1], transform(y - src[2] / 2.0) * white[2], __ensureAlpha(src[3]));
 };
 /**
  * Same as {@link labXyz}, but using hardcoded {@link D65} white point.

package/lab/lab50.d.ts

@@ -1,6 +1,6 @@
 import type { NumericArray } from "@thi.ng/api";
 import type { IRandom } from "@thi.ng/random";
-import type { Color, ColorFactory, ReadonlyColor, TypedColor } from "../api";
+import type { Color, ColorFactory, ReadonlyColor, TypedColor } from "../api.js";
 export declare class LabD50 implements TypedColor<LabD50> {
     buf: NumericArray;
     offset: number;

package/lab/lab50.js

@@ -1,9 +1,10 @@
-import { defColor } from "../defcolor";
-import { rgbLab } from "../rgb/rgb-lab";
-import { xyzLab } from "../xyz/xyz-lab";
-import { xyzXyzD65_50 } from "../xyz/xyz-xyz";
-import { labLabD65_50 } from "./lab-lab";
-import { lchLab } from "./lab-lch";
+import { defColor } from "../defcolor.js";
+import { rgbLab } from "../rgb/rgb-lab.js";
+import { xyzLab } from "../xyz/xyz-lab.js";
+import { xyzXyzD65_50 } from "../xyz/xyz-xyz.js";
+import { labLabD65_50 } from "./lab-lab.js";
+import { lchLab } from "./lab-lch.js";
+import { labRgb } from "./lab-rgb.js";
 export const labD50 = defColor({
     mode: "lab50",
     channels: {
@@ -18,4 +19,5 @@ export const labD50 = defColor({
         xyz50: xyzLab,
         xyz65: [xyzXyzD65_50, xyzLab],
     },
+    toRgb: labRgb,
 });

package/lab/lab65.d.ts

@@ -1,6 +1,6 @@
 import type { NumericArray } from "@thi.ng/api";
 import type { IRandom } from "@thi.ng/random";
-import type { Color, ColorFactory, ReadonlyColor, TypedColor } from "../api";
+import type { Color, ColorFactory, ReadonlyColor, TypedColor } from "../api.js";
 export declare class LabD65 implements TypedColor<LabD65> {
     buf: NumericArray;
     offset: number;

package/lab/lab65.js

@@ -1,9 +1,10 @@
-import { defColor } from "../defcolor";
-import { rgbLabD65 } from "../rgb/rgb-lab";
-import { xyzLabD65 } from "../xyz/xyz-lab";
-import { xyzXyzD50_65 } from "../xyz/xyz-xyz";
-import { labLabD50_65 } from "./lab-lab";
-import { lchLab } from "./lab-lch";
+import { defColor } from "../defcolor.js";
+import { rgbLabD65 } from "../rgb/rgb-lab.js";
+import { xyzLabD65 } from "../xyz/xyz-lab.js";
+import { xyzXyzD50_65 } from "../xyz/xyz-xyz.js";
+import { labLabD50_65 } from "./lab-lab.js";
+import { lchLab } from "./lab-lch.js";
+import { labRgbD65 } from "./lab-rgb.js";
 export const labD65 = defColor({
     mode: "lab65",
     channels: {
@@ -18,4 +19,5 @@ export const labD65 = defColor({
         xyz50: [xyzXyzD50_65, xyzLabD65],
         xyz65: xyzLabD65,
     },
+    toRgb: labRgbD65,
 });

package/lch/lch-css.d.ts

@@ -1,4 +1,4 @@
-import type { ReadonlyColor } from "../api";
+import type { ReadonlyColor } from "../api.js";
 /**
  * @remarks
  * Only supported in CSS Color Level 4 onwards

package/lch/lch-css.js

@@ -1,6 +1,7 @@
-import { clamp0, fract } from "@thi.ng/math";
-import { FF, PC } from "../api/constants";
-import { ensureAlpha } from "../internal/ensure-alpha";
+import { clamp0 } from "@thi.ng/math/interval";
+import { fract } from "@thi.ng/math/prec";
+import { FF, PC } from "../api/constants.js";
+import { __ensureAlpha } from "../internal/ensure.js";
 /**
  * @remarks
  * Only supported in CSS Color Level 4 onwards
@@ -13,6 +14,6 @@ export const lchCss = (src) => {
     const l = PC(clamp0(src[0]));
     const c = FF(clamp0(src[1]) * 100);
     const h = FF(fract(src[2]) * 360);
-    const a = ensureAlpha(src[3]);
+    const a = __ensureAlpha(src[3]);
     return `lch(${l} ${c} ${h}` + (a < 1 ? `/${FF(a)})` : ")");
 };

package/lch/lch.d.ts

@@ -1,6 +1,6 @@
 import type { NumericArray } from "@thi.ng/api";
 import type { IRandom } from "@thi.ng/random";
-import type { Color, ColorFactory, ReadonlyColor, TypedColor } from "../api";
+import type { Color, ColorFactory, ReadonlyColor, TypedColor } from "../api.js";
 export declare class LCH implements TypedColor<LCH> {
     buf: NumericArray;
     offset: number;

package/lch/lch.js

@@ -1,9 +1,10 @@
-import { defColor } from "../defcolor";
-import { labLabD65_50 } from "../lab/lab-lab";
-import { labLch } from "../lab/lab-lch";
-import { rgbLab } from "../rgb/rgb-lab";
-import { xyzLab } from "../xyz/xyz-lab";
-import { xyzXyzD65_50 } from "../xyz/xyz-xyz";
+import { defColor } from "../defcolor.js";
+import { labLabD65_50 } from "../lab/lab-lab.js";
+import { labLch, lchLab } from "../lab/lab-lch.js";
+import { labRgb } from "../lab/lab-rgb.js";
+import { rgbLab } from "../rgb/rgb-lab.js";
+import { xyzLab } from "../xyz/xyz-lab.js";
+import { xyzXyzD65_50 } from "../xyz/xyz-xyz.js";
 /**
  * Luminance Chroma Hue (conversions assume {@link D50} white point, as per CSS
  * spec).
@@ -21,4 +22,5 @@ export const lch = defColor({
         xyz50: [xyzLab, labLch],
         xyz65: [xyzXyzD65_50, xyzLab, labLch],
     },
+    toRgb: [lchLab, labRgb],
 });

package/{ops/luminance-rgb.d.ts → luminance-rgb.d.ts}

@@ -1,4 +1,4 @@
-import type { ReadonlyColor } from "../api";
+import type { ReadonlyColor } from "./api.js";
 /**
  * Computes RGB luminance, optionally using provided weights (by default:
  * {@link RGB_LUMINANCE_REC709}).

package/{ops/luminance-rgb.js → luminance-rgb.js}

@@ -1,5 +1,5 @@
-import { dot3 } from "@thi.ng/vectors";
-import { RGB_LUMINANCE_REC709, RGB_LUMINANCE_REC601 } from "../api/constants";
+import { dot3 } from "@thi.ng/vectors/dot";
+import { RGB_LUMINANCE_REC709, RGB_LUMINANCE_REC601 } from "./api/constants.js";
 /**
  * Computes RGB luminance, optionally using provided weights (by default:
  * {@link RGB_LUMINANCE_REC709}).

package/{ops/luminance.d.ts → luminance.d.ts}

@@ -1,5 +1,4 @@
-import { MultiFn1 } from "@thi.ng/defmulti";
-import type { MaybeColor } from "../api";
+import type { MaybeColor } from "./api.js";
 /**
  * Multi-method to compute relative luminance from any supported input color
  * format.
@@ -10,5 +9,5 @@ import type { MaybeColor } from "../api";
  * unless a direct implementation is available, colors will first be converted
  * to linear RGB.
  */
-export declare const luminance: MultiFn1<MaybeColor, number>;
+export declare const luminance: import("@thi.ng/defmulti/api").MultiFn1<MaybeColor, number>;
 //# sourceMappingURL=luminance.d.ts.map

package/{ops/luminance.js → luminance.js}

@@ -1,6 +1,6 @@
-import { DEFAULT, defmulti } from "@thi.ng/defmulti";
-import { rgb } from "../rgb/rgb";
-import { luminanceAbgr32, luminanceArgb32, luminanceRgb, luminanceSrgb, } from "./luminance-rgb";
+import { DEFAULT, defmulti } from "@thi.ng/defmulti/defmulti";
+import { rgb } from "./rgb/rgb.js";
+import { luminanceAbgr32, luminanceArgb32, luminanceRgb, luminanceSrgb, } from "./luminance-rgb.js";
 /**
  * Multi-method to compute relative luminance from any supported input color
  * format.
@@ -11,8 +11,7 @@ import { luminanceAbgr32, luminanceArgb32, luminanceRgb, luminanceSrgb, } from "
  * unless a direct implementation is available, colors will first be converted
  * to linear RGB.
  */
-export const luminance = defmulti((col) => col.mode);
-luminance.addAll({
+export const luminance = defmulti((col) => col.mode, { lch: "lab", oklab: "lab", ycc: "lab", xyy: "hcy" }, {
     argb32: luminanceArgb32,
     abgr32: luminanceAbgr32,
     hcy: (x) => x[2],
@@ -20,9 +19,5 @@ luminance.addAll({
     rgb: luminanceRgb,
     srgb: luminanceSrgb,
     xyz: (x) => x[1],
+    [DEFAULT]: (x) => luminanceRgb(rgb(x)),
 });
-luminance.isa("lch", "lab");
-luminance.isa("oklab", "lab");
-luminance.isa("ycc", "lab");
-luminance.isa("xyy", "hcy");
-luminance.add(DEFAULT, (x) => luminanceRgb(rgb(x)));

package/{ops/mix.d.ts → mix.d.ts}

@@ -1,5 +1,5 @@
 import type { FnN3, FnU4 } from "@thi.ng/api";
-import type { ColorMixFn, TypedColor } from "../api";
+import type { ColorMixFn, TypedColor } from "./api.js";
 /**
  * HOF color mix function. Takes 4 scalar mix fns (one per color channel) and
  * returns new {@link ColorMixFn}.
@@ -67,5 +67,5 @@ export declare const mixNNNN: ColorMixFn;
  * @param b -
  * @param t -
  */
-export declare const mix: import("@thi.ng/defmulti").MultiFn4<import("@thi.ng/vectors").Vec | null, TypedColor<any>, TypedColor<any>, number, import("@thi.ng/vectors").Vec>;
+export declare const mix: import("@thi.ng/defmulti/api").MultiFn4<import("@thi.ng/vectors").Vec | null, TypedColor<any>, TypedColor<any>, number, import("@thi.ng/vectors").Vec>;
 //# sourceMappingURL=mix.d.ts.map

package/{ops/mix.js → mix.js}

@@ -1,6 +1,8 @@
-import { DEFAULT, defmulti } from "@thi.ng/defmulti";
-import { fract, mix as $mix } from "@thi.ng/math";
-import { mixN4, setC4 } from "@thi.ng/vectors";
+import { DEFAULT, defmulti } from "@thi.ng/defmulti/defmulti";
+import { mix as $mix } from "@thi.ng/math/mix";
+import { fract } from "@thi.ng/math/prec";
+import { mixN4 } from "@thi.ng/vectors/mixn";
+import { setC4 } from "@thi.ng/vectors/setc";
 /**
  * HOF color mix function. Takes 4 scalar mix fns (one per color channel) and
  * returns new {@link ColorMixFn}.
@@ -79,12 +81,11 @@ export const mixNNNN = mixN4;
  * @param b -
  * @param t -
  */
-export const mix = defmulti((_, a) => a.mode);
-mix.add(DEFAULT, mixN4);
-mix.addAll({
+export const mix = defmulti((_, a) => a.mode, {}, {
     hcy: mixHNNN,
     hsi: mixHNNN,
     hsl: mixHNNN,
     hsv: mixHNNN,
     lch: mixNNHN,
+    [DEFAULT]: mixN4,
 });

package/oklab/oklab-rgb.d.ts

@@ -1,4 +1,4 @@
-import type { ColorOp } from "../api";
+import type { ColorOp } from "../api.js";
 /**
  * @remarks
  * Reference: https://bottosson.github.io/posts/oklab/

package/oklab/oklab-rgb.js

@@ -1,14 +1,7 @@
-import { mulV33 } from "../internal/matrix-ops";
+import { __mulV33 } from "../internal/matrix-ops.js";
 const LMS_CONE = [
-    4.0767245293,
-    -1.2681437731,
-    -0.0041119885,
-    -3.3072168827,
-    2.6093323231,
-    -0.7034763098,
-    0.2307590544,
-    -0.341134429,
-    1.7068625689,
+    4.0767245293, -1.2681437731, -0.0041119885, -3.3072168827, 2.6093323231,
+    -0.7034763098, 0.2307590544, -0.341134429, 1.7068625689,
 ];
 /**
  * @remarks
@@ -17,7 +10,7 @@ const LMS_CONE = [
  * @param out
  * @param src
  */
-export const oklabRgb = (out, { 0: l, 1: a, 2: b, 3: alpha }) => mulV33(out, LMS_CONE, [
+export const oklabRgb = (out, { 0: l, 1: a, 2: b, 3: alpha }) => __mulV33(out, LMS_CONE, [
     (l + 0.3963377774 * a + 0.2158037573 * b) ** 3,
     (l - 0.1055613458 * a - 0.0638541728 * b) ** 3,
     (l - 0.0894841775 * a - 1.291485548 * b) ** 3,

package/oklab/oklab-xyz.d.ts

@@ -1,3 +1,3 @@
-import type { ColorOp } from "../api";
+import type { ColorOp } from "../api.js";
 export declare const oklabXyzD65: ColorOp;
 //# sourceMappingURL=oklab-xyz.d.ts.map

package/oklab/oklab-xyz.js

@@ -1,27 +1,15 @@
-import { powN3 } from "@thi.ng/vectors";
-import { mulV33 } from "../internal/matrix-ops";
+import { powN3 } from "@thi.ng/vectors/pown";
+import { __mulV33 } from "../internal/matrix-ops.js";
 // inverted version of OKLAB_M1
 const M1I = [
-    1.2270138511035211,
-    -0.04058017842328059,
-    -0.0763812845057069,
-    -0.5577999806518222,
-    1.1122568696168302,
-    -0.4214819784180127,
-    0.28125614896646783,
-    -0.07167667866560119,
-    1.586163220440795,
+    1.2270138511035211, -0.04058017842328059, -0.0763812845057069,
+    -0.5577999806518222, 1.1122568696168302, -0.4214819784180127,
+    0.28125614896646783, -0.07167667866560119, 1.586163220440795,
 ];
 // inverted version of OKLAB_M2
 const M2I = [
-    0.9999999984505198,
-    1.0000000088817607,
-    1.0000000546724108,
-    0.3963377921737678,
-    -0.10556134232365633,
-    -0.08948418209496575,
-    0.21580375806075877,
-    -0.06385417477170588,
-    -1.2914855378640917,
+    0.9999999984505198, 1.0000000088817607, 1.0000000546724108,
+    0.3963377921737678, -0.10556134232365633, -0.08948418209496575,
+    0.21580375806075877, -0.06385417477170588, -1.2914855378640917,
 ];
-export const oklabXyzD65 = (out, src) => mulV33(null, M1I, powN3(null, mulV33(out, M2I, src), 3));
+export const oklabXyzD65 = (out, src) => __mulV33(null, M1I, powN3(null, __mulV33(out, M2I, src), 3));

package/oklab/oklab.d.ts

@@ -1,6 +1,6 @@
 import type { NumericArray } from "@thi.ng/api";
 import type { IRandom } from "@thi.ng/random";
-import type { Color, ColorFactory, ReadonlyColor, TypedColor } from "../api";
+import type { Color, ColorFactory, ReadonlyColor, TypedColor } from "../api.js";
 export declare class Oklab implements TypedColor<Oklab> {
     buf: NumericArray;
     offset: number;

package/oklab/oklab.js

@@ -1,9 +1,10 @@
-import { defColor } from "../defcolor";
-import { lchLab } from "../lab/lab-lch";
-import { labXyz, labXyzD65 } from "../lab/lab-xyz";
-import { rgbOklab } from "../rgb/rgb-oklab";
-import { xyzOklab } from "../xyz/xyz-oklab";
-import { xyzXyzD50_65 } from "../xyz/xyz-xyz";
+import { defColor } from "../defcolor.js";
+import { lchLab } from "../lab/lab-lch.js";
+import { labXyz, labXyzD65 } from "../lab/lab-xyz.js";
+import { rgbOklab } from "../rgb/rgb-oklab.js";
+import { xyzOklab } from "../xyz/xyz-oklab.js";
+import { xyzXyzD50_65 } from "../xyz/xyz-xyz.js";
+import { oklabRgb } from "./oklab-rgb.js";
 /**
  * Oklab color type. Conversions assume {@link D65} white point).
  *
@@ -25,4 +26,5 @@ export const oklab = defColor({
         xyz50: [xyzXyzD50_65, xyzOklab],
         xyz65: xyzOklab,
     },
+    toRgb: oklabRgb,
 });