@thi.ng/color 5.6.2 → 5.6.4

package/css/parse-css.js

@@ -12,174 +12,108 @@ import { INV8BIT } from "../api/constants.js";
 import { CSS_NAMES } from "../api/names.js";
 import { CSS_SYSTEM_COLORS } from "../api/system.js";
 import { intArgb32Srgb } from "../int/int-srgb.js";
-/**
- * Attempts to parse given CSS color into an interim {@link ParsedColor} type
- * with {@link srgb}, {@link hsl}, {@link labD50} or {@link lch} color modes.
- * Throws an error if any of the validations during parsing failed.
- *
- * @remarks
- * The following syntax versions are supported:
- *
- * - CSS named colors
- * - CSS system colors @see {@link CSS_SYSTEM_COLORS}
- * - hex3/4/6/8
- * - `rgb(r% g% b% / a%?)`
- * - `rgb(r g b / a?)`
- * - `rgb(r,g,b)`
- * - `rgba(r,g,b,a)`
- * - `hsl(h s% l% / a%?)`
- * - `hsl(h,s%,l%)`
- * - `hsla(h,s%,l%,a)`
- * - `lab(l a b / alpha?)`
- * - `lab(l% a% b% / alpha?)`
- * - `lch(l c h / alpha?)`
- * - `lch(l% c% h / alpha?)`
- * - `oklab(l a b / alpha?)`
- * - `oklab(l% a% b% / alpha?)`
- * - `oklch(l c h / alpha?)`
- * - `oklch(l% c% h / alpha?)`
- *
- * Hue values can be given according to CSS Color L4 spec (raw, deg, rad, grad,
- * turn): https://www.w3.org/TR/css-color-4/#typedef-hue
- *
- * For (ok)lab/(ok)lch color channel values given as percentages, the scale
- * ranges defined in the spec are used:
- * https://www.w3.org/TR/css-color-4/#specifying-lab-lch
- *
- * If no alpha channel is given, it will default to 1.0 (fully opaque).
- *
- * Note that any named or system CSS colors, hex colors and any RGB colors will
- * be returned as sRGB instance. In former versions of this library (pre 3.0.0),
- * there was only a single RGB type with undefined behaviour re: linear or
- * gamma-encoded versions. Since v3.0.0, {@link rgb} is only used for _linear_
- * and {@link srgb} for non-linear (gamma encoded) RGB colors (CSS uses sRGB by
- * default).
- *
- * @param src -
- */
-export const parseCss = (src) => {
-    src = (isString(src) ? src : src.deref()).toLowerCase();
-    const named = CSS_NAMES[src] || CSS_SYSTEM_COLORS[src];
-    if (named || src[0] === "#")
-        return new ParsedColor("srgb", intArgb32Srgb([], parseHex(named || src)));
-    const parts = src.split(/[(),/ ]+/);
-    const [mode, a, b, c, d] = parts;
-    assert(parts.length === 5 || parts.length === 6, `invalid color: ${src}`);
-    switch (mode) {
-        case "rgb":
-        case "rgba":
-            return new ParsedColor("srgb", [
-                __numOrPercent(a, 1, INV8BIT, true),
-                __numOrPercent(b, 1, INV8BIT, true),
-                __numOrPercent(c, 1, INV8BIT, true),
-                __alpha(d),
-            ]);
-        case "hsl":
-        case "hsla":
-            return new ParsedColor("hsl", [
-                __hue(a),
-                __percent(b),
-                __percent(c),
-                __alpha(d),
-            ]);
-        case "lab":
-            return new ParsedColor("lab50", [
-                __numOrPercent(a),
-                __numOrPercent(b, 1.25),
-                __numOrPercent(c, 1.25),
-                __alpha(d),
-            ]);
-        case "lch":
-            return new ParsedColor(mode, [
-                __numOrPercent(a),
-                __numOrPercent(b, 1.5),
-                __hue(c),
-                __alpha(d),
-            ]);
-        case "oklab":
-            return new ParsedColor(mode, [
-                __numOrPercent(a, 1, 1),
-                __numOrPercent(b, 0.4, 1),
-                __numOrPercent(c, 0.4, 1),
-                __alpha(d),
-            ]);
-        case "oklch":
-            return new ParsedColor(mode, [
-                __numOrPercent(a, 1, 1),
-                __numOrPercent(b, 0.4, 1),
-                __hue(c),
-                __alpha(d),
-            ]);
-        default:
-            unsupported(`color mode: ${mode}`);
-    }
+const parseCss = (src) => {
+  src = (isString(src) ? src : src.deref()).toLowerCase();
+  const named = CSS_NAMES[src] || CSS_SYSTEM_COLORS[src];
+  if (named || src[0] === "#")
+    return new ParsedColor(
+      "srgb",
+      intArgb32Srgb([], parseHex(named || src))
+    );
+  const parts = src.split(/[(),/ ]+/);
+  const [mode, a, b, c, d] = parts;
+  assert(parts.length === 5 || parts.length === 6, `invalid color: ${src}`);
+  switch (mode) {
+    case "rgb":
+    case "rgba":
+      return new ParsedColor("srgb", [
+        __numOrPercent(a, 1, INV8BIT, true),
+        __numOrPercent(b, 1, INV8BIT, true),
+        __numOrPercent(c, 1, INV8BIT, true),
+        __alpha(d)
+      ]);
+    case "hsl":
+    case "hsla":
+      return new ParsedColor("hsl", [
+        __hue(a),
+        __percent(b),
+        __percent(c),
+        __alpha(d)
+      ]);
+    case "lab":
+      return new ParsedColor("lab50", [
+        __numOrPercent(a),
+        __numOrPercent(b, 1.25),
+        __numOrPercent(c, 1.25),
+        __alpha(d)
+      ]);
+    case "lch":
+      return new ParsedColor(mode, [
+        __numOrPercent(a),
+        __numOrPercent(b, 1.5),
+        __hue(c),
+        __alpha(d)
+      ]);
+    case "oklab":
+      return new ParsedColor(mode, [
+        __numOrPercent(a, 1, 1),
+        __numOrPercent(b, 0.4, 1),
+        __numOrPercent(c, 0.4, 1),
+        __alpha(d)
+      ]);
+    case "oklch":
+      return new ParsedColor(mode, [
+        __numOrPercent(a, 1, 1),
+        __numOrPercent(b, 0.4, 1),
+        __hue(c),
+        __alpha(d)
+      ]);
+    default:
+      unsupported(`color mode: ${mode}`);
+  }
 };
-/**
- * Scale factors for various CSS angle units
- *
- * @remarks
- * Reference:
- * - https://www.w3.org/TR/css-values-4/#angle-value
- *
- * @internal
- */
 const HUE_NORMS = {
-    rad: TAU,
-    grad: 400,
-    turn: 1,
-    deg: 360,
+  rad: TAU,
+  grad: 400,
+  turn: 1,
+  deg: 360
 };
-/** @internal */
 const __hue = (x) => {
-    const match = /^(-?[0-9.]+)(deg|rad|grad|turn)?$/.exec(x);
-    assert(!!match, `expected hue, got: ${x}`);
-    return fract(parseFloat(match[1]) / (HUE_NORMS[match[2]] || 360));
+  const match = /^(-?[0-9.]+)(deg|rad|grad|turn)?$/.exec(x);
+  assert(!!match, `expected hue, got: ${x}`);
+  return fract(parseFloat(match[1]) / (HUE_NORMS[match[2]] || 360));
 };
-/** @internal */
-const __alpha = (x) => (x ? __numOrPercent(x, 1, 1, true) : 1);
-/** @internal */
+const __alpha = (x) => x ? __numOrPercent(x, 1, 1, true) : 1;
 const __percent = (x, clamp = true) => {
-    assert(/^([0-9.]+)%$/.test(x), `expected percentage, got: ${x}`);
-    const res = parseFloat(x) / 100;
-    return clamp ? clamp01(res) : res;
+  assert(/^([0-9.]+)%$/.test(x), `expected percentage, got: ${x}`);
+  const res = parseFloat(x) / 100;
+  return clamp ? clamp01(res) : res;
 };
-/** @internal */
 const __numOrPercent = (x, scalePerc = 1, scale = 0.01, clamp = false) => {
-    assert(/^-?[0-9.]+%?$/.test(x), `expected number or percentage, got: ${x}`);
-    const res = parseFloat(x) * (x.endsWith("%") ? 0.01 * scalePerc : scale);
-    return clamp ? clamp01(res) : res;
+  assert(/^-?[0-9.]+%?$/.test(x), `expected number or percentage, got: ${x}`);
+  const res = parseFloat(x) * (x.endsWith("%") ? 0.01 * scalePerc : scale);
+  return clamp ? clamp01(res) : res;
 };
-/**
- * Parses a CSS hex color string into an uint32. Throws an error if given string
- * doesn't conform to any of the supported formats.
- *
- * @remarks
- * Supports the following input formats (`#` always optional and each letter a
- * hex digit):
- *
- * - `#rgb`
- * - `#rgba`
- * - `#rrggbb`
- * - `#rrggbbaa`
- *
- * @param src
- */
-export const parseHex = (src) => {
-    const match = /^#?([0-9a-f]{3,8})$/i.exec(src);
-    if (match) {
-        const hex = match[1];
-        const val = parseInt(hex, 16);
-        switch (hex.length) {
-            case 3:
-                return (interleave4_12_24(val) | 0xff000000) >>> 0;
-            case 4:
-                return rotateRight(interleave4_16_32(val), 8);
-            case 6:
-                return (val | 0xff000000) >>> 0;
-            case 8:
-                return rotateRight(val, 8);
-            default:
-        }
+const parseHex = (src) => {
+  const match = /^#?([0-9a-f]{3,8})$/i.exec(src);
+  if (match) {
+    const hex = match[1];
+    const val = parseInt(hex, 16);
+    switch (hex.length) {
+      case 3:
+        return (interleave4_12_24(val) | 4278190080) >>> 0;
+      case 4:
+        return rotateRight(interleave4_16_32(val), 8);
+      case 6:
+        return (val | 4278190080) >>> 0;
+      case 8:
+        return rotateRight(val, 8);
+      default:
     }
-    return illegalArgs(`invalid hex color: "${src}"`);
+  }
+  return illegalArgs(`invalid hex color: "${src}"`);
+};
+export {
+  parseCss,
+  parseHex
 };

package/defcolor.js

@@ -17,113 +17,102 @@ import { convert, defConversions } from "./convert.js";
 import { parseCss } from "./css/parse-css.js";
 import { intArgb32Rgb } from "./int/int-rgb.js";
 import { __ensureArgs } from "./internal/ensure.js";
-export const defColor = (spec) => {
-    const channels = spec.channels || {};
-    const order = spec.order;
-    const numChannels = order.length;
-    order.reduce((acc, id) => {
-        acc[id] = {
-            range: [0, 1],
-            ...channels[id],
-        };
-        return acc;
-    }, channels);
-    const min = Object.freeze(order.map((id) => channels[id].range[0]));
-    const max = Object.freeze(order.map((id) => channels[id].range[1]));
-    // fix alpha channel for randomize()
-    const minR = set4([], min);
-    const maxR = set4([], max);
-    minR[numChannels - 1] = 1;
-    const hueChanID = order.findIndex((id) => !!channels[id].hue);
-    const $Color = class {
-        offset;
-        stride;
-        buf;
-        constructor(buf, offset = 0, stride = 1) {
-            this.offset = offset;
-            this.stride = stride;
-            this.buf = buf || [0, 0, 0, 0];
-            this.offset = offset;
-            this.stride = stride;
-        }
-        get mode() {
-            return spec.mode;
-        }
-        get length() {
-            return numChannels;
-        }
-        get range() {
-            return [min, max];
-        }
-        get [Symbol.toStringTag]() {
-            return spec.mode;
-        }
-        get xyz() {
-            return [this[0], this[1], this[2]];
-        }
-        [Symbol.iterator]() {
-            return stridedValues(this.buf, this.length, this.offset, this.stride);
-        }
-        copy() {
-            return new $Color(this.deref());
-        }
-        copyView() {
-            return new $Color(this.buf, this.offset, this.stride);
-        }
-        empty() {
-            return new $Color();
-        }
-        deref() {
-            return [this[0], this[1], this[2], this[3]];
-        }
-        set(src) {
-            return set4(this, src);
-        }
-        clamp() {
-            hueChanID >= 0 && (this[hueChanID] = fract(this[hueChanID]));
-            clamp4(null, this, min, max);
-            return this;
-        }
-        eqDelta(o, eps = EPS) {
-            return eqDelta4(this, o, eps);
-        }
-        randomize(rnd) {
-            return randMinMax(this, minR, maxR, rnd);
-        }
-        toJSON() {
-            return this.deref();
-        }
-        toString() {
-            return vector(4, 4)(this);
-        }
+const defColor = (spec) => {
+  const channels = spec.channels || {};
+  const order = spec.order;
+  const numChannels = order.length;
+  order.reduce((acc, id) => {
+    acc[id] = {
+      range: [0, 1],
+      ...channels[id]
     };
-    declareIndices($Color.prototype, order);
-    defConversions(spec.mode, spec.from);
-    defConversions("rgb", { [spec.mode]: spec.toRgb });
-    const fromColor = (src, mode, xs) => {
-        const res = new $Color(...xs);
-        return mode !== spec.mode
-            ? convert(res, src, spec.mode, mode)
-            : res.set(src);
-    };
-    const factory = (src, ...xs) => src == null
-        ? new $Color()
-        : isString(src)
-            ? factory(parseCss(src), ...xs)
-            : isArrayLike(src)
-                ? isString(src.mode)
-                    ? fromColor(src, src.mode, xs)
-                    : new $Color(src, ...xs)
-                : implementsFunction(src, "deref")
-                    ? fromColor(src.deref(), src.mode, xs)
-                    : isNumber(src)
-                        ? xs.length && xs.every(isNumber)
-                            ? new $Color(...__ensureArgs([src, ...xs]))
-                            : fromColor(intArgb32Rgb([], src), "rgb", xs)
-                        : illegalArgs(`can't create a ${spec.mode} color from: ${src}`);
-    factory.class = $Color;
-    factory.range = [min, max];
-    factory.random = (rnd, buf, idx, stride) => new $Color(buf, idx, stride).randomize(rnd);
-    factory.mapBuffer = (buf, num = (buf.length / numChannels) | 0, start = 0, cstride = 1, estride = numChannels) => mapStridedBuffer($Color, buf, num, start, cstride, estride);
-    return factory;
+    return acc;
+  }, channels);
+  const min = Object.freeze(order.map((id) => channels[id].range[0]));
+  const max = Object.freeze(order.map((id) => channels[id].range[1]));
+  const minR = set4([], min);
+  const maxR = set4([], max);
+  minR[numChannels - 1] = 1;
+  const hueChanID = order.findIndex((id) => !!channels[id].hue);
+  const $Color = class {
+    constructor(buf, offset = 0, stride = 1) {
+      this.offset = offset;
+      this.stride = stride;
+      this.buf = buf || [0, 0, 0, 0];
+      this.offset = offset;
+      this.stride = stride;
+    }
+    buf;
+    get mode() {
+      return spec.mode;
+    }
+    get length() {
+      return numChannels;
+    }
+    get range() {
+      return [min, max];
+    }
+    get [Symbol.toStringTag]() {
+      return spec.mode;
+    }
+    get xyz() {
+      return [this[0], this[1], this[2]];
+    }
+    [Symbol.iterator]() {
+      return stridedValues(
+        this.buf,
+        this.length,
+        this.offset,
+        this.stride
+      );
+    }
+    copy() {
+      return new $Color(this.deref());
+    }
+    copyView() {
+      return new $Color(this.buf, this.offset, this.stride);
+    }
+    empty() {
+      return new $Color();
+    }
+    deref() {
+      return [this[0], this[1], this[2], this[3]];
+    }
+    set(src) {
+      return set4(this, src);
+    }
+    clamp() {
+      hueChanID >= 0 && (this[hueChanID] = fract(this[hueChanID]));
+      clamp4(null, this, min, max);
+      return this;
+    }
+    eqDelta(o, eps = EPS) {
+      return eqDelta4(this, o, eps);
+    }
+    randomize(rnd) {
+      return randMinMax(this, minR, maxR, rnd);
+    }
+    toJSON() {
+      return this.deref();
+    }
+    toString() {
+      return vector(4, 4)(this);
+    }
+  };
+  declareIndices($Color.prototype, order);
+  defConversions(spec.mode, spec.from);
+  defConversions("rgb", { [spec.mode]: spec.toRgb });
+  const fromColor = (src, mode, xs) => {
+    const res = new $Color(...xs);
+    return mode !== spec.mode ? convert(res, src, spec.mode, mode) : res.set(src);
+  };
+  const factory = (src, ...xs) => src == null ? new $Color() : isString(src) ? factory(parseCss(src), ...xs) : isArrayLike(src) ? isString(src.mode) ? fromColor(src, src.mode, xs) : new $Color(src, ...xs) : implementsFunction(src, "deref") ? fromColor(src.deref(), src.mode, xs) : isNumber(src) ? xs.length && xs.every(isNumber) ? new $Color(...__ensureArgs([src, ...xs])) : fromColor(intArgb32Rgb([], src), "rgb", xs) : illegalArgs(`can't create a ${spec.mode} color from: ${src}`);
+  factory.class = $Color;
+  factory.range = [min, max];
+  factory.random = (rnd, buf, idx, stride) => new $Color(buf, idx, stride).randomize(rnd);
+  factory.mapBuffer = (buf, num = buf.length / numChannels | 0, start = 0, cstride = 1, estride = numChannels) => mapStridedBuffer($Color, buf, num, start, cstride, estride);
+  return factory;
+};
+export {
+  defColor
 };