assistsx-js 0.0.2011 → 0.0.2013

package/dist/Step.d.ts

@@ -55,8 +55,27 @@ export declare class Step {
     /**
      * 移除步骤拦截器
      * @param interceptor 要移除的拦截器函数
+     * @returns 是否成功删除
      */
-    static removeInterceptor(interceptor: StepInterceptor): void;
+    static removeInterceptor(interceptor: StepInterceptor): boolean;
+    /**
+     * 按索引移除步骤拦截器
+     * @param index 要移除的拦截器索引
+     * @returns 是否成功删除
+     */
+    static removeInterceptorByIndex(index: number): boolean;
+    /**
+     * 移除所有匹配的步骤拦截器
+     * @param interceptor 要移除的拦截器函数
+     * @returns 删除的拦截器数量
+     */
+    static removeAllInterceptors(interceptor: StepInterceptor): number;
+    /**
+     * 按条件移除步骤拦截器
+     * @param predicate 判断是否删除的条件函数
+     * @returns 删除的拦截器数量
+     */
+    static removeInterceptorByPredicate(predicate: (interceptor: StepInterceptor, index: number) => boolean): number;
     /**
      * 清空所有拦截器
      */

package/dist/Step.js

@@ -50,7 +50,7 @@ export class Step {
                 for (const interceptor of this._interceptors) {
                     try {
                         const result = await interceptor(currentStep);
-                        if (result !== undefined) {
+                        if (result) {
                             interceptedStep = result;
                             if (Step.showLog) {
                                 console.log(`步骤${implnName}被拦截器拦截，执行拦截后的步骤`);
@@ -165,12 +165,57 @@ export class Step {
     /**
      * 移除步骤拦截器
      * @param interceptor 要移除的拦截器函数
+     * @returns 是否成功删除
      */
     static removeInterceptor(interceptor) {
         const index = this._interceptors.indexOf(interceptor);
         if (index > -1) {
             this._interceptors.splice(index, 1);
+            return true;
         }
+        return false;
+    }
+    /**
+     * 按索引移除步骤拦截器
+     * @param index 要移除的拦截器索引
+     * @returns 是否成功删除
+     */
+    static removeInterceptorByIndex(index) {
+        if (index >= 0 && index < this._interceptors.length) {
+            this._interceptors.splice(index, 1);
+            return true;
+        }
+        return false;
+    }
+    /**
+     * 移除所有匹配的步骤拦截器
+     * @param interceptor 要移除的拦截器函数
+     * @returns 删除的拦截器数量
+     */
+    static removeAllInterceptors(interceptor) {
+        let removedCount = 0;
+        for (let i = this._interceptors.length - 1; i >= 0; i--) {
+            if (this._interceptors[i] === interceptor) {
+                this._interceptors.splice(i, 1);
+                removedCount++;
+            }
+        }
+        return removedCount;
+    }
+    /**
+     * 按条件移除步骤拦截器
+     * @param predicate 判断是否删除的条件函数
+     * @returns 删除的拦截器数量
+     */
+    static removeInterceptorByPredicate(predicate) {
+        let removedCount = 0;
+        for (let i = this._interceptors.length - 1; i >= 0; i--) {
+            if (predicate(this._interceptors[i], i)) {
+                this._interceptors.splice(i, 1);
+                removedCount++;
+            }
+        }
+        return removedCount;
     }
     /**
      * 清空所有拦截器

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assistsx-js",
-  "version": "0.0.2011",
+  "version": "0.0.2013",
   "description": "assistsx-js自动化开发SDK",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/Step.ts

@@ -91,7 +91,7 @@ export class Step {
         for (const interceptor of this._interceptors) {
           try {
             const result = await interceptor(currentStep);
-            if (result !== undefined) {
+            if (result) {
               interceptedStep = result;
               if (Step.showLog) {
                 console.log(`步骤${implnName}被拦截器拦截，执行拦截后的步骤`);
@@ -226,12 +226,62 @@ export class Step {
   /**
    * 移除步骤拦截器
    * @param interceptor 要移除的拦截器函数
+   * @returns 是否成功删除
    */
-  static removeInterceptor(interceptor: StepInterceptor): void {
+  static removeInterceptor(interceptor: StepInterceptor): boolean {
     const index = this._interceptors.indexOf(interceptor);
     if (index > -1) {
       this._interceptors.splice(index, 1);
+      return true;
     }
+    return false;
+  }
+
+  /**
+   * 按索引移除步骤拦截器
+   * @param index 要移除的拦截器索引
+   * @returns 是否成功删除
+   */
+  static removeInterceptorByIndex(index: number): boolean {
+    if (index >= 0 && index < this._interceptors.length) {
+      this._interceptors.splice(index, 1);
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * 移除所有匹配的步骤拦截器
+   * @param interceptor 要移除的拦截器函数
+   * @returns 删除的拦截器数量
+   */
+  static removeAllInterceptors(interceptor: StepInterceptor): number {
+    let removedCount = 0;
+    for (let i = this._interceptors.length - 1; i >= 0; i--) {
+      if (this._interceptors[i] === interceptor) {
+        this._interceptors.splice(i, 1);
+        removedCount++;
+      }
+    }
+    return removedCount;
+  }
+
+  /**
+   * 按条件移除步骤拦截器
+   * @param predicate 判断是否删除的条件函数
+   * @returns 删除的拦截器数量
+   */
+  static removeInterceptorByPredicate(
+    predicate: (interceptor: StepInterceptor, index: number) => boolean
+  ): number {
+    let removedCount = 0;
+    for (let i = this._interceptors.length - 1; i >= 0; i--) {
+      if (predicate(this._interceptors[i], i)) {
+        this._interceptors.splice(i, 1);
+        removedCount++;
+      }
+    }
+    return removedCount;
   }
 
   /**