refactor(color): update imports, internal restruct

packages/color/src/alpha.ts

@@ -1,5 +1,5 @@
 import { setC4 } from "@thi.ng/vectors";
-import { Color, ReadonlyColor } from "./api";
+import type { Color, ReadonlyColor } from "./api";
 
 export const alpha = (src: ReadonlyColor) =>
     src[3] !== undefined ? src[3] : 1;

packages/color/src/api.ts

@@ -1,5 +1,5 @@
-import { float, percent } from "@thi.ng/strings";
-import { ReadonlyVec, Vec } from "@thi.ng/vectors";
+import { ColorMode } from "./constants";
+import type { ReadonlyVec, Vec } from "@thi.ng/vectors";
 
 export type Color = Vec;
 export type ReadonlyColor = ReadonlyVec;
@@ -18,82 +18,6 @@ export type CosGradientSpec = [CosCoeffs, CosCoeffs, CosCoeffs, CosCoeffs];
 export type ColorConversion<T> = (out: Color, src: T) => Color;
 export type ColorOp = (out: Color | null, src: ReadonlyColor) => Color;
 
-export const enum ColorMode {
-    RGBA,
-    HCYA,
-    HSVA,
-    HSLA,
-    HSIA,
-    INT32,
-    CSS,
-    XYZA,
-    YCBCRA
-}
-
 export interface IColor {
     readonly mode: ColorMode;
 }
-
-// RGBA constants
-
-export const BLACK = Object.freeze([0, 0, 0, 1]);
-export const WHITE = Object.freeze([1, 1, 1, 1]);
-
-export const RED = Object.freeze([1, 0, 0, 1]);
-export const GREEN = Object.freeze([0, 1, 0, 1]);
-export const BLUE = Object.freeze([0, 0, 1, 1]);
-
-export const CYAN = Object.freeze([0, 1, 1, 1]);
-export const MAGENTA = Object.freeze([1, 0, 1, 1]);
-export const YELLOW = Object.freeze([1, 1, 0, 1]);
-
-export const RGB_LUMINANCE = [0.299, 0.587, 0.114];
-
-// Hue names
-
-export const enum Hue {
-    RED,
-    ORANGE,
-    YELLOW,
-    CHARTREUSE,
-    GREEN,
-    SPRING_GREEN,
-    CYAN,
-    AZURE,
-    BLUE,
-    VIOLET,
-    MAGENTA,
-    ROSE
-}
-
-// internal helpers
-
-export const SRGB_ALPHA = 0.055;
-
-export const RGB_XYZ = [
-    0.4124564,
-    0.3575761,
-    0.1804375,
-    0.2126729,
-    0.7151522,
-    0.072175,
-    0.0193339,
-    0.119192,
-    0.9503041
-];
-
-export const XYZ_RGB = [
-    3.2404542,
-    -1.5371385,
-    -0.4985314,
-    -0.969266,
-    1.8760108,
-    0.041556,
-    0.0556434,
-    -0.2040259,
-    1.0572252
-];
-
-export const FF = float(2);
-export const PC = percent(2);
-export const INV8BIT = 1 / 0xff;

packages/color/src/clamp.ts

@@ -1,8 +1,8 @@
 import { clamp01 } from "@thi.ng/math";
 import { setC4 } from "@thi.ng/vectors";
-import { Color, ReadonlyColor } from "./api";
 import { ensureAlpha } from "./internal/ensure-alpha";
 import { ensureHue } from "./internal/ensure-hue";
+import type { Color, ReadonlyColor } from "./api";
 
 /**
  * Clamps all color channels to [0,1] interval and calls `ensureAlpha`

packages/color/src/closest-hue.ts

@@ -1,4 +1,4 @@
-import { Hue } from "./api";
+import { Hue } from "./constants";
 import { ensureHue } from "./internal/ensure-hue";
 
 /**

packages/color/src/constants.ts

@@ -0,0 +1,77 @@
+import { float, percent } from "@thi.ng/strings";
+
+export const enum ColorMode {
+    RGBA,
+    HCYA,
+    HSVA,
+    HSLA,
+    HSIA,
+    INT32,
+    CSS,
+    XYZA,
+    YCBCRA
+}
+
+// RGBA constants
+
+export const BLACK = Object.freeze([0, 0, 0, 1]);
+export const WHITE = Object.freeze([1, 1, 1, 1]);
+
+export const RED = Object.freeze([1, 0, 0, 1]);
+export const GREEN = Object.freeze([0, 1, 0, 1]);
+export const BLUE = Object.freeze([0, 0, 1, 1]);
+
+export const CYAN = Object.freeze([0, 1, 1, 1]);
+export const MAGENTA = Object.freeze([1, 0, 1, 1]);
+export const YELLOW = Object.freeze([1, 1, 0, 1]);
+
+export const RGB_LUMINANCE = [0.299, 0.587, 0.114];
+
+// Hue names
+
+export const enum Hue {
+    RED,
+    ORANGE,
+    YELLOW,
+    CHARTREUSE,
+    GREEN,
+    SPRING_GREEN,
+    CYAN,
+    AZURE,
+    BLUE,
+    VIOLET,
+    MAGENTA,
+    ROSE
+}
+
+// internal helpers
+
+export const SRGB_ALPHA = 0.055;
+
+export const RGB_XYZ = [
+    0.4124564,
+    0.3575761,
+    0.1804375,
+    0.2126729,
+    0.7151522,
+    0.072175,
+    0.0193339,
+    0.119192,
+    0.9503041
+];
+
+export const XYZ_RGB = [
+    3.2404542,
+    -1.5371385,
+    -0.4985314,
+    -0.969266,
+    1.8760108,
+    0.041556,
+    0.0556434,
+    -0.2040259,
+    1.0572252
+];
+
+export const FF = float(2);
+export const PC = percent(2);
+export const INV8BIT = 1 / 0xff;

packages/color/src/convert.ts

@@ -1,17 +1,6 @@
-import {
-    DEFAULT,
-    defmulti,
-    Implementation2O,
-    MultiFn2O
-} from "@thi.ng/defmulti";
+import { DEFAULT, defmulti } from "@thi.ng/defmulti";
 import { illegalArgs } from "@thi.ng/errors";
-import {
-    Color,
-    ColorConversion,
-    ColorMode,
-    IColor,
-    ReadonlyColor
-} from "./api";
+import { ColorMode } from "./constants";
 import { hcyaRgba } from "./hcya-rgba";
 import { hsiaRgba } from "./hsia-rgba";
 import { hslaCss } from "./hsla-css";
@@ -33,6 +22,13 @@ import { rgbaXyza } from "./rgba-xyza";
 import { rgbaYcbcra } from "./rgba-ycbcra";
 import { xyzaRgba } from "./xyza-rgba";
 import { ycbcraRgba } from "./ycbcra-rgba";
+import type { Implementation2O, MultiFn2O } from "@thi.ng/defmulti";
+import type {
+    Color,
+    ColorConversion,
+    IColor,
+    ReadonlyColor
+} from "./api";
 
 export const convert: MultiFn2O<
     string | number | ReadonlyColor | IColor,

packages/color/src/cosine-gradients.ts

@@ -1,4 +1,3 @@
-import { IObjectOf } from "@thi.ng/api";
 import { partial } from "@thi.ng/compose";
 import { clamp01, TAU } from "@thi.ng/math";
 import {
@@ -9,8 +8,9 @@ import {
     tween,
     zip
 } from "@thi.ng/transducers";
-import { Color, CosGradientSpec, ReadonlyColor } from "./api";
 import { clamp } from "./clamp";
+import type { IObjectOf } from "@thi.ng/api";
+import type { Color, CosGradientSpec, ReadonlyColor } from "./api";
 
 // see http://dev.thi.ng/gradients/ - unlike the clojure version, these
 // presets are for RGBA (though the alpha channel is configured to

packages/color/src/css.ts

@@ -1,5 +1,6 @@
-import { ICopy, IDeref } from "@thi.ng/api";
-import { ColorMode, IColor } from "./api";
+import { ColorMode } from "./constants";
+import type { ICopy, IDeref } from "@thi.ng/api";
+import type { IColor } from "./api";
 
 export const css = (col: string) => new CSS(col);
 

packages/color/src/hcya-rgba.ts

@@ -1,8 +1,9 @@
 import { clamp01 } from "@thi.ng/math";
 import { dot3, setC3 } from "@thi.ng/vectors";
-import { ColorOp, RGB_LUMINANCE } from "./api";
+import { RGB_LUMINANCE } from "./constants";
 import { hueRgba } from "./hue-rgba";
 import { ensureAlpha } from "./internal/ensure-alpha";
+import type { ColorOp } from "./api";
 
 export const hcyaRgba: ColorOp = (out, src) => {
     const h = src[0];

packages/color/src/hcya.ts

@@ -1,7 +1,8 @@
 import { declareIndices, IVector } from "@thi.ng/vectors";
-import { Color, ColorMode } from "./api";
+import { ColorMode } from "./constants";
 import { AColor } from "./internal/acolor";
 import { ensureArgs } from "./internal/ensure-args";
+import type { Color } from "./api";
 
 export function hcya(col: Color, offset?: number, stride?: number): HCYA;
 export function hcya(h?: number, c?: number, y?: number, a?: number): HCYA;

packages/color/src/hsia-rgba.ts

@@ -1,6 +1,6 @@
 import { setC3 } from "@thi.ng/vectors";
-import { ColorOp } from "./api";
 import { clampH } from "./clamp";
+import type { ColorOp } from "./api";
 
 // https://en.wikipedia.org/wiki/HSL_and_HSV#From_HSI
 

packages/color/src/hsia.ts

@@ -1,7 +1,8 @@
 import { declareIndices, IVector } from "@thi.ng/vectors";
-import { Color, ColorMode } from "./api";
+import { ColorMode } from "./constants";
 import { AColor } from "./internal/acolor";
 import { ensureArgs } from "./internal/ensure-args";
+import type { Color } from "./api";
 
 export function hsia(col: Color, offset?: number, stride?: number): HSIA;
 export function hsia(h?: number, s?: number, i?: number, a?: number): HSIA;

packages/color/src/hsla-css.ts

@@ -1,7 +1,8 @@
 import { clamp01 } from "@thi.ng/math";
-import { FF, PC, ReadonlyColor } from "./api";
+import { FF, PC } from "./constants";
 import { ensureAlpha } from "./internal/ensure-alpha";
 import { ensureHue } from "./internal/ensure-hue";
+import type { ReadonlyColor } from "./api";
 
 export const hslaCss = (src: ReadonlyColor) => {
     const h = FF(ensureHue(src[0]) * 360);

packages/color/src/hsla-hsva.ts

@@ -1,5 +1,5 @@
-import { ColorOp } from "./api";
 import { clampH } from "./clamp";
+import type { ColorOp } from "./api";
 
 export const hslaHsva: ColorOp = (out, src) => {
     out = clampH(out || src, src);

packages/color/src/hsla-rgba.ts

@@ -1,8 +1,8 @@
 import { clamp01 } from "@thi.ng/math";
 import { setC3 } from "@thi.ng/vectors";
-import { ColorOp } from "./api";
 import { hueRgba } from "./hue-rgba";
 import { ensureAlpha } from "./internal/ensure-alpha";
+import type { ColorOp } from "./api";
 
 export const hslaRgba: ColorOp = (out, src) => {
     const s = clamp01(src[1]);

packages/color/src/hsla.ts

@@ -1,7 +1,8 @@
 import { declareIndices, IVector } from "@thi.ng/vectors";
-import { Color, ColorMode } from "./api";
+import { ColorMode } from "./constants";
 import { AColor } from "./internal/acolor";
 import { ensureArgs } from "./internal/ensure-args";
+import type { Color } from "./api";
 
 export function hsla(col: Color, offset?: number, stride?: number): HSLA;
 export function hsla(h?: number, s?: number, l?: number, a?: number): HSLA;

packages/color/src/hsva-css.ts

@@ -1,5 +1,5 @@
-import { ReadonlyColor } from "./api";
-import { hsvaHsla } from "./hsva-hsla";
 import { hslaCss } from "./hsla-css";
+import { hsvaHsla } from "./hsva-hsla";
+import type { ReadonlyColor } from "./api";
 
 export const hsvaCss = (src: ReadonlyColor) => hslaCss(hsvaHsla([], src));

packages/color/src/hsva-hsla.ts

@@ -1,5 +1,5 @@
-import { ColorOp } from "./api";
 import { clampH } from "./clamp";
+import type { ColorOp } from "./api";
 
 export const hsvaHsla: ColorOp = (out, src) => {
     out = clampH(out || src, src);

packages/color/src/hsva-rgba.ts

@@ -1,7 +1,7 @@
 import { setC3 } from "@thi.ng/vectors";
-import { ColorOp } from "./api";
 import { clampH } from "./clamp";
 import { hueRgba } from "./hue-rgba";
+import type { ColorOp } from "./api";
 
 export const hsvaRgba: ColorOp = (out, src) => {
     out = clampH(out || src, src);

packages/color/src/hsva.ts

@@ -1,7 +1,8 @@
 import { declareIndices, IVector } from "@thi.ng/vectors";
-import { Color, ColorMode } from "./api";
+import { ColorMode } from "./constants";
 import { AColor } from "./internal/acolor";
 import { ensureArgs } from "./internal/ensure-args";
+import type { Color } from "./api";
 
 export function hsva(col: Color, offset?: number, stride?: number): HSVA;
 export function hsva(h?: number, s?: number, v?: number, a?: number): HSVA;

packages/color/src/hue-rgba.ts

@@ -1,7 +1,8 @@
 import { clamp01 } from "@thi.ng/math";
 import { setC4 } from "@thi.ng/vectors";
-import { Color, Hue } from "./api";
+import { Hue } from "./constants";
 import { ensureHue } from "./internal/ensure-hue";
+import type { Color } from "./api";
 
 /**
  * Converts a normalized hue to RGBA with given optional `alpha`

packages/color/src/index.ts

@@ -1,4 +1,5 @@
-export * from "./api";
+export type * from "./api";
+export * from "./constants";
 export * from "./names";
 
 export * from "./hcya-rgba";

packages/color/src/int-css.ts

@@ -1,6 +1,6 @@
-import { IDeref } from "@thi.ng/api";
 import { U24 } from "@thi.ng/strings";
-import { FF, INV8BIT } from "./api";
+import { FF, INV8BIT } from "./constants";
+import type { IDeref } from "@thi.ng/api";
 
 export const int32Css = (src: number | IDeref<number>) => {
     src = typeof src === "number" ? src : src.deref();

packages/color/src/int-rgba.ts

@@ -1,6 +1,7 @@
-import { IDeref } from "@thi.ng/api";
 import { setC4 } from "@thi.ng/vectors";
-import { Color, INV8BIT } from "./api";
+import { INV8BIT } from "./constants";
+import type { Color } from "./api";
+import type { IDeref } from "@thi.ng/api";
 
 export const int32Rgba = (out: Color | null, src: number | IDeref<number>) => {
     src = typeof src === "number" ? src : src.deref();