@oscarpalmer/atoms 0.79.0 → 0.80.0

package/dist/array/sort.cjs

@@ -36,11 +36,7 @@ function sort(array, first, second) {
   const sorted = array.sort((first2, second2) => {
     for (let index = 0; index < length; index += 1) {
       const { callback, direction: direction2 } = keys[index];
-      const descending = direction2 === "desc";
-      const compared = value_compare.compare(
-        callback(descending ? second2 : first2),
-        callback(descending ? first2 : second2)
-      );
+      const compared = value_compare.compare(callback(first2), callback(second2)) * (direction2 === "asc" ? 1 : -1);
       if (compared !== 0) {
         return compared;
       }

package/dist/array/sort.js

@@ -34,11 +34,7 @@ function sort(array, first, second) {
   const sorted = array.sort((first2, second2) => {
     for (let index = 0; index < length; index += 1) {
       const { callback, direction: direction2 } = keys[index];
-      const descending = direction2 === "desc";
-      const compared = compare(
-        callback(descending ? second2 : first2),
-        callback(descending ? first2 : second2)
-      );
+      const compared = compare(callback(first2), callback(second2)) * (direction2 === "asc" ? 1 : -1);
       if (compared !== 0) {
         return compared;
       }

package/dist/colour/base.cjs

@@ -1,6 +1,25 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const colour_is = require("./is.cjs");
+const defaults = {
+  hsl: {
+    hue: 0,
+    lightness: 0,
+    saturation: 0
+  },
+  rgb: {
+    blue: 0,
+    green: 0,
+    red: 0
+  }
+};
+const properties = {
+  hsl: ["hue", "lightness", "saturation"],
+  rgb: ["blue", "green", "red"]
+};
+function getValue(value, type) {
+  return colour_is.isColourValue(value, properties[type]) ? { ...value } : { ...defaults[type] };
+}
 class Colour {
   /**
    * Get the current value of the colour
@@ -8,10 +27,16 @@ class Colour {
   get value() {
     return { ...this.state.value };
   }
-  constructor(type, value, defaults, properties) {
+  /**
+   * Set the current value of the colour
+   */
+  set value(value) {
+    this.state.value = getValue(value, this.$colour);
+  }
+  constructor(type, value) {
     this.$colour = type;
     this.state = {
-      value: colour_is.isColourValue(value, properties) ? { ...value } : { ...defaults }
+      value: getValue(value, type)
     };
   }
 }

package/dist/colour/base.js

@@ -1,4 +1,23 @@
 import { isColourValue } from "./is.js";
+const defaults = {
+  hsl: {
+    hue: 0,
+    lightness: 0,
+    saturation: 0
+  },
+  rgb: {
+    blue: 0,
+    green: 0,
+    red: 0
+  }
+};
+const properties = {
+  hsl: ["hue", "lightness", "saturation"],
+  rgb: ["blue", "green", "red"]
+};
+function getValue(value, type) {
+  return isColourValue(value, properties[type]) ? { ...value } : { ...defaults[type] };
+}
 class Colour {
   /**
    * Get the current value of the colour
@@ -6,10 +25,16 @@ class Colour {
   get value() {
     return { ...this.state.value };
   }
-  constructor(type, value, defaults, properties) {
+  /**
+   * Set the current value of the colour
+   */
+  set value(value) {
+    this.state.value = getValue(value, this.$colour);
+  }
+  constructor(type, value) {
     this.$colour = type;
     this.state = {
-      value: isColourValue(value, properties) ? { ...value } : { ...defaults }
+      value: getValue(value, type)
     };
   }
 }

package/dist/colour/hsl.cjs

@@ -41,7 +41,7 @@ class HSLColour extends colour_base.Colour {
     this.state.value.saturation = number.clamp(value, 0, 100);
   }
   constructor(value) {
-    super("hsl", value, defaults, properties);
+    super("hsl", value);
   }
   /**
    * @inheritdoc
@@ -68,16 +68,6 @@ class HSLColour extends colour_base.Colour {
     return colour_functions.hslToRgb(value);
   }
 }
-const defaults = {
-  hue: 0,
-  lightness: 0,
-  saturation: 0
-};
-const properties = [
-  "hue",
-  "lightness",
-  "saturation"
-];
 function getHSLColour(value) {
   return new HSLColour(value);
 }

package/dist/colour/hsl.js

@@ -39,7 +39,7 @@ class HSLColour extends Colour {
     this.state.value.saturation = clamp(value, 0, 100);
   }
   constructor(value) {
-    super("hsl", value, defaults, properties);
+    super("hsl", value);
   }
   /**
    * @inheritdoc
@@ -66,16 +66,6 @@ class HSLColour extends Colour {
     return hslToRgb(value);
   }
 }
-const defaults = {
-  hue: 0,
-  lightness: 0,
-  saturation: 0
-};
-const properties = [
-  "hue",
-  "lightness",
-  "saturation"
-];
 function getHSLColour(value) {
   return new HSLColour(value);
 }

package/dist/colour/index.cjs

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const colour_functions = require("./functions.cjs");
 const colour_hex = require("./hex.cjs");
 const colour_hsl = require("./hsl.cjs");
 const colour_is = require("./is.cjs");
@@ -16,6 +17,10 @@ function getForegroundColour(value) {
   const luminance = 0.2126 * values[2] + 0.7152 * values[1] + 0.0722 * values[0];
   return luminance > 0.625 ? "black" : "white";
 }
+exports.hexToRgb = colour_functions.hexToRgb;
+exports.hslToRgb = colour_functions.hslToRgb;
+exports.rgbToHex = colour_functions.rgbToHex;
+exports.rgbToHsl = colour_functions.rgbToHsl;
 exports.HexColour = colour_hex.HexColour;
 exports.getHexColour = colour_hex.getHexColour;
 exports.HSLColour = colour_hsl.HSLColour;

package/dist/colour/index.js

@@ -1,3 +1,4 @@
+import { hexToRgb, hslToRgb, rgbToHex, rgbToHsl } from "./functions.js";
 import { HexColour, getHexColour } from "./hex.js";
 import { HSLColour, getHSLColour } from "./hsl.js";
 import { isColour, isHSLColour, isHexColour, isRGBColour } from "./is.js";
@@ -22,8 +23,12 @@ export {
   getHSLColour,
   getHexColour,
   getRGBColour,
+  hexToRgb,
+  hslToRgb,
   isColour,
   isHSLColour,
   isHexColour,
-  isRGBColour
+  isRGBColour,
+  rgbToHex,
+  rgbToHsl
 };

package/dist/colour/rgb.cjs

@@ -41,7 +41,7 @@ class RGBColour extends colour_base.Colour {
     this.state.value.red = number.clamp(value, 0, 255);
   }
   constructor(value) {
-    super("rgb", value, defaults, properties);
+    super("rgb", value);
   }
   /**
    * @inheritdoc
@@ -74,12 +74,6 @@ class RGBColour extends colour_base.Colour {
     return colour_functions.rgbToHsl(rgb);
   }
 }
-const defaults = {
-  blue: 0,
-  green: 0,
-  red: 0
-};
-const properties = ["blue", "green", "red"];
 function getRGBColour(value) {
   return new RGBColour(value);
 }

package/dist/colour/rgb.js

@@ -39,7 +39,7 @@ class RGBColour extends Colour {
     this.state.value.red = clamp(value, 0, 255);
   }
   constructor(value) {
-    super("rgb", value, defaults, properties);
+    super("rgb", value);
   }
   /**
    * @inheritdoc
@@ -72,12 +72,6 @@ class RGBColour extends Colour {
     return rgbToHsl(rgb);
   }
 }
-const defaults = {
-  blue: 0,
-  green: 0,
-  red: 0
-};
-const properties = ["blue", "green", "red"];
 function getRGBColour(value) {
   return new RGBColour(value);
 }

package/dist/index.cjs

@@ -30,6 +30,7 @@ const array_splice = require("./array/splice.cjs");
 const array_toMap = require("./array/to-map.cjs");
 const array_toRecord = require("./array/to-record.cjs");
 const array_unique = require("./array/unique.cjs");
+const colour_functions = require("./colour/functions.cjs");
 const colour_hex = require("./colour/hex.cjs");
 const colour_hsl = require("./colour/hsl.cjs");
 const colour_is = require("./colour/is.cjs");
@@ -108,6 +109,10 @@ exports.splice = array_splice.splice;
 exports.toMap = array_toMap.toMap;
 exports.toRecord = array_toRecord.toRecord;
 exports.unique = array_unique.unique;
+exports.hexToRgb = colour_functions.hexToRgb;
+exports.hslToRgb = colour_functions.hslToRgb;
+exports.rgbToHex = colour_functions.rgbToHex;
+exports.rgbToHsl = colour_functions.rgbToHsl;
 exports.HexColour = colour_hex.HexColour;
 exports.getHexColour = colour_hex.getHexColour;
 exports.HSLColour = colour_hsl.HSLColour;

package/dist/index.js

@@ -28,6 +28,7 @@ import { splice } from "./array/splice.js";
 import { toMap } from "./array/to-map.js";
 import { toRecord } from "./array/to-record.js";
 import { unique } from "./array/unique.js";
+import { hexToRgb, hslToRgb, rgbToHex, rgbToHsl } from "./colour/functions.js";
 import { HexColour, getHexColour } from "./colour/hex.js";
 import { HSLColour, getHSLColour } from "./colour/hsl.js";
 import { isColour, isHSLColour, isHexColour, isRGBColour } from "./colour/is.js";
@@ -85,6 +86,8 @@ export {
   getString,
   getValue,
   groupBy,
+  hexToRgb,
+  hslToRgb,
   indexOf,
   insert,
   isArrayOrPlainObject,
@@ -115,6 +118,8 @@ export {
   pascalCase,
   push,
   queue,
+  rgbToHex,
+  rgbToHsl,
   round,
   setValue,
   shuffle,

package/dist/internal/array/find.cjs

@@ -6,7 +6,7 @@ function findValue(type, array, parameters) {
   const { bool, key, value } = getParameters(parameters);
   const callbacks = internal_array_callbacks.getCallbacks(bool, key);
   if ((callbacks == null ? void 0 : callbacks.bool) == null && (callbacks == null ? void 0 : callbacks.key) == null) {
-    return type === "index" ? array.findIndex((item) => item === value) : array.find((item) => item === value);
+    return type === "index" ? array.indexOf(value) : array.find((item) => item === value);
   }
   if (callbacks.bool != null) {
     const index = array.findIndex(callbacks.bool);
@@ -35,18 +35,17 @@ function findValues(type, array, parameters) {
   if (type === "all" && key == null) {
     return array.filter((item) => item === value);
   }
+  const keys = /* @__PURE__ */ new Set();
   const result = [];
-  const values = (callbacks == null ? void 0 : callbacks.key) != null ? [] : result;
   for (let index = 0; index < length; index += 1) {
     const item = array[index];
-    const keyed = ((_a = callbacks == null ? void 0 : callbacks.key) == null ? void 0 : _a.call(callbacks, item, index, array)) ?? item;
-    if (type === "all" && keyed === value || type === "unique" && values.indexOf(keyed) === -1) {
-      if (values !== result) {
-        values.push(keyed);
-      }
+    const key2 = ((_a = callbacks == null ? void 0 : callbacks.key) == null ? void 0 : _a.call(callbacks, item, index, array)) ?? item;
+    if (type === "all" && key2 === value || type === "unique" && !keys.has(key2)) {
+      keys.add(key2);
       result.push(item);
     }
   }
+  keys.clear();
   return result;
 }
 function getParameters(original) {

package/dist/internal/array/find.js

@@ -4,7 +4,7 @@ function findValue(type, array, parameters) {
   const { bool, key, value } = getParameters(parameters);
   const callbacks = getCallbacks(bool, key);
   if ((callbacks == null ? void 0 : callbacks.bool) == null && (callbacks == null ? void 0 : callbacks.key) == null) {
-    return type === "index" ? array.findIndex((item) => item === value) : array.find((item) => item === value);
+    return type === "index" ? array.indexOf(value) : array.find((item) => item === value);
   }
   if (callbacks.bool != null) {
     const index = array.findIndex(callbacks.bool);
@@ -33,18 +33,17 @@ function findValues(type, array, parameters) {
   if (type === "all" && key == null) {
     return array.filter((item) => item === value);
   }
+  const keys = /* @__PURE__ */ new Set();
   const result = [];
-  const values = (callbacks == null ? void 0 : callbacks.key) != null ? [] : result;
   for (let index = 0; index < length; index += 1) {
     const item = array[index];
-    const keyed = ((_a = callbacks == null ? void 0 : callbacks.key) == null ? void 0 : _a.call(callbacks, item, index, array)) ?? item;
-    if (type === "all" && keyed === value || type === "unique" && values.indexOf(keyed) === -1) {
-      if (values !== result) {
-        values.push(keyed);
-      }
+    const key2 = ((_a = callbacks == null ? void 0 : callbacks.key) == null ? void 0 : _a.call(callbacks, item, index, array)) ?? item;
+    if (type === "all" && key2 === value || type === "unique" && !keys.has(key2)) {
+      keys.add(key2);
       result.push(item);
     }
   }
+  keys.clear();
   return result;
 }
 function getParameters(original) {

package/package.json

@@ -4,18 +4,18 @@
 		"url": "https://oscarpalmer.se"
 	},
 	"dependencies": {
-		"type-fest": "^4.26"
+		"type-fest": "^4.30"
 	},
 	"description": "Atomic utilities for making your JavaScript better.",
 	"devDependencies": {
 		"@biomejs/biome": "^1.9",
-		"@types/node": "^22.9",
+		"@types/node": "^22.10",
 		"@vitest/coverage-istanbul": "^2.1",
 		"dts-bundle-generator": "^9.5",
 		"glob": "^11",
 		"happy-dom": "^15.11",
-		"typescript": "^5.6",
-		"vite": "^5.4",
+		"typescript": "^5.7",
+		"vite": "^6",
 		"vitest": "^2.1"
 	},
 	"exports": {
@@ -205,5 +205,5 @@
 	},
 	"type": "module",
 	"types": "./types/index.d.cts",
-	"version": "0.79.0"
+	"version": "0.80.0"
 }

package/src/array/sort.ts

@@ -105,12 +105,9 @@ export function sort(
 		for (let index = 0; index < length; index += 1) {
 			const {callback, direction} = keys[index];
 
-			const descending = direction === 'desc';
-
-			const compared = compare(
-				callback(descending ? second : first),
-				callback(descending ? first : second),
-			);
+			const compared =
+				compare(callback(first), callback(second)) *
+				(direction === 'asc' ? 1 : -1);
 
 			if (compared !== 0) {
 				return compared;

package/src/colour/base.ts

@@ -1,8 +1,44 @@
 import type {HexColour} from './hex';
+import type {HSLColourValue} from './hsl';
 import {isColourValue} from './is';
+import type {RGBColourValue} from './rgb';
+
+type Defaults = {
+	hsl: HSLColourValue;
+	rgb: RGBColourValue;
+};
+
+type Properties = {
+	hsl: Array<keyof HSLColourValue>;
+	rgb: Array<keyof RGBColourValue>;
+};
+
+const defaults: Defaults = {
+	hsl: {
+		hue: 0,
+		lightness: 0,
+		saturation: 0,
+	},
+	rgb: {
+		blue: 0,
+		green: 0,
+		red: 0,
+	},
+};
+
+const properties: Properties = {
+	hsl: ['hue', 'lightness', 'saturation'],
+	rgb: ['blue', 'green', 'red'],
+};
+
+function getValue<Model>(value: Model, type: keyof Properties): Model {
+	return (
+		isColourValue(value, properties[type]) ? {...value} : {...defaults[type]}
+	) as Model;
+}
 
 export abstract class Colour<Model> {
-	private declare readonly $colour: string;
+	private declare readonly $colour: keyof Properties;
 	protected declare readonly state: ColourState<Model>;
 
 	/**
@@ -12,18 +48,18 @@ export abstract class Colour<Model> {
 		return {...this.state.value};
 	}
 
-	constructor(
-		type: string,
-		value: Model,
-		defaults: Model,
-		properties: Array<keyof Model>,
-	) {
+	/**
+	 * Set the current value of the colour
+	 */
+	set value(value: Model) {
+		this.state.value = getValue(value, this.$colour);
+	}
+
+	constructor(type: keyof Properties, value: Model) {
 		this.$colour = type;
 
 		this.state = {
-			value: isColourValue<Model>(value, properties)
-				? {...value}
-				: {...defaults},
+			value: getValue(value, type),
 		};
 	}
 

package/src/colour/hsl.ts

@@ -54,7 +54,7 @@ export class HSLColour extends Colour<HSLColourValue> {
 	}
 
 	constructor(value: HSLColourValue) {
-		super('hsl', value, defaults, properties);
+		super('hsl', value);
 	}
 
 	/**
@@ -86,18 +86,6 @@ export class HSLColour extends Colour<HSLColourValue> {
 	}
 }
 
-const defaults: HSLColourValue = {
-	hue: 0,
-	lightness: 0,
-	saturation: 0,
-};
-
-const properties: Array<keyof HSLColourValue> = [
-	'hue',
-	'lightness',
-	'saturation',
-];
-
 /**
  * Get an HSL-colour from a value-object
  */

package/src/colour/index.ts

@@ -21,6 +21,7 @@ export function getForegroundColour(value: RGBColourValue): string {
 	return luminance > 0.625 ? 'black' : 'white';
 }
 
+export {hexToRgb, hslToRgb, rgbToHex, rgbToHsl} from './functions';
 export {getHexColour, HexColour} from './hex';
 export {getHSLColour, HSLColour, type HSLColourValue} from './hsl';
 export {isColour, isHexColour, isHSLColour, isRGBColour} from './is';

package/src/colour/is.ts

@@ -11,10 +11,7 @@ export function isColour(
 	return isInstance(/^(hex|hsl|rgb)$/, value);
 }
 
-export function isColourValue<Expected>(
-	value: unknown,
-	properties: Array<keyof Expected>,
-): value is Expected {
+export function isColourValue(value: unknown, properties: string[]): boolean {
 	return (
 		typeof value === 'object' &&
 		value !== null &&

package/src/colour/rgb.ts

@@ -54,7 +54,7 @@ export class RGBColour extends Colour<RGBColourValue> {
 	}
 
 	constructor(value: RGBColourValue) {
-		super('rgb', value, defaults, properties);
+		super('rgb', value);
 	}
 
 	/**
@@ -93,14 +93,6 @@ export class RGBColour extends Colour<RGBColourValue> {
 	}
 }
 
-const defaults: RGBColourValue = {
-	blue: 0,
-	green: 0,
-	red: 0,
-};
-
-const properties: Array<keyof RGBColourValue> = ['blue', 'green', 'red'];
-
 /**
  * Get an RGB-colour from a value-object
  */

package/src/internal/array/find.ts

@@ -18,7 +18,7 @@ export function findValue(
 
 	if (callbacks?.bool == null && callbacks?.key == null) {
 		return type === 'index'
-			? array.findIndex(item => item === value)
+			? array.indexOf(value)
 			: array.find(item => item === value);
 	}
 
@@ -64,25 +64,24 @@ export function findValues(
 		return array.filter(item => item === value);
 	}
 
+	const keys = new Set();
 	const result: unknown[] = [];
-	const values: unknown[] = callbacks?.key != null ? [] : result;
 
 	for (let index = 0; index < length; index += 1) {
 		const item = array[index];
-		const keyed = callbacks?.key?.(item, index, array) ?? item;
+		const key = callbacks?.key?.(item, index, array) ?? item;
 
 		if (
-			(type === 'all' && keyed === value) ||
-			(type === 'unique' && values.indexOf(keyed) === -1)
+			(type === 'all' && key === value) ||
+			(type === 'unique' && !keys.has(key))
 		) {
-			if (values !== result) {
-				values.push(keyed);
-			}
-
+			keys.add(key);
 			result.push(item);
 		}
 	}
 
+	keys.clear();
+
 	return result;
 }
 

package/types/colour/base.d.cts

@@ -77,6 +77,10 @@ declare class HexColour {
 	 */
 	static toRgb(value: string): RGBColour;
 }
+export type Properties = {
+	hsl: Array<keyof HSLColourValue>;
+	rgb: Array<keyof RGBColourValue>;
+};
 export declare abstract class Colour<Model> {
 	private readonly $colour;
 	protected readonly state: ColourState<Model>;
@@ -84,7 +88,11 @@ export declare abstract class Colour<Model> {
 	 * Get the current value of the colour
 	 */
 	get value(): Model;
-	constructor(type: string, value: Model, defaults: Model, properties: Array<keyof Model>);
+	/**
+	 * Set the current value of the colour
+	 */
+	set value(value: Model);
+	constructor(type: keyof Properties, value: Model);
 	/**
 	 * Convert the colour to a hex-colour
 	 */

package/types/colour/base.d.ts

@@ -1,4 +1,10 @@
 import type { HexColour } from './hex';
+import type { HSLColourValue } from './hsl';
+import type { RGBColourValue } from './rgb';
+type Properties = {
+    hsl: Array<keyof HSLColourValue>;
+    rgb: Array<keyof RGBColourValue>;
+};
 export declare abstract class Colour<Model> {
     private readonly $colour;
     protected readonly state: ColourState<Model>;
@@ -6,7 +12,11 @@ export declare abstract class Colour<Model> {
      * Get the current value of the colour
      */
     get value(): Model;
-    constructor(type: string, value: Model, defaults: Model, properties: Array<keyof Model>);
+    /**
+     * Set the current value of the colour
+     */
+    set value(value: Model);
+    constructor(type: keyof Properties, value: Model);
     /**
      * Convert the colour to a hex-colour
      */

package/types/colour/functions.d.cts

@@ -77,6 +77,10 @@ declare class HexColour {
 	 */
 	static toRgb(value: string): RGBColour;
 }
+export type Properties = {
+	hsl: Array<keyof HSLColourValue>;
+	rgb: Array<keyof RGBColourValue>;
+};
 declare abstract class Colour<Model> {
 	private readonly $colour;
 	protected readonly state: ColourState<Model>;
@@ -84,7 +88,11 @@ declare abstract class Colour<Model> {
 	 * Get the current value of the colour
 	 */
 	get value(): Model;
-	constructor(type: string, value: Model, defaults: Model, properties: Array<keyof Model>);
+	/**
+	 * Set the current value of the colour
+	 */
+	set value(value: Model);
+	constructor(type: keyof Properties, value: Model);
 	/**
 	 * Convert the colour to a hex-colour
 	 */

package/types/colour/hex.d.cts

@@ -81,6 +81,10 @@ export declare class HexColour {
  * Get a hex-colour from a string
  */
 export declare function getHexColour(value: string): HexColour;
+export type Properties = {
+	hsl: Array<keyof HSLColourValue>;
+	rgb: Array<keyof RGBColourValue>;
+};
 declare abstract class Colour<Model> {
 	private readonly $colour;
 	protected readonly state: ColourState<Model>;
@@ -88,7 +92,11 @@ declare abstract class Colour<Model> {
 	 * Get the current value of the colour
 	 */
 	get value(): Model;
-	constructor(type: string, value: Model, defaults: Model, properties: Array<keyof Model>);
+	/**
+	 * Set the current value of the colour
+	 */
+	set value(value: Model);
+	constructor(type: keyof Properties, value: Model);
 	/**
 	 * Convert the colour to a hex-colour
 	 */

package/types/colour/hsl.d.cts

@@ -81,6 +81,10 @@ declare class HexColour {
 	 */
 	static toRgb(value: string): RGBColour;
 }
+export type Properties = {
+	hsl: Array<keyof HSLColourValue>;
+	rgb: Array<keyof RGBColourValue>;
+};
 declare abstract class Colour<Model> {
 	private readonly $colour;
 	protected readonly state: ColourState<Model>;
@@ -88,7 +92,11 @@ declare abstract class Colour<Model> {
 	 * Get the current value of the colour
 	 */
 	get value(): Model;
-	constructor(type: string, value: Model, defaults: Model, properties: Array<keyof Model>);
+	/**
+	 * Set the current value of the colour
+	 */
+	set value(value: Model);
+	constructor(type: keyof Properties, value: Model);
 	/**
 	 * Convert the colour to a hex-colour
 	 */

package/types/colour/index.d.cts

@@ -85,6 +85,10 @@ export declare class HexColour {
  * Get a hex-colour from a string
  */
 export declare function getHexColour(value: string): HexColour;
+export type Properties = {
+	hsl: Array<keyof HSLColourValue>;
+	rgb: Array<keyof RGBColourValue>;
+};
 declare abstract class Colour<Model> {
 	private readonly $colour;
 	protected readonly state: ColourState<Model>;
@@ -92,7 +96,11 @@ declare abstract class Colour<Model> {
 	 * Get the current value of the colour
 	 */
 	get value(): Model;
-	constructor(type: string, value: Model, defaults: Model, properties: Array<keyof Model>);
+	/**
+	 * Set the current value of the colour
+	 */
+	set value(value: Model);
+	constructor(type: keyof Properties, value: Model);
 	/**
 	 * Convert the colour to a hex-colour
 	 */
@@ -161,6 +169,24 @@ export declare class RGBColour extends Colour<RGBColourValue> {
  * Get an RGB-colour from a value-object
  */
 export declare function getRGBColour(value: RGBColourValue): RGBColour;
+/**
+ * Convert a hex-colour to an RGB-colour
+ */
+export declare function hexToRgb(value: string): RGBColour;
+/**
+ * - Convert an HSL-colour to an RGB-colour
+ * - Thanks, https://github.com/color-js/color.js/blob/main/src/spaces/hsl.js#L61
+ */
+export declare function hslToRgb(value: HSLColourValue): RGBColour;
+/**
+ * Convert an RGB-colour to a hex-colour
+ */
+export declare function rgbToHex(value: RGBColourValue): HexColour;
+/**
+ * - Convert an RGB-colour to an HSL-colour
+ * - Thanks, https://github.com/color-js/color.js/blob/main/src/spaces/hsl.js#L26
+ */
+export declare function rgbToHsl(rgb: RGBColourValue): HSLColour;
 /**
  * Is the value a colour?
  */

package/types/colour/index.d.ts

@@ -3,6 +3,7 @@ import type { RGBColourValue } from './rgb';
  * Get a foreground colour _(usually text)_ based on a background colour's luminance
  */
 export declare function getForegroundColour(value: RGBColourValue): string;
+export { hexToRgb, hslToRgb, rgbToHex, rgbToHsl } from './functions';
 export { getHexColour, HexColour } from './hex';
 export { getHSLColour, HSLColour, type HSLColourValue } from './hsl';
 export { isColour, isHexColour, isHSLColour, isRGBColour } from './is';

package/types/colour/is.d.cts

@@ -77,6 +77,10 @@ declare class HexColour {
 	 */
 	static toRgb(value: string): RGBColour;
 }
+export type Properties = {
+	hsl: Array<keyof HSLColourValue>;
+	rgb: Array<keyof RGBColourValue>;
+};
 declare abstract class Colour<Model> {
 	private readonly $colour;
 	protected readonly state: ColourState<Model>;
@@ -84,7 +88,11 @@ declare abstract class Colour<Model> {
 	 * Get the current value of the colour
 	 */
 	get value(): Model;
-	constructor(type: string, value: Model, defaults: Model, properties: Array<keyof Model>);
+	/**
+	 * Set the current value of the colour
+	 */
+	set value(value: Model);
+	constructor(type: keyof Properties, value: Model);
 	/**
 	 * Convert the colour to a hex-colour
 	 */
@@ -153,7 +161,7 @@ declare class RGBColour extends Colour<RGBColourValue> {
  * Is the value a colour?
  */
 export declare function isColour(value: unknown): value is HexColour | HSLColour | RGBColour;
-export declare function isColourValue<Expected>(value: unknown, properties: Array<keyof Expected>): value is Expected;
+export declare function isColourValue(value: unknown, properties: string[]): boolean;
 /**
  * Is the value a hex-colour?
  */

package/types/colour/is.d.ts

@@ -5,7 +5,7 @@ import type { RGBColour } from './rgb';
  * Is the value a colour?
  */
 export declare function isColour(value: unknown): value is HexColour | HSLColour | RGBColour;
-export declare function isColourValue<Expected>(value: unknown, properties: Array<keyof Expected>): value is Expected;
+export declare function isColourValue(value: unknown, properties: string[]): boolean;
 /**
  * Is the value a hex-colour?
  */

package/types/colour/rgb.d.cts

@@ -77,6 +77,10 @@ declare class HexColour {
 	 */
 	static toRgb(value: string): RGBColour;
 }
+export type Properties = {
+	hsl: Array<keyof HSLColourValue>;
+	rgb: Array<keyof RGBColourValue>;
+};
 declare abstract class Colour<Model> {
 	private readonly $colour;
 	protected readonly state: ColourState<Model>;
@@ -84,7 +88,11 @@ declare abstract class Colour<Model> {
 	 * Get the current value of the colour
 	 */
 	get value(): Model;
-	constructor(type: string, value: Model, defaults: Model, properties: Array<keyof Model>);
+	/**
+	 * Set the current value of the colour
+	 */
+	set value(value: Model);
+	constructor(type: keyof Properties, value: Model);
 	/**
 	 * Convert the colour to a hex-colour
 	 */

package/types/index.d.cts

@@ -401,6 +401,7 @@ export type StringDigit =
 	| '7'
 	| '8'
 	| '9';
+type NoInfer$1<T> = T extends infer U ? U : never;
 /**
 Returns a boolean for whether the given type is `any`.
 
@@ -429,7 +430,7 @@ const anyA = get(anyObject, 'a');
 @category Type Guard
 @category Utilities
 */
-export type IsAny<T> = 0 extends 1 & T ? true : false;
+export type IsAny<T> = 0 extends 1 & NoInfer$1<T> ? true : false;
 export type Numeric = number | bigint;
 export type Zero = 0 | 0n;
 /**
@@ -2512,6 +2513,10 @@ export declare class HexColour {
  * Get a hex-colour from a string
  */
 export declare function getHexColour(value: string): HexColour;
+export type Properties = {
+	hsl: Array<keyof HSLColourValue>;
+	rgb: Array<keyof RGBColourValue>;
+};
 declare abstract class Colour<Model> {
 	private readonly $colour;
 	protected readonly state: ColourState<Model>;
@@ -2519,12 +2524,11 @@ declare abstract class Colour<Model> {
 	 * Get the current value of the colour
 	 */
 	get value(): Model;
-	constructor(
-		type: string,
-		value: Model,
-		defaults: Model,
-		properties: Array<keyof Model>,
-	);
+	/**
+	 * Set the current value of the colour
+	 */
+	set value(value: Model);
+	constructor(type: keyof Properties, value: Model);
 	/**
 	 * Convert the colour to a hex-colour
 	 */
@@ -2593,6 +2597,24 @@ export declare class RGBColour extends Colour<RGBColourValue> {
  * Get an RGB-colour from a value-object
  */
 export declare function getRGBColour(value: RGBColourValue): RGBColour;
+/**
+ * Convert a hex-colour to an RGB-colour
+ */
+export declare function hexToRgb(value: string): RGBColour;
+/**
+ * - Convert an HSL-colour to an RGB-colour
+ * - Thanks, https://github.com/color-js/color.js/blob/main/src/spaces/hsl.js#L61
+ */
+export declare function hslToRgb(value: HSLColourValue): RGBColour;
+/**
+ * Convert an RGB-colour to a hex-colour
+ */
+export declare function rgbToHex(value: RGBColourValue): HexColour;
+/**
+ * - Convert an RGB-colour to an HSL-colour
+ * - Thanks, https://github.com/color-js/color.js/blob/main/src/spaces/hsl.js#L26
+ */
+export declare function rgbToHsl(rgb: RGBColourValue): HSLColour;
 /**
  * Is the value a colour?
  */

package/types/models.d.cts

@@ -176,6 +176,7 @@ export type StringDigit =
 	| '7'
 	| '8'
 	| '9';
+type NoInfer$1<T> = T extends infer U ? U : never;
 /**
 Returns a boolean for whether the given type is `any`.
 
@@ -204,7 +205,7 @@ const anyA = get(anyObject, 'a');
 @category Type Guard
 @category Utilities
 */
-export type IsAny<T> = 0 extends 1 & T ? true : false;
+export type IsAny<T> = 0 extends 1 & NoInfer$1<T> ? true : false;
 export type Numeric = number | bigint;
 export type Zero = 0 | 0n;
 /**

package/types/value/get.d.cts

@@ -176,6 +176,7 @@ export type StringDigit =
 	| '7'
 	| '8'
 	| '9';
+type NoInfer$1<T> = T extends infer U ? U : never;
 /**
 Returns a boolean for whether the given type is `any`.
 
@@ -204,7 +205,7 @@ const anyA = get(anyObject, 'a');
 @category Type Guard
 @category Utilities
 */
-export type IsAny<T> = 0 extends 1 & T ? true : false;
+export type IsAny<T> = 0 extends 1 & NoInfer$1<T> ? true : false;
 export type Numeric = number | bigint;
 export type Zero = 0 | 0n;
 /**

package/types/value/index.d.cts

@@ -276,6 +276,7 @@ export type StringDigit =
 	| '7'
 	| '8'
 	| '9';
+type NoInfer$1<T> = T extends infer U ? U : never;
 /**
 Returns a boolean for whether the given type is `any`.
 
@@ -304,7 +305,7 @@ const anyA = get(anyObject, 'a');
 @category Type Guard
 @category Utilities
 */
-export type IsAny<T> = 0 extends 1 & T ? true : false;
+export type IsAny<T> = 0 extends 1 & NoInfer$1<T> ? true : false;
 export type Numeric = number | bigint;
 export type Zero = 0 | 0n;
 /**

package/types/value/set.d.cts

@@ -165,6 +165,7 @@ export type VariablePartOfArray<T extends UnknownArray> = T extends unknown
 		? U
 		: []
 	: never; // Should never happen
+type NoInfer$1<T> = T extends infer U ? U : never;
 /**
 Returns a boolean for whether the given type is `any`.
 
@@ -193,7 +194,7 @@ const anyA = get(anyObject, 'a');
 @category Type Guard
 @category Utilities
 */
-export type IsAny<T> = 0 extends 1 & T ? true : false;
+export type IsAny<T> = 0 extends 1 & NoInfer$1<T> ? true : false;
 export type Numeric = number | bigint;
 export type Zero = 0 | 0n;
 /**

package/types/value/smush.d.cts

@@ -236,6 +236,7 @@ export type StringDigit =
 	| '7'
 	| '8'
 	| '9';
+type NoInfer$1<T> = T extends infer U ? U : never;
 /**
 Returns a boolean for whether the given type is `any`.
 
@@ -264,7 +265,7 @@ const anyA = get(anyObject, 'a');
 @category Type Guard
 @category Utilities
 */
-export type IsAny<T> = 0 extends 1 & T ? true : false;
+export type IsAny<T> = 0 extends 1 & NoInfer$1<T> ? true : false;
 export type Numeric = number | bigint;
 export type Zero = 0 | 0n;
 /**