@haibun/core 1.2.4 → 1.8.2

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 (120) hide show
  1. package/build/index.js +5 -1
  2. package/build/index.js.map +1 -1
  3. package/build/lib/Logger.js +1 -1
  4. package/build/lib/Logger.js.map +1 -1
  5. package/build/lib/Logger.test.js +6 -2
  6. package/build/lib/Logger.test.js.map +1 -1
  7. package/build/lib/Timer.d.ts +2 -0
  8. package/build/lib/Timer.d.ts.map +1 -1
  9. package/build/lib/Timer.js +4 -0
  10. package/build/lib/Timer.js.map +1 -1
  11. package/build/lib/defs.d.ts +36 -9
  12. package/build/lib/defs.d.ts.map +1 -1
  13. package/build/lib/defs.js +5 -2
  14. package/build/lib/defs.js.map +1 -1
  15. package/build/lib/domain.d.ts +4 -3
  16. package/build/lib/domain.d.ts.map +1 -1
  17. package/build/lib/domain.js +14 -10
  18. package/build/lib/domain.js.map +1 -1
  19. package/build/lib/features.js +5 -5
  20. package/build/lib/features.js.map +1 -1
  21. package/build/lib/features.test.js +27 -23
  22. package/build/lib/features.test.js.map +1 -1
  23. package/build/lib/namedVars.d.ts +3 -2
  24. package/build/lib/namedVars.d.ts.map +1 -1
  25. package/build/lib/namedVars.js +6 -6
  26. package/build/lib/namedVars.js.map +1 -1
  27. package/build/lib/namedVars.test.js +19 -19
  28. package/build/lib/namedVars.test.js.map +1 -1
  29. package/build/lib/run-with-options.d.ts +2 -2
  30. package/build/lib/run-with-options.d.ts.map +1 -1
  31. package/build/lib/run-with-options.js +7 -10
  32. package/build/lib/run-with-options.js.map +1 -1
  33. package/build/lib/run.d.ts +11 -14
  34. package/build/lib/run.d.ts.map +1 -1
  35. package/build/lib/run.domains.test.js +12 -12
  36. package/build/lib/run.domains.test.js.map +1 -1
  37. package/build/lib/run.js +35 -52
  38. package/build/lib/run.js.map +1 -1
  39. package/build/lib/run.test.js +35 -11
  40. package/build/lib/run.test.js.map +1 -1
  41. package/build/lib/test/TestSteps.d.ts +2 -2
  42. package/build/lib/test/TestSteps.d.ts.map +1 -1
  43. package/build/lib/test/TestSteps.js +6 -6
  44. package/build/lib/test/TestSteps.js.map +1 -1
  45. package/build/lib/test/TestStepsWithDomain.d.ts +2 -1
  46. package/build/lib/test/TestStepsWithDomain.d.ts.map +1 -1
  47. package/build/lib/test/TestStepsWithDomain.js +1 -1
  48. package/build/lib/test/TestStepsWithDomain.js.map +1 -1
  49. package/build/lib/test/TestStepsWithOptions.d.ts +2 -1
  50. package/build/lib/test/TestStepsWithOptions.d.ts.map +1 -1
  51. package/build/lib/test/TestStepsWithOptions.js +2 -2
  52. package/build/lib/test/TestStepsWithOptions.js.map +1 -1
  53. package/build/lib/test/lib.d.ts +8 -15
  54. package/build/lib/test/lib.d.ts.map +1 -1
  55. package/build/lib/test/lib.js +39 -20
  56. package/build/lib/test/lib.js.map +1 -1
  57. package/build/lib/trace.d.ts +1 -0
  58. package/build/lib/trace.d.ts.map +1 -0
  59. package/build/lib/trace.js +2 -0
  60. package/build/lib/trace.js.map +1 -0
  61. package/build/lib/{util.d.ts → util/index.d.ts} +25 -22
  62. package/build/lib/util/index.d.ts.map +1 -0
  63. package/build/lib/{util.js → util/index.js} +108 -89
  64. package/build/lib/util/index.js.map +1 -0
  65. package/build/lib/util/mfs.d.ts +11 -0
  66. package/build/lib/util/mfs.d.ts.map +1 -0
  67. package/build/lib/util/mfs.js +14 -0
  68. package/build/lib/util/mfs.js.map +1 -0
  69. package/build/lib/util/storage-fs.d.ts +11 -0
  70. package/build/lib/util/storage-fs.d.ts.map +1 -0
  71. package/build/lib/util/storage-fs.js +14 -0
  72. package/build/lib/util/storage-fs.js.map +1 -0
  73. package/build/lib/{util.test.d.ts → util/util.test.d.ts} +0 -0
  74. package/build/lib/{util.test.d.ts.map → util/util.test.d.ts.map} +1 -1
  75. package/build/lib/util/util.test.js +140 -0
  76. package/build/lib/util/util.test.js.map +1 -0
  77. package/build/phases/Builder.d.ts +3 -2
  78. package/build/phases/Builder.d.ts.map +1 -1
  79. package/build/phases/Builder.js +6 -6
  80. package/build/phases/Builder.js.map +1 -1
  81. package/build/phases/Builder.test.js +7 -24
  82. package/build/phases/Builder.test.js.map +1 -1
  83. package/build/phases/Executor.d.ts +13 -7
  84. package/build/phases/Executor.d.ts.map +1 -1
  85. package/build/phases/Executor.js +67 -36
  86. package/build/phases/Executor.js.map +1 -1
  87. package/build/phases/Resolver.d.ts.map +1 -1
  88. package/build/phases/Resolver.js +16 -12
  89. package/build/phases/Resolver.js.map +1 -1
  90. package/build/phases/Resolver.test.js +18 -14
  91. package/build/phases/Resolver.test.js.map +1 -1
  92. package/build/steps/conformance.d.ts +2 -1
  93. package/build/steps/conformance.d.ts.map +1 -1
  94. package/build/steps/conformance.js +1 -1
  95. package/build/steps/conformance.js.map +1 -1
  96. package/build/steps/credentials.d.ts +2 -2
  97. package/build/steps/credentials.d.ts.map +1 -1
  98. package/build/steps/credentials.js +5 -5
  99. package/build/steps/credentials.js.map +1 -1
  100. package/build/steps/haibun.d.ts +14 -2
  101. package/build/steps/haibun.d.ts.map +1 -1
  102. package/build/steps/haibun.js +23 -2
  103. package/build/steps/haibun.js.map +1 -1
  104. package/build/steps/haibun.test.js +2 -2
  105. package/build/steps/haibun.test.js.map +1 -1
  106. package/build/steps/vars.d.ts +8 -4
  107. package/build/steps/vars.d.ts.map +1 -1
  108. package/build/steps/vars.js +16 -7
  109. package/build/steps/vars.js.map +1 -1
  110. package/build/steps/vars.test.js +24 -23
  111. package/build/steps/vars.test.js.map +1 -1
  112. package/build/storage/storage-fs.d.ts +11 -0
  113. package/build/storage/storage-fs.d.ts.map +1 -0
  114. package/build/storage/storage-fs.js +16 -0
  115. package/build/storage/storage-fs.js.map +1 -0
  116. package/package.json +6 -3
  117. package/build/lib/util.d.ts.map +0 -1
  118. package/build/lib/util.js.map +0 -1
  119. package/build/lib/util.test.js +0 -84
  120. package/build/lib/util.test.js.map +0 -1
@@ -7,45 +7,28 @@ const contexts_1 = require("../lib/contexts");
7
7
  const defs_1 = require("../lib/defs");
8
8
  const lib_1 = require("../lib/test/lib");
9
9
  const Builder_1 = __importDefault(require("./Builder"));
10
- const feature = (result) => ({
11
- path: 'passes.feature',
12
- feature: 'test',
13
- vsteps: [
14
- {
15
- in: 'test',
16
- seq: 0,
17
- actions: [
18
- {
19
- name: 'test',
20
- step: {
21
- exact: 'test',
22
- action: async () => defs_1.OK,
23
- build: result,
24
- },
25
- },
26
- ],
27
- },
28
- ],
29
- });
30
10
  describe('Builder', () => {
31
- test('throws', () => {
11
+ test('throws', async () => {
12
+ const steppers = await (0, lib_1.getCreateSteppers)([]);
32
13
  const throws = async () => {
33
14
  throw Error('fails');
34
15
  };
35
- const builder = new Builder_1.default(lib_1.getDefaultWorld(0).world);
16
+ const builder = new Builder_1.default(steppers, (0, lib_1.getDefaultWorld)(0).world);
36
17
  // expect(async () => await builder.build([feature(throws)])).rejects.toThrow('fails');
37
18
  });
38
19
  test('passes', async () => {
20
+ const steppers = await (0, lib_1.getCreateSteppers)([]);
39
21
  const throws = async () => defs_1.OK;
40
- const builder = new Builder_1.default(lib_1.getDefaultWorld(0).world);
22
+ const builder = new Builder_1.default(steppers, (0, lib_1.getDefaultWorld)(0).world);
41
23
  // const res = await builder.build([feature(throws)]);
42
24
  // expect(res).toBe(OK);
43
25
  });
44
26
  test('finalizes', async () => {
27
+ const steppers = await (0, lib_1.getCreateSteppers)([]);
45
28
  const finalize = (workspace) => (workspace.set('done', true));
46
29
  const finalizes = async () => ({ ...defs_1.OK, finalize });
47
30
  const workspace = new contexts_1.WorkspaceContext(`test builder finalizes`);
48
- const builder = new Builder_1.default(lib_1.getDefaultWorld(0).world, workspace);
31
+ const builder = new Builder_1.default(steppers, (0, lib_1.getDefaultWorld)(0).world, workspace);
49
32
  // await builder.build([feature(finalizes)]);
50
33
  // expect(workspace['passes.feature'].done).toBe(true);
51
34
  });
@@ -1 +1 @@
1
- {"version":3,"file":"Builder.test.js","sourceRoot":"","sources":["../../src/phases/Builder.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAmD;AACnD,sCAA4C;AAC5C,yCAAkD;AAClD,wDAAgC;AAEhC,MAAM,OAAO,GAAG,CAAC,MAAW,EAAE,EAAE,CAAC,CAAC;IAChC,IAAI,EAAE,gBAAgB;IACtB,OAAO,EAAE,MAAM;IACf,MAAM,EAAE;QACN;YACE,EAAE,EAAE,MAAM;YACV,GAAG,EAAE,CAAC;YACN,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE;wBACJ,KAAK,EAAE,MAAM;wBACb,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,SAAE;wBACtB,KAAK,EAAE,MAAM;qBACd;iBACF;aACF;SACF;KACF;CACF,CAAC,CAAC;AAEH,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;QAClB,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE;YACxB,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC;QACvB,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,qBAAe,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACtD,uFAAuF;IACzF,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QACxB,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE,CAAC,SAAE,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,qBAAe,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACtD,sDAAsD;QACtD,wBAAwB;IAC1B,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;QAC3B,MAAM,QAAQ,GAAc,CAAC,SAA2B,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;QAC3F,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,SAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACpD,MAAM,SAAS,GAAqB,IAAI,2BAAgB,CAAC,wBAAwB,CAAC,CAAC;QACnF,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,qBAAe,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACjE,6CAA6C;QAC7C,uDAAuD;IACzD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"Builder.test.js","sourceRoot":"","sources":["../../src/phases/Builder.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAmD;AACnD,sCAA4C;AAC5C,yCAAqE;AACrE,wDAAgC;AAEhC,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QACxB,MAAM,QAAQ,GAAG,MAAM,IAAA,uBAAiB,EAAC,EAAE,CAAC,CAAA;QAC5C,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE;YACxB,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC;QACvB,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,QAAQ,EAAE,IAAA,qBAAe,EAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAChE,uFAAuF;IACzF,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QACxB,MAAM,QAAQ,GAAG,MAAM,IAAA,uBAAiB,EAAC,EAAE,CAAC,CAAA;QAC5C,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE,CAAC,SAAE,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,QAAQ,EAAE,IAAA,qBAAe,EAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAChE,sDAAsD;QACtD,wBAAwB;IAC1B,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;QAC3B,MAAM,QAAQ,GAAG,MAAM,IAAA,uBAAiB,EAAC,EAAE,CAAC,CAAA;QAC5C,MAAM,QAAQ,GAAc,CAAC,SAA2B,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;QAC3F,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,SAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACpD,MAAM,SAAS,GAAqB,IAAI,2BAAgB,CAAC,wBAAwB,CAAC,CAAC;QACnF,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,QAAQ,EAAE,IAAA,qBAAe,EAAC,CAAC,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3E,6CAA6C;QAC7C,uDAAuD;IACzD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -1,13 +1,19 @@
1
- import { TVStep, TResolvedFeature, TResult, TStepResult, TFeatureResult, TWorld, AStepper } from '../lib/defs';
1
+ import { TVStep, TResolvedFeature, TResult, TStepResult, TFeatureResult, TActionResult, TWorld, AStepper, TEndFeatureCallback, CStepper, TFound } from '../lib/defs';
2
2
  export declare class Executor {
3
- steppers: AStepper[];
4
- world: TWorld;
5
- constructor(steppers: AStepper[], world: TWorld);
6
- execute(features: TResolvedFeature[]): Promise<TResult>;
3
+ static action(steppers: AStepper[], vstep: TVStep, a: TFound, world: TWorld): Promise<Partial<TActionResult>>;
4
+ static execute(csteppers: CStepper[], world: TWorld, features: TResolvedFeature[], endFeatureCallback?: TEndFeatureCallback): Promise<TResult>;
5
+ }
6
+ export declare class FeatureExecutor {
7
+ csteppers: CStepper[];
8
+ endFeatureCallback?: TEndFeatureCallback;
9
+ world?: TWorld;
10
+ steppers?: AStepper[];
11
+ constructor(csteppers: CStepper[], endFeatureCallback?: TEndFeatureCallback);
12
+ setup(world: TWorld): Promise<void>;
7
13
  doFeature(feature: TResolvedFeature): Promise<TFeatureResult>;
8
- static doFeatureStep(vstep: TVStep, world: TWorld): Promise<TStepResult>;
14
+ static doFeatureStep(steppers: AStepper[], vstep: TVStep, world: TWorld): Promise<TStepResult>;
9
15
  onFailure(result: TStepResult): Promise<void>;
10
- endFeature(): Promise<void>;
16
+ endFeature(featureResult: TFeatureResult): Promise<void>;
11
17
  close(): Promise<void>;
12
18
  }
13
19
  //# sourceMappingURL=Executor.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Executor.d.ts","sourceRoot":"","sources":["../../src/phases/Executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAiB,MAAM,EAA0C,QAAQ,EAAE,MAAM,aAAa,CAAC;AAItK,qBAAa,QAAQ;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;gBAEF,QAAQ,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM;IAKzC,OAAO,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAwBvD,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC;WA0BtD,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAiCxE,SAAS,CAAC,MAAM,EAAE,WAAW;IAS7B,UAAU;IAQV,KAAK;CAQZ"}
1
+ {"version":3,"file":"Executor.d.ts","sourceRoot":"","sources":["../../src/phases/Executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,EAAqB,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIxL,qBAAa,QAAQ;WAEN,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;WAUtG,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,EAAE,kBAAkB,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC;CA8BrJ;AAED,qBAAa,eAAe;IAC1B,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,kBAAkB,CAAC,EAAE,mBAAmB,CAAC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;gBAEV,SAAS,EAAE,QAAQ,EAAE,EAAE,kBAAkB,CAAC,EAAE,mBAAmB;IAIrE,KAAK,CAAC,KAAK,EAAE,MAAM;IAUnB,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC;WA8BtD,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IA0B9F,SAAS,CAAC,MAAM,EAAE,WAAW;IAS7B,UAAU,CAAC,aAAa,EAAE,cAAc;IAiBxC,KAAK;CAQZ"}
@@ -1,50 +1,80 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Executor = void 0;
3
+ exports.FeatureExecutor = exports.Executor = void 0;
4
4
  const namedVars_1 = require("../lib/namedVars");
5
5
  const util_1 = require("../lib/util");
6
6
  class Executor {
7
- constructor(steppers, world) {
8
- this.steppers = steppers;
9
- this.world = world;
7
+ // find the stepper and action, call it and return its result
8
+ static async action(steppers, vstep, a, world) {
9
+ try {
10
+ const namedWithVars = (0, namedVars_1.getNamedToVars)(a, world);
11
+ const stepper = (0, util_1.findStepper)(steppers, a.stepperName);
12
+ return await stepper.steps[a.actionName].action(namedWithVars, vstep);
13
+ }
14
+ catch (caught) {
15
+ world.logger.error(caught.stack);
16
+ return (0, util_1.actionNotOK)(`in ${vstep.in}: ${caught.message}`, { topics: { caught: caught.stack.toString() } });
17
+ }
10
18
  }
11
- async execute(features) {
19
+ static async execute(csteppers, world, features, endFeatureCallback) {
12
20
  let ok = true;
13
- const stay = (this.world.options.STAY === 'always');
21
+ const stay = (world.options.stay === 'always');
14
22
  let featureResults = [];
15
- // FIXME
16
- this.world.shared.values._features = features;
17
- this.world.shared.values._scored = [];
23
+ // FIXME scoring hack
24
+ world.shared.values._features = features;
25
+ world.shared.values._scored = [];
26
+ let featureNum = 0;
18
27
  for (const feature of features) {
19
- this.world.logger.log(`*** feature: ${feature.path}`);
20
- const featureResult = await this.doFeature(feature);
28
+ featureNum++;
29
+ const newWorld = { ...world, tag: { ...world.tag, ...{ featureNum: 0 + featureNum } } };
30
+ const featureExecutor = new FeatureExecutor(csteppers, endFeatureCallback);
31
+ await featureExecutor.setup(newWorld);
32
+ const featureResult = await featureExecutor.doFeature(feature);
21
33
  ok = ok && featureResult.ok;
34
+ if (!stay) {
35
+ await featureExecutor.endFeature(featureResult);
36
+ }
22
37
  featureResults.push(featureResult);
23
38
  if (!stay) {
24
- await this.endFeature();
39
+ await featureExecutor.close();
25
40
  }
26
41
  }
27
- if (!stay) {
28
- await this.close();
29
- }
30
- return { ok, results: featureResults, tag: this.world.tag };
42
+ return { ok, results: featureResults, tag: world.tag, shared: world.shared };
43
+ }
44
+ }
45
+ exports.Executor = Executor;
46
+ class FeatureExecutor {
47
+ constructor(csteppers, endFeatureCallback) {
48
+ this.csteppers = csteppers;
49
+ this.endFeatureCallback = endFeatureCallback;
50
+ }
51
+ async setup(world) {
52
+ this.world = world;
53
+ const errorBail = (phase, error, extra) => {
54
+ console.error('error', phase, error, extra);
55
+ throw Error(error);
56
+ };
57
+ const steppers = await (0, util_1.createSteppers)(this.csteppers);
58
+ await (0, util_1.setWorldStepperOptions)(steppers, world).catch((error) => errorBail('Apply Options', error, world.extraOptions));
59
+ this.steppers = steppers;
31
60
  }
32
61
  async doFeature(feature) {
62
+ const world = this.world;
63
+ world.logger.log(`*** feature ${world.tag.featureNum}: ${feature.path}`);
33
64
  let ok = true;
34
65
  let stepResults = [];
35
66
  let seq = 0;
36
67
  for (const step of feature.vsteps) {
37
- this.world.logger.log(` ${step.in}\r`);
38
- const result = await Executor.doFeatureStep(step, this.world);
39
- if (this.world.options.step_delay) {
40
- await util_1.sleep(this.world.options.step_delay);
68
+ world.logger.log(` ${step.in}\r`);
69
+ const result = await FeatureExecutor.doFeatureStep(this.steppers, step, world);
70
+ if (world.options.step_delay) {
71
+ await (0, util_1.sleep)(world.options.step_delay);
41
72
  }
42
73
  ok = ok && result.ok;
43
74
  if (!result.ok) {
44
75
  await this.onFailure(result);
45
76
  }
46
- const topics = result.actionResults.reduce((all, a) => ({ ...all, ...a.topics }), {});
47
- this.world.logger.log(ok, { topic: { stage: 'Executor', seq, result } });
77
+ world.logger.log(ok, { topic: { stage: 'Executor', seq, result } });
48
78
  stepResults.push(result);
49
79
  if (!ok) {
50
80
  break;
@@ -54,21 +84,13 @@ class Executor {
54
84
  const featureResult = { path: feature.path, ok, stepResults };
55
85
  return featureResult;
56
86
  }
57
- static async doFeatureStep(vstep, world) {
87
+ static async doFeatureStep(steppers, vstep, world) {
58
88
  let ok = true;
59
89
  let actionResults = [];
60
90
  // FIXME feature should really be attached ot the vstep
61
91
  for (const a of vstep.actions) {
62
92
  const start = world.timer.since();
63
- let res;
64
- try {
65
- const namedWithVars = namedVars_1.getNamedToVars(a, world);
66
- res = await a.step.action(namedWithVars, vstep);
67
- }
68
- catch (caught) {
69
- world.logger.error(caught.stack);
70
- res = util_1.actionNotOK(`in ${vstep.in}: ${caught.message}`, { topics: { caught: caught.stack.toString() } });
71
- }
93
+ const res = await Executor.action(steppers, vstep, a, world);
72
94
  let traces;
73
95
  if (world.shared.get('_trace')) {
74
96
  traces = world.shared.get('_trace');
@@ -76,9 +98,9 @@ class Executor {
76
98
  }
77
99
  const end = world.timer.since();
78
100
  // FIXME
79
- const stepResult = { ...res, name: a.name, start, end, traces };
101
+ const stepResult = { ...res, name: a.actionName, start, end, traces };
80
102
  actionResults.push(stepResult);
81
- const shouldContinue = util_1.applyResShouldContinue(world, res, a);
103
+ const shouldContinue = (0, util_1.applyResShouldContinue)(world, res, a);
82
104
  ok = ok && shouldContinue;
83
105
  if (!shouldContinue) {
84
106
  break;
@@ -94,13 +116,22 @@ class Executor {
94
116
  }
95
117
  }
96
118
  }
97
- async endFeature() {
119
+ async endFeature(featureResult) {
98
120
  for (const s of this.steppers) {
99
121
  if (s.endFeature) {
100
122
  this.world.logger.debug(`endFeature ${s.constructor.name}`);
101
123
  await s.endFeature();
102
124
  }
103
125
  }
126
+ if (this.endFeatureCallback) {
127
+ try {
128
+ await this.endFeatureCallback(this.world, featureResult, this.steppers);
129
+ }
130
+ catch (error) {
131
+ console.log('e', error);
132
+ throw Error(error);
133
+ }
134
+ }
104
135
  }
105
136
  async close() {
106
137
  for (const s of this.steppers) {
@@ -111,5 +142,5 @@ class Executor {
111
142
  }
112
143
  }
113
144
  }
114
- exports.Executor = Executor;
145
+ exports.FeatureExecutor = FeatureExecutor;
115
146
  //# sourceMappingURL=Executor.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Executor.js","sourceRoot":"","sources":["../../src/phases/Executor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Executor.js","sourceRoot":"","sources":["../../src/phases/Executor.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"Resolver.d.ts","sourceRoot":"","sources":["../../src/phases/Resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAG,MAAM,EAAE,gBAAgB,EAAM,MAAM,EAAc,gBAAgB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAI5G,qBAAa,QAAQ;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;gBACD,QAAQ,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAKvD,YAAY,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAavE,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAuBpE,MAAM,CAAC,UAAU,SAAU,MAAM,QAAQ,MAAM,eAAe,MAAM,YAA4D;IAChI,MAAM,CAAC,sBAAsB,YAAa,MAAM,YAAY,MAAM,QAAQ,MAAM,uBAAuB,MAAM,YACpB;IACzF,MAAM,CAAC,4BAA4B,YAAa,MAAM,YAAY,MAAM,QAAQ,MAAM,YAAsE;IAC5J,MAAM,CAAC,2BAA2B,YAAa,MAAM,YAAY,MAAM,QAAQ,MAAM,YAA2D;IAEzI,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE;CA2B/C"}
1
+ {"version":3,"file":"Resolver.d.ts","sourceRoot":"","sources":["../../src/phases/Resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAM,MAAM,EAAc,gBAAgB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAI3G,qBAAa,QAAQ;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;gBACD,QAAQ,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAKvD,YAAY,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAgBvE,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAuBpE,MAAM,CAAC,UAAU,SAAU,MAAM,QAAQ,MAAM,eAAe,MAAM,YAA4D;IAChI,MAAM,CAAC,sBAAsB,YAAa,MAAM,YAAY,MAAM,QAAQ,MAAM,uBAAuB,MAAM,YACpB;IACzF,MAAM,CAAC,4BAA4B,YAAa,MAAM,YAAY,MAAM,QAAQ,MAAM,YAAsE;IAC5J,MAAM,CAAC,2BAA2B,YAAa,MAAM,YAAY,MAAM,QAAQ,MAAM,YAA2D;IAEzI,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE;CA8B/C"}
@@ -18,6 +18,7 @@ class Resolver {
18
18
  expanded.push(steps);
19
19
  }
20
20
  catch (e) {
21
+ this.world.logger.error(e);
21
22
  throw e;
22
23
  }
23
24
  }
@@ -25,7 +26,7 @@ class Resolver {
25
26
  }
26
27
  async addSteps(feature) {
27
28
  const vsteps = feature.expanded.map((featureLine, seq) => {
28
- const actionable = util_1.getActionable(featureLine.line);
29
+ const actionable = (0, util_1.getActionable)(featureLine.line);
29
30
  const actions = this.findSteps(actionable);
30
31
  try {
31
32
  // FIXME
@@ -35,10 +36,10 @@ class Resolver {
35
36
  throw e;
36
37
  }
37
38
  if (actions.length > 1) {
38
- throw Error(`more than one step found for "${featureLine.line}" ${JSON.stringify(actions.map(a => a.name))}`);
39
+ throw Error(`more than one step found for "${featureLine.line}" ${JSON.stringify(actions.map(a => a.actionName))}`);
39
40
  }
40
41
  else if (actions.length < 1 && this.mode !== 'some') {
41
- throw Error(`no step found for ${featureLine.line} in ${feature.path} from ${util_1.describeSteppers(this.steppers)}`);
42
+ throw Error(`no step found for ${featureLine.line} in ${feature.path} from ${(0, util_1.describeSteppers)(this.steppers)}`);
42
43
  }
43
44
  return { source: featureLine.feature, in: featureLine.line, seq, actions };
44
45
  });
@@ -50,22 +51,24 @@ class Resolver {
50
51
  }
51
52
  let found = [];
52
53
  const types = [...defs_1.BASE_TYPES, ...this.world.domains.map((d) => d.name)];
53
- for (const { steps } of this.steppers) {
54
- for (const name in steps) {
55
- const step = steps[name];
54
+ for (const stepper of this.steppers) {
55
+ const stepperName = stepper.constructor.name;
56
+ const { steps } = stepper;
57
+ for (const actionName in steps) {
58
+ const step = steps[actionName];
56
59
  const addIfMatch = (m) => m && found.push(m);
57
60
  if (step.gwta) {
58
- let { str, vars } = namedVars_1.namedInterpolation(step.gwta, types);
61
+ let { str, vars } = (0, namedVars_1.namedInterpolation)(step.gwta, types);
59
62
  const f = str.charAt(0);
60
- const s = util_1.isLowerCase(f) ? ['[', f, f.toUpperCase(), ']', str.substring(1)].join('') : str;
63
+ const s = (0, util_1.isLowerCase)(f) ? ['[', f, f.toUpperCase(), ']', str.substring(1)].join('') : str;
61
64
  const r = new RegExp(`^(Given|When|Then|And)?( the )?( I('m)? (am )?)? ?${s}`);
62
- addIfMatch(namedVars_1.getMatch(actionable, r, name, step, vars));
65
+ addIfMatch((0, namedVars_1.getMatch)(actionable, r, actionName, stepperName, step, vars));
63
66
  }
64
67
  else if (step.match) {
65
- addIfMatch(namedVars_1.getMatch(actionable, step.match, name, step));
68
+ addIfMatch((0, namedVars_1.getMatch)(actionable, step.match, actionName, stepperName, step));
66
69
  }
67
70
  else if (actionable.length > 0 && step.exact === actionable) {
68
- found.push({ name, step });
71
+ found.push({ actionName, stepperName, step });
69
72
  }
70
73
  }
71
74
  }
@@ -78,7 +81,8 @@ Resolver.getTypeValidationError = (prelude, fileType, name, typeValidationError)
78
81
  Resolver.getMoreThanOneInclusionError = (prelude, fileType, name) => `${prelude} more than one '${fileType}' inclusion for '${name}'`;
79
82
  Resolver.getNoFileTypeInclusionError = (prelude, fileType, name) => `${prelude} no '${fileType}' inclusion for '${name}'`;
80
83
  const comment = {
81
- name: 'comment',
84
+ stepperName: 'Haibun',
85
+ actionName: 'comment',
82
86
  step: {
83
87
  match: /.*/,
84
88
  action: async () => {
@@ -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":"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"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const defs_1 = require("../lib/defs");
4
4
  const lib_1 = require("../lib/test/lib");
5
+ const util_1 = require("../lib/util");
5
6
  const Resolver_1 = require("./Resolver");
6
7
  describe('validate map steps', () => {
7
8
  class TestStepper extends defs_1.AStepper {
@@ -27,30 +28,33 @@ describe('validate map steps', () => {
27
28
  };
28
29
  }
29
30
  }
30
- const steppers = [new TestStepper()];
31
- const getResolver = () => new Resolver_1.Resolver(steppers, '', {
32
- ...lib_1.getDefaultWorld(0).world,
33
- });
31
+ const getResolvedSteps = async (features) => {
32
+ const steppers = await (0, util_1.createSteppers)([TestStepper]);
33
+ const resolver = new Resolver_1.Resolver(steppers, '', {
34
+ ...(0, lib_1.getDefaultWorld)(0).world,
35
+ });
36
+ return await resolver.resolveSteps(features);
37
+ };
34
38
  describe('exact', () => {
35
39
  test('exact', async () => {
36
- const features = lib_1.asExpandedFeatures([{ path: 'l1', content: `exact1` }]);
37
- const res = await getResolver().resolveSteps(features);
40
+ const features = (0, lib_1.asExpandedFeatures)([{ path: 'l1', content: `exact1` }]);
41
+ const res = await getResolvedSteps(features);
38
42
  const { vsteps } = res[0];
39
43
  expect(vsteps[0].actions[0].named).toBeUndefined();
40
44
  });
41
45
  });
42
46
  describe('match', () => {
43
47
  test('match', async () => {
44
- const features = lib_1.asExpandedFeatures([{ path: 'l1', content: `match1` }]);
45
- const res = await getResolver().resolveSteps(features);
48
+ const features = (0, lib_1.asExpandedFeatures)([{ path: 'l1', content: `match1` }]);
49
+ const res = await getResolvedSteps(features);
46
50
  const { vsteps } = res[0];
47
51
  expect(vsteps[0].actions[0].named).toEqual({ num: '1' });
48
52
  });
49
53
  });
50
54
  describe('gwta regex', () => {
51
55
  test('gwta', async () => {
52
- const features = lib_1.asExpandedFeatures([{ path: 'l1', content: `gwta2\nGiven I'm gwta3\nWhen I am gwta4\nGwta5\nThen the gwta6` }]);
53
- const res = await getResolver().resolveSteps(features);
56
+ const features = (0, lib_1.asExpandedFeatures)([{ path: 'l1', content: `gwta2\nGiven I'm gwta3\nWhen I am gwta4\nGwta5\nThen the gwta6` }]);
57
+ const res = await getResolvedSteps(features);
54
58
  const { vsteps } = res[0];
55
59
  expect(vsteps[0].actions[0].named).toEqual({ num: '2' });
56
60
  expect(vsteps[1].actions[0].named).toEqual({ num: '3' });
@@ -61,14 +65,14 @@ describe('validate map steps', () => {
61
65
  });
62
66
  describe('gwta interpolated', () => {
63
67
  test('gets quoted', async () => {
64
- const features = lib_1.asExpandedFeatures([{ path: 'l1', content: 'is "string"' }]);
65
- const res = await getResolver().resolveSteps(features);
68
+ const features = (0, lib_1.asExpandedFeatures)([{ path: 'l1', content: 'is "string"' }]);
69
+ const res = await getResolvedSteps(features);
66
70
  const { vsteps } = res[0];
67
71
  expect(vsteps[0].actions[0].named?.q_0).toEqual('string');
68
72
  });
69
73
  test('gets uri', async () => {
70
- const features = lib_1.asExpandedFeatures([{ path: 'l1', content: 'is http://url' }]);
71
- const res = await getResolver().resolveSteps(features);
74
+ const features = (0, lib_1.asExpandedFeatures)([{ path: 'l1', content: 'is http://url' }]);
75
+ const res = await getResolvedSteps(features);
72
76
  const { vsteps } = res[0];
73
77
  expect(vsteps[0].actions[0].named?.t_0).toEqual('http://url');
74
78
  });
@@ -1 +1 @@
1
- {"version":3,"file":"Resolver.test.js","sourceRoot":"","sources":["../../src/phases/Resolver.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Resolver.test.js","sourceRoot":"","sources":["../../src/phases/Resolver.test.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ import { AStepper } from '../lib/defs';
1
2
  declare const Conformance: {
2
3
  new (): {
3
4
  steps: {
@@ -10,7 +11,7 @@ declare const Conformance: {
10
11
  close?(): void;
11
12
  endFeature?(): void;
12
13
  onFailure?(result: import("../lib/defs").TStepResult): void;
13
- setWorld(world: import("../lib/defs").TWorld): void;
14
+ setWorld(world: import("../lib/defs").TWorld, steppers: AStepper[]): void;
14
15
  getWorld(): import("../lib/defs").TWorld;
15
16
  };
16
17
  };
@@ -1 +1 @@
1
- {"version":3,"file":"conformance.d.ts","sourceRoot":"","sources":["../../src/steps/conformance.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,WAAW;;;;;gCAIW,GAAG;;;;;;;;;;CAG9B,CAAC;AAEF,eAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"conformance.d.ts","sourceRoot":"","sources":["../../src/steps/conformance.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,QAAA,MAAM,WAAW;;;;;gCAIW,GAAG;;;;;;;;;;CAG9B,CAAC;AAEF,eAAe,WAAW,CAAC"}
@@ -8,7 +8,7 @@ const Conformance = class Conformance extends defs_1.AStepper {
8
8
  this.steps = {
9
9
  must: {
10
10
  match: /(?!\n|. )\b([A-Z].*? must .*?\.)/,
11
- action: async (input) => util_1.actionNotOK('not implemented'),
11
+ action: async (input) => (0, util_1.actionNotOK)('not implemented'),
12
12
  },
13
13
  };
14
14
  }
@@ -1 +1 @@
1
- {"version":3,"file":"conformance.js","sourceRoot":"","sources":["../../src/steps/conformance.ts"],"names":[],"mappings":";;AAAA,sCAA0C;AAC1C,sCAAuC;AAEvC,MAAM,WAAW,GAAG,MAAM,WAAY,SAAQ,eAAQ;IAAlC;;QAClB,UAAK,GAAG;YACN,IAAI,EAAE;gBACJ,KAAK,EAAE,kCAAkC;gBACzC,MAAM,EAAE,KAAK,EAAE,KAAU,EAAE,EAAE,CAAC,kBAAW,CAAC,iBAAiB,CAAC;aAC7D;SACF,CAAC;IACJ,CAAC;CAAA,CAAC;AAEF,kBAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"conformance.js","sourceRoot":"","sources":["../../src/steps/conformance.ts"],"names":[],"mappings":";;AAAA,sCAA0C;AAC1C,sCAAuC;AAEvC,MAAM,WAAW,GAAG,MAAM,WAAY,SAAQ,eAAQ;IAAlC;;QAClB,UAAK,GAAG;YACN,IAAI,EAAE;gBACJ,KAAK,EAAE,kCAAkC;gBACzC,MAAM,EAAE,KAAK,EAAE,KAAU,EAAE,EAAE,CAAC,IAAA,kBAAW,EAAC,iBAAiB,CAAC;aAC7D;SACF,CAAC;IACJ,CAAC;CAAA,CAAC;AAEF,kBAAe,WAAW,CAAC"}
@@ -1,4 +1,4 @@
1
- import { TNamed } from '../lib/defs';
1
+ import { TNamed, AStepper } from '../lib/defs';
2
2
  export declare const cred: (key: string) => string;
3
3
  declare const Credentials: {
4
4
  new (): {
@@ -19,7 +19,7 @@ declare const Credentials: {
19
19
  close?(): void;
20
20
  endFeature?(): void;
21
21
  onFailure?(result: import("../lib/defs").TStepResult): void;
22
- setWorld(world: import("../lib/defs").TWorld): void;
22
+ setWorld(world: import("../lib/defs").TWorld, steppers: AStepper[]): void;
23
23
  getWorld(): import("../lib/defs").TWorld;
24
24
  };
25
25
  };
@@ -1 +1 @@
1
- {"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../../src/steps/credentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,MAAM,EAAY,MAAM,aAAa,CAAC;AAEnD,eAAO,MAAM,IAAI,QAAS,MAAM,WAAoB,CAAC;AAErD,QAAA,MAAM,WAAW;;oCACa,MAAM;oCAKN,MAAM;wBASlB,MAAM;;;;mCAOO,MAAM;;;;mCAQN,MAAM;;;;;;;;;;CAMpC,CAAC;AACF,eAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../../src/steps/credentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEnD,eAAO,MAAM,IAAI,QAAS,MAAM,WAAoB,CAAC;AAErD,QAAA,MAAM,WAAW;;oCACa,MAAM;oCAKN,MAAM;wBASlB,MAAM;;;;mCAOO,MAAM;;;;mCAQN,MAAM;;;;;;;;;;CAMpC,CAAC;AACF,eAAe,WAAW,CAAC"}
@@ -25,20 +25,20 @@ const Credentials = class Credentials extends defs_1.AStepper {
25
25
  };
26
26
  }
27
27
  generateRandomUsername(ref) {
28
- this.getWorld().shared.set(exports.cred(ref), ['rnd', Math.floor(Date.now() / 1000).toString(36), Math.floor(Math.random() * 1e8).toString(36)].join('_'));
29
- return this.getWorld().shared.get(exports.cred(ref));
28
+ this.getWorld().shared.set((0, exports.cred)(ref), ['rnd', Math.floor(Date.now() / 1000).toString(36), Math.floor(Math.random() * 1e8).toString(36)].join('_'));
29
+ return this.getWorld().shared.get((0, exports.cred)(ref));
30
30
  }
31
31
  generateRandomPassword(ref) {
32
- this.getWorld().shared.set(exports.cred(ref), [
32
+ this.getWorld().shared.set((0, exports.cred)(ref), [
33
33
  'testpass',
34
34
  Math.floor(Math.random() * 1e8)
35
35
  .toString(36)
36
36
  .toUpperCase(),
37
37
  ].join('_'));
38
- return this.getWorld().shared.get(exports.cred(ref));
38
+ return this.getWorld().shared.get((0, exports.cred)(ref));
39
39
  }
40
40
  getRandom(name) {
41
- return this.getWorld().shared.get(exports.cred(name));
41
+ return this.getWorld().shared.get((0, exports.cred)(name));
42
42
  }
43
43
  };
44
44
  exports.default = Credentials;
@@ -1 +1 @@
1
- {"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../src/steps/credentials.ts"],"names":[],"mappings":";;;AAAA,sCAAmD;AAE5C,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC;AAAxC,QAAA,IAAI,QAAoC;AAErD,MAAM,WAAW,GAAG,MAAM,WAAY,SAAQ,eAAQ;IAAlC;;QAmBlB,UAAK,GAAG;YACN,iBAAiB,EAAE;gBACjB,KAAK,EAAE,oDAAoD;gBAC3D,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,EAAU,EAAE,EAAE;oBACjC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;oBAClC,OAAO,SAAE,CAAC;gBACZ,CAAC;aACF;YAED,iBAAiB,EAAE;gBACjB,KAAK,EAAE,oDAAoD;gBAC3D,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,EAAU,EAAE,EAAE;oBACjC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;oBAClC,OAAO,SAAE,CAAC;gBACZ,CAAC;aACF;SACF,CAAC;IACJ,CAAC;IAnCC,sBAAsB,CAAC,GAAW;QAChC,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,YAAI,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACnJ,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,YAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,sBAAsB,CAAC,GAAW;QAChC,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,YAAI,CAAC,GAAG,CAAC,EAAE;YACpC,UAAU;YACV,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC;iBAC5B,QAAQ,CAAC,EAAE,CAAC;iBACZ,WAAW,EAAE;SACjB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACb,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,YAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,SAAS,CAAC,IAAY;QACpB,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,YAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAChD,CAAC;CAmBF,CAAC;AACF,kBAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../src/steps/credentials.ts"],"names":[],"mappings":";;;AAAA,sCAAmD;AAE5C,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC;AAAxC,QAAA,IAAI,QAAoC;AAErD,MAAM,WAAW,GAAG,MAAM,WAAY,SAAQ,eAAQ;IAAlC;;QAmBlB,UAAK,GAAG;YACN,iBAAiB,EAAE;gBACjB,KAAK,EAAE,oDAAoD;gBAC3D,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,EAAU,EAAE,EAAE;oBACjC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;oBAClC,OAAO,SAAE,CAAC;gBACZ,CAAC;aACF;YAED,iBAAiB,EAAE;gBACjB,KAAK,EAAE,oDAAoD;gBAC3D,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,EAAU,EAAE,EAAE;oBACjC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;oBAClC,OAAO,SAAE,CAAC;gBACZ,CAAC;aACF;SACF,CAAC;IACJ,CAAC;IAnCC,sBAAsB,CAAC,GAAW;QAChC,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAA,YAAI,EAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACnJ,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAA,YAAI,EAAC,GAAG,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,sBAAsB,CAAC,GAAW;QAChC,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAA,YAAI,EAAC,GAAG,CAAC,EAAE;YACpC,UAAU;YACV,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC;iBAC5B,QAAQ,CAAC,EAAE,CAAC;iBACZ,WAAW,EAAE;SACjB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACb,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAA,YAAI,EAAC,GAAG,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,SAAS,CAAC,IAAY;QACpB,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAA,YAAI,EAAC,IAAI,CAAC,CAAC,CAAC;IAChD,CAAC;CAmBF,CAAC;AACF,kBAAe,WAAW,CAAC"}