@whitesev/utils 2.9.1 → 2.9.2

package/dist/types/src/Utils.d.ts

@@ -1567,9 +1567,16 @@ declare class Utils {
      * fn(4,5);
      * > 9
      */
-    createFunction(code: string): (...args: any[]) => any;
-    createFunction(param: string, code: string): (...args: any[]) => any;
-    createFunction<A extends string[], T extends boolean>(...params: [...A, code: string, isAsync: T]): T extends true ? (...params: any[]) => Promise<any> : (...args: any[]) => any;
+    createFunction<R = any>(code: string): () => R;
+    createFunction<R = any>(param: string, code: string): (param: any) => R;
+    createFunction<P extends string[]>(...params: [...P, code: string]): (...args: {
+        [K in keyof P]: any;
+    }) => any;
+    createFunction<P extends string[], T extends boolean>(...params: [...P, code: string, isAsync: T]): T extends true ? (...params: {
+        [K in keyof P]: any;
+    }) => Promise<any> : (...args: {
+        [K in keyof P]: any;
+    }) => any;
 }
 declare const utils: Utils;
 export { utils as Utils };

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@whitesev/utils",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "type": "module",
   "description": "一个常用的工具库",
   "main": "dist/index.cjs.js",

package/src/Utils.ts

@@ -3799,19 +3799,21 @@ class Utils {
    * fn(4,5);
    * > 9
    */
-  createFunction(code: string): (...args: any[]) => any;
-  createFunction(param: string, code: string): (...args: any[]) => any;
-  createFunction<A extends string[], T extends boolean>(
-    ...params: [...A, code: string, isAsync: T]
-  ): T extends true ? (...params: any[]) => Promise<any> : (...args: any[]) => any;
+  createFunction<R = any>(code: string): () => R;
+  createFunction<R = any>(param: string, code: string): (param: any) => R;
+  createFunction<P extends string[]>(...params: [...P, code: string]): (...args: { [K in keyof P]: any }) => any;
+  createFunction<P extends string[], T extends boolean>(
+    ...params: [...P, code: string, isAsync: T]
+  ): T extends true ? (...params: { [K in keyof P]: any }) => Promise<any> : (...args: { [K in keyof P]: any }) => any;
   createFunction<A extends string[], T extends boolean>(
     ...args: [...A, code: string, isAsync?: T]
   ): T extends true ? (...args: any[]) => Promise<any> : (...args: any[]) => any {
     let isAsync: string | boolean | undefined = args[args.length - 1];
-    if (typeof isAsync !== "boolean") {
+    if (typeof isAsync === "boolean") {
+      args.splice(args.length - 1, 1);
+    } else {
       isAsync = false;
     }
-    args.splice(args.length - 1, 1);
     if (isAsync) {
       const AsyncFunctionConstructor = Object.getPrototypeOf(async function () {}).constructor;
       return new AsyncFunctionConstructor(...args);