@oscarpalmer/atoms 0.76.0 → 0.77.0

package/dist/js/array/count.cjs

@@ -2,13 +2,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const internal_array_find = require("../internal/array/find.cjs");
 function count(array, ...parameters) {
-  const { length } = parameters;
-  return internal_array_find.findValues(
-    "all",
-    array,
-    length === 1 && typeof parameters[0] === "function" ? parameters[0] : void 0,
-    length === 2 ? parameters[0] : void 0,
-    length === 1 && typeof parameters[0] !== "function" ? parameters[0] : parameters[1]
-  ).length;
+  return internal_array_find.findValues("all", array, parameters).length;
 }
 exports.count = count;

package/dist/js/array/count.js

@@ -1,13 +1,6 @@
 import { findValues } from "../internal/array/find.js";
 function count(array, ...parameters) {
-  const { length } = parameters;
-  return findValues(
-    "all",
-    array,
-    length === 1 && typeof parameters[0] === "function" ? parameters[0] : void 0,
-    length === 2 ? parameters[0] : void 0,
-    length === 1 && typeof parameters[0] !== "function" ? parameters[0] : parameters[1]
-  ).length;
+  return findValues("all", array, parameters).length;
 }
 export {
   count

package/dist/js/array/exists.cjs

@@ -2,13 +2,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const internal_array_find = require("../internal/array/find.cjs");
 function exists(array, ...parameters) {
-  const { length } = parameters;
-  return internal_array_find.findValue(
-    "index",
-    array,
-    length === 1 && typeof parameters[0] === "function" ? parameters[0] : void 0,
-    length === 2 ? parameters[0] : void 0,
-    length === 1 && typeof parameters[0] !== "function" ? parameters[0] : parameters[1]
-  ) > -1;
+  return internal_array_find.findValue("index", array, parameters) > -1;
 }
 exports.exists = exists;

package/dist/js/array/exists.js

@@ -1,13 +1,6 @@
 import { findValue } from "../internal/array/find.js";
 function exists(array, ...parameters) {
-  const { length } = parameters;
-  return findValue(
-    "index",
-    array,
-    length === 1 && typeof parameters[0] === "function" ? parameters[0] : void 0,
-    length === 2 ? parameters[0] : void 0,
-    length === 1 && typeof parameters[0] !== "function" ? parameters[0] : parameters[1]
-  ) > -1;
+  return findValue("index", array, parameters) > -1;
 }
 export {
   exists

package/dist/js/array/filter.cjs

@@ -2,13 +2,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const internal_array_find = require("../internal/array/find.cjs");
 function filter(array, ...parameters) {
-  const { length } = parameters;
-  return internal_array_find.findValues(
-    "all",
-    array,
-    length === 1 && typeof parameters[0] === "function" ? parameters[0] : void 0,
-    length === 2 ? parameters[0] : void 0,
-    length === 1 && typeof parameters[0] !== "function" ? parameters[0] : parameters[1]
-  );
+  return internal_array_find.findValues("all", array, parameters);
 }
 exports.filter = filter;

package/dist/js/array/filter.js

@@ -1,13 +1,6 @@
 import { findValues } from "../internal/array/find.js";
 function filter(array, ...parameters) {
-  const { length } = parameters;
-  return findValues(
-    "all",
-    array,
-    length === 1 && typeof parameters[0] === "function" ? parameters[0] : void 0,
-    length === 2 ? parameters[0] : void 0,
-    length === 1 && typeof parameters[0] !== "function" ? parameters[0] : parameters[1]
-  );
+  return findValues("all", array, parameters);
 }
 export {
   filter

package/dist/js/array/find.cjs

@@ -2,13 +2,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const internal_array_find = require("../internal/array/find.cjs");
 function find(array, ...parameters) {
-  const { length } = parameters;
-  return internal_array_find.findValue(
-    "value",
-    array,
-    length === 1 && typeof parameters[0] === "function" ? parameters[0] : void 0,
-    length === 2 ? parameters[0] : void 0,
-    length === 1 && typeof parameters[0] !== "function" ? parameters[0] : parameters[1]
-  );
+  return internal_array_find.findValue("value", array, parameters);
 }
 exports.find = find;

package/dist/js/array/find.js

@@ -1,13 +1,6 @@
 import { findValue } from "../internal/array/find.js";
 function find(array, ...parameters) {
-  const { length } = parameters;
-  return findValue(
-    "value",
-    array,
-    length === 1 && typeof parameters[0] === "function" ? parameters[0] : void 0,
-    length === 2 ? parameters[0] : void 0,
-    length === 1 && typeof parameters[0] !== "function" ? parameters[0] : parameters[1]
-  );
+  return findValue("value", array, parameters);
 }
 export {
   find

package/dist/js/array/index-of.cjs

@@ -2,13 +2,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const internal_array_find = require("../internal/array/find.cjs");
 function indexOf(array, ...parameters) {
-  const { length } = parameters;
-  return internal_array_find.findValue(
-    "index",
-    array,
-    length === 1 && typeof parameters[0] === "function" ? parameters[0] : void 0,
-    length === 2 ? parameters[0] : void 0,
-    length === 1 && typeof parameters[0] !== "function" ? parameters[0] : parameters[1]
-  );
+  return internal_array_find.findValue("index", array, parameters);
 }
 exports.indexOf = indexOf;

package/dist/js/array/index-of.js

@@ -1,13 +1,6 @@
 import { findValue } from "../internal/array/find.js";
 function indexOf(array, ...parameters) {
-  const { length } = parameters;
-  return findValue(
-    "index",
-    array,
-    length === 1 && typeof parameters[0] === "function" ? parameters[0] : void 0,
-    length === 2 ? parameters[0] : void 0,
-    length === 1 && typeof parameters[0] !== "function" ? parameters[0] : parameters[1]
-  );
+  return findValue("index", array, parameters);
 }
 export {
   indexOf

package/dist/js/array/unique.cjs

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const internal_array_find = require("../internal/array/find.cjs");
 function unique(array, key) {
-  return internal_array_find.findValues("unique", array, void 0, key, void 0);
+  return internal_array_find.findValues("unique", array, [key, void 0]);
 }
 exports.unique = unique;

package/dist/js/array/unique.js

@@ -1,6 +1,6 @@
 import { findValues } from "../internal/array/find.js";
 function unique(array, key) {
-  return findValues("unique", array, void 0, key, void 0);
+  return findValues("unique", array, [key, void 0]);
 }
 export {
   unique

package/dist/js/internal/array/find.cjs

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const internal_array_callbacks = require("./callbacks.cjs");
-function findValue(type, array, bool, key, value) {
+function findValue(type, array, parameters) {
   var _a;
+  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);
@@ -20,8 +21,9 @@ function findValue(type, array, bool, key, value) {
   }
   return type === "index" ? -1 : void 0;
 }
-function findValues(type, array, bool, key, value) {
+function findValues(type, array, parameters) {
   var _a;
+  const { bool, key, value } = getParameters(parameters);
   const callbacks = internal_array_callbacks.getCallbacks(bool, key);
   const { length } = array;
   if (type === "unique" && (callbacks == null ? void 0 : callbacks.key) == null && length >= 100) {
@@ -47,5 +49,13 @@ function findValues(type, array, bool, key, value) {
   }
   return result;
 }
+function getParameters(original) {
+  const { length } = original;
+  return {
+    bool: length === 1 && typeof original[0] === "function" ? original[0] : void 0,
+    key: length === 2 ? original[0] : void 0,
+    value: length === 1 && typeof original[0] !== "function" ? original[0] : original[1]
+  };
+}
 exports.findValue = findValue;
 exports.findValues = findValues;

package/dist/js/internal/array/find.js

@@ -1,6 +1,7 @@
 import { getCallbacks } from "./callbacks.js";
-function findValue(type, array, bool, key, value) {
+function findValue(type, array, parameters) {
   var _a;
+  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);
@@ -18,8 +19,9 @@ function findValue(type, array, bool, key, value) {
   }
   return type === "index" ? -1 : void 0;
 }
-function findValues(type, array, bool, key, value) {
+function findValues(type, array, parameters) {
   var _a;
+  const { bool, key, value } = getParameters(parameters);
   const callbacks = getCallbacks(bool, key);
   const { length } = array;
   if (type === "unique" && (callbacks == null ? void 0 : callbacks.key) == null && length >= 100) {
@@ -45,6 +47,14 @@ function findValues(type, array, bool, key, value) {
   }
   return result;
 }
+function getParameters(original) {
+  const { length } = original;
+  return {
+    bool: length === 1 && typeof original[0] === "function" ? original[0] : void 0,
+    key: length === 2 ? original[0] : void 0,
+    value: length === 1 && typeof original[0] !== "function" ? original[0] : original[1]
+  };
+}
 export {
   findValue,
   findValues

package/package.json

@@ -4,7 +4,7 @@
 		"url": "https://oscarpalmer.se"
 	},
 	"dependencies": {
-		"type-fest": "^4.26.1"
+		"type-fest": "^4.26"
 	},
 	"description": "Sweet little atomic goodies…",
 	"devDependencies": {
@@ -208,8 +208,15 @@
 			}
 		}
 	},
-	"files": ["dist", "src", "types"],
-	"keywords": ["helper", "utility"],
+	"files": [
+		"dist",
+		"src",
+		"types"
+	],
+	"keywords": [
+		"helper",
+		"utility"
+	],
 	"license": "MIT",
 	"main": "./dist/js/index.cjs",
 	"module": "./dist/js/index.js",
@@ -230,5 +237,5 @@
 	},
 	"type": "module",
 	"types": "./types/index.d.cts",
-	"version": "0.76.0"
+	"version": "0.77.0"
 }

package/src/js/array/count.ts

@@ -1,5 +1,5 @@
 import {findValues} from '~/internal/array/find';
-import type {BooleanCallback, KeyCallback} from '~/array/models';
+import type {Key as SimpleKey} from '~/models';
 
 /**
  * Get the number of items _(count)_ that match the given value
@@ -11,7 +11,7 @@ export function count<Item>(array: Item[], value: Item): number;
  */
 export function count<Item>(
 	array: Item[],
-	matches: BooleanCallback<Item>,
+	matches: (item: Item, index: number, array: Item[]) => boolean,
 ): number;
 
 /**
@@ -26,24 +26,11 @@ export function count<Item, Key extends keyof Item>(
 /**
  * Get the number of items _(count)_ that match the given value
  */
-export function count<Item, Key extends KeyCallback<Item>>(
-	array: Item[],
-	key: Key,
-	value: ReturnType<Key>,
-): number;
+export function count<
+	Item,
+	Key extends (item: Item, index: number, array: Item[]) => SimpleKey,
+>(array: Item[], key: Key, value: ReturnType<Key>): number;
 
 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;
+	return findValues('all', array, parameters).length;
 }

package/src/js/array/exists.ts

@@ -1,5 +1,5 @@
 import {findValue} from '~/internal/array/find';
-import type {BooleanCallback, KeyCallback} from './models';
+import type {Key as SimpleKey} from '~/models';
 
 /**
  * Does the value exist in array?
@@ -11,7 +11,7 @@ export function exists<Item>(array: Item[], value: Item): boolean;
  */
 export function exists<Item>(
 	array: Item[],
-	matches: BooleanCallback<Item>,
+	matches: (item: Item, index: number, array: Item[]) => boolean,
 ): boolean;
 
 /**
@@ -28,26 +28,11 @@ export function exists<Item, Key extends keyof Item>(
  * - 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<
+	Item,
+	Key extends (item: Item, index: number, array: Item[]) => SimpleKey,
+>(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
-	);
+	return (findValue('index', array, parameters) as number) > -1;
 }

package/src/js/array/filter.ts

@@ -1,5 +1,5 @@
-import type {BooleanCallback, KeyCallback} from '~/array/models';
 import {findValues} from '~/internal/array/find';
+import type {Key as SimpleKey} from '~/models';
 
 /**
  * Get a filtered array of items matching `value`
@@ -11,7 +11,7 @@ export function filter<Item>(array: Item[], value: Item): Item[];
  */
 export function filter<Item>(
 	array: Item[],
-	matches: BooleanCallback<Item>,
+	matches: (item: Item, index: number, array: Item[]) => boolean,
 ): Item[];
 
 /**
@@ -28,24 +28,11 @@ export function filter<Item, Key extends keyof Item>(
  * - Get a filtered array of items
  * - Use `key` to find a comparison value to match with `value`
  */
-export function filter<Item, Key extends KeyCallback<Item>>(
-	array: Item[],
-	key: Key,
-	value: ReturnType<Key>,
-): Item[];
+export function filter<
+	Item,
+	Key extends (item: Item, index: number, array: Item[]) => SimpleKey,
+>(array: Item[], key: Key, value: ReturnType<Key>): Item[];
 
 export function filter(array: unknown[], ...parameters: unknown[]): unknown[] {
-	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],
-	);
+	return findValues('all', array, parameters);
 }

package/src/js/array/find.ts

@@ -1,5 +1,5 @@
-import type {BooleanCallback, KeyCallback} from '~/array/models';
 import {findValue} from '~/internal/array/find';
+import type {Key as SimpleKey} from '~/models';
 
 /**
  * Get the first item matching `value` _(or `undefined` if no match is found)_
@@ -11,7 +11,7 @@ export function find<Item>(array: Item[], value: Item): Item | undefined;
  */
 export function find<Item>(
 	array: Item[],
-	matches: BooleanCallback<Item>,
+	matches: (item: Item, index: number, array: Item[]) => boolean,
 ): Item | undefined;
 
 /**
@@ -28,27 +28,14 @@ export function find<Item, Key extends keyof Item>(
  * - Get the first matching item _(or `undefined` if no match is found)_
  * - Use `key` to find a comparison value to match with `value`
  */
-export function find<Item, Key extends KeyCallback<Item>>(
-	array: Item[],
-	key: Key,
-	value: ReturnType<Key>,
-): Item | undefined;
+export function find<
+	Item,
+	Key extends (item: Item, index: number, array: Item[]) => SimpleKey,
+>(array: Item[], key: Key, value: ReturnType<Key>): Item | undefined;
 
 export function find<Item>(
 	array: unknown[],
 	...parameters: unknown[]
 ): Item | undefined {
-	const {length} = parameters;
-
-	return findValue(
-		'value',
-		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 Item | undefined;
+	return findValue('value', array, parameters) as Item | undefined;
 }

package/src/js/array/group-by.ts

@@ -1,6 +1,5 @@
-import type {KeyCallback, ValueCallback} from '~/array/models';
 import {getCallbacks} from '~/internal/array/callbacks';
-import type {Key, KeyedValue, PlainObject} from '~/models';
+import type {Key as SimpleKey, KeyedValue, PlainObject} from '~/models';
 
 /**
  * Create a record from an array of items using a specific key
@@ -22,19 +21,18 @@ export function groupBy<Item, Key extends keyof Item>(
 /**
  * Create a record from an array of items using a specific key
  */
-export function groupBy<Item, Key extends KeyCallback<Item>>(
-	array: Item[],
-	key: Key,
-): Record<ReturnType<Key>, Item>;
+export function groupBy<
+	Item,
+	Key extends (item: Item, index: number, array: Item[]) => SimpleKey,
+>(array: Item[], key: Key): Record<ReturnType<Key>, Item>;
 
 /**
  * Create a record from an array of items using a specific key, and grouping them into arrays
  */
-export function groupBy<Item, Key extends KeyCallback<Item>>(
-	array: Item[],
-	key: Key,
-	arrays: true,
-): Record<ReturnType<Key>, Item[]>;
+export function groupBy<
+	Item,
+	Key extends (item: Item, index: number, array: Item[]) => SimpleKey,
+>(array: Item[], key: Key, arrays: true): Record<ReturnType<Key>, Item[]>;
 
 /**
  * Create a record from an array of items using a specific key and value
@@ -61,7 +59,7 @@ export function groupBy<Item, Key extends keyof Item, Value extends keyof Item>(
 export function groupBy<
 	Item,
 	Key extends keyof Item,
-	Value extends ValueCallback<Item>,
+	Value extends (item: Item, index: number, array: Item[]) => unknown,
 >(
 	array: Item[],
 	key: Key,
@@ -74,7 +72,7 @@ export function groupBy<
 export function groupBy<
 	Item,
 	Key extends keyof Item,
-	Value extends ValueCallback<Item>,
+	Value extends (item: Item, index: number, array: Item[]) => unknown,
 >(
 	array: Item[],
 	key: Key,
@@ -87,7 +85,7 @@ export function groupBy<
  */
 export function groupBy<
 	Item,
-	Key extends KeyCallback<Item>,
+	Key extends (item: Item, index: number, array: Item[]) => SimpleKey,
 	Value extends keyof Item,
 >(
 	array: Item[],
@@ -100,7 +98,7 @@ export function groupBy<
  */
 export function groupBy<
 	Item,
-	Key extends KeyCallback<Item>,
+	Key extends (item: Item, index: number, array: Item[]) => SimpleKey,
 	Value extends keyof Item,
 >(
 	array: Item[],
@@ -114,8 +112,8 @@ export function groupBy<
  */
 export function groupBy<
 	Item,
-	Key extends KeyCallback<Item>,
-	Value extends ValueCallback<Item>,
+	Key extends (item: Item, index: number, array: Item[]) => SimpleKey,
+	Value extends (item: Item, index: number, array: Item[]) => unknown,
 >(
 	array: Item[],
 	key: Key,
@@ -127,8 +125,8 @@ export function groupBy<
  */
 export function groupBy<
 	Item,
-	Key extends KeyCallback<Item>,
-	Value extends ValueCallback<Item>,
+	Key extends (item: Item, index: number, array: Item[]) => SimpleKey,
+	Value extends (item: Item, index: number, array: Item[]) => unknown,
 >(
 	array: Item[],
 	key: Key,
@@ -155,9 +153,9 @@ export function groupValues(
 	key: unknown,
 	value: unknown,
 	arrays: boolean,
-): Record<Key, unknown> {
+): Record<SimpleKey, unknown> {
 	const callbacks = getCallbacks(undefined, key, value);
-	const record: Record<Key, unknown> = {};
+	const record: Record<SimpleKey, unknown> = {};
 	const {length} = array;
 
 	for (let index = 0; index < length; index += 1) {

package/src/js/array/index-of.ts

@@ -1,5 +1,5 @@
-import type {BooleanCallback, KeyCallback} from '~/array/models';
 import {findValue} from '~/internal/array/find';
+import type {Key as SimpleKey} from '~/models';
 
 /**
  * Get the index for the first item matching `value` _(or `-1` if no match is found)_
@@ -11,7 +11,7 @@ export function indexOf<Item>(array: Item[], value: Item): number;
  */
 export function indexOf<Item>(
 	array: Item[],
-	matches: BooleanCallback<Item>,
+	matches: (item: Item, index: number, array: Item[]) => boolean,
 ): number;
 
 /**
@@ -28,24 +28,11 @@ export function indexOf<Item, Key extends keyof Item>(
  * - Get the index for the first matching item _(or `-1` if no match is found)_
  * - Use `key` to find a comparison value to match with `value`
  */
-export function indexOf<Item, Key extends KeyCallback<Item>>(
-	array: Item[],
-	key: Key,
-	value: ReturnType<Key>,
-): number;
+export function indexOf<
+	Item,
+	Key extends (item: Item, index: number, array: Item[]) => SimpleKey,
+>(array: Item[], key: Key, value: ReturnType<Key>): number;
 
 export function indexOf(array: unknown[], ...parameters: unknown[]): number {
-	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;
+	return findValue('index', array, parameters) as number;
 }

package/src/js/array/models.ts

@@ -1,13 +1,5 @@
 import type {GenericCallback, Key} from '~/models';
 
-export type ArrayCallback<Item, Value> = (
-	item: Item,
-	index: number,
-	array: Item[],
-) => Value;
-
-export type BooleanCallback<Item> = ArrayCallback<Item, boolean>;
-
 export type Callbacks = {
 	bool?: GenericCallback;
 	key?: GenericCallback;
@@ -18,18 +10,12 @@ export type FindType = 'index' | 'value';
 
 export type InsertType = 'push' | 'splice';
 
-export type KeyCallback<Item> = ArrayCallback<Item, Key>;
-
 export type SortKey<Item> = {
 	direction: 'asc' | 'desc';
-	value: Key | SortKeyCallback<Item>;
+	value: Key | ((item: Item) => Key);
 };
 
-export type SortKeyCallback<Item> = (item: Item) => unknown;
-
 export type SortKeyWithCallback<Item> = {
-	callback: SortKeyCallback<Item>;
+	callback: (item: Item) => Key;
 	direction: 'asc' | 'desc';
 };
-
-export type ValueCallback<Item> = ArrayCallback<Item, unknown>;