@oscarpalmer/atoms 0.74.1 → 0.76.0

package/dist/js/value/unsmush.cjs

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const is = require("../is.cjs");
+const value_set = require("./set.cjs");
+function getKeyGroups(value) {
+  const keys = Object.keys(value);
+  const { length } = keys;
+  const grouped = [];
+  for (let index = 0; index < length; index += 1) {
+    const key = keys[index];
+    const dots = key.split(".");
+    if (grouped[dots.length] == null) {
+      grouped[dots.length] = [key];
+    } else {
+      grouped[dots.length].push(key);
+    }
+  }
+  return grouped;
+}
+function unsmush(value) {
+  const groups = getKeyGroups(value);
+  const { length } = groups;
+  const unsmushed = {};
+  for (let groupIndex = 1; groupIndex < length; groupIndex += 1) {
+    const group = groups[groupIndex];
+    const groupLength = group.length;
+    for (let keyIndex = 0; keyIndex < groupLength; keyIndex += 1) {
+      const key = group[keyIndex];
+      const val = value[key];
+      value_set.setValue(
+        unsmushed,
+        key,
+        is.isArrayOrPlainObject(val) ? Array.isArray(val) ? [...val] : { ...val } : val
+      );
+    }
+  }
+  return unsmushed;
+}
+exports.unsmush = unsmush;

package/dist/js/value/{unsmush.mjs → unsmush.js}

@@ -1,11 +1,10 @@
-// src/js/value/unsmush.ts
-import { isArrayOrPlainObject } from "../is";
-import { setValue } from "./set";
+import { isArrayOrPlainObject } from "../is.js";
+import { setValue } from "./set.js";
 function getKeyGroups(value) {
   const keys = Object.keys(value);
   const { length } = keys;
   const grouped = [];
-  for (let index = 0;index < length; index += 1) {
+  for (let index = 0; index < length; index += 1) {
     const key = keys[index];
     const dots = key.split(".");
     if (grouped[dots.length] == null) {
@@ -20,13 +19,17 @@ function unsmush(value) {
   const groups = getKeyGroups(value);
   const { length } = groups;
   const unsmushed = {};
-  for (let groupIndex = 1;groupIndex < length; groupIndex += 1) {
+  for (let groupIndex = 1; groupIndex < length; groupIndex += 1) {
     const group = groups[groupIndex];
     const groupLength = group.length;
-    for (let keyIndex = 0;keyIndex < groupLength; keyIndex += 1) {
+    for (let keyIndex = 0; keyIndex < groupLength; keyIndex += 1) {
       const key = group[keyIndex];
       const val = value[key];
-      setValue(unsmushed, key, isArrayOrPlainObject(val) ? Array.isArray(val) ? [...val] : { ...val } : val);
+      setValue(
+        unsmushed,
+        key,
+        isArrayOrPlainObject(val) ? Array.isArray(val) ? [...val] : { ...val } : val
+      );
     }
   }
   return unsmushed;

package/package.json

@@ -8,14 +8,16 @@
 	},
 	"description": "Sweet little atomic goodies…",
 	"devDependencies": {
-		"@biomejs/biome": "^1.9.2",
-		"@happy-dom/global-registrator": "^15.7.4",
-		"@oscarpalmer/timer": "^0.24.0",
-		"@types/bun": "^1.1.10",
-		"bun": "^1.1.29",
-		"dts-bundle-generator": "^9.5.1",
-		"sass": "^1.79.4",
-		"typescript": "^5.6.2"
+		"@biomejs/biome": "^1.9",
+		"@types/node": "^22.7",
+		"@vitest/coverage-istanbul": "^2.1",
+		"dts-bundle-generator": "^9.5",
+		"glob": "^11",
+		"happy-dom": "^15.7",
+		"sass": "^1.79",
+		"typescript": "^5.6",
+		"vite": "^5.4",
+		"vitest": "^2.1"
 	},
 	"exports": {
 		"./package.json": "./package.json",
@@ -23,33 +25,33 @@
 			"bun": "./src/js/index.ts",
 			"import": {
 				"types": "./types/index.d.ts",
-				"default": "./dist/js/index.mjs"
+				"default": "./dist/js/index.js"
 			},
 			"require": {
 				"types": "./types/index.d.cts",
-				"default": "./dist/js/index.js"
+				"default": "./dist/js/index.cjs"
 			}
 		},
 		"./array": {
 			"bun": "./src/js/array/index.ts",
 			"import": {
 				"types": "./types/array/index.d.ts",
-				"default": "./dist/js/array/index.mjs"
+				"default": "./dist/js/array/index.js"
 			},
 			"require": {
 				"types": "./types/array/index.d.cts",
-				"default": "./dist/js/array/index.js"
+				"default": "./dist/js/array/index.cjs"
 			}
 		},
 		"./colour": {
 			"bun": "./src/js/colour/index.ts",
 			"import": {
 				"types": "./types/colour/index.d.ts",
-				"default": "./dist/js/colour/index.mjs"
+				"default": "./dist/js/colour/index.js"
 			},
 			"require": {
 				"types": "./types/colour/index.d.cts",
-				"default": "./dist/js/colour/index.js"
+				"default": "./dist/js/colour/index.cjs"
 			}
 		},
 		"./css/a11y": {
@@ -68,55 +70,55 @@
 			"bun": "./src/js/emitter.ts",
 			"import": {
 				"types": "./types/emitter.d.ts",
-				"default": "./dist/js/emitter.mjs"
+				"default": "./dist/js/emitter.js"
 			},
 			"require": {
 				"types": "./types/emitter.d.cts",
-				"default": "./dist/js/emitter.js"
+				"default": "./dist/js/emitter.cjs"
 			}
 		},
 		"./function": {
 			"bun": "./src/js/function.ts",
 			"import": {
 				"types": "./types/function.d.ts",
-				"default": "./dist/js/function.mjs"
+				"default": "./dist/js/function.js"
 			},
 			"require": {
 				"types": "./types/function.d.cts",
-				"default": "./dist/js/function.js"
+				"default": "./dist/js/function.cjs"
 			}
 		},
 		"./is": {
 			"bun": "./src/js/is.ts",
 			"import": {
 				"types": "./types/is.d.ts",
-				"default": "./dist/js/is.mjs"
+				"default": "./dist/js/is.js"
 			},
 			"require": {
 				"types": "./types/is.d.cts",
-				"default": "./dist/js/is.js"
+				"default": "./dist/js/is.cjs"
 			}
 		},
 		"./logger": {
 			"bun": "./src/js/logger.ts",
 			"import": {
 				"types": "./types/logger.d.ts",
-				"default": "./dist/js/logger.mjs"
+				"default": "./dist/js/logger.js"
 			},
 			"require": {
 				"types": "./types/logger.d.cts",
-				"default": "./dist/js/logger.js"
+				"default": "./dist/js/logger.cjs"
 			}
 		},
 		"./math": {
 			"bun": "./src/js/math.ts",
 			"import": {
 				"types": "./types/math.d.ts",
-				"default": "./dist/js/math.mjs"
+				"default": "./dist/js/math.js"
 			},
 			"require": {
 				"types": "./types/math.d.cts",
-				"default": "./dist/js/math.js"
+				"default": "./dist/js/math.cjs"
 			}
 		},
 		"./models": {
@@ -132,100 +134,101 @@
 			"bun": "./src/js/number.ts",
 			"import": {
 				"types": "./types/number.d.ts",
-				"default": "./dist/js/number.mjs"
+				"default": "./dist/js/number.js"
 			},
 			"require": {
 				"types": "./types/number.d.cts",
-				"default": "./dist/js/number.js"
+				"default": "./dist/js/number.cjs"
 			}
 		},
 		"./query": {
 			"bun": "./src/js/query.ts",
 			"import": {
 				"types": "./types/query.d.ts",
-				"default": "./dist/js/query.mjs"
+				"default": "./dist/js/query.js"
 			},
 			"require": {
 				"types": "./types/query.d.cts",
-				"default": "./dist/js/query.js"
+				"default": "./dist/js/query.cjs"
 			}
 		},
 		"./queue": {
 			"bun": "./src/js/queue.ts",
 			"import": {
 				"types": "./types/queue.d.ts",
-				"default": "./dist/js/queue.mjs"
+				"default": "./dist/js/queue.js"
 			},
 			"require": {
 				"types": "./types/queue.d.cts",
-				"default": "./dist/js/queue.js"
+				"default": "./dist/js/queue.cjs"
 			}
 		},
 		"./random": {
 			"bun": "./src/js/random.ts",
 			"import": {
 				"types": "./types/random.d.ts",
-				"default": "./dist/js/random.mjs"
+				"default": "./dist/js/random.js"
 			},
 			"require": {
 				"types": "./types/random.d.cts",
-				"default": "./dist/js/random.js"
+				"default": "./dist/js/random.cjs"
 			}
 		},
 		"./string": {
 			"bun": "./src/js/string/index.ts",
 			"import": {
 				"types": "./types/string/index.d.ts",
-				"default": "./dist/js/string/index.mjs"
+				"default": "./dist/js/string/index.js"
 			},
 			"require": {
 				"types": "./types/string/index.d.cts",
-				"default": "./dist/js/string/index.js"
+				"default": "./dist/js/string/index.cjs"
 			}
 		},
 		"./supports-touch": {
 			"bun": "./src/js/touch.ts",
 			"import": {
 				"types": "./types/touch.d.ts",
-				"default": "./dist/js/touch.mjs"
+				"default": "./dist/js/touch.js"
 			},
 			"require": {
 				"types": "./types/touch.d.cts",
-				"default": "./dist/js/touch.js"
+				"default": "./dist/js/touch.cjs"
 			}
 		},
 		"./value": {
 			"bun": "./src/js/value/index.ts",
 			"import": {
 				"types": "./types/value/index.d.ts",
-				"default": "./dist/js/value/index.mjs"
+				"default": "./dist/js/value/index.js"
 			},
 			"require": {
 				"types": "./types/value/index.d.cts",
-				"default": "./dist/js/value/index.js"
+				"default": "./dist/js/value/index.cjs"
 			}
 		}
 	},
 	"files": ["dist", "src", "types"],
 	"keywords": ["helper", "utility"],
 	"license": "MIT",
-	"main": "./dist/js/index.js",
-	"module": "./dist/js/index.mjs",
+	"main": "./dist/js/index.cjs",
+	"module": "./dist/js/index.js",
 	"name": "@oscarpalmer/atoms",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/oscarpalmer/atoms.git"
 	},
 	"scripts": {
-		"build": "bun run clean && bun run build:css && bun run build:js",
-		"build:css": "bunx sass ./src/css:./dist/css --no-source-map",
-		"build:js": "bunx bun ./.bun.ts && bunx bun ./.bun.ts --esm",
+		"build": "npm run clean && npm run build:css && npm run build:js",
+		"build:css": "npx sass ./src/css:./dist/css --no-source-map",
+		"build:js": "npx vite build && npm run types",
 		"clean": "rm -rf ./dist && rm -rf ./types && rm -f ./tsconfig.tsbuildinfo",
-		"test": "bun test",
-		"watch:css": "bunx sass ./src/css:./dist/css --no-source-map --watch",
-		"watch:js": "bun build ./src/js/index.ts --outfile ./dist/js/index.js --watch"
+		"test": "npx vitest --coverage",
+		"types": "npx tsc && npx dts-bundle-generator --config ./dts.config.ts --silent",
+		"watch:css": "npx sass ./src/css:./dist/css --no-source-map --watch",
+		"watch:js": "npx vite build --watch"
 	},
 	"type": "module",
 	"types": "./types/index.d.cts",
-	"version": "0.74.1"
+	"version": "0.76.0"
 }

package/src/js/array/chunk.ts

@@ -1,16 +1,17 @@
+import {clamp} from '~/number';
+
 /**
- * Chunks an array into smaller arrays of a specified size
+ * Chunk an array _(into smaller arrays of a specified size)_
  */
-export function chunk<Value>(array: Value[], size?: number): Value[][] {
+export function chunk<Item>(array: Item[], size?: number): Item[][] {
+	const chunkSize = clamp(size ?? 64_000, 1, 64_000);
 	const {length} = array;
 
-	const chunkSize = typeof size === 'number' && size > 0 ? size : 64_000;
-
 	if (length <= chunkSize) {
 		return [array];
 	}
 
-	const chunks: Value[][] = [];
+	const chunks: Item[][] = [];
 
 	let remaining = Number(length);
 

package/src/js/array/compact.ts

@@ -1,19 +1,17 @@
 /**
- * Compacts and returns an array with all falsey values removed
+ * Compact an array _(removing all `null` and `undefined` values)_
  */
-export function compact<Value>(
-	array: Value[],
-	strict: true,
-): Exclude<Value, 0 | '' | false | null | undefined>[];
+export function compact<Item>(array: Item[]): Exclude<Item, null | undefined>[];
 
 /**
- * Compacts and returns an array with all `null` and `undefined` values removed
+ * Compact an array _(removing all falsey values)_
  */
-export function compact<Value>(
-	array: Value[],
-): Exclude<Value, null | undefined>[];
+export function compact<Item>(
+	array: Item[],
+	strict: true,
+): Exclude<Item, 0 | '' | false | null | undefined>[];
 
-export function compact<Value>(array: Value[], strict?: boolean): Value[] {
+export function compact<Item>(array: Item[], strict?: boolean): Item[] {
 	return strict === true
 		? array.filter(item => !!item)
 		: array.filter(item => item != null);

package/src/js/array/count.ts

@@ -1,29 +1,49 @@
-import {findValues} from '../internal/array-find';
-import type {Key} from '../models';
-import type {BooleanCallback, KeyCallback} from './models';
+import {findValues} from '~/internal/array/find';
+import type {BooleanCallback, KeyCallback} from '~/array/models';
 
 /**
- * Returns the number of items _(count)_ that match the given value
+ * Get the number of items _(count)_ that match the given value
  */
-export function count<Model, Value>(
-	array: Model[],
-	value: Value | BooleanCallback<Model>,
+export function count<Item>(array: Item[], value: Item): number;
+
+/**
+ * Get the number of items _(count)_ that match the given value
+ */
+export function count<Item>(
+	array: Item[],
+	matches: BooleanCallback<Item>,
+): number;
+
+/**
+ * Get the number of items _(count)_ that match the given value
+ */
+export function count<Item, Key extends keyof Item>(
+	array: Item[],
+	key: Key,
+	value: Item[Key],
 ): number;
 
 /**
- * - Returns the number of items _(count)_ that match the given value
- * - Use `key` to find a comparison value to match with `value`
+ * Get the number of items _(count)_ that match the given value
  */
-export function count<Model, Value = Model>(
-	array: Model[],
-	value: Value,
-	key: Key | KeyCallback<Model>,
+export function count<Item, Key extends KeyCallback<Item>>(
+	array: Item[],
+	key: Key,
+	value: ReturnType<Key>,
 ): number;
 
-export function count<Model, Value = Model>(
-	array: Model[],
-	value: Value | BooleanCallback<Model>,
-	key?: Key | KeyCallback<Model>,
-): number {
-	return findValues('all', array, value, key).length;
+export function count(array: unknown[], ...parameters: unknown[]): number {
+	const {length} = parameters;
+
+	return findValues(
+		'all',
+		array,
+		length === 1 && typeof parameters[0] === 'function'
+			? parameters[0]
+			: undefined,
+		length === 2 ? parameters[0] : undefined,
+		length === 1 && typeof parameters[0] !== 'function'
+			? parameters[0]
+			: parameters[1],
+	).length;
 }

package/src/js/array/exists.ts

@@ -1,29 +1,53 @@
-import {findValue} from '../internal/array-find';
-import type {Key} from '../models';
+import {findValue} from '~/internal/array/find';
 import type {BooleanCallback, KeyCallback} from './models';
 
 /**
  * Does the value exist in array?
  */
-export function exists<Model, Value>(
-	array: Model[],
-	value: Value | BooleanCallback<Model>,
+export function exists<Item>(array: Item[], value: Item): boolean;
+
+/**
+ * Does the value exist in array?
+ */
+export function exists<Item>(
+	array: Item[],
+	matches: BooleanCallback<Item>,
 ): boolean;
 
 /**
  * - Does the value exist in array?
  * - Use `key` to find a comparison value to match with `value`
  */
-export function exists<Model, Value = Model>(
-	array: Model[],
-	value: Value,
-	key: Key | KeyCallback<Model>,
+export function exists<Item, Key extends keyof Item>(
+	array: Item[],
+	key: Key,
+	value: Item[Key],
 ): boolean;
 
-export function exists<Model, Value = Model>(
-	array: Model[],
-	value: Value | BooleanCallback<Model>,
-	key?: Key | KeyCallback<Model>,
-): boolean {
-	return (findValue('index', array, value, key) as number) > -1;
+/**
+ * - Does the value exist in array?
+ * - Use `key` to find a comparison value to match with `value`
+ */
+export function exists<Item, Key extends KeyCallback<Item>>(
+	array: Item[],
+	key: Key,
+	value: ReturnType<Key>,
+): boolean;
+
+export function exists(array: unknown[], ...parameters: unknown[]): boolean {
+	const {length} = parameters;
+
+	return (
+		(findValue(
+			'index',
+			array,
+			length === 1 && typeof parameters[0] === 'function'
+				? parameters[0]
+				: undefined,
+			length === 2 ? parameters[0] : undefined,
+			length === 1 && typeof parameters[0] !== 'function'
+				? parameters[0]
+				: parameters[1],
+		) as number) > -1
+	);
 }

package/src/js/array/filter.ts

@@ -1,29 +1,51 @@
-import {findValues} from '../internal/array-find';
-import type {Key} from '../models';
-import type {BooleanCallback, KeyCallback} from './models';
+import type {BooleanCallback, KeyCallback} from '~/array/models';
+import {findValues} from '~/internal/array/find';
 
 /**
- * Returns a filtered array of items matching `value`
+ * Get a filtered array of items matching `value`
  */
-export function filter<Model, Value>(
-	array: Model[],
-	value: Value | BooleanCallback<Model>,
-): Model[];
+export function filter<Item>(array: Item[], value: Item): Item[];
 
 /**
- * - Returns a filtered array of items
+ * Get a filtered array of items matching `value`
+ */
+export function filter<Item>(
+	array: Item[],
+	matches: BooleanCallback<Item>,
+): Item[];
+
+/**
+ * - Get a filtered array of items
+ * - Use `key` to find a comparison value to match with `value`
+ */
+export function filter<Item, Key extends keyof Item>(
+	array: Item[],
+	key: Key,
+	value: Item[Key],
+): Item[];
+
+/**
+ * - Get a filtered array of items
  * - Use `key` to find a comparison value to match with `value`
  */
-export function filter<Model, Value = Model>(
-	array: Model[],
-	value: Value,
-	key: Key | KeyCallback<Model>,
-): Model[];
+export function filter<Item, Key extends KeyCallback<Item>>(
+	array: Item[],
+	key: Key,
+	value: ReturnType<Key>,
+): Item[];
+
+export function filter(array: unknown[], ...parameters: unknown[]): unknown[] {
+	const {length} = parameters;
 
-export function filter<Model, Value = Model>(
-	array: Model[],
-	value: Value | BooleanCallback<Model>,
-	key?: Key | KeyCallback<Model>,
-): Model[] {
-	return findValues('all', array, value, key);
+	return findValues(
+		'all',
+		array,
+		length === 1 && typeof parameters[0] === 'function'
+			? parameters[0]
+			: undefined,
+		length === 2 ? parameters[0] : undefined,
+		length === 1 && typeof parameters[0] !== 'function'
+			? parameters[0]
+			: parameters[1],
+	);
 }