@haibun/core 1.24.0 → 1.25.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/lib/contexts.d.ts +1 -0
- package/build/lib/contexts.js +6 -0
- package/build/lib/contexts.js.map +1 -1
- package/build/lib/defs.d.ts +4 -1
- package/build/lib/defs.js.map +1 -1
- package/build/lib/domain.d.ts +3 -2
- package/build/lib/domain.js +3 -2
- package/build/lib/domain.js.map +1 -1
- package/build/lib/namedVars.test.js +2 -2
- package/build/lib/namedVars.test.js.map +1 -1
- package/build/lib/run-with-options.d.ts +1 -0
- package/build/lib/run-with-options.js +3 -1
- package/build/lib/run-with-options.js.map +1 -1
- package/build/lib/run.domains.test.js +1 -1
- package/build/lib/run.domains.test.js.map +1 -1
- package/build/lib/run.js +12 -10
- package/build/lib/run.js.map +1 -1
- package/build/lib/run.test.js +34 -35
- package/build/lib/run.test.js.map +1 -1
- package/build/lib/test/TestSteps.d.ts +1 -1
- package/build/lib/test/TestSteps.js +4 -4
- package/build/lib/test/TestSteps.js.map +1 -1
- package/build/lib/test/TestStepsWithOptions.d.ts +26 -1
- package/build/lib/test/TestStepsWithOptions.js +20 -2
- package/build/lib/test/TestStepsWithOptions.js.map +1 -1
- package/build/lib/test/lib.js +3 -3
- package/build/lib/test/lib.js.map +1 -1
- package/build/lib/util/index.d.ts +2 -1
- package/build/lib/util/index.js +22 -10
- package/build/lib/util/index.js.map +1 -1
- package/build/lib/util/util.test.js +51 -2
- package/build/lib/util/util.test.js.map +1 -1
- package/build/phases/Builder.d.ts +10 -3
- package/build/phases/Builder.js +53 -28
- package/build/phases/Builder.js.map +1 -1
- package/build/phases/Executor.d.ts +1 -1
- package/build/phases/Executor.js +11 -11
- package/build/phases/Executor.js.map +1 -1
- package/build/phases/Resolver.d.ts +9 -5
- package/build/phases/Resolver.js +76 -32
- package/build/phases/Resolver.js.map +1 -1
- package/build/phases/Resolver.test.js +14 -2
- package/build/phases/Resolver.test.js.map +1 -1
- package/build/steps/haibun.d.ts +17 -5
- package/build/steps/haibun.js +29 -2
- package/build/steps/haibun.js.map +1 -1
- package/build/steps/haibun.test.js +72 -2
- package/build/steps/haibun.test.js.map +1 -1
- package/package.json +2 -2
package/build/lib/contexts.d.ts
CHANGED
|
@@ -9,6 +9,7 @@ export declare class Context {
|
|
|
9
9
|
});
|
|
10
10
|
toString(): string;
|
|
11
11
|
set(name: string, value: string | boolean | object): void;
|
|
12
|
+
setOnly(name: string, value: string | boolean | object): void;
|
|
12
13
|
get(name: string): any;
|
|
13
14
|
concat(name: string, value: any): void;
|
|
14
15
|
unset(name: string): void;
|
package/build/lib/contexts.js
CHANGED
|
@@ -11,6 +11,12 @@ export class Context {
|
|
|
11
11
|
set(name, value) {
|
|
12
12
|
this.values[name] = value;
|
|
13
13
|
}
|
|
14
|
+
setOnly(name, value) {
|
|
15
|
+
if (this.get(name)) {
|
|
16
|
+
throw Error(`${name} is already set to ${this.values[name]}`);
|
|
17
|
+
}
|
|
18
|
+
this.set(name, value);
|
|
19
|
+
}
|
|
14
20
|
get(name) {
|
|
15
21
|
return this.values[name];
|
|
16
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contexts.js","sourceRoot":"","sources":["../../src/lib/contexts.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"contexts.js","sourceRoot":"","sources":["../../src/lib/contexts.ts"],"names":[],"mappings":"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"}
|
package/build/lib/defs.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Resolver } from '../phases/Resolver.js';
|
|
1
2
|
import { DomainContext, WorkspaceContext, WorldContext } from './contexts.js';
|
|
2
3
|
import { ILogger } from './interfaces/logger.js';
|
|
3
4
|
import { Timer } from './Timer.js';
|
|
@@ -119,8 +120,9 @@ export type TVStep = {
|
|
|
119
120
|
export type TAction = (named: TNamed, vstep: TVStep) => Promise<TActionResult>;
|
|
120
121
|
export type TBuildResult = (TOKActionResult & {
|
|
121
122
|
finalize?: TFinalize;
|
|
123
|
+
workspace?: WorkspaceContext;
|
|
122
124
|
}) | TNotOKActionResult;
|
|
123
|
-
export type TBuild = (named: TNamed, vstep: TVStep, workspace: WorkspaceContext) => Promise<TBuildResult>;
|
|
125
|
+
export type TBuild = (named: TNamed, vstep: TVStep, workspace: WorkspaceContext, resolver: Resolver, steppers: AStepper[]) => Promise<TBuildResult>;
|
|
124
126
|
export type TRequiresResult = {
|
|
125
127
|
includes?: string[];
|
|
126
128
|
};
|
|
@@ -185,6 +187,7 @@ export type TResult = {
|
|
|
185
187
|
ok: boolean;
|
|
186
188
|
tag: TTag;
|
|
187
189
|
shared: WorldContext;
|
|
190
|
+
topics?: TActionResultTopics;
|
|
188
191
|
results?: TFeatureResult[];
|
|
189
192
|
failure?: {
|
|
190
193
|
stage: string;
|
package/build/lib/defs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defs.js","sourceRoot":"","sources":["../../src/lib/defs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"defs.js","sourceRoot":"","sources":["../../src/lib/defs.ts"],"names":[],"mappings":"AAwIA,MAAM,OAAgB,gBAAgB;IACpC,IAAI,CAAS;IACb,YAAY,IAAY;QACtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CAGF;AAqBD,MAAM,OAAgB,QAAQ;IAC5B,KAAK,CAAU;IAIf,QAAQ,CAAC,KAAa,EAAE,QAAoB;QAC1C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,MAAM,KAAK,CAAC,yBAAyB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;SAC/D;QAED,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;CACF;AAMD,MAAM,CAAC,MAAM,EAAE,GAAoB,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;AAkGhD,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAAC;AAC/B,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,MAAM,GAAG,CAAC;AACxC,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC;AACjC,MAAM,CAAC,MAAM,YAAY,GAAG,SAAS,CAAC;AAEtC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;AAEhF,MAAM,CAAC,MAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC"}
|
package/build/lib/domain.d.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { Context } from './contexts.js';
|
|
2
|
-
import { AStepper, TFound, TWorld, TModuleDomain } from './defs.js';
|
|
2
|
+
import { AStepper, IHasDomains, TFound, TWorld, TModuleDomain } from './defs.js';
|
|
3
3
|
export declare const isBaseType: (type: string) => boolean;
|
|
4
4
|
export declare const getStepShared: (type: string, world: TWorld) => Context;
|
|
5
5
|
export declare const getDomain: (domain: string, world: Partial<TWorld>) => TModuleDomain;
|
|
6
|
-
export declare const
|
|
6
|
+
export declare const getStepperAsDomain: (s: AStepper) => IHasDomains;
|
|
7
|
+
export declare const getDomains: (steppers: AStepper[]) => Promise<TModuleDomain[]>;
|
|
7
8
|
export declare const verifyDomainsOrError: (steppers: AStepper[], world: TWorld) => Promise<void>;
|
|
8
9
|
export declare function checkRequiredType({ path }: {
|
|
9
10
|
path: string;
|
package/build/lib/domain.js
CHANGED
|
@@ -30,9 +30,10 @@ export const getStepShared = (type, world) => {
|
|
|
30
30
|
return currentSource;
|
|
31
31
|
};
|
|
32
32
|
export const getDomain = (domain, world) => world.domains.find((d) => d.name === domain);
|
|
33
|
-
export const
|
|
33
|
+
export const getStepperAsDomain = (s) => s?.domains ? s : undefined;
|
|
34
|
+
export const getDomains = async (steppers) => {
|
|
34
35
|
const domainWorld = { domains: [] };
|
|
35
|
-
for (const module of steppers.
|
|
36
|
+
for (const module of steppers.map(s => getStepperAsDomain(s)).filter(s => s !== undefined)) {
|
|
36
37
|
const { domains } = module;
|
|
37
38
|
if (domains) {
|
|
38
39
|
for (const d of domains) {
|
package/build/lib/domain.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domain.js","sourceRoot":"","sources":["../../src/lib/domain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,aAAa,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,UAAU,EAAsF,MAAM,WAAW,CAAC;AAE3H,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACtE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,KAAa,EAAW,EAAE;IACpE,0CAA0C;IAE1C,IAAI,IAAI,KAAK,SAAS,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE;QAC1C,OAAO,KAAK,CAAC,MAAM,CAAC;KACrB;IACD,IAAI,MAAM,GAAG,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACpC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;QAC7B,MAAM,KAAK,CAAC,iBAAiB,IAAI,KAAK,MAAM,GAAG,CAAC,CAAC;KAClD;IACD,MAAM,MAAM,GAAiB,MAAO,CAAC,IAAI,CAAC;IAE1C,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,MAAM,CAAC,MAAM,CAAC;KACtB;IACD,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC5C,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;QACrC,MAAM,KAAK,CAAC,wBAAwB,MAAM,KAAK,UAAU,GAAG,CAAC,CAAC;KAC/D;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAEhD,kEAAkE;IAClE,+EAA+E;IAE/E,IAAI,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,CAAC,aAAa,EAAE;QAClB,wEAAwE;QACxE,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAEtD,kFAAkF;KACnF;IACD,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAAc,EAAE,KAAsB,EAAE,EAAE,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"domain.js","sourceRoot":"","sources":["../../src/lib/domain.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,10 +75,10 @@ describe('getNamedWithVars', () => {
|
|
|
75
75
|
const { world } = getDefaultWorld(0);
|
|
76
76
|
test('gets var', async () => {
|
|
77
77
|
const steppers = await createSteppers([TestStepper]);
|
|
78
|
-
const resolver = new Resolver(steppers,
|
|
78
|
+
const resolver = new Resolver(steppers, world);
|
|
79
79
|
world.shared.set('exact', 'res');
|
|
80
80
|
const features = asExpandedFeatures([withNameType(TEST_BASE, 'l1', 'is `exact`')]);
|
|
81
|
-
const res = await resolver.
|
|
81
|
+
const res = await resolver.resolveStepsFromFeatures(features);
|
|
82
82
|
const { vsteps } = res[0];
|
|
83
83
|
expect(vsteps[0].actions[0]).toBeDefined();
|
|
84
84
|
const val = getNamedToVars(vsteps[0].actions[0], world, vsteps[0]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namedVars.test.js","sourceRoot":"","sources":["../../src/lib/namedVars.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"namedVars.test.js","sourceRoot":"","sources":["../../src/lib/namedVars.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { TRunOptions, TRunResult, TTagValue } from './defs.js';
|
|
|
2
2
|
import Logger from './Logger.js';
|
|
3
3
|
export default function runWithOptions(runOptions: TRunOptions): Promise<{
|
|
4
4
|
ok: boolean;
|
|
5
|
+
output: any[];
|
|
5
6
|
exceptionResults: any[];
|
|
6
7
|
ranResults: TRunResult[];
|
|
7
8
|
allFailures: {
|
|
@@ -35,7 +35,9 @@ export default async function runWithOptions(runOptions) {
|
|
|
35
35
|
.map((i) => i.value);
|
|
36
36
|
let passed = 0;
|
|
37
37
|
let failed = 0;
|
|
38
|
+
const output = [];
|
|
38
39
|
for (const r of ranResults) {
|
|
40
|
+
output.push(r.output);
|
|
39
41
|
if (r.result.ok) {
|
|
40
42
|
passed++;
|
|
41
43
|
}
|
|
@@ -64,7 +66,7 @@ export default async function runWithOptions(runOptions) {
|
|
|
64
66
|
.map((i) => i.reason);
|
|
65
67
|
const ok = ranResults.every((a) => a.result.ok);
|
|
66
68
|
const runTime = timer.since();
|
|
67
|
-
return { ok, exceptionResults, ranResults, allFailures, logger, passed, failed, totalRan, runTime };
|
|
69
|
+
return { ok, output, exceptionResults, ranResults, allFailures, logger, passed, failed, totalRan, runTime };
|
|
68
70
|
}
|
|
69
71
|
async function doRun(bases, specl, runtime, featureFilter, shared, protoOptions, containerLogger, tag, timer, startRunCallback, endFeatureCallback) {
|
|
70
72
|
const runStart = process.hrtime();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-with-options.js","sourceRoot":"","sources":["../../src/lib/run-with-options.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"run-with-options.js","sourceRoot":"","sources":["../../src/lib/run-with-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,7 +49,7 @@ describe('domain object', () => {
|
|
|
49
49
|
expect(result.failure.error.message.startsWith(`missing required domain "${TTYPE}"`)).toBe(true);
|
|
50
50
|
expect(result.failure.error.details.stack).toBeDefined();
|
|
51
51
|
});
|
|
52
|
-
it('domain object from background', async () => {
|
|
52
|
+
it.only('domain object from background', async () => {
|
|
53
53
|
const specl = getDefaultOptions();
|
|
54
54
|
const key = '/backgrounds/p1';
|
|
55
55
|
const { world } = getDefaultWorld(0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.domains.test.js","sourceRoot":"","sources":["../../src/lib/run.domains.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"run.domains.test.js","sourceRoot":"","sources":["../../src/lib/run.domains.test.ts"],"names":[],"mappings":"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"}
|
package/build/lib/run.js
CHANGED
|
@@ -3,7 +3,7 @@ import { expand } from './features.js';
|
|
|
3
3
|
import { Executor } from '../phases/Executor.js';
|
|
4
4
|
import { Resolver } from '../phases/Resolver.js';
|
|
5
5
|
import Builder from '../phases/Builder.js';
|
|
6
|
-
import { getSteppers, verifyExtraOptions, getRunTag, verifyRequiredOptions, createSteppers,
|
|
6
|
+
import { getSteppers, verifyExtraOptions, getRunTag, verifyRequiredOptions, createSteppers, setStepperWorlds } from './util/index.js';
|
|
7
7
|
import { getDomains, verifyDomainsOrError } from './domain.js';
|
|
8
8
|
import { getFeaturesAndBackgrounds } from '../phases/collector.js';
|
|
9
9
|
export const DEF_PROTO_DEFAULT_OPTIONS = { DEST: DEFAULT_DEST };
|
|
@@ -20,7 +20,8 @@ export async function run({ specl, bases, world, addSteppers = [], featureFilter
|
|
|
20
20
|
return ({ ok: false, tag: getRunTag(-1, -1, -1, -1, {}, false), failure: { stage: 'Collect', error: { message: error.message, details: { stack: error.stack } } }, shared: world.shared });
|
|
21
21
|
}
|
|
22
22
|
const { features, backgrounds } = featuresBackgrounds;
|
|
23
|
-
|
|
23
|
+
const res = await runWith({ specl, world, features, backgrounds, addSteppers, endFeatureCallback });
|
|
24
|
+
return res;
|
|
24
25
|
}
|
|
25
26
|
export async function runWith({ specl, world, features, backgrounds, addSteppers, endFeatureCallback }) {
|
|
26
27
|
const { tag } = world;
|
|
@@ -32,17 +33,18 @@ export async function runWith({ specl, world, features, backgrounds, addSteppers
|
|
|
32
33
|
try {
|
|
33
34
|
const baseSteppers = await getSteppers(specl.steppers).catch((error) => errorBail('Steppers', error));
|
|
34
35
|
const csteppers = baseSteppers.concat(addSteppers);
|
|
35
|
-
await verifyRequiredOptions(csteppers, world.
|
|
36
|
-
await verifyExtraOptions(world.extraOptions, csteppers).catch((error) => errorBail('
|
|
36
|
+
await verifyRequiredOptions(csteppers, world.extraOptions).catch((error) => errorBail('RequiredOptions', error));
|
|
37
|
+
await verifyExtraOptions(world.extraOptions, csteppers).catch((error) => errorBail('ExtraOptions', error));
|
|
37
38
|
const expandedFeatures = await expand(backgrounds, features).catch((error) => errorBail('Expand', error));
|
|
38
39
|
const steppers = await createSteppers(csteppers);
|
|
39
|
-
await
|
|
40
|
-
world.domains = await getDomains(steppers
|
|
41
|
-
await verifyDomainsOrError(steppers, world).catch((error) => errorBail('
|
|
42
|
-
const resolver = new Resolver(steppers, specl.mode, world);
|
|
43
|
-
const mappedValidatedSteps = await resolver.resolveSteps(expandedFeatures).catch((error) => errorBail('Resolve', error));
|
|
40
|
+
await setStepperWorlds(steppers, world).catch((error) => errorBail('StepperOptions', error));
|
|
41
|
+
world.domains = await getDomains(steppers).catch((error) => errorBail('GetDomains', error));
|
|
42
|
+
await verifyDomainsOrError(steppers, world).catch((error) => errorBail('RequiredDomains', error));
|
|
44
43
|
const builder = new Builder(steppers, world);
|
|
45
|
-
|
|
44
|
+
const resolver = new Resolver(steppers, world, builder);
|
|
45
|
+
const mappedValidatedSteps = await resolver.resolveStepsFromFeatures(expandedFeatures).catch((error) => errorBail('Resolve', error));
|
|
46
|
+
// await builder.build(mappedValidatedSteps).catch((error) => errorBail('Build', error, { stack: error.stack, mappedValidatedSteps }));
|
|
47
|
+
await builder.finalize();
|
|
46
48
|
world.logger.log(`features: ${expandedFeatures.length} backgrounds: ${backgrounds.length} steps: (${expandedFeatures.map((e) => e.path)}), ${mappedValidatedSteps.length}`);
|
|
47
49
|
result = await Executor.execute(csteppers, world, mappedValidatedSteps, endFeatureCallback).catch((error) => errorBail('Execute', error));
|
|
48
50
|
if (!result || !result.ok) {
|
package/build/lib/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/lib/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsF,YAAY,EAA6B,MAAM,WAAW,CAAC;AACxJ,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,OAAO,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,SAAS,EAAE,qBAAqB,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/lib/run.ts"],"names":[],"mappings":"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"}
|
package/build/lib/run.test.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import haibun from '../steps/haibun.js';
|
|
2
1
|
import { AStepper, OK } from './defs.js';
|
|
3
2
|
import { testWithDefaults } from './test/lib.js';
|
|
4
3
|
import TestSteps from './test/TestSteps.js';
|
|
4
|
+
import { TestStepsWithRequiredOptions } from './test/TestStepsWithOptions.js';
|
|
5
5
|
describe('run self-contained', () => {
|
|
6
6
|
it('no backgrounds', async () => {
|
|
7
|
-
const feature = { path: '/features/test.feature', content: `When I have a test\nThen
|
|
7
|
+
const feature = { path: '/features/test.feature', content: `When I have a test\nThen it passes` };
|
|
8
8
|
const result = await testWithDefaults([feature], [TestSteps]);
|
|
9
9
|
expect(result.ok).toBe(true);
|
|
10
10
|
expect(result.results.length).toBe(1);
|
|
@@ -15,29 +15,31 @@ describe('run self-contained', () => {
|
|
|
15
15
|
expect(t.stepResults.every((r) => r.ok === true)).toBe(true);
|
|
16
16
|
});
|
|
17
17
|
});
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
18
|
+
describe.skip('increments', () => {
|
|
19
|
+
it('increments feature', async () => {
|
|
20
|
+
const TS = class TS extends AStepper {
|
|
21
|
+
steps = {
|
|
22
|
+
test: {
|
|
23
|
+
exact: 'The feature should be incremented',
|
|
24
|
+
action: async () => {
|
|
25
|
+
const { featureNum } = this.getWorld().tag;
|
|
26
|
+
this.getWorld().shared.set('result', `${featureNum}`);
|
|
27
|
+
return OK;
|
|
28
|
+
},
|
|
27
29
|
},
|
|
28
|
-
}
|
|
30
|
+
};
|
|
29
31
|
};
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
32
|
+
const feature = { path: '/features/test.feature', content: `When I have a test` };
|
|
33
|
+
const feature2 = { path: '/features/test.feature', content: `The feature should be incremented` };
|
|
34
|
+
const verify = { path: '/features/test.feature', content: `result is "2"` };
|
|
35
|
+
const { ok } = await testWithDefaults([feature, feature2, verify], [TestSteps, TS]);
|
|
36
|
+
expect(ok).toBe(true);
|
|
37
|
+
});
|
|
36
38
|
});
|
|
37
39
|
describe('run backgrounds', () => {
|
|
38
40
|
it('background', async () => {
|
|
39
41
|
const feature = { path: '/features/test.feature', content: `Backgrounds: included` };
|
|
40
|
-
const background = { path: '/backgrounds/included.feature', content: `Then
|
|
42
|
+
const background = { path: '/backgrounds/included.feature', content: `Then it passes` };
|
|
41
43
|
const result = await testWithDefaults([feature], [TestSteps], undefined, [background]);
|
|
42
44
|
expect(result.ok).toBe(true);
|
|
43
45
|
expect(result.results.length).toBe(1);
|
|
@@ -59,17 +61,25 @@ describe('fails', () => {
|
|
|
59
61
|
});
|
|
60
62
|
describe('step fails', () => {
|
|
61
63
|
it('step fails', async () => {
|
|
62
|
-
const feature = { path: '/features/test.feature', content: `When I have a test\nThen
|
|
64
|
+
const feature = { path: '/features/test.feature', content: `When I have a test\nThen it fails` };
|
|
63
65
|
const result = await testWithDefaults([feature], [TestSteps]);
|
|
64
66
|
expect(result.ok).toBe(false);
|
|
65
67
|
expect(result.failure?.stage).toBe('Execute');
|
|
66
68
|
});
|
|
67
69
|
});
|
|
70
|
+
describe('options', () => {
|
|
71
|
+
it('missing required options', async () => {
|
|
72
|
+
const feature = { path: '/features/test.feature', content: `have a stepper option` };
|
|
73
|
+
const result = await testWithDefaults([feature], [TestStepsWithRequiredOptions]);
|
|
74
|
+
expect(result.ok).toBe(false);
|
|
75
|
+
expect(result.failure?.stage).toBe('RequiredOptions');
|
|
76
|
+
});
|
|
77
|
+
});
|
|
68
78
|
describe('multiple', () => {
|
|
69
79
|
it('fail and pass', async () => {
|
|
70
80
|
const features = [
|
|
71
|
-
{ path: '/features/fails.feature', content: `When I have a test\nThen
|
|
72
|
-
{ path: '/features/passes.feature', content: `When I have a test\nThen
|
|
81
|
+
{ path: '/features/fails.feature', content: `When I have a test\nThen it fails` },
|
|
82
|
+
{ path: '/features/passes.feature', content: `When I have a test\nThen it passes` },
|
|
73
83
|
];
|
|
74
84
|
const result = await testWithDefaults(features, [TestSteps]);
|
|
75
85
|
expect(result.ok).toBe(false);
|
|
@@ -79,7 +89,7 @@ describe('multiple', () => {
|
|
|
79
89
|
});
|
|
80
90
|
describe('step vars', () => {
|
|
81
91
|
it('step vars', async () => {
|
|
82
|
-
const features = [{ path: '/features/test.feature', content: `Backgrounds: vars\nThen
|
|
92
|
+
const features = [{ path: '/features/test.feature', content: `Backgrounds: vars\nThen it passes` }];
|
|
83
93
|
const backgrounds = [{ path: '/backgrounds/vars.feature', content: `Given I set var to 1\nGiven I set Var 2 to 2\nSet Var 3 to 3` }];
|
|
84
94
|
const result = await testWithDefaults(features, [TestSteps], undefined, backgrounds);
|
|
85
95
|
expect(result.ok).toBe(true);
|
|
@@ -91,21 +101,10 @@ describe('step vars', () => {
|
|
|
91
101
|
});
|
|
92
102
|
describe('handles exception', () => {
|
|
93
103
|
it('handles exception', async () => {
|
|
94
|
-
const feature = { path: '/features/test.feature', content: `When I throw an exception\nThen
|
|
104
|
+
const feature = { path: '/features/test.feature', content: `When I throw an exception\nThen it passes` };
|
|
95
105
|
const result = await testWithDefaults([feature], [TestSteps]);
|
|
96
106
|
expect(result.ok).toBe(false);
|
|
97
107
|
expect(result.results?.length).toBe(1);
|
|
98
108
|
});
|
|
99
109
|
});
|
|
100
|
-
describe('haibun', () => {
|
|
101
|
-
it('mixed prose', async () => {
|
|
102
|
-
const feature = {
|
|
103
|
-
path: '/features/test.feature',
|
|
104
|
-
content: `Haibun prose allows mixing text descriptions with a functional test.\n When I have a test\n Then the test should pass\n \nProse sections are indicated by the presence of punctuation at the end of paragraphs.`,
|
|
105
|
-
};
|
|
106
|
-
const result = await testWithDefaults([feature], [haibun, TestSteps]);
|
|
107
|
-
expect(result.ok).toBe(true);
|
|
108
|
-
expect(result.results?.length).toBe(1);
|
|
109
|
-
});
|
|
110
|
-
});
|
|
111
110
|
//# sourceMappingURL=run.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.test.js","sourceRoot":"","sources":["../../src/lib/run.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run.test.js","sourceRoot":"","sources":["../../src/lib/run.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ declare const TestSteps: {
|
|
|
17
17
|
};
|
|
18
18
|
named: {
|
|
19
19
|
match: RegExp;
|
|
20
|
-
action: ({ param }: TNamed) => Promise<import("../defs.js").
|
|
20
|
+
action: ({ param }: TNamed) => Promise<import("../defs.js").TOKActionResult | import("../defs.js").TNotOKActionResult>;
|
|
21
21
|
};
|
|
22
22
|
throws: {
|
|
23
23
|
gwta: string;
|
|
@@ -3,19 +3,19 @@ import { actionNotOK, actionOK } from '../util/index.js';
|
|
|
3
3
|
const TestSteps = class TestSteps extends AStepper {
|
|
4
4
|
steps = {
|
|
5
5
|
fails: {
|
|
6
|
-
gwta: '
|
|
6
|
+
gwta: 'fails',
|
|
7
7
|
action: async () => actionNotOK('test fail'),
|
|
8
8
|
},
|
|
9
9
|
test: {
|
|
10
|
-
exact: '
|
|
10
|
+
exact: 'have a test',
|
|
11
11
|
action: async () => actionOK(),
|
|
12
12
|
},
|
|
13
13
|
passes: {
|
|
14
|
-
exact: '
|
|
14
|
+
exact: 'passes',
|
|
15
15
|
action: async () => actionOK(),
|
|
16
16
|
},
|
|
17
17
|
named: {
|
|
18
|
-
match: /^
|
|
18
|
+
match: /^parameter (?<param>.+) is accepted$/,
|
|
19
19
|
action: async ({ param }) => {
|
|
20
20
|
return param === 'x' ? actionOK() : actionNotOK('test');
|
|
21
21
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TestSteps.js","sourceRoot":"","sources":["../../../src/lib/test/TestSteps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGzD,MAAM,SAAS,GAAG,MAAM,SAAU,SAAQ,QAAQ;IAChD,KAAK,GAAG;QACN,KAAK,EAAE;YACL,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"TestSteps.js","sourceRoot":"","sources":["../../../src/lib/test/TestSteps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGzD,MAAM,SAAS,GAAG,MAAM,SAAU,SAAQ,QAAQ;IAChD,KAAK,GAAG;QACN,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC;SAC7C;QACD,IAAI,EAAE;YACJ,KAAK,EAAE,aAAa;YACpB,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,QAAQ,EAAE;SAC/B;QACD,MAAM,EAAE;YACN,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,QAAQ,EAAE;SAC/B;QACD,KAAK,EAAE;YACL,KAAK,EAAE,sCAAsC;YAC7C,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,EAAU,EAAE,EAAE;gBAClC,OAAO,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAC1D,CAAC;SACF;QACD,MAAM,EAAE;YACN,IAAI,EAAE,oBAAoB;YAC1B,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,MAAM,KAAK,CAAC,wBAAwB,CAAC,CAAC;YACxC,CAAC;SACF;QACD,mBAAmB,EAAE;YACnB,IAAI,EAAE,uBAAuB;YAC7B,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,QAAQ,EAAE;YAC9B,KAAK,EAAE,KAAK,IAAI,EAAE;gBAChB,OAAO;oBACL,GAAG,QAAQ,EAAE;oBACb,QAAQ,EAAE,CAAC,SAA2B,EAAE,EAAE;wBACxC,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;oBAC3C,CAAC;iBACF,CAAC;YACJ,CAAC;SACF;KACF,CAAC;CACH,CAAC;AAEF,eAAe,SAAS,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AStepper } from '../defs.js';
|
|
2
|
-
declare const TestStepsWithOptions: {
|
|
2
|
+
export declare const TestStepsWithOptions: {
|
|
3
3
|
new (): {
|
|
4
4
|
options: {
|
|
5
5
|
EXISTS: {
|
|
@@ -24,3 +24,28 @@ declare const TestStepsWithOptions: {
|
|
|
24
24
|
};
|
|
25
25
|
};
|
|
26
26
|
export default TestStepsWithOptions;
|
|
27
|
+
export declare const TestStepsWithRequiredOptions: {
|
|
28
|
+
new (): {
|
|
29
|
+
options: {
|
|
30
|
+
EXISTS: {
|
|
31
|
+
required: boolean;
|
|
32
|
+
desc: string;
|
|
33
|
+
parse: (input: string) => {
|
|
34
|
+
result: number;
|
|
35
|
+
};
|
|
36
|
+
};
|
|
37
|
+
};
|
|
38
|
+
steps: {
|
|
39
|
+
test: {
|
|
40
|
+
exact: string;
|
|
41
|
+
action: () => Promise<import("../defs.js").TOKActionResult>;
|
|
42
|
+
};
|
|
43
|
+
};
|
|
44
|
+
world?: import("../defs.js").TWorld;
|
|
45
|
+
close?(): void;
|
|
46
|
+
endFeature?(): void;
|
|
47
|
+
onFailure?(result: import("../defs.js").TStepResult): void;
|
|
48
|
+
setWorld(world: import("../defs.js").TWorld, steppers: AStepper[]): void;
|
|
49
|
+
getWorld(): import("../defs.js").TWorld;
|
|
50
|
+
};
|
|
51
|
+
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AStepper } from '../defs.js';
|
|
2
2
|
import { actionOK, getStepperOption } from '../util/index.js';
|
|
3
|
-
const TestStepsWithOptions = class TestStepsWithOptions extends AStepper {
|
|
3
|
+
export const TestStepsWithOptions = class TestStepsWithOptions extends AStepper {
|
|
4
4
|
options = {
|
|
5
5
|
EXISTS: {
|
|
6
6
|
desc: 'option exists',
|
|
@@ -9,7 +9,7 @@ const TestStepsWithOptions = class TestStepsWithOptions extends AStepper {
|
|
|
9
9
|
};
|
|
10
10
|
steps = {
|
|
11
11
|
test: {
|
|
12
|
-
exact: '
|
|
12
|
+
exact: 'have a stepper option',
|
|
13
13
|
action: async () => {
|
|
14
14
|
const res = getStepperOption(this, 'EXISTS', this.getWorld().extraOptions);
|
|
15
15
|
return actionOK({ options: { summary: 'options', details: res } });
|
|
@@ -18,4 +18,22 @@ const TestStepsWithOptions = class TestStepsWithOptions extends AStepper {
|
|
|
18
18
|
};
|
|
19
19
|
};
|
|
20
20
|
export default TestStepsWithOptions;
|
|
21
|
+
export const TestStepsWithRequiredOptions = class TestStepsWithRequiredOptions extends AStepper {
|
|
22
|
+
options = {
|
|
23
|
+
EXISTS: {
|
|
24
|
+
required: true,
|
|
25
|
+
desc: 'option exists',
|
|
26
|
+
parse: (input) => ({ result: 42 }),
|
|
27
|
+
},
|
|
28
|
+
};
|
|
29
|
+
steps = {
|
|
30
|
+
test: {
|
|
31
|
+
exact: 'have a stepper option',
|
|
32
|
+
action: async () => {
|
|
33
|
+
const res = getStepperOption(this, 'EXISTS', this.getWorld().extraOptions);
|
|
34
|
+
return actionOK({ options: { summary: 'options', details: res } });
|
|
35
|
+
},
|
|
36
|
+
},
|
|
37
|
+
};
|
|
38
|
+
};
|
|
21
39
|
//# sourceMappingURL=TestStepsWithOptions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TestStepsWithOptions.js","sourceRoot":"","sources":["../../../src/lib/test/TestStepsWithOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,QAAQ,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE9D,MAAM,oBAAoB,GAAG,MAAM,oBAAqB,SAAQ,QAAQ;
|
|
1
|
+
{"version":3,"file":"TestStepsWithOptions.js","sourceRoot":"","sources":["../../../src/lib/test/TestStepsWithOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,QAAQ,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE9D,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,oBAAqB,SAAQ,QAAQ;IAC7E,OAAO,GAAG;QACR,MAAM,EAAE;YACN,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;SAC3C;KACF,CAAC;IACF,KAAK,GAAG;QACN,IAAI,EAAE;YACJ,KAAK,EAAE,uBAAuB;YAC9B,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,MAAM,GAAG,GAAG,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,YAAY,CAAC,CAAC;gBAC3E,OAAO,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YACrE,CAAC;SACF;KACF,CAAC;CACH,CAAC;AAEF,eAAe,oBAAoB,CAAC;AAEpC,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,4BAA6B,SAAQ,QAAQ;IAC7F,OAAO,GAAG;QACR,MAAM,EAAE;YACN,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;SAC3C;KACF,CAAC;IACF,KAAK,GAAG;QACN,IAAI,EAAE;YACJ,KAAK,EAAE,uBAAuB;YAC9B,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,MAAM,GAAG,GAAG,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,YAAY,CAAC,CAAC;gBAC3E,OAAO,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YACrE,CAAC;SACF;KACF,CAAC;CACH,CAAC"}
|
package/build/lib/test/lib.js
CHANGED
|
@@ -23,10 +23,10 @@ export async function getTestEnv(useSteppers, test, world) {
|
|
|
23
23
|
const csteppers = await getSteppers(useSteppers);
|
|
24
24
|
const steppers = await createSteppers(csteppers);
|
|
25
25
|
verifyExtraOptions({}, csteppers);
|
|
26
|
-
world.domains = await getDomains(steppers
|
|
26
|
+
world.domains = await getDomains(steppers);
|
|
27
27
|
verifyDomainsOrError(steppers, world);
|
|
28
|
-
const resolver = new Resolver(steppers,
|
|
29
|
-
const actions = resolver.
|
|
28
|
+
const resolver = new Resolver(steppers, world);
|
|
29
|
+
const actions = resolver.findActionableSteps(test);
|
|
30
30
|
const vstep = testVStep('test', actions);
|
|
31
31
|
return { world, vstep, csteppers, steppers };
|
|
32
32
|
}
|