@seleniumhq/side-runtime 4.0.0-alpha.3 → 4.0.0-alpha.31
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.
- package/dist/callstack.d.ts +1 -1
- package/dist/callstack.d.ts.map +1 -1
- package/dist/playback-tree/command-leveler.d.ts +2 -2
- package/dist/playback-tree/command-leveler.d.ts.map +1 -1
- package/dist/playback-tree/command-leveler.js +1 -0
- package/dist/playback-tree/command-leveler.js.map +1 -1
- package/dist/playback-tree/command-node.d.ts +9 -6
- package/dist/playback-tree/command-node.d.ts.map +1 -1
- package/dist/playback-tree/command-node.js +70 -32
- package/dist/playback-tree/command-node.js.map +1 -1
- package/dist/playback-tree/commands.d.ts +3 -0
- package/dist/playback-tree/commands.d.ts.map +1 -1
- package/dist/playback-tree/commands.js +22 -14
- package/dist/playback-tree/commands.js.map +1 -1
- package/dist/playback-tree/index.d.ts +3 -3
- package/dist/playback-tree/index.d.ts.map +1 -1
- package/dist/playback-tree/index.js +7 -6
- package/dist/playback-tree/index.js.map +1 -1
- package/dist/playback-tree/syntax-validation.d.ts.map +1 -1
- package/dist/playback-tree/syntax-validation.js +1 -0
- package/dist/playback-tree/syntax-validation.js.map +1 -1
- package/dist/playback.d.ts +10 -8
- package/dist/playback.d.ts.map +1 -1
- package/dist/playback.js +26 -8
- package/dist/playback.js.map +1 -1
- package/dist/plugins.d.ts +4 -5
- package/dist/plugins.d.ts.map +1 -1
- package/dist/plugins.js +54 -8
- package/dist/plugins.js.map +1 -1
- package/dist/preprocessors.d.ts +1 -1
- package/dist/preprocessors.d.ts.map +1 -1
- package/dist/types.d.ts +25 -27
- package/dist/types.d.ts.map +1 -1
- package/dist/variables.d.ts.map +1 -1
- package/dist/variables.js +6 -0
- package/dist/variables.js.map +1 -1
- package/dist/webdriver.d.ts +31 -23
- package/dist/webdriver.d.ts.map +1 -1
- package/dist/webdriver.js +101 -148
- package/dist/webdriver.js.map +1 -1
- package/package.json +11 -11
package/dist/callstack.d.ts
CHANGED
package/dist/callstack.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callstack.d.ts","sourceRoot":"","sources":["../src/callstack.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAE1D,QAAA,MAAM,KAAK,eAAkB,CAAA;AAE7B,MAAM,WAAW,MAAM;IACrB,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IAC7B,IAAI,EAAE,YAAY,CAAA;IAClB,QAAQ,EAAE,YAAY,EAAE,CAAA;CACzB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"callstack.d.ts","sourceRoot":"","sources":["../src/callstack.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAE1D,QAAA,MAAM,KAAK,eAAkB,CAAA;AAE7B,MAAM,WAAW,MAAM;IACrB,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IAC7B,IAAI,EAAE,YAAY,CAAA;IAClB,QAAQ,EAAE,YAAY,EAAE,CAAA;CACzB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,SAAS,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,CAAC,OAAO,OAAO,SAAS;;IAI5B,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAA;IACpB,IAAI,MAAM,WAET;IAED,IAAI,CAAC,SAAS,EAAE,SAAS;IAIzB,MAAM,IAAI,SAAS;IAKnB,GAAG;CAGJ"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { CommandShape } from '@seleniumhq/side-model';
|
|
2
2
|
export declare function deriveCommandLevels(commandStack: CommandShape[]): number[];
|
|
3
|
-
export
|
|
3
|
+
export type LevelCommand = (command: CommandShape, level: number, levels: number[]) => {
|
|
4
4
|
level: number;
|
|
5
5
|
levels: number[];
|
|
6
|
-
}
|
|
6
|
+
};
|
|
7
7
|
//# sourceMappingURL=command-leveler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-leveler.d.ts","sourceRoot":"","sources":["../../src/playback-tree/command-leveler.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAErD,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,CAS1E;AAED,
|
|
1
|
+
{"version":3,"file":"command-leveler.d.ts","sourceRoot":"","sources":["../../src/playback-tree/command-leveler.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAErD,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,CAS1E;AAED,MAAM,MAAM,YAAY,GAAG,CACzB,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EAAE,KACb;IACH,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,EAAE,CAAA;CACjB,CAAA"}
|
|
@@ -68,6 +68,7 @@ const commandLevelers = {
|
|
|
68
68
|
[commands_1.ControlFlowCommandNames.if]: levelBranchOpen,
|
|
69
69
|
[commands_1.ControlFlowCommandNames.repeatIf]: levelBranchEnd,
|
|
70
70
|
[commands_1.ControlFlowCommandNames.times]: levelBranchOpen,
|
|
71
|
+
[commands_1.ControlFlowCommandNames.try]: levelBranchOpen,
|
|
71
72
|
[commands_1.ControlFlowCommandNames.while]: levelBranchOpen,
|
|
72
73
|
};
|
|
73
74
|
//# sourceMappingURL=command-leveler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-leveler.js","sourceRoot":"","sources":["../../src/playback-tree/command-leveler.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,+DAA+D;AAC/D,wDAAwD;AACxD,6DAA6D;AAC7D,oDAAoD;AACpD,6DAA6D;AAC7D,6DAA6D;AAC7D,EAAE;AACF,+CAA+C;AAC/C,EAAE;AACF,6DAA6D;AAC7D,8DAA8D;AAC9D,yDAAyD;AACzD,4DAA4D;AAC5D,0DAA0D;AAC1D,qBAAqB;;;AAErB,yCAAoD;AAGpD,SAAgB,mBAAmB,CAAC,YAA4B;IAC9D,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,IAAI,MAAM,GAAa,EAAE,CAAA;IACzB,YAAY,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"command-leveler.js","sourceRoot":"","sources":["../../src/playback-tree/command-leveler.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,15 +8,16 @@ export interface CommandExecutorOptions {
|
|
|
8
8
|
executorOverride?: Fn;
|
|
9
9
|
}
|
|
10
10
|
export interface CommandExecutionResult {
|
|
11
|
-
next?:
|
|
11
|
+
next?: CommandNode;
|
|
12
12
|
skipped?: boolean;
|
|
13
13
|
value?: any;
|
|
14
14
|
}
|
|
15
15
|
export declare class CommandNode {
|
|
16
|
-
constructor(command: CommandShape, {
|
|
16
|
+
constructor(command: CommandShape, { emitControlFlowChange }?: CommandNodeOptions);
|
|
17
17
|
command: CommandShape;
|
|
18
|
-
|
|
18
|
+
emitControlFlowChange: Fn;
|
|
19
19
|
next?: CommandNode;
|
|
20
|
+
transientError?: string;
|
|
20
21
|
left?: CommandNode;
|
|
21
22
|
right?: CommandNode;
|
|
22
23
|
index: number;
|
|
@@ -26,15 +27,17 @@ export declare class CommandNode {
|
|
|
26
27
|
isTerminal(): boolean;
|
|
27
28
|
shouldSkip(): boolean;
|
|
28
29
|
execute(commandExecutor: WebDriverExecutor, args?: CommandExecutorOptions): Promise<{
|
|
29
|
-
next: CommandNode |
|
|
30
|
+
next: CommandNode | undefined;
|
|
30
31
|
skipped: boolean | undefined;
|
|
31
32
|
}>;
|
|
32
33
|
_executeCommand(commandExecutor: WebDriverExecutor, { executorOverride }?: CommandExecutorOptions): Promise<any>;
|
|
33
|
-
|
|
34
|
+
pauseTimeout(timeout?: number): Promise<void>;
|
|
35
|
+
retryCommand(execute: () => Promise<unknown>, timeout: number): Promise<unknown>;
|
|
34
36
|
_executionResult(result?: CommandExecutionResult): {
|
|
35
|
-
next: CommandNode |
|
|
37
|
+
next: CommandNode | undefined;
|
|
36
38
|
skipped: boolean | undefined;
|
|
37
39
|
};
|
|
40
|
+
handleTransientError(e: unknown, timeout: number): void;
|
|
38
41
|
evaluateForEach(variables: Variables): boolean | string;
|
|
39
42
|
_evaluate(commandExecutor: WebDriverExecutor): {
|
|
40
43
|
next: CommandNode | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-node.d.ts","sourceRoot":"","sources":["../../src/playback-tree/command-node.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAA;AAEtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,SAAS,MAAM,cAAc,CAAA;AACpC,OAAO,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAA;AAG9D,MAAM,WAAW,sBAAsB;IACrC,gBAAgB,CAAC,EAAE,EAAE,CAAA;CACtB;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"command-node.d.ts","sourceRoot":"","sources":["../../src/playback-tree/command-node.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAA;AAEtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,SAAS,MAAM,cAAc,CAAA;AACpC,OAAO,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAA;AAG9D,MAAM,WAAW,sBAAsB;IACrC,gBAAgB,CAAC,EAAE,EAAE,CAAA;CACtB;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,WAAW,CAAA;IAClB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,KAAK,CAAC,EAAE,GAAG,CAAA;CACZ;AAED,qBAAa,WAAW;gBAEpB,OAAO,EAAE,YAAY,EACrB,EAAE,qBAAqB,EAAE,GAAE,kBAAuB;IAapD,OAAO,EAAE,YAAY,CAAA;IACrB,qBAAqB,EAAE,EAAE,CAAA;IACzB,IAAI,CAAC,EAAE,WAAW,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,IAAI,CAAC,EAAE,WAAW,CAAA;IAClB,KAAK,CAAC,EAAE,WAAW,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,EAAE,MAAM,CAAA;IAWpB,aAAa,IAAI,OAAO;IAIxB,UAAU,IAAI,OAAO;IAOrB,UAAU,IAAI,OAAO;IAIf,OAAO,CACX,eAAe,EAAE,iBAAiB,EAClC,IAAI,CAAC,EAAE,sBAAsB;;;;IAgBzB,eAAe,CACnB,eAAe,EAAE,iBAAiB,EAClC,EAAE,gBAAgB,EAAE,GAAE,sBAA2B;IAkC7C,YAAY,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7C,YAAY,CAChB,OAAO,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,EAC/B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,OAAO,CAAC;IAmBnB,gBAAgB,CAAC,MAAM,GAAE,sBAA2B;;;;IAQpD,oBAAoB,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM;IA0BhD,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM;IAyBvD,SAAS,CAAC,eAAe,EAAE,iBAAiB;;;;;IAgC5C,iBAAiB,CAAC,MAAM,EAAE,+BAA+B;;;IAYzD,sBAAsB;IAItB,aAAa;CAWd;AAED,eAAO,MAAM,WAAW;;;CAGd,CAAA"}
|
|
@@ -20,7 +20,7 @@ exports.CommandType = exports.CommandNode = void 0;
|
|
|
20
20
|
const preprocessors_1 = require("../preprocessors");
|
|
21
21
|
const commands_1 = require("./commands");
|
|
22
22
|
class CommandNode {
|
|
23
|
-
constructor(command, {
|
|
23
|
+
constructor(command, { emitControlFlowChange } = {}) {
|
|
24
24
|
this.command = command;
|
|
25
25
|
this.next = undefined;
|
|
26
26
|
this.left = undefined;
|
|
@@ -28,8 +28,8 @@ class CommandNode {
|
|
|
28
28
|
this.index = 0;
|
|
29
29
|
this.level = 0;
|
|
30
30
|
this.timesVisited = 0;
|
|
31
|
-
this.
|
|
32
|
-
?
|
|
31
|
+
this.emitControlFlowChange = emitControlFlowChange
|
|
32
|
+
? emitControlFlowChange
|
|
33
33
|
: () => { };
|
|
34
34
|
}
|
|
35
35
|
/* I'm not sure what this does yet, so I'm putting it on a shelf atm
|
|
@@ -50,49 +50,67 @@ class CommandNode {
|
|
|
50
50
|
shouldSkip() {
|
|
51
51
|
return Boolean(this.command.skip || this.command.command.startsWith('//'));
|
|
52
52
|
}
|
|
53
|
-
execute(commandExecutor, args) {
|
|
53
|
+
async execute(commandExecutor, args) {
|
|
54
54
|
if (this._isRetryLimit()) {
|
|
55
|
-
|
|
55
|
+
throw new Error('Max retry limit exceeded. To override it, specify a new limit in the value input field.');
|
|
56
56
|
}
|
|
57
57
|
if (this.shouldSkip()) {
|
|
58
|
-
return
|
|
58
|
+
return this._executionResult({ skipped: true });
|
|
59
59
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
});
|
|
65
|
-
});
|
|
66
|
-
});
|
|
60
|
+
await commandExecutor.beforeCommand(this.command);
|
|
61
|
+
const result = await this._executeCommand(commandExecutor, args);
|
|
62
|
+
await commandExecutor.afterCommand(this.command);
|
|
63
|
+
return this._executionResult(result);
|
|
67
64
|
}
|
|
68
65
|
async _executeCommand(commandExecutor, { executorOverride } = {}) {
|
|
69
66
|
if (executorOverride) {
|
|
70
|
-
return executorOverride(this.command.target, this.command.value);
|
|
67
|
+
return await executorOverride(this.command.target, this.command.value);
|
|
71
68
|
}
|
|
72
69
|
else if (this.isControlFlow()) {
|
|
73
|
-
return
|
|
70
|
+
return this._evaluate(commandExecutor);
|
|
74
71
|
}
|
|
75
72
|
else if (this.isTerminal()) {
|
|
76
|
-
return
|
|
73
|
+
return;
|
|
77
74
|
}
|
|
78
75
|
else {
|
|
79
|
-
|
|
80
|
-
|
|
76
|
+
const { command } = this;
|
|
77
|
+
const { target, value } = command;
|
|
78
|
+
const commandName = command.command;
|
|
79
|
+
const customCommand = commandExecutor.customCommands[commandName];
|
|
80
|
+
const existingCommandName = commandExecutor.name(commandName);
|
|
81
|
+
// @ts-expect-error webdriver is too kludged by here
|
|
82
|
+
if (!customCommand && !commandExecutor[existingCommandName]) {
|
|
83
|
+
throw new Error(`Missing expected command type ${commandName}`);
|
|
81
84
|
}
|
|
82
|
-
|
|
85
|
+
const executor = customCommand
|
|
86
|
+
? () => customCommand.execute(command, commandExecutor)
|
|
87
|
+
: // @ts-expect-error webdriver is too kludged by here
|
|
88
|
+
() => commandExecutor[existingCommandName](target, value, commandName);
|
|
89
|
+
const ignoreRetry = commandName === 'pause' || commandName.startsWith('wait');
|
|
90
|
+
if (ignoreRetry) {
|
|
91
|
+
return executor();
|
|
92
|
+
}
|
|
93
|
+
return this.retryCommand(executor, Date.now() + commandExecutor.implicitWait);
|
|
83
94
|
}
|
|
84
95
|
}
|
|
85
|
-
async
|
|
96
|
+
async pauseTimeout(timeout) {
|
|
97
|
+
return new Promise((resolve) => setTimeout(resolve, timeout));
|
|
98
|
+
}
|
|
99
|
+
async retryCommand(execute, timeout) {
|
|
100
|
+
const timeLimit = timeout - Date.now();
|
|
101
|
+
const expirationTimer = setTimeout(() => {
|
|
102
|
+
throw new Error(`Operation timed out running command ${this.command.command}:${this.command.target}:${this.command.value}`);
|
|
103
|
+
}, timeLimit);
|
|
86
104
|
try {
|
|
87
|
-
|
|
88
|
-
|
|
105
|
+
const result = await execute();
|
|
106
|
+
clearTimeout(expirationTimer);
|
|
107
|
+
return result;
|
|
89
108
|
}
|
|
90
109
|
catch (e) {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
return this._executeCoreCommand(commandExecutor, timeout);
|
|
110
|
+
clearTimeout(expirationTimer);
|
|
111
|
+
this.handleTransientError(e, timeout);
|
|
112
|
+
await this.pauseTimeout();
|
|
113
|
+
return this.retryCommand(execute, timeout);
|
|
96
114
|
}
|
|
97
115
|
}
|
|
98
116
|
_executionResult(result = {}) {
|
|
@@ -102,6 +120,26 @@ class CommandNode {
|
|
|
102
120
|
skipped: result.skipped,
|
|
103
121
|
};
|
|
104
122
|
}
|
|
123
|
+
handleTransientError(e, timeout) {
|
|
124
|
+
const { command, target, value } = this.command;
|
|
125
|
+
const thisCommand = `${command}-${target}-${value}`;
|
|
126
|
+
const thisErrorMessage = e instanceof Error ? e.message : '';
|
|
127
|
+
const thisTransientError = `${thisCommand}-${thisErrorMessage}`;
|
|
128
|
+
const lastTransientError = this.transientError;
|
|
129
|
+
const isNewErrorMessage = lastTransientError !== thisTransientError;
|
|
130
|
+
const notRetrying = Date.now() > timeout;
|
|
131
|
+
if (isNewErrorMessage) {
|
|
132
|
+
this.transientError = thisTransientError;
|
|
133
|
+
console.warn('Unexpected error occured during command:', thisCommand, notRetrying ? '' : 'retrying...');
|
|
134
|
+
if (thisErrorMessage) {
|
|
135
|
+
console.error(thisErrorMessage);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
if (notRetrying) {
|
|
139
|
+
console.error('Command failure:', thisCommand);
|
|
140
|
+
throw e;
|
|
141
|
+
}
|
|
142
|
+
}
|
|
105
143
|
evaluateForEach(variables) {
|
|
106
144
|
let collection = variables.get((0, preprocessors_1.interpolateScript)(this.command.target, variables).script);
|
|
107
145
|
if (!collection)
|
|
@@ -109,7 +147,7 @@ class CommandNode {
|
|
|
109
147
|
variables.set((0, preprocessors_1.interpolateScript)(this.command.value, variables).script, collection[this.timesVisited]);
|
|
110
148
|
const result = this.timesVisited < collection.length;
|
|
111
149
|
if (result)
|
|
112
|
-
this.
|
|
150
|
+
this.emitControlFlowChange({
|
|
113
151
|
commandId: this.command.id,
|
|
114
152
|
type: exports.CommandType.LOOP,
|
|
115
153
|
index: this.timesVisited,
|
|
@@ -124,18 +162,18 @@ class CommandNode {
|
|
|
124
162
|
return result;
|
|
125
163
|
}
|
|
126
164
|
_evaluate(commandExecutor) {
|
|
127
|
-
let expression = (0, preprocessors_1.interpolateScript)(this.command.target, commandExecutor.variables);
|
|
128
165
|
if (commands_1.ControlFlowCommandChecks.isTimes(this.command)) {
|
|
129
|
-
const number = Math.floor(+
|
|
166
|
+
const number = Math.floor(+(0, preprocessors_1.interpolateString)(`${this.command.target}`, commandExecutor.variables));
|
|
130
167
|
if (isNaN(number)) {
|
|
131
168
|
return Promise.reject(new Error('Invalid number provided as a target.'));
|
|
132
169
|
}
|
|
133
170
|
return this._evaluationResult({ value: this.timesVisited < number });
|
|
134
171
|
}
|
|
135
|
-
|
|
172
|
+
let expression = (0, preprocessors_1.interpolateScript)(this.command.target, commandExecutor.variables);
|
|
173
|
+
if (commands_1.ControlFlowCommandChecks.isForEach(this.command)) {
|
|
136
174
|
const result = this.evaluateForEach(commandExecutor.variables);
|
|
137
175
|
if (!result) {
|
|
138
|
-
this.
|
|
176
|
+
this.emitControlFlowChange({
|
|
139
177
|
commandId: this.command.id,
|
|
140
178
|
type: exports.CommandType.LOOP,
|
|
141
179
|
end: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-node.js","sourceRoot":"","sources":["../../src/playback-tree/command-node.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,+DAA+D;AAC/D,wDAAwD;AACxD,6DAA6D;AAC7D,oDAAoD;AACpD,6DAA6D;AAC7D,6DAA6D;AAC7D,EAAE;AACF,+CAA+C;AAC/C,EAAE;AACF,6DAA6D;AAC7D,8DAA8D;AAC9D,yDAAyD;AACzD,4DAA4D;AAC5D,0DAA0D;AAC1D,qBAAqB;;;AAKrB,
|
|
1
|
+
{"version":3,"file":"command-node.js","sourceRoot":"","sources":["../../src/playback-tree/command-node.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export declare const ControlFlowCommandNames: {
|
|
|
8
8
|
if: string;
|
|
9
9
|
repeatIf: string;
|
|
10
10
|
times: string;
|
|
11
|
+
try: string;
|
|
11
12
|
while: string;
|
|
12
13
|
};
|
|
13
14
|
declare function isBlockOpen(command: CommandShape): boolean;
|
|
@@ -22,6 +23,7 @@ declare function isIfBlock(command: CommandShape): boolean;
|
|
|
22
23
|
declare function isLoop(command: CommandShape): boolean;
|
|
23
24
|
declare function isTerminal(command: CommandShape): boolean;
|
|
24
25
|
declare function isTimes(command: CommandShape): boolean;
|
|
26
|
+
declare function isTry(command: CommandShape): boolean;
|
|
25
27
|
declare function isForEach(command: CommandShape): boolean;
|
|
26
28
|
export declare const ControlFlowCommandChecks: {
|
|
27
29
|
isIfBlock: typeof isIfBlock;
|
|
@@ -37,6 +39,7 @@ export declare const ControlFlowCommandChecks: {
|
|
|
37
39
|
isControlFlow: typeof isControlFlow;
|
|
38
40
|
isTimes: typeof isTimes;
|
|
39
41
|
isForEach: typeof isForEach;
|
|
42
|
+
isTry: typeof isTry;
|
|
40
43
|
};
|
|
41
44
|
export {};
|
|
42
45
|
//# sourceMappingURL=commands.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/playback-tree/commands.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAErD,eAAO,MAAM,uBAAuB
|
|
1
|
+
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/playback-tree/commands.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAErD,eAAO,MAAM,uBAAuB;;;;;;;;;;;CAWnC,CAAA;AAcD,iBAAS,WAAW,CAAC,OAAO,EAAE,YAAY,WAKzC;AAED,iBAAS,aAAa,CAAC,OAAO,EAAE,YAAY,WAa3C;AAED,iBAAS,aAAa,CAAC,OAAO,EAAE,YAAY,WAiB3C;AAED,iBAAS,IAAI,CAAC,OAAO,EAAE,YAAY,WAKlC;AAED,iBAAS,MAAM,CAAC,OAAO,EAAE,YAAY,WAKpC;AASD,iBAAS,cAAc,CAAC,OAAO,EAAE,YAAY,WAE5C;AAED,iBAAS,KAAK,CAAC,OAAO,EAAE,YAAY,WAKnC;AAED,iBAAS,IAAI,CAAC,OAAO,EAAE,YAAY,WAKlC;AAED,iBAAS,SAAS,CAAC,OAAO,EAAE,YAAY,WAEvC;AAED,iBAAS,MAAM,CAAC,OAAO,EAAE,YAAY,WASpC;AAED,iBAAS,UAAU,CAAC,OAAO,EAAE,YAAY,WAKxC;AAED,iBAAS,OAAO,CAAC,OAAO,EAAE,YAAY,WAKrC;AAED,iBAAS,KAAK,CAAC,OAAO,EAAE,YAAY,WAKnC;AAED,iBAAS,SAAS,CAAC,OAAO,EAAE,YAAY,WAKvC;AAED,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;CAepC,CAAA"}
|
|
@@ -26,6 +26,7 @@ exports.ControlFlowCommandNames = {
|
|
|
26
26
|
if: 'if',
|
|
27
27
|
repeatIf: 'repeatIf',
|
|
28
28
|
times: 'times',
|
|
29
|
+
try: 'try',
|
|
29
30
|
while: 'while',
|
|
30
31
|
};
|
|
31
32
|
function commandNamesEqual(command, target) {
|
|
@@ -40,7 +41,8 @@ function isCommandEnabled(command) {
|
|
|
40
41
|
return command && !command.skip;
|
|
41
42
|
}
|
|
42
43
|
function isBlockOpen(command) {
|
|
43
|
-
return isCommandEnabled(command) &&
|
|
44
|
+
return (isCommandEnabled(command) &&
|
|
45
|
+
(isIf(command) || isLoop(command) || isTry(command)));
|
|
44
46
|
}
|
|
45
47
|
function isConditional(command) {
|
|
46
48
|
if (!isCommandEnabled(command))
|
|
@@ -67,6 +69,7 @@ function isControlFlow(command) {
|
|
|
67
69
|
case exports.ControlFlowCommandNames.do:
|
|
68
70
|
case exports.ControlFlowCommandNames.repeatIf:
|
|
69
71
|
case exports.ControlFlowCommandNames.times:
|
|
72
|
+
case exports.ControlFlowCommandNames.try:
|
|
70
73
|
case exports.ControlFlowCommandNames.while:
|
|
71
74
|
return true;
|
|
72
75
|
default:
|
|
@@ -115,23 +118,28 @@ function isTimes(command) {
|
|
|
115
118
|
return (isCommandEnabled(command) &&
|
|
116
119
|
commandNamesEqual(command, exports.ControlFlowCommandNames.times));
|
|
117
120
|
}
|
|
121
|
+
function isTry(command) {
|
|
122
|
+
return (isCommandEnabled(command) &&
|
|
123
|
+
commandNamesEqual(command, exports.ControlFlowCommandNames.try));
|
|
124
|
+
}
|
|
118
125
|
function isForEach(command) {
|
|
119
126
|
return (isCommandEnabled(command) &&
|
|
120
127
|
commandNamesEqual(command, exports.ControlFlowCommandNames.forEach));
|
|
121
128
|
}
|
|
122
129
|
exports.ControlFlowCommandChecks = {
|
|
123
|
-
isIfBlock
|
|
124
|
-
isConditional
|
|
125
|
-
isDo
|
|
126
|
-
isElse
|
|
127
|
-
isElseOrElseIf
|
|
128
|
-
isEnd
|
|
129
|
-
isIf
|
|
130
|
-
isLoop
|
|
131
|
-
isBlockOpen
|
|
132
|
-
isTerminal
|
|
133
|
-
isControlFlow
|
|
134
|
-
isTimes
|
|
135
|
-
isForEach
|
|
130
|
+
isIfBlock,
|
|
131
|
+
isConditional,
|
|
132
|
+
isDo,
|
|
133
|
+
isElse,
|
|
134
|
+
isElseOrElseIf,
|
|
135
|
+
isEnd,
|
|
136
|
+
isIf,
|
|
137
|
+
isLoop,
|
|
138
|
+
isBlockOpen,
|
|
139
|
+
isTerminal,
|
|
140
|
+
isControlFlow,
|
|
141
|
+
isTimes,
|
|
142
|
+
isForEach,
|
|
143
|
+
isTry,
|
|
136
144
|
};
|
|
137
145
|
//# sourceMappingURL=commands.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/playback-tree/commands.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,+DAA+D;AAC/D,wDAAwD;AACxD,6DAA6D;AAC7D,oDAAoD;AACpD,6DAA6D;AAC7D,6DAA6D;AAC7D,EAAE;AACF,+CAA+C;AAC/C,EAAE;AACF,6DAA6D;AAC7D,8DAA8D;AAC9D,yDAAyD;AACzD,4DAA4D;AAC5D,0DAA0D;AAC1D,qBAAqB;;;AAIR,QAAA,uBAAuB,GAAG;IACrC,EAAE,EAAE,IAAI;IACR,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,GAAG,EAAE,KAAK;IACV,OAAO,EAAE,SAAS;IAClB,EAAE,EAAE,IAAI;IACR,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,OAAO;CACf,CAAA;AAED,SAAS,iBAAiB,CAAC,OAAqB,EAAE,MAAc;IAC9D,IAAI,OAAO,EAAE;QACX,OAAO,OAAO,CAAC,OAAO,KAAK,MAAM,CAAA;KAClC;SAAM;QACL,OAAO,KAAK,CAAA;KACb;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAqB;IAC7C,OAAO,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAA;AACjC,CAAC;AAED,SAAS,WAAW,CAAC,OAAqB;IACxC,OAAO,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/playback-tree/commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ export interface PlaybackTree {
|
|
|
9
9
|
nodes: CommandNode[];
|
|
10
10
|
containsControlFlow: boolean;
|
|
11
11
|
}
|
|
12
|
-
declare function createPlaybackTree(commandStack: CommandShape[], { isValidationDisabled,
|
|
13
|
-
declare function createCommandNodesFromCommandStack(commandStack: CommandShape[], isValidationDisabled?: boolean,
|
|
14
|
-
export
|
|
12
|
+
declare function createPlaybackTree(commandStack: CommandShape[], { isValidationDisabled, emitControlFlowChange }?: CommandNodeOptions): PlaybackTree;
|
|
13
|
+
declare function createCommandNodesFromCommandStack(commandStack: CommandShape[], isValidationDisabled?: boolean, emitControlFlowChange?: Fn): CommandNode[];
|
|
14
|
+
export type ConnectFn = (commandNode: CommandNode, _nextCommandNode: CommandNode, stack: CommandNode[], state?: any) => void;
|
|
15
15
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/playback-tree/index.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAK5C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAC7B,OAAO,EAAE,kCAAkC,EAAE,CAAA;AAE7C,MAAM,WAAW,YAAY;IAC3B,mBAAmB,EAAE,WAAW,CAAA;IAChC,KAAK,EAAE,WAAW,EAAE,CAAA;IACpB,mBAAmB,EAAE,OAAO,CAAA;CAC7B;AAED,iBAAS,kBAAkB,CACzB,YAAY,EAAE,YAAY,EAAE,EAC5B,EAAE,oBAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/playback-tree/index.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAK5C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAC7B,OAAO,EAAE,kCAAkC,EAAE,CAAA;AAE7C,MAAM,WAAW,YAAY;IAC3B,mBAAmB,EAAE,WAAW,CAAA;IAChC,KAAK,EAAE,WAAW,EAAE,CAAA;IACpB,mBAAmB,EAAE,OAAO,CAAA;CAC7B;AAED,iBAAS,kBAAkB,CACzB,YAAY,EAAE,YAAY,EAAE,EAC5B,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,GAAE,kBAAuB,GACvE,YAAY,CAWd;AAMD,iBAAS,kCAAkC,CACzC,YAAY,EAAE,YAAY,EAAE,EAC5B,oBAAoB,GAAE,OAAe,EACrC,qBAAqB,CAAC,EAAE,EAAE,iBAM3B;AAgCD,MAAM,MAAM,SAAS,GAAG,CACtB,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,WAAW,EAC7B,KAAK,EAAE,WAAW,EAAE,EACpB,KAAK,CAAC,EAAE,GAAG,KACR,IAAI,CAAA"}
|
|
@@ -22,8 +22,8 @@ const state_1 = require("./state");
|
|
|
22
22
|
const syntax_validation_1 = require("./syntax-validation");
|
|
23
23
|
const command_leveler_1 = require("./command-leveler");
|
|
24
24
|
const commands_1 = require("./commands");
|
|
25
|
-
function createPlaybackTree(commandStack, { isValidationDisabled,
|
|
26
|
-
let nodes = createCommandNodesFromCommandStack(commandStack, isValidationDisabled,
|
|
25
|
+
function createPlaybackTree(commandStack, { isValidationDisabled, emitControlFlowChange } = {}) {
|
|
26
|
+
let nodes = createCommandNodesFromCommandStack(commandStack, isValidationDisabled, emitControlFlowChange);
|
|
27
27
|
return {
|
|
28
28
|
startingCommandNode: nodes[0],
|
|
29
29
|
nodes,
|
|
@@ -34,18 +34,18 @@ exports.createPlaybackTree = createPlaybackTree;
|
|
|
34
34
|
function containsControlFlow(nodes) {
|
|
35
35
|
return !!nodes.filter((node) => node.isControlFlow()).length;
|
|
36
36
|
}
|
|
37
|
-
function createCommandNodesFromCommandStack(commandStack, isValidationDisabled = false,
|
|
37
|
+
function createCommandNodesFromCommandStack(commandStack, isValidationDisabled = false, emitControlFlowChange) {
|
|
38
38
|
if (!isValidationDisabled)
|
|
39
39
|
(0, syntax_validation_1.validateControlFlowSyntax)(commandStack);
|
|
40
40
|
let levels = (0, command_leveler_1.deriveCommandLevels)(commandStack);
|
|
41
|
-
let nodes = createCommandNodes(commandStack, levels,
|
|
41
|
+
let nodes = createCommandNodes(commandStack, levels, emitControlFlowChange);
|
|
42
42
|
return connectCommandNodes(nodes);
|
|
43
43
|
}
|
|
44
44
|
exports.createCommandNodesFromCommandStack = createCommandNodesFromCommandStack;
|
|
45
|
-
function createCommandNodes(commandStack, levels,
|
|
45
|
+
function createCommandNodes(commandStack, levels, emitControlFlowChange) {
|
|
46
46
|
let commandNodes = [];
|
|
47
47
|
commandStack.forEach(function (command, index) {
|
|
48
|
-
let node = new command_node_1.CommandNode(command, {
|
|
48
|
+
let node = new command_node_1.CommandNode(command, { emitControlFlowChange });
|
|
49
49
|
node.index = index;
|
|
50
50
|
node.level = levels[index];
|
|
51
51
|
commandNodes.push(node);
|
|
@@ -156,6 +156,7 @@ const commandNodeConnectors = {
|
|
|
156
156
|
[commands_1.ControlFlowCommandNames.if]: connectConditionalForBranchOpen,
|
|
157
157
|
[commands_1.ControlFlowCommandNames.repeatIf]: connectDo,
|
|
158
158
|
[commands_1.ControlFlowCommandNames.times]: connectConditionalForBranchOpen,
|
|
159
|
+
[commands_1.ControlFlowCommandNames.try]: connectConditionalForBranchOpen,
|
|
159
160
|
[commands_1.ControlFlowCommandNames.while]: connectConditionalForBranchOpen,
|
|
160
161
|
};
|
|
161
162
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/playback-tree/index.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,+DAA+D;AAC/D,wDAAwD;AACxD,6DAA6D;AAC7D,oDAAoD;AACpD,6DAA6D;AAC7D,6DAA6D;AAC7D,EAAE;AACF,+CAA+C;AAC/C,EAAE;AACF,6DAA6D;AAC7D,8DAA8D;AAC9D,yDAAyD;AACzD,4DAA4D;AAC5D,0DAA0D;AAC1D,qBAAqB;;;AAErB,iDAA4C;AAC5C,mCAA+B;AAC/B,2DAA8E;AAC9E,uDAAuD;AACvD,yCAA8E;AAa9E,SAAS,kBAAkB,CACzB,YAA4B,EAC5B,EAAE,oBAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/playback-tree/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syntax-validation.d.ts","sourceRoot":"","sources":["../../src/playback-tree/syntax-validation.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAErD,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,YAAY,EAAE,WAarE;
|
|
1
|
+
{"version":3,"file":"syntax-validation.d.ts","sourceRoot":"","sources":["../../src/playback-tree/syntax-validation.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAErD,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,YAAY,EAAE,WAarE;AAkGD,wBAAgB,aAAa,CAAC,YAAY,CAAC,EAAE,MAAM,QAKlD"}
|
|
@@ -47,6 +47,7 @@ const commandValidators = {
|
|
|
47
47
|
[commands_1.ControlFlowCommandNames.if]: trackControlFlowBranchOpen,
|
|
48
48
|
[commands_1.ControlFlowCommandNames.repeatIf]: validateRepeatIf,
|
|
49
49
|
[commands_1.ControlFlowCommandNames.times]: trackControlFlowBranchOpen,
|
|
50
|
+
[commands_1.ControlFlowCommandNames.try]: trackControlFlowBranchOpen,
|
|
50
51
|
[commands_1.ControlFlowCommandNames.while]: trackControlFlowBranchOpen,
|
|
51
52
|
};
|
|
52
53
|
function trackControlFlowBranchOpen(commandName, commandIndex, state) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syntax-validation.js","sourceRoot":"","sources":["../../src/playback-tree/syntax-validation.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,+DAA+D;AAC/D,wDAAwD;AACxD,6DAA6D;AAC7D,oDAAoD;AACpD,6DAA6D;AAC7D,6DAA6D;AAC7D,EAAE;AACF,+CAA+C;AAC/C,EAAE;AACF,6DAA6D;AAC7D,8DAA8D;AAC9D,yDAAyD;AACzD,4DAA4D;AAC5D,0DAA0D;AAC1D,qBAAqB;;;AAErB,yCAA8E;AAC9E,mCAA+B;AAC/B,2EAAoE;AAGpE,SAAgB,yBAAyB,CAAC,YAA4B;IACpE,IAAI,KAAK,GAAG,IAAI,aAAK,EAAE,CAAA;IACvB,YAAY,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"syntax-validation.js","sourceRoot":"","sources":["../../src/playback-tree/syntax-validation.ts"],"names":[],"mappings":"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"}
|