@haibun/core 1.13.5 → 1.15.0
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/build/index.d.ts +1 -2
- package/build/index.js +1 -27
- package/build/index.js.map +1 -1
- package/build/lib/ConnectedLogger.d.ts +3 -4
- package/build/lib/ConnectedLogger.js +3 -9
- package/build/lib/ConnectedLogger.js.map +1 -1
- package/build/lib/Logger.d.ts +10 -11
- package/build/lib/Logger.js +17 -19
- package/build/lib/Logger.js.map +1 -1
- package/build/lib/Logger.test.d.ts +0 -1
- package/build/lib/Logger.test.js +11 -36
- package/build/lib/Logger.test.js.map +1 -1
- package/build/lib/TestLogger.d.ts +1 -2
- package/build/lib/TestLogger.js +1 -4
- package/build/lib/TestLogger.js.map +1 -1
- package/build/lib/Timer.d.ts +0 -1
- package/build/lib/Timer.js +4 -8
- package/build/lib/Timer.js.map +1 -1
- package/build/lib/contexts.d.ts +1 -2
- package/build/lib/contexts.js +9 -14
- package/build/lib/contexts.js.map +1 -1
- package/build/lib/{defs/index.d.ts → defs.d.ts} +57 -57
- package/build/lib/defs.js +28 -0
- package/build/lib/defs.js.map +1 -0
- package/build/lib/domain.d.ts +3 -4
- package/build/lib/domain.js +14 -23
- package/build/lib/domain.js.map +1 -1
- package/build/lib/features.d.ts +1 -2
- package/build/lib/features.js +15 -27
- package/build/lib/features.js.map +1 -1
- package/build/lib/features.test.d.ts +0 -1
- package/build/lib/features.test.js +31 -59
- package/build/lib/features.test.js.map +1 -1
- package/build/lib/interfaces/logger.d.ts +9 -10
- package/build/lib/interfaces/logger.js +1 -4
- package/build/lib/interfaces/logger.js.map +1 -1
- package/build/lib/namedVars.d.ts +7 -8
- package/build/lib/namedVars.js +12 -20
- package/build/lib/namedVars.js.map +1 -1
- package/build/lib/namedVars.test.d.ts +0 -1
- package/build/lib/namedVars.test.js +33 -38
- package/build/lib/namedVars.test.js.map +1 -1
- package/build/lib/run-with-options.d.ts +2 -3
- package/build/lib/run-with-options.js +13 -19
- package/build/lib/run-with-options.js.map +1 -1
- package/build/lib/run.d.ts +3 -4
- package/build/lib/run.domains.test.d.ts +0 -1
- package/build/lib/run.domains.test.js +43 -51
- package/build/lib/run.domains.test.js.map +1 -1
- package/build/lib/run.js +28 -36
- package/build/lib/run.js.map +1 -1
- package/build/lib/run.test.d.ts +0 -1
- package/build/lib/run.test.js +24 -32
- package/build/lib/run.test.js.map +1 -1
- package/build/lib/test/TestSteps.d.ts +12 -13
- package/build/lib/test/TestSteps.js +39 -44
- package/build/lib/test/TestSteps.js.map +1 -1
- package/build/lib/test/TestStepsWithDomain.d.ts +7 -8
- package/build/lib/test/TestStepsWithDomain.js +12 -17
- package/build/lib/test/TestStepsWithDomain.js.map +1 -1
- package/build/lib/test/TestStepsWithOptions.d.ts +6 -7
- package/build/lib/test/TestStepsWithOptions.js +18 -23
- package/build/lib/test/TestStepsWithOptions.js.map +1 -1
- package/build/lib/test/lib.d.ts +5 -6
- package/build/lib/test/lib.js +38 -72
- package/build/lib/test/lib.js.map +1 -1
- package/build/lib/util/index.d.ts +5 -6
- package/build/lib/util/index.js +54 -119
- package/build/lib/util/index.js.map +1 -1
- package/build/lib/util/util.test.d.ts +0 -1
- package/build/lib/util/util.test.js +35 -67
- package/build/lib/util/util.test.js.map +1 -1
- package/build/link-packages.d.ts +0 -1
- package/build/link-packages.js +5 -7
- package/build/link-packages.js.map +1 -1
- package/build/phases/Builder.d.ts +3 -4
- package/build/phases/Builder.js +12 -12
- package/build/phases/Builder.js.map +1 -1
- package/build/phases/Builder.test.d.ts +0 -1
- package/build/phases/Builder.test.js +13 -18
- package/build/phases/Builder.test.js.map +1 -1
- package/build/phases/Executor.d.ts +1 -2
- package/build/phases/Executor.js +16 -17
- package/build/phases/Executor.js.map +1 -1
- package/build/phases/Resolver.d.ts +1 -2
- package/build/phases/Resolver.domains.test.d.ts +0 -1
- package/build/phases/Resolver.domains.test.js +1 -2
- package/build/phases/Resolver.domains.test.js.map +1 -1
- package/build/phases/Resolver.js +19 -20
- package/build/phases/Resolver.js.map +1 -1
- package/build/phases/Resolver.test.d.ts +0 -1
- package/build/phases/Resolver.test.js +31 -36
- package/build/phases/Resolver.test.js.map +1 -1
- package/build/scaffold/index.d.ts +0 -1
- package/build/scaffold/index.js +2 -4
- package/build/scaffold/index.js.map +1 -1
- package/build/scaffold/scaffold.d.ts +1 -2
- package/build/scaffold/scaffold.js +25 -33
- package/build/scaffold/scaffold.js.map +1 -1
- package/build/scaffold/scaffold.test.d.ts +0 -1
- package/build/scaffold/scaffold.test.js +15 -20
- package/build/scaffold/scaffold.test.js.map +1 -1
- package/build/steps/conformance.d.ts +6 -7
- package/build/steps/conformance.js +10 -15
- package/build/steps/conformance.js.map +1 -1
- package/build/steps/credentials.d.ts +7 -8
- package/build/steps/credentials.js +25 -32
- package/build/steps/credentials.js.map +1 -1
- package/build/steps/haibun.d.ts +13 -14
- package/build/steps/haibun.js +66 -71
- package/build/steps/haibun.js.map +1 -1
- package/build/steps/haibun.test.d.ts +0 -1
- package/build/steps/haibun.test.js +4 -6
- package/build/steps/haibun.test.js.map +1 -1
- package/build/steps/vars.d.ts +17 -18
- package/build/steps/vars.js +74 -83
- package/build/steps/vars.js.map +1 -1
- package/build/steps/vars.test.d.ts +0 -1
- package/build/steps/vars.test.js +9 -11
- package/build/steps/vars.test.js.map +1 -1
- package/package.json +19 -5
- package/scaffold/.eslintrc.in +20 -0
- package/scaffold/.prettierrc.in +6 -0
- package/scaffold/src/stepper.test.ts.in +1 -1
- package/scaffold/src/stepper.ts.in +2 -2
- package/scaffold/tsconfig.json.in +2 -2
- package/build/index.d.ts.map +0 -1
- package/build/lib/ConnectedLogger.d.ts.map +0 -1
- package/build/lib/Logger.d.ts.map +0 -1
- package/build/lib/Logger.test.d.ts.map +0 -1
- package/build/lib/TestLogger.d.ts.map +0 -1
- package/build/lib/Timer.d.ts.map +0 -1
- package/build/lib/contexts.d.ts.map +0 -1
- package/build/lib/defs/index.d.ts.map +0 -1
- package/build/lib/defs/index.js +0 -31
- package/build/lib/defs/index.js.map +0 -1
- package/build/lib/domain.d.ts.map +0 -1
- package/build/lib/features.d.ts.map +0 -1
- package/build/lib/features.test.d.ts.map +0 -1
- package/build/lib/interfaces/logger.d.ts.map +0 -1
- package/build/lib/namedVars.d.ts.map +0 -1
- package/build/lib/namedVars.test.d.ts.map +0 -1
- package/build/lib/run-with-options.d.ts.map +0 -1
- package/build/lib/run.d.ts.map +0 -1
- package/build/lib/run.domains.test.d.ts.map +0 -1
- package/build/lib/run.test.d.ts.map +0 -1
- package/build/lib/test/TestSteps.d.ts.map +0 -1
- package/build/lib/test/TestStepsWithDomain.d.ts.map +0 -1
- package/build/lib/test/TestStepsWithOptions.d.ts.map +0 -1
- package/build/lib/test/lib.d.ts.map +0 -1
- package/build/lib/util/index.d.ts.map +0 -1
- package/build/lib/util/util.test.d.ts.map +0 -1
- package/build/link-packages.d.ts.map +0 -1
- package/build/phases/Builder.d.ts.map +0 -1
- package/build/phases/Builder.test.d.ts.map +0 -1
- package/build/phases/Executor.d.ts.map +0 -1
- package/build/phases/Resolver.d.ts.map +0 -1
- package/build/phases/Resolver.domains.test.d.ts.map +0 -1
- package/build/phases/Resolver.test.d.ts.map +0 -1
- package/build/scaffold/index.d.ts.map +0 -1
- package/build/scaffold/scaffold.d.ts.map +0 -1
- package/build/scaffold/scaffold.test.d.ts.map +0 -1
- package/build/scaffold.d.ts +0 -3
- package/build/scaffold.d.ts.map +0 -1
- package/build/scaffold.js +0 -78
- package/build/scaffold.js.map +0 -1
- package/build/steps/conformance.d.ts.map +0 -1
- package/build/steps/credentials.d.ts.map +0 -1
- package/build/steps/haibun.d.ts.map +0 -1
- package/build/steps/haibun.test.d.ts.map +0 -1
- package/build/steps/vars.d.ts.map +0 -1
- package/build/steps/vars.test.d.ts.map +0 -1
package/build/link-packages.js
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const fs_1 = require("fs");
|
|
5
|
-
const util_1 = require("./lib/util");
|
|
2
|
+
import { readFileSync } from "fs";
|
|
3
|
+
import { spawn } from "./lib/util/index.js";
|
|
6
4
|
let pkg;
|
|
7
5
|
try {
|
|
8
|
-
pkg = JSON.parse(
|
|
6
|
+
pkg = JSON.parse(readFileSync('package.json', 'utf-8'));
|
|
9
7
|
}
|
|
10
8
|
catch (e) {
|
|
11
9
|
console.error(`failed to read package.json ${e}`);
|
|
@@ -13,12 +11,12 @@ catch (e) {
|
|
|
13
11
|
}
|
|
14
12
|
for (const i in pkg.dependencies) {
|
|
15
13
|
if (i.startsWith('@haibun/')) {
|
|
16
|
-
|
|
14
|
+
spawn(['npm', 'link', i], process.cwd());
|
|
17
15
|
}
|
|
18
16
|
}
|
|
19
17
|
for (const i in pkg.devDependencies) {
|
|
20
18
|
if (i.startsWith('@haibun/')) {
|
|
21
|
-
|
|
19
|
+
spawn(['npm', 'link', i], process.cwd());
|
|
22
20
|
}
|
|
23
21
|
}
|
|
24
22
|
//# sourceMappingURL=link-packages.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link-packages.js","sourceRoot":"","sources":["../src/link-packages.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"link-packages.js","sourceRoot":"","sources":["../src/link-packages.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE5C,IAAI,GAAG,CAAC;AACR,IAAI;IACA,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;CAC3D;AAAC,OAAO,CAAC,EAAE;IACR,OAAO,CAAC,KAAK,CAAC,+BAA+B,CAAC,EAAE,CAAC,CAAC;IAClD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CACnB;AAED,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,YAAY,EAAE;IAC9B,IAAI,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QAC1B,KAAK,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;KAC5C;CACJ;AAED,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,eAAe,EAAE;IACjC,IAAI,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QAC1B,KAAK,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;KAC5C;CACJ"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { WorkspaceContext } from '../lib/contexts';
|
|
2
|
-
import { AStepper, TResolvedFeature, TWorld } from '../lib/defs';
|
|
1
|
+
import { WorkspaceContext } from '../lib/contexts.js';
|
|
2
|
+
import { AStepper, TResolvedFeature, TWorld } from '../lib/defs.js';
|
|
3
3
|
export default class Builder {
|
|
4
4
|
world: any;
|
|
5
5
|
workspace: WorkspaceContext;
|
|
6
6
|
steppers: AStepper[];
|
|
7
7
|
constructor(steppers: AStepper[], world: TWorld, workspace?: WorkspaceContext);
|
|
8
|
-
build(features: TResolvedFeature[]): Promise<import("../lib/defs").TOKActionResult>;
|
|
8
|
+
build(features: TResolvedFeature[]): Promise<import("../lib/defs.js").TOKActionResult>;
|
|
9
9
|
}
|
|
10
|
-
//# sourceMappingURL=Builder.d.ts.map
|
package/build/phases/Builder.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
1
|
+
import { WorkspaceContext } from '../lib/contexts.js';
|
|
2
|
+
import { OK } from '../lib/defs.js';
|
|
3
|
+
import { applyResShouldContinue } from '../lib/util/index.js';
|
|
4
|
+
import { Executor, } from './Executor.js';
|
|
5
|
+
export default class Builder {
|
|
6
|
+
world;
|
|
7
|
+
workspace;
|
|
8
|
+
steppers;
|
|
9
|
+
constructor(steppers, world, workspace = new WorkspaceContext(`builder`)) {
|
|
9
10
|
this.steppers = steppers;
|
|
10
11
|
this.world = world;
|
|
11
12
|
this.workspace = workspace;
|
|
@@ -21,8 +22,8 @@ class Builder {
|
|
|
21
22
|
this.workspace.createPath(feature.path);
|
|
22
23
|
finalizers[feature.path] = [];
|
|
23
24
|
}
|
|
24
|
-
const res = await
|
|
25
|
-
const shouldContinue =
|
|
25
|
+
const res = await Executor.action(this.steppers, vstep, vstep.actions[0], this.world);
|
|
26
|
+
const shouldContinue = applyResShouldContinue(this.world, res, action);
|
|
26
27
|
if (!shouldContinue) {
|
|
27
28
|
throw Error(`${action.actionName}: ${res.message}`);
|
|
28
29
|
}
|
|
@@ -38,8 +39,7 @@ class Builder {
|
|
|
38
39
|
finalize(this.workspace.get(key));
|
|
39
40
|
}
|
|
40
41
|
}
|
|
41
|
-
return
|
|
42
|
+
return OK;
|
|
42
43
|
}
|
|
43
44
|
}
|
|
44
|
-
exports.default = Builder;
|
|
45
45
|
//# sourceMappingURL=Builder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Builder.js","sourceRoot":"","sources":["../../src/phases/Builder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Builder.js","sourceRoot":"","sources":["../../src/phases/Builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAY,EAAE,EAAkG,MAAM,gBAAgB,CAAC;AAC9I,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,QAAQ,GAAG,MAAM,eAAe,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,OAAO;IAC1B,KAAK,CAAM;IACX,SAAS,CAAmB;IAC5B,QAAQ,CAAa;IACrB,YAAY,QAAoB,EAAE,KAAa,EAAE,YAA8B,IAAI,gBAAgB,CAAC,SAAS,CAAC;QAC5G,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IACD,KAAK,CAAC,KAAK,CAAC,QAA4B;QACtC,MAAM,UAAU,GAAoC,EAAE,CAAC;QACvD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC;QACtC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClC,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE;oBAClC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE;wBACrB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;4BACrC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;4BACxC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;yBAC/B;wBACD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;wBAEtF,MAAM,cAAc,GAAG,sBAAsB,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;wBACvE,IAAI,CAAC,cAAc,EAAE;4BACnB,MAAM,KAAK,CAAC,GAAG,MAAM,CAAC,UAAU,KAA8B,GAAI,CAAC,OAAO,EAAE,CAAC,CAAC;yBAC/E;wBACD,IAAyC,GAAI,CAAC,QAAQ,EAAE;4BACtD,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAsC,GAAI,CAAC,QAAS,CAAC,CAAC;yBACpF;qBACF;iBACF;aACF;SACF;QACD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YACzC,KAAK,MAAM,QAAQ,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE;gBACtC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;aACnC;SACF;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;CACF"}
|
|
@@ -1,34 +1,29 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const contexts_1 = require("../lib/contexts");
|
|
7
|
-
const defs_1 = require("../lib/defs");
|
|
8
|
-
const lib_1 = require("../lib/test/lib");
|
|
9
|
-
const Builder_1 = __importDefault(require("./Builder"));
|
|
1
|
+
import { WorkspaceContext } from '../lib/contexts.js';
|
|
2
|
+
import { OK } from '../lib/defs.js';
|
|
3
|
+
import { getCreateSteppers, getDefaultWorld } from '../lib/test/lib.js';
|
|
4
|
+
import Builder from './Builder.js';
|
|
10
5
|
describe('Builder', () => {
|
|
11
6
|
test('throws', async () => {
|
|
12
|
-
const steppers = await
|
|
7
|
+
const steppers = await getCreateSteppers([]);
|
|
13
8
|
const throws = async () => {
|
|
14
9
|
throw Error('fails');
|
|
15
10
|
};
|
|
16
|
-
const builder = new
|
|
11
|
+
const builder = new Builder(steppers, getDefaultWorld(0).world);
|
|
17
12
|
// expect(async () => await builder.build([feature(throws)])).rejects.toThrow('fails');
|
|
18
13
|
});
|
|
19
14
|
test('passes', async () => {
|
|
20
|
-
const steppers = await
|
|
21
|
-
const throws = async () =>
|
|
22
|
-
const builder = new
|
|
15
|
+
const steppers = await getCreateSteppers([]);
|
|
16
|
+
const throws = async () => OK;
|
|
17
|
+
const builder = new Builder(steppers, getDefaultWorld(0).world);
|
|
23
18
|
// const res = await builder.build([feature(throws)]);
|
|
24
19
|
// expect(res).toBe(OK);
|
|
25
20
|
});
|
|
26
21
|
test('finalizes', async () => {
|
|
27
|
-
const steppers = await
|
|
22
|
+
const steppers = await getCreateSteppers([]);
|
|
28
23
|
const finalize = (workspace) => (workspace.set('done', true));
|
|
29
|
-
const finalizes = async () => ({ ...
|
|
30
|
-
const workspace = new
|
|
31
|
-
const builder = new
|
|
24
|
+
const finalizes = async () => ({ ...OK, finalize });
|
|
25
|
+
const workspace = new WorkspaceContext(`test builder finalizes`);
|
|
26
|
+
const builder = new Builder(steppers, getDefaultWorld(0).world, workspace);
|
|
32
27
|
// await builder.build([feature(finalizes)]);
|
|
33
28
|
// expect(workspace['passes.feature'].done).toBe(true);
|
|
34
29
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Builder.test.js","sourceRoot":"","sources":["../../src/phases/Builder.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Builder.test.js","sourceRoot":"","sources":["../../src/phases/Builder.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,EAAE,EAAa,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QACxB,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,EAAE,CAAC,CAAA;QAC5C,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE;YACxB,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC;QACvB,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAChE,uFAAuF;IACzF,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QACxB,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,EAAE,CAAC,CAAA;QAC5C,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE,CAAC,EAAE,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAChE,sDAAsD;QACtD,wBAAwB;IAC1B,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;QAC3B,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,EAAE,CAAC,CAAA;QAC5C,MAAM,QAAQ,GAAc,CAAC,SAA2B,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;QAC3F,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACpD,MAAM,SAAS,GAAqB,IAAI,gBAAgB,CAAC,wBAAwB,CAAC,CAAC;QACnF,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3E,6CAA6C;QAC7C,uDAAuD;IACzD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TVStep, TResolvedFeature, TResult, TStepResult, TFeatureResult, TActionResult, TWorld, AStepper, TEndFeatureCallback, CStepper, TFound } from '../lib/defs';
|
|
1
|
+
import { TVStep, TResolvedFeature, TResult, TStepResult, TFeatureResult, TActionResult, TWorld, AStepper, TEndFeatureCallback, CStepper, TFound } from '../lib/defs.js';
|
|
2
2
|
export declare class Executor {
|
|
3
3
|
static action(steppers: AStepper[], vstep: TVStep, a: TFound, world: TWorld): Promise<Partial<TActionResult>>;
|
|
4
4
|
static execute(csteppers: CStepper[], world: TWorld, features: TResolvedFeature[], endFeatureCallback?: TEndFeatureCallback): Promise<TResult>;
|
|
@@ -17,4 +17,3 @@ export declare class FeatureExecutor {
|
|
|
17
17
|
endFeature(featureResult: TFeatureResult): Promise<void>;
|
|
18
18
|
close(): Promise<void>;
|
|
19
19
|
}
|
|
20
|
-
//# sourceMappingURL=Executor.d.ts.map
|
package/build/phases/Executor.js
CHANGED
|
@@ -1,19 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const namedVars_1 = require("../lib/namedVars");
|
|
5
|
-
const util_1 = require("../lib/util");
|
|
6
|
-
class Executor {
|
|
1
|
+
import { getNamedToVars } from '../lib/namedVars.js';
|
|
2
|
+
import { actionNotOK, applyResShouldContinue, setWorldStepperOptions, sleep, createSteppers, findStepper } from '../lib/util/index.js';
|
|
3
|
+
export class Executor {
|
|
7
4
|
// find the stepper and action, call it and return its result
|
|
8
5
|
static async action(steppers, vstep, a, world) {
|
|
9
6
|
try {
|
|
10
|
-
const namedWithVars =
|
|
11
|
-
const stepper =
|
|
7
|
+
const namedWithVars = getNamedToVars(a, world, vstep);
|
|
8
|
+
const stepper = findStepper(steppers, a.stepperName);
|
|
12
9
|
return await stepper.steps[a.actionName].action(namedWithVars, vstep);
|
|
13
10
|
}
|
|
14
11
|
catch (caught) {
|
|
15
12
|
world.logger.error(caught.stack);
|
|
16
|
-
return
|
|
13
|
+
return actionNotOK(`in ${vstep.in}: ${caught.message}`, { topics: { caught: caught.stack.toString() } });
|
|
17
14
|
}
|
|
18
15
|
}
|
|
19
16
|
static async execute(csteppers, world, features, endFeatureCallback) {
|
|
@@ -42,10 +39,13 @@ class Executor {
|
|
|
42
39
|
return { ok, results: featureResults, tag: world.tag, shared: world.shared };
|
|
43
40
|
}
|
|
44
41
|
}
|
|
45
|
-
|
|
46
|
-
|
|
42
|
+
export class FeatureExecutor {
|
|
43
|
+
csteppers;
|
|
44
|
+
endFeatureCallback;
|
|
45
|
+
world;
|
|
46
|
+
steppers;
|
|
47
|
+
startOffset = 0;
|
|
47
48
|
constructor(csteppers, endFeatureCallback) {
|
|
48
|
-
this.startOffset = 0;
|
|
49
49
|
this.csteppers = csteppers;
|
|
50
50
|
this.endFeatureCallback = endFeatureCallback;
|
|
51
51
|
}
|
|
@@ -56,8 +56,8 @@ class FeatureExecutor {
|
|
|
56
56
|
console.error('error', phase, error, extra);
|
|
57
57
|
throw Error(error);
|
|
58
58
|
};
|
|
59
|
-
const steppers = await
|
|
60
|
-
await
|
|
59
|
+
const steppers = await createSteppers(this.csteppers);
|
|
60
|
+
await setWorldStepperOptions(steppers, world).catch((error) => errorBail('Apply Options', error, world.extraOptions));
|
|
61
61
|
this.steppers = steppers;
|
|
62
62
|
}
|
|
63
63
|
async doFeature(feature) {
|
|
@@ -70,7 +70,7 @@ class FeatureExecutor {
|
|
|
70
70
|
world.logger.log(` ${step.in}\r`);
|
|
71
71
|
const result = await FeatureExecutor.doFeatureStep(this.steppers, step, world);
|
|
72
72
|
if (world.options.step_delay) {
|
|
73
|
-
await
|
|
73
|
+
await sleep(world.options.step_delay);
|
|
74
74
|
}
|
|
75
75
|
ok = ok && result.ok;
|
|
76
76
|
if (!result.ok) {
|
|
@@ -102,7 +102,7 @@ class FeatureExecutor {
|
|
|
102
102
|
// FIXME
|
|
103
103
|
const stepResult = { ...res, name: a.actionName, start, end, traces };
|
|
104
104
|
actionResults.push(stepResult);
|
|
105
|
-
const shouldContinue =
|
|
105
|
+
const shouldContinue = applyResShouldContinue(world, res, a);
|
|
106
106
|
ok = ok && shouldContinue;
|
|
107
107
|
if (!shouldContinue) {
|
|
108
108
|
break;
|
|
@@ -143,5 +143,4 @@ class FeatureExecutor {
|
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
145
|
}
|
|
146
|
-
exports.FeatureExecutor = FeatureExecutor;
|
|
147
146
|
//# sourceMappingURL=Executor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Executor.js","sourceRoot":"","sources":["../../src/phases/Executor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Executor.js","sourceRoot":"","sources":["../../src/phases/Executor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEvI,MAAM,OAAO,QAAQ;IACnB,6DAA6D;IAC7D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,QAAoB,EAAE,KAAa,EAAE,CAAS,EAAE,KAAa;QAC/E,IAAI;YACF,MAAM,aAAa,GAAG,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YACtD,MAAM,OAAO,GAAG,WAAW,CAAW,QAAQ,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC;YAC/D,OAAO,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;SACvE;QAAC,OAAO,MAAW,EAAE;YACpB,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACjC,OAAO,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,KAAK,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;SAC1G;IACH,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,SAAqB,EAAE,KAAa,EAAE,QAA4B,EAAE,kBAAwC;QAC/H,IAAI,EAAE,GAAG,IAAI,CAAC;QACd,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;QAC/C,IAAI,cAAc,GAAqB,EAAE,CAAC;QAC1C,qBAAqB;QACrB,4CAA4C;QAC5C,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC;QACjC,IAAI,UAAU,GAAG,CAAC,CAAC;QAGnB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,UAAU,EAAE,CAAC;YAEb,MAAM,QAAQ,GAAG,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,GAAG,UAAU,EAAE,EAAE,EAAE,CAAA;YAEvF,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;YAC3E,MAAM,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAEtC,MAAM,aAAa,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAC/D,EAAE,GAAG,EAAE,IAAI,aAAa,CAAC,EAAE,CAAC;YAE5B,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,eAAe,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;aACjD;YACD,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACnC,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,eAAe,CAAC,KAAK,EAAE,CAAC;aAC/B;SACF;QACD,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;IAC/E,CAAC;CACF;AAED,MAAM,OAAO,eAAe;IAC1B,SAAS,CAAa;IACtB,kBAAkB,CAAuB;IACzC,KAAK,CAAU;IACf,QAAQ,CAAc;IACtB,WAAW,GAAW,CAAC,CAAC;IAExB,YAAY,SAAqB,EAAE,kBAAwC;QACzE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;IAC/C,CAAC;IACD,KAAK,CAAC,KAAK,CAAC,KAAa;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACvC,MAAM,SAAS,GAAG,CAAC,KAAa,EAAE,KAAU,EAAE,KAAW,EAAE,EAAE;YAC3D,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YAC5C,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtD,MAAM,sBAAsB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;QAC3H,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,OAAyB;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAM,CAAC;QAC1B,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,KAAK,CAAC,GAAG,CAAC,UAAU,KAAK,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACzE,IAAI,EAAE,GAAG,IAAI,CAAC;QACd,IAAI,WAAW,GAAkB,EAAE,CAAC;QACpC,IAAI,GAAG,GAAG,CAAC,CAAC;QAEZ,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE;YACjC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;YACpC,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,QAAS,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YAEhF,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE;gBAC5B,MAAM,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,UAAoB,CAAC,CAAC;aACjD;YACD,EAAE,GAAG,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;gBACd,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;aAC9B;YACD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YACpE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzB,IAAI,CAAC,EAAE,EAAE;gBACP,MAAM;aACP;YACD,GAAG,EAAE,CAAC;SACP;QACD,MAAM,aAAa,GAAmB,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC;QAE9E,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,QAAoB,EAAE,KAAa,EAAE,KAAa;QAC3E,IAAI,EAAE,GAAG,IAAI,CAAC;QACd,IAAI,aAAa,GAAG,EAAE,CAAC;QAEvB,uDAAuD;QACvD,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE;YAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YAClC,MAAM,GAAG,GAA2B,MAAM,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;YAErF,IAAI,MAAM,CAAC;YACX,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;gBAC9B,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBACpC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;aAC9B;YACD,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YAChC,QAAQ;YACR,MAAM,UAAU,GAAsB,EAAE,GAAG,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAuB,CAAC;YAC9G,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC/B,MAAM,cAAc,GAAG,sBAAsB,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;YAC7D,EAAE,GAAG,EAAE,IAAI,cAAc,CAAC;YAC1B,IAAI,CAAC,cAAc,EAAE;gBACnB,MAAM;aACP;SACF;QACD,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC;IAC5F,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,MAAmB;QACjC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAS,EAAE;YAC9B,IAAI,CAAC,CAAC,SAAS,EAAE;gBACf,IAAI,CAAC,KAAM,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC5D,MAAM,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;aAC3B;SACF;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,aAA6B;QAC5C,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAS,EAAE;YAC9B,IAAI,CAAC,CAAC,UAAU,EAAE;gBAChB,IAAI,CAAC,KAAM,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC7D,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC;aACtB;SACF;QAED,IAAI,IAAI,CAAC,kBAAkB,EAAE;YAC3B,IAAI;gBACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAM,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAS,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;aACtI;YAAC,OAAO,KAAU,EAAE;gBACnB,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;aACpB;SACF;IACH,CAAC;IACD,KAAK,CAAC,KAAK;QACT,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAS,EAAE;YAC9B,IAAI,CAAC,CAAC,KAAK,EAAE;gBACX,IAAI,CAAC,KAAM,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC1D,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC;aACjB;SACF;IACH,CAAC;CACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TFound, TResolvedFeature, TWorld, TExpandedFeature, AStepper } from '../lib/defs';
|
|
1
|
+
import { TFound, TResolvedFeature, TWorld, TExpandedFeature, AStepper } from '../lib/defs.js';
|
|
2
2
|
export declare class Resolver {
|
|
3
3
|
steppers: AStepper[];
|
|
4
4
|
world: TWorld;
|
|
@@ -12,4 +12,3 @@ export declare class Resolver {
|
|
|
12
12
|
static getNoFileTypeInclusionError: (prelude: string, fileType: string, name: string) => string;
|
|
13
13
|
findSteps(actionable: string): TFound[];
|
|
14
14
|
}
|
|
15
|
-
//# sourceMappingURL=Resolver.d.ts.map
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
1
|
describe('validate map steps', () => {
|
|
4
2
|
test('placeholder', () => {
|
|
5
3
|
expect(true).toBeTruthy();
|
|
@@ -72,4 +70,5 @@ describe('validate map steps', () => {
|
|
|
72
70
|
});
|
|
73
71
|
*/
|
|
74
72
|
});
|
|
73
|
+
export {};
|
|
75
74
|
//# sourceMappingURL=Resolver.domains.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Resolver.domains.test.js","sourceRoot":"","sources":["../../src/phases/Resolver.domains.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Resolver.domains.test.js","sourceRoot":"","sources":["../../src/phases/Resolver.domains.test.ts"],"names":[],"mappings":"AAMA,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE;QACvB,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;IAC5B,CAAC,CAAC,CAAA;IACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAkEE;AACF,CAAC,CAAC,CAAC"}
|
package/build/phases/Resolver.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
import { OK, BASE_TYPES } from '../lib/defs.js';
|
|
2
|
+
import { namedInterpolation, getMatch } from '../lib/namedVars.js';
|
|
3
|
+
import { getActionable, describeSteppers, isLowerCase } from '../lib/util/index.js';
|
|
4
|
+
export class Resolver {
|
|
5
|
+
steppers;
|
|
6
|
+
world;
|
|
7
|
+
mode;
|
|
8
8
|
constructor(steppers, mode, world) {
|
|
9
9
|
this.steppers = steppers;
|
|
10
10
|
this.mode = mode;
|
|
@@ -26,7 +26,7 @@ class Resolver {
|
|
|
26
26
|
}
|
|
27
27
|
async addSteps(feature) {
|
|
28
28
|
const vsteps = feature.expanded.map((featureLine, seq) => {
|
|
29
|
-
const actionable =
|
|
29
|
+
const actionable = getActionable(featureLine.line);
|
|
30
30
|
const actions = this.findSteps(actionable);
|
|
31
31
|
try {
|
|
32
32
|
// FIXME
|
|
@@ -39,18 +39,22 @@ class Resolver {
|
|
|
39
39
|
throw Error(`more than one step found for "${featureLine.line}": ${JSON.stringify(actions.map(a => a.actionName))}`);
|
|
40
40
|
}
|
|
41
41
|
else if (actions.length < 1 && this.mode !== 'some') {
|
|
42
|
-
throw Error(`no step found for ${featureLine.line} in ${feature.path} from ${
|
|
42
|
+
throw Error(`no step found for ${featureLine.line} in ${feature.path} from ${describeSteppers(this.steppers)}`);
|
|
43
43
|
}
|
|
44
44
|
return { source: featureLine.feature, in: featureLine.line, seq, actions };
|
|
45
45
|
});
|
|
46
46
|
return { ...feature, vsteps };
|
|
47
47
|
}
|
|
48
|
+
static getPrelude = (path, line, featureLine) => `In '${path}', step '${featureLine}' using '${line}':`;
|
|
49
|
+
static getTypeValidationError = (prelude, fileType, name, typeValidationError) => `${prelude} Type '${fileType}' doesn't validate for '${name}': ${typeValidationError}`;
|
|
50
|
+
static getMoreThanOneInclusionError = (prelude, fileType, name) => `${prelude} more than one '${fileType}' inclusion for '${name}'`;
|
|
51
|
+
static getNoFileTypeInclusionError = (prelude, fileType, name) => `${prelude} no '${fileType}' inclusion for '${name}'`;
|
|
48
52
|
findSteps(actionable) {
|
|
49
53
|
if (!actionable.length) {
|
|
50
54
|
return [comment];
|
|
51
55
|
}
|
|
52
56
|
let found = [];
|
|
53
|
-
const types = [...
|
|
57
|
+
const types = [...BASE_TYPES, ...this.world.domains.map((d) => d.name)];
|
|
54
58
|
for (const stepper of this.steppers) {
|
|
55
59
|
const stepperName = stepper.constructor.name;
|
|
56
60
|
const { steps } = stepper;
|
|
@@ -58,14 +62,14 @@ class Resolver {
|
|
|
58
62
|
const step = steps[actionName];
|
|
59
63
|
const addIfMatch = (m) => m && found.push(m);
|
|
60
64
|
if (step.gwta) {
|
|
61
|
-
let { str, vars } =
|
|
65
|
+
let { str, vars } = namedInterpolation(step.gwta, types);
|
|
62
66
|
const f = str.charAt(0);
|
|
63
|
-
const s =
|
|
67
|
+
const s = isLowerCase(f) ? ['[', f, f.toUpperCase(), ']', str.substring(1)].join('') : str;
|
|
64
68
|
const r = new RegExp(`^(Given|When|Then|And)?( the )?( I('m)? (am )?)? ?${s}`);
|
|
65
|
-
addIfMatch(
|
|
69
|
+
addIfMatch(getMatch(actionable, r, actionName, stepperName, step, vars));
|
|
66
70
|
}
|
|
67
71
|
else if (step.match) {
|
|
68
|
-
addIfMatch(
|
|
72
|
+
addIfMatch(getMatch(actionable, step.match, actionName, stepperName, step));
|
|
69
73
|
}
|
|
70
74
|
else if (actionable.length > 0 && step.exact === actionable) {
|
|
71
75
|
found.push({ actionName, stepperName, step });
|
|
@@ -75,18 +79,13 @@ class Resolver {
|
|
|
75
79
|
return found;
|
|
76
80
|
}
|
|
77
81
|
}
|
|
78
|
-
exports.Resolver = Resolver;
|
|
79
|
-
Resolver.getPrelude = (path, line, featureLine) => `In '${path}', step '${featureLine}' using '${line}':`;
|
|
80
|
-
Resolver.getTypeValidationError = (prelude, fileType, name, typeValidationError) => `${prelude} Type '${fileType}' doesn't validate for '${name}': ${typeValidationError}`;
|
|
81
|
-
Resolver.getMoreThanOneInclusionError = (prelude, fileType, name) => `${prelude} more than one '${fileType}' inclusion for '${name}'`;
|
|
82
|
-
Resolver.getNoFileTypeInclusionError = (prelude, fileType, name) => `${prelude} no '${fileType}' inclusion for '${name}'`;
|
|
83
82
|
const comment = {
|
|
84
83
|
stepperName: 'Haibun',
|
|
85
84
|
actionName: 'comment',
|
|
86
85
|
step: {
|
|
87
86
|
match: /.*/,
|
|
88
87
|
action: async () => {
|
|
89
|
-
return
|
|
88
|
+
return OK;
|
|
90
89
|
},
|
|
91
90
|
},
|
|
92
91
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Resolver.js","sourceRoot":"","sources":["../../src/phases/Resolver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Resolver.js","sourceRoot":"","sources":["../../src/phases/Resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,43 +1,38 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const util_1 = require("../lib/util");
|
|
6
|
-
const Resolver_1 = require("./Resolver");
|
|
1
|
+
import { AStepper, OK } from '../lib/defs.js';
|
|
2
|
+
import { asExpandedFeatures, getDefaultWorld } from '../lib/test/lib.js';
|
|
3
|
+
import { createSteppers } from '../lib/util/index.js';
|
|
4
|
+
import { Resolver } from './Resolver.js';
|
|
7
5
|
describe('validate map steps', () => {
|
|
8
|
-
class TestStepper extends
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
},
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
},
|
|
28
|
-
};
|
|
29
|
-
}
|
|
6
|
+
class TestStepper extends AStepper {
|
|
7
|
+
steps = {
|
|
8
|
+
exact: {
|
|
9
|
+
exact: 'exact1',
|
|
10
|
+
action: async () => OK,
|
|
11
|
+
},
|
|
12
|
+
match: {
|
|
13
|
+
match: /match(?<num>1)/,
|
|
14
|
+
action: async () => OK,
|
|
15
|
+
},
|
|
16
|
+
gwta: {
|
|
17
|
+
gwta: 'gwta(?<num>.)',
|
|
18
|
+
action: async () => OK,
|
|
19
|
+
},
|
|
20
|
+
gwtaInterpolated: {
|
|
21
|
+
gwta: 'is {what}',
|
|
22
|
+
action: async () => OK,
|
|
23
|
+
},
|
|
24
|
+
};
|
|
30
25
|
}
|
|
31
26
|
const getResolvedSteps = async (features) => {
|
|
32
|
-
const steppers = await
|
|
33
|
-
const resolver = new
|
|
34
|
-
...
|
|
27
|
+
const steppers = await createSteppers([TestStepper]);
|
|
28
|
+
const resolver = new Resolver(steppers, '', {
|
|
29
|
+
...getDefaultWorld(0).world,
|
|
35
30
|
});
|
|
36
31
|
return await resolver.resolveSteps(features);
|
|
37
32
|
};
|
|
38
33
|
describe('exact', () => {
|
|
39
34
|
test('exact', async () => {
|
|
40
|
-
const features =
|
|
35
|
+
const features = asExpandedFeatures([{ path: 'l1', content: `exact1` }]);
|
|
41
36
|
const res = await getResolvedSteps(features);
|
|
42
37
|
const { vsteps } = res[0];
|
|
43
38
|
expect(vsteps[0].actions[0].named).toBeUndefined();
|
|
@@ -45,7 +40,7 @@ describe('validate map steps', () => {
|
|
|
45
40
|
});
|
|
46
41
|
describe('match', () => {
|
|
47
42
|
test('match', async () => {
|
|
48
|
-
const features =
|
|
43
|
+
const features = asExpandedFeatures([{ path: 'l1', content: `match1` }]);
|
|
49
44
|
const res = await getResolvedSteps(features);
|
|
50
45
|
const { vsteps } = res[0];
|
|
51
46
|
expect(vsteps[0].actions[0].named).toEqual({ num: '1' });
|
|
@@ -53,7 +48,7 @@ describe('validate map steps', () => {
|
|
|
53
48
|
});
|
|
54
49
|
describe('gwta regex', () => {
|
|
55
50
|
test('gwta', async () => {
|
|
56
|
-
const features =
|
|
51
|
+
const features = asExpandedFeatures([{ path: 'l1', content: `gwta2\nGiven I'm gwta3\nWhen I am gwta4\nGwta5\nThen the gwta6` }]);
|
|
57
52
|
const res = await getResolvedSteps(features);
|
|
58
53
|
const { vsteps } = res[0];
|
|
59
54
|
expect(vsteps[0].actions[0].named).toEqual({ num: '2' });
|
|
@@ -65,13 +60,13 @@ describe('validate map steps', () => {
|
|
|
65
60
|
});
|
|
66
61
|
describe('gwta interpolated', () => {
|
|
67
62
|
test('gets quoted', async () => {
|
|
68
|
-
const features =
|
|
63
|
+
const features = asExpandedFeatures([{ path: 'l1', content: 'is "string"' }]);
|
|
69
64
|
const res = await getResolvedSteps(features);
|
|
70
65
|
const { vsteps } = res[0];
|
|
71
66
|
expect(vsteps[0].actions[0].named?.q_0).toEqual('string');
|
|
72
67
|
});
|
|
73
68
|
test('gets uri', async () => {
|
|
74
|
-
const features =
|
|
69
|
+
const features = asExpandedFeatures([{ path: 'l1', content: 'is http://url' }]);
|
|
75
70
|
const res = await getResolvedSteps(features);
|
|
76
71
|
const { vsteps } = res[0];
|
|
77
72
|
expect(vsteps[0].actions[0].named?.t_0).toEqual('http://url');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Resolver.test.js","sourceRoot":"","sources":["../../src/phases/Resolver.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Resolver.test.js","sourceRoot":"","sources":["../../src/phases/Resolver.test.ts"],"names":[],"mappings":"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"}
|
package/build/scaffold/index.js
CHANGED
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
const scaffold_1 = require("./scaffold");
|
|
2
|
+
import { scaffoldHaibun } from "./scaffold.js";
|
|
5
3
|
try {
|
|
6
|
-
|
|
4
|
+
scaffoldHaibun('.', console.info);
|
|
7
5
|
}
|
|
8
6
|
catch (e) {
|
|
9
7
|
console.error(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/scaffold/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/scaffold/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAG/C,IAAI;IACA,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC;AAAC,OAAO,CAAC,EAAE;IACR,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;CACpB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
|
|
2
|
+
type Tkv = {
|
|
3
3
|
[name: string]: string;
|
|
4
4
|
};
|
|
5
5
|
export declare function scaffoldHaibun(dest: string, out: typeof console.info, add?: {
|
|
@@ -8,4 +8,3 @@ export declare function scaffoldHaibun(dest: string, out: typeof console.info, a
|
|
|
8
8
|
addDirs: string[];
|
|
9
9
|
}): void;
|
|
10
10
|
export {};
|
|
11
|
-
//# sourceMappingURL=scaffold.d.ts.map
|