@oscarpalmer/atoms 0.78.0 → 0.80.0

package/dist/array/sort.cjs

@@ -6,10 +6,7 @@ function sort(array, first, second) {
   if (array.length < 2) {
     return array;
   }
-  if (first == null || typeof first === "boolean") {
-    return first === true ? array.sort((first2, second2) => second2 - first2) : array.sort();
-  }
-  const direction = second === true ? "desc" : "asc";
+  const direction = first === true || second === true ? "desc" : "asc";
   const keys = (Array.isArray(first) ? first : [first]).map((key) => {
     const returned = {
       direction,
@@ -27,7 +24,9 @@ function sort(array, first, second) {
   }).filter((key) => typeof key.callback === "function");
   const { length } = keys;
   if (length === 0) {
-    return direction === "asc" ? array.sort() : array.sort((first2, second2) => second2 - first2);
+    return array.sort(
+      (first2, second2) => value_compare.compare(first2, second2) * (direction === "asc" ? 1 : -1)
+    );
   }
   if (length === 1) {
     return array.sort(
@@ -37,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

@@ -4,10 +4,7 @@ function sort(array, first, second) {
   if (array.length < 2) {
     return array;
   }
-  if (first == null || typeof first === "boolean") {
-    return first === true ? array.sort((first2, second2) => second2 - first2) : array.sort();
-  }
-  const direction = second === true ? "desc" : "asc";
+  const direction = first === true || second === true ? "desc" : "asc";
   const keys = (Array.isArray(first) ? first : [first]).map((key) => {
     const returned = {
       direction,
@@ -25,7 +22,9 @@ function sort(array, first, second) {
   }).filter((key) => typeof key.callback === "function");
   const { length } = keys;
   if (length === 0) {
-    return direction === "asc" ? array.sort() : array.sort((first2, second2) => second2 - first2);
+    return array.sort(
+      (first2, second2) => compare(first2, second2) * (direction === "asc" ? 1 : -1)
+    );
   }
   if (length === 1) {
     return array.sort(
@@ -35,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/functions.cjs

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const number = require("../number.cjs");
 const colour_hex = require("./hex.cjs");
 const colour_hsl = require("./hsl.cjs");
 const colour_rgb = require("./rgb.cjs");
-const number = require("../number.cjs");
 const anyPattern = /^#*([a-f0-9]{3}){1,2}$/i;
 const groupedPattern = /^#*([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})$/i;
 function getNormalisedHex(value) {

package/dist/colour/functions.js

@@ -1,7 +1,7 @@
+import { clamp } from "../number.js";
 import { HexColour } from "./hex.js";
 import { HSLColour } from "./hsl.js";
 import { RGBColour } from "./rgb.js";
-import { clamp } from "../number.js";
 const anyPattern = /^#*([a-f0-9]{3}){1,2}$/i;
 const groupedPattern = /^#*([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})$/i;
 function getNormalisedHex(value) {

package/dist/colour/hsl.cjs

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const number = require("../number.cjs");
 const colour_base = require("./base.cjs");
 const colour_functions = require("./functions.cjs");
-const number = require("../number.cjs");
 class HSLColour extends colour_base.Colour {
   /**
    * Get the current hue
@@ -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

@@ -1,6 +1,6 @@
+import { clamp } from "../number.js";
 import { Colour } from "./base.js";
 import { hslToRgb } from "./functions.js";
-import { clamp } from "../number.js";
 class HSLColour extends Colour {
   /**
    * Get the current hue
@@ -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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const number = require("../number.cjs");
 const colour_base = require("./base.cjs");
 const colour_functions = require("./functions.cjs");
-const number = require("../number.cjs");
 class RGBColour extends colour_base.Colour {
   /**
    * Get the current blue value
@@ -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

@@ -1,6 +1,6 @@
+import { clamp } from "../number.js";
 import { Colour } from "./base.js";
 import { rgbToHex, rgbToHsl } from "./functions.js";
-import { clamp } from "../number.js";
 class RGBColour extends Colour {
   /**
    * Get the current blue value
@@ -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/dist/value/equal.cjs

@@ -26,7 +26,10 @@ function equal(first, second, ignoreCase) {
       return equalSet(first, second);
     case (Array.isArray(first) && Array.isArray(second)):
     case (is.isPlainObject(first) && is.isPlainObject(second)):
-      return equalObject(first, second);
+      return equalObject(
+        first,
+        second
+      );
     case (typeof first === "string" && ignoreCase === true):
       return Object.is(first.toLowerCase(), second.toLowerCase());
     default:

package/dist/value/equal.js

@@ -24,7 +24,10 @@ function equal(first, second, ignoreCase) {
       return equalSet(first, second);
     case (Array.isArray(first) && Array.isArray(second)):
     case (isPlainObject(first) && isPlainObject(second)):
-      return equalObject(first, second);
+      return equalObject(
+        first,
+        second
+      );
     case (typeof first === "string" && ignoreCase === true):
       return Object.is(first.toLowerCase(), second.toLowerCase());
     default:

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.8",
+		"@types/node": "^22.10",
 		"@vitest/coverage-istanbul": "^2.1",
 		"dts-bundle-generator": "^9.5",
 		"glob": "^11",
-		"happy-dom": "^15.7",
-		"typescript": "^5.6",
-		"vite": "^5.4",
+		"happy-dom": "^15.11",
+		"typescript": "^5.7",
+		"vite": "^6",
 		"vitest": "^2.1"
 	},
 	"exports": {
@@ -179,8 +179,15 @@
 			}
 		}
 	},
-	"files": ["dist", "src", "types"],
-	"keywords": ["helper", "utility"],
+	"files": [
+		"dist",
+		"src",
+		"types"
+	],
+	"keywords": [
+		"helper",
+		"utility"
+	],
 	"license": "MIT",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.js",
@@ -198,5 +205,5 @@
 	},
 	"type": "module",
 	"types": "./types/index.d.cts",
-	"version": "0.78.0"
+	"version": "0.80.0"
 }

package/src/array/chunk.ts

@@ -1,4 +1,4 @@
-import {clamp} from '~/number';
+import {clamp} from '../number';
 
 /**
  * Chunk an array _(into smaller arrays of a specified size)_

package/src/array/count.ts

@@ -1,5 +1,5 @@
-import {findValues} from '~/internal/array/find';
-import type {Key, PlainObject} from '~/models';
+import {findValues} from '../internal/array/find';
+import type {Key, PlainObject} from '../models';
 
 /**
  * Get the number of items _(count)_ that match the given value

package/src/array/exists.ts

@@ -1,5 +1,5 @@
-import {findValue} from '~/internal/array/find';
-import type {Key, PlainObject} from '~/models';
+import {findValue} from '../internal/array/find';
+import type {Key, PlainObject} from '../models';
 
 /**
  * Does the value exist in array?

package/src/array/filter.ts

@@ -1,5 +1,5 @@
-import {findValues} from '~/internal/array/find';
-import type {Key, PlainObject} from '~/models';
+import {findValues} from '../internal/array/find';
+import type {Key, PlainObject} from '../models';
 
 /**
  * Get a filtered array of items matching `value`

package/src/array/find.ts

@@ -1,5 +1,5 @@
-import {findValue} from '~/internal/array/find';
-import type {Key, PlainObject} from '~/models';
+import {findValue} from '../internal/array/find';
+import type {Key, PlainObject} from '../models';
 
 /**
  * Get the first item matching `value` _(or `undefined` if no match is found)_

package/src/array/group-by.ts

@@ -1,6 +1,6 @@
 import type {Simplify} from 'type-fest';
-import {getCallbacks} from '~/internal/array/callbacks';
-import type {Key, KeyedValue, PlainObject} from '~/models';
+import {getCallbacks} from '../internal/array/callbacks';
+import type {Key, KeyedValue, PlainObject} from '../models';
 
 /**
  * Create a record from an array of items using a specific key

package/src/array/index-of.ts

@@ -1,5 +1,5 @@
-import {findValue} from '~/internal/array/find';
-import type {Key, PlainObject} from '~/models';
+import {findValue} from '../internal/array/find';
+import type {Key, PlainObject} from '../models';
 
 /**
  * Get the index for the first item matching `value` _(or `-1` if no match is found)_

package/src/array/index.ts

@@ -1,5 +1,5 @@
-import {insertValues} from '~/array/insert';
-import type {NestedArrayType} from '~/models';
+import {insertValues} from '../array/insert';
+import type {NestedArrayType} from '../models';
 
 /**
  * Flatten an array _(using native `flat` and maximum depth)_
@@ -32,3 +32,4 @@ export * from './splice';
 export * from './to-map';
 export * from './to-record';
 export * from './unique';
+

package/src/array/insert.ts

@@ -1,5 +1,5 @@
-import {chunk} from '~/array/chunk';
-import type {InsertType} from '~/array/models';
+import {chunk} from './chunk';
+import type {InsertType} from './models';
 
 /**
  * - Insert values into an array _(at the end)_

package/src/array/models.ts

@@ -1,4 +1,4 @@
-import type {GenericCallback, Key} from '~/models';
+import type {GenericCallback, Key} from '../models';
 
 export type Callbacks = {
 	bool?: GenericCallback;

package/src/array/shuffle.ts

@@ -1,4 +1,4 @@
-import {getRandomInteger} from '~/random';
+import {getRandomInteger} from '../random';
 
 /**
  * Shuffle an array