@haibun/core 4.0.0-alpha.2 → 4.0.0-alpha.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/currentVersion.d.ts +1 -1
- package/build/currentVersion.js +1 -1
- package/build/index.d.ts +1 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +1 -1
- package/build/index.js.map +1 -1
- package/build/kireji/converter.d.ts +2 -2
- package/build/kireji/converter.d.ts.map +1 -1
- package/build/kireji/converter.js +12 -9
- package/build/kireji/converter.js.map +1 -1
- package/build/kireji/withAction.d.ts +16 -4
- package/build/kireji/withAction.d.ts.map +1 -1
- package/build/kireji/withAction.js +40 -11
- package/build/kireji/withAction.js.map +1 -1
- package/build/lib/EventLogger.d.ts +5 -5
- package/build/lib/EventLogger.d.ts.map +1 -1
- package/build/lib/EventLogger.js +39 -37
- package/build/lib/EventLogger.js.map +1 -1
- package/build/lib/PhaseRunner.d.ts +3 -3
- package/build/lib/PhaseRunner.d.ts.map +1 -1
- package/build/lib/PhaseRunner.js +7 -5
- package/build/lib/PhaseRunner.js.map +1 -1
- package/build/lib/astepper.d.ts +90 -13
- package/build/lib/astepper.d.ts.map +1 -1
- package/build/lib/astepper.js +35 -6
- package/build/lib/astepper.js.map +1 -1
- package/build/lib/base-prompt-manager.d.ts +1 -1
- package/build/lib/base-prompt-manager.d.ts.map +1 -1
- package/build/lib/base-prompt-manager.js.map +1 -1
- package/build/lib/capture-locator.d.ts +1 -1
- package/build/lib/capture-locator.d.ts.map +1 -1
- package/build/lib/capture-locator.js +5 -5
- package/build/lib/capture-locator.js.map +1 -1
- package/build/lib/core/flow-runner.d.ts +8 -7
- package/build/lib/core/flow-runner.d.ts.map +1 -1
- package/build/lib/core/flow-runner.js +42 -71
- package/build/lib/core/flow-runner.js.map +1 -1
- package/build/lib/core-domains.d.ts +2 -2
- package/build/lib/core-domains.d.ts.map +1 -1
- package/build/lib/core-domains.js +17 -18
- package/build/lib/core-domains.js.map +1 -1
- package/build/lib/defs.d.ts +2 -13
- package/build/lib/defs.d.ts.map +1 -1
- package/build/lib/defs.js.map +1 -1
- package/build/lib/document-content.d.ts +18 -0
- package/build/lib/document-content.d.ts.map +1 -0
- package/build/lib/document-content.js +158 -0
- package/build/lib/document-content.js.map +1 -0
- package/build/lib/domains.d.ts +31 -0
- package/build/lib/domains.d.ts.map +1 -0
- package/build/lib/domains.js +105 -0
- package/build/lib/domains.js.map +1 -0
- package/build/lib/execution.d.ts +304 -0
- package/build/lib/execution.d.ts.map +1 -0
- package/build/lib/execution.js +23 -0
- package/build/lib/execution.js.map +1 -0
- package/build/lib/feature-variables.d.ts +21 -50
- package/build/lib/feature-variables.d.ts.map +1 -1
- package/build/lib/feature-variables.js +122 -232
- package/build/lib/feature-variables.js.map +1 -1
- package/build/lib/features.d.ts +2 -2
- package/build/lib/features.d.ts.map +1 -1
- package/build/lib/features.js +13 -17
- package/build/lib/features.js.map +1 -1
- package/build/lib/fixme.d.ts.map +1 -1
- package/build/lib/host-id.d.ts +44 -0
- package/build/lib/host-id.d.ts.map +1 -0
- package/build/lib/host-id.js +51 -0
- package/build/lib/host-id.js.map +1 -0
- package/build/lib/http-observations.d.ts +15 -2
- package/build/lib/http-observations.d.ts.map +1 -1
- package/build/lib/http-observations.js +40 -23
- package/build/lib/http-observations.js.map +1 -1
- package/build/lib/hypermedia.d.ts +62 -0
- package/build/lib/hypermedia.d.ts.map +1 -0
- package/build/lib/hypermedia.js +228 -0
- package/build/lib/hypermedia.js.map +1 -0
- package/build/lib/namedVars.d.ts +2 -2
- package/build/lib/namedVars.d.ts.map +1 -1
- package/build/lib/namedVars.js +25 -30
- package/build/lib/namedVars.js.map +1 -1
- package/build/lib/node-http-events.d.ts +3 -3
- package/build/lib/node-http-events.d.ts.map +1 -1
- package/build/lib/node-http-events.js +26 -26
- package/build/lib/node-http-events.js.map +1 -1
- package/build/lib/populateActionArgs.d.ts +4 -4
- package/build/lib/populateActionArgs.d.ts.map +1 -1
- package/build/lib/populateActionArgs.js +4 -6
- package/build/lib/populateActionArgs.js.map +1 -1
- package/build/lib/prompter.d.ts.map +1 -1
- package/build/lib/prompter.js +10 -7
- package/build/lib/prompter.js.map +1 -1
- package/build/lib/quad-store.d.ts +34 -10
- package/build/lib/quad-store.d.ts.map +1 -1
- package/build/lib/quad-store.js +169 -21
- package/build/lib/quad-store.js.map +1 -1
- package/build/lib/quad-types.d.ts +80 -9
- package/build/lib/quad-types.d.ts.map +1 -1
- package/build/lib/quad-types.js +46 -2
- package/build/lib/quad-types.js.map +1 -1
- package/build/lib/readline-prompter.d.ts +1 -1
- package/build/lib/readline-prompter.js +4 -4
- package/build/lib/remote-stepper-proxy.d.ts +56 -0
- package/build/lib/remote-stepper-proxy.d.ts.map +1 -0
- package/build/lib/remote-stepper-proxy.js +123 -0
- package/build/lib/remote-stepper-proxy.js.map +1 -0
- package/build/lib/resolver-features.d.ts +1 -1
- package/build/lib/resolver-features.d.ts.map +1 -1
- package/build/lib/resolver-features.js +2 -2
- package/build/lib/resolver-features.js.map +1 -1
- package/build/lib/resources.d.ts +461 -0
- package/build/lib/resources.d.ts.map +1 -0
- package/build/lib/resources.js +249 -0
- package/build/lib/resources.js.map +1 -0
- package/build/lib/rpc-client.d.ts +68 -0
- package/build/lib/rpc-client.d.ts.map +1 -0
- package/build/lib/rpc-client.js +186 -0
- package/build/lib/rpc-client.js.map +1 -0
- package/build/lib/sse-subscriber.d.ts +57 -0
- package/build/lib/sse-subscriber.d.ts.map +1 -0
- package/build/lib/sse-subscriber.js +110 -0
- package/build/lib/sse-subscriber.js.map +1 -0
- package/build/lib/step-dispatch.d.ts +92 -28
- package/build/lib/step-dispatch.d.ts.map +1 -1
- package/build/lib/step-dispatch.js +331 -75
- package/build/lib/step-dispatch.js.map +1 -1
- package/build/lib/step-validation.d.ts +3 -3
- package/build/lib/step-validation.d.ts.map +1 -1
- package/build/lib/step-validation.js +2 -2
- package/build/lib/step-validation.js.map +1 -1
- package/build/lib/stepper-cycles.d.ts +5 -0
- package/build/lib/stepper-cycles.d.ts.map +1 -0
- package/build/lib/stepper-cycles.js +31 -0
- package/build/lib/stepper-cycles.js.map +1 -0
- package/build/lib/stepper-registry.d.ts +6 -3
- package/build/lib/stepper-registry.d.ts.map +1 -1
- package/build/lib/stepper-registry.js +9 -8
- package/build/lib/stepper-registry.js.map +1 -1
- package/build/lib/subprocess-runner.d.ts +35 -0
- package/build/lib/subprocess-runner.d.ts.map +1 -0
- package/build/lib/subprocess-runner.js +60 -0
- package/build/lib/subprocess-runner.js.map +1 -0
- package/build/lib/subprocess-transport.d.ts +37 -0
- package/build/lib/subprocess-transport.d.ts.map +1 -0
- package/build/lib/subprocess-transport.js +113 -0
- package/build/lib/subprocess-transport.js.map +1 -0
- package/build/lib/test/EventCollectorStepper.d.ts +3 -3
- package/build/lib/test/EventCollectorStepper.d.ts.map +1 -1
- package/build/lib/test/EventCollectorStepper.js +3 -3
- package/build/lib/test/EventCollectorStepper.js.map +1 -1
- package/build/lib/test/SetTimeStepper.d.ts +3 -3
- package/build/lib/test/SetTimeStepper.d.ts.map +1 -1
- package/build/lib/test/SetTimeStepper.js +7 -7
- package/build/lib/test/SetTimeStepper.js.map +1 -1
- package/build/lib/test/TestSteps.d.ts +7 -7
- package/build/lib/test/TestSteps.d.ts.map +1 -1
- package/build/lib/test/TestSteps.js +7 -7
- package/build/lib/test/TestSteps.js.map +1 -1
- package/build/lib/test/TestStepsWithOptions.d.ts +6 -6
- package/build/lib/test/TestStepsWithOptions.js +7 -7
- package/build/lib/test/lib.d.ts +3 -3
- package/build/lib/test/lib.d.ts.map +1 -1
- package/build/lib/test/lib.js +27 -21
- package/build/lib/test/lib.js.map +1 -1
- package/build/lib/test/resolvedTestFeatures.d.ts +6 -6
- package/build/lib/test/resolvedTestFeatures.d.ts.map +1 -1
- package/build/lib/test/resolvedTestFeatures.js +5 -5
- package/build/lib/test/subprocess-fixture.d.ts +8 -0
- package/build/lib/test/subprocess-fixture.d.ts.map +1 -0
- package/build/lib/test/subprocess-fixture.js +27 -0
- package/build/lib/test/subprocess-fixture.js.map +1 -0
- package/build/lib/ttag.d.ts +7 -1
- package/build/lib/ttag.d.ts.map +1 -1
- package/build/lib/ttag.js +5 -4
- package/build/lib/ttag.js.map +1 -1
- package/build/lib/util/dot-path.d.ts +2 -2
- package/build/lib/util/dot-path.d.ts.map +1 -1
- package/build/lib/util/dot-path.js +8 -7
- package/build/lib/util/dot-path.js.map +1 -1
- package/build/lib/util/index.d.ts +10 -24
- package/build/lib/util/index.d.ts.map +1 -1
- package/build/lib/util/index.js +43 -93
- package/build/lib/util/index.js.map +1 -1
- package/build/lib/util/node/actualURI.d.ts +4 -0
- package/build/lib/util/node/actualURI.d.ts.map +1 -0
- package/build/lib/util/node/actualURI.js +10 -0
- package/build/lib/util/node/actualURI.js.map +1 -0
- package/build/lib/util/node/module-loader.d.ts +14 -0
- package/build/lib/util/node/module-loader.d.ts.map +1 -0
- package/build/lib/util/node/module-loader.js +51 -0
- package/build/lib/util/node/module-loader.js.map +1 -0
- package/build/lib/util/node/workspace-lib.d.ts +15 -0
- package/build/lib/util/node/workspace-lib.d.ts.map +1 -0
- package/build/lib/util/node/workspace-lib.js +119 -0
- package/build/lib/util/node/workspace-lib.js.map +1 -0
- package/build/lib/util/secret-utils.d.ts.map +1 -1
- package/build/lib/util/secret-utils.js +2 -2
- package/build/lib/util/secret-utils.js.map +1 -1
- package/build/lib/vertex-crud.d.ts +22 -0
- package/build/lib/vertex-crud.d.ts.map +1 -0
- package/build/lib/vertex-crud.js +73 -0
- package/build/lib/vertex-crud.js.map +1 -0
- package/build/lib/workspace-discovery.d.ts +1 -1
- package/build/lib/workspace-discovery.d.ts.map +1 -1
- package/build/lib/workspace-discovery.js +10 -10
- package/build/lib/workspace-discovery.js.map +1 -1
- package/build/lib/zcap-like-authority.d.ts +38 -0
- package/build/lib/zcap-like-authority.d.ts.map +1 -0
- package/build/lib/zcap-like-authority.js +56 -0
- package/build/lib/zcap-like-authority.js.map +1 -0
- package/build/monitor/index.d.ts +1 -1
- package/build/monitor/index.d.ts.map +1 -1
- package/build/monitor/index.js +1 -1
- package/build/monitor/index.js.map +1 -1
- package/build/phases/Executor.d.ts +31 -7
- package/build/phases/Executor.d.ts.map +1 -1
- package/build/phases/Executor.js +201 -219
- package/build/phases/Executor.js.map +1 -1
- package/build/phases/Resolver.d.ts +2 -2
- package/build/phases/Resolver.d.ts.map +1 -1
- package/build/phases/Resolver.js +35 -30
- package/build/phases/Resolver.js.map +1 -1
- package/build/phases/collector.d.ts +3 -3
- package/build/phases/collector.d.ts.map +1 -1
- package/build/phases/collector.js +19 -17
- package/build/phases/collector.js.map +1 -1
- package/build/run-policy/run-policy-schema.d.ts +3 -5
- package/build/run-policy/run-policy-schema.d.ts.map +1 -1
- package/build/run-policy/run-policy-schema.js +41 -37
- package/build/run-policy/run-policy-schema.js.map +1 -1
- package/build/run-policy/run-policy-types.d.ts +1 -1
- package/build/run-policy/run-policy-types.d.ts.map +1 -1
- package/build/run-policy/run-policy-types.js +19 -16
- package/build/run-policy/run-policy-types.js.map +1 -1
- package/build/runner.d.ts +4 -4
- package/build/runner.d.ts.map +1 -1
- package/build/runner.js +15 -13
- package/build/runner.js.map +1 -1
- package/build/schema/protocol.d.ts +153 -61
- package/build/schema/protocol.d.ts.map +1 -1
- package/build/schema/protocol.js +177 -148
- package/build/schema/protocol.js.map +1 -1
- package/build/steps/activities-stepper.d.ts +13 -13
- package/build/steps/activities-stepper.d.ts.map +1 -1
- package/build/steps/activities-stepper.js +105 -79
- package/build/steps/activities-stepper.js.map +1 -1
- package/build/steps/conformance.d.ts +5 -5
- package/build/steps/conformance.js +4 -4
- package/build/steps/console-monitor-stepper.d.ts +2 -2
- package/build/steps/console-monitor-stepper.d.ts.map +1 -1
- package/build/steps/console-monitor-stepper.js +22 -22
- package/build/steps/console-monitor-stepper.js.map +1 -1
- package/build/steps/debugger-stepper.d.ts +11 -11
- package/build/steps/debugger-stepper.d.ts.map +1 -1
- package/build/steps/debugger-stepper.js +65 -64
- package/build/steps/debugger-stepper.js.map +1 -1
- package/build/steps/finalizer-stepper.d.ts +3 -4
- package/build/steps/finalizer-stepper.d.ts.map +1 -1
- package/build/steps/finalizer-stepper.js +16 -19
- package/build/steps/finalizer-stepper.js.map +1 -1
- package/build/steps/haibun.d.ts +27 -20
- package/build/steps/haibun.d.ts.map +1 -1
- package/build/steps/haibun.js +76 -67
- package/build/steps/haibun.js.map +1 -1
- package/build/steps/lib/tts.d.ts +1 -1
- package/build/steps/lib/tts.d.ts.map +1 -1
- package/build/steps/lib/tts.js +28 -28
- package/build/steps/lib/tts.js.map +1 -1
- package/build/steps/logic-stepper.d.ts +5 -5
- package/build/steps/logic-stepper.d.ts.map +1 -1
- package/build/steps/logic-stepper.js +76 -76
- package/build/steps/logic-stepper.js.map +1 -1
- package/build/steps/narrator.d.ts +9 -9
- package/build/steps/narrator.d.ts.map +1 -1
- package/build/steps/narrator.js +32 -28
- package/build/steps/narrator.js.map +1 -1
- package/build/steps/resources-stepper.d.ts +47 -0
- package/build/steps/resources-stepper.d.ts.map +1 -0
- package/build/steps/resources-stepper.js +100 -0
- package/build/steps/resources-stepper.js.map +1 -0
- package/build/steps/variables-stepper.d.ts +57 -57
- package/build/steps/variables-stepper.d.ts.map +1 -1
- package/build/steps/variables-stepper.js +252 -224
- package/build/steps/variables-stepper.js.map +1 -1
- package/build/steps/zcap-like-stepper.d.ts +50 -0
- package/build/steps/zcap-like-stepper.d.ts.map +1 -0
- package/build/steps/zcap-like-stepper.js +113 -0
- package/build/steps/zcap-like-stepper.js.map +1 -0
- package/package.json +1 -1
- package/build/lib/consts.d.ts +0 -5
- package/build/lib/consts.d.ts.map +0 -1
- package/build/lib/consts.js +0 -5
- package/build/lib/consts.js.map +0 -1
- package/build/lib/step-helpers.d.ts +0 -10
- package/build/lib/step-helpers.d.ts.map +0 -1
- package/build/lib/step-helpers.js +0 -16
- package/build/lib/step-helpers.js.map +0 -1
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const currentVersion = "4.0.0-alpha.
|
|
1
|
+
export declare const currentVersion = "4.0.0-alpha.3";
|
|
2
2
|
//# sourceMappingURL=currentVersion.d.ts.map
|
package/build/currentVersion.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const currentVersion = '4.0.0-alpha.
|
|
1
|
+
export const currentVersion = '4.0.0-alpha.3';
|
|
2
2
|
//# sourceMappingURL=currentVersion.js.map
|
package/build/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export {};
|
|
2
2
|
//# sourceMappingURL=index.d.ts.map
|
package/build/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""}
|
package/build/index.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export {};
|
|
2
2
|
//# sourceMappingURL=index.js.map
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { AStepper } from
|
|
2
|
-
import { TActionExecutor } from
|
|
1
|
+
import { AStepper } from "../lib/astepper.js";
|
|
2
|
+
import { TActionExecutor } from "./withAction.js";
|
|
3
3
|
type TkirejiFeature = {
|
|
4
4
|
[key: string]: (TActionExecutor<string> | string)[];
|
|
5
5
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["../../src/kireji/converter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,eAAe,EAA8B,MAAM,iBAAiB,CAAC;AAI9E,KAAK,cAAc,GAAG;
|
|
1
|
+
{"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["../../src/kireji/converter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,eAAe,EAA8B,MAAM,iBAAiB,CAAC;AAI9E,KAAK,cAAc,GAAG;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,cAAc,KAAG,eA0B/C,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,OAAO,GAAI,KAAK,MAAM,EAAE,UAAU,QAAQ,EAAE,KAAG,OAAO,CAAC,cAAc,CAkCjF,CAAC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { Resolver } from
|
|
2
|
-
import { withAction } from
|
|
1
|
+
import { Resolver } from "../phases/Resolver.js";
|
|
2
|
+
import { withAction } from "./withAction.js";
|
|
3
3
|
/**
|
|
4
4
|
* Converts a Kireji feature object into a BDD formatted string.
|
|
5
5
|
* It iterates through the feature's steps, executing any functional steps to get their GWTA string,
|
|
6
6
|
* and mapping the resulting lines to the original step indices for source tracking.
|
|
7
7
|
*/
|
|
8
8
|
export const toBdd = (feature) => {
|
|
9
|
-
let bddString =
|
|
9
|
+
let bddString = "";
|
|
10
10
|
const lineMap = new Map();
|
|
11
11
|
let currentLine = 1; // 1-indexed line number in output
|
|
12
12
|
for (const featureName in feature) {
|
|
@@ -16,7 +16,7 @@ export const toBdd = (feature) => {
|
|
|
16
16
|
for (let stepIdx = 0; stepIdx < steps.length; stepIdx++) {
|
|
17
17
|
const step = steps[stepIdx];
|
|
18
18
|
// Handle both function executors and plain prose strings
|
|
19
|
-
if (typeof step ===
|
|
19
|
+
if (typeof step === "string") {
|
|
20
20
|
bddString += ` ${step}\n`;
|
|
21
21
|
}
|
|
22
22
|
else {
|
|
@@ -36,12 +36,15 @@ export const toBdd = (feature) => {
|
|
|
36
36
|
* functional action with arguments.
|
|
37
37
|
*/
|
|
38
38
|
export const fromBdd = (bdd, steppers) => {
|
|
39
|
-
const lines = bdd.split(
|
|
40
|
-
const featureName = lines[0].replace(
|
|
41
|
-
const steps = lines
|
|
39
|
+
const lines = bdd.split("\n");
|
|
40
|
+
const featureName = lines[0].replace("Feature: ", "").trim();
|
|
41
|
+
const steps = lines
|
|
42
|
+
.slice(1)
|
|
43
|
+
.map((l) => l.trim())
|
|
44
|
+
.filter((l) => l.length > 0);
|
|
42
45
|
const resolver = new Resolver(steppers);
|
|
43
|
-
const stepperActions = steppers.map(stepper => withAction(stepper));
|
|
44
|
-
const kirejiSteps = steps.map(step => {
|
|
46
|
+
const stepperActions = steppers.map((stepper) => withAction(stepper));
|
|
47
|
+
const kirejiSteps = steps.map((step) => {
|
|
45
48
|
const action = resolver.findSingleStepAction(step);
|
|
46
49
|
const { actionName, stepValuesMap } = action;
|
|
47
50
|
const args = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../src/kireji/converter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAmC,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAa9E;;;;GAIG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,OAAuB,EAAmB,EAAE;
|
|
1
|
+
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../src/kireji/converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
-
import { AStepper, TStepperSteps } from
|
|
1
|
+
import { AStepper, TStepperSteps } from "../lib/astepper.js";
|
|
2
2
|
type TStripOptionalPatterns<S extends string> = S extends `${infer Before}(${string})?${infer After}` ? TStripOptionalPatterns<`${Before}${After}`> : S;
|
|
3
3
|
type TPlaceholderEntries<S extends string> = TPlaceholderEntriesImpl<TStripOptionalPatterns<S>>;
|
|
4
4
|
type TPlaceholderEntriesImpl<S extends string> = S extends `${string}{${infer Placeholder}}${infer After}` ? [...TPlaceholderEntry<Placeholder>, ...TPlaceholderEntriesImpl<After>] : [];
|
|
5
5
|
type TPlaceholderEntry<P extends string> = P extends `${infer Name}:${infer Domain}` ? [[Name, Domain]] : [[P, undefined]];
|
|
6
|
-
type
|
|
6
|
+
type TNestedArgValue = string | number | boolean | null | TActionExecutor<string> | TNestedArgValue[] | {
|
|
7
|
+
[key: string]: TNestedArgValue;
|
|
8
|
+
};
|
|
9
|
+
type TPlaceholderValueType<Name extends string, Domain extends string | undefined> = Domain extends "statement" ? string | TActionExecutor<string> : Name extends "statement" ? string | TActionExecutor<string> : string;
|
|
7
10
|
type TPlaceholderDomain<Entries extends ReadonlyArray<[string, string | undefined]>, Name extends string> = Extract<Entries[number], [Name, string | undefined]> extends [Name, infer Domain] ? Domain extends string | undefined ? Domain : undefined : undefined;
|
|
8
11
|
type TArgsInputFromEntries<Entries extends ReadonlyArray<[string, string | undefined]>> = {
|
|
9
12
|
[K in Entries[number][0]]: TPlaceholderValueType<K, TPlaceholderDomain<Entries, K>>;
|
|
@@ -26,11 +29,20 @@ export type TKirejiExport = {
|
|
|
26
29
|
type TActionsFromStepper<S extends TStepperSteps> = {
|
|
27
30
|
[K in keyof S]: S[K] extends {
|
|
28
31
|
gwta: infer G;
|
|
29
|
-
} ? G extends string ? TCurriedAction<G> : never : never;
|
|
32
|
+
} ? (G extends string ? TCurriedAction<G> : never) : never;
|
|
30
33
|
};
|
|
34
|
+
type TActionFactory = (args: Record<string, TNestedArgValue>) => TActionExecutor<string>;
|
|
31
35
|
type TStepMap<T extends AStepper> = T extends {
|
|
32
36
|
typedSteps: infer U;
|
|
33
|
-
} ? U extends TStepperSteps ? U : T[
|
|
37
|
+
} ? (U extends TStepperSteps ? U : T["steps"]) : T["steps"];
|
|
34
38
|
export declare const withAction: <T extends AStepper>(stepper: T) => TActionsFromStepper<TStepMap<T>>;
|
|
39
|
+
/**
|
|
40
|
+
* Generate kireji action factories for vertex CRUD from a label and domain key.
|
|
41
|
+
* No stepper instance needed — works at import time.
|
|
42
|
+
* The actual handlers are generated by the registry from domain definitions at runtime.
|
|
43
|
+
*/
|
|
44
|
+
export declare const withVertexActions: (label: string, domainKey: string) => {
|
|
45
|
+
[k: string]: TActionFactory;
|
|
46
|
+
};
|
|
35
47
|
export {};
|
|
36
48
|
//# sourceMappingURL=withAction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withAction.d.ts","sourceRoot":"","sources":["../../src/kireji/withAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AA4B7D,KAAK,sBAAsB,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,GAAG,MAAM,MAAM,IAAI,MAAM,KAAK,MAAM,KAAK,EAAE,GAClG,sBAAsB,CAAC,GAAG,MAAM,GAAG,KAAK,EAAE,CAAC,GAC3C,CAAC,CAAC;AAEL,KAAK,mBAAmB,CAAC,CAAC,SAAS,MAAM,IAAI,uBAAuB,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;AAEhG,KAAK,uBAAuB,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,MAAM,WAAW,IAAI,MAAM,KAAK,EAAE,GACvG,CAAC,GAAG,iBAAiB,CAAC,WAAW,CAAC,EAAE,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC,GACtE,EAAE,CAAC;AAEN,KAAK,iBAAiB,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,IAAI,MAAM,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"withAction.d.ts","sourceRoot":"","sources":["../../src/kireji/withAction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { namedInterpolation } from
|
|
1
|
+
import { namedInterpolation } from "../lib/namedVars.js";
|
|
2
2
|
const isStepWithGwta = (step) => {
|
|
3
|
-
return typeof step.gwta ===
|
|
3
|
+
return typeof step.gwta === "string";
|
|
4
4
|
};
|
|
5
5
|
const interpolateGwta = (gwta, args) => {
|
|
6
6
|
let interpolated = gwta;
|
|
7
7
|
// First, remove optional regex patterns like '( empty)?' from the gwta
|
|
8
8
|
// These are used for matching but shouldn't appear in the final output
|
|
9
|
-
interpolated = interpolated.replace(/\([^)]*\)\?/g,
|
|
9
|
+
interpolated = interpolated.replace(/\([^)]*\)\?/g, "");
|
|
10
10
|
for (const key in args) {
|
|
11
11
|
const placeholder = `{${key}}`;
|
|
12
|
-
const placeholderWithDomain = new RegExp(`\\{${key}:[^}]+\\}`,
|
|
12
|
+
const placeholderWithDomain = new RegExp(`\\{${key}:[^}]+\\}`, "g");
|
|
13
13
|
interpolated = interpolated.replace(placeholderWithDomain, args[key]);
|
|
14
14
|
interpolated = interpolated.replace(placeholder, args[key]);
|
|
15
15
|
}
|
|
@@ -17,21 +17,21 @@ const interpolateGwta = (gwta, args) => {
|
|
|
17
17
|
};
|
|
18
18
|
const resolveArgValue = (value) => {
|
|
19
19
|
if (value === null) {
|
|
20
|
-
return
|
|
20
|
+
return "null";
|
|
21
21
|
}
|
|
22
|
-
if (typeof value ===
|
|
22
|
+
if (typeof value === "function") {
|
|
23
23
|
const executed = value();
|
|
24
24
|
return executed.gwta;
|
|
25
25
|
}
|
|
26
26
|
if (Array.isArray(value)) {
|
|
27
|
-
return value.map(resolveArgValue).join(
|
|
27
|
+
return value.map(resolveArgValue).join(" ");
|
|
28
28
|
}
|
|
29
|
-
if (typeof value ===
|
|
29
|
+
if (typeof value === "object") {
|
|
30
30
|
const entries = Object.entries(value).map(([key, nested]) => `${key}: ${resolveArgValue(nested)}`);
|
|
31
|
-
return `{ ${entries.join(
|
|
31
|
+
return `{ ${entries.join(", ")} }`;
|
|
32
32
|
}
|
|
33
33
|
// Escape newlines in string values for BDD format
|
|
34
|
-
return String(value).replace(/\n/g,
|
|
34
|
+
return String(value).replace(/\n/g, "\\n");
|
|
35
35
|
};
|
|
36
36
|
export const withAction = (stepper) => {
|
|
37
37
|
const actions = {};
|
|
@@ -39,7 +39,7 @@ export const withAction = (stepper) => {
|
|
|
39
39
|
const step = stepper.steps[actionName];
|
|
40
40
|
if (isStepWithGwta(step)) {
|
|
41
41
|
// Strip optional patterns before extracting placeholders to match type-level behavior
|
|
42
|
-
const strippedGwta = step.gwta.replace(/\([^)]*\)\?/g,
|
|
42
|
+
const strippedGwta = step.gwta.replace(/\([^)]*\)\?/g, "");
|
|
43
43
|
const { stepValuesMap } = namedInterpolation(strippedGwta);
|
|
44
44
|
const argNames = stepValuesMap ? Object.keys(stepValuesMap) : [];
|
|
45
45
|
actions[actionName] = (args) => {
|
|
@@ -63,4 +63,33 @@ export const withAction = (stepper) => {
|
|
|
63
63
|
}
|
|
64
64
|
return actions;
|
|
65
65
|
};
|
|
66
|
+
/**
|
|
67
|
+
* Generate kireji action factories for vertex CRUD from a label and domain key.
|
|
68
|
+
* No stepper instance needed — works at import time.
|
|
69
|
+
* The actual handlers are generated by the registry from domain definitions at runtime.
|
|
70
|
+
*/
|
|
71
|
+
export const withVertexActions = (label, domainKey) => {
|
|
72
|
+
const lc = label.toLowerCase();
|
|
73
|
+
const makeAction = (actionName, gwta, argNames) => {
|
|
74
|
+
return [
|
|
75
|
+
actionName,
|
|
76
|
+
(args) => {
|
|
77
|
+
for (const name of argNames) {
|
|
78
|
+
if (args[name] === undefined)
|
|
79
|
+
throw new Error(`Missing argument "${name}" for action "${actionName}"`);
|
|
80
|
+
}
|
|
81
|
+
const normalizedArgs = {};
|
|
82
|
+
for (const name of argNames)
|
|
83
|
+
normalizedArgs[name] = resolveArgValue(args[name]);
|
|
84
|
+
return () => ({ actionName, args: normalizedArgs, gwta: interpolateGwta(gwta, normalizedArgs) });
|
|
85
|
+
},
|
|
86
|
+
];
|
|
87
|
+
};
|
|
88
|
+
return Object.fromEntries([
|
|
89
|
+
makeAction(`create${label}`, `create ${lc} {data: ${domainKey}}`, ["data"]),
|
|
90
|
+
makeAction(`get${label}`, `get ${lc} {id: string}`, ["id"]),
|
|
91
|
+
makeAction(`delete${label}`, `delete ${lc} {id: string}`, ["id"]),
|
|
92
|
+
makeAction(`list${label}s`, `list ${lc}s`, []),
|
|
93
|
+
]);
|
|
94
|
+
};
|
|
66
95
|
//# sourceMappingURL=withAction.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withAction.js","sourceRoot":"","sources":["../../src/kireji/withAction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAIzD,MAAM,cAAc,GAAG,CAAC,IAAa,EAAyB,EAAE;IAC/D,OAAO,OAAQ,IAA+B,CAAC,IAAI,KAAK,QAAQ,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,IAA+B,EAAU,EAAE;IACjF,IAAI,YAAY,GAAG,IAAI,CAAC;IAExB,uEAAuE;IACvE,uEAAuE;IACvE,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IAExD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,WAAW,GAAG,IAAI,GAAG,GAAG,CAAC;QAC/B,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAAC,MAAM,GAAG,WAAW,EAAE,GAAG,CAAC,CAAC;QACpE,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,qBAAqB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACtE,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,YAAY,CAAC;AACrB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"withAction.js","sourceRoot":"","sources":["../../src/kireji/withAction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { THaibunEvent, TArtifactEvent, THaibunLogLevel } from
|
|
2
|
-
import { TFeatureStep } from
|
|
1
|
+
import type { THaibunEvent, TArtifactEvent, THaibunLogLevel } from "../schema/protocol.js";
|
|
2
|
+
import { TFeatureStep } from "./execution.js";
|
|
3
3
|
export type TIsSecretFn = (name: string) => boolean;
|
|
4
4
|
export type TEventSubscriber = (event: THaibunEvent) => void;
|
|
5
5
|
export interface IEventLogger {
|
|
@@ -12,7 +12,7 @@ export interface IEventLogger {
|
|
|
12
12
|
debug(message: string, attributes?: Record<string, unknown>): void;
|
|
13
13
|
warn(message: string, attributes?: Record<string, unknown>): void;
|
|
14
14
|
error(message: string, attributes?: Record<string, unknown>): void;
|
|
15
|
-
stepStart(featureStep: TFeatureStep, stepperName: string, actionName: string, stepArgs: Record<string, unknown>, stepValuesMap: Record<string, unknown> | undefined): void;
|
|
15
|
+
stepStart(featureStep: TFeatureStep, stepperName: string, actionName: string, stepArgs: Record<string, unknown>, stepValuesMap: Record<string, unknown> | undefined, isAsync?: boolean): void;
|
|
16
16
|
stepEnd(featureStep: TFeatureStep, stepperName: string, actionName: string, ok: boolean, error: string | Error | undefined, stepArgs: Record<string, unknown>, stepValuesMap: Record<string, unknown> | undefined, products: Record<string, unknown> | undefined): void;
|
|
17
17
|
artifact(featureStep: TFeatureStep, artifact: TArtifactEvent): void;
|
|
18
18
|
}
|
|
@@ -30,8 +30,8 @@ export declare class EventLogger implements IEventLogger {
|
|
|
30
30
|
warn(message: string, attributes?: Record<string, unknown>): void;
|
|
31
31
|
error(message: string, attributes?: Record<string, unknown>): void;
|
|
32
32
|
private emitLog;
|
|
33
|
-
stepStart(featureStep: TFeatureStep, stepperName: string, actionName: string, stepArgs: Record<string, unknown>, stepValuesMap: Record<string, unknown> | undefined): void;
|
|
34
|
-
stepEnd(featureStep: TFeatureStep, stepperName: string, actionName: string, ok: boolean, error: string | Error | undefined,
|
|
33
|
+
stepStart(featureStep: TFeatureStep, stepperName: string, actionName: string, stepArgs: Record<string, unknown>, stepValuesMap: Record<string, unknown> | undefined, isAsync?: boolean): void;
|
|
34
|
+
stepEnd(featureStep: TFeatureStep, stepperName: string, actionName: string, ok: boolean, error: string | Error | undefined, _stepArgs: Record<string, unknown>, stepValuesMap: Record<string, unknown> | undefined, products: Record<string, unknown> | undefined): void;
|
|
35
35
|
/**
|
|
36
36
|
* Emit an artifact event. The artifact should already be a valid TArtifactEvent
|
|
37
37
|
* (parsed via the appropriate Zod schema like ImageArtifact.parse()).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventLogger.d.ts","sourceRoot":"","sources":["../../src/lib/EventLogger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"EventLogger.d.ts","sourceRoot":"","sources":["../../src/lib/EventLogger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;AAEpD,MAAM,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;AAE7D,MAAM,WAAW,YAAY;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC5C,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC9C,IAAI,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IAChC,GAAG,CAAC,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAEpH,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAClE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACnE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAClE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACnE,SAAS,CACR,WAAW,EAAE,YAAY,EACzB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAClD,OAAO,CAAC,EAAE,OAAO,GACf,IAAI,CAAC;IACR,OAAO,CACN,WAAW,EAAE,YAAY,EACzB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,OAAO,EACX,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,EACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAClD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAC3C,IAAI,CAAC;IACR,QAAQ,CAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;CACpE;AA4BD,qBAAa,WAAY,YAAW,YAAY;IAC/C,OAAO,CAAC,WAAW,CAA0B;IACtC,eAAe,EAAE,OAAO,CAAS;IACxC,OAAO,CAAC,UAAU,CAAc;gBAEpB,UAAU,GAAE,WAAyB;IAOjD,SAAS,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI;IAI3C,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI;IAI7C,IAAI,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI;IAkB/B,GAAG,CAAC,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAcnH,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAIjE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAIlE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAIjE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAIlE,OAAO,CAAC,OAAO;IAaf,SAAS,CACR,WAAW,EAAE,YAAY,EACzB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAClD,OAAO,CAAC,EAAE,OAAO,GACf,IAAI;IAyBP,OAAO,CACN,WAAW,EAAE,YAAY,EACzB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,OAAO,EACX,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,EACjC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAClD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAC3C,IAAI;IAyBP;;;OAGG;IACH,QAAQ,CAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,GAAG,IAAI;CASnE"}
|
package/build/lib/EventLogger.js
CHANGED
|
@@ -1,29 +1,32 @@
|
|
|
1
|
-
import { LogEvent, LifecycleEvent } from
|
|
2
|
-
import { sanitizeObjectSecrets } from
|
|
3
|
-
import { formatCurrentSeqPath } from
|
|
1
|
+
import { LogEvent, LifecycleEvent } from "../schema/protocol.js";
|
|
2
|
+
import { sanitizeObjectSecrets } from "./util/secret-utils.js";
|
|
3
|
+
import { formatCurrentSeqPath } from "./util/index.js";
|
|
4
4
|
/**
|
|
5
5
|
* Get caller info for the emitter field (e.g., "Executor:238")
|
|
6
6
|
*/
|
|
7
7
|
function getEmitter() {
|
|
8
|
-
const stack = Error().stack?.split(
|
|
8
|
+
const stack = Error().stack?.split("\n");
|
|
9
9
|
if (!stack || stack.length < 5)
|
|
10
|
-
return
|
|
10
|
+
return "unknown";
|
|
11
11
|
// Find the first non-EventLogger caller
|
|
12
12
|
for (let i = 3; i < Math.min(stack.length, 10); i++) {
|
|
13
13
|
const line = stack[i];
|
|
14
|
-
if (line.includes(
|
|
14
|
+
if (line.includes("EventLogger") || line.includes("emitLog"))
|
|
15
15
|
continue;
|
|
16
16
|
// Capture function, path, line, col
|
|
17
17
|
// Example: at Executor.doFeatureStep (/home/.../Executor.ts:287:11)
|
|
18
18
|
const match = line.match(/at\s+(?:(\S+)\s+)?\(?(.+?):(\d+):(\d+)\)?$/);
|
|
19
19
|
if (match) {
|
|
20
20
|
const [, func, path, row] = match;
|
|
21
|
-
const shortFunc = func ? func.split(
|
|
22
|
-
const file = path
|
|
21
|
+
const shortFunc = func ? func.split(".").pop() : "at";
|
|
22
|
+
const file = path
|
|
23
|
+
.split("/")
|
|
24
|
+
.pop()
|
|
25
|
+
?.replace(/\.[^/.]+$/, "");
|
|
23
26
|
return `${file}.${shortFunc}:${row}`;
|
|
24
27
|
}
|
|
25
28
|
}
|
|
26
|
-
return
|
|
29
|
+
return "unknown";
|
|
27
30
|
}
|
|
28
31
|
export class EventLogger {
|
|
29
32
|
subscribers = [];
|
|
@@ -31,15 +34,15 @@ export class EventLogger {
|
|
|
31
34
|
isSecretFn;
|
|
32
35
|
constructor(isSecretFn = () => false) {
|
|
33
36
|
this.isSecretFn = isSecretFn;
|
|
34
|
-
const forceNdjson = process.env[
|
|
35
|
-
const isTest = process.env[
|
|
37
|
+
const forceNdjson = process.env["HAIBUN_NDJSON"] === "true";
|
|
38
|
+
const isTest = process.env["VITEST"] !== undefined || process.env["NODE_ENV"] === "test";
|
|
36
39
|
this.suppressConsole = !forceNdjson && isTest;
|
|
37
40
|
}
|
|
38
41
|
subscribe(callback) {
|
|
39
42
|
this.subscribers.push(callback);
|
|
40
43
|
}
|
|
41
44
|
unsubscribe(callback) {
|
|
42
|
-
this.subscribers = this.subscribers.filter(s => s !== callback);
|
|
45
|
+
this.subscribers = this.subscribers.filter((s) => s !== callback);
|
|
43
46
|
}
|
|
44
47
|
emit(event) {
|
|
45
48
|
const eventWithEmitter = {
|
|
@@ -51,7 +54,7 @@ export class EventLogger {
|
|
|
51
54
|
subscriber(eventWithEmitter);
|
|
52
55
|
}
|
|
53
56
|
catch (e) {
|
|
54
|
-
console.error(
|
|
57
|
+
console.error("EventLogger subscriber error:", e);
|
|
55
58
|
}
|
|
56
59
|
}
|
|
57
60
|
if (!this.suppressConsole) {
|
|
@@ -62,78 +65,77 @@ export class EventLogger {
|
|
|
62
65
|
this.emit(LogEvent.parse({
|
|
63
66
|
id: formatCurrentSeqPath(featureStep.seqPath),
|
|
64
67
|
timestamp: Date.now(),
|
|
65
|
-
kind:
|
|
68
|
+
kind: "log",
|
|
66
69
|
level,
|
|
67
70
|
message,
|
|
68
|
-
attributes
|
|
71
|
+
attributes,
|
|
69
72
|
}));
|
|
70
73
|
}
|
|
71
74
|
// Convenience methods for logging without a featureStep (for cycles, helpers, etc.)
|
|
72
75
|
info(message, attributes) {
|
|
73
|
-
this.emitLog(
|
|
76
|
+
this.emitLog("info", message, attributes);
|
|
74
77
|
}
|
|
75
78
|
debug(message, attributes) {
|
|
76
|
-
this.emitLog(
|
|
79
|
+
this.emitLog("debug", message, attributes);
|
|
77
80
|
}
|
|
78
81
|
warn(message, attributes) {
|
|
79
|
-
this.emitLog(
|
|
82
|
+
this.emitLog("warn", message, attributes);
|
|
80
83
|
}
|
|
81
84
|
error(message, attributes) {
|
|
82
|
-
this.emitLog(
|
|
85
|
+
this.emitLog("error", message, attributes);
|
|
83
86
|
}
|
|
84
87
|
emitLog(level, message, attributes) {
|
|
85
88
|
this.emit(LogEvent.parse({
|
|
86
89
|
id: `log.${Date.now()}`,
|
|
87
90
|
timestamp: Date.now(),
|
|
88
|
-
kind:
|
|
91
|
+
kind: "log",
|
|
89
92
|
level,
|
|
90
93
|
message,
|
|
91
|
-
attributes
|
|
94
|
+
attributes,
|
|
92
95
|
}));
|
|
93
96
|
}
|
|
94
|
-
stepStart(featureStep, stepperName, actionName, stepArgs, stepValuesMap) {
|
|
97
|
+
stepStart(featureStep, stepperName, actionName, stepArgs, stepValuesMap, isAsync) {
|
|
95
98
|
const safeStepValuesMap = stepValuesMap ? sanitizeObjectSecrets(stepValuesMap, this.isSecretFn) : undefined;
|
|
96
99
|
const safeStepArgs = sanitizeObjectSecrets(stepArgs, () => false);
|
|
97
100
|
this.emit(LifecycleEvent.parse({
|
|
98
101
|
id: formatCurrentSeqPath(featureStep.seqPath),
|
|
99
102
|
timestamp: Date.now(),
|
|
100
|
-
kind:
|
|
101
|
-
type:
|
|
102
|
-
stage:
|
|
103
|
+
kind: "lifecycle",
|
|
104
|
+
type: "step",
|
|
105
|
+
stage: "start",
|
|
103
106
|
in: featureStep.in,
|
|
104
107
|
lineNumber: featureStep.source.lineNumber,
|
|
105
108
|
featurePath: featureStep.source.path,
|
|
106
|
-
status:
|
|
107
|
-
level: featureStep.isSubStep ?
|
|
109
|
+
status: "running",
|
|
110
|
+
level: featureStep.isSubStep ? "trace" : "info",
|
|
108
111
|
intent: featureStep.intent ? { mode: featureStep.intent.mode } : undefined,
|
|
109
112
|
stepperName,
|
|
110
113
|
actionName,
|
|
111
114
|
stepArgs: safeStepArgs,
|
|
112
|
-
stepValuesMap: safeStepValuesMap
|
|
115
|
+
stepValuesMap: safeStepValuesMap,
|
|
116
|
+
isAsync,
|
|
113
117
|
}));
|
|
114
118
|
}
|
|
115
|
-
stepEnd(featureStep, stepperName, actionName, ok, error,
|
|
119
|
+
stepEnd(featureStep, stepperName, actionName, ok, error, _stepArgs, stepValuesMap, products) {
|
|
116
120
|
const errorMessage = error instanceof Error ? error.message : error;
|
|
117
121
|
const safeStepValuesMap = stepValuesMap ? sanitizeObjectSecrets(stepValuesMap, this.isSecretFn) : undefined;
|
|
118
|
-
const safeStepArgs = sanitizeObjectSecrets(stepArgs, () => false);
|
|
119
122
|
this.emit(LifecycleEvent.parse({
|
|
120
123
|
id: formatCurrentSeqPath(featureStep.seqPath),
|
|
121
124
|
timestamp: Date.now(),
|
|
122
|
-
kind:
|
|
123
|
-
type:
|
|
124
|
-
stage:
|
|
125
|
+
kind: "lifecycle",
|
|
126
|
+
type: "step",
|
|
127
|
+
stage: "end",
|
|
125
128
|
in: featureStep.in,
|
|
126
129
|
lineNumber: featureStep.source.lineNumber,
|
|
127
130
|
featurePath: featureStep.source.path,
|
|
128
|
-
status: ok ?
|
|
129
|
-
level: featureStep.isSubStep ?
|
|
131
|
+
status: ok ? "completed" : "failed",
|
|
132
|
+
level: featureStep.isSubStep ? "trace" : "info",
|
|
130
133
|
error: errorMessage,
|
|
131
134
|
intent: featureStep.intent ? { mode: featureStep.intent.mode } : undefined,
|
|
132
135
|
stepperName,
|
|
133
136
|
actionName,
|
|
134
|
-
stepArgs: safeStepArgs, // Match Zod union type
|
|
135
137
|
stepValuesMap: safeStepValuesMap,
|
|
136
|
-
products
|
|
138
|
+
products,
|
|
137
139
|
}));
|
|
138
140
|
}
|
|
139
141
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventLogger.js","sourceRoot":"","sources":["../../src/lib/EventLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"EventLogger.js","sourceRoot":"","sources":["../../src/lib/EventLogger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { TWorld } from
|
|
2
|
-
import { TExecutorResult } from
|
|
3
|
-
import { AStepper } from
|
|
1
|
+
import { TWorld } from "./execution.js";
|
|
2
|
+
import { TExecutorResult } from "../schema/protocol.js";
|
|
3
|
+
import { AStepper } from "./astepper.js";
|
|
4
4
|
export declare class PhaseBailError extends Error {
|
|
5
5
|
result: TExecutorResult;
|
|
6
6
|
constructor(result: TExecutorResult);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PhaseRunner.d.ts","sourceRoot":"","sources":["../../src/lib/PhaseRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"PhaseRunner.d.ts","sourceRoot":"","sources":["../../src/lib/PhaseRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,qBAAa,cAAe,SAAQ,KAAK;IACrB,MAAM,EAAE,eAAe;gBAAvB,MAAM,EAAE,eAAe;CAG1C;AAED,qBAAa,WAAW;IAGJ,KAAK,CAAC,EAAE,MAAM;IAF1B,QAAQ,EAAE,QAAQ,EAAE,CAAM;gBAEd,KAAK,CAAC,EAAE,MAAM;IAEpB,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;WAQ/D,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM;IAQjD,OAAO,CAAC,mBAAmB;CAU3B"}
|
package/build/lib/PhaseRunner.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { z } from
|
|
1
|
+
import { z } from "zod";
|
|
2
2
|
export class PhaseBailError extends Error {
|
|
3
3
|
result;
|
|
4
4
|
constructor(result) {
|
|
5
|
-
super(
|
|
5
|
+
super("PhaseBailError");
|
|
6
6
|
this.result = result;
|
|
7
7
|
}
|
|
8
8
|
}
|
|
@@ -22,8 +22,10 @@ export class PhaseRunner {
|
|
|
22
22
|
}
|
|
23
23
|
static formatError(error) {
|
|
24
24
|
return error instanceof z.ZodError
|
|
25
|
-
? error.issues.map((i) => ` • ${i.path.length ? i.path.join(
|
|
26
|
-
: error instanceof Error
|
|
25
|
+
? error.issues.map((i) => ` • ${i.path.length ? i.path.join(".") + ": " : ""}${i.message}`).join("\n")
|
|
26
|
+
: error instanceof Error
|
|
27
|
+
? error.message
|
|
28
|
+
: String(error);
|
|
27
29
|
}
|
|
28
30
|
createFailureResult(stage, error) {
|
|
29
31
|
return {
|
|
@@ -32,7 +34,7 @@ export class PhaseRunner {
|
|
|
32
34
|
tag: this.world?.tag,
|
|
33
35
|
failure: { stage, error: { message: PhaseRunner.formatError(error), details: { stack: error?.stack } } },
|
|
34
36
|
steppers: this.steppers,
|
|
35
|
-
featureResults: []
|
|
37
|
+
featureResults: [],
|
|
36
38
|
};
|
|
37
39
|
}
|
|
38
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PhaseRunner.js","sourceRoot":"","sources":["../../src/lib/PhaseRunner.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,OAAO,cAAe,SAAQ,KAAK;
|
|
1
|
+
{"version":3,"file":"PhaseRunner.js","sourceRoot":"","sources":["../../src/lib/PhaseRunner.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,OAAO,cAAe,SAAQ,KAAK;IACrB;IAAnB,YAAmB,MAAuB;QACzC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QADN,WAAM,GAAN,MAAM,CAAiB;IAE1C,CAAC;CACD;AAED,MAAM,OAAO,WAAW;IAGJ;IAFZ,QAAQ,GAAe,EAAE,CAAC;IAEjC,YAAmB,KAAc;QAAd,UAAK,GAAL,KAAK,CAAS;IAAG,CAAC;IAE9B,KAAK,CAAC,QAAQ,CAAI,KAAa,EAAE,EAAwB;QAC/D,IAAI,CAAC;YACJ,OAAO,MAAM,EAAE,EAAE,CAAC;QACnB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,cAAc,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;QAClE,CAAC;IACF,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,KAAc;QACvC,OAAO,KAAK,YAAY,CAAC,CAAC,QAAQ;YACjC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YACnH,CAAC,CAAC,KAAK,YAAY,KAAK;gBACvB,CAAC,CAAC,KAAK,CAAC,OAAO;gBACf,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC;IAEO,mBAAmB,CAAC,KAAa,EAAE,KAAc;QACxD,OAAO;YACN,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM;YAC1B,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG;YACpB,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,KAAK,EAAG,KAAe,EAAE,KAAK,EAAE,EAAE,EAAE;YACnH,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,cAAc,EAAE,EAAE;SACY,CAAC;IACjC,CAAC;CACD"}
|