@haibun/core 1.42.4 → 1.44.0

package/build/lib/interfaces/logger.d.ts

@@ -1,91 +1,38 @@
-import { TAnyFixme, TStepResult, TTag, TFeatureStep } from '../defs.js';
+import { TAnyFixme, TTag } from '../defs.js';
+import { TMessageContext } from './messageContexts.js';
+export type * from './messageContexts.js';
+export type * from './artifacts.js';
 export type TLogLevel = 'none' | 'debug' | 'log' | 'info' | 'warn' | 'error';
-export type TLogMessage = string;
+export type TLogArgs = string;
 export type TLogHistory = {
-    message: TLogMessage;
+    message: TLogArgs;
     level: TLogLevel;
     caller: string;
     messageContext: TMessageContext;
 };
-export declare const SCHEMA_HISTORY_WITH_META: string;
-export type THistoryWithMeta = {
-    '$schema': typeof SCHEMA_HISTORY_WITH_META;
-    meta: {
-        startTime: string;
-        description: string;
-        feature: string;
-        startOffset: number;
-        ok: boolean;
-    };
-    logHistory: TLogHistory[];
-};
-export type TMessageContext = TArtifactMessageContext | TExecutorMessageContext | TTraceMessageContext | TBasicMessageContext;
-type TContextTopic = TArtifactRequestStepTopic | TArtifactFailureStepTopic | TExecutorResultTopic | TTraceTopic;
-export type TLogHistoryWithArtifact = TLogHistory & {
-    messageContext: TArtifactMessageContext;
-};
-export type TArtifactMessageContext = {
-    topic: TArtifactRequestStepTopic | TArtifactSummaryTopic | TArtifactFailureStepTopic | TArtifactDebugTopic;
-    artifact: TArtifact;
-    tag?: TTag;
-};
-export type TBasicMessageContext = {
-    tag: TTag;
-};
-export type TExecutorMessageContext = {
-    topic: TExecutorResultTopic;
-    tag: TTag;
-};
-export type TTraceMessageContext = {
-    topic: TTraceTopic;
-    tag: TTag;
-};
-export type TExecutorResultTopic = {
-    result: TStepResult;
-    step: TFeatureStep;
-    stage: 'Executor';
-};
-export type TActionStage = 'endFeature' | 'action' | 'onFailure' | 'nextStep' | 'init' | 'action';
-type TBaseArtifactTopic = {
-    stage: TActionStage;
-};
-export type TArtifactSummaryTopic = TBaseArtifactTopic & {
-    event: 'summary';
-};
-export type TArtifactRequestStepTopic = TBaseArtifactTopic & {
-    event: 'request';
-    seq: number;
-};
-export type TArtifactDebugTopic = TBaseArtifactTopic & {
-    event: 'debug';
-};
-export type TArtifactFailureStepTopic = TBaseArtifactTopic & {
-    event: 'failure';
-    step: TFeatureStep;
-};
-export type TTraceTopic = {
-    type?: string;
-    trace?: object;
-};
-export type TLogHistoryWithExecutorTopic = TLogHistory & {
-    messageContext: {
-        topic: TExecutorResultTopic;
-        tag: TTag;
-    };
-};
-export type TArtifact = {
-    type: 'video' | 'picture' | 'html' | 'json' | 'json/playwright/trace';
-    path?: string;
-    content?: TAnyFixme;
-};
-export type TArtifactType = TArtifact['type'];
+export declare enum EExecutionMessageType {
+    INIT = "INIT",
+    EXECUTION_START = "EXECUTION_START",
+    FEATURE_START = "FEATURE_START",
+    SCENARIO_START = "SCENARIO_START",
+    STEP_START = "STEP_START",
+    STEP_NEXT = "STEP_NEXT",
+    ACTION = "ACTION",
+    TRACE = "TRACE",
+    STEP_END = "STEP_END",
+    SCENARIO_END = "SCENARIO_END",
+    FEATURE_END = "FEATURE_END",
+    EXECUTION_END = "EXECUTION_END",
+    ON_FAILURE = "ON_FAILURE"
+}
 export interface ILogger {
-    debug: (what: TLogMessage, ctx?: TMessageContext) => void;
-    log: (what: TLogMessage, ctx?: TMessageContext) => void;
-    info: (what: TLogMessage, ctx?: TMessageContext) => void;
-    warn: (what: TLogMessage, ctx?: TMessageContext) => void;
-    error: (what: TLogMessage, ctx?: TMessageContext) => void;
+    debug: (what: TLogArgs, ctx?: TMessageContext) => void;
+    log: (what: TLogArgs, ctx?: TMessageContext) => void;
+    info: (what: TLogArgs, ctx?: TMessageContext) => void;
+    warn: (what: TLogArgs, ctx?: TMessageContext) => void;
+    error: (what: TLogArgs, ctx?: TMessageContext) => void;
     addSubscriber: (subscriber: ILogOutput) => void;
+    removeSubscriber: (subscriber: ILogOutput) => void;
 }
 export interface IConnect {
     connect: () => Promise<void>;
@@ -99,23 +46,10 @@ export interface ILoggerKeepAlive {
     stop: () => Promise<void>;
 }
 export interface ILogOutput {
-    out: (level: TLogLevel, message: TLogMessage, ctx?: TMessageContext) => void;
+    out: (level: TLogLevel, args: TLogArgs, ctx?: TMessageContext) => void;
 }
 export type TOutputEnv = {
     output: ILogOutput;
     tag: TTag;
 };
-export type TMessage = {
-    level: string;
-    message: string;
-    messageTopic?: TContextTopic;
-};
-export type TMessageWithTopic = {
-    level: string;
-    message: string;
-    messageTopic: {
-        result: TStepResult;
-    };
-};
-export {};
 //# sourceMappingURL=logger.d.ts.map

package/build/lib/interfaces/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/lib/interfaces/logger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/lib/interfaces/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,mBAAmB,sBAAsB,CAAC;AAC1C,mBAAmB,gBAAgB,CAAA;AAEnC,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAC7E,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE9B,MAAM,MAAM,WAAW,GAAG;IACzB,OAAO,EAAE,QAAQ,CAAC;IAClB,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,eAAe,CAAA;CAC/B,CAAC;AAGF,oBAAY,qBAAqB;IAChC,IAAI,SAAS;IACb,eAAe,oBAAoB;IACnC,aAAa,kBAAkB;IAC/B,cAAc,mBAAmB;IACjC,UAAU,eAAe;IACzB,SAAS,cAAc;IACvB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,YAAY,iBAAiB;IAC7B,WAAW,gBAAgB;IAC3B,aAAa,kBAAkB;IAC/B,UAAU,eAAe;CACzB;AAED,MAAM,WAAW,OAAO;IACvB,KAAK,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,eAAe,KAAK,IAAI,CAAC;IACvD,GAAG,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,eAAe,KAAK,IAAI,CAAC;IACrD,IAAI,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,eAAe,KAAK,IAAI,CAAC;IACtD,IAAI,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,eAAe,KAAK,IAAI,CAAC;IACtD,KAAK,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,eAAe,KAAK,IAAI,CAAC;IACvD,aAAa,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;IAChD,gBAAgB,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;CACnD;AAED,MAAM,WAAW,QAAQ;IACxB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,CAAC;CAC9C;AAED,MAAM,WAAW,gBAAiB,SAAQ,OAAO,EAAE,QAAQ;CAAI;AAE/D,MAAM,WAAW,gBAAgB;IAChC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,MAAM,WAAW,UAAU;IAC1B,GAAG,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,eAAe,KAAK,IAAI,CAAC;CACvE;AAED,MAAM,MAAM,UAAU,GAAG;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,CAAC"}

package/build/lib/interfaces/logger.js

@@ -1,3 +1,17 @@
-import { versionedSchema } from '../defs.js';
-export const SCHEMA_HISTORY_WITH_META = versionedSchema('HistoryWithMeta');
+export var EExecutionMessageType;
+(function (EExecutionMessageType) {
+    EExecutionMessageType["INIT"] = "INIT";
+    EExecutionMessageType["EXECUTION_START"] = "EXECUTION_START";
+    EExecutionMessageType["FEATURE_START"] = "FEATURE_START";
+    EExecutionMessageType["SCENARIO_START"] = "SCENARIO_START";
+    EExecutionMessageType["STEP_START"] = "STEP_START";
+    EExecutionMessageType["STEP_NEXT"] = "STEP_NEXT";
+    EExecutionMessageType["ACTION"] = "ACTION";
+    EExecutionMessageType["TRACE"] = "TRACE";
+    EExecutionMessageType["STEP_END"] = "STEP_END";
+    EExecutionMessageType["SCENARIO_END"] = "SCENARIO_END";
+    EExecutionMessageType["FEATURE_END"] = "FEATURE_END";
+    EExecutionMessageType["EXECUTION_END"] = "EXECUTION_END";
+    EExecutionMessageType["ON_FAILURE"] = "ON_FAILURE";
+})(EExecutionMessageType || (EExecutionMessageType = {}));
 //# sourceMappingURL=logger.js.map

package/build/lib/interfaces/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/lib/interfaces/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,eAAe,EAAE,MAAM,YAAY,CAAC;AAYzF,MAAM,CAAC,MAAM,wBAAwB,GAAG,eAAe,CAAC,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/lib/interfaces/logger.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAN,IAAY,qBAcX;AAdD,WAAY,qBAAqB;IAChC,sCAAa,CAAA;IACb,4DAAmC,CAAA;IACnC,wDAA+B,CAAA;IAC/B,0DAAiC,CAAA;IACjC,kDAAyB,CAAA;IACzB,gDAAuB,CAAA;IACvB,0CAAiB,CAAA;IACjB,wCAAe,CAAA;IACf,8CAAqB,CAAA;IACrB,sDAA6B,CAAA;IAC7B,oDAA2B,CAAA;IAC3B,wDAA+B,CAAA;IAC/B,kDAAyB,CAAA;AAC1B,CAAC,EAdW,qBAAqB,KAArB,qBAAqB,QAchC"}

package/build/lib/interfaces/messageContexts.d.ts

@@ -0,0 +1,10 @@
+import { TAnyFixme, TTag } from '../defs.js';
+import { TArtifact } from './artifacts.js';
+import { EExecutionMessageType } from './logger.js';
+export type TMessageContext = {
+    incident: EExecutionMessageType;
+    artifact?: TArtifact;
+    incidentDetails?: TAnyFixme;
+    tag?: TTag;
+};
+//# sourceMappingURL=messageContexts.d.ts.map

package/build/lib/interfaces/messageContexts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"messageContexts.d.ts","sourceRoot":"","sources":["../../../src/lib/interfaces/messageContexts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,MAAM,eAAe,GAAG;IAC7B,QAAQ,EAAE,qBAAqB,CAAC;IAChC,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,GAAG,CAAC,EAAE,IAAI,CAAC;CACX,CAAC"}

package/build/lib/interfaces/messageContexts.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=messageContexts.js.map

package/build/lib/interfaces/messageContexts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"messageContexts.js","sourceRoot":"","sources":["../../../src/lib/interfaces/messageContexts.ts"],"names":[],"mappings":""}

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

@@ -1 +1 @@
-{"version":3,"file":"namedVars.d.ts","sourceRoot":"","sources":["../../src/lib/namedVars.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAU,MAAM,WAAW,CAAC;AAYvG,eAAO,MAAM,WAAW,0BASvB,CAAC;AAEF,eAAO,MAAM,kBAAkB,QAAS,MAAM,UAAS,MAAM,EAAE,KAAgB;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAA;CAyB/G,CAAC;AAaF,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;;EAG3D;AAED,eAAO,MAAM,QAAQ,eACR,MAAM,KACf,MAAM,cACG,MAAM,eACL,MAAM,QACb,YAAY,SACX,SAAS,EAAE;;;;;;;;CAOlB,CAAC;AAIF,wBAAgB,cAAc,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,UAoF1F"}
+{"version":3,"file":"namedVars.d.ts","sourceRoot":"","sources":["../../src/lib/namedVars.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAU,MAAM,WAAW,CAAC;AAYvG,eAAO,MAAM,WAAW,GAAI,YAAO,WASlC,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,KAAK,MAAM,EAAE,QAAO,MAAM,EAAe,KAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAA;CAyB/G,CAAC;AAaF,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;;EAG3D;AAED,eAAO,MAAM,QAAQ,GACpB,YAAY,MAAM,EAClB,GAAG,MAAM,EACT,YAAY,MAAM,EAClB,aAAa,MAAM,EACnB,MAAM,YAAY,EAClB,OAAO,SAAS,EAAE;;;;;;;;CAOlB,CAAC;AAIF,wBAAgB,cAAc,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,UAuE1F"}

package/build/lib/namedVars.js

@@ -86,8 +86,8 @@ export function getNamedToVars(found, world, featureStep) {
         const namedValue = named[namedKey];
         if (namedKey.startsWith(TYPE_ENV_OR_VAR_OR_LITERAL)) {
             // For TYPE_ENV_OR_VAR_OR_LITERAL, check env first if exists
-            if (world.options.env && world.options.env[namedValue] !== undefined) {
-                namedFromVars[name] = world.options.env[namedValue];
+            if (world.options.envVariables && world.options.envVariables[namedValue] !== undefined) {
+                namedFromVars[name] = world.options.envVariables[namedValue];
             }
             else {
                 namedFromVars[name] = shared?.get(namedValue) || (named && named[namedKey]);
@@ -96,7 +96,7 @@ export function getNamedToVars(found, world, featureStep) {
         else if (namedKey.startsWith(TYPE_VAR)) {
             // must be from source
             if (!shared.get(namedValue)) {
-                throw Error(`no value for "${namedValue}" from ${JSON.stringify({ keys: Object.keys(shared.values), type })} in ${featureStep.source.path}`);
+                throw Error(`no value for "${namedValue}" from ${JSON.stringify({ keys: Object.keys(shared.values), type })} in ${featureStep.path}`);
             }
             namedFromVars[name] = shared.get(namedValue);
         }
@@ -119,22 +119,11 @@ export function getNamedToVars(found, world, featureStep) {
         }
         else if (namedKey.startsWith(TYPE_ENV)) {
             // FIXME add test
-            const val = world.options?.env[namedValue];
+            const val = world.options?.envVariables[namedValue];
             if (val === undefined) {
-                throw Error(`no env value for "${namedValue}" from ${JSON.stringify(world.options?.env)}.\nenv values are passed via ${HAIBUN}_ENV and ${HAIBUN}_ENVC.`);
-            }
-            if (Array.isArray(val)) {
-                let index = world.options[`_index_${namedValue}`] === undefined ? val.length - 1 : world.options[`_index_${namedValue}`];
-                index++;
-                if (index > val.length - 1) {
-                    index = 0;
-                }
-                world.options[`_index_${namedValue}`] = index;
-                namedFromVars[name] = val[index];
-            }
-            else {
-                namedFromVars[name] = val;
+                throw Error(`no env value for "${namedValue}" from ${JSON.stringify(world.options?.envVariables)}.\nenv values are passed via ${HAIBUN}_ENV and ${HAIBUN}_ENVC.`);
             }
+            namedFromVars[name] = val;
         }
         else if (namedKey.startsWith(TYPE_QUOTED)) {
             // quoted

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/resolver-features.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolver-features.d.ts","sourceRoot":"","sources":["../../src/lib/resolver-features.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,gBAAgB,EAAa,MAAM,WAAW,CAAC;AAIvE,eAAO,MAAM,UAAU,MAAO;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;CAAE,EAAE;;;;;;GAAuE,CAAC;AAGzJ,eAAO,MAAM,kBAAkB,MAAO;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;CAAE,EAAE,KAAG,gBAAgB,EAM1G,CAAC"}
+{"version":3,"file":"resolver-features.d.ts","sourceRoot":"","sources":["../../src/lib/resolver-features.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,gBAAgB,EAAa,MAAM,WAAW,CAAC;AAIvE,eAAO,MAAM,UAAU,GAAI,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;CAAE,EAAE;;;;;;GAAuE,CAAC;AAGzJ,eAAO,MAAM,kBAAkB,GAAI,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;CAAE,EAAE,KAAG,gBAAgB,EAM1G,CAAC"}

package/build/lib/test/SetTimeStepper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SetTimeStepper.d.ts","sourceRoot":"","sources":["../../../src/lib/test/SetTimeStepper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAM,MAAM,YAAY,CAAC;AAMlD,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,QAAQ;IAClD,KAAK;;;6CAGsC,MAAM;;MAM/C;CACH"}
+{"version":3,"file":"SetTimeStepper.d.ts","sourceRoot":"","sources":["../../../src/lib/test/SetTimeStepper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAM,MAAM,YAAY,CAAC;AAMlD,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,QAAQ;IAClD,KAAK;;;6CAGgC,MAAM;;MAMzC;CACH"}

package/build/lib/test/SetTimeStepper.js

@@ -9,10 +9,10 @@ export default class SetTimeStepper extends AStepper {
     steps = {
         setTime: {
             gwta: 'change date to {y}-{m}-{d} {h}:{min}:{s}',
-            action: async ({ y, m, d, h, min, s }) => {
+            action: ({ y, m, d, h, min, s }) => {
                 const date = new Date(checkedInt('year', y), checkedInt('month', m) - 1, checkedInt('day', d), checkedInt('hour', h), checkedInt('minute', min), checkedInt('second', s));
                 vi.setSystemTime(date);
-                return OK;
+                return Promise.resolve(OK);
             }
         },
     };

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

@@ -1 +1 @@
-{"version":3,"file":"SetTimeStepper.js","sourceRoot":"","sources":["../../../src/lib/test/SetTimeStepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAU,QAAQ,EAAE,EAAE,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,UAAU,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;IAC1C,IAAI,CAAC,KAAK,SAAS;QAAE,MAAM,KAAK,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IACpE,OAAO,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACzB,CAAC,CAAA;AACD,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,QAAQ;IAClD,KAAK,GAAG;QACN,OAAO,EAAE;YACP,IAAI,EAAE,0CAA0C;YAChD,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAU,EAAE,EAAE;gBAC/C,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC1K,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gBACvB,OAAO,EAAE,CAAC;YACZ,CAAC;SACF;KACF,CAAC;CACH"}
+{"version":3,"file":"SetTimeStepper.js","sourceRoot":"","sources":["../../../src/lib/test/SetTimeStepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAU,QAAQ,EAAE,EAAE,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,UAAU,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;IAC1C,IAAI,CAAC,KAAK,SAAS;QAAE,MAAM,KAAK,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IACpE,OAAO,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACzB,CAAC,CAAA;AACD,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,QAAQ;IAClD,KAAK,GAAG;QACN,OAAO,EAAE;YACP,IAAI,EAAE,0CAA0C;YAChD,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAU,EAAE,EAAE;gBACzC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC1K,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gBACvB,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC7B,CAAC;SACF;KACF,CAAC;CACH"}

package/build/lib/test/TestSteps.d.ts

@@ -20,13 +20,11 @@ declare const TestSteps: {
             };
             throws: {
                 gwta: string;
-                action: () => Promise<never>;
+                action: () => never;
             };
         };
         world?: import("../defs.js").TWorld;
-        close?(): void;
-        endFeature?(): Promise<void>;
-        onFailure?(result: import("../defs.js").TStepResult, step: import("../defs.js").TFeatureStep): Promise<void | import("../interfaces/logger.js").TMessageContext>;
+        cycles?: import("../defs.js").IStepperCycles;
         setWorld(world: import("../defs.js").TWorld, steppers: AStepper[]): Promise<void>;
         getWorld(): import("../defs.js").TWorld;
     };

package/build/lib/test/TestSteps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TestSteps.d.ts","sourceRoot":"","sources":["../../../src/lib/test/TestSteps.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAI9C,QAAA,MAAM,SAAS;;;;;;;;;;;;;;;;;oCAgBiB,MAAM;;;;;;;;;;;;;;CAWrC,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"TestSteps.d.ts","sourceRoot":"","sources":["../../../src/lib/test/TestSteps.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAG9C,QAAA,MAAM,SAAS;;;;;;;;;;;;;;;;;oCAgBc,MAAM;;;;;;;;;;;;CAWlC,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/build/lib/test/TestSteps.js

@@ -4,25 +4,25 @@ const TestSteps = class TestSteps extends AStepper {
     steps = {
         fails: {
             gwta: 'fails',
-            action: async () => actionNotOK('test fail'),
+            action: async () => Promise.resolve(actionNotOK('test fail')),
         },
         test: {
             exact: 'have a test',
-            action: async () => actionOK(),
+            action: async () => Promise.resolve(actionOK()),
         },
         passes: {
             exact: 'passes',
-            action: async () => actionOK(),
+            action: async () => Promise.resolve(actionOK()),
         },
         named: {
             match: /^parameter (?<param>.+) is accepted$/,
             action: async ({ param }) => {
-                return param === 'x' ? actionOK() : actionNotOK('test');
+                return Promise.resolve(param === 'x' ? actionOK() : actionNotOK('test'));
             },
         },
         throws: {
             gwta: 'throw an exception',
-            action: async () => {
+            action: () => {
                 throw Error(`<Thrown for test case>`);
             },
         },

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

@@ -1 +1 @@
-{"version":3,"file":"TestSteps.js","sourceRoot":"","sources":["../../../src/lib/test/TestSteps.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGzD,MAAM,SAAS,GAAG,MAAM,SAAU,SAAQ,QAAQ;IAChD,KAAK,GAAG;QACN,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC;SAC7C;QACD,IAAI,EAAE;YACJ,KAAK,EAAE,aAAa;YACpB,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,QAAQ,EAAE;SAC/B;QACD,MAAM,EAAE;YACN,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,QAAQ,EAAE;SAC/B;QACD,KAAK,EAAE;YACL,KAAK,EAAE,sCAAsC;YAC7C,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,EAAU,EAAE,EAAE;gBAClC,OAAO,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAC1D,CAAC;SACF;QACD,MAAM,EAAE;YACN,IAAI,EAAE,oBAAoB;YAC1B,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,MAAM,KAAK,CAAC,wBAAwB,CAAC,CAAC;YACxC,CAAC;SACF;KACF,CAAC;CACH,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"TestSteps.js","sourceRoot":"","sources":["../../../src/lib/test/TestSteps.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEzD,MAAM,SAAS,GAAG,MAAM,SAAU,SAAQ,QAAQ;IACjD,KAAK,GAAG;QACP,KAAK,EAAE;YACN,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;SAC7D;QACD,IAAI,EAAE;YACL,KAAK,EAAE,aAAa;YACpB,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;SAC/C;QACD,MAAM,EAAE;YACP,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;SAC/C;QACD,KAAK,EAAE;YACN,KAAK,EAAE,sCAAsC;YAC7C,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,EAAU,EAAE,EAAE;gBACnC,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;YAC1E,CAAC;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE,oBAAoB;YAC1B,MAAM,EAAE,GAAG,EAAE;gBACZ,MAAM,KAAK,CAAC,wBAAwB,CAAC,CAAC;YACvC,CAAC;SACD;KACD,CAAC;CACF,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/build/lib/test/TestStepsWithOptions.d.ts

@@ -4,7 +4,7 @@ export declare const TestStepsWithOptions: {
         options: {
             EXISTS: {
                 desc: string;
-                parse: (input: string) => {
+                parse: () => {
                     result: number;
                 };
             };
@@ -16,37 +16,10 @@ export declare const TestStepsWithOptions: {
             };
         };
         world?: import("../defs.js").TWorld;
-        close?(): void;
-        endFeature?(): Promise<void>;
-        onFailure?(result: import("../defs.js").TStepResult, step: import("../defs.js").TFeatureStep): Promise<void | import("../interfaces/logger.js").TMessageContext>;
+        cycles?: import("../defs.js").IStepperCycles;
         setWorld(world: import("../defs.js").TWorld, steppers: AStepper[]): Promise<void>;
         getWorld(): import("../defs.js").TWorld;
     };
 };
 export default TestStepsWithOptions;
-export declare const TestStepsWithRequiredOptions: {
-    new (): {
-        options: {
-            EXISTS: {
-                required: boolean;
-                desc: string;
-                parse: (input: string) => {
-                    result: number;
-                };
-            };
-        };
-        steps: {
-            test: {
-                exact: string;
-                action: () => Promise<import("../defs.js").TOKActionResult>;
-            };
-        };
-        world?: import("../defs.js").TWorld;
-        close?(): void;
-        endFeature?(): Promise<void>;
-        onFailure?(result: import("../defs.js").TStepResult, step: import("../defs.js").TFeatureStep): Promise<void | import("../interfaces/logger.js").TMessageContext>;
-        setWorld(world: import("../defs.js").TWorld, steppers: AStepper[]): Promise<void>;
-        getWorld(): import("../defs.js").TWorld;
-    };
-};
 //# sourceMappingURL=TestStepsWithOptions.d.ts.map

package/build/lib/test/TestStepsWithOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TestStepsWithOptions.d.ts","sourceRoot":"","sources":["../../../src/lib/test/TestStepsWithOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGnD,eAAO,MAAM,oBAAoB;;;;;+BAIZ,MAAM;;;;;;;;;;;;;;;;;;CAY1B,CAAC;AAEF,eAAe,oBAAoB,CAAC;AAEpC,eAAO,MAAM,4BAA4B;;;;;;+BAKpB,MAAM;;;;;;;;;;;;;;;;;;CAY1B,CAAC"}
+{"version":3,"file":"TestStepsWithOptions.d.ts","sourceRoot":"","sources":["../../../src/lib/test/TestStepsWithOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,QAAQ,EAAE,MAAM,YAAY,CAAC;AAInD,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;CAgBhC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/build/lib/test/TestStepsWithOptions.js

@@ -1,10 +1,11 @@
 import { AStepper } from '../defs.js';
+import { EExecutionMessageType } from '../interfaces/logger.js';
 import { actionOK, getStepperOption } from '../util/index.js';
 export const TestStepsWithOptions = class TestStepsWithOptions extends AStepper {
     options = {
         EXISTS: {
             desc: 'option exists',
-            parse: (input) => ({ result: 42 }),
+            parse: () => ({ result: 42 }),
         },
     };
     steps = {
@@ -12,28 +13,10 @@ export const TestStepsWithOptions = class TestStepsWithOptions extends AStepper
             exact: 'have a stepper option',
             action: async () => {
                 const res = getStepperOption(this, 'EXISTS', this.getWorld().moduleOptions);
-                return actionOK({ options: { summary: 'options', details: res } });
+                return Promise.resolve(actionOK({ incident: EExecutionMessageType.ACTION, incidentDetails: { summary: 'options', details: res } }));
             },
         },
     };
 };
 export default TestStepsWithOptions;
-export const TestStepsWithRequiredOptions = class TestStepsWithRequiredOptions extends AStepper {
-    options = {
-        EXISTS: {
-            required: true,
-            desc: 'option exists',
-            parse: (input) => ({ result: 42 }),
-        },
-    };
-    steps = {
-        test: {
-            exact: 'have a stepper option',
-            action: async () => {
-                const res = getStepperOption(this, 'EXISTS', this.getWorld().moduleOptions);
-                return actionOK({ options: { summary: 'options', details: res } });
-            },
-        },
-    };
-};
 //# sourceMappingURL=TestStepsWithOptions.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"TestStepsWithOptions.js","sourceRoot":"","sources":["../../../src/lib/test/TestStepsWithOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,QAAQ,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE9D,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,oBAAqB,SAAQ,QAAQ;IAC7E,OAAO,GAAG;QACR,MAAM,EAAE;YACN,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;SAC3C;KACF,CAAC;IACF,KAAK,GAAG;QACN,IAAI,EAAE;YACJ,KAAK,EAAE,uBAAuB;YAC9B,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,MAAM,GAAG,GAAG,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,aAAa,CAAC,CAAC;gBAC5E,OAAO,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YACrE,CAAC;SACF;KACF,CAAC;CACH,CAAC;AAEF,eAAe,oBAAoB,CAAC;AAEpC,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,4BAA6B,SAAQ,QAAQ;IAC7F,OAAO,GAAG;QACR,MAAM,EAAE;YACN,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;SAC3C;KACF,CAAC;IACF,KAAK,GAAG;QACN,IAAI,EAAE;YACJ,KAAK,EAAE,uBAAuB;YAC9B,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,MAAM,GAAG,GAAG,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,aAAa,CAAC,CAAC;gBAC5E,OAAO,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YACrE,CAAC;SACF;KACF,CAAC;CACH,CAAC"}
+{"version":3,"file":"TestStepsWithOptions.js","sourceRoot":"","sources":["../../../src/lib/test/TestStepsWithOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,QAAQ,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE9D,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,oBAAqB,SAAQ,QAAQ;IAC9E,OAAO,GAAG;QACT,MAAM,EAAE;YACP,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;SAC7B;KACD,CAAC;IACF,KAAK,GAAG;QACP,IAAI,EAAE;YACL,KAAK,EAAE,uBAAuB;YAC9B,MAAM,EAAE,KAAK,IAAI,EAAE;gBAClB,MAAM,GAAG,GAAG,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,aAAa,CAAC,CAAC;gBAC5E,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,qBAAqB,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;YACrI,CAAC;SACD;KACD,CAAC;CACF,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/build/lib/test/lib.d.ts

@@ -2,7 +2,7 @@ import { TWorld, TFeatureStep, TProtoOptions, CStepper, TExecutorResult } from '
 export declare const HAIBUN_O_TESTSTEPSWITHOPTIONS_EXISTS = "HAIBUN_O_TESTSTEPSWITHOPTIONS_EXISTS";
 export declare const TEST_BASE = "test_base";
 export declare function getCreateSteppers(steppers: string[], addSteppers?: CStepper[]): Promise<import("../defs.js").AStepper[]>;
-export declare const testFeatureStep: (line: string, action: any, base?: string) => TFeatureStep;
+export declare const testFeatureStep: (name: string, action: any) => TFeatureStep;
 export declare function getTestEnv(useSteppers: string[], test: string, world: TWorld): Promise<{
     world: TWorld;
     featureStep: TFeatureStep;

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

@@ -1 +1 @@
-{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../../src/lib/test/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAgB,eAAe,EAAE,MAAM,YAAY,CAAC;AAc1G,eAAO,MAAM,oCAAoC,yCAAyC,CAAC;AAC3F,eAAO,MAAM,SAAS,cAAc,CAAC;AAErC,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,EAAE,QAAQ,EAAE,4CAGnF;AAED,eAAO,MAAM,eAAe,SAAU,MAAM,iCAA6B,YAKvE,CAAC;AAEH,wBAAsB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;;;;;GAWlF;AACD,KAAK,aAAa,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC;AAExE,wBAAsB,gBAAgB,CACrC,UAAU,EAAE,aAAa,GAAG,MAAM,EAClC,WAAW,EAAE,QAAQ,EAAE,EACvB,YAAY,GAAE,aAAiC,EAC/C,aAAa,GAAE,aAAkB,GAC/B,OAAO,CAAC,eAAe,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAa9C;AAED,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,aAAa,EAAE,GAAG;;CAA+B,UAOtG;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,oBAAc,GAAG,MAAM,CAW3E;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,GAAG,SAAqB,6BAEnF"}
+{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../../src/lib/test/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAgB,eAAe,EAAE,MAAM,YAAY,CAAC;AAa1G,eAAO,MAAM,oCAAoC,yCAAyC,CAAC;AAC3F,eAAO,MAAM,SAAS,cAAc,CAAC;AAErC,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,EAAE,QAAQ,EAAE,4CAGnF;AAED,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,EAAE,WAAM,KAAG,YAKrD,CAAC;AAEH,wBAAsB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;;;;;GAWlF;AACD,KAAK,aAAa,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC;AAExE,wBAAsB,gBAAgB,CACrC,UAAU,EAAE,aAAa,GAAG,MAAM,EAClC,WAAW,EAAE,QAAQ,EAAE,EACvB,YAAY,GAAE,aAAiC,EAC/C,aAAa,GAAE,aAAkB,GAC/B,OAAO,CAAC,eAAe,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAa9C;AAED,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,aAAa,EAAE,GAAG;;CAA+B,UAOtG;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,oBAAc,GAAG,MAAM,CAW3E;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,GAAG,SAAqB,6BAEnF"}

package/build/lib/test/lib.js

@@ -3,7 +3,6 @@ import { Resolver } from '../../phases/Resolver.js';
 import { getRunTag, verifyExtraOptions, createSteppers } from './../util/index.js';
 import { getSteppers } from '../util/workspace-lib.js';
 import { WorldContext } from '../contexts.js';
-import { withNameType } from './../features.js';
 import Logger, { LOGGER_LOG } from '../Logger.js';
 import { Timer } from '../Timer.js';
 import { asFeatures } from '../resolver-features.js';
@@ -16,9 +15,9 @@ export async function getCreateSteppers(steppers, addSteppers) {
     const csteppers = await getSteppers(steppers);
     return await createSteppers(csteppers.concat(addSteppers || []));
 }
-export const testFeatureStep = (line, action, base = TEST_BASE) => ({
-    source: { ...withNameType(base, line, '') },
-    line,
+export const testFeatureStep = (name, action) => ({
+    path: '/features/test',
+    in: name,
     seq: 0,
     action,
 });

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

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