@haibun/core 1.41.2 → 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 (72) hide show
  1. package/build/currentVersion.d.ts +1 -1
  2. package/build/currentVersion.js +1 -1
  3. package/build/lib/LogHistory.d.ts +1 -1
  4. package/build/lib/LogHistory.d.ts.map +1 -1
  5. package/build/lib/LogHistory.js +1 -1
  6. package/build/lib/LogHistory.js.map +1 -1
  7. package/build/lib/Logger.d.ts +7 -7
  8. package/build/lib/Logger.d.ts.map +1 -1
  9. package/build/lib/Logger.js.map +1 -1
  10. package/build/lib/contexts.d.ts +1 -1
  11. package/build/lib/contexts.d.ts.map +1 -1
  12. package/build/lib/contexts.js +1 -1
  13. package/build/lib/contexts.js.map +1 -1
  14. package/build/lib/defs.d.ts +20 -50
  15. package/build/lib/defs.d.ts.map +1 -1
  16. package/build/lib/defs.js +19 -0
  17. package/build/lib/defs.js.map +1 -1
  18. package/build/lib/interfaces/logger.d.ts +11 -11
  19. package/build/lib/interfaces/logger.d.ts.map +1 -1
  20. package/build/lib/interfaces/logger.js.map +1 -1
  21. package/build/lib/namedVars.d.ts +4 -4
  22. package/build/lib/namedVars.d.ts.map +1 -1
  23. package/build/lib/namedVars.js +2 -2
  24. package/build/lib/namedVars.js.map +1 -1
  25. package/build/lib/test/TestSteps.d.ts +2 -12
  26. package/build/lib/test/TestSteps.d.ts.map +1 -1
  27. package/build/lib/test/TestSteps.js +0 -12
  28. package/build/lib/test/TestSteps.js.map +1 -1
  29. package/build/lib/test/TestStepsWithOptions.d.ts +2 -2
  30. package/build/lib/test/lib.d.ts +4 -6
  31. package/build/lib/test/lib.d.ts.map +1 -1
  32. package/build/lib/test/lib.js +14 -16
  33. package/build/lib/test/lib.js.map +1 -1
  34. package/build/lib/util/index.d.ts.map +1 -1
  35. package/build/lib/util/index.js +2 -3
  36. package/build/lib/util/index.js.map +1 -1
  37. package/build/lib/util/workspace-lib.d.ts +1 -2
  38. package/build/lib/util/workspace-lib.d.ts.map +1 -1
  39. package/build/lib/util/workspace-lib.js +0 -22
  40. package/build/lib/util/workspace-lib.js.map +1 -1
  41. package/build/phases/Executor.d.ts +8 -8
  42. package/build/phases/Executor.d.ts.map +1 -1
  43. package/build/phases/Executor.js +49 -50
  44. package/build/phases/Executor.js.map +1 -1
  45. package/build/phases/Resolver.d.ts +7 -8
  46. package/build/phases/Resolver.d.ts.map +1 -1
  47. package/build/phases/Resolver.js +17 -31
  48. package/build/phases/Resolver.js.map +1 -1
  49. package/build/runner.d.ts +8 -3
  50. package/build/runner.d.ts.map +1 -1
  51. package/build/runner.js +28 -10
  52. package/build/runner.js.map +1 -1
  53. package/build/steps/conformance.d.ts +1 -1
  54. package/build/steps/credentials.d.ts +1 -1
  55. package/build/steps/haibun.d.ts +8 -4
  56. package/build/steps/haibun.d.ts.map +1 -1
  57. package/build/steps/haibun.js +32 -7
  58. package/build/steps/haibun.js.map +1 -1
  59. package/build/steps/parse.d.ts +2 -2
  60. package/build/steps/vars.d.ts +15 -15
  61. package/build/steps/vars.d.ts.map +1 -1
  62. package/build/steps/vars.js +16 -16
  63. package/build/steps/vars.js.map +1 -1
  64. package/package.json +1 -1
  65. package/build/lib/run-with-options.o.d.ts +0 -2
  66. package/build/lib/run-with-options.o.d.ts.map +0 -1
  67. package/build/lib/run-with-options.o.js +0 -113
  68. package/build/lib/run-with-options.o.js.map +0 -1
  69. package/build/lib/run.o.d.ts +0 -19
  70. package/build/lib/run.o.d.ts.map +0 -1
  71. package/build/lib/run.o.js +0 -62
  72. package/build/lib/run.o.js.map +0 -1
@@ -1,57 +1,43 @@
1
- import { OK } from '../lib/defs.js';
1
+ import { OK, } from '../lib/defs.js';
2
2
  import { BASE_TYPES } from '../lib/domain-types.js';
3
3
  import { namedInterpolation, getMatch } from '../lib/namedVars.js';
4
4
  import { getActionable, describeSteppers, isLowerCase, dePolite, constructorName } from '../lib/util/index.js';
5
5
  export class Resolver {
6
6
  steppers;
7
- world;
8
- mode;
9
7
  types;
10
- constructor(steppers, world) {
8
+ constructor(steppers) {
11
9
  this.steppers = steppers;
12
- this.world = world;
13
10
  this.types = BASE_TYPES;
14
11
  }
15
12
  async resolveStepsFromFeatures(features) {
16
- const expanded = [];
13
+ const steps = [];
17
14
  for (const feature of features) {
18
- try {
19
- const vsteps = await this.findVSteps(feature, feature.path);
20
- const e = { ...feature, ...{ vsteps } };
21
- expanded.push(e);
22
- }
23
- catch (e) {
24
- this.world.logger.error(e);
25
- throw e;
26
- }
15
+ const featureSteps = await this.findFeatureSteps(feature);
16
+ const e = { ...feature, ...{ featureSteps } };
17
+ steps.push(e);
27
18
  }
28
- return expanded;
19
+ return steps;
29
20
  }
30
- async findVSteps(feature, path, build = true) {
31
- let vsteps = [];
21
+ async findFeatureSteps(feature) {
22
+ let featureSteps = [];
32
23
  let seq = 0;
33
24
  for (const featureLine of feature.expanded) {
34
25
  seq++;
35
26
  const actionable = getActionable(featureLine.line);
36
27
  const actions = this.findActionableSteps(actionable);
37
- /*
38
- try {
39
- // FIXME
40
- checkRequiredType(feature, featureLine.line, actions, this.world);
41
- } catch (e) {
42
- throw e;
43
- }
44
- */
45
28
  if (actions.length > 1) {
46
29
  throw Error(`more than one step found for "${featureLine.line}": ${JSON.stringify(actions.map((a) => a.actionName))}`);
47
30
  }
48
31
  else if (actions.length < 1) {
49
32
  throw Error(`no step found for ${featureLine.line} in ${feature.path} from ${describeSteppers(this.steppers)}`);
50
33
  }
51
- const vstep = { source: featureLine.feature, in: featureLine.line, seq, actions };
52
- vsteps.push(vstep);
34
+ const featureStep = this.getFeatureStep(featureLine, seq, actions[0]);
35
+ featureSteps.push(featureStep);
53
36
  }
54
- return vsteps;
37
+ return featureSteps;
38
+ }
39
+ getFeatureStep(featureLine, seq, action) {
40
+ return { source: featureLine.feature, in: featureLine.line, seq, action };
55
41
  }
56
42
  findActionableSteps(actionable) {
57
43
  if (!actionable.length) {
@@ -63,7 +49,7 @@ export class Resolver {
63
49
  const { steps } = stepper;
64
50
  for (const actionName in steps) {
65
51
  const step = steps[actionName];
66
- const stepFound = this.choose(step, actionable, actionName, stepperName);
52
+ const stepFound = this.stepApplies(step, actionable, actionName, stepperName);
67
53
  if (stepFound) {
68
54
  found.push(stepFound);
69
55
  }
@@ -71,7 +57,7 @@ export class Resolver {
71
57
  }
72
58
  return found;
73
59
  }
74
- choose(step, actionable, actionName, stepperName) {
60
+ stepApplies(step, actionable, actionName, stepperName) {
75
61
  const curt = dePolite(actionable);
76
62
  if (step.gwta) {
77
63
  const { str, vars } = namedInterpolation(step.gwta, this.types);
@@ -1 +1 @@
1
- {"version":3,"file":"Resolver.js","sourceRoot":"","sources":["../../src/phases/Resolver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Resolver.js","sourceRoot":"","sources":["../../src/phases/Resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,EAAE,GAMF,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,WAAW,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE/G,MAAM,OAAO,QAAQ;IAGA;IAFpB,KAAK,CAAW;IAEhB,YAAoB,QAAoB;QAApB,aAAQ,GAAR,QAAQ,CAAY;QACvC,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,QAA4B;QAC1D,MAAM,KAAK,GAAuB,EAAE,CAAC;QACrC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAChC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAC1D,MAAM,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE,CAAC;YAC9C,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACf,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,OAAyB;QACtD,IAAI,YAAY,GAAmB,EAAE,CAAC;QACtC,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,KAAK,MAAM,WAAW,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC5C,GAAG,EAAE,CAAC;YAEN,MAAM,UAAU,GAAG,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAEnD,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;YAErD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,MAAM,KAAK,CAAC,iCAAiC,WAAW,CAAC,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;YACxH,CAAC;iBAAM,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,MAAM,KAAK,CAAC,qBAAqB,WAAW,CAAC,IAAI,OAAO,OAAO,CAAC,IAAI,SAAS,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACjH,CAAC;YACD,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YACtE,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAChC,CAAC;QAED,OAAO,YAAY,CAAC;IACrB,CAAC;IAED,cAAc,CAAC,WAA0B,EAAE,GAAW,EAAE,MAAmB;QAC1E,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,EAAE,EAAE,EAAE,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IAC3E,CAAC;IAEM,mBAAmB,CAAC,UAAkB;QAC5C,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YACxB,OAAO,CAAC,OAAO,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,KAAK,GAAkB,EAAE,CAAC;QAEhC,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACrC,MAAM,WAAW,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;YAC7C,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;YAC1B,KAAK,MAAM,UAAU,IAAI,KAAK,EAAE,CAAC;gBAChC,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;gBAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;gBAE9E,IAAI,SAAS,EAAE,CAAC;oBACf,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACvB,CAAC;YACF,CAAC;QACF,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAEO,WAAW,CAAC,IAAkB,EAAE,UAAkB,EAAE,UAAkB,EAAE,WAAmB;QAClG,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;QAClC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAChE,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YAC3F,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC9B,iFAAiF;YACjF,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/D,CAAC;aAAM,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACvB,OAAO,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;QACxE,CAAC;aAAM,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YAChC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QAC1C,CAAC;IACF,CAAC;IACD;OACG,CAAC,MAAM,CAAC,sBAAsB,GAAG,CAAC,OAAe,EAAE,QAAgB,EAAE,IAAY,EAAE,mBAA2B,EAAE,EAAE,CACpH,GAAG,OAAO,UAAU,QAAQ,2BAA2B,IAAI,MAAM,mBAAmB,EAAE,CAAC;IACxF,MAAM,CAAC,4BAA4B,GAAG,CAAC,OAAe,EAAE,QAAgB,EAAE,IAAY,EAAE,EAAE,CACzF,GAAG,OAAO,mBAAmB,QAAQ,oBAAoB,IAAI,GAAG,CAAC;IAClE,MAAM,CAAC,2BAA2B,GAAG,CAAC,OAAe,EAAE,QAAgB,EAAE,IAAY,EAAE,EAAE,CACxF,GAAG,OAAO,QAAQ,QAAQ,oBAAoB,IAAI,GAAG,CAAC;;AAGxD,MAAM,OAAO,GAAG;IACf,WAAW,EAAE,QAAQ;IACrB,UAAU,EAAE,SAAS;IACrB,IAAI,EAAE;QACL,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,KAAK,IAAI,EAAE;YAClB,OAAO,EAAE,CAAC;QACX,CAAC;KACD;CACD,CAAC"}
package/build/runner.d.ts CHANGED
@@ -1,11 +1,16 @@
1
- import { TWorld, TExecutorResult, CStepper } from './lib/defs.js';
1
+ import { TWorld, TExecutorResult, CStepper, TEndFeatureCallback } from './lib/defs.js';
2
2
  import { TFeaturesBackgrounds } from './phases/collector.js';
3
+ export type TRunnerCallbacks = {
4
+ endFeature?: TEndFeatureCallback[];
5
+ };
3
6
  export declare class Runner {
4
- private result;
5
7
  private world;
6
- constructor(world: TWorld);
8
+ private callbacks;
9
+ private result;
10
+ constructor(world: TWorld, callbacks?: TRunnerCallbacks);
7
11
  private errorBail;
8
12
  run(steppers: string[]): Promise<TExecutorResult>;
9
13
  runFeaturesAndBackgrounds(csteppers: CStepper[], { features, backgrounds }: TFeaturesBackgrounds): Promise<TExecutorResult>;
14
+ private applyEffectFeatures;
10
15
  }
11
16
  //# sourceMappingURL=runner.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAA+B,QAAQ,EAAE,MAAM,eAAe,CAAC;AAI/F,OAAO,EAA6B,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAIxF,qBAAa,MAAM;IAClB,OAAO,CAAC,MAAM,CAA8B;IAC5C,OAAO,CAAC,KAAK,CAAS;gBAEV,KAAK,EAAE,MAAM;IAIzB,OAAO,CAAC,SAAS,CASf;IAEI,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE;IActB,yBAAyB,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,oBAAoB;CAmCtG"}
1
+ {"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,MAAM,EACN,eAAe,EAEf,QAAQ,EACR,mBAAmB,EAInB,MAAM,eAAe,CAAC;AAWvB,OAAO,EAA6B,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAIxF,MAAM,MAAM,gBAAgB,GAAG;IAC9B,UAAU,CAAC,EAAE,mBAAmB,EAAE,CAAC;CACnC,CAAC;AAEF,qBAAa,MAAM;IAGN,OAAO,CAAC,KAAK;IAAU,OAAO,CAAC,SAAS;IAFpD,OAAO,CAAC,MAAM,CAA8B;gBAExB,KAAK,EAAE,MAAM,EAAU,SAAS,GAAE,gBAAqB;IAE3E,OAAO,CAAC,SAAS,CASf;IAEI,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE;IAatB,yBAAyB,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,oBAAoB;YAoCxF,mBAAmB;CAgBjC"}
package/build/runner.js CHANGED
@@ -1,14 +1,17 @@
1
1
  import { expand } from './lib/features.js';
2
- import { verifyRequiredOptions, verifyExtraOptions, createSteppers, setStepperWorlds } from './lib/util/index.js';
2
+ import { getNamedToVars } from './lib/namedVars.js';
3
+ import { verifyRequiredOptions, verifyExtraOptions, createSteppers, setStepperWorlds, constructorName, } from './lib/util/index.js';
3
4
  import { getSteppers } from './lib/util/workspace-lib.js';
4
5
  import { getFeaturesAndBackgrounds } from './phases/collector.js';
5
6
  import { Executor } from './phases/Executor.js';
6
7
  import { Resolver } from './phases/Resolver.js';
7
8
  export class Runner {
8
- result = undefined;
9
9
  world;
10
- constructor(world) {
10
+ callbacks;
11
+ result = undefined;
12
+ constructor(world, callbacks = {}) {
11
13
  this.world = world;
14
+ this.callbacks = callbacks;
12
15
  }
13
16
  errorBail = (phase, error, details) => {
14
17
  this.world.logger.error(`errorBail ${phase} ${error} ${details}`, error.stack);
@@ -26,8 +29,7 @@ export class Runner {
26
29
  featuresBackgrounds = getFeaturesAndBackgrounds(this.world.bases, []);
27
30
  }
28
31
  catch (error) {
29
- console.error('Error collecting features and backgrounds:', error);
30
- throw error;
32
+ this.errorBail('Collector', error);
31
33
  }
32
34
  const { features, backgrounds } = featuresBackgrounds;
33
35
  const cSteppers = await getSteppers(steppers).catch((error) => this.errorBail('Steppers', error));
@@ -37,15 +39,16 @@ export class Runner {
37
39
  try {
38
40
  await verifyRequiredOptions(csteppers, this.world.moduleOptions).catch((error) => this.errorBail('RequiredOptions', error));
39
41
  await verifyExtraOptions(this.world.moduleOptions, csteppers).catch((error) => this.errorBail('moduleOptions', error));
40
- const expandedFeatures = await expand(backgrounds, features).catch((error) => this.errorBail('Expand', error));
41
42
  const steppers = await createSteppers(csteppers);
42
43
  await setStepperWorlds(steppers, this.world).catch((error) => this.errorBail('StepperOptions', error));
43
- const resolver = new Resolver(steppers, this.world);
44
- const mappedValidatedSteps = await resolver
44
+ const expandedFeatures = await expand(backgrounds, features).catch((error) => this.errorBail('Expand', error));
45
+ const resolver = new Resolver(steppers);
46
+ const resolvedFeatures = await resolver
45
47
  .resolveStepsFromFeatures(expandedFeatures)
46
48
  .catch((error) => this.errorBail('Resolve', error));
47
- this.world.logger.log(`features: ${expandedFeatures.length} backgrounds: ${backgrounds.length} steps: (${expandedFeatures.map((e) => e.path)}), ${mappedValidatedSteps.length}`);
48
- this.result = await Executor.execute(csteppers, this.world, mappedValidatedSteps).catch((error) => this.errorBail('Execute', error));
49
+ const appliedResolvedFeatures = await this.applyEffectFeatures(resolvedFeatures, steppers);
50
+ this.world.logger.log(`features: ${expandedFeatures.length} backgrounds: ${backgrounds.length} steps: (${expandedFeatures.map((e) => e.path)}), ${appliedResolvedFeatures.length}`);
51
+ this.result = await Executor.execute(csteppers, this.world, appliedResolvedFeatures, this.callbacks.endFeature).catch((error) => this.errorBail('Execute', error));
49
52
  }
50
53
  catch (error) {
51
54
  if (!this.result) {
@@ -54,5 +57,20 @@ export class Runner {
54
57
  }
55
58
  return this.result;
56
59
  }
60
+ async applyEffectFeatures(resolvedFeatures, steppers) {
61
+ let allFeatures = [...resolvedFeatures];
62
+ for (const feature of resolvedFeatures) {
63
+ for (const featureStep of feature.featureSteps) {
64
+ const action = featureStep.action;
65
+ const stepper = steppers.find((s) => constructorName(s) === action.stepperName);
66
+ if (stepper && stepper.steps[action.actionName]?.applyEffect) {
67
+ const found = action;
68
+ const namedWithVars = getNamedToVars(found, this.world, featureStep);
69
+ allFeatures = await stepper.steps[action.actionName].applyEffect(namedWithVars, [feature]);
70
+ }
71
+ }
72
+ }
73
+ return allFeatures;
74
+ }
57
75
  }
58
76
  //# sourceMappingURL=runner.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"runner.js","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAClH,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAwB,MAAM,uBAAuB,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,MAAM,OAAO,MAAM;IACV,MAAM,GAAoB,SAAS,CAAC;IACpC,KAAK,CAAS;IAEtB,YAAY,KAAa;QACxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACpB,CAAC;IAEO,SAAS,GAAG,CAAC,KAAa,EAAE,KAAgB,EAAE,OAAmB,EAAE,EAAE;QAC5E,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,KAAK,IAAI,KAAK,IAAI,OAAO,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAC/E,IAAI,CAAC,MAAM,GAAG;YACb,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM;YACzB,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG;YACnB,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE;SACtG,CAAC;QACF,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC,CAAC;IAEF,KAAK,CAAC,GAAG,CAAC,QAAkB;QAC3B,IAAI,mBAAmB,GAAyB,SAAS,CAAC;QAC1D,IAAI,CAAC;YACJ,mBAAmB,GAAG,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACvE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,CAAC,4CAA4C,EAAE,KAAK,CAAC,CAAC;YACnE,MAAM,KAAK,CAAC;QACb,CAAC;QAED,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,mBAAmB,CAAC;QACtD,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;QAClG,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;IACnF,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,SAAqB,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAwB;QACrG,IAAI,CAAC;YACJ,MAAM,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAChF,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,KAAK,CAAC,CACxC,CAAC;YACF,MAAM,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC;YAEvH,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;YAE/G,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,CAAC;YAEjD,MAAM,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC,CAAC;YAEvG,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YACpD,MAAM,oBAAoB,GAAuB,MAAM,QAAQ;iBAC7D,wBAAwB,CAAC,gBAAgB,CAAC;iBAC1C,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;YAErD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CACpB,aAAa,gBAAgB,CAAC,MAAM,iBAAiB,WAAW,CAAC,MAAM,YAAY,gBAAgB,CAAC,GAAG,CACtG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CACb,MAAM,oBAAoB,CAAC,MAAM,EAAE,CACpC,CAAC;YAEF,IAAI,CAAC,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CACjG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAChC,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBAClB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAChC,CAAC;QACF,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;CACD"}
1
+ {"version":3,"file":"runner.js","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"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"}
@@ -10,7 +10,7 @@ declare const Conformance: {
10
10
  world?: import("../lib/defs.js").TWorld;
11
11
  close?(): void;
12
12
  endFeature?(): Promise<void>;
13
- onFailure?(result: import("../lib/defs.js").TStepResult, step: import("../lib/defs.js").TVStep): Promise<void | import("../lib/interfaces/logger.js").TMessageContext>;
13
+ onFailure?(result: import("../lib/defs.js").TStepResult, step: import("../lib/defs.js").TFeatureStep): Promise<void | import("../lib/interfaces/logger.js").TMessageContext>;
14
14
  setWorld(world: import("../lib/defs.js").TWorld, steppers: AStepper[]): Promise<void>;
15
15
  getWorld(): import("../lib/defs.js").TWorld;
16
16
  };
@@ -18,7 +18,7 @@ declare const Credentials: {
18
18
  world?: import("../lib/defs.js").TWorld;
19
19
  close?(): void;
20
20
  endFeature?(): Promise<void>;
21
- onFailure?(result: import("../lib/defs.js").TStepResult, step: import("../lib/defs.js").TVStep): Promise<void | import("../lib/interfaces/logger.js").TMessageContext>;
21
+ onFailure?(result: import("../lib/defs.js").TStepResult, step: import("../lib/defs.js").TFeatureStep): Promise<void | import("../lib/interfaces/logger.js").TMessageContext>;
22
22
  setWorld(world: import("../lib/defs.js").TWorld, steppers: AStepper[]): Promise<void>;
23
23
  getWorld(): import("../lib/defs.js").TWorld;
24
24
  };
@@ -1,5 +1,4 @@
1
- import { TNamed, AStepper, TWorld, TVStep } from '../lib/defs.js';
2
- import { Resolver } from '../phases/Resolver.js';
1
+ import { TNamed, AStepper, TWorld, TFeatureStep, TResolvedFeature } from '../lib/defs.js';
3
2
  declare const Haibun: {
4
3
  new (): {
5
4
  steppers: AStepper[];
@@ -45,12 +44,17 @@ declare const Haibun: {
45
44
  gwta: string;
46
45
  action: () => Promise<import("../lib/defs.js").TOKActionResult>;
47
46
  };
47
+ afterEveryStepper: {
48
+ gwta: string;
49
+ action: (usedInEffect: TNamed) => Promise<import("../lib/defs.js").TOKActionResult>;
50
+ applyEffect: ({ stepperName, line }: TNamed, resolvedFeatures: TResolvedFeature[]) => Promise<TResolvedFeature[]>;
51
+ };
48
52
  };
49
- findAction: (action: string, resolver: Resolver, steppers: any) => AStepper;
53
+ newFeatureFromEffect(steppers: AStepper[], content: string, seq: number): Promise<TFeatureStep>;
50
54
  world?: TWorld;
51
55
  close?(): void;
52
56
  endFeature?(): Promise<void>;
53
- onFailure?(result: import("../lib/defs.js").TStepResult, step: TVStep): Promise<void | import("../lib/interfaces/logger.js").TMessageContext>;
57
+ onFailure?(result: import("../lib/defs.js").TStepResult, step: TFeatureStep): Promise<void | import("../lib/interfaces/logger.js").TMessageContext>;
54
58
  getWorld(): TWorld;
55
59
  };
56
60
  };
@@ -1 +1 @@
1
- {"version":3,"file":"haibun.d.ts","sourceRoot":"","sources":["../../src/steps/haibun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAGjD,QAAA,MAAM,MAAM;;kBACA,QAAQ,EAAE;wBACE,MAAM,YAAY,QAAQ,EAAE;;;;;;;;oCAWpB,MAAM;;;;iCAOT,MAAM;;;;sCAOD,MAAM;;;;;;;;;;;;oCAmBR,MAAM;;;;0CAQA,MAAM;;;;iCASf,MAAM;;;;;;;6BAaX,MAAM,YAAY,QAAQ;;;;;;;CASjD,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"haibun.d.ts","sourceRoot":"","sources":["../../src/steps/haibun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAM9F,QAAA,MAAM,MAAM;;kBACD,QAAQ,EAAE;wBACE,MAAM,YAAY,QAAQ,EAAE;;;;;;;;oCAWtB,MAAM;;;;iCAOT,MAAM;;;;sCAOD,MAAM;;;;;;;;;;;;oCAmBR,MAAM;;;;0CAQA,MAAM;;;;iCASf,MAAM;;;;;;;;uCAcA,MAAM;qDAGQ,MAAM,oBAAoB,gBAAgB,EAAE;;;uCAsBpD,QAAQ,EAAE,WAAW,MAAM,OAAO,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;;;;;;;CAMrG,CAAC;AAEF,eAAe,MAAM,CAAC"}
@@ -1,5 +1,8 @@
1
1
  import { OK, AStepper } from '../lib/defs.js';
2
+ import { Resolver } from '../phases/Resolver.js';
2
3
  import { actionNotOK, findStepper, sleep } from '../lib/util/index.js';
4
+ import { expand } from '../lib/features.js';
5
+ import { asFeatures } from '../lib/resolver-features.js';
3
6
  const Haibun = class Haibun extends AStepper {
4
7
  steppers;
5
8
  async setWorld(world, steppers) {
@@ -75,14 +78,36 @@ const Haibun = class Haibun extends AStepper {
75
78
  return OK;
76
79
  },
77
80
  },
81
+ afterEveryStepper: {
82
+ gwta: 'after every {stepperName}, {line}',
83
+ action: async (usedInEffect) => {
84
+ return OK;
85
+ },
86
+ applyEffect: async ({ stepperName, line }, resolvedFeatures) => {
87
+ const modifiedFeatures = [];
88
+ for (const rf of resolvedFeatures) {
89
+ const theStepper = findStepper(this.steppers, stepperName);
90
+ const newSteps = [];
91
+ for (const featureStep of rf.featureSteps) {
92
+ newSteps.push(featureStep);
93
+ if (featureStep.action.stepperName === stepperName) {
94
+ const newFeatureStep = await this.newFeatureFromEffect(this.steppers, line, featureStep.seq + 0.1);
95
+ newSteps.push(newFeatureStep);
96
+ }
97
+ }
98
+ rf.featureSteps = newSteps;
99
+ modifiedFeatures.push(rf);
100
+ }
101
+ return modifiedFeatures;
102
+ },
103
+ },
78
104
  };
79
- findAction = (action, resolver, steppers) => {
80
- const found = resolver.findActionableSteps(action);
81
- if (found?.length === 1) {
82
- return findStepper(steppers, found[0].stepperName);
83
- }
84
- return undefined;
85
- };
105
+ async newFeatureFromEffect(steppers, content, seq) {
106
+ const features = asFeatures([{ path: `resolved from ${content}`, content }]);
107
+ const expandedFeatures = await expand([], features);
108
+ const featureSteps = await new Resolver(steppers).findFeatureSteps(expandedFeatures[0]);
109
+ return { ...featureSteps[0], seq };
110
+ }
86
111
  };
87
112
  export default Haibun;
88
113
  //# sourceMappingURL=haibun.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"haibun.js","sourceRoot":"","sources":["../../src/steps/haibun.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"haibun.js","sourceRoot":"","sources":["../../src/steps/haibun.ts"],"names":[],"mappings":"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"}
@@ -12,13 +12,13 @@ declare const Parse: {
12
12
  };
13
13
  conformance: {
14
14
  gwta: string;
15
- action: ({ where }: TNamed) => Promise<import("../lib/defs.js").TOKActionResult | import("../lib/defs.js").TNotOKActionResult>;
15
+ action: ({ where }: TNamed) => Promise<import("../lib/defs.js").TNotOKActionResult | import("../lib/defs.js").TOKActionResult>;
16
16
  };
17
17
  };
18
18
  world?: import("../lib/defs.js").TWorld;
19
19
  close?(): void;
20
20
  endFeature?(): Promise<void>;
21
- onFailure?(result: import("../lib/defs.js").TStepResult, step: import("../lib/defs.js").TVStep): Promise<void | import("../lib/interfaces/logger.js").TMessageContext>;
21
+ onFailure?(result: import("../lib/defs.js").TStepResult, step: import("../lib/defs.js").TFeatureStep): Promise<void | import("../lib/interfaces/logger.js").TMessageContext>;
22
22
  setWorld(world: import("../lib/defs.js").TWorld, steppers: AStepper[]): Promise<void>;
23
23
  getWorld(): import("../lib/defs.js").TWorld;
24
24
  };
@@ -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;;;;;;;;oBAO7B,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;;;;mCAQb,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;;;;;;;CAU9E,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,10 @@ 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
- const res = setShared(named, vstep, this.getWorld(), emptyOnly);
8
+ const emptyOnly = !!featureStep.in.match(/set empty /);
9
+ const res = setShared(named, featureStep, this.getWorld(), emptyOnly);
10
10
  return res;
11
11
  };
12
12
  isSet(what, orCond) {
@@ -25,30 +25,30 @@ const vars = class Vars extends AStepper {
25
25
  steps = {
26
26
  concat: {
27
27
  gwta: 'concat {p1} and {p2} as {what}',
28
- 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),
29
29
  },
30
30
  showEnv: {
31
31
  gwta: 'show env',
32
- action: async (n, vstep) => {
32
+ action: async (n, featureStep) => {
33
33
  console.info('env', this.world.options.env);
34
- return await this.set(n, vstep);
34
+ return await this.set(n, featureStep);
35
35
  },
36
- build: async (n, vstep) => await this.set(n, vstep),
36
+ build: async (n, featureStep) => await this.set(n, featureStep),
37
37
  },
38
38
  showVars: {
39
39
  gwta: 'show vars',
40
- action: async (n, vstep) => {
40
+ action: async (n, featureStep) => {
41
41
  console.info('vars', this.world.shared);
42
- return await this.set(n, vstep);
42
+ return await this.set(n, featureStep);
43
43
  },
44
- build: async (n, vstep) => await this.set(n, vstep),
44
+ build: async (n, featureStep) => await this.set(n, featureStep),
45
45
  },
46
46
  set: {
47
47
  gwta: 'set( empty)? {what: string} to {value: string}',
48
- action: async (n, vstep) => {
49
- return await this.set(n, vstep);
48
+ action: async (n, featureStep) => {
49
+ return await this.set(n, featureStep);
50
50
  },
51
- build: async (n, vstep) => await this.set(n, vstep),
51
+ build: async (n, featureStep) => await this.set(n, featureStep),
52
52
  },
53
53
  is: {
54
54
  gwta: '{what: string} is "{value}"',
@@ -59,8 +59,8 @@ const vars = class Vars extends AStepper {
59
59
  },
60
60
  isSet: {
61
61
  gwta: '{what: string} is set( or .*)?',
62
- action: async ({ what }, vstep) => this.isSet(what, getOrCond(vstep.in)),
63
- 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)),
64
64
  },
65
65
  background: {
66
66
  match: /^Background: ?(?<background>.+)?$/,
@@ -96,7 +96,7 @@ export default vars;
96
96
  export const didNotOverwrite = (what, present, value) => ({
97
97
  overwrite: { summary: `did not overwrite ${what} value of "${present}" with "${value}"` },
98
98
  });
99
- export const setShared = ({ what, value }, vstep, world, emptyOnly = false) => {
99
+ export const setShared = ({ what, value }, featureStep, world, emptyOnly = false) => {
100
100
  let { shared } = world;
101
101
  if (!emptyOnly || shared.get(what) === undefined) {
102
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.2",
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