assistsx-js 0.0.2051 → 0.0.2053

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/AssistsX.js +7 -7
  2. package/dist/AssistsXAsync.js +7 -7
  3. package/dist/Step.js +3 -3
  4. package/package.json +1 -1
  5. package/src/AssistsX.ts +7 -7
  6. package/src/AssistsXAsync.ts +7 -7
  7. package/src/Step.ts +3 -3
package/dist/AssistsX.js CHANGED
@@ -146,7 +146,7 @@ export class AssistsX {
146
146
  const response = this.call(CallMethod.getAllNodes, {
147
147
  args: { filterClass, filterViewId, filterDes, filterText },
148
148
  });
149
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
149
+ return Node.fromJSONArray(response.getDataOrDefault([]));
150
150
  }
151
151
  /**
152
152
  * 设置节点文本
@@ -301,7 +301,7 @@ export class AssistsX {
301
301
  args: { id, filterClass, filterText, filterDes },
302
302
  node,
303
303
  });
304
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
304
+ return Node.fromJSONArray(response.getDataOrDefault([]));
305
305
  }
306
306
  /**
307
307
  * 通过文本查找节点
@@ -317,7 +317,7 @@ export class AssistsX {
317
317
  args: { text, filterClass, filterViewId, filterDes },
318
318
  node,
319
319
  });
320
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
320
+ return Node.fromJSONArray(response.getDataOrDefault([]));
321
321
  }
322
322
  /**
323
323
  * 通过标签查找节点
@@ -333,7 +333,7 @@ export class AssistsX {
333
333
  args: { className, filterText, filterViewId, filterDes },
334
334
  node,
335
335
  });
336
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
336
+ return Node.fromJSONArray(response.getDataOrDefault([]));
337
337
  }
338
338
  /**
339
339
  * 查找所有匹配文本的节点
@@ -344,7 +344,7 @@ export class AssistsX {
344
344
  const response = this.call(CallMethod.findByTextAllMatch, {
345
345
  args: { text },
346
346
  });
347
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
347
+ return Node.fromJSONArray(response.getDataOrDefault([]));
348
348
  }
349
349
  /**
350
350
  * 检查是否包含指定文本
@@ -361,7 +361,7 @@ export class AssistsX {
361
361
  */
362
362
  static getAllText() {
363
363
  const response = this.call(CallMethod.getAllText);
364
- return response.getDataOrDefault("[]");
364
+ return response.getDataOrDefault([]);
365
365
  }
366
366
  /**
367
367
  * 查找第一个匹配标签的父节点
@@ -382,7 +382,7 @@ export class AssistsX {
382
382
  */
383
383
  static getNodes(node) {
384
384
  const response = this.call(CallMethod.getNodes, { node });
385
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
385
+ return Node.fromJSONArray(response.getDataOrDefault([]));
386
386
  }
387
387
  /**
388
388
  * 获取节点的直接子节点
package/dist/AssistsXAsync.js CHANGED
@@ -86,7 +86,7 @@ export class AssistsXAsync {
86
86
  args: { filterClass, filterViewId, filterDes, filterText },
87
87
  timeout,
88
88
  });
89
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
89
+ return Node.fromJSONArray(response.getDataOrDefault([]));
90
90
  }
91
91
  /**
92
92
  * 设置节点文本
@@ -242,7 +242,7 @@ export class AssistsXAsync {
242
242
  node,
243
243
  timeout,
244
244
  });
245
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
245
+ return Node.fromJSONArray(response.getDataOrDefault([]));
246
246
  }
247
247
  /**
248
248
  * 通过文本查找节点
@@ -260,7 +260,7 @@ export class AssistsXAsync {
260
260
  node,
261
261
  timeout,
262
262
  });
263
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
263
+ return Node.fromJSONArray(response.getDataOrDefault([]));
264
264
  }
265
265
  /**
266
266
  * 通过标签查找节点
@@ -278,7 +278,7 @@ export class AssistsXAsync {
278
278
  node,
279
279
  timeout,
280
280
  });
281
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
281
+ return Node.fromJSONArray(response.getDataOrDefault([]));
282
282
  }
283
283
  /**
284
284
  * 查找所有匹配文本的节点
@@ -291,7 +291,7 @@ export class AssistsXAsync {
291
291
  args: { text },
292
292
  timeout,
293
293
  });
294
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
294
+ return Node.fromJSONArray(response.getDataOrDefault([]));
295
295
  }
296
296
  /**
297
297
  * 检查是否包含指定文本
@@ -313,7 +313,7 @@ export class AssistsXAsync {
313
313
  */
314
314
  static async getAllText(timeout) {
315
315
  const response = await this.asyncCall(CallMethod.getAllText, { timeout });
316
- return response.getDataOrDefault("[]");
316
+ return response.getDataOrDefault([]);
317
317
  }
318
318
  /**
319
319
  * 查找第一个匹配标签的父节点
@@ -340,7 +340,7 @@ export class AssistsXAsync {
340
340
  node,
341
341
  timeout,
342
342
  });
343
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
343
+ return Node.fromJSONArray(response.getDataOrDefault([]));
344
344
  }
345
345
  /**
346
346
  * 获取节点的直接子节点
package/dist/Step.js CHANGED
@@ -100,12 +100,12 @@ export class Step {
100
100
  else {
101
101
  nextStep = await ((_e = currentStep.impl) === null || _e === void 0 ? void 0 : _e.call(currentStep, currentStep));
102
102
  }
103
- if (currentStep.repeatCountMax > Step.repeatCountInfinite &&
104
- currentStep.repeatCount > currentStep.repeatCountMax) {
103
+ if (currentStep.repeatCountMax >= Step.repeatCountInfinite &&
104
+ currentStep.repeatCount >= currentStep.repeatCountMax) {
105
105
  if (Step.showLog) {
106
106
  console.log(`重复次数${currentStep.repeatCount}超过最大次数${currentStep.repeatCountMax}，停止执行`);
107
107
  }
108
- break;
108
+ throw new StepError("步骤重复次数达到最大次数", { stepId: currentStep.stepId, repeatCount: currentStep.repeatCount, repeatCountMax: currentStep.repeatCountMax });
109
109
  }
110
110
  Step.assert(currentStep.stepId);
111
111
  if (nextStep) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "assistsx-js",
3
- "version": "0.0.2051",
3
+ "version": "0.0.2053",
4
4
  "description": "assistsx-js自动化开发SDK",
5
5
  "main": "dist/index.js",
6
6
  "module": "dist/index.js",
package/src/AssistsX.ts CHANGED
@@ -241,7 +241,7 @@ export class AssistsX {
241
241
  const response = this.call(CallMethod.getAllNodes, {
242
242
  args: { filterClass, filterViewId, filterDes, filterText },
243
243
  });
244
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
244
+ return Node.fromJSONArray(response.getDataOrDefault([]));
245
245
  }
246
246
 
247
247
  /**
@@ -435,7 +435,7 @@ export class AssistsX {
435
435
  args: { id, filterClass, filterText, filterDes },
436
436
  node,
437
437
  });
438
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
438
+ return Node.fromJSONArray(response.getDataOrDefault([]));
439
439
  }
440
440
 
441
441
  /**
@@ -465,7 +465,7 @@ export class AssistsX {
465
465
  args: { text, filterClass, filterViewId, filterDes },
466
466
  node,
467
467
  });
468
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
468
+ return Node.fromJSONArray(response.getDataOrDefault([]));
469
469
  }
470
470
 
471
471
  /**
@@ -495,7 +495,7 @@ export class AssistsX {
495
495
  args: { className, filterText, filterViewId, filterDes },
496
496
  node,
497
497
  });
498
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
498
+ return Node.fromJSONArray(response.getDataOrDefault([]));
499
499
  }
500
500
 
501
501
  /**
@@ -507,7 +507,7 @@ export class AssistsX {
507
507
  const response = this.call(CallMethod.findByTextAllMatch, {
508
508
  args: { text },
509
509
  });
510
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
510
+ return Node.fromJSONArray(response.getDataOrDefault([]));
511
511
  }
512
512
 
513
513
  /**
@@ -526,7 +526,7 @@ export class AssistsX {
526
526
  */
527
527
  public static getAllText(): string[] {
528
528
  const response = this.call(CallMethod.getAllText);
529
- return response.getDataOrDefault("[]");
529
+ return response.getDataOrDefault([]);
530
530
  }
531
531
 
532
532
  /**
@@ -549,7 +549,7 @@ export class AssistsX {
549
549
  */
550
550
  public static getNodes(node: Node): Node[] {
551
551
  const response = this.call(CallMethod.getNodes, { node });
552
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
552
+ return Node.fromJSONArray(response.getDataOrDefault([]));
553
553
  }
554
554
 
555
555
  /**
package/src/AssistsXAsync.ts CHANGED
@@ -169,7 +169,7 @@ export class AssistsXAsync {
169
169
  args: { filterClass, filterViewId, filterDes, filterText },
170
170
  timeout,
171
171
  });
172
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
172
+ return Node.fromJSONArray(response.getDataOrDefault([]));
173
173
  }
174
174
 
175
175
  /**
@@ -397,7 +397,7 @@ export class AssistsXAsync {
397
397
  node,
398
398
  timeout,
399
399
  });
400
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
400
+ return Node.fromJSONArray(response.getDataOrDefault([]));
401
401
  }
402
402
 
403
403
  /**
@@ -431,7 +431,7 @@ export class AssistsXAsync {
431
431
  node,
432
432
  timeout,
433
433
  });
434
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
434
+ return Node.fromJSONArray(response.getDataOrDefault([]));
435
435
  }
436
436
 
437
437
  /**
@@ -465,7 +465,7 @@ export class AssistsXAsync {
465
465
  node,
466
466
  timeout,
467
467
  });
468
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
468
+ return Node.fromJSONArray(response.getDataOrDefault([]));
469
469
  }
470
470
 
471
471
  /**
@@ -482,7 +482,7 @@ export class AssistsXAsync {
482
482
  args: { text },
483
483
  timeout,
484
484
  });
485
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
485
+ return Node.fromJSONArray(response.getDataOrDefault([]));
486
486
  }
487
487
 
488
488
  /**
@@ -509,7 +509,7 @@ export class AssistsXAsync {
509
509
  */
510
510
  public static async getAllText(timeout?: number): Promise<string[]> {
511
511
  const response = await this.asyncCall(CallMethod.getAllText, { timeout });
512
- return response.getDataOrDefault("[]");
512
+ return response.getDataOrDefault([]);
513
513
  }
514
514
 
515
515
  /**
@@ -542,7 +542,7 @@ export class AssistsXAsync {
542
542
  node,
543
543
  timeout,
544
544
  });
545
- return Node.fromJSONArray(response.getDataOrDefault("[]"));
545
+ return Node.fromJSONArray(response.getDataOrDefault([]));
546
546
  }
547
547
 
548
548
  /**
package/src/Step.ts CHANGED
@@ -152,15 +152,15 @@ export class Step {
152
152
  nextStep = await currentStep.impl?.(currentStep);
153
153
  }
154
154
  if (
155
- currentStep.repeatCountMax > Step.repeatCountInfinite &&
156
- currentStep.repeatCount > currentStep.repeatCountMax
155
+ currentStep.repeatCountMax >= Step.repeatCountInfinite &&
156
+ currentStep.repeatCount >= currentStep.repeatCountMax
157
157
  ) {
158
158
  if (Step.showLog) {
159
159
  console.log(
160
160
  `重复次数${currentStep.repeatCount}超过最大次数${currentStep.repeatCountMax}，停止执行`
161
161
  );
162
162
  }
163
- break;
163
+ throw new StepError("步骤重复次数达到最大次数", { stepId: currentStep.stepId, repeatCount: currentStep.repeatCount, repeatCountMax: currentStep.repeatCountMax });
164
164
  }
165
165
 
166
166
  Step.assert(currentStep.stepId);