@oscarpalmer/atoms 0.193.1 → 0.195.0

package/dist/query.mjs

@@ -1,5 +1,5 @@
 import { isPlainObject } from "./internal/is.mjs";
-import { getString, ignoreKey, join, tryDecode, tryEncode } from "./internal/string.mjs";
+import { getString, ignoreKey, join, tryDecode, tryEncode } from "./internal/string/misc.mjs";
 import { getNumber } from "./internal/number.mjs";
 import { setValue } from "./internal/value/set.mjs";
 //#region src/query.ts
@@ -11,15 +11,15 @@ import { setValue } from "./internal/value/set.mjs";
 */
 function fromQuery(query) {
 	if (typeof query !== "string" || query.trim().length === 0) return {};
-	const parts = query.split(AMPERSAND).map((part) => part.split(EQUAL).map(tryDecode)).sort(([first], [second]) => first.localeCompare(second));
+	const parts = query.split(QUERY_AMPERSAND).map((part) => part.split(QUERY_EQUAL).map(tryDecode)).sort(([first], [second]) => first.localeCompare(second));
 	const { length } = parts;
 	const parameters = {};
 	let position = 0;
 	let array;
 	for (let index = 0; index < length; index += 1) {
 		const [key, value] = parts[index];
-		if (EXPRESSION_ARRAY_SUFFIX.test(key)) {
-			const named = key.replace(EXPRESSION_ARRAY_SUFFIX, "");
+		if (QUERY_EXPRESSION_ARRAY_SUFFIX.test(key)) {
+			const named = key.replace(QUERY_EXPRESSION_ARRAY_SUFFIX, "");
 			if (named !== array) {
 				array = named;
 				position = 0;
@@ -41,9 +41,9 @@ function getParts(value, fromArray, prefix) {
 	for (let index = 0; index < length; index += 1) {
 		const key = keys[index];
 		const val = value[key];
-		const fullKey = join([prefix, fromArray ? void 0 : key], DOT);
+		const fullKey = join([prefix, fromArray ? void 0 : key], QUERY_DOT);
 		const encodedKey = getString(tryEncode(fullKey));
-		const prefixedKey = fromArray ? join([encodedKey, index], DOT) : encodedKey;
+		const prefixedKey = fromArray ? join([encodedKey, index], QUERY_DOT) : encodedKey;
 		if (Array.isArray(val)) parts.push(...getParts(val, true, fullKey));
 		else if (isPlainObject(val)) parts.push(...getParts(val, false, fullKey));
 		else if (isDecodable(val)) parts.push(`${prefixedKey}=${getString(tryEncode(val))}`);
@@ -52,7 +52,7 @@ function getParts(value, fromArray, prefix) {
 	return parts;
 }
 function getQueryValue(value) {
-	if (EXPRESSION_BOOLEAN.test(value)) return value === TRUE;
+	if (QUERY_EXPRESSION_BOOLEAN.test(value)) return value === QUERY_TRUE;
 	const asNumber = getNumber(value);
 	if (!Number.isNaN(asNumber)) return asNumber;
 	const parsed = Date.parse(value);
@@ -61,7 +61,7 @@ function getQueryValue(value) {
 	return date.toJSON() === value ? date : value;
 }
 function isDecodable(value) {
-	return TYPES.has(typeof value);
+	return QUERY_TYPES.has(typeof value);
 }
 /**
 * Convert a plain _(nested)_ object to a query string
@@ -70,15 +70,15 @@ function isDecodable(value) {
 * @returns Query string representation of the object
 */
 function toQuery(parameters) {
-	return isPlainObject(parameters) ? join(getParts(parameters, false).filter((part) => part.length > 0), AMPERSAND) : "";
+	return isPlainObject(parameters) ? join(getParts(parameters, false).filter((part) => part.length > 0), QUERY_AMPERSAND) : "";
 }
-const AMPERSAND = "&";
-const DOT = ".";
-const EQUAL = "=";
-const EXPRESSION_ARRAY_SUFFIX = /\[\]$/;
-const EXPRESSION_BOOLEAN = /^(false|true)$/;
-const TRUE = "true";
-const TYPES = /* @__PURE__ */ new Set([
+const QUERY_AMPERSAND = "&";
+const QUERY_DOT = ".";
+const QUERY_EQUAL = "=";
+const QUERY_EXPRESSION_ARRAY_SUFFIX = /\[\]$/;
+const QUERY_EXPRESSION_BOOLEAN = /^(false|true)$/;
+const QUERY_TRUE = "true";
+const QUERY_TYPES = /* @__PURE__ */ new Set([
 	"boolean",
 	"number",
 	"string"

package/dist/queue.mjs

@@ -1,4 +1,5 @@
-import { getNumberOrDefault } from "./internal/number.mjs";
+import { createAborter } from "./internal/abort.mjs";
+import { getBooleanOrDefault, getNumberOrDefault } from "./internal/defaults.mjs";
 //#region src/queue.ts
 /**
 * An error thrown by the Queue when an operation fails
@@ -6,11 +7,47 @@ import { getNumberOrDefault } from "./internal/number.mjs";
 var QueueError = class extends Error {
 	constructor(message) {
 		super(message);
-		this.name = ERROR_NAME;
+		this.name = QUEUE_ERROR_NAME;
 	}
 };
+function addToQueue(instance, state, parameters, signal) {
+	if (instance.full) throw new QueueError(QUEUE_MESSAGE_MAXIMUM);
+	const abortSignal = signal instanceof AbortSignal ? signal : void 0;
+	if (abortSignal?.aborted ?? false) throw new Error(abortSignal?.reason);
+	const id = identify(state);
+	let rejector;
+	let resolver;
+	const promise = new Promise((resolve, reject) => {
+		rejector = reject;
+		resolver = resolve;
+	});
+	const aborter = createAborter(abortSignal, () => rejector(abortSignal?.reason));
+	state.items.push({
+		aborter,
+		id,
+		parameters,
+		promise,
+		key: state.key,
+		reject: rejector,
+		resolve: resolver
+	});
+	if (state.options.autostart) run(state);
+	return {
+		id,
+		promise
+	};
+}
+function clearQueue(state) {
+	const items = state.items.splice(0);
+	const { length } = items;
+	for (let index = 0; index < length; index += 1) {
+		const { aborter, reject } = items[index];
+		aborter?.cancel();
+		reject(new QueueError(QUEUE_MESSAGE_CLEAR));
+	}
+}
 function createQueue(callback, options, key) {
-	if (typeof callback !== "function") throw new TypeError(MESSAGE_CALLBACK);
+	if (typeof callback !== "function") throw new TypeError(QUEUE_MESSAGE_CALLBACK);
 	const state = {
 		callback,
 		key,
@@ -22,71 +59,16 @@ function createQueue(callback, options, key) {
 		runners: 0
 	};
 	const instance = {
-		add: (parameters, signal) => {
-			if (instance.full) throw new QueueError(MESSAGE_MAXIMUM);
-			const abortSignal = signal instanceof AbortSignal ? signal : void 0;
-			if (abortSignal?.aborted ?? false) throw new Error(abortSignal.reason);
-			const id = identify(state);
-			let rejector;
-			let resolver;
-			const promise = new Promise((resolve, reject) => {
-				rejector = reject;
-				resolver = resolve;
-			});
-			const aborter = abortSignal == null ? void 0 : () => rejector(abortSignal.reason);
-			signal?.addEventListener(EVENT_NAME, aborter, EVENT_OPTIONS);
-			state.items.push({
-				id,
-				parameters,
-				promise,
-				abort: aborter,
-				key: state.key,
-				reject: rejector,
-				resolve: resolver,
-				signal: abortSignal
-			});
-			if (state.options.autostart) run(state);
-			return {
-				id,
-				promise
-			};
-		},
-		clear: () => {
-			const items = state.items.splice(0);
-			const { length } = items;
-			for (let index = 0; index < length; index += 1) {
-				const { abort, reject, signal } = items[index];
-				reject(new QueueError(MESSAGE_CLEAR));
-				signal?.removeEventListener(EVENT_NAME, abort);
-			}
-		},
+		add: (parameters, signal) => addToQueue(instance, state, parameters, signal),
+		clear: () => clearQueue(state),
 		pause: () => {
 			state.paused = true;
 		},
-		remove: (id) => {
-			const index = state.items.findIndex((item) => item.id === id);
-			if (index > -1) {
-				const { abort, reject, signal } = state.items.splice(index, 1)[0];
-				reject(new QueueError(MESSAGE_REMOVE));
-				signal?.removeEventListener(EVENT_NAME, abort);
-			}
-		},
-		resume: () => {
-			if (state.paused) {
-				const handled = state.handled.splice(0);
-				const { length } = handled;
-				for (let index = 0; index < length; index += 1) handled[index]();
-			}
-			state.paused = false;
-			const length = Math.min(state.options.concurrency, state.items.length);
-			for (let index = 0; index < length; index += 1) run(state);
-		}
+		remove: (id) => removeQueued(state, id),
+		resume: () => resumeQueue(state)
 	};
 	Object.defineProperties(instance, {
-		[KEY_QUEUE]: {
-			enumerable: false,
-			value: NAME_QUEUE
-		},
+		[QUEUE_PROPERTY]: { value: QUEUE_NAME_QUEUE },
 		active: {
 			enumerable: true,
 			get: () => state.runners > 0
@@ -122,15 +104,6 @@ function createQueue(callback, options, key) {
 	});
 	return Object.freeze(instance);
 }
-function getBooleanOrDefault(value, defaultValue) {
-	return typeof value === "boolean" ? value : defaultValue;
-}
-function getItems(state) {
-	const size = {};
-	const queues = state.queues.entries();
-	for (const [key, queue] of queues) size[key] = queue.size;
-	return size;
-}
 function getOptions(input) {
 	const options = typeof input === "object" && input != null ? input : {};
 	return {
@@ -140,7 +113,7 @@ function getOptions(input) {
 	};
 }
 function getQueue(state, key, add) {
-	if (typeof key !== "string" || key.trim().length === 0) throw new TypeError(MESSAGE_KEY);
+	if (typeof key !== "string" || key.trim().length === 0) throw new TypeError(QUEUE_MESSAGE_KEY);
 	let queue = state.queues.get(key);
 	if (queue == null && add === true) {
 		queue = createQueue(state.callback, state.options, key);
@@ -148,6 +121,12 @@ function getQueue(state, key, add) {
 	}
 	return queue;
 }
+function getQueueItems(state) {
+	const size = {};
+	const queues = state.queues.entries();
+	for (const [key, queue] of queues) size[key] = queue.size;
+	return size;
+}
 function getStatus(state, status) {
 	const queues = state.queues.entries();
 	const result = [];
@@ -155,8 +134,8 @@ function getStatus(state, status) {
 	return result;
 }
 function handleQueuedResult(item, error, result) {
-	item.signal?.removeEventListener(EVENT_NAME, item.abort);
-	if (item.signal?.aborted ?? false) {
+	item.aborter?.cancel();
+	if (item.aborter?.signal?.aborted ?? false) {
 		item.reject();
 		return;
 	}
@@ -185,7 +164,7 @@ function identify(state) {
 * @returns `true` if the value is a keyed queue, otherwise `false`
 */
 function isKeyedQueue(value) {
-	return isQueueInstance(NAME_KEYED, value);
+	return isQueueInstance(QUEUE_NAME_KEYED, value);
 }
 /**
 * Is the value a queue?
@@ -194,13 +173,13 @@ function isKeyedQueue(value) {
 * @returns `true` if the value is a queue, otherwise `false`
 */
 function isQueue(value) {
-	return isQueueInstance(NAME_QUEUE, value);
+	return isQueueInstance(QUEUE_NAME_QUEUE, value);
 }
 function isQueueInstance(name, value) {
-	return typeof value === "object" && value != null && value[KEY_QUEUE] === name;
+	return typeof value === "object" && value != null && value[QUEUE_PROPERTY] === name;
 }
 function keyedQueue(callback, options) {
-	if (typeof callback !== "function") throw new TypeError(MESSAGE_CALLBACK);
+	if (typeof callback !== "function") throw new TypeError(QUEUE_MESSAGE_CALLBACK);
 	const state = {
 		callback,
 		options: getOptions(options),
@@ -208,26 +187,17 @@ function keyedQueue(callback, options) {
 	};
 	const instance = {
 		add: (key, parameters, signal) => getQueue(state, key, true).add(parameters, signal),
-		clear: (key) => {
-			handleQueues(state, HANDLE_CLEAR, key);
-		},
+		clear: (key) => handleQueues(state, QUEUE_HANDLE_CLEAR, key),
 		get: (key) => getQueue(state, key),
-		pause: (key) => {
-			handleQueues(state, HANDLE_PAUSE, key);
-		},
+		pause: (key) => handleQueues(state, QUEUE_HANDLE_PAUSE, key),
 		remove: (key, id) => removeQueue(state, key, id),
-		resume: (key) => {
-			handleQueues(state, HANDLE_RESUME, key);
-		}
+		resume: (key) => handleQueues(state, QUEUE_HANDLE_RESUME, key)
 	};
 	Object.defineProperties(instance, {
-		[KEY_QUEUE]: {
-			enumerable: false,
-			value: NAME_KEYED
-		},
+		[QUEUE_PROPERTY]: { value: QUEUE_NAME_KEYED },
 		active: {
 			enumerable: true,
-			get: () => getStatus(state, STATUS_ACTIVE)
+			get: () => getStatus(state, QUEUE_STATUS_ACTIVE)
 		},
 		autostart: {
 			enumerable: true,
@@ -239,15 +209,15 @@ function keyedQueue(callback, options) {
 		},
 		empty: {
 			enumerable: true,
-			get: () => getStatus(state, STATUS_EMPTY)
+			get: () => getStatus(state, QUEUE_STATUS_EMPTY)
 		},
 		full: {
 			enumerable: true,
-			get: () => getStatus(state, STATUS_FULL)
+			get: () => getStatus(state, QUEUE_STATUS_FULL)
 		},
 		items: {
 			enumerable: true,
-			get: () => getItems(state)
+			get: () => getQueueItems(state)
 		},
 		keys: {
 			enumerable: true,
@@ -259,7 +229,7 @@ function keyedQueue(callback, options) {
 		},
 		paused: {
 			enumerable: true,
-			get: () => getStatus(state, STATUS_PAUSED)
+			get: () => getStatus(state, QUEUE_STATUS_PAUSED)
 		},
 		queues: {
 			enumerable: true,
@@ -274,7 +244,7 @@ function queue(callback, options) {
 queue.keyed = keyedQueue;
 function removeQueue(state, key, id) {
 	if (key == null) {
-		handleQueues(state, HANDLE_CLEAR);
+		handleQueues(state, QUEUE_HANDLE_CLEAR);
 		state.queues.clear();
 		return;
 	}
@@ -287,6 +257,24 @@ function removeQueue(state, key, id) {
 	queue.clear();
 	state.queues.delete(key);
 }
+function removeQueued(state, id) {
+	const index = state.items.findIndex((item) => item.id === id);
+	if (index > -1) {
+		const { aborter, reject } = state.items.splice(index, 1)[0];
+		aborter?.cancel();
+		reject(new QueueError(QUEUE_MESSAGE_REMOVE));
+	}
+}
+function resumeQueue(state) {
+	if (state.paused) {
+		const handled = state.handled.splice(0);
+		const { length } = handled;
+		for (let index = 0; index < length; index += 1) handled[index]();
+	}
+	state.paused = false;
+	const length = Math.min(state.options.concurrency, state.items.length);
+	for (let index = 0; index < length; index += 1) run(state);
+}
 async function run(state) {
 	if (state.paused || state.runners >= state.options.concurrency) return;
 	state.runners += 1;
@@ -295,7 +283,7 @@ async function run(state) {
 		let error = false;
 		let result;
 		try {
-			if (!(item.signal?.aborted ?? false)) {
+			if (!(item.aborter?.signal?.aborted ?? false)) {
 				const parameters = item.key == null ? item.parameters : [item.key, ...item.parameters];
 				result = await state.callback(...parameters);
 			}
@@ -305,9 +293,7 @@ async function run(state) {
 		}
 		if (state.paused) {
 			const paused = item;
-			state.handled.push(() => {
-				handleQueuedResult(paused, error, result);
-			});
+			state.handled.push(() => handleQueuedResult(paused, error, result));
 			break;
 		}
 		handleQueuedResult(item, error, result);
@@ -315,23 +301,21 @@ async function run(state) {
 	}
 	state.runners -= 1;
 }
-const ERROR_NAME = "QueueError";
-const EVENT_NAME = "abort";
-const EVENT_OPTIONS = { once: true };
-const KEY_QUEUE = "$queue";
-const HANDLE_CLEAR = "clear";
-const HANDLE_PAUSE = "pause";
-const HANDLE_RESUME = "resume";
-const MESSAGE_CALLBACK = "A Queue requires a callback function";
-const MESSAGE_CLEAR = "Queue was cleared";
-const MESSAGE_KEY = "Key must be a non-empty string";
-const MESSAGE_MAXIMUM = "Queue has reached its maximum size";
-const MESSAGE_REMOVE = "Item removed from queue";
-const NAME_KEYED = "keyedQueue";
-const NAME_QUEUE = "queue";
-const STATUS_ACTIVE = "active";
-const STATUS_EMPTY = "empty";
-const STATUS_FULL = "full";
-const STATUS_PAUSED = "paused";
+const QUEUE_ERROR_NAME = "QueueError";
+const QUEUE_PROPERTY = "$queue";
+const QUEUE_HANDLE_CLEAR = "clear";
+const QUEUE_HANDLE_PAUSE = "pause";
+const QUEUE_HANDLE_RESUME = "resume";
+const QUEUE_MESSAGE_CALLBACK = "A Queue requires a callback function";
+const QUEUE_MESSAGE_CLEAR = "Queue was cleared";
+const QUEUE_MESSAGE_KEY = "Key must be a non-empty string";
+const QUEUE_MESSAGE_MAXIMUM = "Queue has reached its maximum size";
+const QUEUE_MESSAGE_REMOVE = "Item removed from queue";
+const QUEUE_NAME_KEYED = "keyedQueue";
+const QUEUE_NAME_QUEUE = "queue";
+const QUEUE_STATUS_ACTIVE = "active";
+const QUEUE_STATUS_EMPTY = "empty";
+const QUEUE_STATUS_FULL = "full";
+const QUEUE_STATUS_PAUSED = "paused";
 //#endregion
 export { QueueError, isKeyedQueue, isQueue, isQueueInstance, keyedQueue, queue };

package/dist/random.mjs

@@ -1,6 +1,6 @@
 import { getRandomFloatingNumber, getRandomInteger } from "./internal/random.mjs";
 import { shuffle } from "./internal/array/shuffle.mjs";
-import { join } from "./internal/string.mjs";
+import { join } from "./internal/string/misc.mjs";
 //#region src/random.ts
 /**
 * Get a random boolean
@@ -8,7 +8,7 @@ import { join } from "./internal/string.mjs";
 * @returns Random boolean
 */
 function getRandomBoolean() {
-	return Math.random() > BOOLEAN_MODIFIER;
+	return Math.random() > RANDOM_BOOLEAN_MODIFIER;
 }
 /**
 * Get a random string of characters with a specified length
@@ -19,7 +19,7 @@ function getRandomBoolean() {
 */
 function getRandomCharacters(length, selection) {
 	if (typeof length !== "number" || length <= 0) return "";
-	const actual = typeof selection === "string" && selection.length > 0 ? selection : ALPHABET;
+	const actual = typeof selection === "string" && selection.length > 0 ? selection : RANDOM_ALPHABET;
 	let characters = "";
 	for (let index = 0; index < length; index += 1) characters += actual.charAt(getRandomInteger(0, actual.length - 1));
 	return characters;
@@ -39,7 +39,7 @@ function getRandomColor(prefix) {
 * @returns Random hexadecimal character from `0-9` and `A-F`
 */
 function getRandomHex() {
-	return HEX_CHARACTERS[getRandomInteger(0, HEX_MAXIMUM)];
+	return RANDOM_HEX_CHARACTERS[getRandomInteger(0, RANDOM_HEX_MAXIMUM)];
 }
 /**
 * Get a random item from an array
@@ -57,9 +57,9 @@ function getRandomItems(array, amount) {
 	if (amount === 1) return [array[getRandomInteger(0, array.length - 1)]];
 	return typeof amount !== "number" || amount <= 0 || amount >= array.length ? shuffle(array) : shuffle(array).slice(0, amount);
 }
-const ALPHABET = "abcdefghijklmnopqrstuvwxyz";
-const BOOLEAN_MODIFIER = .5;
-const HEX_CHARACTERS = "0123456789ABCDEF";
-const HEX_MAXIMUM = 15;
+const RANDOM_ALPHABET = "abcdefghijklmnopqrstuvwxyz";
+const RANDOM_BOOLEAN_MODIFIER = .5;
+const RANDOM_HEX_CHARACTERS = "0123456789ABCDEF";
+const RANDOM_HEX_MAXIMUM = 15;
 //#endregion
 export { getRandomBoolean, getRandomCharacters, getRandomColor, getRandomFloatingNumber as getRandomFloat, getRandomHex, getRandomInteger, getRandomItem, getRandomItems };

package/dist/result/index.d.mts

@@ -1,4 +1,4 @@
-import { ExtendedResult, Result } from "./models.mjs";
+import { ExtendedResult, Result } from "../internal/result/models.mjs";
 //#region src/result/index.d.ts
 /**
  * Executes a _Promise_, catching any errors, and returns a result
@@ -53,8 +53,5 @@ declare function attempt<Value, E>(callback: () => Value, error: E): ExtendedRes
  * @returns Callback result
  */
 declare function attempt<Value>(callback: () => Value): Result<Value, Error>;
-declare namespace attempt {
-  var async: typeof asyncAttempt;
-}
 //#endregion
 export { asyncAttempt, attempt };

package/dist/result/index.mjs

@@ -1,4 +1,4 @@
-import { getError, ok } from "./misc.mjs";
+import { getError, ok } from "../internal/result/misc.mjs";
 //#region src/result/index.ts
 async function asyncAttempt(value, err) {
 	try {
@@ -17,6 +17,6 @@ function attempt(callback, err) {
 		return getError(err ?? thrown, err == null ? void 0 : thrown);
 	}
 }
-attempt.async = asyncAttempt;
+Object.defineProperty(attempt, "async", { value: asyncAttempt });
 //#endregion
 export { asyncAttempt, attempt };

package/dist/result/match.d.mts

@@ -1,4 +1,4 @@
-import { AnyResult, ResultMatch } from "./models.mjs";
+import { AnyResult, ResultMatch } from "../internal/result/models.mjs";
 //#region src/result/match.d.ts
 /**
  * Handles a _Result_ with match callbacks
@@ -38,8 +38,5 @@ declare function matchResult<Value, Returned, E = Error>(result: AnyResult<Value
  * @returns Matched value
  */
 declare function matchResult<Value, Returned, E = Error>(result: AnyResult<Value, E> | (() => AnyResult<Value, E>), ok: ResultMatch<Value, Returned, E>['ok'], error: ResultMatch<Value, Returned, E>['error']): Returned;
-declare namespace matchResult {
-  var async: typeof asyncMatchResult;
-}
 //#endregion
 export { asyncMatchResult, matchResult };

package/dist/result/match.mjs

@@ -1,11 +1,11 @@
-import { isOk, isResult } from "../internal/result.mjs";
+import { isOk, isResult } from "../internal/result/misc.mjs";
 //#region src/result/match.ts
 async function asyncMatchResult(result, first, error) {
 	let value;
 	if (typeof result === "function") value = await result();
 	else if (result instanceof Promise) value = await result;
 	else value = result;
-	if (!isResult(value)) throw new Error(MESSAGE_RESULT);
+	if (!isResult(value)) throw new Error(MATCH_MESSAGE);
 	const hasObj = typeof first === "object" && first !== null;
 	const okHandler = hasObj ? first.ok : first;
 	const errorHandler = hasObj ? first.error : error;
@@ -14,14 +14,14 @@ async function asyncMatchResult(result, first, error) {
 }
 function matchResult(result, first, error) {
 	const value = typeof result === "function" ? result() : result;
-	if (!isResult(value)) throw new Error(MESSAGE_RESULT);
+	if (!isResult(value)) throw new Error(MATCH_MESSAGE);
 	const hasObj = typeof first === "object" && first !== null;
 	const okHandler = hasObj ? first.ok : first;
 	const errorHandler = hasObj ? first.error : error;
 	if (isOk(value)) return okHandler(value.value);
 	return errorHandler(value.error, value.original);
 }
-matchResult.async = asyncMatchResult;
-const MESSAGE_RESULT = "`result.match` expected a Result or a function that returns a Result";
+const MATCH_MESSAGE = "`result.match` expected a Result or a function that returns a Result";
+Object.defineProperty(matchResult, "async", { value: asyncMatchResult });
 //#endregion
 export { asyncMatchResult, matchResult };

package/dist/result/misc.d.mts

@@ -1,29 +1,6 @@
-import { AnyResult, Err, ExtendedErr, Ok, Result } from "./models.mjs";
-import { isError, isOk, isResult } from "../internal/result.mjs";
+import { AnyResult } from "../internal/result/models.mjs";
+import { error, isError, isOk, isResult, ok, unwrap } from "../internal/result/misc.mjs";
 //#region src/result/misc.d.ts
-/**
- * Creates an extended error result
- *
- * @param value Error value
- * @param original Original error
- * @returns Error result
- */
-declare function error<E>(value: E, original: Error): ExtendedErr<E>;
-/**
- * Creates an error result
- *
- * @param value Error value
- * @returns Error result
- */
-declare function error<E>(value: E): Err<E>;
-declare function getError<E>(value: E, original?: Error): Err<E> | ExtendedErr<E>;
-/**
- * Creates an ok result
- *
- * @param value Value
- * @returns Ok result
- */
-declare function ok<Value>(value: Value): Ok<Value>;
 /**
  * Converts a result to a _Promise_
  *
@@ -42,21 +19,5 @@ declare function toPromise<Value, E = Error>(callback: () => AnyResult<Value, E>
  * @returns Promised result
  */
 declare function toPromise<Value, E = Error>(result: AnyResult<Value, E>): Promise<Value>;
-/**
- * Gets the value of an ok result _(or a default value)_
- *
- * @param value _Result_ to unwrap
- * @param defaultValue Default value
- * @returns Value of the _Result_ _(or the default value)_
- */
-declare function unwrap<Value, E = Error>(value: Result<Value, E>, defaultValue: Value): Value;
-/**
- * Gets the value of an ok result _(or a default value)_
- *
- * @param value _Result_ to unwrap
- * @param defaultValue Default value
- * @returns Value of the _Result_ _(or the default value)_
- */
-declare function unwrap(value: unknown, defaultValue: unknown): unknown;
 //#endregion
-export { error, getError, isError, isOk, isResult, ok, toPromise, unwrap };
+export { error, isError, isOk, isResult, ok, toPromise, unwrap };

package/dist/result/misc.mjs

@@ -1,28 +1,5 @@
-import { isError, isOk, isResult } from "../internal/result.mjs";
+import { error, isError, isOk, isResult, ok, unwrap } from "../internal/result/misc.mjs";
 //#region src/result/misc.ts
-function error(value, original) {
-	return getError(value, original);
-}
-function getError(value, original) {
-	const errorResult = {
-		error: value,
-		ok: false
-	};
-	if (original instanceof Error) errorResult.original = original;
-	return errorResult;
-}
-/**
-* Creates an ok result
-*
-* @param value Value
-* @returns Ok result
-*/
-function ok(value) {
-	return {
-		ok: true,
-		value
-	};
-}
 /**
 * Converts a _Result_ to a _Promise_
 *
@@ -33,12 +10,9 @@ function ok(value) {
 */
 async function toPromise(result) {
 	const actual = typeof result === "function" ? result() : result;
-	if (!isResult(actual)) return Promise.reject(new Error(MESSAGE_PROMISE_RESULT));
+	if (!isResult(actual)) return Promise.reject(new Error(RESULT_MESSAGE_PROMISE));
 	return isOk(actual) ? Promise.resolve(actual.value) : Promise.reject(actual.error);
 }
-function unwrap(value, defaultValue) {
-	return isOk(value) ? value.value : defaultValue;
-}
-const MESSAGE_PROMISE_RESULT = "toPromise expected to receive a Result";
+const RESULT_MESSAGE_PROMISE = "toPromise expected to receive a Result";
 //#endregion
-export { error, getError, isError, isOk, isResult, ok, toPromise, unwrap };
+export { error, isError, isOk, isResult, ok, toPromise, unwrap };

package/dist/result/work/flow.d.mts

@@ -1,5 +1,5 @@
 import { GenericCallback } from "../../models.mjs";
-import { Result, UnwrapValue } from "../models.mjs";
+import { Result, UnwrapValue } from "../../internal/result/models.mjs";
 //#region src/result/work/flow.d.ts
 /**
  * A synchronous _Flow_, a function that attempts to pipe values through a series of functions
@@ -177,8 +177,5 @@ declare function attemptFlow<First extends GenericCallback>(first: First, ...fns
  * @returns _Flow_ function
  */
 declare function attemptFlow(...fns: GenericCallback[]): (...args: unknown[]) => Result<unknown>;
-declare namespace attemptFlow {
-  var async: typeof attemptAsyncFlow;
-}
 //#endregion
 export { AttemptFlow, AttemptFlowPromise, attemptAsyncFlow, attemptFlow };