@haibun/core 1.41.2 → 1.41.4

package/build/steps/vars.js

@@ -3,10 +3,10 @@ import { actionNotOK } from '../lib/util/index.js';
 // FIXME see https://github.com/withhaibun/haibun/issues/18
 const getOrCond = (fr) => fr.replace(/.* is set or /, '');
 const vars = class Vars extends AStepper {
-    set = async (named, vstep) => {
+    set = async (named, featureStep) => {
         // FIXME see https://github.com/withhaibun/haibun/issues/18
-        const emptyOnly = !!vstep.in.match(/set empty /);
-        const res = setShared(named, vstep, this.getWorld(), emptyOnly);
+        const emptyOnly = !!featureStep.line.match(/set empty /);
+        const res = setShared(named, featureStep, this.getWorld(), emptyOnly);
         return res;
     };
     isSet(what, orCond) {
@@ -25,30 +25,30 @@ const vars = class Vars extends AStepper {
     steps = {
         concat: {
             gwta: 'concat {p1} and {p2} as {what}',
-            action: async ({ p1, p2, what }, vstep) => await this.set({ what, value: `${p1}${p2}` }, vstep),
+            action: async ({ p1, p2, what }, featureStep) => await this.set({ what, value: `${p1}${p2}` }, featureStep),
         },
         showEnv: {
             gwta: 'show env',
-            action: async (n, vstep) => {
+            action: async (n, featureStep) => {
                 console.info('env', this.world.options.env);
-                return await this.set(n, vstep);
+                return await this.set(n, featureStep);
             },
-            build: async (n, vstep) => await this.set(n, vstep),
+            build: async (n, featureStep) => await this.set(n, featureStep),
         },
         showVars: {
             gwta: 'show vars',
-            action: async (n, vstep) => {
+            action: async (n, featureStep) => {
                 console.info('vars', this.world.shared);
-                return await this.set(n, vstep);
+                return await this.set(n, featureStep);
             },
-            build: async (n, vstep) => await this.set(n, vstep),
+            build: async (n, featureStep) => await this.set(n, featureStep),
         },
         set: {
             gwta: 'set( empty)? {what: string} to {value: string}',
-            action: async (n, vstep) => {
-                return await this.set(n, vstep);
+            action: async (n, featureStep) => {
+                return await this.set(n, featureStep);
             },
-            build: async (n, vstep) => await this.set(n, vstep),
+            build: async (n, featureStep) => await this.set(n, featureStep),
         },
         is: {
             gwta: '{what: string} is "{value}"',
@@ -59,8 +59,8 @@ const vars = class Vars extends AStepper {
         },
         isSet: {
             gwta: '{what: string} is set( or .*)?',
-            action: async ({ what }, vstep) => this.isSet(what, getOrCond(vstep.in)),
-            build: async ({ what }, vstep) => this.isSet(what, getOrCond(vstep.in)),
+            action: async ({ what }, featureStep) => this.isSet(what, getOrCond(featureStep.line)),
+            build: async ({ what }, featureStep) => this.isSet(what, getOrCond(featureStep.line)),
         },
         background: {
             match: /^Background: ?(?<background>.+)?$/,
@@ -96,7 +96,7 @@ export default vars;
 export const didNotOverwrite = (what, present, value) => ({
     overwrite: { summary: `did not overwrite ${what} value of "${present}" with "${value}"` },
 });
-export const setShared = ({ what, value }, vstep, world, emptyOnly = false) => {
+export const setShared = ({ what, value }, featureStep, world, emptyOnly = false) => {
     let { shared } = world;
     if (!emptyOnly || shared.get(what) === undefined) {
         shared.set(what, value);

package/build/steps/vars.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@haibun/core",
   "type": "module",
-  "version": "1.41.2",
+  "version": "1.41.4",
   "description": "",
   "author": "",
   "xexports": {

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

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=run-with-options.o.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"run-with-options.o.d.ts","sourceRoot":"","sources":["../../src/lib/run-with-options.o.ts"],"names":[],"mappings":""}

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

@@ -1,113 +0,0 @@
-export {};
-/*
-import { TStartRunCallback, TProtoOptions, TSpecl, TWorld, TTag, TRunOptions, TRunResult, TTagValue, TEndFeatureCallback, TBase } from './defs.js';
-import { WorldContext } from './contexts.js';
-import Logger from './Logger.js';
-
-import { run } from './run.o.js';
-import { getRunTag } from './util/index.js';
-import { getOutputResult } from './util/workspace-lib.js';
-import { ILogOutput } from './interfaces/logger.js';
-import { Timer } from './Timer.js';
-
-export default async function runWithOptions(runOptions: TRunOptions) {
-  const { loops, members, trace, startRunCallback, endFeatureCallback, featureFilter, specl, bases, splits, protoOptions } = runOptions;
-  const { LOG_LEVEL: logLevel, LOG_FOLLOW: logFollow } = protoOptions.options;
-
-  const logger = new Logger({ level: logLevel || 'debug', follow: logFollow });
-
-  const timer = new Timer();
-  let totalRan = 0;
-  type TFailure = { sequence: TTagValue; runDuration: number; fromStart: number };
-  const allFailures: { [message: string]: TFailure[] } = {};
-  let allRunResults: PromiseSettledResult<TRunResult>[] = [];
-
-  for (let loop = 1; loop < loops + 1; loop++) {
-    loops > 1 && logger.log(`starting loop ${loop}/${loops}`);
-    let groupRuns: Promise<TRunResult>[] = [];
-    for (let member = 1; member < members + 1; member++) {
-      members > 1 && logger.log(`starting member ${member + 1}/${members}`);
-      const instances = splits.map(async (split) => {
-        splits.length > 1 && logger.log(`starting instance ${split}`);
-        const runtime = {};
-        const tag: TTag = getRunTag(totalRan, loop, member, 0, split, trace);
-        totalRan++;
-
-        const res = await doInstanceRun(bases, specl, runtime, featureFilter, new WorldContext(tag, split), protoOptions, logger, tag, timer, startRunCallback, endFeatureCallback);
-        return res;
-      });
-      groupRuns = groupRuns.concat(instances);
-    }
-
-    const theseValues = await Promise.allSettled(groupRuns);
-    allRunResults = allRunResults.concat(theseValues);
-  }
-
-  const ranResults = allRunResults
-    .filter((i) => i.status === 'fulfilled')
-    .map((i) => <PromiseFulfilledResult<TRunResult>>i)
-    .map((i) => i.value);
-
-  let passed = 0;
-  let failed = 0;
-
-  const output = [];
-  for (const r of ranResults) {
-    output.push(r.output);
-    if (r.result.ok) {
-      passed++;
-    } else {
-      try {
-        const errorMessage = r.result?.failure?.error?.message || JSON.stringify(r.result.failure);
-        allFailures[errorMessage] = (allFailures[errorMessage] || []).concat({
-          sequence: r.tag.sequence,
-          runDuration: r.runDuration,
-          fromStart: r.fromStart,
-        });
-        failed++;
-      } catch (e) {
-        console.error('fail message', e, '\nfrom:', r.result.failure, 'bailing');
-        throw (e);
-      }
-    }
-  }
-
-  const exceptionResults = allRunResults
-    .filter((i) => i.status === 'rejected')
-    .map((i) => <PromiseRejectedResult>i)
-    .map((i) => i.reason);
-
-  const ok = ranResults.every((a) => a.result.ok);
-  const runTime = timer.since();
-  return { ok, output, exceptionResults, ranResults, allFailures, logger, passed, failed, totalRan, runTime };
-}
-
-async function doInstanceRun(
-  bases: TBase,
-  specl: TSpecl,
-  runtime: object,
-  featureFilter: string[] | undefined,
-  shared: WorldContext,
-  protoOptions: TProtoOptions,
-  containerLogger: ILogOutput,
-  tag: TTag,
-  timer: Timer,
-  startRunCallback?: TStartRunCallback,
-  endFeatureCallback?: TEndFeatureCallback
-) {
-  const runStart = process.hrtime();
-  const logger = new Logger({ output: containerLogger, tag });
-
-  const world: TWorld = { options: protoOptions.options, moduleOptions: protoOptions.moduleOptions, shared, logger, runtime, domains: [], tag, timer, bases };
-  if (startRunCallback) {
-    startRunCallback(world);
-  }
-
-  const runResult = await run({ specl, bases, world, featureFilter, endFeatureCallback });
-  const output = await getOutputResult(world.options.OUTPUT, runResult);
-
-  return { result: runResult, shared, output, tag, runStart: runStart[0], runDuration: process.hrtime(runStart)[0], fromStart: timer.since() };
-}
-
-*/ 
-//# sourceMappingURL=run-with-options.o.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"run-with-options.o.js","sourceRoot":"","sources":["../../src/lib/run-with-options.o.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8GE"}

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

@@ -1,19 +0,0 @@
-import { TSpecl, TExecutorResult, TWorld, TFeature, TEndFeatureCallback, CStepper, TBase } from './defs.js';
-type TBaseOptions = {
-    specl: TSpecl;
-    world: TWorld;
-    addSteppers?: CStepper[];
-    endFeatureCallback?: TEndFeatureCallback;
-};
-type TRunOptions = TBaseOptions & {
-    bases: TBase;
-    featureFilter: string[];
-};
-type TRunWithFeaturesBackgrounds = TBaseOptions & {
-    features: TFeature[];
-    backgrounds: TFeature[];
-};
-export declare function run({ specl, bases, world, addSteppers, featureFilter, endFeatureCallback }: TRunOptions): Promise<TExecutorResult>;
-export declare function runWith({ specl, world, features, backgrounds, addSteppers, endFeatureCallback }: TRunWithFeaturesBackgrounds): Promise<TExecutorResult>;
-export {};
-//# sourceMappingURL=run.o.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"run.o.d.ts","sourceRoot":"","sources":["../../src/lib/run.o.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAoB,mBAAmB,EAAE,QAAQ,EAAoC,KAAK,EAAa,MAAM,WAAW,CAAC;AAQ3K,KAAK,YAAY,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,CAAC;IAAC,kBAAkB,CAAC,EAAE,mBAAmB,CAAC;CAAE,CAAC;AAE1H,KAAK,WAAW,GAAG,YAAY,GAAG;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAC;CAAE,CAAC;AAE7E,KAAK,2BAA2B,GAAG,YAAY,GAAG;IAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAAC,WAAW,EAAE,QAAQ,EAAE,CAAC;CAAE,CAAC;AAErG,wBAAsB,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,WAAgB,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAc7I;AAED,wBAAsB,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAgB,EAAE,kBAAkB,EAAE,EAAE,2BAA2B,GAAG,OAAO,CAAC,eAAe,CAAC,CA+ClK"}

package/build/lib/run.o.js

@@ -1,62 +0,0 @@
-import { expand } from './features.js';
-import { Executor } from '../phases/Executor.js';
-import { Resolver } from '../phases/Resolver.js';
-import { verifyExtraOptions, getRunTag, verifyRequiredOptions, createSteppers, setStepperWorlds } from './util/index.js';
-import { getSteppers } from './util/workspace-lib.js';
-import { getFeaturesAndBackgrounds } from '../phases/collector.js';
-export async function run({ specl, bases, world, addSteppers = [], featureFilter, endFeatureCallback }) {
-    if (!world.options || !world.moduleOptions) {
-        throw Error(`missing options ${world.options} moduleOptions ${world.moduleOptions}`);
-    }
-    let featuresBackgrounds;
-    try {
-        featuresBackgrounds = getFeaturesAndBackgrounds(bases, featureFilter);
-    }
-    catch (error) {
-        return ({ ok: false, tag: getRunTag(-1, -1, {}, false), failure: { stage: 'Collect', error: { message: error.message, details: { stack: error.stack } } }, shared: world.shared });
-    }
-    const { features, backgrounds } = featuresBackgrounds;
-    const res = await runWith({ specl, world, features, backgrounds, addSteppers, endFeatureCallback });
-    return res;
-}
-export async function runWith({ specl, world, features, backgrounds, addSteppers = [], endFeatureCallback }) {
-    const { tag } = world;
-    let result = undefined;
-    const errorBail = (phase, error, details) => {
-        world.logger.error(`errorBail ${phase} ${error} ${details}`, error.stack);
-        result = { ok: false, shared: world.shared, tag, failure: { stage: phase, error: { message: error.message, details: { stack: error.stack, details } } } };
-        throw Error(error);
-    };
-    try {
-        const baseSteppers = await getSteppers(specl.steppers).catch((error) => errorBail('Steppers', error));
-        const csteppers = [...baseSteppers, ...addSteppers];
-        await verifyRequiredOptions(csteppers, world.moduleOptions).catch((error) => errorBail('RequiredOptions', error));
-        await verifyExtraOptions(world.moduleOptions, csteppers).catch((error) => errorBail('moduleOptions', error));
-        const expandedFeatures = await expand(backgrounds, features).catch((error) => errorBail('Expand', error));
-        const steppers = await createSteppers(csteppers);
-        await setStepperWorlds(steppers, world).catch((error) => errorBail('StepperOptions', error));
-        const resolver = new Resolver(steppers, world);
-        const mappedValidatedSteps = await resolver.resolveStepsFromFeatures(expandedFeatures).catch((error) => errorBail('Resolve', error));
-        // 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}`);
-        result = await Executor.execute(csteppers, world, mappedValidatedSteps, endFeatureCallback)
-            .catch((error) => errorBail('Execute', error));
-        if (!result || !result.ok) {
-            let message;
-            try {
-                message = result.featureResults[0].stepResults.find((s) => !s.ok)?.actionResults[0]?.message || result.featureResults;
-            }
-            catch (e) {
-                message = e;
-            }
-            result.failure = { stage: 'Execute', error: { message, details: { stack: [], errors: result.featureResults?.filter((r) => !r.ok).map((r) => r.path) } } };
-        }
-    }
-    catch (error) {
-        if (!result) {
-            errorBail('catch', error);
-        }
-    }
-    return result;
-}
-//# sourceMappingURL=run.o.js.map

package/build/lib/run.o.js.map

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