@haibun/core 1.73.0 → 1.74.1

package/build/lib/namedVars.js

@@ -1,138 +1,154 @@
-import { cred } from '../steps/credentials.js';
-import { HAIBUN } from './defs.js';
-import { BASE_TYPES } from './domain-types.js';
-import { getSerialTime } from './util/index.js';
-const TYPE_QUOTED = 'q_';
-const TYPE_CREDENTIAL = 'c_';
-const TYPE_SPECIAL = 's_';
-const TYPE_ENV = 'e_';
-const TYPE_VAR = 'b_';
-// from source or literal
-const TYPE_ENV_OR_VAR_OR_LITERAL = 't_';
-export const matchGroups = (num = 0) => {
-    const b = `\`(?<${TYPE_VAR}${num}>.+)\``; // var
-    const e = `{(?<${TYPE_ENV}${num}>.+)}`; // env var
-    // FIXME this is being assigned as t_
-    const s = `\\[(?<${TYPE_SPECIAL}${num}>.+)\\]`; // special
-    const c = `<(?<${TYPE_CREDENTIAL}${num}>.+)>`; // credential
-    const q = `"(?<${TYPE_QUOTED}${num}>.+)"`; // quoted string
-    const t = `(?<${TYPE_ENV_OR_VAR_OR_LITERAL}${num}>.+)`; // var or enve or literal
-    return `(${b}|${e}|${s}|${c}|${q}|${t})`;
-};
-export const namedInterpolation = (inp, types = BASE_TYPES) => {
+import { Origin } from './defs.js';
+import { DOMAIN_STRING } from './domain-types.js';
+export const TYPE_QUOTED = 'q_';
+export const TYPE_ENV = 'e_';
+export const TYPE_VAR = 'b_';
+export const TYPE_ENV_OR_VAR_OR_LITERAL = 't_';
+export const namedInterpolation = (inp) => {
     if (!inp.includes('{')) {
-        return { str: inp };
+        return { regexPattern: inp };
     }
-    const stepVariables = [];
+    const stepValuesMap = {};
     let last = 0;
-    let str = '';
+    let regexPattern = '';
     let bs = inp.indexOf('{');
-    let be = 401;
+    let be = -1;
     let bail = 0;
-    let matches = 0;
+    let matchIndex = 0;
+    const placeholderRegex = '.+';
     while (bs > -1 && bail++ < 400) {
-        str += inp.substring(last, bs);
+        regexPattern += inp.substring(last, bs);
         be = inp.indexOf('}', bs);
         if (be < 0) {
             throw Error(`missing end bracket in ${inp}`);
         }
-        stepVariables.push(pairToVar(inp.substring(bs + 1, be), types));
+        const rawPair = inp.substring(bs + 1, be);
+        const { name, domain } = pairToVar(rawPair);
+        const precedingChar = inp.substring(bs - 1, bs);
+        const origin = inferOrigin(precedingChar);
+        // Strip any already-appended preceding delimiter from the
+        // regexPattern so the group pattern can insert the correct single
+        // delimiter.
+        if (precedingChar && ['$', '`', '<', '"'].includes(precedingChar)) {
+            // remove the last character we just added (the delimiter)
+            regexPattern = regexPattern.slice(0, -1);
+        }
+        stepValuesMap[name] = { term: name, domain, origin };
+        let matchGroupPattern;
+        if (origin === Origin.env) {
+            matchGroupPattern = `\\$(?<${TYPE_ENV}${matchIndex}>[A-Za-z_][A-Za-z0-9_]*)\\$`;
+        }
+        else if (origin === Origin.var) {
+            matchGroupPattern = `\`(?<${TYPE_VAR}${matchIndex}>.+)\``;
+        }
+        else if (origin === Origin.quoted) {
+            matchGroupPattern = `"(?<${TYPE_QUOTED}${matchIndex}>.+)"`;
+        }
+        else {
+            // For a plain placeholder we accept several syntaxes and capture each
+            // into a distinct named group so callers can detect whether the
+            // value was quoted, backticked or a bare literal.
+            matchGroupPattern = `(?:"(?<${TYPE_QUOTED}${matchIndex}>.+)"|\`(?<${TYPE_VAR}${matchIndex}>.+)\`|(?<${TYPE_ENV_OR_VAR_OR_LITERAL}${matchIndex}>${placeholderRegex}))`;
+        }
+        regexPattern += matchGroupPattern;
+        matchIndex++;
         bs = inp.indexOf('{', be);
-        last = be + 1;
-        str += matchGroups(matches++);
+        // If the placeholder was wrapped with a delimiter on the left, the
+        // corresponding closing delimiter appears immediately after the '}' and
+        // must be skipped from the trailing substring to avoid duplicating it
+        // in the final regex. Otherwise include the character after '}' as
+        // normal.
+        if (precedingChar && ['$', '`', '<', '"'].includes(precedingChar)) {
+            last = be + 2;
+        }
+        else {
+            last = be + 1;
+        }
     }
-    str += inp.substring(be + 1);
-    return { stepVariables, str };
+    regexPattern += inp.substring(last);
+    return { stepValuesMap, regexPattern };
 };
-function pairToVar(pair, types) {
-    // eslint-disable-next-line prefer-const
-    let [name, type] = pair.split(':').map((i) => i.trim());
-    if (!type)
-        type = 'string';
-    if (!types.includes(type)) {
-        throw Error(`unknown type ${type}`);
-    }
-    return { name, type };
+export const matchGwtaToAction = (gwta, actionable, actionName, stepperName, step) => {
+    const { regexPattern, stepValuesMap } = namedInterpolation(gwta);
+    // anchor the pattern so the whole actionable matches
+    // use case-insensitive matching to be consistent with dePolite handling
+    const r = new RegExp(`^${regexPattern}$`, 'i');
+    return getMatch(actionable, r, actionName, stepperName, step, stepValuesMap);
+};
+// no-op
+function pairToVar(pair) {
+    const [name, domainRaw] = pair.split(':').map((i) => i.trim());
+    const domain = domainRaw || DOMAIN_STRING;
+    return { name, domain };
 }
 export function getNamedMatches(regexp, what) {
     const named = regexp.exec(what);
     return named?.groups;
 }
-export const getMatch = (actionable, r, actionName, stepperName, step, stepVariables) => {
+export const getMatch = (actionable, r, actionName, stepperName, step, stepValuesMap) => {
     if (!r.test(actionable)) {
         return;
     }
-    const named = getNamedMatches(r, actionable);
-    return { actionName, stepperName, step, named, stepVariables };
-};
-// returns named values, assigning variable values as appropriate
-// retrieves from world.shared if a base domain, otherwise world.domains[type].shared
-export function getNamedToVars(found, world, featureStep) {
-    const { named, stepVariables } = found;
-    if (!named) {
-        return { _nb: 'no named' };
-    }
-    if (!stepVariables || stepVariables.length < 1) {
-        return named;
-    }
-    const namedFromVars = {};
-    stepVariables.forEach((v, i) => {
-        const { name, type } = v;
-        const { shared } = world;
-        const namedKey = Object.keys(named).find((c) => c.endsWith(`_${i}`) && named[c] !== undefined);
-        if (!namedKey) {
-            throw Error(`no namedKey from ${named} for ${i}`);
-        }
-        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.envVariables && world.options.envVariables[namedValue] !== undefined) {
-                namedFromVars[name] = world.options.envVariables[namedValue];
-            }
-            else {
-                namedFromVars[name] = shared?.get(namedValue) || (named && named[namedKey]);
+    const groups = getNamedMatches(r, actionable);
+    if (groups && stepValuesMap) {
+        const entries = Object.values(stepValuesMap);
+        let i = 0;
+        for (const ph of entries) {
+            // Prefer quoted, backtick, then bare literal captures.
+            const q = groups[`${TYPE_QUOTED}${i}`];
+            const b = groups[`${TYPE_VAR}${i}`];
+            const e = groups[`${TYPE_ENV}${i}`];
+            const t = groups[`${TYPE_ENV_OR_VAR_OR_LITERAL}${i}`];
+            const chosen = q ?? b ?? t;
+            // prefer the dedicated env group if present
+            const actuallyChosen = q ?? b ?? e ?? t;
+            if (actuallyChosen !== undefined) {
+                ph.term = chosen;
+                // set origin according to which capture matched
+                if (q !== undefined) {
+                    ph.origin = Origin.quoted;
+                }
+                else if (b !== undefined) {
+                    ph.origin = Origin.var;
+                }
+                else if (e !== undefined) {
+                    ph.origin = Origin.env;
+                }
+                else if (t !== undefined) {
+                    // bare literal capture - detect env syntax $NAME$ or inline name:domain
+                    const envMatch = /^\$([A-Za-z_][A-Za-z0-9_]*)\$$/.exec(t);
+                    if (envMatch) {
+                        ph.term = envMatch[1];
+                        ph.origin = Origin.env;
+                    }
+                    else {
+                        ph.origin = Origin.fallthrough;
+                        // If the bare literal looks like JSON, treat it as fallthrough.
+                        const tTrim = String(t).trim();
+                        if (tTrim.startsWith('{') || tTrim.startsWith('[')) {
+                            ph.term = tTrim;
+                        }
+                    }
+                }
+                // domain 'statement' should force origin to 'statement'
+                if (ph.domain === 'statement')
+                    ph.origin = Origin.statement;
             }
+            i++;
         }
-        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.all()), type })} in ${featureStep.path}`);
-            }
-            namedFromVars[name] = shared.get(namedValue);
-        }
-        else if (namedKey.startsWith(TYPE_SPECIAL)) {
-            let toSet;
-            if (namedValue === 'SERIALTIME') {
-                toSet = '' + getSerialTime();
-            }
-            else {
-                throw Error(`unknown special "${namedValue}" in ${JSON.stringify(found)}`);
-            }
-            namedFromVars[name] = toSet;
-        }
-        else if (namedKey.startsWith(TYPE_CREDENTIAL)) {
-            // must be from source
-            if (!shared.get(cred(namedValue))) {
-                throw Error(`no value for credential "${namedValue}" from ${JSON.stringify({ keys: Object.keys(shared), type })}`);
-            }
-            namedFromVars[name] = shared.get(cred(namedValue));
-        }
-        else if (namedKey.startsWith(TYPE_ENV)) {
-            // FIXME add test
-            const val = world.options?.envVariables[namedValue];
-            if (val === undefined) {
-                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
-            namedFromVars[name] = named[namedKey];
-        }
-        else {
-            throw Error(`unknown assignment ${namedKey}`);
-        }
-    });
-    return namedFromVars;
-}
+    }
+    return { actionName, stepperName, step, stepValuesMap };
+};
+const inferOrigin = (char) => {
+    switch (char) {
+        case '$':
+            return Origin.env;
+        case '`':
+            return Origin.var;
+        case '"':
+            return Origin.quoted;
+        default:
+            return Origin.fallthrough;
+    }
+};
 //# sourceMappingURL=namedVars.js.map

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/populateActionArgs.d.ts

@@ -0,0 +1,4 @@
+import { AStepper } from './astepper.js';
+import { TFeatureStep, TStepArgs, TWorld } from './defs.js';
+export declare function populateActionArgs(featureStep: TFeatureStep, world: TWorld, steppers: AStepper[]): Promise<TStepArgs>;
+//# sourceMappingURL=populateActionArgs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"populateActionArgs.d.ts","sourceRoot":"","sources":["../../src/lib/populateActionArgs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAU,MAAM,WAAW,CAAC;AAIpE,wBAAsB,kBAAkB,CAAC,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAkD3H"}

package/build/lib/populateActionArgs.js

@@ -0,0 +1,58 @@
+import { Origin } from './defs.js';
+import { asDomainKey, DOMAIN_STRING } from './domain-types.js';
+// Given a feature step and the current world, populate the action args. This will update the existing stepValuesMap as actionVal
+export async function populateActionArgs(featureStep, world, steppers) {
+    const stepArgs = {};
+    if (!featureStep.action.stepValuesMap)
+        return stepArgs; // no variables for this step
+    for (const [name, actionVal] of Object.entries(featureStep.action.stepValuesMap)) {
+        const storedEntry = world.shared.all()[actionVal.term];
+        if (actionVal.origin === Origin.statement) {
+            actionVal.value = actionVal.term;
+        }
+        else if (actionVal.origin === Origin.env) {
+            actionVal.value = world.options.envVariables[actionVal.term]; // might be undefined
+            actionVal.domain = DOMAIN_STRING;
+        }
+        else if (actionVal.origin === Origin.var) {
+            if (storedEntry) {
+                actionVal.domain = storedEntry.domain;
+                actionVal.value = storedEntry.value;
+                actionVal.provenance = storedEntry.provenance;
+            }
+        }
+        else if (actionVal.origin === Origin.fallthrough) {
+            if (world.options.envVariables[actionVal.term]) {
+                actionVal.value = world.options.envVariables[actionVal.term];
+            }
+            else if (storedEntry) {
+                actionVal.value = storedEntry.value;
+                actionVal.domain = storedEntry.domain;
+                actionVal.provenance = storedEntry.provenance;
+            }
+            else {
+                actionVal.value = actionVal.term;
+                actionVal.domain = DOMAIN_STRING;
+            }
+        }
+        else if (actionVal.origin === Origin.quoted) {
+            actionVal.value = actionVal.term;
+            actionVal.domain = DOMAIN_STRING;
+        }
+        else {
+            throw new Error(`Unsupported origin type: ${actionVal.origin}`);
+        }
+        if (actionVal.value === undefined) {
+            continue;
+        }
+        const actionDomainKey = asDomainKey(actionVal.domain.split('|').map(d => d.trim()));
+        if (!world.domains[actionDomainKey]) {
+            throw new Error(`No domain coercer found for domain "${actionDomainKey}"`);
+        }
+        actionVal.value = await Promise.resolve(world.domains[actionDomainKey].coerce(actionVal, featureStep, steppers));
+        // actionVal has been updated, update the actionVal in place for downstream processing
+        stepArgs[name] = actionVal.value;
+    }
+    return stepArgs;
+}
+//# sourceMappingURL=populateActionArgs.js.map

package/build/lib/populateActionArgs.js.map

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

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

@@ -1,10 +1,10 @@
-import { TNamed } from '../defs.js';
+import { TStepArgs } from '../defs.js';
 import { AStepper } from '../astepper.js';
 export default class SetTimeStepper extends AStepper {
     steps: {
         setTime: {
             gwta: string;
-            action: ({ y, m, d, h, min, s }: TNamed) => Promise<import("../defs.js").TOKActionResult>;
+            action: ({ y, m, d, h, min, s }: TStepArgs) => Promise<import("../defs.js").TOKActionResult>;
         };
     };
 }

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,EAAM,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAM1C,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,QAAQ;IAClD,KAAK;;;6CAGgC,MAAM;;MAMzC;CACH"}
+{"version":3,"file":"SetTimeStepper.d.ts","sourceRoot":"","sources":["../../../src/lib/test/SetTimeStepper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAM,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAM1C,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,QAAQ;IAClD,KAAK;;;6CAGgC,SAAS;;MAQ5C;CACH"}

package/build/lib/test/SetTimeStepper.js

@@ -11,7 +11,12 @@ export default class SetTimeStepper extends AStepper {
         setTime: {
             gwta: 'change date to {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));
+                for (const v of [y, m, d, h, min, s]) {
+                    if (Array.isArray(v))
+                        throw new Error('date parts must be strings');
+                }
+                const ys = y, ms = m, ds = d, hs = h, mins = min, ss = s;
+                const date = new Date(checkedInt('year', ys), checkedInt('month', ms) - 1, checkedInt('day', ds), checkedInt('hour', hs), checkedInt('minute', mins), checkedInt('second', ss));
                 vi.setSystemTime(date);
                 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,EAAE,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,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"}
+{"version":3,"file":"SetTimeStepper.js","sourceRoot":"","sources":["../../../src/lib/test/SetTimeStepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAa,EAAE,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,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,EAAa,EAAE,EAAE;gBAC5C,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;oBAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;wBAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAAC,CAAC;gBAC9G,MAAM,EAAE,GAAG,CAAW,EAAE,EAAE,GAAG,CAAW,EAAE,EAAE,GAAG,CAAW,EAAE,EAAE,GAAG,CAAW,EAAE,IAAI,GAAG,GAAa,EAAE,EAAE,GAAG,CAAW,CAAC;gBACrH,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;gBAChL,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

@@ -1,4 +1,4 @@
-import { TNamed } from '../defs.js';
+import { TStepArgs } from '../defs.js';
 import { AStepper } from '../astepper.js';
 declare const TestSteps: {
     new (): {
@@ -16,8 +16,8 @@ declare const TestSteps: {
                 action: () => Promise<import("../defs.js").TOKActionResult>;
             };
             named: {
-                match: RegExp;
-                action: ({ param }: TNamed) => Promise<import("../defs.js").TOKActionResult | import("../defs.js").TNotOKActionResult>;
+                gwta: string;
+                action: ({ param }: TStepArgs) => Promise<import("../defs.js").TOKActionResult | import("../defs.js").TNotOKActionResult>;
             };
             throws: {
                 gwta: string;

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,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,QAAA,MAAM,SAAS;;;;;;;;;;;;;;;;;oCAgBc,MAAM;;;;;;;;;;;;CAWlC,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"TestSteps.d.ts","sourceRoot":"","sources":["../../../src/lib/test/TestSteps.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,QAAA,MAAM,SAAS;;;;;;;;;;;;;;;;;oCAgBc,SAAS;;;;;;;;;;;;CAYrC,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/build/lib/test/TestSteps.js

@@ -15,8 +15,10 @@ const TestSteps = class TestSteps extends AStepper {
             action: async () => Promise.resolve(actionOK()),
         },
         named: {
-            match: /^parameter (?<param>.+) is accepted$/,
+            gwta: 'parameter {param} is accepted',
             action: async ({ param }) => {
+                if (Array.isArray(param))
+                    throw new Error('param must be string');
                 return Promise.resolve(param === 'x' ? actionOK() : actionNotOK('test'));
             },
         },

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

@@ -1 +1 @@
-{"version":3,"file":"TestSteps.js","sourceRoot":"","sources":["../../../src/lib/test/TestSteps.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,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"}
+{"version":3,"file":"TestSteps.js","sourceRoot":"","sources":["../../../src/lib/test/TestSteps.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,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,IAAI,EAAE,+BAA+B;YACrC,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,EAAa,EAAE,EAAE;gBACtC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;oBAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;gBAClE,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/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,aAAa,EAAE,QAAQ,EAAgB,eAAe,EAAE,MAAM,YAAY,CAAC;AAY5F,eAAO,MAAM,iBAAiB;;;;;CAA4D,CAAC;AAE3F,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,gDAGnF;AAGD,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,CAAC,UAAU,EAAE,aAAa,GAAG,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,YAAY,GAAE,aAAiC,EAAE,aAAa,GAAE,aAAkB;WAKC,MAAM;GAF5L;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,GAAG,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,aAAa,GAAE,aAAkB,GAAG,OAAO,CAAC,eAAe,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAY/L;AAED,wBAAgB,uBAAuB,CAAC,YAAY,GAAE,aAAiC,EAAE,GAAG;;CAA+B,UAQ1H;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,oBAAc,GAAG,MAAM,CAY3E;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,aAAa,EAAE,QAAQ,EAAgB,eAAe,EAAE,MAAM,YAAY,CAAC;AAa5F,eAAO,MAAM,iBAAiB;;;;;CAA4D,CAAC;AAE3F,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,gDAGnF;AAGD,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,CAAC,UAAU,EAAE,aAAa,GAAG,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,YAAY,GAAE,aAAiC,EAAE,aAAa,GAAE,aAAkB;WAKC,MAAM;GAF5L;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,GAAG,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,aAAa,GAAE,aAAkB,GAAG,OAAO,CAAC,eAAe,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAY/L;AAED,wBAAgB,uBAAuB,CAAC,YAAY,GAAE,aAAiC,EAAE,GAAG;;CAA+B,UAQ1H;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,oBAAc,GAAG,MAAM,CAc3E;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,GAAG,SAAqB,6BAEnF"}

package/build/lib/test/lib.js

@@ -1,4 +1,5 @@
 import { DEFAULT_DEST } from '../defs.js';
+import { getCoreDomains } from '../domain-types.js';
 import { createSteppers } from './../util/index.js';
 import { getRunTag } from '../ttag.js';
 import { getSteppers } from '../util/workspace-lib.js';
@@ -41,10 +42,9 @@ export function getTestWorldWithOptions(protoOptions = DEF_PROTO_OPTIONS, env =
     return world;
 }
 export function getDefaultWorld(sequence, env = process.env) {
-    return {
+    const world = {
         timer: new Timer(),
         tag: getRunTag(sequence, 0),
-        shared: new FeatureVariables(getDefaultTag(sequence).toString()),
         logger: new Logger(env.HAIBUN_LOG_LEVEL ? { level: env.HAIBUN_LOG_LEVEL } : LOGGER_LOG),
         prompter: new Prompter(),
         runtime: {},
@@ -52,6 +52,9 @@ export function getDefaultWorld(sequence, env = process.env) {
         moduleOptions: {},
         bases: ['/features/'],
     };
+    world.domains = getCoreDomains(world);
+    world.shared = new FeatureVariables(world);
+    return world;
 }
 export function getDefaultTag(sequence, desc = undefined) {
     return getRunTag(sequence, -1, desc ? { desc } : undefined, false);

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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"}

package/build/lib/util/featureStep-executor.d.ts

@@ -0,0 +1,6 @@
+import { AStepper } from '../astepper.js';
+import { TWorld, TStepResult, TFeatureStep, ExecMode } from '../defs.js';
+export declare function resolveAndExecuteStatement(statement: string, base: string, steppers: AStepper[], world: TWorld, execMode: ExecMode, seqStart: number[]): Promise<TStepResult>;
+export declare function doExecuteFeatureSteps(featureSteps: TFeatureStep[], steppers: AStepper[], world: TWorld, execMode?: ExecMode): Promise<TStepResult>;
+export declare function findFeatureStepsFromStatement(statement: string, steppers: AStepper[], world: TWorld, base: string, seqStart: number[], inc?: number): TFeatureStep[];
+//# sourceMappingURL=featureStep-executor.d.ts.map

package/build/lib/util/featureStep-executor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"featureStep-executor.d.ts","sourceRoot":"","sources":["../../../src/lib/util/featureStep-executor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,WAAW,EAAY,YAAY,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGnF,wBAAsB,0BAA0B,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAGnL;AAED,wBAAsB,qBAAqB,CAAC,YAAY,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,GAAE,QAA0B,GAAG,OAAO,CAAC,WAAW,CAAC,CAUzK;AAED,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAG,SAAI,GAAG,YAAY,EAAE,CAiB/J"}

package/build/lib/util/{resolveAndExecuteStatement.js → featureStep-executor.js}

@@ -1,21 +1,16 @@
 import { getActionableStatement } from '../../phases/Resolver.js';
 import { FeatureExecutor } from '../../phases/Executor.js';
+import { ExecMode } from '../defs.js';
 import { expandLine } from '../features.js';
-export async function resolveAndExecuteStatementWithCycles(names, base, steppers, world, startSeq) {
-    return await doResolveAndExecuteStatement(names, base, steppers, world, startSeq, false);
+export async function resolveAndExecuteStatement(statement, base, steppers, world, execMode, seqStart) {
+    const featureSteps = findFeatureStepsFromStatement(statement, steppers, world, base, seqStart);
+    return await doExecuteFeatureSteps(featureSteps, steppers, world, execMode);
 }
-export async function resolveAndExecuteStatement(names, base, steppers, world) {
-    return await doResolveAndExecuteStatement(names, base, steppers, world, null, true);
-}
-async function doResolveAndExecuteStatement(names, base, steppers, world, startSeq, noCycles) {
-    const featureSteps = await findFeatureStepsFromStatement(names, steppers, world, base, startSeq);
-    return await doExecuteFeatureSteps(featureSteps, steppers, world, noCycles);
-}
-export async function doExecuteFeatureSteps(featureSteps, steppers, world, noCycles = false) {
+export async function doExecuteFeatureSteps(featureSteps, steppers, world, execMode = ExecMode.CYCLES) {
     let lastResult;
     for (const x of featureSteps) {
-        lastResult = await FeatureExecutor.doFeatureStep(steppers, x, world, noCycles);
-        if (!noCycles) {
+        lastResult = await FeatureExecutor.doFeatureStep(steppers, x, world, execMode);
+        if (execMode === ExecMode.CYCLES || execMode === ExecMode.PROMPT) {
             world.runtime.stepResults.push(lastResult);
         }
         if (!lastResult.ok)
@@ -23,19 +18,22 @@ export async function doExecuteFeatureSteps(featureSteps, steppers, world, noCyc
     }
     return lastResult;
 }
-export async function findFeatureStepsFromStatement(statement, steppers, world, base, startSeq = 0, sub = 0) {
+export function findFeatureStepsFromStatement(statement, steppers, world, base, seqStart, inc = 1) {
     const featureSteps = [];
     if (!world.runtime.backgrounds) {
         throw new Error('runtime.backgrounds is undefined; cannot expand inline Backgrounds');
     }
-    // temporary feature for expandLine
     const backgroundFeature = { path: `from ${statement}`, base, name: 'inline-backgrounds', content: `Backgrounds: ${statement}` };
     const expanded = expandLine(statement, world.runtime.backgrounds, backgroundFeature);
+    // Increment the last segment of seqStart by inc for each expanded step
+    const prefix = seqStart.slice(0, -1);
+    let latest = seqStart[seqStart.length - 1];
     for (const x of expanded) {
-        sub += .1;
-        const { featureStep } = await getActionableStatement(steppers, x.line, x.feature.path, startSeq, sub);
+        const seqPath = [...prefix, latest];
+        const { featureStep } = getActionableStatement(steppers, x.line, x.feature.path, seqPath);
+        latest += inc;
         featureSteps.push(featureStep);
     }
     return featureSteps;
 }
-//# sourceMappingURL=resolveAndExecuteStatement.js.map
+//# sourceMappingURL=featureStep-executor.js.map

package/build/lib/util/featureStep-executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"featureStep-executor.js","sourceRoot":"","sources":["../../../src/lib/util/featureStep-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAA+C,QAAQ,EAAE,MAAM,YAAY,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,SAAiB,EAAE,IAAY,EAAE,QAAoB,EAAE,KAAa,EAAE,QAAkB,EAAE,QAAkB;IAC5J,MAAM,YAAY,GAAG,6BAA6B,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC/F,OAAO,MAAM,qBAAqB,CAAC,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;AAC7E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,YAA4B,EAAE,QAAoB,EAAE,KAAa,EAAE,WAAqB,QAAQ,CAAC,MAAM;IAClJ,IAAI,UAAU,CAAC;IACf,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC;QAC9B,UAAU,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC/E,IAAI,QAAQ,KAAK,QAAQ,CAAC,MAAM,IAAI,QAAQ,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClE,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5C,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,EAAE;YAAE,OAAO,UAAU,CAAC;IACvC,CAAC;IACD,OAAO,UAAW,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,SAAiB,EAAE,QAAoB,EAAE,KAAa,EAAE,IAAY,EAAE,QAAkB,EAAE,GAAG,GAAG,CAAC;IAC9I,MAAM,YAAY,GAAmB,EAAE,CAAC;IACxC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;IACvF,CAAC;IACD,MAAM,iBAAiB,GAAa,EAAE,IAAI,EAAE,QAAQ,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,oBAAoB,EAAE,OAAO,EAAE,gBAAgB,SAAS,EAAE,EAAE,CAAC;IAC1I,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;IACrF,uEAAuE;IACvE,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACrC,IAAI,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC3C,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QAC1B,MAAM,OAAO,GAAG,CAAC,GAAG,MAAM,EAAE,MAAM,CAAC,CAAC;QACpC,MAAM,EAAE,WAAW,EAAE,GAAG,sBAAsB,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1F,MAAM,IAAI,GAAG,CAAC;QACd,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,YAAY,CAAC;AACrB,CAAC"}