@haibun/core 1.2.2 → 1.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/lib/Logger.d.ts.map +1 -1
- package/build/lib/Logger.js +4 -0
- package/build/lib/Logger.js.map +1 -1
- package/build/lib/defs.d.ts +0 -2
- package/build/lib/defs.d.ts.map +1 -1
- package/build/lib/namedVars.js +2 -2
- package/build/lib/namedVars.js.map +1 -1
- package/build/lib/run-with-options.d.ts.map +1 -1
- package/build/lib/run-with-options.js +7 -8
- package/build/lib/run-with-options.js.map +1 -1
- package/build/lib/run.d.ts.map +1 -1
- package/build/lib/run.js +1 -0
- package/build/lib/run.js.map +1 -1
- package/build/steps/haibun.d.ts +4 -0
- package/build/steps/haibun.d.ts.map +1 -1
- package/build/steps/haibun.js +7 -0
- package/build/steps/haibun.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../src/lib/Logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../src/lib/Logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtF,eAAO,MAAM,UAAU;;CAAmB,CAAC;AAC3C,eAAO,MAAM,WAAW;;CAAoB,CAAC;AAG7C,eAAO,MAAM,aAAa;;;;;;;CAOzB,CAAC;AAEF,aAAK,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AACjD,aAAK,UAAU,GAAG;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,CAAC;AACpD,aAAK,KAAK,GAAG,MAAM,GAAG,UAAU,CAAC;AAEjC,MAAM,CAAC,OAAO,OAAO,MAAO,YAAW,OAAO,EAAE,UAAU;IACxD,KAAK,EAAE,MAAM,GAAG,SAAS,CAAK;IAC9B,GAAG,EAAE,UAAU,GAAG,SAAS,CAAC;IAC5B,WAAW,EAAE,UAAU,EAAE,CAAM;IAC/B,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;gBAEf,IAAI,EAAE,KAAK;IAUvB,aAAa,CAAC,UAAU,EAAE,UAAU;IAGpC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS;IAMpD,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI;IAO/C,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,eAAe;IAiBjE,KAAK,SAAU,GAAG,8CAA2D;IAC7E,GAAG,SAAU,GAAG,8CAAyD;IACzE,IAAI,SAAU,GAAG,8CAA0D;IAC3E,IAAI,SAAU,GAAG,8CAA0D;IAC3E,KAAK,SAAU,GAAG,8CAA2D;CAC9E"}
|
package/build/lib/Logger.js
CHANGED
|
@@ -15,6 +15,7 @@ exports.LOGGER_LEVELS = {
|
|
|
15
15
|
};
|
|
16
16
|
class Logger {
|
|
17
17
|
constructor(conf) {
|
|
18
|
+
this.level = 1;
|
|
18
19
|
this.subscribers = [];
|
|
19
20
|
this.debug = (args, mctx) => this.out('debug', args, mctx);
|
|
20
21
|
this.log = (args, mctx) => this.out('log', args, mctx);
|
|
@@ -34,6 +35,9 @@ class Logger {
|
|
|
34
35
|
this.subscribers.push(subscriber);
|
|
35
36
|
}
|
|
36
37
|
static shouldLogLevel(level, name) {
|
|
38
|
+
if (!level) {
|
|
39
|
+
throw Error(`undefined logger level ${level}`);
|
|
40
|
+
}
|
|
37
41
|
return exports.LOGGER_LEVELS[name] >= level;
|
|
38
42
|
}
|
|
39
43
|
static shouldLogFollow(match, tag) {
|
package/build/lib/Logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/lib/Logger.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/lib/Logger.ts"],"names":[],"mappings":"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"}
|
package/build/lib/defs.d.ts
CHANGED
|
@@ -246,8 +246,6 @@ export declare type TRunEnv = {
|
|
|
246
246
|
export declare type TRunOptions = {
|
|
247
247
|
loops: number;
|
|
248
248
|
members: number;
|
|
249
|
-
logLevel: string;
|
|
250
|
-
logFollow: string;
|
|
251
249
|
trace: boolean;
|
|
252
250
|
startRunCallback?: TStartRunCallback;
|
|
253
251
|
endRunCallback?: TEndRunCallback;
|
package/build/lib/defs.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defs.d.ts","sourceRoot":"","sources":["../../src/lib/defs.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"defs.d.ts","sourceRoot":"","sources":["../../src/lib/defs.ts"],"names":[],"mappings":"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"}
|
package/build/lib/namedVars.js
CHANGED
|
@@ -14,7 +14,7 @@ const matchGroups = (num = 0) => {
|
|
|
14
14
|
const q = `"(?<${TYPE_QUOTED}${num}>.+)"`; // quoted string
|
|
15
15
|
const c = `<(?<${TYPE_CREDENTIAL}${num}>.+)>`; // credential
|
|
16
16
|
const b = `\`(?<${TYPE_VAR}${num}>.+)\``; // var
|
|
17
|
-
const e = `\{(?<${TYPE_ENV}${num}>.+)\}`; // var
|
|
17
|
+
const e = `\{(?<${TYPE_ENV}${num}>.+)\}`; // env var
|
|
18
18
|
const t = `(?<${TYPE_VAR_OR_LITERAL}${num}>.+)`; // var or literal
|
|
19
19
|
return `(${q}|${c}|${e}|${b}|${t})`;
|
|
20
20
|
};
|
|
@@ -106,7 +106,7 @@ function getNamedToVars({ named, vars }, world) {
|
|
|
106
106
|
// FIXME add test
|
|
107
107
|
const val = world.options.env[namedValue];
|
|
108
108
|
if (val === undefined) {
|
|
109
|
-
throw Error(`no env value for "${namedValue}" from ${JSON.stringify(
|
|
109
|
+
throw Error(`no env value for "${namedValue}" from ${JSON.stringify(world.options.env)}`);
|
|
110
110
|
}
|
|
111
111
|
if (Array.isArray(val)) {
|
|
112
112
|
let index = world.options[`_index_${namedValue}`] === undefined ? val.length - 1 : world.options[`_index_${namedValue}`];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namedVars.js","sourceRoot":"","sources":["../../src/lib/namedVars.ts"],"names":[],"mappings":";;;AAAA,sDAA4C;AAC5C,iCAAsF;AACtF,qCAAyC;AAEzC,MAAM,WAAW,GAAG,IAAI,CAAC;AACzB,MAAM,eAAe,GAAG,IAAI,CAAC;AAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC;AACtB,MAAM,QAAQ,GAAG,IAAI,CAAC;AACtB,yBAAyB;AACzB,MAAM,mBAAmB,GAAG,IAAI,CAAC;AAE1B,MAAM,WAAW,GAAG,CAAC,MAAc,CAAC,EAAE,EAAE;IAC7C,MAAM,CAAC,GAAG,OAAO,WAAW,GAAG,GAAG,OAAO,CAAC,CAAC,gBAAgB;IAC3D,MAAM,CAAC,GAAG,OAAO,eAAe,GAAG,GAAG,OAAO,CAAC,CAAC,aAAa;IAC5D,MAAM,CAAC,GAAG,QAAQ,QAAQ,GAAG,GAAG,QAAQ,CAAC,CAAC,MAAM;IAChD,MAAM,CAAC,GAAG,QAAQ,QAAQ,GAAG,GAAG,QAAQ,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"namedVars.js","sourceRoot":"","sources":["../../src/lib/namedVars.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +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,
|
|
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"}
|
|
@@ -9,22 +9,20 @@ const run_1 = require("./run");
|
|
|
9
9
|
const util_1 = require("./util");
|
|
10
10
|
const Timer_1 = require("./Timer");
|
|
11
11
|
async function runWithOptions(runOptions) {
|
|
12
|
-
const { loops, members,
|
|
13
|
-
const
|
|
12
|
+
const { loops, members, trace, startRunCallback, endRunCallback, featureFilter, specl, base, splits, protoOptions } = runOptions;
|
|
13
|
+
const { LOG_LEVEL: logLevel, LOG_FOLLOW: logFollow } = protoOptions.options;
|
|
14
|
+
const logger = new Logger_1.default({ level: logLevel || 'debug', follow: logFollow });
|
|
14
15
|
const timer = new Timer_1.Timer();
|
|
15
16
|
let totalRan = 0;
|
|
16
17
|
let allFailures = {};
|
|
17
18
|
let allRunResults = [];
|
|
18
19
|
for (let loop = 1; loop < loops + 1; loop++) {
|
|
19
|
-
|
|
20
|
-
logger.log(`starting loop ${loop}/${loops}`);
|
|
21
|
-
}
|
|
20
|
+
loops > 1 && logger.log(`starting loop ${loop}/${loops}`);
|
|
22
21
|
let groupRuns = [];
|
|
23
22
|
for (let member = 1; member < members + 1; member++) {
|
|
24
|
-
|
|
25
|
-
logger.log(`starting member ${member + 1}/${members}`);
|
|
26
|
-
}
|
|
23
|
+
members > 1 && logger.log(`starting member ${member + 1}/${members}`);
|
|
27
24
|
const instances = splits.map(async (split) => {
|
|
25
|
+
splits.length > 1 && logger.log(`starting instance ${split}`);
|
|
28
26
|
const runtime = {};
|
|
29
27
|
const tag = util_1.getRunTag(totalRan, loop, member, split, trace);
|
|
30
28
|
totalRan++;
|
|
@@ -84,6 +82,7 @@ async function doRun(base, specl, runtime, featureFilter, shared, protoOptions,
|
|
|
84
82
|
if (startRunCallback) {
|
|
85
83
|
startRunCallback(world);
|
|
86
84
|
}
|
|
85
|
+
logger.log(`running with these options: ${JSON.stringify(world.options)})}`);
|
|
87
86
|
const { result } = await run_1.run({ specl, base, world, featureFilter, extraOptions: protoOptions.extraOptions });
|
|
88
87
|
const output = await util_1.resultOutput(process.env.HAIBUN_OUTPUT, result);
|
|
89
88
|
return { world, result, shared, output, tag, runStart: runStart[0], runDuration: process.hrtime(runStart)[0], fromStart: timer.since() };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-with-options.js","sourceRoot":"","sources":["../../src/lib/run-with-options.ts"],"names":[],"mappings":";;;;;AACA,yCAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"run-with-options.js","sourceRoot":"","sources":["../../src/lib/run-with-options.ts"],"names":[],"mappings":";;;;;AACA,yCAA0C;AAC1C,sDAAiD;AAEjD,+BAA4B;AAC5B,iCAAiD;AAEjD,mCAAgC;AAGjB,KAAK,UAAU,cAAc,CAAC,UAAuB;IAEhE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC;IACjI,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC,OAAO,CAAC;IAE5E,MAAM,MAAM,GAAG,IAAI,gBAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,IAAI,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAE7E,MAAM,KAAK,GAAG,IAAI,aAAK,EAAE,CAAC;IAC1B,IAAI,QAAQ,GAAG,CAAC,CAAC;IAEjB,IAAI,WAAW,GAAsC,EAAE,CAAC;IACxD,IAAI,aAAa,GAAuC,EAAE,CAAC;IAE3D,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,KAAK,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE;QACzC,KAAK,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,iBAAiB,IAAI,IAAI,KAAK,EAAE,CAAC,CAAA;QACzD,IAAI,SAAS,GAA0B,EAAE,CAAC;QAC1C,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,CAAC,EAAE,MAAM,EAAE,EAAE;YACjD,OAAO,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,mBAAmB,MAAM,GAAG,CAAC,IAAI,OAAO,EAAE,CAAC,CAAA;YACrE,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBACzC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,qBAAqB,KAAK,EAAE,CAAC,CAAC;gBAC9D,MAAM,OAAO,GAAG,EAAE,CAAC;gBACnB,MAAM,GAAG,GAAS,gBAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;gBAClE,QAAQ,EAAE,CAAC;gBAEX,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,uBAAY,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC;gBAC/I,IAAI,cAAc,EAAE;oBAChB,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;iBACzC;gBACD,OAAO,GAAG,CAAC;YAEf,CAAC,CAAC,CAAC;YACH,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SAC3C;QAED,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACxD,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;KACrD;IAED,IAAI,UAAU,GAAG,aAAa;SACzB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC;SACvC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAqC,CAAC,CAAC;SACjD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAEzB,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,MAAM,GAAG,CAAC,CAAC;IAEf,KAAK,IAAI,CAAC,IAAI,UAAU,EAAE;QACtB,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE;YACb,MAAM,EAAE,CAAC;SACZ;aAAM;YACH,IAAI,OAAO,GAAG,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC;YAChD,IAAI,CAAC,OAAO,EAAE;gBACV,IAAI;oBACA,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;iBAC9C;gBAAC,OAAO,CAAC,EAAE;oBACR,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;oBAEjC,OAAO,GAAG,gBAAgB,CAAA;iBAC7B;aACJ;YAED,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;gBACvD,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ;gBACxB,WAAW,EAAE,CAAC,CAAC,WAAW;gBAC1B,SAAS,EAAE,CAAC,CAAC,SAAS;aACzB,CAAC,CAAC;YACH,MAAM,EAAE,CAAC;SACZ;KACJ;IACD,IAAI,gBAAgB,GAAG,aAAa;SAC/B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,UAAU,CAAC;SACtC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAwB,CAAC,CAAC;SACpC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAE1B,MAAM,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;IAC9B,OAAO,EAAE,EAAE,EAAE,gBAAgB,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AACxG,CAAC;AA7ED,iCA6EC;AAED,KAAK,UAAU,KAAK,CAAC,IAAY,EAAE,KAAa,EAAE,OAAW,EAAE,aAAmC,EAAE,MAAoB,EAAE,YAA2B,EAAE,eAA2B,EAAE,GAAS,EAAE,KAAY,EAAE,gBAAoC;IAC7O,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,IAAI,gBAAM,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,CAAC,CAAC;IAE5D,MAAM,KAAK,GAAW,EAAE,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;IAC1G,IAAI,gBAAgB,EAAE;QAClB,gBAAgB,CAAC,KAAK,CAAC,CAAC;KAC3B;IAED,MAAM,CAAC,GAAG,CAAC,+BAA+B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7E,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC;IAC7G,MAAM,MAAM,GAAG,MAAM,mBAAY,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAErE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;AAC7I,CAAC"}
|
package/build/lib/run.d.ts.map
CHANGED
|
@@ -1 +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,
|
|
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,CAgBtK;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"}
|
package/build/lib/run.js
CHANGED
|
@@ -12,6 +12,7 @@ const Builder_1 = __importDefault(require("../phases/Builder"));
|
|
|
12
12
|
const util_1 = require("./util");
|
|
13
13
|
const domain_1 = require("./domain");
|
|
14
14
|
async function run({ specl, base, world, addSteppers = [], featureFilter, extraOptions = {} }) {
|
|
15
|
+
console.log('xxxx', process.env, world.options, extraOptions);
|
|
15
16
|
let features;
|
|
16
17
|
let backgrounds = [];
|
|
17
18
|
try {
|
package/build/lib/run.js.map
CHANGED
|
@@ -1 +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;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/lib/run.ts"],"names":[],"mappings":"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"}
|
package/build/steps/haibun.d.ts
CHANGED
|
@@ -18,6 +18,10 @@ declare const Haibun: {
|
|
|
18
18
|
gwta: string;
|
|
19
19
|
action: () => Promise<import("../lib/defs").TOKActionResult>;
|
|
20
20
|
};
|
|
21
|
+
displayEnv: {
|
|
22
|
+
gwta: string;
|
|
23
|
+
action: (a: TNamed) => Promise<import("../lib/defs").TOKActionResult>;
|
|
24
|
+
};
|
|
21
25
|
pauseSeconds: {
|
|
22
26
|
gwta: string;
|
|
23
27
|
action: ({ ms }: TNamed) => Promise<import("../lib/defs").TOKActionResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"haibun.d.ts","sourceRoot":"","sources":["../../src/steps/haibun.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"haibun.d.ts","sourceRoot":"","sources":["../../src/steps/haibun.ts"],"names":[],"mappings":"AACA,OAAO,EAAM,MAAM,EAAY,MAAM,aAAa,CAAC;AAGnD,QAAA,MAAM,MAAM;;;;;;;;;;;;;iCAciB,MAAM;;;;;;;;4BAaX,MAAM;;;;iCAOD,MAAM;;;;;;;;;;CAOlC,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
package/build/steps/haibun.js
CHANGED
|
@@ -29,6 +29,13 @@ const Haibun = class Haibun extends defs_1.AStepper {
|
|
|
29
29
|
return defs_1.OK;
|
|
30
30
|
},
|
|
31
31
|
},
|
|
32
|
+
displayEnv: {
|
|
33
|
+
gwta: 'show the environment',
|
|
34
|
+
action: async (a) => {
|
|
35
|
+
this.world?.logger.log(`env: ${JSON.stringify(this.world.options.env)}`);
|
|
36
|
+
return defs_1.OK;
|
|
37
|
+
}
|
|
38
|
+
},
|
|
32
39
|
pauseSeconds: {
|
|
33
40
|
gwta: 'pause for {ms}s',
|
|
34
41
|
action: async ({ ms }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"haibun.js","sourceRoot":"","sources":["../../src/steps/haibun.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"haibun.js","sourceRoot":"","sources":["../../src/steps/haibun.ts"],"names":[],"mappings":";;AACA,sCAAmD;AACnD,sCAA8C;AAE9C,MAAM,MAAM,GAAG,MAAM,MAAO,SAAQ,eAAQ;IAA7B;;QACb,UAAK,GAAG;YACN,KAAK,EAAE;gBACL,IAAI,EAAE,UAAU;gBAChB,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,SAAE;aACvB;YACD,YAAY,EAAE;gBACZ,IAAI,EAAE,eAAe;gBACrB,MAAM,EAAE,KAAK,IAAI,EAAE;oBACjB,OAAO,eAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;gBACzE,CAAC;aACF;YACD,cAAc,EAAE;gBACd,IAAI,EAAE,+BAA+B;gBACrC,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,EAAU,EAAE,EAAE;oBAC/B,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,UAAU,GAAG,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;oBACtD,OAAO,SAAE,CAAC;gBACZ,CAAC;aACF;YACD,aAAa,EAAE;gBACb,IAAI,EAAE,iBAAiB;gBACvB,MAAM,EAAE,KAAK,IAAI,EAAE;oBACjB,OAAO,SAAE,CAAC;gBACZ,CAAC;aACF;YACD,UAAU,EAAE;gBACV,IAAI,EAAE,sBAAsB;gBAC5B,MAAM,EAAE,KAAK,EAAE,CAAS,EAAE,EAAE;oBAC1B,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;oBACxE,OAAO,SAAE,CAAC;gBACZ,CAAC;aACF;YACD,YAAY,EAAE;gBACZ,IAAI,EAAE,iBAAiB;gBACvB,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,EAAU,EAAE,EAAE;oBAC/B,MAAM,OAAO,GAAG,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC;oBACxC,MAAM,YAAK,CAAC,OAAO,CAAC,CAAC;oBACrB,OAAO,SAAE,CAAC;gBACZ,CAAC;aACF;SACF,CAAC;IACJ,CAAC;CAAA,CAAC;AAEF,kBAAe,MAAM,CAAC"}
|