retuple 1.0.0-next.33 → 1.0.0-next.36

package/dist/index.cjs

@@ -490,6 +490,10 @@ function $anyPromised(results) {
 function $collect(results) {
     const oks = {};
     for (const [key, result] of Object.entries(results)) {
+        if (!result) {
+            oks[key] = Ok(result);
+            continue;
+        }
         const { ok, value } = result[retuple_symbols_1.ResultLikeSymbol]();
         if (ok) {
             oks[key] = value;
@@ -506,17 +510,22 @@ function $collect(results) {
  */
 function $collectPromised(results) {
     return new ResultAsync(new Promise((resolve, reject) => {
-        void Promise.all(Object.entries(results).map(([key, result]) => Promise.resolve(result).then((result) => {
-            const { ok, value } = result[retuple_symbols_1.ResultLikeSymbol]();
-            return ok ? [key, value] : Promise.reject(value);
-        }, (err) => {
-            reject(err);
-            // Because reject has been called, we can safely return an
-            // empty rejection to ensure we don't end up with undefined
-            // in the Ok path. The subsequent call to resolve will not
-            // change the state of the Promise.
-            return Promise.reject();
-        }))).then((values) => resolve(Ok(Object.fromEntries(values))), (err) => resolve(Err(err)));
+        void Promise.all(Object.entries(results).map(([key, result]) => {
+            if (!result) {
+                return [key, result];
+            }
+            return Promise.resolve(result).then((result) => {
+                const { ok, value } = result[retuple_symbols_1.ResultLikeSymbol]();
+                return ok ? [key, value] : Promise.reject(value);
+            }, (err) => {
+                reject(err);
+                // Because reject has been called, we can safely return an
+                // empty rejection to ensure we don't end up with undefined
+                // in the Ok path. The subsequent call to resolve will not
+                // change the state of the Promise.
+                return Promise.reject();
+            });
+        })).then((values) => resolve(Ok(Object.fromEntries(values))), (err) => resolve(Err(err)));
     }));
 }
 function $pipe(f0, ...fnx) {

package/dist/index.d.cts

@@ -132,8 +132,8 @@ export declare namespace Result {
     var $allPromised: <const TResults extends ResultLikeAwaitable<any, any>[]>(results: TResults) => ResultAsync<AllOk<TResults>, AllErr<TResults>>;
     var $any: <const TResults extends ResultLike<any, any>[]>(results: TResults) => Result<AnyOk<TResults>, AnyErr<TResults>>;
     var $anyPromised: <const TResults extends ResultLikeAwaitable<any, any>[]>(results: TResults) => ResultAsync<AnyOk<TResults>, AnyErr<TResults>>;
-    var $collect: <TResults extends Record<string, ResultLike<any, any>>>(results: TResults) => Result<CollectOk<TResults>, CollectErr<TResults>>;
-    var $collectPromised: <TResults extends Record<string, ResultLikeAwaitable<any, any>>>(results: TResults) => ResultAsync<CollectOk<TResults>, CollectErr<TResults>>;
+    var $collect: <TResults extends Record<string, ResultLike<any, any> | false | null | undefined>>(results: TResults) => Result<CollectOk<TResults>, CollectErr<TResults>>;
+    var $collectPromised: <TResults extends Record<string, ResultLikeAwaitable<any, any> | false | null | undefined>>(results: TResults) => ResultAsync<CollectOk<TResults>, CollectErr<TResults>>;
     var $pipe: {
         <T0, E0, T1, E1>(f0: () => ResultLike<T0, E0>, f1: (val0: T0) => ResultLike<T1, E1>): Result<T1, E0 | E1>;
         <T0, E0, T1, E1, T2, E2>(f0: () => ResultLike<T0, E0>, f1: (val0: T0) => ResultLike<T1, E1>, f2: (val1: T1) => ResultLike<T2, E2>): Result<T2, E0 | E1 | E2>;
@@ -1638,10 +1638,10 @@ type AnyOk<TResult extends ResultLikeAwaitable<any, any>[]> = TResult[number] ex
 type AnyErr<TResults extends ResultLikeAwaitable<any, any>[]> = {
     [K in keyof TResults]: TResults[K] extends ResultLikeAwaitable<any, infer E> ? E : never;
 };
-type CollectOk<TResults extends Record<string, ResultLikeAwaitable<any, any>>> = {
-    [K in keyof TResults]: TResults[K] extends ResultLikeAwaitable<infer T, any> ? T : never;
+type CollectOk<TResults extends Record<string, ResultLikeAwaitable<any, any> | false | null | undefined>> = {
+    [K in keyof TResults]: Exclude<TResults[K], false | null | undefined> extends ResultLikeAwaitable<infer T, any> ? T | Extract<TResults[K], false | null | undefined> : Extract<TResults[K], false | null | undefined>;
 } & {};
-type CollectErr<TResults extends Record<string, ResultLikeAwaitable<any, any>>> = TResults[keyof TResults] extends ResultLikeAwaitable<any, infer E> ? E : never;
+type CollectErr<TResults extends Record<string, ResultLikeAwaitable<any, any> | false | null | undefined>> = TResults[keyof TResults] extends ResultLikeAwaitable<any, infer E> ? E : never;
 type Truthy<T> = Exclude<T, false | null | undefined | 0 | 0n | "">;
 type Falsey<T> = Extract<T, false | null | undefined | 0 | 0n | "">;
 type NonZero<N extends number> = N & (`${N}` extends "0" ? never : N);

package/dist/index.d.ts

@@ -132,8 +132,8 @@ export declare namespace Result {
     var $allPromised: <const TResults extends ResultLikeAwaitable<any, any>[]>(results: TResults) => ResultAsync<AllOk<TResults>, AllErr<TResults>>;
     var $any: <const TResults extends ResultLike<any, any>[]>(results: TResults) => Result<AnyOk<TResults>, AnyErr<TResults>>;
     var $anyPromised: <const TResults extends ResultLikeAwaitable<any, any>[]>(results: TResults) => ResultAsync<AnyOk<TResults>, AnyErr<TResults>>;
-    var $collect: <TResults extends Record<string, ResultLike<any, any>>>(results: TResults) => Result<CollectOk<TResults>, CollectErr<TResults>>;
-    var $collectPromised: <TResults extends Record<string, ResultLikeAwaitable<any, any>>>(results: TResults) => ResultAsync<CollectOk<TResults>, CollectErr<TResults>>;
+    var $collect: <TResults extends Record<string, ResultLike<any, any> | false | null | undefined>>(results: TResults) => Result<CollectOk<TResults>, CollectErr<TResults>>;
+    var $collectPromised: <TResults extends Record<string, ResultLikeAwaitable<any, any> | false | null | undefined>>(results: TResults) => ResultAsync<CollectOk<TResults>, CollectErr<TResults>>;
     var $pipe: {
         <T0, E0, T1, E1>(f0: () => ResultLike<T0, E0>, f1: (val0: T0) => ResultLike<T1, E1>): Result<T1, E0 | E1>;
         <T0, E0, T1, E1, T2, E2>(f0: () => ResultLike<T0, E0>, f1: (val0: T0) => ResultLike<T1, E1>, f2: (val1: T1) => ResultLike<T2, E2>): Result<T2, E0 | E1 | E2>;
@@ -1638,10 +1638,10 @@ type AnyOk<TResult extends ResultLikeAwaitable<any, any>[]> = TResult[number] ex
 type AnyErr<TResults extends ResultLikeAwaitable<any, any>[]> = {
     [K in keyof TResults]: TResults[K] extends ResultLikeAwaitable<any, infer E> ? E : never;
 };
-type CollectOk<TResults extends Record<string, ResultLikeAwaitable<any, any>>> = {
-    [K in keyof TResults]: TResults[K] extends ResultLikeAwaitable<infer T, any> ? T : never;
+type CollectOk<TResults extends Record<string, ResultLikeAwaitable<any, any> | false | null | undefined>> = {
+    [K in keyof TResults]: Exclude<TResults[K], false | null | undefined> extends ResultLikeAwaitable<infer T, any> ? T | Extract<TResults[K], false | null | undefined> : Extract<TResults[K], false | null | undefined>;
 } & {};
-type CollectErr<TResults extends Record<string, ResultLikeAwaitable<any, any>>> = TResults[keyof TResults] extends ResultLikeAwaitable<any, infer E> ? E : never;
+type CollectErr<TResults extends Record<string, ResultLikeAwaitable<any, any> | false | null | undefined>> = TResults[keyof TResults] extends ResultLikeAwaitable<any, infer E> ? E : never;
 type Truthy<T> = Exclude<T, false | null | undefined | 0 | 0n | "">;
 type Falsey<T> = Extract<T, false | null | undefined | 0 | 0n | "">;
 type NonZero<N extends number> = N & (`${N}` extends "0" ? never : N);

package/dist/index.js

@@ -476,6 +476,10 @@ function $anyPromised(results) {
 function $collect(results) {
     const oks = {};
     for (const [key, result] of Object.entries(results)) {
+        if (!result) {
+            oks[key] = Ok(result);
+            continue;
+        }
         const { ok, value } = result[ResultLikeSymbol]();
         if (ok) {
             oks[key] = value;
@@ -492,17 +496,22 @@ function $collect(results) {
  */
 function $collectPromised(results) {
     return new ResultAsync(new Promise((resolve, reject) => {
-        void Promise.all(Object.entries(results).map(([key, result]) => Promise.resolve(result).then((result) => {
-            const { ok, value } = result[ResultLikeSymbol]();
-            return ok ? [key, value] : Promise.reject(value);
-        }, (err) => {
-            reject(err);
-            // Because reject has been called, we can safely return an
-            // empty rejection to ensure we don't end up with undefined
-            // in the Ok path. The subsequent call to resolve will not
-            // change the state of the Promise.
-            return Promise.reject();
-        }))).then((values) => resolve(Ok(Object.fromEntries(values))), (err) => resolve(Err(err)));
+        void Promise.all(Object.entries(results).map(([key, result]) => {
+            if (!result) {
+                return [key, result];
+            }
+            return Promise.resolve(result).then((result) => {
+                const { ok, value } = result[ResultLikeSymbol]();
+                return ok ? [key, value] : Promise.reject(value);
+            }, (err) => {
+                reject(err);
+                // Because reject has been called, we can safely return an
+                // empty rejection to ensure we don't end up with undefined
+                // in the Ok path. The subsequent call to resolve will not
+                // change the state of the Promise.
+                return Promise.reject();
+            });
+        })).then((values) => resolve(Ok(Object.fromEntries(values))), (err) => resolve(Err(err)));
     }));
 }
 function $pipe(f0, ...fnx) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "retuple",
-  "version": "1.0.0-next.33",
+  "version": "1.0.0-next.36",
   "scripts": {
     "test": "vitest",
     "lint": "eslint . --ext .ts -c eslint.config.mjs --fix",