@zwa73/utils 1.0.89 → 1.0.90

package/dist/UtilFunctions.d.ts

@@ -103,7 +103,7 @@ export declare class UtilFunc {
      * @param task - 任务逻辑
      * @returns 处理结果
      */
-    static queueProc<T>(flag: Keyable, task: (() => Promise<T>) | Promise<T>): Promise<T>;
+    static queueProc<T>(flag: Keyable, task: (() => Promise<T>)): Promise<T>;
     /**队列获取目标的代办事件数
      * @param flag - 队列标签
      */

package/dist/UtilFunctions.js

@@ -301,7 +301,7 @@ class UtilFunc {
         this.pendingMap[flag] = this.pendingMap[flag] ?? [];
         const pending = this.pendingMap[flag];
         //尝试解除下个任务的等待
-        const tryRes = function () {
+        const tryRes = () => {
             const thispd = pending;
             const resolve = thispd.shift();
             if (resolve)
@@ -313,10 +313,8 @@ class UtilFunc {
         else
             await new Promise((resolve) => pending.push(resolve));
         try {
-            const result = typeof task === 'function'
-                ? await task()
-                : await task;
-            return result;
+            return await task();
+            ;
         }
         catch (e) {
             UtilLogger_1.SLogger.fatal(`queuePromise 出现错误`, e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zwa73/utils",
-  "version": "1.0.89",
+  "version": "1.0.90",
   "description": "my utils",
   "main": "index.js",
   "scripts": {

package/src/UtilFunctions.ts

@@ -356,12 +356,12 @@ static pendingMap:Record<Keyable,AnyFunc[]> = {};
  * @param task - 任务逻辑
  * @returns 处理结果
  */
-static async queueProc<T>(flag:Keyable,task:(()=>Promise<T>)|Promise<T>):Promise<T> {
+static async queueProc<T>(flag:Keyable,task:(()=>Promise<T>)):Promise<T> {
     this.pendingMap[flag] = this.pendingMap[flag]??[];
     const pending = this.pendingMap[flag];
 
     //尝试解除下个任务的等待
-    const tryRes = function(){
+    const tryRes = () => {
         const thispd = pending;
         const resolve = thispd.shift();
         if(resolve) resolve();
@@ -373,10 +373,7 @@ static async queueProc<T>(flag:Keyable,task:(()=>Promise<T>)|Promise<T>):Promise
     else await new Promise((resolve) => pending.push(resolve));
 
     try {
-        const result = typeof task === 'function'
-            ? await task()
-            : await task;
-        return result;
+        return await task();;
     } catch(e){
         SLogger.fatal(`queuePromise 出现错误`,e);
         throw e;