assistsx-js 0.0.2041 → 0.0.2043

package/dist/Step.d.ts

@@ -23,7 +23,8 @@ export declare class Step {
      * @param data 步骤数据
      * @param delayMs 步骤延迟时间(毫秒)
      */
-    static run(impl: StepImpl, { tag, data, delayMs, }?: {
+    static run(impl: StepImpl, { stepId, tag, data, delayMs, }?: {
+        stepId?: string | undefined;
         tag?: string | undefined;
         data?: any | undefined;
         delayMs?: number;
@@ -113,7 +114,7 @@ export declare class Step {
     /**
      * 步骤实现函数
      */
-    impl: StepImpl;
+    impl: StepImpl | undefined;
     /**
      * 构造函数
      * @param stepId 步骤ID
@@ -124,7 +125,7 @@ export declare class Step {
      */
     constructor({ stepId, impl, tag, data, delayMs, repeatCountMax, isEnd, }: {
         stepId: string;
-        impl: StepImpl;
+        impl: StepImpl | undefined;
         tag?: string | undefined;
         data?: any | undefined;
         delayMs?: number;
@@ -146,7 +147,7 @@ export declare class Step {
         delayMs?: number;
         repeatCountMax?: number;
     }): Step;
-    end(impl: StepImpl, { tag, data, delayMs, repeatCountMax, }?: {
+    end({ tag, data, delayMs, repeatCountMax, }?: {
         tag?: string | undefined;
         data?: any | undefined;
         delayMs?: number;

package/dist/Step.js

@@ -15,15 +15,15 @@ export class Step {
      * @param data 步骤数据
      * @param delayMs 步骤延迟时间(毫秒)
      */
-    static async run(impl, { tag, data, delayMs = Step.delayMsDefault, } = {}) {
-        var _a;
+    static async run(impl, { stepId, tag, data, delayMs = Step.delayMsDefault, } = {}) {
+        var _a, _b, _c, _d, _e, _f;
         const stepStore = useStepStore();
         let implnName = impl.name;
         let currentStep;
         let nextStep;
         try {
             //步骤开始
-            this._stepId = generateUUID();
+            this._stepId = stepId !== null && stepId !== void 0 ? stepId : generateUUID();
             stepStore.startStep(this._stepId, tag, data);
             currentStep = new Step({
                 stepId: this._stepId,
@@ -41,7 +41,7 @@ export class Step {
                     Step.assert(currentStep.stepId);
                 }
                 //执行步骤
-                implnName = currentStep.impl.name;
+                implnName = (_b = (_a = currentStep.impl) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : "undefined";
                 if (Step.showLog) {
                     console.log(`执行步骤${implnName}，重复次数${currentStep.repeatCount}`);
                 }
@@ -78,15 +78,15 @@ export class Step {
                         Step.assert(stepToExecute.stepId);
                     }
                     // 打印拦截步骤的执行信息
-                    const interceptedImplName = stepToExecute.impl.name;
+                    const interceptedImplName = (_c = stepToExecute.impl) === null || _c === void 0 ? void 0 : _c.name;
                     if (Step.showLog) {
                         console.log(`执行拦截步骤${interceptedImplName}，重复次数${stepToExecute.repeatCount}`);
                     }
                     // 执行拦截后的步骤
-                    nextStep = await stepToExecute.impl(stepToExecute);
+                    nextStep = await ((_d = stepToExecute.impl) === null || _d === void 0 ? void 0 : _d.call(stepToExecute, stepToExecute));
                 }
                 else {
-                    nextStep = await currentStep.impl(currentStep);
+                    nextStep = await ((_e = currentStep.impl) === null || _e === void 0 ? void 0 : _e.call(currentStep, currentStep));
                 }
                 if (currentStep.repeatCountMax > Step.repeatCountInfinite &&
                     currentStep.repeatCount > currentStep.repeatCountMax) {
@@ -117,7 +117,7 @@ export class Step {
                 impl: implnName,
                 tag: tag,
                 data: data,
-                error: (_a = e === null || e === void 0 ? void 0 : e.message) !== null && _a !== void 0 ? _a : String(e),
+                error: (_f = e === null || e === void 0 ? void 0 : e.message) !== null && _f !== void 0 ? _f : String(e),
             });
             stepStore.setError(errorMsg);
             throw new StepError(errorMsg, implnName, tag, data, e, currentStep || undefined);
@@ -293,11 +293,11 @@ export class Step {
             repeatCountMax,
         });
     }
-    end(impl, { tag, data, delayMs = Step.delayMsDefault, repeatCountMax = Step.repeatCountMaxDefault, } = {}) {
+    end({ tag, data, delayMs = Step.delayMsDefault, repeatCountMax = Step.repeatCountMaxDefault, } = {}) {
         Step.assert(this.stepId);
         return new Step({
             stepId: this.stepId,
-            impl,
+            impl: undefined,
             tag,
             data: data !== null && data !== void 0 ? data : this.data,
             delayMs,

package/package.json

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

package/src/Step.ts

@@ -45,10 +45,12 @@ export class Step {
     static async run(
         impl: StepImpl,
         {
+            stepId,
             tag,
             data,
             delayMs = Step.delayMsDefault,
         }: {
+            stepId?: string | undefined;
             tag?: string | undefined;
             data?: any | undefined;
             delayMs?: number;
@@ -60,7 +62,7 @@ export class Step {
         let nextStep: Step | undefined;
         try {
             //步骤开始
-            this._stepId = generateUUID();
+            this._stepId = stepId ?? generateUUID();
 
             stepStore.startStep(this._stepId, tag, data);
             currentStep = new Step({
@@ -79,7 +81,7 @@ export class Step {
                     Step.assert(currentStep.stepId);
                 }
                 //执行步骤
-                implnName = currentStep.impl.name;
+                implnName = currentStep.impl?.name ?? "undefined";
                 if (Step.showLog) {
                     console.log(
                         `执行步骤${implnName}，重复次数${currentStep.repeatCount}`
@@ -121,7 +123,7 @@ export class Step {
                     }
 
                     // 打印拦截步骤的执行信息
-                    const interceptedImplName = stepToExecute.impl.name;
+                    const interceptedImplName = stepToExecute.impl?.name;
                     if (Step.showLog) {
                         console.log(
                             `执行拦截步骤${interceptedImplName}，重复次数${stepToExecute.repeatCount}`
@@ -129,9 +131,9 @@ export class Step {
                     }
 
                     // 执行拦截后的步骤
-                    nextStep = await stepToExecute.impl(stepToExecute);
+                    nextStep = await stepToExecute.impl?.(stepToExecute);
                 } else {
-                    nextStep = await currentStep.impl(currentStep);
+                    nextStep = await currentStep.impl?.(currentStep);
                 }
                 if (
                     currentStep.repeatCountMax > Step.repeatCountInfinite &&
@@ -340,7 +342,7 @@ export class Step {
     /**
      * 步骤实现函数
      */
-    impl: StepImpl;
+    impl: StepImpl | undefined;
 
     /**
      * 构造函数
@@ -360,7 +362,7 @@ export class Step {
         isEnd = false,
     }: {
         stepId: string;
-        impl: StepImpl;
+        impl: StepImpl | undefined;
         tag?: string | undefined;
         data?: any | undefined;
         delayMs?: number;
@@ -412,7 +414,6 @@ export class Step {
         });
     }
     end(
-        impl: StepImpl,
         {
             tag,
             data,
@@ -428,7 +429,7 @@ export class Step {
         Step.assert(this.stepId);
         return new Step({
             stepId: this.stepId,
-            impl,
+            impl: undefined,
             tag,
             data: data ?? this.data,
             delayMs,