@leafer/task 1.9.12 → 1.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/task",
-  "version": "1.9.12",
+  "version": "1.10.0",
   "description": "@leafer/task",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,10 +22,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.9.12",
-    "@leafer/debug": "1.9.12"
+    "@leafer/math": "1.10.0",
+    "@leafer/debug": "1.10.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.9.12"
+    "@leafer/interface": "1.10.0"
   }
 }

package/src/TaskItem.ts

@@ -18,6 +18,8 @@ export class TaskItem implements ITaskItem {
     public isComplete: boolean
     public isCancel: boolean
 
+    public canUse?: IFunction
+
     private task: IFunction
 
     constructor(task?: IFunction) {
@@ -27,7 +29,9 @@ export class TaskItem implements ITaskItem {
 
     async run(): Promise<void> {
         try {
-            if (this.task && !this.isComplete && this.parent.running) await this.task()
+            if (this.isComplete) return
+            if (this.canUse && !this.canUse()) return this.cancel()
+            if (this.task && this.parent.running) await this.task()
         } catch (error) {
             debug.error(error)
         }
@@ -35,8 +39,7 @@ export class TaskItem implements ITaskItem {
 
     public complete(): void {
         this.isComplete = true
-        this.parent = null
-        this.task = null
+        this.parent = this.task = this.canUse = null
     }
 
     public cancel(): void {

package/src/TaskProcessor.ts

@@ -56,7 +56,7 @@ export class TaskProcessor implements ITaskProcessor {
 
     // list
 
-    public add(taskCallback: IFunction, options?: ITaskOptions | number): ITaskItem {
+    public add(taskCallback: IFunction, options?: ITaskOptions | number, canUse?: IFunction): ITaskItem {
         let start: boolean, parallel: boolean, time: number, delay: number
 
         const task = new TaskItem(taskCallback)
@@ -69,10 +69,12 @@ export class TaskProcessor implements ITaskProcessor {
             start = options.start
             time = options.time
             delay = options.delay
+            if (!canUse) canUse = options.canUse
         }
 
         if (time) task.time = time
         if (parallel === false) task.parallel = false
+        if (canUse) task.canUse = canUse
 
         if (isUndefined(delay)) {
             this.push(task, start)
@@ -163,18 +165,12 @@ export class TaskProcessor implements ITaskProcessor {
             return
         }
 
-        if (task.isCancel) {
-            this.index++
-            this.runTask()
-            return
-        }
-
         task.run().then(() => {
 
             this.onTask(task)
 
             this.index++
-            this.nextTask()
+            task.isCancel ? this.runTask() : this.nextTask()
 
         }).catch(error => {
             this.onError(error)

package/types/index.d.ts

@@ -15,7 +15,7 @@ declare class TaskProcessor implements ITaskProcessor {
     get remain(): number;
     get percent(): number;
     constructor(config?: ITaskProcessorConfig);
-    add(taskCallback: IFunction, options?: ITaskOptions | number): ITaskItem;
+    add(taskCallback: IFunction, options?: ITaskOptions | number, canUse?: IFunction): ITaskItem;
     protected push(task: ITaskItem, start?: boolean): void;
     protected empty(): void;
     start(): void;
@@ -44,6 +44,7 @@ declare class TaskItem implements ITaskItem {
     time: number;
     isComplete: boolean;
     isCancel: boolean;
+    canUse?: IFunction;
     private task;
     constructor(task?: IFunction);
     run(): Promise<void>;