💪 iter_map_not_null/iter_first_not_null现在可以不提供callbackfn

Author: Gaubee

util/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@gaubee/util",
-  "version": "0.26.3",
+  "version": "0.26.4",
   "exports": {
     "./abort": "./src/abort.ts",
     "./bigint": "./src/bigint.ts",

util/src/iterable.ts

@@ -107,24 +107,32 @@ export const iter_map_reduce = <
  *
  * 支持任何可迭代的对象
  */
-export const iter_map_not_null = <TS extends Iterable<T>, T = IterableItem<TS>, R = unknown>(
+export const iter_map_not_null = <TS extends Iterable<T>, T = IterableItem<TS>, R = T>(
     values: TS,
-    callbackfn: (
+    callbackfn?: (
         value: T,
         index: number,
         values: TS,
     ) => R,
 ): Array<NonNullable<R>> => {
     const result: NonNullable<R>[] = [];
     let index = 0;
-    for (const value of values) {
-        const r = callbackfn(
-            value,
-            index++,
-            values,
-        );
-        if (r != null) {
-            result.push(r);
+    if (callbackfn) {
+        for (const value of values) {
+            const r = callbackfn(
+                value,
+                index++,
+                values,
+            );
+            if (r != null) {
+                result.push(r);
+            }
+        }
+    } else {
+        for (const value of values) {
+            if (value != null) {
+                result.push(value as unknown as NonNullable<R>);
+            }
         }
     }
     return result;
@@ -137,21 +145,29 @@ export const iter_map_not_null = <TS extends Iterable<T>, T = IterableItem<TS>,
  */
 export const iter_first_not_null = <TS extends Iterable<T>, T = IterableItem<TS>, R = unknown>(
     values: TS,
-    callbackfn: (
+    callbackfn?: (
         value: T,
         index: number,
         values: TS,
     ) => R,
-): R | undefined => {
+): NonNullable<R> | undefined => {
     let index = 0;
-    for (const value of values) {
-        const r = callbackfn(
-            value,
-            index++,
-            values,
-        );
-        if (r != null) {
-            return r;
+    if (callbackfn) {
+        for (const value of values) {
+            const r = callbackfn(
+                value,
+                index++,
+                values,
+            );
+            if (r != null) {
+                return r;
+            }
+        }
+    } else {
+        for (const value of values) {
+            if (value != null) {
+                return (value as unknown as NonNullable<R>);
+            }
         }
     }
 };