@haibun/core 1.41.1-alpha → 1.41.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (78) hide show
  1. package/build/currentVersion.d.ts +1 -1
  2. package/build/currentVersion.d.ts.map +1 -1
  3. package/build/currentVersion.js +1 -1
  4. package/build/currentVersion.js.map +1 -1
  5. package/build/lib/LogHistory.d.ts +1 -1
  6. package/build/lib/LogHistory.d.ts.map +1 -1
  7. package/build/lib/LogHistory.js +1 -1
  8. package/build/lib/LogHistory.js.map +1 -1
  9. package/build/lib/Logger.d.ts +7 -7
  10. package/build/lib/Logger.d.ts.map +1 -1
  11. package/build/lib/Logger.js.map +1 -1
  12. package/build/lib/contexts.d.ts +1 -2
  13. package/build/lib/contexts.d.ts.map +1 -1
  14. package/build/lib/contexts.js +1 -2
  15. package/build/lib/contexts.js.map +1 -1
  16. package/build/lib/defs.d.ts +20 -50
  17. package/build/lib/defs.d.ts.map +1 -1
  18. package/build/lib/defs.js +19 -0
  19. package/build/lib/defs.js.map +1 -1
  20. package/build/lib/domain-types.d.ts +0 -1
  21. package/build/lib/domain-types.d.ts.map +1 -1
  22. package/build/lib/domain-types.js.map +1 -1
  23. package/build/lib/interfaces/logger.d.ts +11 -11
  24. package/build/lib/interfaces/logger.d.ts.map +1 -1
  25. package/build/lib/interfaces/logger.js.map +1 -1
  26. package/build/lib/namedVars.d.ts +4 -4
  27. package/build/lib/namedVars.d.ts.map +1 -1
  28. package/build/lib/namedVars.js +9 -4
  29. package/build/lib/namedVars.js.map +1 -1
  30. package/build/lib/test/TestSteps.d.ts +2 -12
  31. package/build/lib/test/TestSteps.d.ts.map +1 -1
  32. package/build/lib/test/TestSteps.js +0 -12
  33. package/build/lib/test/TestSteps.js.map +1 -1
  34. package/build/lib/test/TestStepsWithOptions.d.ts +2 -2
  35. package/build/lib/test/lib.d.ts +5 -7
  36. package/build/lib/test/lib.d.ts.map +1 -1
  37. package/build/lib/test/lib.js +19 -18
  38. package/build/lib/test/lib.js.map +1 -1
  39. package/build/lib/util/index.d.ts +1 -2
  40. package/build/lib/util/index.d.ts.map +1 -1
  41. package/build/lib/util/index.js +2 -15
  42. package/build/lib/util/index.js.map +1 -1
  43. package/build/lib/util/workspace-lib.d.ts +1 -2
  44. package/build/lib/util/workspace-lib.d.ts.map +1 -1
  45. package/build/lib/util/workspace-lib.js +0 -22
  46. package/build/lib/util/workspace-lib.js.map +1 -1
  47. package/build/phases/Executor.d.ts +8 -8
  48. package/build/phases/Executor.d.ts.map +1 -1
  49. package/build/phases/Executor.js +50 -53
  50. package/build/phases/Executor.js.map +1 -1
  51. package/build/phases/Resolver.d.ts +7 -8
  52. package/build/phases/Resolver.d.ts.map +1 -1
  53. package/build/phases/Resolver.js +17 -31
  54. package/build/phases/Resolver.js.map +1 -1
  55. package/build/runner.d.ts +8 -3
  56. package/build/runner.d.ts.map +1 -1
  57. package/build/runner.js +28 -10
  58. package/build/runner.js.map +1 -1
  59. package/build/steps/conformance.d.ts +1 -1
  60. package/build/steps/credentials.d.ts +1 -1
  61. package/build/steps/haibun.d.ts +8 -4
  62. package/build/steps/haibun.d.ts.map +1 -1
  63. package/build/steps/haibun.js +32 -7
  64. package/build/steps/haibun.js.map +1 -1
  65. package/build/steps/parse.d.ts +2 -2
  66. package/build/steps/vars.d.ts +15 -15
  67. package/build/steps/vars.d.ts.map +1 -1
  68. package/build/steps/vars.js +17 -18
  69. package/build/steps/vars.js.map +1 -1
  70. package/package.json +1 -1
  71. package/build/lib/run-with-options.o.d.ts +0 -2
  72. package/build/lib/run-with-options.o.d.ts.map +0 -1
  73. package/build/lib/run-with-options.o.js +0 -113
  74. package/build/lib/run-with-options.o.js.map +0 -1
  75. package/build/lib/run.o.d.ts +0 -19
  76. package/build/lib/run.o.d.ts.map +0 -1
  77. package/build/lib/run.o.js +0 -62
  78. package/build/lib/run.o.js.map +0 -1
@@ -1,8 +1,8 @@
1
1
  import { Context } from '../lib/contexts.js';
2
- import { TNamed, TVStep, TWorld, AStepper } from '../lib/defs.js';
2
+ import { TNamed, TFeatureStep, TWorld, AStepper } from '../lib/defs.js';
3
3
  declare const vars: {
4
4
  new (): {
5
- set: (named: TNamed, vstep: TVStep) => Promise<import("../lib/defs.js").TOKActionResult | {
5
+ set: (named: TNamed, featureStep: TFeatureStep) => Promise<import("../lib/defs.js").TOKActionResult | {
6
6
  topics: {
7
7
  overwrite: {
8
8
  summary: string;
@@ -10,11 +10,11 @@ declare const vars: {
10
10
  };
11
11
  ok: true;
12
12
  }>;
13
- isSet(what: string, orCond: string): import("../lib/defs.js").TOKActionResult | import("../lib/defs.js").TNotOKActionResult;
13
+ isSet(what: string, orCond: string): import("../lib/defs.js").TNotOKActionResult | import("../lib/defs.js").TOKActionResult;
14
14
  steps: {
15
15
  concat: {
16
16
  gwta: string;
17
- action: ({ p1, p2, what }: TNamed, vstep: TVStep) => Promise<import("../lib/defs.js").TOKActionResult | {
17
+ action: ({ p1, p2, what }: TNamed, featureStep: TFeatureStep) => Promise<import("../lib/defs.js").TOKActionResult | {
18
18
  topics: {
19
19
  overwrite: {
20
20
  summary: string;
@@ -25,7 +25,7 @@ declare const vars: {
25
25
  };
26
26
  showEnv: {
27
27
  gwta: string;
28
- action: (n: TNamed, vstep: TVStep) => Promise<import("../lib/defs.js").TOKActionResult | {
28
+ action: (n: TNamed, featureStep: TFeatureStep) => Promise<import("../lib/defs.js").TOKActionResult | {
29
29
  topics: {
30
30
  overwrite: {
31
31
  summary: string;
@@ -33,7 +33,7 @@ declare const vars: {
33
33
  };
34
34
  ok: true;
35
35
  }>;
36
- build: (n: TNamed, vstep: TVStep) => Promise<import("../lib/defs.js").TOKActionResult | {
36
+ build: (n: TNamed, featureStep: TFeatureStep) => Promise<import("../lib/defs.js").TOKActionResult | {
37
37
  topics: {
38
38
  overwrite: {
39
39
  summary: string;
@@ -44,7 +44,7 @@ declare const vars: {
44
44
  };
45
45
  showVars: {
46
46
  gwta: string;
47
- action: (n: TNamed, vstep: TVStep) => Promise<import("../lib/defs.js").TOKActionResult | {
47
+ action: (n: TNamed, featureStep: TFeatureStep) => Promise<import("../lib/defs.js").TOKActionResult | {
48
48
  topics: {
49
49
  overwrite: {
50
50
  summary: string;
@@ -52,7 +52,7 @@ declare const vars: {
52
52
  };
53
53
  ok: true;
54
54
  }>;
55
- build: (n: TNamed, vstep: TVStep) => Promise<import("../lib/defs.js").TOKActionResult | {
55
+ build: (n: TNamed, featureStep: TFeatureStep) => Promise<import("../lib/defs.js").TOKActionResult | {
56
56
  topics: {
57
57
  overwrite: {
58
58
  summary: string;
@@ -63,7 +63,7 @@ declare const vars: {
63
63
  };
64
64
  set: {
65
65
  gwta: string;
66
- action: (n: TNamed, vstep: TVStep) => Promise<import("../lib/defs.js").TOKActionResult | {
66
+ action: (n: TNamed, featureStep: TFeatureStep) => Promise<import("../lib/defs.js").TOKActionResult | {
67
67
  topics: {
68
68
  overwrite: {
69
69
  summary: string;
@@ -71,7 +71,7 @@ declare const vars: {
71
71
  };
72
72
  ok: true;
73
73
  }>;
74
- build: (n: TNamed, vstep: TVStep) => Promise<import("../lib/defs.js").TOKActionResult | {
74
+ build: (n: TNamed, featureStep: TFeatureStep) => Promise<import("../lib/defs.js").TOKActionResult | {
75
75
  topics: {
76
76
  overwrite: {
77
77
  summary: string;
@@ -82,12 +82,12 @@ declare const vars: {
82
82
  };
83
83
  is: {
84
84
  gwta: string;
85
- action: ({ what, value }: TNamed) => Promise<import("../lib/defs.js").TOKActionResult | import("../lib/defs.js").TNotOKActionResult>;
85
+ action: ({ what, value }: TNamed) => Promise<import("../lib/defs.js").TNotOKActionResult | import("../lib/defs.js").TOKActionResult>;
86
86
  };
87
87
  isSet: {
88
88
  gwta: string;
89
- action: ({ what }: TNamed, vstep: TVStep) => Promise<import("../lib/defs.js").TOKActionResult | import("../lib/defs.js").TNotOKActionResult>;
90
- build: ({ what }: TNamed, vstep: TVStep) => Promise<import("../lib/defs.js").TOKActionResult | import("../lib/defs.js").TNotOKActionResult>;
89
+ action: ({ what }: TNamed, featureStep: TFeatureStep) => Promise<import("../lib/defs.js").TNotOKActionResult | import("../lib/defs.js").TOKActionResult>;
90
+ build: ({ what }: TNamed, featureStep: TFeatureStep) => Promise<import("../lib/defs.js").TNotOKActionResult | import("../lib/defs.js").TOKActionResult>;
91
91
  };
92
92
  background: {
93
93
  match: RegExp;
@@ -109,7 +109,7 @@ declare const vars: {
109
109
  world?: TWorld;
110
110
  close?(): void;
111
111
  endFeature?(): Promise<void>;
112
- onFailure?(result: import("../lib/defs.js").TStepResult, step: TVStep): Promise<void | import("../lib/interfaces/logger.js").TMessageContext>;
112
+ onFailure?(result: import("../lib/defs.js").TStepResult, step: TFeatureStep): Promise<void | import("../lib/interfaces/logger.js").TMessageContext>;
113
113
  setWorld(world: TWorld, steppers: AStepper[]): Promise<void>;
114
114
  getWorld(): TWorld;
115
115
  };
@@ -120,7 +120,7 @@ export declare const didNotOverwrite: (what: string, present: string | Context,
120
120
  summary: string;
121
121
  };
122
122
  };
123
- export declare const setShared: ({ what, value }: TNamed, vstep: TVStep, world: TWorld, emptyOnly?: boolean) => import("../lib/defs.js").TOKActionResult | {
123
+ export declare const setShared: ({ what, value }: TNamed, featureStep: TFeatureStep, world: TWorld, emptyOnly?: boolean) => import("../lib/defs.js").TOKActionResult | {
124
124
  topics: {
125
125
  overwrite: {
126
126
  summary: string;
@@ -1 +1 @@
1
- {"version":3,"file":"vars.d.ts","sourceRoot":"","sources":["../../src/steps/vars.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAM,MAAM,EAAE,MAAM,EAAE,MAAM,EAAuB,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAM3F,QAAA,MAAM,IAAI;;qBACW,MAAM,SAAS,MAAM;;;;;;;;oBAM7B,MAAM,UAAU,MAAM;;;;2CAmBC,MAAM,SAAS,MAAM;;;;;;;;;;;4BAIpC,MAAM,SAAS,MAAM;;;;;;;;2BAItB,MAAM,SAAS,MAAM;;;;;;;;;;;4BAIpB,MAAM,SAAS,MAAM;;;;;;;;2BAItB,MAAM,SAAS,MAAM;;;;;;;;;;;4BAIpB,MAAM,SAAS,MAAM;;;;;;;;2BAGtB,MAAM,SAAS,MAAM;;;;;;;;;;;0CAIN,MAAM;;;;mCASb,MAAM,SAAS,MAAM;kCACtB,MAAM,SAAS,MAAM;;;;yCAId,MAAM;;;;sCAOT,MAAM;;;;uCAOL,MAAM;;;;mCAOV,MAAM;;;;;;;;;;CAOjC,CAAC;AACF,eAAe,IAAI,CAAC;AAEpB,eAAO,MAAM,eAAe,SAAU,MAAM,WAAW,MAAM,GAAG,OAAO,SAAS,MAAM;;;;CAEpF,CAAC;AAEH,eAAO,MAAM,SAAS,oBAAqB,MAAM,SAAS,MAAM,SAAS,MAAM;;;;;;;CAa9E,CAAC"}
1
+ {"version":3,"file":"vars.d.ts","sourceRoot":"","sources":["../../src/steps/vars.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAM,MAAM,EAAE,YAAY,EAAE,MAAM,EAAuB,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAMjG,QAAA,MAAM,IAAI;;qBACW,MAAM,eAAe,YAAY;;;;;;;;oBAOzC,MAAM,UAAU,MAAM;;;;2CAmBC,MAAM,eAAe,YAAY;;;;;;;;;;;4BAIhD,MAAM,eAAe,YAAY;;;;;;;;2BAIlC,MAAM,eAAe,YAAY;;;;;;;;;;;4BAIhC,MAAM,eAAe,YAAY;;;;;;;;2BAIlC,MAAM,eAAe,YAAY;;;;;;;;;;;4BAIhC,MAAM,eAAe,YAAY;;;;;;;;2BAGlC,MAAM,eAAe,YAAY;;;;;;;;;;;0CAIlB,MAAM;;;;mCAQb,MAAM,eAAe,YAAY;kCAClC,MAAM,eAAe,YAAY;;;;yCAI1B,MAAM;;;;sCAOT,MAAM;;;;uCAOL,MAAM;;;;mCAOV,MAAM;;;;;;;;;;CAOjC,CAAC;AACF,eAAe,IAAI,CAAC;AAEpB,eAAO,MAAM,eAAe,SAAU,MAAM,WAAW,MAAM,GAAG,OAAO,SAAS,MAAM;;;;CAEpF,CAAC;AAEH,eAAO,MAAM,SAAS,oBAAqB,MAAM,eAAe,YAAY,SAAS,MAAM;;;;;;;CAU1F,CAAC"}
@@ -3,10 +3,11 @@ import { actionNotOK } from '../lib/util/index.js';
3
3
  // FIXME see https://github.com/withhaibun/haibun/issues/18
4
4
  const getOrCond = (fr) => fr.replace(/.* is set or /, '');
5
5
  const vars = class Vars extends AStepper {
6
- set = async (named, vstep) => {
6
+ set = async (named, featureStep) => {
7
7
  // FIXME see https://github.com/withhaibun/haibun/issues/18
8
- const emptyOnly = !!vstep.in.match(/set empty /);
9
- return setShared(named, vstep, this.getWorld(), emptyOnly);
8
+ const emptyOnly = !!featureStep.in.match(/set empty /);
9
+ const res = setShared(named, featureStep, this.getWorld(), emptyOnly);
10
+ return res;
10
11
  };
11
12
  isSet(what, orCond) {
12
13
  if (this.getWorld().shared.get(what) !== undefined) {
@@ -24,30 +25,30 @@ const vars = class Vars extends AStepper {
24
25
  steps = {
25
26
  concat: {
26
27
  gwta: 'concat {p1} and {p2} as {what}',
27
- action: async ({ p1, p2, what }, vstep) => await this.set({ what, value: `${p1}${p2}` }, vstep),
28
+ action: async ({ p1, p2, what }, featureStep) => await this.set({ what, value: `${p1}${p2}` }, featureStep),
28
29
  },
29
30
  showEnv: {
30
31
  gwta: 'show env',
31
- action: async (n, vstep) => {
32
+ action: async (n, featureStep) => {
32
33
  console.info('env', this.world.options.env);
33
- return await this.set(n, vstep);
34
+ return await this.set(n, featureStep);
34
35
  },
35
- build: async (n, vstep) => await this.set(n, vstep),
36
+ build: async (n, featureStep) => await this.set(n, featureStep),
36
37
  },
37
38
  showVars: {
38
39
  gwta: 'show vars',
39
- action: async (n, vstep) => {
40
+ action: async (n, featureStep) => {
40
41
  console.info('vars', this.world.shared);
41
- return await this.set(n, vstep);
42
+ return await this.set(n, featureStep);
42
43
  },
43
- build: async (n, vstep) => await this.set(n, vstep),
44
+ build: async (n, featureStep) => await this.set(n, featureStep),
44
45
  },
45
46
  set: {
46
47
  gwta: 'set( empty)? {what: string} to {value: string}',
47
- action: async (n, vstep) => {
48
- return await this.set(n, vstep);
48
+ action: async (n, featureStep) => {
49
+ return await this.set(n, featureStep);
49
50
  },
50
- build: async (n, vstep) => await this.set(n, vstep),
51
+ build: async (n, featureStep) => await this.set(n, featureStep),
51
52
  },
52
53
  is: {
53
54
  gwta: '{what: string} is "{value}"',
@@ -58,8 +59,8 @@ const vars = class Vars extends AStepper {
58
59
  },
59
60
  isSet: {
60
61
  gwta: '{what: string} is set( or .*)?',
61
- action: async ({ what }, vstep) => this.isSet(what, getOrCond(vstep.in)),
62
- build: async ({ what }, vstep) => this.isSet(what, getOrCond(vstep.in)),
62
+ action: async ({ what }, featureStep) => this.isSet(what, getOrCond(featureStep.in)),
63
+ build: async ({ what }, featureStep) => this.isSet(what, getOrCond(featureStep.in)),
63
64
  },
64
65
  background: {
65
66
  match: /^Background: ?(?<background>.+)?$/,
@@ -95,9 +96,7 @@ export default vars;
95
96
  export const didNotOverwrite = (what, present, value) => ({
96
97
  overwrite: { summary: `did not overwrite ${what} value of "${present}" with "${value}"` },
97
98
  });
98
- export const setShared = ({ what, value }, vstep, world, emptyOnly = false) => {
99
- // if on a domain page, set it in that domain's shared
100
- const { type, name } = vstep.source;
99
+ export const setShared = ({ what, value }, featureStep, world, emptyOnly = false) => {
101
100
  let { shared } = world;
102
101
  if (!emptyOnly || shared.get(what) === undefined) {
103
102
  shared.set(what, value);
@@ -1 +1 @@
1
- {"version":3,"file":"vars.js","sourceRoot":"","sources":["../../src/steps/vars.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vars.js","sourceRoot":"","sources":["../../src/steps/vars.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@haibun/core",
3
3
  "type": "module",
4
- "version": "1.41.1-alpha",
4
+ "version": "1.41.3",
5
5
  "description": "",
6
6
  "author": "",
7
7
  "xexports": {
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=run-with-options.o.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"run-with-options.o.d.ts","sourceRoot":"","sources":["../../src/lib/run-with-options.o.ts"],"names":[],"mappings":""}
@@ -1,113 +0,0 @@
1
- export {};
2
- /*
3
- import { TStartRunCallback, TProtoOptions, TSpecl, TWorld, TTag, TRunOptions, TRunResult, TTagValue, TEndFeatureCallback, TBase } from './defs.js';
4
- import { WorldContext } from './contexts.js';
5
- import Logger from './Logger.js';
6
-
7
- import { run } from './run.o.js';
8
- import { getRunTag } from './util/index.js';
9
- import { getOutputResult } from './util/workspace-lib.js';
10
- import { ILogOutput } from './interfaces/logger.js';
11
- import { Timer } from './Timer.js';
12
-
13
- export default async function runWithOptions(runOptions: TRunOptions) {
14
- const { loops, members, trace, startRunCallback, endFeatureCallback, featureFilter, specl, bases, splits, protoOptions } = runOptions;
15
- const { LOG_LEVEL: logLevel, LOG_FOLLOW: logFollow } = protoOptions.options;
16
-
17
- const logger = new Logger({ level: logLevel || 'debug', follow: logFollow });
18
-
19
- const timer = new Timer();
20
- let totalRan = 0;
21
- type TFailure = { sequence: TTagValue; runDuration: number; fromStart: number };
22
- const allFailures: { [message: string]: TFailure[] } = {};
23
- let allRunResults: PromiseSettledResult<TRunResult>[] = [];
24
-
25
- for (let loop = 1; loop < loops + 1; loop++) {
26
- loops > 1 && logger.log(`starting loop ${loop}/${loops}`);
27
- let groupRuns: Promise<TRunResult>[] = [];
28
- for (let member = 1; member < members + 1; member++) {
29
- members > 1 && logger.log(`starting member ${member + 1}/${members}`);
30
- const instances = splits.map(async (split) => {
31
- splits.length > 1 && logger.log(`starting instance ${split}`);
32
- const runtime = {};
33
- const tag: TTag = getRunTag(totalRan, loop, member, 0, split, trace);
34
- totalRan++;
35
-
36
- const res = await doInstanceRun(bases, specl, runtime, featureFilter, new WorldContext(tag, split), protoOptions, logger, tag, timer, startRunCallback, endFeatureCallback);
37
- return res;
38
- });
39
- groupRuns = groupRuns.concat(instances);
40
- }
41
-
42
- const theseValues = await Promise.allSettled(groupRuns);
43
- allRunResults = allRunResults.concat(theseValues);
44
- }
45
-
46
- const ranResults = allRunResults
47
- .filter((i) => i.status === 'fulfilled')
48
- .map((i) => <PromiseFulfilledResult<TRunResult>>i)
49
- .map((i) => i.value);
50
-
51
- let passed = 0;
52
- let failed = 0;
53
-
54
- const output = [];
55
- for (const r of ranResults) {
56
- output.push(r.output);
57
- if (r.result.ok) {
58
- passed++;
59
- } else {
60
- try {
61
- const errorMessage = r.result?.failure?.error?.message || JSON.stringify(r.result.failure);
62
- allFailures[errorMessage] = (allFailures[errorMessage] || []).concat({
63
- sequence: r.tag.sequence,
64
- runDuration: r.runDuration,
65
- fromStart: r.fromStart,
66
- });
67
- failed++;
68
- } catch (e) {
69
- console.error('fail message', e, '\nfrom:', r.result.failure, 'bailing');
70
- throw (e);
71
- }
72
- }
73
- }
74
-
75
- const exceptionResults = allRunResults
76
- .filter((i) => i.status === 'rejected')
77
- .map((i) => <PromiseRejectedResult>i)
78
- .map((i) => i.reason);
79
-
80
- const ok = ranResults.every((a) => a.result.ok);
81
- const runTime = timer.since();
82
- return { ok, output, exceptionResults, ranResults, allFailures, logger, passed, failed, totalRan, runTime };
83
- }
84
-
85
- async function doInstanceRun(
86
- bases: TBase,
87
- specl: TSpecl,
88
- runtime: object,
89
- featureFilter: string[] | undefined,
90
- shared: WorldContext,
91
- protoOptions: TProtoOptions,
92
- containerLogger: ILogOutput,
93
- tag: TTag,
94
- timer: Timer,
95
- startRunCallback?: TStartRunCallback,
96
- endFeatureCallback?: TEndFeatureCallback
97
- ) {
98
- const runStart = process.hrtime();
99
- const logger = new Logger({ output: containerLogger, tag });
100
-
101
- const world: TWorld = { options: protoOptions.options, moduleOptions: protoOptions.moduleOptions, shared, logger, runtime, domains: [], tag, timer, bases };
102
- if (startRunCallback) {
103
- startRunCallback(world);
104
- }
105
-
106
- const runResult = await run({ specl, bases, world, featureFilter, endFeatureCallback });
107
- const output = await getOutputResult(world.options.OUTPUT, runResult);
108
-
109
- return { result: runResult, shared, output, tag, runStart: runStart[0], runDuration: process.hrtime(runStart)[0], fromStart: timer.since() };
110
- }
111
-
112
- */
113
- //# sourceMappingURL=run-with-options.o.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"run-with-options.o.js","sourceRoot":"","sources":["../../src/lib/run-with-options.o.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8GE"}
@@ -1,19 +0,0 @@
1
- import { TSpecl, TExecutorResult, TWorld, TFeature, TEndFeatureCallback, CStepper, TBase } from './defs.js';
2
- type TBaseOptions = {
3
- specl: TSpecl;
4
- world: TWorld;
5
- addSteppers?: CStepper[];
6
- endFeatureCallback?: TEndFeatureCallback;
7
- };
8
- type TRunOptions = TBaseOptions & {
9
- bases: TBase;
10
- featureFilter: string[];
11
- };
12
- type TRunWithFeaturesBackgrounds = TBaseOptions & {
13
- features: TFeature[];
14
- backgrounds: TFeature[];
15
- };
16
- export declare function run({ specl, bases, world, addSteppers, featureFilter, endFeatureCallback }: TRunOptions): Promise<TExecutorResult>;
17
- export declare function runWith({ specl, world, features, backgrounds, addSteppers, endFeatureCallback }: TRunWithFeaturesBackgrounds): Promise<TExecutorResult>;
18
- export {};
19
- //# sourceMappingURL=run.o.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"run.o.d.ts","sourceRoot":"","sources":["../../src/lib/run.o.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAoB,mBAAmB,EAAE,QAAQ,EAAoC,KAAK,EAAa,MAAM,WAAW,CAAC;AAQ3K,KAAK,YAAY,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,CAAC;IAAC,kBAAkB,CAAC,EAAE,mBAAmB,CAAC;CAAE,CAAC;AAE1H,KAAK,WAAW,GAAG,YAAY,GAAG;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAC;CAAE,CAAC;AAE7E,KAAK,2BAA2B,GAAG,YAAY,GAAG;IAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAAC,WAAW,EAAE,QAAQ,EAAE,CAAC;CAAE,CAAC;AAErG,wBAAsB,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,WAAgB,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAc7I;AAED,wBAAsB,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAgB,EAAE,kBAAkB,EAAE,EAAE,2BAA2B,GAAG,OAAO,CAAC,eAAe,CAAC,CA+ClK"}
@@ -1,62 +0,0 @@
1
- import { expand } from './features.js';
2
- import { Executor } from '../phases/Executor.js';
3
- import { Resolver } from '../phases/Resolver.js';
4
- import { verifyExtraOptions, getRunTag, verifyRequiredOptions, createSteppers, setStepperWorlds } from './util/index.js';
5
- import { getSteppers } from './util/workspace-lib.js';
6
- import { getFeaturesAndBackgrounds } from '../phases/collector.js';
7
- export async function run({ specl, bases, world, addSteppers = [], featureFilter, endFeatureCallback }) {
8
- if (!world.options || !world.moduleOptions) {
9
- throw Error(`missing options ${world.options} moduleOptions ${world.moduleOptions}`);
10
- }
11
- let featuresBackgrounds;
12
- try {
13
- featuresBackgrounds = getFeaturesAndBackgrounds(bases, featureFilter);
14
- }
15
- catch (error) {
16
- return ({ ok: false, tag: getRunTag(-1, -1, {}, false), failure: { stage: 'Collect', error: { message: error.message, details: { stack: error.stack } } }, shared: world.shared });
17
- }
18
- const { features, backgrounds } = featuresBackgrounds;
19
- const res = await runWith({ specl, world, features, backgrounds, addSteppers, endFeatureCallback });
20
- return res;
21
- }
22
- export async function runWith({ specl, world, features, backgrounds, addSteppers = [], endFeatureCallback }) {
23
- const { tag } = world;
24
- let result = undefined;
25
- const errorBail = (phase, error, details) => {
26
- world.logger.error(`errorBail ${phase} ${error} ${details}`, error.stack);
27
- result = { ok: false, shared: world.shared, tag, failure: { stage: phase, error: { message: error.message, details: { stack: error.stack, details } } } };
28
- throw Error(error);
29
- };
30
- try {
31
- const baseSteppers = await getSteppers(specl.steppers).catch((error) => errorBail('Steppers', error));
32
- const csteppers = [...baseSteppers, ...addSteppers];
33
- await verifyRequiredOptions(csteppers, world.moduleOptions).catch((error) => errorBail('RequiredOptions', error));
34
- await verifyExtraOptions(world.moduleOptions, csteppers).catch((error) => errorBail('moduleOptions', error));
35
- const expandedFeatures = await expand(backgrounds, features).catch((error) => errorBail('Expand', error));
36
- const steppers = await createSteppers(csteppers);
37
- await setStepperWorlds(steppers, world).catch((error) => errorBail('StepperOptions', error));
38
- const resolver = new Resolver(steppers, world);
39
- const mappedValidatedSteps = await resolver.resolveStepsFromFeatures(expandedFeatures).catch((error) => errorBail('Resolve', error));
40
- // await builder.build(mappedValidatedSteps).catch((error) => errorBail('Build', error, { stack: error.stack, mappedValidatedSteps }));
41
- world.logger.log(`features: ${expandedFeatures.length} backgrounds: ${backgrounds.length} steps: (${expandedFeatures.map((e) => e.path)}), ${mappedValidatedSteps.length}`);
42
- result = await Executor.execute(csteppers, world, mappedValidatedSteps, endFeatureCallback)
43
- .catch((error) => errorBail('Execute', error));
44
- if (!result || !result.ok) {
45
- let message;
46
- try {
47
- message = result.featureResults[0].stepResults.find((s) => !s.ok)?.actionResults[0]?.message || result.featureResults;
48
- }
49
- catch (e) {
50
- message = e;
51
- }
52
- result.failure = { stage: 'Execute', error: { message, details: { stack: [], errors: result.featureResults?.filter((r) => !r.ok).map((r) => r.path) } } };
53
- }
54
- }
55
- catch (error) {
56
- if (!result) {
57
- errorBail('catch', error);
58
- }
59
- }
60
- return result;
61
- }
62
- //# sourceMappingURL=run.o.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"run.o.js","sourceRoot":"","sources":["../../src/lib/run.o.ts"],"names":[],"mappings":"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"}