@oscarpalmer/atoms 0.78.0 → 0.79.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(

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(

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

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

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

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

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

@@ -9,11 +9,11 @@
 	"description": "Atomic utilities for making your JavaScript better.",
 	"devDependencies": {
 		"@biomejs/biome": "^1.9",
-		"@types/node": "^22.8",
+		"@types/node": "^22.9",
 		"@vitest/coverage-istanbul": "^2.1",
 		"dts-bundle-generator": "^9.5",
 		"glob": "^11",
-		"happy-dom": "^15.7",
+		"happy-dom": "^15.11",
 		"typescript": "^5.6",
 		"vite": "^5.4",
 		"vitest": "^2.1"
@@ -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.79.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

package/src/array/sort.ts

@@ -1,7 +1,7 @@
-import type {SortKey, SortKeyWithCallback} from '~/array/models';
-import {isKey} from '~/is';
-import type {Key, PlainObject} from '~/models';
-import {compare} from '~/value/compare';
+import {isKey} from '../is';
+import type {Key, PlainObject} from '../models';
+import {compare} from '../value/compare';
+import type {SortKey, SortKeyWithCallback} from './models';
 
 /**
  * Sort an array of items _(defaults to ascending)_
@@ -57,13 +57,7 @@ export function sort(
 		return array;
 	}
 
-	if (first == null || typeof first === 'boolean') {
-		return first === true
-			? (array as never[]).sort((first, second) => second - first)
-			: 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 => {
@@ -92,9 +86,11 @@ export function sort(
 	const {length} = keys;
 
 	if (length === 0) {
-		return direction === 'asc'
-			? array.sort()
-			: (array as never[]).sort((first, second) => second - first);
+		return array.sort(
+			(first, second) =>
+				compare(first as never, second as never) *
+				(direction === 'asc' ? 1 : -1),
+		);
 	}
 
 	if (length === 1) {

package/src/array/splice.ts

@@ -1,4 +1,4 @@
-import {insertValues} from '~/array/insert';
+import {insertValues} from './insert';
 
 /**
  * Removes and returns all items from an array starting from a specific index

package/src/array/to-map.ts

@@ -1,5 +1,5 @@
-import {getCallbacks} from '~/internal/array/callbacks';
-import type {Key, PlainObject} from '~/models';
+import {getCallbacks} from '../internal/array/callbacks';
+import type {Key, PlainObject} from '../models';
 
 /**
  * Create a map from an array of items _(using their indices as keys)_

package/src/array/to-record.ts

@@ -1,6 +1,6 @@
 import type {Simplify} from 'type-fest';
-import {groupValues} from '~/array/group-by';
-import type {Key, KeyedValue, PlainObject} from '~/models';
+import {groupValues} from '../array/group-by';
+import type {Key, KeyedValue, PlainObject} from '../models';
 
 /**
  * Create a record from an array of items _(using their indices as keys)_
@@ -11,18 +11,18 @@ export function toRecord<Item>(array: Item[]): Record<number, Item>;
  * Create a record from an array of items using a specific key
  */
 export function toRecord<Item extends PlainObject, ItemKey extends keyof Item>(
-		array: Item[],
-		key: ItemKey,
-	): Simplify<Record<KeyedValue<Item, ItemKey>, Item>>;
+	array: Item[],
+	key: ItemKey,
+): Simplify<Record<KeyedValue<Item, ItemKey>, Item>>;
 
 /**
  * Create a record from an array of items using a specific key, and grouping them into arrays
  */
 export function toRecord<Item extends PlainObject, ItemKey extends keyof Item>(
-		array: Item[],
-		key: ItemKey,
-		arrays: true,
-	): Simplify<Record<KeyedValue<Item, ItemKey>, Item[]>>;
+	array: Item[],
+	key: ItemKey,
+	arrays: true,
+): Simplify<Record<KeyedValue<Item, ItemKey>, Item[]>>;
 
 /**
  * Create a record from an array of items using a specific key
@@ -48,82 +48,82 @@ export function toRecord<
  * Create a record from an array of items using a specific key and value
  */
 export function toRecord<
-		Item extends PlainObject,
-		ItemKey extends keyof Item,
-		ItemValue extends keyof Item,
-	>(
-		array: Item[],
-		key: ItemKey,
-		value: ItemValue,
-	): Simplify<Record<KeyedValue<Item, ItemKey>, Item[ItemValue]>>;
+	Item extends PlainObject,
+	ItemKey extends keyof Item,
+	ItemValue extends keyof Item,
+>(
+	array: Item[],
+	key: ItemKey,
+	value: ItemValue,
+): Simplify<Record<KeyedValue<Item, ItemKey>, Item[ItemValue]>>;
 
 /**
  * Create a record from an array of items using a specific key and value, and grouping them into arrays
  */
 export function toRecord<
-		Item extends PlainObject,
-		ItemKey extends keyof Item,
-		ItemValue extends keyof Item,
-	>(
-		array: Item[],
-		key: ItemKey,
-		value: ItemValue,
-		arrays: true,
-	): Simplify<Record<KeyedValue<Item, ItemKey>, Array<Item[ItemValue]>>>;
+	Item extends PlainObject,
+	ItemKey extends keyof Item,
+	ItemValue extends keyof Item,
+>(
+	array: Item[],
+	key: ItemKey,
+	value: ItemValue,
+	arrays: true,
+): Simplify<Record<KeyedValue<Item, ItemKey>, Array<Item[ItemValue]>>>;
 
 /**
  * Create a record from an array of items using a specific key and value
  */
 export function toRecord<
-		Item extends PlainObject,
-		ItemKey extends keyof Item,
-		ItemValue extends (item: Item, index: number, array: Item[]) => unknown,
-	>(
-		array: Item[],
-		key: ItemKey,
-		value: ItemValue,
-	): Simplify<Record<KeyedValue<Item, ItemKey>, ReturnType<ItemValue>>>;
+	Item extends PlainObject,
+	ItemKey extends keyof Item,
+	ItemValue extends (item: Item, index: number, array: Item[]) => unknown,
+>(
+	array: Item[],
+	key: ItemKey,
+	value: ItemValue,
+): Simplify<Record<KeyedValue<Item, ItemKey>, ReturnType<ItemValue>>>;
 
 /**
  * Create a record from an array of items using a specific key and value, and grouping them into arrays
  */
 export function toRecord<
-		Item extends PlainObject,
-		ItemKey extends keyof Item,
-		ItemValue extends (item: Item, index: number, array: Item[]) => unknown,
-	>(
-		array: Item[],
-		key: ItemKey,
-		value: ItemValue,
-		arrays: true,
-	): Simplify<Record<KeyedValue<Item, ItemKey>, Array<ReturnType<ItemValue>>>>;
+	Item extends PlainObject,
+	ItemKey extends keyof Item,
+	ItemValue extends (item: Item, index: number, array: Item[]) => unknown,
+>(
+	array: Item[],
+	key: ItemKey,
+	value: ItemValue,
+	arrays: true,
+): Simplify<Record<KeyedValue<Item, ItemKey>, Array<ReturnType<ItemValue>>>>;
 
 /**
  * Create a record from an array of items using a specific key and value
  */
 export function toRecord<
-		Item extends PlainObject,
-		ItemKey extends (item: Item, index: number, array: Item[]) => Key,
-		ItemValue extends keyof Item,
-	>(
-		array: Item[],
-		key: ItemKey,
-		value: ItemValue,
-	): Record<ReturnType<ItemKey>, Item[ItemValue]>;
+	Item extends PlainObject,
+	ItemKey extends (item: Item, index: number, array: Item[]) => Key,
+	ItemValue extends keyof Item,
+>(
+	array: Item[],
+	key: ItemKey,
+	value: ItemValue,
+): Record<ReturnType<ItemKey>, Item[ItemValue]>;
 
 /**
  * Create a record from an array of items using a specific key and value, and grouping them into arrays
  */
 export function toRecord<
-		Item extends PlainObject,
-		ItemKey extends (item: Item, index: number, array: Item[]) => Key,
-		ItemValue extends keyof Item,
-	>(
-		array: Item[],
-		key: ItemKey,
-		value: ItemValue,
-		arrays: true,
-	): Record<ReturnType<ItemKey>, Array<Item[ItemValue]>>;
+	Item extends PlainObject,
+	ItemKey extends (item: Item, index: number, array: Item[]) => Key,
+	ItemValue extends keyof Item,
+>(
+	array: Item[],
+	key: ItemKey,
+	value: ItemValue,
+	arrays: true,
+): Record<ReturnType<ItemKey>, Array<Item[ItemValue]>>;
 
 /**
  * Create a record from an array of items using a specific key and value

package/src/array/unique.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 an array of unique items
@@ -20,9 +20,9 @@ export function unique<Item extends PlainObject, ItemKey extends keyof Item>(
  * - Use `key` to find a comparison value for an item
  */
 export function unique<
-		Item,
-		ItemKey extends (item: Item, index: number, array: Item[]) => Key,
-	>(array: Item[], key: ItemKey): Item[];
+	Item,
+	ItemKey extends (item: Item, index: number, array: Item[]) => Key,
+>(array: Item[], key: ItemKey): Item[];
 
 export function unique(array: unknown[], key?: unknown): unknown[] {
 	return findValues('unique', array, [key, undefined]);

package/src/colour/base.ts

@@ -1,5 +1,5 @@
-import type {HexColour} from '~/colour/hex';
-import {isColourValue} from '~/colour/is';
+import type {HexColour} from './hex';
+import {isColourValue} from './is';
 
 export abstract class Colour<Model> {
 	private declare readonly $colour: string;

package/src/colour/functions.ts

@@ -1,7 +1,7 @@
-import {HexColour} from '~/colour/hex';
-import {HSLColour, type HSLColourValue} from '~/colour/hsl';
-import {RGBColour, type RGBColourValue} from '~/colour/rgb';
-import {clamp} from '~/number';
+import {clamp} from '../number';
+import {HexColour} from './hex';
+import {HSLColour, type HSLColourValue} from './hsl';
+import {RGBColour, type RGBColourValue} from './rgb';
 
 export const anyPattern = /^#*([a-f0-9]{3}){1,2}$/i;
 const groupedPattern = /^#*([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})$/i;

package/src/colour/hex.ts

@@ -1,6 +1,6 @@
-import {anyPattern, getNormalisedHex, hexToRgb} from '~/colour/functions';
-import type {HSLColour} from '~/colour/hsl';
-import type {RGBColour} from '~/colour/rgb';
+import {anyPattern, getNormalisedHex, hexToRgb} from './functions';
+import type {HSLColour} from './hsl';
+import type {RGBColour} from './rgb';
 
 type State = {
 	value: string;

package/src/colour/hsl.ts

@@ -1,8 +1,8 @@
-import {Colour} from '~/colour/base';
-import {hslToRgb} from '~/colour/functions';
-import type {HexColour} from '~/colour/hex';
-import type {RGBColour} from '~/colour/rgb';
-import {clamp} from '~/number';
+import {clamp} from '../number';
+import {Colour} from './base';
+import {hslToRgb} from './functions';
+import type {HexColour} from './hex';
+import type {RGBColour} from './rgb';
 
 export type HSLColourValue = {
 	hue: number;

package/src/colour/index.ts

@@ -1,4 +1,4 @@
-import type {RGBColourValue} from '~/colour/rgb';
+import type {RGBColourValue} from './rgb';
 
 /**
  * Get a foreground colour _(usually text)_ based on a background colour's luminance

package/src/colour/is.ts

@@ -1,6 +1,6 @@
-import type {HexColour} from '~/colour/hex';
-import type {HSLColour} from '~/colour/hsl';
-import type {RGBColour} from '~/colour/rgb';
+import type {HexColour} from './hex';
+import type {HSLColour} from './hsl';
+import type {RGBColour} from './rgb';
 
 /**
  * Is the value a colour?

package/src/colour/rgb.ts

@@ -1,8 +1,8 @@
-import {Colour} from '~/colour/base';
-import {rgbToHex, rgbToHsl} from '~/colour/functions';
-import type {HexColour} from '~/colour/hex';
-import type {HSLColour} from '~/colour/hsl';
-import {clamp} from '~/number';
+import {clamp} from '../number';
+import {Colour} from './base';
+import {rgbToHex, rgbToHsl} from './functions';
+import type {HexColour} from './hex';
+import type {HSLColour} from './hsl';
 
 export type RGBColourValue = {
 	blue: number;

package/src/emitter.ts

@@ -1,4 +1,4 @@
-import {noop} from '~/function';
+import {noop} from './function';
 
 class Emitter<Value> {
 	private declare readonly state: EmitterState<Value>;

package/src/function.ts

@@ -1,5 +1,5 @@
-import type {GenericCallback} from '~/models';
-import {clamp} from '~/number';
+import type {GenericCallback} from './models';
+import {clamp} from './number';
 
 type Debounced<Callback extends GenericCallback> = Callback & {
 	/**