@haibun/core 1.2.4 → 1.5.0

package/build/lib/namedVars.js

@@ -39,7 +39,7 @@ const namedInterpolation = (inp, types = defs_1.BASE_TYPES) => {
         vars.push(pairToVar(inp.substring(bs + 1, be), types));
         bs = inp.indexOf('{', be);
         last = be + 1;
-        str += exports.matchGroups(matches++);
+        str += (0, exports.matchGroups)(matches++);
     }
     str += inp.substr(be + 1);
     return { vars, str };
@@ -59,12 +59,12 @@ function getNamedMatches(regexp, what) {
     return named?.groups;
 }
 exports.getNamedMatches = getNamedMatches;
-const getMatch = (actionable, r, name, step, vars) => {
+const getMatch = (actionable, r, actionName, stepperName, step, vars) => {
     if (!r.test(actionable)) {
         return;
     }
     const named = getNamedMatches(r, actionable);
-    return { name, step, named, vars };
+    return { actionName, stepperName, step, named, vars };
 };
 exports.getMatch = getMatch;
 // returns named values, assigning variable values as appropriate
@@ -79,7 +79,7 @@ function getNamedToVars({ named, vars }, world) {
     let namedFromVars = {};
     vars.forEach((v, i) => {
         const { name, type } = v;
-        const shared = domain_1.getStepShared(type, world);
+        const shared = (0, domain_1.getStepShared)(type, world);
         const namedKey = Object.keys(named).find((c) => c.endsWith(`_${i}`) && named[c] !== undefined);
         if (!namedKey) {
             throw Error(`no namedKey from ${named} for ${i}`);
@@ -97,10 +97,10 @@ function getNamedToVars({ named, vars }, world) {
         }
         else if (namedKey.startsWith(TYPE_CREDENTIAL)) {
             // must be from source
-            if (!shared.get(credentials_1.cred(namedValue))) {
+            if (!shared.get((0, credentials_1.cred)(namedValue))) {
                 throw Error(`no value for credential "${namedValue}" from ${JSON.stringify({ keys: Object.keys(shared), type })}`);
             }
-            namedFromVars[name] = shared.get(credentials_1.cred(namedValue));
+            namedFromVars[name] = shared.get((0, credentials_1.cred)(namedValue));
         }
         else if (namedKey.startsWith(TYPE_ENV)) {
             // FIXME add test

package/build/lib/namedVars.js.map

@@ -1 +1 @@
-{"version":3,"file":"namedVars.js","sourceRoot":"","sources":["../../src/lib/namedVars.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"namedVars.js","sourceRoot":"","sources":["../../src/lib/namedVars.ts"],"names":[],"mappings":"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"}

package/build/lib/namedVars.test.js

@@ -9,28 +9,28 @@ const features_1 = require("./features");
 describe('namedMatches', () => {
     const step = {
         match: /^(?<one>.*?) is (?<two>.*?)$/,
-        action: async () => util_1.actionNotOK('test'),
+        action: async () => (0, util_1.actionNotOK)('test'),
     };
     it('gets named matches', () => {
-        expect(namedVars_1.getNamedMatches(step.match, 'It is set')).toEqual({ one: 'It', two: 'set' });
+        expect((0, namedVars_1.getNamedMatches)(step.match, 'It is set')).toEqual({ one: 'It', two: 'set' });
     });
 });
 describe('namedInterpolation', () => {
     test('gets string', () => {
-        expect(namedVars_1.namedInterpolation('hi').str).toEqual('hi');
+        expect((0, namedVars_1.namedInterpolation)('hi').str).toEqual('hi');
     });
     test('gets var', () => {
-        expect(namedVars_1.namedInterpolation('{hi}')).toEqual({ str: `${namedVars_1.matchGroups(0)}`, vars: [{ name: 'hi', type: 'string' }] });
+        expect((0, namedVars_1.namedInterpolation)('{hi}')).toEqual({ str: `${(0, namedVars_1.matchGroups)(0)}`, vars: [{ name: 'hi', type: 'string' }] });
     });
     test('gets var with type', () => {
-        expect(namedVars_1.namedInterpolation('{hi: string}')).toEqual({ str: `${namedVars_1.matchGroups(0)}`, vars: [{ name: 'hi', type: 'string' }] });
+        expect((0, namedVars_1.namedInterpolation)('{hi: string}')).toEqual({ str: `${(0, namedVars_1.matchGroups)(0)}`, vars: [{ name: 'hi', type: 'string' }] });
     });
     test('gets var with post string', () => {
-        expect(namedVars_1.namedInterpolation('{hi} eh')).toEqual({ str: `${namedVars_1.matchGroups(0)} eh`, vars: [{ name: 'hi', type: 'string' }] });
+        expect((0, namedVars_1.namedInterpolation)('{hi} eh')).toEqual({ str: `${(0, namedVars_1.matchGroups)(0)} eh`, vars: [{ name: 'hi', type: 'string' }] });
     });
     test('gets vars', () => {
-        expect(namedVars_1.namedInterpolation('{hi} and {there}')).toEqual({
-            str: `${namedVars_1.matchGroups(0)} and ${namedVars_1.matchGroups(1)}`,
+        expect((0, namedVars_1.namedInterpolation)('{hi} and {there}')).toEqual({
+            str: `${(0, namedVars_1.matchGroups)(0)} and ${(0, namedVars_1.matchGroups)(1)}`,
             vars: [
                 { name: 'hi', type: 'string' },
                 { name: 'there', type: 'string' },
@@ -38,8 +38,8 @@ describe('namedInterpolation', () => {
         });
     });
     test('gets vars with post text', () => {
-        expect(namedVars_1.namedInterpolation('{hi} and {there} eh')).toEqual({
-            str: `${namedVars_1.matchGroups(0)} and ${namedVars_1.matchGroups(1)} eh`,
+        expect((0, namedVars_1.namedInterpolation)('{hi} and {there} eh')).toEqual({
+            str: `${(0, namedVars_1.matchGroups)(0)} and ${(0, namedVars_1.matchGroups)(1)} eh`,
             vars: [
                 { name: 'hi', type: 'string' },
                 { name: 'there', type: 'string' },
@@ -47,25 +47,25 @@ describe('namedInterpolation', () => {
         });
     });
     test('throws for bad type', () => {
-        expect(() => namedVars_1.namedInterpolation('{hi: wtw}')).toThrow();
+        expect(() => (0, namedVars_1.namedInterpolation)('{hi: wtw}')).toThrow();
     });
 });
 describe('namedInterpolation regexes', () => {
     test('regexes single', () => {
-        const r = new RegExp(namedVars_1.namedInterpolation('{ v1: string } ').str);
+        const r = new RegExp((0, namedVars_1.namedInterpolation)('{ v1: string } ').str);
         expect(r.exec('"hi" there')?.groups?.q_0).toBe('hi');
         expect(r.exec('<hi> there')?.groups?.c_0).toBe('hi');
         expect(r.exec('`hi` there')?.groups?.b_0).toBe('hi');
         expect(r.exec('hi there')?.groups?.t_0).toBe('hi');
     });
     test('regexes two', () => {
-        const r2 = new RegExp(namedVars_1.namedInterpolation('{ v1 } is { v2 }').str);
+        const r2 = new RegExp((0, namedVars_1.namedInterpolation)('{ v1 } is { v2 }').str);
         const x = r2.exec('this is that');
         expect(x?.groups?.t_0).toBe('this');
         expect(x?.groups?.t_1).toBe('that');
     });
 });
-describe('getNamedWithVars', () => {
+describe('getNamedWithVars', async () => {
     class TestStepper extends defs_1.AStepper {
         constructor() {
             super(...arguments);
@@ -77,16 +77,16 @@ describe('getNamedWithVars', () => {
             };
         }
     }
-    const steppers = [new TestStepper()];
-    const { world } = lib_1.getDefaultWorld(0);
+    const { world } = (0, lib_1.getDefaultWorld)(0);
+    const steppers = await (0, util_1.createSteppers)([TestStepper]);
     const resolver = new Resolver_1.Resolver(steppers, '', world);
     world.shared.set('exact', 'res');
     test('gets var', async () => {
-        const features = lib_1.asExpandedFeatures([features_1.withNameType('l1', 'is `exact`')]);
+        const features = (0, lib_1.asExpandedFeatures)([(0, features_1.withNameType)('l1', 'is `exact`')]);
         const res = await resolver.resolveSteps(features);
         const { vsteps } = res[0];
         expect(vsteps[0].actions[0]).toBeDefined();
-        const val = namedVars_1.getNamedToVars(vsteps[0].actions[0], world);
+        const val = (0, namedVars_1.getNamedToVars)(vsteps[0].actions[0], world);
         expect(val?.what).toBe('res');
     });
 });

package/build/lib/namedVars.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"namedVars.test.js","sourceRoot":"","sources":["../../src/lib/namedVars.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"namedVars.test.js","sourceRoot":"","sources":["../../src/lib/namedVars.test.ts"],"names":[],"mappings":"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"}

package/build/lib/run-with-options.d.ts

@@ -1,4 +1,4 @@
-import { TRunOptions, TRunResult } from './defs';
+import { TRunOptions, TRunResult, StringOrNumber } from './defs';
 import Logger from './Logger';
 export default function runWithOptions(runOptions: TRunOptions): Promise<{
     ok: boolean;
@@ -6,7 +6,7 @@ export default function runWithOptions(runOptions: TRunOptions): Promise<{
     ranResults: TRunResult[];
     allFailures: {
         [message: string]: {
-            sequence: number;
+            sequence: StringOrNumber;
             runDuration: number;
             fromStart: number;
         }[];

package/build/lib/run-with-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-with-options.d.ts","sourceRoot":"","sources":["../../src/lib/run-with-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,WAAW,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEtF,OAAO,MAAyB,MAAM,UAAU,CAAC;AAQjD,wBAA8B,cAAc,CAAC,UAAU,EAAE,WAAW;;;;;;sBASpC,MAAM;yBAAe,MAAM;uBAAa,MAAM;;;;;;;;GAoE7E"}
+{"version":3,"file":"run-with-options.d.ts","sourceRoot":"","sources":["../../src/lib/run-with-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0D,WAAW,EAAE,UAAU,EAAE,cAAc,EAAuB,MAAM,QAAQ,CAAC;AAE9I,OAAO,MAAM,MAAM,UAAU,CAAC;AAO9B,wBAA8B,cAAc,CAAC,UAAU,EAAE,WAAW;;;;;;sBAQpC,cAAc;yBAAe,MAAM;uBAAa,MAAM;;;;;;;;GAgErF"}

package/build/lib/run-with-options.js

@@ -9,7 +9,7 @@ const run_1 = require("./run");
 const util_1 = require("./util");
 const Timer_1 = require("./Timer");
 async function runWithOptions(runOptions) {
-    const { loops, members, trace, startRunCallback, endRunCallback, featureFilter, specl, base, splits, protoOptions } = runOptions;
+    const { loops, members, trace, startRunCallback, endFeatureCallback, featureFilter, specl, base, splits, protoOptions } = runOptions;
     const { LOG_LEVEL: logLevel, LOG_FOLLOW: logFollow } = protoOptions.options;
     const logger = new Logger_1.default({ level: logLevel || 'debug', follow: logFollow });
     const timer = new Timer_1.Timer();
@@ -24,12 +24,9 @@ async function runWithOptions(runOptions) {
             const instances = splits.map(async (split) => {
                 splits.length > 1 && logger.log(`starting instance ${split}`);
                 const runtime = {};
-                const tag = util_1.getRunTag(totalRan, loop, member, split, trace);
+                const tag = (0, util_1.getRunTag)(totalRan, loop, member, 0, split, trace);
                 totalRan++;
-                const res = await doRun(base, specl, runtime, featureFilter, new contexts_1.WorldContext(tag, split), protoOptions, logger, tag, timer, startRunCallback);
-                if (endRunCallback) {
-                    endRunCallback(res.world, res.result);
-                }
+                const res = await doRun(base, specl, runtime, featureFilter, new contexts_1.WorldContext(tag, split), protoOptions, logger, tag, timer, startRunCallback, endFeatureCallback);
                 return res;
             });
             groupRuns = groupRuns.concat(instances);
@@ -75,16 +72,16 @@ async function runWithOptions(runOptions) {
     return { ok, exceptionResults, ranResults, allFailures, logger, passed, failed, totalRan, runTime };
 }
 exports.default = runWithOptions;
-async function doRun(base, specl, runtime, featureFilter, shared, protoOptions, containerLogger, tag, timer, startRunCallback) {
+async function doRun(base, specl, runtime, featureFilter, shared, protoOptions, containerLogger, tag, timer, startRunCallback, endFeatureCallback) {
     const runStart = process.hrtime();
     const logger = new Logger_1.default({ output: containerLogger, tag });
-    const world = { options: protoOptions.options, shared, logger, runtime, domains: [], tag, timer };
+    const world = { options: protoOptions.options, extraOptions: protoOptions.extraOptions, shared, logger, runtime, domains: [], tag, timer, base };
     if (startRunCallback) {
         startRunCallback(world);
     }
     logger.log(`running with these options: ${JSON.stringify(world.options)})}`);
-    const { result } = await run_1.run({ specl, base, world, featureFilter, extraOptions: protoOptions.extraOptions });
-    const output = await util_1.resultOutput(process.env.HAIBUN_OUTPUT, result);
+    const result = await (0, run_1.run)({ specl, base, world, featureFilter, extraOptions: protoOptions.extraOptions, endFeatureCallback });
+    const output = await (0, util_1.resultOutput)(world.options.OUTPUT, result);
     return { world, result, shared, output, tag, runStart: runStart[0], runDuration: process.hrtime(runStart)[0], fromStart: timer.since() };
 }
 //# sourceMappingURL=run-with-options.js.map

package/build/lib/run-with-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-with-options.js","sourceRoot":"","sources":["../../src/lib/run-with-options.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run-with-options.js","sourceRoot":"","sources":["../../src/lib/run-with-options.ts"],"names":[],"mappings":"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"}

package/build/lib/run.d.ts

@@ -1,31 +1,26 @@
-import { TSpecl, AStepper, TResult, TWorld, TFeature, TExtraOptions } from './defs';
-declare type TrunOptions = {
+import { TSpecl, TResult, TWorld, TFeature, TExtraOptions, TendFeatureCallback, CStepper } from './defs';
+declare type TRunOptions = {
     specl: TSpecl;
     world: TWorld;
     base: string;
-    addSteppers?: typeof AStepper[];
+    addSteppers?: CStepper[];
     featureFilter?: string[];
     extraOptions?: TExtraOptions;
+    endFeatureCallback?: TendFeatureCallback;
 };
-export declare function run({ specl, base, world, addSteppers, featureFilter, extraOptions }: TrunOptions): Promise<{
-    result: TResult;
-    steppers?: AStepper[];
-}>;
+export declare function run({ specl, base, world, addSteppers, featureFilter, endFeatureCallback }: TRunOptions): Promise<TResult>;
 declare type TRunWithOptions = {
     specl: TSpecl;
     world: TWorld;
     features: TFeature[];
     backgrounds: TFeature[];
-    addSteppers: typeof AStepper[];
-    extraOptions?: TExtraOptions;
+    addSteppers: CStepper[];
+    endFeatureCallback?: TendFeatureCallback;
 };
 export declare const DEF_PROTO_OPTIONS: {
     options: {};
     extraOptions: {};
 };
-export declare function runWith({ specl, world, features, backgrounds, addSteppers, extraOptions }: TRunWithOptions): Promise<{
-    result: TResult;
-    steppers?: AStepper[];
-}>;
+export declare function runWith({ specl, world, features, backgrounds, addSteppers, endFeatureCallback }: TRunWithOptions): Promise<TResult>;
 export {};
 //# sourceMappingURL=run.d.ts.map

package/build/lib/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/lib/run.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAsB,aAAa,EAAE,MAAM,QAAQ,CAAC;AAQxG,aAAK,WAAW,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,QAAQ,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,YAAY,CAAC,EAAE,aAAa,CAAC;CAAE,CAAA;AAE3J,wBAAsB,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,WAAgB,EAAE,aAAa,EAAE,YAAiB,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAA;CAAE,CAAC,CActK;AAED,aAAK,eAAe,GAAG;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,WAAW,EAAE,QAAQ,EAAE,CAAC;IACxB,WAAW,EAAE,OAAO,QAAQ,EAAE,CAAC;IAC/B,YAAY,CAAC,EAAE,aAAa,CAAC;CAC9B,CAAA;AAED,eAAO,MAAM,iBAAiB;;;CAAoC,CAAC;AAEnE,wBAAsB,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,YAAiB,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAA;CAAE,CAAC,CA0D3K"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/lib/run.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAoB,mBAAmB,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAQ3H,aAAK,WAAW,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,YAAY,CAAC,EAAE,aAAa,CAAC;IAAC,kBAAkB,CAAC,EAAE,mBAAmB,CAAA;CAAE,CAAA;AAE7L,wBAAsB,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,WAAgB,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAcpI;AAED,aAAK,eAAe,GAAG;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,WAAW,EAAE,QAAQ,EAAE,CAAC;IACxB,WAAW,EAAE,QAAQ,EAAE,CAAC;IACxB,kBAAkB,CAAC,EAAE,mBAAmB,CAAA;CACzC,CAAA;AAED,eAAO,MAAM,iBAAiB;;;CAAoC,CAAC;AAEnE,wBAAsB,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CA2CzI"}

package/build/lib/run.domains.test.js

@@ -17,14 +17,14 @@ const TestStepsRequiresDomain = class TestStepsRequiresDomain extends defs_1.ASt
             onType: {
                 gwta: `on the {what} {type}$`,
                 action: async ({ what, type }) => {
-                    const location = vars_1.onCurrentTypeForDomain({ name: what, type }, this.getWorld());
-                    return util_1.actionOK(location);
+                    const location = (0, vars_1.onCurrentTypeForDomain)({ name: what, type }, this.getWorld());
+                    return (0, util_1.actionOK)(location);
                 },
             },
             test: {
                 gwta: `See the {what: ${CCONTROL}} ${CCONTROL}`,
                 action: async (named) => {
-                    return util_1.actionOK();
+                    return (0, util_1.actionOK)();
                 },
             },
         };
@@ -43,8 +43,8 @@ const TestStepsWithDomain = class TestStepsWithDomain extends defs_1.AStepper {
                 gwta: `Has a {what: ${CCONTROL}} control`,
                 action: async ({ what }, vstep) => {
                     const value = 'xxx';
-                    vars_1.setShared({ what, value }, vstep, this.getWorld());
-                    return util_1.actionOK();
+                    (0, vars_1.setShared)({ what, value }, vstep, this.getWorld());
+                    return (0, util_1.actionOK)();
                 },
             },
         };
@@ -52,21 +52,21 @@ const TestStepsWithDomain = class TestStepsWithDomain extends defs_1.AStepper {
 };
 describe('domain object', () => {
     it('missing domain object', async () => {
-        const { result } = await lib_1.testWithDefaults([{ path: '/features/test.feature', content: `\nHas a foobar control\n` }], [TestStepsRequiresDomain]);
+        const result = await (0, lib_1.testWithDefaults)([{ path: '/features/test.feature', content: `\nHas a foobar control\n` }], [TestStepsRequiresDomain]);
         expect(result.ok).toBe(false);
         expect(result.failure.error.message.startsWith(`missing required domain "${TTYPE}"`)).toBe(true);
         expect(result.failure.error.details.stack).toBeDefined();
     });
     it('domain object from background', async () => {
-        const specl = util_1.getOptionsOrDefault();
+        const specl = (0, util_1.getDefaultOptions)();
         const key = '/backgrounds/p1';
-        const { world } = lib_1.getDefaultWorld(0);
-        const features = lib_1.asFeatures([{ path: '/features/test.feature', content: `Backgrounds: p1.${TTYPE}\n\nOn the /backgrounds/p1 ${TTYPE}\nSee the page control\n` }]);
-        const backgrounds = lib_1.asFeatures([{ path: `/backgrounds/p1.${TTYPE}.feature`, content: 'Has a lever control' }]);
-        const { result } = await run_1.runWith({ specl, features, backgrounds, addSteppers: [TestStepsRequiresDomain, TestStepsWithDomain], world });
+        const { world } = (0, lib_1.getDefaultWorld)(0);
+        const features = (0, lib_1.asFeatures)([{ path: '/features/test.feature', content: `Backgrounds: p1.${TTYPE}\n\nOn the /backgrounds/p1 ${TTYPE}\nSee the page control\n` }]);
+        const backgrounds = (0, lib_1.asFeatures)([{ path: `/backgrounds/p1.${TTYPE}.feature`, content: 'Has a lever control' }]);
+        const result = await (0, run_1.runWith)({ specl, features, backgrounds, addSteppers: [TestStepsRequiresDomain, TestStepsWithDomain], world });
         expect(result.ok).toBe(true);
         expect(world.shared.getCurrent(TTYPE)).toEqual(key);
-        const page = domain_1.getDomain(TTYPE, world).shared.get(key);
+        const page = (0, domain_1.getDomain)(TTYPE, world).shared.get(key);
         expect(page).toBeDefined();
         expect(page.get(ACONTROL)).toEqual('xxx');
     });

package/build/lib/run.domains.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"run.domains.test.js","sourceRoot":"","sources":["../../src/lib/run.domains.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run.domains.test.js","sourceRoot":"","sources":["../../src/lib/run.domains.test.ts"],"names":[],"mappings":"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"}

package/build/lib/run.js

@@ -11,76 +11,56 @@ const Resolver_1 = require("../phases/Resolver");
 const Builder_1 = __importDefault(require("../phases/Builder"));
 const util_1 = require("./util");
 const domain_1 = require("./domain");
-async function run({ specl, base, world, addSteppers = [], featureFilter, extraOptions = {} }) {
+async function run({ specl, base, world, addSteppers = [], featureFilter, endFeatureCallback }) {
     let features;
     let backgrounds = [];
     try {
-        features = util_1.debase(base, util_1.recurse(`${base}/features`, 'feature', featureFilter));
-        if (fs_1.existsSync(`${base}/backgrounds`)) {
-            backgrounds = util_1.debase(base, util_1.recurse(`${base}/backgrounds`, 'feature'));
+        features = (0, util_1.debase)(base, (0, util_1.recurse)(`${base}/features`, 'feature', featureFilter));
+        if ((0, fs_1.existsSync)(`${base}/backgrounds`)) {
+            backgrounds = (0, util_1.debase)(base, (0, util_1.recurse)(`${base}/backgrounds`, 'feature'));
         }
     }
     catch (error) {
-        return { result: { ok: false, tag: util_1.getRunTag(-1, -1, -1, {}, false), failure: { stage: 'Collect', error: { message: error.message, details: { stack: error.stack } } } } };
+        return { ok: false, tag: (0, util_1.getRunTag)(-1, -1, -1, -1, {}, false), failure: { stage: 'Collect', error: { message: error.message, details: { stack: error.stack } } }, shared: world.shared };
     }
-    return runWith({ specl, world, features, backgrounds, addSteppers, extraOptions });
+    return runWith({ specl, world, features, backgrounds, addSteppers, endFeatureCallback });
 }
 exports.run = run;
 exports.DEF_PROTO_OPTIONS = { options: {}, extraOptions: {} };
-async function runWith({ specl, world, features, backgrounds, addSteppers, extraOptions = {} }) {
+async function runWith({ specl, world, features, backgrounds, addSteppers, endFeatureCallback }) {
     const { tag } = world;
-    const steppers = await util_1.getSteppers({ steppers: specl.steppers, addSteppers });
-    try {
-        util_1.applyExtraOptions(extraOptions, steppers, world);
-    }
-    catch (error) {
-        console.error(error);
-        return { result: { ok: false, tag, failure: { stage: 'Options', error: { message: error.message, details: error } } } };
-    }
-    try {
-        domain_1.applyDomainsOrError(steppers, world);
-    }
-    catch (error) {
-        return { result: { ok: false, tag, failure: { stage: 'Domains', error: { message: error.message, details: { stack: error.stack } } } } };
-    }
-    let expandedFeatures;
-    try {
-        expandedFeatures = await features_1.expand(backgrounds, features);
-    }
-    catch (error) {
-        return { result: { ok: false, tag, failure: { stage: 'Expand', error: { message: error.message, details: error } } } };
-    }
-    let mappedValidatedSteps;
+    let result = undefined;
     try {
+        const errorBail = (phase, error, details) => {
+            result = { ok: false, tag, failure: { stage: phase, error: { message: error.message, details: { stack: error.stack, details } } } };
+            throw Error(error);
+        };
+        const baseSteppers = await (0, util_1.getSteppers)(specl.steppers).catch(error => errorBail('Steppers', error));
+        const csteppers = baseSteppers.concat(addSteppers);
+        await (0, util_1.verifyRequiredOptions)(csteppers, world.options).catch(error => errorBail('Required Options', error));
+        await (0, util_1.verifyExtraOptions)(world.extraOptions, csteppers).catch((error) => errorBail('Options', error));
+        const expandedFeatures = await (0, features_1.expand)(backgrounds, features).catch(error => errorBail('Expand', tag, error));
+        const steppers = await (0, util_1.createSteppers)(csteppers);
+        await (0, util_1.setWorldStepperOptions)(steppers, world);
+        world.domains = await (0, domain_1.getDomains)(steppers, world).catch(error => errorBail('Get Domains', error));
+        await (0, domain_1.verifyDomainsOrError)(steppers, world).catch(error => errorBail('Required Domains', error));
         const resolver = new Resolver_1.Resolver(steppers, specl.mode, world);
-        mappedValidatedSteps = await resolver.resolveSteps(expandedFeatures);
-    }
-    catch (error) {
-        return { result: { ok: false, tag, failure: { stage: 'Resolve', error: { message: error.message, details: { stack: error.stack, steppers, mappedValidatedSteps } } } } };
-    }
-    const builder = new Builder_1.default(world);
-    try {
-        const res = await builder.build(mappedValidatedSteps);
+        const mappedValidatedSteps = await resolver.resolveSteps(expandedFeatures).catch(error => errorBail('Resolve', error));
+        const builder = new Builder_1.default(steppers, world);
+        await builder.build(mappedValidatedSteps).catch(error => errorBail('Build', error, { stack: error.stack, mappedValidatedSteps }));
         world.logger.log(`features: ${expandedFeatures.length} backgrounds: ${backgrounds.length} steps: (${expandedFeatures.map((e) => e.path)}), ${mappedValidatedSteps.length}`);
-    }
-    catch (error) {
-        console.error(error);
-        return { result: { ok: false, tag, failure: { stage: 'Build', error: { message: error.message, details: { stack: error.stack, steppers, mappedValidatedSteps } } } } };
-    }
-    const executor = new Executor_1.Executor(steppers, world);
-    let result;
-    try {
-        result = { ...await executor.execute(mappedValidatedSteps), tag };
-        if (!result.ok) {
-            const message = result.results[0].stepResults.find(s => !s.ok)?.actionResults[0].message;
-            result.failure = { stage: 'Execute', error: { message, details: { errors: result.results?.filter((r) => !r.ok).map((r) => r.path) } } };
-        }
+        result = await Executor_1.Executor.execute(csteppers, world, mappedValidatedSteps, endFeatureCallback).catch(error => errorBail('Execute', error));
+        // if (!result || !result.ok) {
+        //   const message = (result.results![0].stepResults.find(s => !s.ok)?.actionResults[0] as TNotOKActionResult).message;
+        //   result.failure = { stage: 'Execute', error: { message, details: { errors: result.results?.filter((r) => !r.ok).map((r) => r.path) } } };
+        // }
     }
     catch (e) {
-        console.error('XXXXXXX', e);
-        result = { ok: false, tag, failure: e };
+        console.log('fell', e);
+    }
+    finally {
+        return result;
     }
-    return { result, steppers };
 }
 exports.runWith = runWith;
 //# sourceMappingURL=run.js.map

package/build/lib/run.js.map

@@ -1 +1 @@
-{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/lib/run.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAgC;AAEhC,yCAAoC;AACpC,iDAA8C;AAC9C,iDAA8C;AAC9C,gEAAwC;AACxC,iCAAoF;AACpF,qCAA+C;AAIxC,KAAK,UAAU,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,GAAG,EAAE,EAAE,aAAa,EAAE,YAAY,GAAG,EAAE,EAAe;IAC/G,IAAI,QAAQ,CAAC;IACb,IAAI,WAAW,GAAe,EAAE,CAAC;IACjC,IAAI;QACF,QAAQ,GAAG,aAAM,CAAC,IAAI,EAAE,cAAO,CAAC,GAAG,IAAI,WAAW,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC;QAE/E,IAAI,eAAU,CAAC,GAAG,IAAI,cAAc,CAAC,EAAE;YACrC,WAAW,GAAG,aAAM,CAAC,IAAI,EAAE,cAAO,CAAC,GAAG,IAAI,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC;SACvE;KACF;IAAC,OAAO,KAAU,EAAE;QACnB,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,gBAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;KAC5K;IAED,OAAO,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;AACrF,CAAC;AAdD,kBAcC;AAWY,QAAA,iBAAiB,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;AAE5D,KAAK,UAAU,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,GAAG,EAAE,EAAmB;IACpH,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;IAEtB,MAAM,QAAQ,GAAe,MAAM,kBAAW,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;IAE1F,IAAI;QACF,wBAAiB,CAAC,YAAY,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;KAClD;IAAC,OAAO,KAAU,EAAE;QACnB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC;KACzH;IACD,IAAI;QACF,4BAAmB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;KACtC;IAAC,OAAO,KAAU,EAAE;QACnB,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;KAC1I;IAED,IAAI,gBAAgB,CAAC;IACrB,IAAI;QACF,gBAAgB,GAAG,MAAM,iBAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;KACxD;IAAC,OAAO,KAAU,EAAE;QAEnB,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC;KACxH;IAED,IAAI,oBAAoB,CAAC;IACzB,IAAI;QACF,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3D,oBAAoB,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;KACtE;IAAC,OAAO,KAAU,EAAE;QACnB,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,oBAAoB,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;KAC1K;IAED,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,KAAK,CAAC,CAAC;IACnC,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACtD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,gBAAgB,CAAC,MAAM,iBAAiB,WAAW,CAAC,MAAM,YAAY,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,oBAAoB,CAAC,MAAM,EAAE,CAAC,CAAC;KAC7K;IAAC,OAAO,KAAU,EAAE;QACnB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,oBAAoB,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;KACxK;IAED,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC/C,IAAI,MAAM,CAAC;IACX,IAAI;QACF,MAAM,GAAG,EAAE,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,GAAG,EAAE,CAAC;QAElE,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;YACd,MAAM,OAAO,GAAI,MAAM,CAAC,OAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAwB,CAAC,OAAO,CAAC;YAElH,MAAM,CAAC,OAAO,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;SACzI;KACF;IAAC,OAAO,CAAM,EAAE;QACf,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAE5B,MAAM,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;KACzC;IACD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AAC9B,CAAC;AA1DD,0BA0DC"}
+{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/lib/run.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAgC;AAEhC,yCAAoC;AACpC,iDAA8C;AAC9C,iDAA8C;AAC9C,gEAAwC;AACxC,iCAAoJ;AACpJ,qCAA4D;AAIrD,KAAK,UAAU,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,GAAG,EAAE,EAAE,aAAa,EAAE,kBAAkB,EAAe;IAChH,IAAI,QAAQ,CAAC;IACb,IAAI,WAAW,GAAe,EAAE,CAAC;IACjC,IAAI;QACF,QAAQ,GAAG,IAAA,aAAM,EAAC,IAAI,EAAE,IAAA,cAAO,EAAC,GAAG,IAAI,WAAW,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC;QAE/E,IAAI,IAAA,eAAU,EAAC,GAAG,IAAI,cAAc,CAAC,EAAE;YACrC,WAAW,GAAG,IAAA,aAAM,EAAC,IAAI,EAAE,IAAA,cAAO,EAAC,GAAG,IAAI,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC;SACvE;KACF;IAAC,OAAO,KAAU,EAAE;QACnB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,IAAA,gBAAS,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;KAC1L;IAED,OAAO,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC,CAAC;AAC3F,CAAC;AAdD,kBAcC;AAWY,QAAA,iBAAiB,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;AAE5D,KAAK,UAAU,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAmB;IACrH,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;IAEtB,IAAI,MAAM,GAAG,SAAS,CAAC;IACvB,IAAI;QACF,MAAM,SAAS,GAAG,CAAC,KAAa,EAAE,KAAU,EAAE,OAAa,EAAE,EAAE;YAC7D,MAAM,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,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,EAAE,CAAC;YACpI,MAAM,KAAK,CAAC,KAAK,CAAC,CAAA;QACpB,CAAC,CAAC;QACF,MAAM,YAAY,GAAG,MAAM,IAAA,kBAAW,EAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;QACpG,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAGnD,MAAM,IAAA,4BAAqB,EAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC,CAAC;QAC3G,MAAM,IAAA,yBAAkB,EAAC,KAAK,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QAE3G,MAAM,gBAAgB,GAAG,MAAM,IAAA,iBAAM,EAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QAE7G,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAc,EAAC,SAAS,CAAC,CAAC;QACjD,MAAM,IAAA,6BAAsB,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAE9C,KAAK,CAAC,OAAO,GAAG,MAAM,IAAA,mBAAU,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC;QAClG,MAAM,IAAA,6BAAoB,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC,CAAC;QAEjG,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3D,MAAM,oBAAoB,GAAuB,MAAM,QAAQ,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QAE3I,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC7C,MAAM,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,oBAAoB,EAAE,CAAC,CAAC,CAAA;QAEjI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,gBAAgB,CAAC,MAAM,iBAAiB,WAAW,CAAC,MAAM,YAAY,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,oBAAoB,CAAC,MAAM,EAAE,CAAC,CAAC;QAE5K,MAAM,GAAG,MAAM,mBAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QAExI,+BAA+B;QAC/B,uHAAuH;QACvH,6IAA6I;QAC7I,IAAI;KACL;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;KACxB;YAAS;QACR,OAAO,MAAO,CAAC;KAChB;AACH,CAAC;AA3CD,0BA2CC"}