@oscarpalmer/atoms 0.165.0 → 0.165.2

package/dist/index.mjs

@@ -3659,31 +3659,6 @@ function sum(array, key) {
 	return getAggregated("sum", array, key);
 }
 //#endregion
-//#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);
-	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);
-}
-function matchResult(result, first, error) {
-	const value = typeof result === "function" ? result() : result;
-	if (!isResult(value)) throw new Error(MESSAGE_RESULT);
-	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";
-//#endregion
 //#region src/result/misc.ts
 function error(value, original) {
 	return getError(value, original);
@@ -3724,48 +3699,6 @@ function unwrap(value, defaultValue) {
 }
 const MESSAGE_PROMISE_RESULT = "toPromise expected to receive a Result";
 //#endregion
-//#region src/result/work/flow.ts
-function attemptAsyncFlow(...fns) {
-	let Flow;
-	return (...args) => attempt.async(() => {
-		Flow ??= flow.async(...fns);
-		return Flow(...args.map((value) => {
-			if (isError(value)) throw value.error;
-			return isOk(value) ? value.value : value;
-		}));
-	});
-}
-function attemptFlow(...fns) {
-	let Flow;
-	return (...args) => attempt(() => {
-		Flow ??= flow(...fns);
-		return Flow(...args.map((value) => {
-			if (isError(value)) throw value.error;
-			return isOk(value) ? value.value : value;
-		}));
-	});
-}
-attemptFlow.async = attemptAsyncFlow;
-//#endregion
-//#region src/result/work/pipe.ts
-async function attemptAsyncPipe(initial, first, ...seconds) {
-	return attempt.async(() => {
-		if (isError(initial)) throw initial.error;
-		const value = typeof initial === "function" ? initial() : isOk(initial) ? initial.value : initial;
-		if (first == null) return value;
-		return pipe.async(value, ...[first, ...seconds]);
-	});
-}
-function attemptPipe(initial, first, ...seconds) {
-	return attempt(() => {
-		if (isError(initial)) throw initial.error;
-		const value = typeof initial === "function" ? initial() : isOk(initial) ? initial.value : initial;
-		if (first == null) return value;
-		return pipe(value, ...[first, ...seconds]);
-	});
-}
-attemptPipe.async = attemptAsyncPipe;
-//#endregion
 //#region src/promise/models.ts
 var CancelablePromise = class extends Promise {
 	#rejector;
@@ -3803,64 +3736,6 @@ const PROMISE_STRATEGY_DEFAULT = "complete";
 const PROMISE_TYPE_FULFILLED = "fulfilled";
 const PROMISE_TYPE_REJECTED = "rejected";
 //#endregion
-//#region src/promise/misc.ts
-/**
-* Create a cancelable promise
-* @param executor Executor function for the promise
-* @returns Cancelable promise
-*/
-function cancelable(executor) {
-	return new CancelablePromise(executor);
-}
-function handleResult$1(status, parameters) {
-	const { abort, complete, data, handlers, index, signal, value } = parameters;
-	if (signal?.aborted ?? false) return;
-	if (!complete && status === "rejected") {
-		settlePromise(abort, handlers.reject, value, signal);
-		return;
-	}
-	data.result[index] = !complete ? value : status === "fulfilled" ? {
-		status,
-		value
-	} : {
-		status,
-		reason: value
-	};
-	if (index === data.last) settlePromise(abort, handlers.resolve, data.result, signal);
-}
-function settlePromise(aborter, settler, value, signal) {
-	signal?.removeEventListener(PROMISE_ABORT_EVENT, aborter);
-	settler(value);
-}
-async function toResult(value) {
-	const actual = typeof value === "function" ? value() : value;
-	if (!(actual instanceof Promise)) return Promise.reject(new TypeError(PROMISE_MESSAGE_EXPECTATION_RESULT));
-	return actual.then((result) => ok(result)).catch((reason) => error(reason));
-}
-//#endregion
-//#region src/result/index.ts
-async function asyncAttempt(value, err) {
-	try {
-		let result = typeof value === "function" ? value() : await value;
-		if (result instanceof Promise) result = await result;
-		return ok(result);
-	} catch (thrown) {
-		return getError(err ?? thrown, err == null ? void 0 : thrown);
-	}
-}
-function attempt(callback, err) {
-	try {
-		return ok(callback());
-	} catch (thrown) {
-		return getError(err ?? thrown, err == null ? void 0 : thrown);
-	}
-}
-attempt.async = asyncAttempt;
-attempt.flow = attemptFlow;
-attempt.match = matchResult;
-attempt.pipe = attemptPipe;
-attempt.promise = attemptPromise;
-//#endregion
 //#region src/promise/helpers.ts
 function getNumberOrDefault$1(value) {
 	return typeof value === "number" && value > 0 ? value : 0;
@@ -3915,6 +3790,41 @@ function isType(value, type) {
 	return typeof value === "object" && value !== null && value.status === type;
 }
 //#endregion
+//#region src/promise/misc.ts
+/**
+* Create a cancelable promise
+* @param executor Executor function for the promise
+* @returns Cancelable promise
+*/
+function cancelable(executor) {
+	return new CancelablePromise(executor);
+}
+function handleResult$1(status, parameters) {
+	const { abort, complete, data, handlers, index, signal, value } = parameters;
+	if (signal?.aborted ?? false) return;
+	if (!complete && status === "rejected") {
+		settlePromise(abort, handlers.reject, value, signal);
+		return;
+	}
+	data.result[index] = !complete ? value : status === "fulfilled" ? {
+		status,
+		value
+	} : {
+		status,
+		reason: value
+	};
+	if (index === data.last) settlePromise(abort, handlers.resolve, data.result, signal);
+}
+function settlePromise(aborter, settler, value, signal) {
+	signal?.removeEventListener(PROMISE_ABORT_EVENT, aborter);
+	settler(value);
+}
+async function toResult(value) {
+	const actual = typeof value === "function" ? value() : value;
+	if (!(actual instanceof Promise)) return Promise.reject(new TypeError(PROMISE_MESSAGE_EXPECTATION_RESULT));
+	return actual.then((result) => ok(result)).catch((reason) => error(reason));
+}
+//#endregion
 //#region src/promise/timed.ts
 async function getTimedPromise(promise, time, signal) {
 	function abort() {
@@ -4372,6 +4282,96 @@ const BOOLEAN_MODIFIER = .5;
 const HEX_CHARACTERS = "0123456789ABCDEF";
 const HEX_MAXIMUM = 15;
 //#endregion
+//#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);
+	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);
+}
+function matchResult(result, first, error) {
+	const value = typeof result === "function" ? result() : result;
+	if (!isResult(value)) throw new Error(MESSAGE_RESULT);
+	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";
+//#endregion
+//#region src/result/work/flow.ts
+function attemptAsyncFlow(...fns) {
+	let Flow;
+	return (...args) => attempt.async(() => {
+		Flow ??= flow.async(...fns);
+		return Flow(...args.map((value) => {
+			if (isError(value)) throw value.error;
+			return isOk(value) ? value.value : value;
+		}));
+	});
+}
+function attemptFlow(...fns) {
+	let Flow;
+	return (...args) => attempt(() => {
+		Flow ??= flow(...fns);
+		return Flow(...args.map((value) => {
+			if (isError(value)) throw value.error;
+			return isOk(value) ? value.value : value;
+		}));
+	});
+}
+attemptFlow.async = attemptAsyncFlow;
+//#endregion
+//#region src/result/work/pipe.ts
+async function attemptAsyncPipe(initial, first, ...seconds) {
+	return attempt.async(() => {
+		if (isError(initial)) throw initial.error;
+		const value = typeof initial === "function" ? initial() : isOk(initial) ? initial.value : initial;
+		if (first == null) return value;
+		return pipe.async(value, ...[first, ...seconds]);
+	});
+}
+function attemptPipe(initial, first, ...seconds) {
+	return attempt(() => {
+		if (isError(initial)) throw initial.error;
+		const value = typeof initial === "function" ? initial() : isOk(initial) ? initial.value : initial;
+		if (first == null) return value;
+		return pipe(value, ...[first, ...seconds]);
+	});
+}
+attemptPipe.async = attemptAsyncPipe;
+//#endregion
+//#region src/result/index.ts
+async function asyncAttempt(value, err) {
+	try {
+		let result = typeof value === "function" ? value() : await value;
+		if (result instanceof Promise) result = await result;
+		return ok(result);
+	} catch (thrown) {
+		return getError(err ?? thrown, err == null ? void 0 : thrown);
+	}
+}
+function attempt(callback, err) {
+	try {
+		return ok(callback());
+	} catch (thrown) {
+		return getError(err ?? thrown, err == null ? void 0 : thrown);
+	}
+}
+attempt.async = asyncAttempt;
+attempt.flow = attemptFlow;
+attempt.match = matchResult;
+attempt.pipe = attemptPipe;
+attempt.promise = attemptPromise;
+//#endregion
 //#region src/sized/set.ts
 /**
 * - A Set with a maximum size

package/dist/promise/delay.mjs

@@ -1,7 +1,7 @@
 import { TIMER_WAIT, getTimer } from "../internal/function/timer.mjs";
 import { PROMISE_ABORT_EVENT, PROMISE_ABORT_OPTIONS } from "./models.mjs";
-import { settlePromise } from "./misc.mjs";
 import { getPromiseOptions } from "./helpers.mjs";
+import { settlePromise } from "./misc.mjs";
 //#region src/promise/delay.ts
 function delay(options) {
 	const { signal, time } = getPromiseOptions(options);

package/dist/promise/helpers.mjs

@@ -1,6 +1,5 @@
 import { error, ok } from "../result/misc.mjs";
 import { PROMISE_STRATEGY_ALL, PROMISE_STRATEGY_DEFAULT, PROMISE_TYPE_FULFILLED, PROMISE_TYPE_REJECTED } from "./models.mjs";
-import "../result/index.mjs";
 //#region src/promise/helpers.ts
 function getNumberOrDefault(value) {
 	return typeof value === "number" && value > 0 ? value : 0;

package/dist/promise/index.mjs

@@ -1,7 +1,7 @@
 import { toPromise } from "../result/misc.mjs";
 import { CancelablePromise, PROMISE_ABORT_EVENT, PROMISE_ABORT_OPTIONS, PROMISE_MESSAGE_EXPECTATION_ATTEMPT, PROMISE_STRATEGY_DEFAULT, PROMISE_TYPE_FULFILLED, PROMISE_TYPE_REJECTED, PromiseTimeoutError } from "./models.mjs";
-import { cancelable, handleResult, settlePromise, toResult } from "./misc.mjs";
 import { getPromiseOptions, getPromisesOptions, getResultsFromPromises, isFulfilled, isRejected } from "./helpers.mjs";
+import { cancelable, handleResult, settlePromise, toResult } from "./misc.mjs";
 import { getTimedPromise, timed } from "./timed.mjs";
 import { delay } from "./delay.mjs";
 //#region src/promise/index.ts

package/dist/promise/timed.mjs

@@ -1,7 +1,7 @@
 import { TIMER_WAIT, getTimer } from "../internal/function/timer.mjs";
 import { PROMISE_ABORT_EVENT, PROMISE_ABORT_OPTIONS, PROMISE_MESSAGE_EXPECTATION_TIMED, PromiseTimeoutError } from "./models.mjs";
-import { settlePromise } from "./misc.mjs";
 import { getPromiseOptions } from "./helpers.mjs";
+import { settlePromise } from "./misc.mjs";
 //#region src/promise/timed.ts
 async function getTimedPromise(promise, time, signal) {
 	function abort() {

package/dist/result/index.mjs

@@ -1,10 +1,10 @@
 import { isError, isOk, isResult } from "../internal/result.mjs";
-import { matchResult } from "./match.mjs";
 import { error, getError, ok, toPromise, unwrap } from "./misc.mjs";
-import { attemptFlow } from "./work/flow.mjs";
-import { attemptPipe } from "./work/pipe.mjs";
 import { toResult } from "../promise/misc.mjs";
 import { attemptPromise } from "../promise/index.mjs";
+import { matchResult } from "./match.mjs";
+import { attemptFlow } from "./work/flow.mjs";
+import { attemptPipe } from "./work/pipe.mjs";
 //#region src/result/index.ts
 async function asyncAttempt(value, err) {
 	try {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oscarpalmer/atoms",
-	"version": "0.165.0",
+	"version": "0.165.2",
 	"description": "Atomic utilities for making your JavaScript better.",
 	"keywords": [
 		"helper",
@@ -111,6 +111,10 @@
 			"types": "./dist/promise/delay.d.mts",
 			"default": "./dist/promise/delay.mjs"
 		},
+		"./promise/models": {
+			"types": "./dist/promise/models.d.mts",
+			"default": "./dist/promise/models.mjs"
+		},
 		"./query": {
 			"types": "./dist/query.d.mts",
 			"default": "./dist/query.mjs"

package/src/promise/helpers.ts

@@ -1,5 +1,5 @@
 import type {RequiredKeys} from '../models';
-import {error, ok} from '../result';
+import {error, ok} from '../result/misc';
 import type {Result} from '../result/models';
 import {
 	PROMISE_STRATEGY_ALL,