assistsx-js 0.2.0 → 0.2.2

package/src/step.ts

@@ -9,6 +9,7 @@ import { useStepStore } from "./step-state-store";
 import { generateUUID } from "./utils";
 import { StepError, StepStopError } from "./step-error";
 import { StepAsync } from "./step-async";
+import type { NodeLookupScope } from "./node-lookup-scope";
 
 // 步骤结果类型，可以是Step实例或undefined
 export type StepResult = Step | undefined;
@@ -22,7 +23,7 @@ export type StepInterceptor = (step: Step) => StepResult | Promise<StepResult>;
 export class Step {
     static delayMsDefault: number = 1000;
     static readonly repeatCountInfinite: number = -1;
-    static repeatCountMaxDefault: number = Step.repeatCountInfinite;
+    static repeatCountMaxDefault: number = 15;
     static showLog: boolean = false;
     static exceptionRetryCountMaxDefault: number = 3;
 
@@ -161,7 +162,7 @@ export class Step {
                         nextStep = await currentStep.impl?.(currentStep);
                     }
                     if (
-                        currentStep.repeatCountMax >= Step.repeatCountInfinite &&
+                        currentStep.repeatCountMax > Step.repeatCountInfinite &&
                         currentStep.repeatCount >= currentStep.repeatCountMax
                     ) {
                         if (Step.showLog) {
@@ -378,7 +379,7 @@ export class Step {
     repeatCount: number = 0;
 
     /**
-     * 步骤重复执行最大次数,默认不限制
+     * 步骤重复执行最大次数,默认15次
      */
     repeatCountMax: number = Step.repeatCountMaxDefault;
 
@@ -631,11 +632,13 @@ export class Step {
         filterViewId,
         filterDes,
         filterText,
+        scope,
     }: {
         filterClass?: string;
         filterViewId?: string;
         filterDes?: string;
         filterText?: string;
+        scope?: NodeLookupScope;
     } = {}): Node[] {
         Step.assert(this.stepId);
         const nodes = AssistsX.getAllNodes({
@@ -643,6 +646,7 @@ export class Step {
             filterViewId,
             filterDes,
             filterText,
+            scope,
         });
         Step.assert(this.stepId);
         Step.assignIdsToNodes(nodes, this.stepId);
@@ -663,11 +667,11 @@ export class Step {
 
     /**
      * 获取当前应用包名
-     * @returns 包名
+     * @param options.scope 节点查找范围（可选）
      */
-    public getPackageName(): string {
+    public getPackageName(options: { scope?: NodeLookupScope } = {}): string {
         Step.assert(this.stepId);
-        const result = AssistsX.getPackageName();
+        const result = AssistsX.getPackageName(options);
         Step.assert(this.stepId);
         return result;
     }
@@ -686,10 +690,21 @@ export class Step {
             filterClass,
             filterText,
             filterDes,
-        }: { filterClass?: string; filterText?: string; filterDes?: string } = {}
+            scope,
+        }: {
+            filterClass?: string;
+            filterText?: string;
+            filterDes?: string;
+            scope?: NodeLookupScope;
+        } = {}
     ): Node[] {
         Step.assert(this.stepId);
-        const nodes = AssistsX.findById(id, { filterClass, filterText, filterDes });
+        const nodes = AssistsX.findById(id, {
+            filterClass,
+            filterText,
+            filterDes,
+            scope,
+        });
         Step.assert(this.stepId);
         Step.assignIdsToNodes(nodes, this.stepId);
         return nodes;
@@ -709,13 +724,20 @@ export class Step {
             filterClass,
             filterViewId,
             filterDes,
-        }: { filterClass?: string; filterViewId?: string; filterDes?: string } = {}
+            scope,
+        }: {
+            filterClass?: string;
+            filterViewId?: string;
+            filterDes?: string;
+            scope?: NodeLookupScope;
+        } = {}
     ): Node[] {
         Step.assert(this.stepId);
         const nodes = AssistsX.findByText(text, {
             filterClass,
             filterViewId,
             filterDes,
+            scope,
         });
         Step.assert(this.stepId);
         Step.assignIdsToNodes(nodes, this.stepId);
@@ -736,13 +758,20 @@ export class Step {
             filterText,
             filterViewId,
             filterDes,
-        }: { filterText?: string; filterViewId?: string; filterDes?: string } = {}
+            scope,
+        }: {
+            filterText?: string;
+            filterViewId?: string;
+            filterDes?: string;
+            scope?: NodeLookupScope;
+        } = {}
     ): Node[] {
         Step.assert(this.stepId);
         const nodes = AssistsX.findByTags(className, {
             filterText,
             filterViewId,
             filterDes,
+            scope,
         });
         Step.assert(this.stepId);
         Step.assignIdsToNodes(nodes, this.stepId);
@@ -752,11 +781,14 @@ export class Step {
     /**
      * 查找所有匹配文本的节点
      * @param text 要查找的文本
-     * @returns 节点数组
+     * @param options.scope 节点查找范围（可选）
      */
-    public findByTextAllMatch(text: string): Node[] {
+    public findByTextAllMatch(
+        text: string,
+        { scope }: { scope?: NodeLookupScope } = {}
+    ): Node[] {
         Step.assert(this.stepId);
-        const nodes = AssistsX.findByTextAllMatch(text);
+        const nodes = AssistsX.findByTextAllMatch(text, { scope });
         Step.assert(this.stepId);
         Step.assignIdsToNodes(nodes, this.stepId);
         return nodes;