@haibun/core 1.75.2 → 3.0.0
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/applyEffectFeatures.d.ts.map +1 -1
- package/build/applyEffectFeatures.js +3 -6
- package/build/applyEffectFeatures.js.map +1 -1
- package/build/currentVersion.d.ts +1 -1
- package/build/currentVersion.d.ts.map +1 -1
- package/build/currentVersion.js +1 -1
- package/build/currentVersion.js.map +1 -1
- package/build/jsprolog/converter.d.ts +9 -0
- package/build/jsprolog/converter.d.ts.map +1 -0
- package/build/jsprolog/converter.js +42 -0
- package/build/jsprolog/converter.js.map +1 -0
- package/build/jsprolog/stepper-utils.d.ts +8 -0
- package/build/jsprolog/stepper-utils.d.ts.map +1 -0
- package/build/jsprolog/stepper-utils.js +8 -0
- package/build/jsprolog/stepper-utils.js.map +1 -0
- package/build/jsprolog/test.jsprolog.d.ts +4 -0
- package/build/jsprolog/test.jsprolog.d.ts.map +1 -0
- package/build/jsprolog/test.jsprolog.js +19 -0
- package/build/jsprolog/test.jsprolog.js.map +1 -0
- package/build/jsprolog/test.kireji.d.ts +4 -0
- package/build/jsprolog/test.kireji.d.ts.map +1 -0
- package/build/jsprolog/test.kireji.js +19 -0
- package/build/jsprolog/test.kireji.js.map +1 -0
- package/build/jsprolog/withAction.d.ts +32 -0
- package/build/jsprolog/withAction.d.ts.map +1 -0
- package/build/jsprolog/withAction.js +65 -0
- package/build/jsprolog/withAction.js.map +1 -0
- package/build/kireji/converter.d.ts +9 -0
- package/build/kireji/converter.d.ts.map +1 -0
- package/build/kireji/converter.js +49 -0
- package/build/kireji/converter.js.map +1 -0
- package/build/kireji/test.kireji.d.ts +4 -0
- package/build/kireji/test.kireji.d.ts.map +1 -0
- package/build/kireji/test.kireji.js +19 -0
- package/build/kireji/test.kireji.js.map +1 -0
- package/build/kireji/withAction.d.ts +36 -0
- package/build/kireji/withAction.d.ts.map +1 -0
- package/build/kireji/withAction.js +66 -0
- package/build/kireji/withAction.js.map +1 -0
- package/build/lib/Logger.d.ts +2 -0
- package/build/lib/Logger.d.ts.map +1 -1
- package/build/lib/Logger.js +9 -5
- package/build/lib/Logger.js.map +1 -1
- package/build/lib/TestLogger.d.ts +1 -0
- package/build/lib/TestLogger.d.ts.map +1 -1
- package/build/lib/TestLogger.js +1 -0
- package/build/lib/TestLogger.js.map +1 -1
- package/build/lib/astepper.d.ts +4 -6
- package/build/lib/astepper.d.ts.map +1 -1
- package/build/lib/astepper.js +0 -1
- package/build/lib/astepper.js.map +1 -1
- package/build/lib/core-domains.d.ts +3 -3
- package/build/lib/core-domains.d.ts.map +1 -1
- package/build/lib/core-domains.js +3 -3
- package/build/lib/core-domains.js.map +1 -1
- package/build/lib/defs.d.ts +29 -23
- package/build/lib/defs.d.ts.map +1 -1
- package/build/lib/defs.js +2 -1
- package/build/lib/defs.js.map +1 -1
- package/build/lib/errors.d.ts +13 -0
- package/build/lib/errors.d.ts.map +1 -0
- package/build/lib/errors.js +18 -0
- package/build/lib/errors.js.map +1 -0
- package/build/lib/feature-variables.d.ts +4 -2
- package/build/lib/feature-variables.d.ts.map +1 -1
- package/build/lib/feature-variables.js +12 -2
- package/build/lib/feature-variables.js.map +1 -1
- package/build/lib/features.d.ts.map +1 -1
- package/build/lib/features.js +7 -3
- package/build/lib/features.js.map +1 -1
- package/build/lib/interfaces/logger.d.ts +4 -2
- package/build/lib/interfaces/logger.d.ts.map +1 -1
- package/build/lib/interfaces/logger.js +1 -0
- package/build/lib/interfaces/logger.js.map +1 -1
- package/build/lib/namedVars.d.ts.map +1 -1
- package/build/lib/namedVars.js +8 -1
- package/build/lib/namedVars.js.map +1 -1
- package/build/lib/populateActionArgs.js +1 -1
- package/build/lib/populateActionArgs.js.map +1 -1
- package/build/lib/test/TestSteps.d.ts +0 -5
- package/build/lib/test/TestSteps.d.ts.map +1 -1
- package/build/lib/test/TestSteps.js +0 -8
- package/build/lib/test/TestSteps.js.map +1 -1
- package/build/lib/test/lib.d.ts +4 -1
- package/build/lib/test/lib.d.ts.map +1 -1
- package/build/lib/test/lib.js +18 -5
- package/build/lib/test/lib.js.map +1 -1
- package/build/lib/test/resolvedTestFeatures.js +1 -1
- package/build/lib/test/resolvedTestFeatures.js.map +1 -1
- package/build/lib/util/featureStep-executor.d.ts +2 -1
- package/build/lib/util/featureStep-executor.d.ts.map +1 -1
- package/build/lib/util/featureStep-executor.js +31 -7
- package/build/lib/util/featureStep-executor.js.map +1 -1
- package/build/lib/util/index.d.ts +3 -1
- package/build/lib/util/index.d.ts.map +1 -1
- package/build/lib/util/index.js +2 -0
- package/build/lib/util/index.js.map +1 -1
- package/build/phases/Executor.d.ts +6 -1
- package/build/phases/Executor.d.ts.map +1 -1
- package/build/phases/Executor.js +156 -22
- package/build/phases/Executor.js.map +1 -1
- package/build/phases/Resolver.d.ts +4 -3
- package/build/phases/Resolver.d.ts.map +1 -1
- package/build/phases/Resolver.js +49 -31
- package/build/phases/Resolver.js.map +1 -1
- package/build/phases/collector.d.ts +1 -1
- package/build/phases/collector.d.ts.map +1 -1
- package/build/phases/collector.js +36 -7
- package/build/phases/collector.js.map +1 -1
- package/build/runner.d.ts.map +1 -1
- package/build/runner.js +4 -7
- package/build/runner.js.map +1 -1
- package/build/steps/activities-stepper.d.ts +79 -0
- package/build/steps/activities-stepper.d.ts.map +1 -0
- package/build/steps/activities-stepper.js +342 -0
- package/build/steps/activities-stepper.js.map +1 -0
- package/build/steps/conditions-stepper.d.ts +27 -0
- package/build/steps/conditions-stepper.d.ts.map +1 -0
- package/build/steps/conditions-stepper.js +99 -0
- package/build/steps/conditions-stepper.js.map +1 -0
- package/build/steps/debugger-stepper.d.ts +60 -2
- package/build/steps/debugger-stepper.d.ts.map +1 -1
- package/build/steps/debugger-stepper.js +5 -5
- package/build/steps/debugger-stepper.js.map +1 -1
- package/build/steps/haibun.d.ts +69 -22
- package/build/steps/haibun.d.ts.map +1 -1
- package/build/steps/haibun.js +138 -75
- package/build/steps/haibun.js.map +1 -1
- package/build/steps/narrator.d.ts +4 -4
- package/build/steps/parse.d.ts +1 -1
- package/build/steps/variables-stepper.d.ts +69 -4
- package/build/steps/variables-stepper.d.ts.map +1 -1
- package/build/steps/variables-stepper.js +44 -14
- package/build/steps/variables-stepper.js.map +1 -1
- package/package.json +1 -1
package/build/runner.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { applyEffectFeatures } from './applyEffectFeatures.js';
|
|
2
1
|
import { expand } from './lib/features.js';
|
|
3
2
|
import { verifyRequiredOptions, verifyExtraOptions, createSteppers, setStepperWorldsAndDomains } from './lib/util/index.js';
|
|
4
3
|
import { getSteppers } from './lib/util/workspace-lib.js';
|
|
@@ -13,7 +12,7 @@ export class Runner {
|
|
|
13
12
|
this.world = world;
|
|
14
13
|
}
|
|
15
14
|
errorBail = (phase, error, details) => {
|
|
16
|
-
this.world.logger.error(`errorBail ${phase} ${error} ${details}`, error.stack);
|
|
15
|
+
// this.world.logger.error(`errorBail ${phase} ${error} ${details}`, error.stack);
|
|
17
16
|
this.result = {
|
|
18
17
|
ok: false,
|
|
19
18
|
shared: this.world.shared,
|
|
@@ -27,7 +26,7 @@ export class Runner {
|
|
|
27
26
|
async run(steppers, featureFilter = []) {
|
|
28
27
|
let featuresBackgrounds = undefined;
|
|
29
28
|
try {
|
|
30
|
-
featuresBackgrounds = getFeaturesAndBackgrounds(this.world.bases, featureFilter);
|
|
29
|
+
featuresBackgrounds = await getFeaturesAndBackgrounds(this.world.bases, featureFilter);
|
|
31
30
|
}
|
|
32
31
|
catch (error) {
|
|
33
32
|
this.errorBail('Collector', error);
|
|
@@ -45,11 +44,9 @@ export class Runner {
|
|
|
45
44
|
// Make backgrounds available at runtime for inline `Backgrounds:` expansion
|
|
46
45
|
this.world.runtime.backgrounds = featuresBackgrounds.backgrounds;
|
|
47
46
|
const expandedFeatures = await expand(featuresBackgrounds).catch((error) => this.errorBail('Expand', error));
|
|
48
|
-
const resolver = new Resolver(this.steppers);
|
|
47
|
+
const resolver = new Resolver(this.steppers, featuresBackgrounds.backgrounds);
|
|
49
48
|
const resolvedFeatures = await resolver.resolveStepsFromFeatures(expandedFeatures).catch((error) => this.errorBail('Resolve', error));
|
|
50
|
-
|
|
51
|
-
this.world.logger.log(`features: ${appliedResolvedFeatures.length} (${appliedResolvedFeatures.map((e) => e.path)}) backgrounds: ${featuresBackgrounds.backgrounds.length}`);
|
|
52
|
-
this.result = await Executor.executeFeatures(this.steppers, this.world, appliedResolvedFeatures).catch((error) => this.errorBail('Execute', error));
|
|
49
|
+
this.result = await Executor.executeFeatures(this.steppers, this.world, resolvedFeatures).catch((error) => this.errorBail('Execute', error));
|
|
53
50
|
}
|
|
54
51
|
catch (error) {
|
|
55
52
|
if (!this.result) {
|
package/build/runner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,cAAc,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAC5H,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAwB,MAAM,uBAAuB,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,MAAM,OAAO,MAAM;IAIE;IAHZ,MAAM,GAAoB,SAAS,CAAC;IAC5C,QAAQ,CAAa;IAErB,YAAoB,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;IAAI,CAAC;IAE9B,SAAS,GAAG,CAAC,KAAa,EAAE,KAAgB,EAAE,OAAmB,EAAE,EAAE;QAC5E,kFAAkF;QAClF,IAAI,CAAC,MAAM,GAAG;YACb,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM;YACzB,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG;YACnB,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE;YACtG,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACvB,CAAC;QACF,8BAA8B;QAC9B,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC,CAAC;IAEF,KAAK,CAAC,GAAG,CAAC,QAAkB,EAAE,aAAa,GAAG,EAAE;QAC/C,IAAI,mBAAmB,GAAyB,SAAS,CAAC;QAC1D,IAAI,CAAC;YACJ,mBAAmB,GAAG,MAAM,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QACxF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;QAClG,MAAM,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,CAAC;QAC5H,MAAM,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC;QAEvH,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;QAC5F,OAAO,cAAc,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,SAAqB,EAAE,mBAAyC;QAC/F,IAAI,CAAC;YACJ,IAAI,CAAC,QAAQ,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,CAAC;YAChD,MAAM,0BAA0B,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5D,4EAA4E;YAC5E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,GAAG,mBAAmB,CAAC,WAAW,CAAC;YACjE,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;YAE7G,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,WAAW,CAAC,CAAC;YAC9E,MAAM,gBAAgB,GAAG,MAAM,QAAQ,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;YAEtI,IAAI,CAAC,MAAM,GAAG,MAAM,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CACzG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAChC,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBAClB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAChC,CAAC;QACF,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;CACD"}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { AStepper, TStepperSteps } from '../lib/astepper.js';
|
|
2
|
+
import { TStepArgs, TFeatureStep, TWorld, IStepperCycles, TStepperStep, TFeatures } from '../lib/defs.js';
|
|
3
|
+
type TActivitiesFixedSteps = {
|
|
4
|
+
activity: TStepperStep;
|
|
5
|
+
waypoint: TStepperStep;
|
|
6
|
+
ensure: TStepperStep;
|
|
7
|
+
forget: TStepperStep;
|
|
8
|
+
waypointed: TStepperStep;
|
|
9
|
+
showWaypoints: TStepperStep;
|
|
10
|
+
};
|
|
11
|
+
type TActivitiesStepperSteps = TStepperSteps & TActivitiesFixedSteps;
|
|
12
|
+
/**
|
|
13
|
+
* Stepper that dynamically builds virtual steps from `waypoint` statements.
|
|
14
|
+
* implements this logic: P ∨ (¬P ∧ [A]P)
|
|
15
|
+
*/
|
|
16
|
+
export declare class ActivitiesStepper extends AStepper {
|
|
17
|
+
private steppers;
|
|
18
|
+
private backgroundOutcomePatterns;
|
|
19
|
+
private featureOutcomePatterns;
|
|
20
|
+
private outcomeToFeaturePath;
|
|
21
|
+
private currentFeaturePath;
|
|
22
|
+
private lastFeaturePath;
|
|
23
|
+
private ensuredInstances;
|
|
24
|
+
private readonly baseSteps;
|
|
25
|
+
readonly typedSteps: {
|
|
26
|
+
readonly activity: {
|
|
27
|
+
readonly gwta: "Activity: {activity}";
|
|
28
|
+
readonly action: () => import("../lib/defs.js").TOKActionResult;
|
|
29
|
+
};
|
|
30
|
+
readonly waypoint: {
|
|
31
|
+
readonly gwta: "waypoint {outcome} with {proof:statement}";
|
|
32
|
+
readonly resolveFeatureLine: (line: string, path: string, stepper: AStepper, _backgrounds: TFeatures, allLines?: string[], lineIndex?: number) => boolean;
|
|
33
|
+
readonly action: ({ proof }: {
|
|
34
|
+
proof: TFeatureStep[];
|
|
35
|
+
}, featureStep: TFeatureStep) => Promise<import("../lib/defs.js").TOKActionResult | import("../lib/defs.js").TNotOKActionResult>;
|
|
36
|
+
};
|
|
37
|
+
readonly ensure: {
|
|
38
|
+
readonly description: "Ensure a waypoint condition by always running the proof. If proof passes, waypoint is already satisfied. If proof fails, run the full activity to satisfy it.";
|
|
39
|
+
readonly gwta: "ensure {outcome:statement}";
|
|
40
|
+
readonly action: ({ outcome }: {
|
|
41
|
+
outcome: TFeatureStep[];
|
|
42
|
+
}, featureStep: TFeatureStep) => Promise<import("../lib/defs.js").TOKActionResult | import("../lib/defs.js").TNotOKActionResult>;
|
|
43
|
+
};
|
|
44
|
+
readonly forget: {
|
|
45
|
+
readonly description: "Deprecated: forget is no longer needed since ensure always re-verifies outcomes";
|
|
46
|
+
readonly gwta: "forget {outcome:statement}";
|
|
47
|
+
readonly action: ({ outcome }: {
|
|
48
|
+
outcome: TFeatureStep[];
|
|
49
|
+
}, featureStep: TFeatureStep) => import("../lib/defs.js").TOKActionResult;
|
|
50
|
+
};
|
|
51
|
+
readonly waypointed: {
|
|
52
|
+
readonly description: "Deprecated: waypointed is no longer meaningful since outcomes are not cached";
|
|
53
|
+
readonly gwta: "waypointed {outcome:statement}";
|
|
54
|
+
readonly action: ({ outcome }: {
|
|
55
|
+
outcome: TFeatureStep[];
|
|
56
|
+
}) => import("../lib/defs.js").TOKActionResult;
|
|
57
|
+
};
|
|
58
|
+
readonly showWaypoints: {
|
|
59
|
+
readonly exact: "show waypoints";
|
|
60
|
+
readonly action: (_args: TStepArgs, featureStep: TFeatureStep) => Promise<import("../lib/defs.js").TOKActionResult>;
|
|
61
|
+
};
|
|
62
|
+
};
|
|
63
|
+
steps: TActivitiesStepperSteps;
|
|
64
|
+
cycles: IStepperCycles;
|
|
65
|
+
setWorld(world: TWorld, steppers: AStepper[]): Promise<void>;
|
|
66
|
+
/**
|
|
67
|
+
* Register a dynamic outcome step.
|
|
68
|
+
* This is called when parsing `waypoint` statements.
|
|
69
|
+
*
|
|
70
|
+
* @param outcome - The outcome pattern (e.g., "Is logged in as {user}")
|
|
71
|
+
* @param proofStatements - Array of statement strings from the DOMAIN_STATEMENT proof
|
|
72
|
+
* @param proofPath - The path of the feature containing the proof
|
|
73
|
+
* @param isBackground - Whether this outcome is defined in a background (persists across features)
|
|
74
|
+
* @param activityBlockSteps - Optional array of all steps in the containing activity block
|
|
75
|
+
*/
|
|
76
|
+
registerOutcome(outcome: string, proofStatements: string[], proofPath: string, isBackground?: boolean, activityBlockSteps?: string[]): void;
|
|
77
|
+
}
|
|
78
|
+
export default ActivitiesStepper;
|
|
79
|
+
//# sourceMappingURL=activities-stepper.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"activities-stepper.d.ts","sourceRoot":"","sources":["../../src/steps/activities-stepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAiB,SAAS,EAAE,YAAY,EAAM,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAQ7H,KAAK,qBAAqB,GAAG;IAC5B,QAAQ,EAAE,YAAY,CAAC;IACvB,QAAQ,EAAE,YAAY,CAAC;IACvB,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,YAAY,CAAC;IACrB,UAAU,EAAE,YAAY,CAAC;IACzB,aAAa,EAAE,YAAY,CAAC;CAC5B,CAAC;AAEF,KAAK,uBAAuB,GAAG,aAAa,GAAG,qBAAqB,CAAC;AAErE;;;GAGG;AACH,qBAAa,iBAAkB,SAAQ,QAAQ;IAC9C,OAAO,CAAC,QAAQ,CAAkB;IAElC,OAAO,CAAC,yBAAyB,CAA0B;IAC3D,OAAO,CAAC,sBAAsB,CAA0B;IAExD,OAAO,CAAC,oBAAoB,CAAkC;IAE9D,OAAO,CAAC,kBAAkB,CAAc;IAExC,OAAO,CAAC,eAAe,CAAc;IAErC,OAAO,CAAC,gBAAgB,CAA+D;IAEvF,OAAO,CAAC,QAAQ,CAAC,SAAS,CAwNiB;IAE3C,QAAQ,CAAC,UAAU;;;;;;;gDAlNU,MAAM,QAAQ,MAAM,WAAW,QAAQ,gBAAgB,SAAS,aAAa,MAAM,EAAE,cAAc,MAAM;yCA+D1G;gBAAE,KAAK,EAAE,YAAY,EAAE,CAAA;aAAE,eAAe,YAAY;;;;;2CAiBlD;gBAAE,OAAO,EAAE,YAAY,EAAE,CAAA;aAAE,eAAe,YAAY;;;;;2CAqD5D;gBAAE,OAAO,EAAE,YAAY,EAAE,CAAA;aAAE,eAAe,YAAY;;;;;2CAWtD;gBAAE,OAAO,EAAE,YAAY,EAAE,CAAA;aAAE;;;;6DAWd,YAAY;;MAuDZ;IAErC,KAAK,EAAE,uBAAuB,CAAyB;IAEvD,MAAM,EAAE,cAAc,CA8BrB;IACK,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE;IAKlD;;;;;;;;;OASG;IACH,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,EAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE;CAkHpI;AAED,eAAe,iBAAiB,CAAC"}
|
|
@@ -0,0 +1,342 @@
|
|
|
1
|
+
import { AStepper } from '../lib/astepper.js';
|
|
2
|
+
import { OK } from '../lib/defs.js';
|
|
3
|
+
import { executeSubFeatureSteps, findFeatureStepsFromStatement } from '../lib/util/featureStep-executor.js';
|
|
4
|
+
import { ExecMode } from '../lib/defs.js';
|
|
5
|
+
import { actionOK, actionNotOK, getActionable } from '../lib/util/index.js';
|
|
6
|
+
import { DOMAIN_STATEMENT } from '../lib/domain-types.js';
|
|
7
|
+
import { EExecutionMessageType } from '../lib/interfaces/logger.js';
|
|
8
|
+
/**
|
|
9
|
+
* Stepper that dynamically builds virtual steps from `waypoint` statements.
|
|
10
|
+
* implements this logic: P ∨ (¬P ∧ [A]P)
|
|
11
|
+
*/
|
|
12
|
+
export class ActivitiesStepper extends AStepper {
|
|
13
|
+
steppers = [];
|
|
14
|
+
// Track which outcome patterns were defined in backgrounds vs features
|
|
15
|
+
backgroundOutcomePatterns = new Set();
|
|
16
|
+
featureOutcomePatterns = new Set();
|
|
17
|
+
// Track which feature each feature-scoped outcome belongs to (for proper cleanup)
|
|
18
|
+
outcomeToFeaturePath = new Map();
|
|
19
|
+
// Track the currently running feature path
|
|
20
|
+
currentFeaturePath = '';
|
|
21
|
+
// Track the last feature path to clear outcomes from it when starting a new feature
|
|
22
|
+
lastFeaturePath = '';
|
|
23
|
+
// Track ensured waypoint instances with their interpolated proofs
|
|
24
|
+
ensuredInstances = new Map();
|
|
25
|
+
baseSteps = {
|
|
26
|
+
activity: {
|
|
27
|
+
gwta: 'Activity: {activity}',
|
|
28
|
+
action: () => OK
|
|
29
|
+
},
|
|
30
|
+
waypoint: {
|
|
31
|
+
gwta: `waypoint {outcome} with {proof:${DOMAIN_STATEMENT}}`,
|
|
32
|
+
resolveFeatureLine: (line, path, stepper, _backgrounds, allLines, lineIndex) => {
|
|
33
|
+
// Simple regex match to check if this is a waypoint statement
|
|
34
|
+
if (!line.match(/^waypoint\s+.+?\s+with\s+/i)) {
|
|
35
|
+
return false;
|
|
36
|
+
}
|
|
37
|
+
const activitiesStepper = stepper;
|
|
38
|
+
// Extract outcome name
|
|
39
|
+
const match = line.match(/^waypoint\s+(.+?)\s+with\s+(.+?)$/i);
|
|
40
|
+
if (!match) {
|
|
41
|
+
return false;
|
|
42
|
+
}
|
|
43
|
+
const outcome = match[1].trim();
|
|
44
|
+
// Skip if this outcome pattern is already registered
|
|
45
|
+
// This prevents infinite loops if resolveFeatureLine is called multiple times
|
|
46
|
+
if (activitiesStepper.backgroundOutcomePatterns.has(outcome) || activitiesStepper.featureOutcomePatterns.has(outcome)) {
|
|
47
|
+
return true;
|
|
48
|
+
}
|
|
49
|
+
const isBackground = path.includes('backgrounds/');
|
|
50
|
+
const proofRaw = match[2].trim();
|
|
51
|
+
// Parse the proof statements from the waypoint clause (DOMAIN_STATEMENT)
|
|
52
|
+
const proofFromRemember = proofRaw.split('\n').map(s => s.trim()).filter(s => s.length > 0);
|
|
53
|
+
// Check if we're in an activity block by scanning backwards through allLines
|
|
54
|
+
let activityBlockSteps;
|
|
55
|
+
if (allLines && lineIndex !== undefined) {
|
|
56
|
+
// Scan backwards from current line to find the Activity: marker
|
|
57
|
+
let activityStartLine = -1;
|
|
58
|
+
for (let i = lineIndex - 1; i >= 0; i--) {
|
|
59
|
+
const prevLine = getActionable(allLines[i]);
|
|
60
|
+
if (prevLine.match(/^Activity:/i)) {
|
|
61
|
+
activityStartLine = i;
|
|
62
|
+
break;
|
|
63
|
+
}
|
|
64
|
+
// Stop if we hit another major section marker
|
|
65
|
+
if (prevLine.match(/^(Feature|Scenario|Background):/i)) {
|
|
66
|
+
break;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
if (activityStartLine !== -1) {
|
|
70
|
+
// Collect ALL steps in the activity block up to and including the current waypoint statement
|
|
71
|
+
const blockLines = [];
|
|
72
|
+
for (let i = activityStartLine + 1; i < lineIndex; i++) { // Use < instead of <= to exclude waypoint line
|
|
73
|
+
const stepLine = getActionable(allLines[i]);
|
|
74
|
+
if (stepLine) {
|
|
75
|
+
blockLines.push(stepLine);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
activityBlockSteps = blockLines;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
// Register the outcome with its proof from the DOMAIN_STATEMENT
|
|
82
|
+
activitiesStepper.registerOutcome(outcome, proofFromRemember, path, isBackground, activityBlockSteps);
|
|
83
|
+
return true; // Skip normal step resolution since we've registered the outcome
|
|
84
|
+
},
|
|
85
|
+
action: async ({ proof }, featureStep) => {
|
|
86
|
+
// Execute the proof statements to satisfy this outcome
|
|
87
|
+
this.getWorld().logger.debug(`waypoint action: executing ${proof?.length || 0} proof steps`);
|
|
88
|
+
const result = await executeSubFeatureSteps(featureStep, proof, this.steppers, this.getWorld(), ExecMode.NO_CYCLES);
|
|
89
|
+
if (!result.ok) {
|
|
90
|
+
return actionNotOK(`waypoint: failed to execute proof steps`);
|
|
91
|
+
}
|
|
92
|
+
return actionOK();
|
|
93
|
+
},
|
|
94
|
+
},
|
|
95
|
+
ensure: {
|
|
96
|
+
description: 'Ensure a waypoint condition by always running the proof. If proof passes, waypoint is already satisfied. If proof fails, run the full activity to satisfy it.',
|
|
97
|
+
gwta: `ensure {outcome:${DOMAIN_STATEMENT}}`,
|
|
98
|
+
action: async ({ outcome }, featureStep) => {
|
|
99
|
+
// Build outcome key from the resolved outcome steps
|
|
100
|
+
const outcomeKey = outcome.map(step => step.in).join(' ');
|
|
101
|
+
this.getWorld().logger.debug(`ensure: verifying waypoint "${outcomeKey}"`);
|
|
102
|
+
// Get the pattern from the first outcome step's action
|
|
103
|
+
const pattern = outcome[0]?.action?.actionName || outcomeKey;
|
|
104
|
+
// Get the registered waypoint to access its proof
|
|
105
|
+
const registeredWaypoint = this.steps[pattern];
|
|
106
|
+
if (!registeredWaypoint) {
|
|
107
|
+
const messageContext = {
|
|
108
|
+
incident: EExecutionMessageType.ACTION,
|
|
109
|
+
incidentDetails: { waypoint: outcomeKey, error: 'waypoint not registered' }
|
|
110
|
+
};
|
|
111
|
+
return actionNotOK(`ensure: waypoint "${outcomeKey}" (pattern "${pattern}") is not registered`, { messageContext });
|
|
112
|
+
}
|
|
113
|
+
// Always execute the full waypoint (which includes the proof verification)
|
|
114
|
+
const result = await executeSubFeatureSteps(featureStep, outcome, this.steppers, this.getWorld(), ExecMode.NO_CYCLES);
|
|
115
|
+
if (!result.ok) {
|
|
116
|
+
const messageContext = {
|
|
117
|
+
incident: EExecutionMessageType.ACTION,
|
|
118
|
+
incidentDetails: { waypoint: outcomeKey, satisfied: false, error: result }
|
|
119
|
+
};
|
|
120
|
+
return actionNotOK(`ensure: waypoint "${outcomeKey}" could not be satisfied`, { messageContext });
|
|
121
|
+
}
|
|
122
|
+
// Extract the interpolated proof statements from the result
|
|
123
|
+
const proofStatements = result.stepActionResult?.messageContext?.incidentDetails?.proofStatements;
|
|
124
|
+
// Track this ensured instance
|
|
125
|
+
if (proofStatements) {
|
|
126
|
+
this.ensuredInstances.set(outcomeKey, { proof: proofStatements, valid: true });
|
|
127
|
+
}
|
|
128
|
+
this.getWorld().logger.debug(`ensure: waypoint "${outcomeKey}" verified and satisfied`);
|
|
129
|
+
const messageContext = {
|
|
130
|
+
incident: EExecutionMessageType.ACTION,
|
|
131
|
+
incidentDetails: {
|
|
132
|
+
waypoint: outcomeKey,
|
|
133
|
+
satisfied: true,
|
|
134
|
+
proofStatements
|
|
135
|
+
}
|
|
136
|
+
};
|
|
137
|
+
return actionOK({ messageContext });
|
|
138
|
+
},
|
|
139
|
+
},
|
|
140
|
+
forget: {
|
|
141
|
+
description: 'Deprecated: forget is no longer needed since ensure always re-verifies outcomes',
|
|
142
|
+
gwta: `forget {outcome:${DOMAIN_STATEMENT}}`,
|
|
143
|
+
action: ({ outcome }, featureStep) => {
|
|
144
|
+
const outcomeKey = outcome.map(step => step.in).join(' ');
|
|
145
|
+
this.getWorld().logger.debug(`forget: deprecated no-op for outcome "${outcomeKey}" (from ${featureStep.in}). Outcomes are no longer cached, so forget is unnecessary.`);
|
|
146
|
+
const messageContext = { incident: EExecutionMessageType.ACTION, incidentDetails: { outcome: outcomeKey, deprecated: true } };
|
|
147
|
+
return actionOK({ messageContext });
|
|
148
|
+
},
|
|
149
|
+
},
|
|
150
|
+
waypointed: {
|
|
151
|
+
description: 'Deprecated: waypointed is no longer meaningful since outcomes are not cached',
|
|
152
|
+
gwta: `waypointed {outcome:${DOMAIN_STATEMENT}}`,
|
|
153
|
+
action: ({ outcome }) => {
|
|
154
|
+
const outcomeKey = outcome.map(step => step.in).join(' ');
|
|
155
|
+
this.getWorld().logger.debug(`waypointed: deprecated for outcome "${outcomeKey}". Outcomes are verified on each ensure, not cached.`);
|
|
156
|
+
const messageContext = { incident: EExecutionMessageType.ACTION, incidentDetails: { outcome: outcomeKey, deprecated: true } };
|
|
157
|
+
return actionOK({ messageContext });
|
|
158
|
+
},
|
|
159
|
+
},
|
|
160
|
+
showWaypoints: {
|
|
161
|
+
exact: 'show waypoints',
|
|
162
|
+
action: async (_args, featureStep) => {
|
|
163
|
+
// Show ensured waypoint instances with their current validity
|
|
164
|
+
const waypointResults = {};
|
|
165
|
+
// Check validity of all ensured instances
|
|
166
|
+
for (const [instanceKey, instanceData] of this.ensuredInstances.entries()) {
|
|
167
|
+
this.getWorld().logger.debug(`show waypoints: verifying "${instanceKey}"`);
|
|
168
|
+
try {
|
|
169
|
+
// Re-verify the proof for this instance
|
|
170
|
+
const resolvedSteps = [];
|
|
171
|
+
for (let i = 0; i < instanceData.proof.length; i++) {
|
|
172
|
+
const statement = instanceData.proof[i];
|
|
173
|
+
const resolved = findFeatureStepsFromStatement(statement, this.steppers, this.getWorld(), featureStep.path, [...featureStep.seqPath, i], 1);
|
|
174
|
+
// Add waypoint context to each proof step
|
|
175
|
+
const contextualizedSteps = resolved.map(step => ({
|
|
176
|
+
...step,
|
|
177
|
+
in: `[${instanceKey} proof] ${step.in}`
|
|
178
|
+
}));
|
|
179
|
+
resolvedSteps.push(...contextualizedSteps);
|
|
180
|
+
}
|
|
181
|
+
// Execute the proof statements with NO_CYCLES to check current validity
|
|
182
|
+
const result = await executeSubFeatureSteps(featureStep, resolvedSteps, this.steppers, this.getWorld(), ExecMode.NO_CYCLES);
|
|
183
|
+
waypointResults[instanceKey] = {
|
|
184
|
+
proof: instanceData.proof.join('; '),
|
|
185
|
+
currentlyValid: result.ok
|
|
186
|
+
};
|
|
187
|
+
}
|
|
188
|
+
catch (error) {
|
|
189
|
+
waypointResults[instanceKey] = {
|
|
190
|
+
proof: instanceData.proof.join('; '),
|
|
191
|
+
currentlyValid: false,
|
|
192
|
+
error: error instanceof Error ? error.message : String(error)
|
|
193
|
+
};
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
this.getWorld().logger.info(`Waypoints (${Object.keys(waypointResults).length} ensured):\n${JSON.stringify(waypointResults, null, 2)}`);
|
|
197
|
+
return actionOK({ messageContext: { incident: EExecutionMessageType.ACTION, incidentDetails: { waypoints: waypointResults } } });
|
|
198
|
+
},
|
|
199
|
+
},
|
|
200
|
+
};
|
|
201
|
+
typedSteps = this.baseSteps;
|
|
202
|
+
steps = { ...this.baseSteps };
|
|
203
|
+
cycles = {
|
|
204
|
+
startFeature: (startFeature) => {
|
|
205
|
+
this.getWorld().logger.info(`ActivitiesStepper.startFeature: starting feature at path "${startFeature.resolvedFeature.path}"`);
|
|
206
|
+
// If we were running a different feature before, clear its outcomes
|
|
207
|
+
if (this.lastFeaturePath && this.lastFeaturePath !== startFeature.resolvedFeature.path) {
|
|
208
|
+
this.getWorld().logger.info(`ActivitiesStepper.startFeature: clearing outcomes from previous feature "${this.lastFeaturePath}"`);
|
|
209
|
+
const outcomesToClear = [];
|
|
210
|
+
for (const [outcome, featurePath] of this.outcomeToFeaturePath.entries()) {
|
|
211
|
+
if (featurePath === this.lastFeaturePath) {
|
|
212
|
+
outcomesToClear.push(outcome);
|
|
213
|
+
delete this.steps[outcome];
|
|
214
|
+
this.featureOutcomePatterns.delete(outcome);
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
for (const outcome of outcomesToClear) {
|
|
218
|
+
this.outcomeToFeaturePath.delete(outcome);
|
|
219
|
+
}
|
|
220
|
+
this.getWorld().logger.info(`ActivitiesStepper.startFeature: cleared ${outcomesToClear.length} outcomes from previous feature`);
|
|
221
|
+
}
|
|
222
|
+
this.currentFeaturePath = startFeature.resolvedFeature.path;
|
|
223
|
+
},
|
|
224
|
+
endFeature: async () => {
|
|
225
|
+
// Track this feature path so we can clean it up when the next feature starts
|
|
226
|
+
this.lastFeaturePath = this.currentFeaturePath;
|
|
227
|
+
// Clear ensured instances for next feature
|
|
228
|
+
this.ensuredInstances.clear();
|
|
229
|
+
return Promise.resolve();
|
|
230
|
+
}
|
|
231
|
+
};
|
|
232
|
+
async setWorld(world, steppers) {
|
|
233
|
+
await super.setWorld(world, steppers);
|
|
234
|
+
this.steppers = steppers;
|
|
235
|
+
}
|
|
236
|
+
/**
|
|
237
|
+
* Register a dynamic outcome step.
|
|
238
|
+
* This is called when parsing `waypoint` statements.
|
|
239
|
+
*
|
|
240
|
+
* @param outcome - The outcome pattern (e.g., "Is logged in as {user}")
|
|
241
|
+
* @param proofStatements - Array of statement strings from the DOMAIN_STATEMENT proof
|
|
242
|
+
* @param proofPath - The path of the feature containing the proof
|
|
243
|
+
* @param isBackground - Whether this outcome is defined in a background (persists across features)
|
|
244
|
+
* @param activityBlockSteps - Optional array of all steps in the containing activity block
|
|
245
|
+
*/
|
|
246
|
+
registerOutcome(outcome, proofStatements, proofPath, isBackground, activityBlockSteps) {
|
|
247
|
+
// Prevent duplicate outcome registration
|
|
248
|
+
if (this.steps[outcome]) {
|
|
249
|
+
throw new Error(`Outcome "${outcome}" is already registered. Each outcome can only be defined once.`);
|
|
250
|
+
}
|
|
251
|
+
// Track whether this is a background or feature outcome
|
|
252
|
+
if (isBackground) {
|
|
253
|
+
this.backgroundOutcomePatterns.add(outcome);
|
|
254
|
+
}
|
|
255
|
+
else {
|
|
256
|
+
this.featureOutcomePatterns.add(outcome);
|
|
257
|
+
// Track which feature this outcome belongs to
|
|
258
|
+
this.outcomeToFeaturePath.set(outcome, proofPath);
|
|
259
|
+
}
|
|
260
|
+
this.getWorld().logger.info(`ActivitiesStepper: registerOutcome called with ${proofStatements.length} proof steps for "${outcome}"`);
|
|
261
|
+
this.getWorld().logger.info(`ActivitiesStepper: outcome is background=${isBackground}, will be added to ${isBackground ? 'backgroundOutcomePatterns' : 'featureOutcomePatterns'}`);
|
|
262
|
+
// Store proofStatements for later retrieval
|
|
263
|
+
const outcomeProofStatements = proofStatements;
|
|
264
|
+
this.steps[outcome] = {
|
|
265
|
+
gwta: outcome,
|
|
266
|
+
virtual: true, // Dynamically registered outcomes are virtual
|
|
267
|
+
description: `Outcome: ${outcome}. Proof: ${proofStatements.join('; ')}`,
|
|
268
|
+
action: async (args, featureStep) => {
|
|
269
|
+
this.getWorld().logger.debug(`ActivitiesStepper: executing recipe for outcome "${outcome}" with args ${JSON.stringify(args)}`);
|
|
270
|
+
// Helper to expand variables in statements
|
|
271
|
+
const expandStatements = (statements) => statements.map(statement => {
|
|
272
|
+
let expanded = statement;
|
|
273
|
+
for (const [key, value] of Object.entries(args)) {
|
|
274
|
+
expanded = expanded.replace(new RegExp(`\\{${key}\\}`, 'g'), String(value));
|
|
275
|
+
}
|
|
276
|
+
return expanded;
|
|
277
|
+
});
|
|
278
|
+
// Helper to resolve and execute statements
|
|
279
|
+
const resolveAndExecute = async (statements, stepOffset = 0, execMode = ExecMode.NO_CYCLES) => {
|
|
280
|
+
const expandedStatements = expandStatements(statements);
|
|
281
|
+
const resolvedSteps = [];
|
|
282
|
+
for (let i = 0; i < expandedStatements.length; i++) {
|
|
283
|
+
const statement = expandedStatements[i];
|
|
284
|
+
this.getWorld().logger.debug(`ActivitiesStepper: resolving statement ${i}: "${statement}"`);
|
|
285
|
+
const resolved = findFeatureStepsFromStatement(statement, this.steppers, this.getWorld(), proofPath, [...featureStep.seqPath, stepOffset + i], 1);
|
|
286
|
+
resolvedSteps.push(...resolved);
|
|
287
|
+
}
|
|
288
|
+
return await executeSubFeatureSteps(featureStep, resolvedSteps, this.steppers, this.getWorld(), execMode);
|
|
289
|
+
};
|
|
290
|
+
// ALWAYS-VERIFY SEMANTICS: Try proof first
|
|
291
|
+
// Use NO_CYCLES for proof checking to avoid triggering hooks
|
|
292
|
+
this.getWorld().logger.debug(`ActivitiesStepper: checking proof for outcome "${outcome}"`);
|
|
293
|
+
this.getWorld().logger.debug(`ActivitiesStepper: proof statements: ${JSON.stringify(proofStatements)}`);
|
|
294
|
+
const proofResult = await resolveAndExecute(proofStatements, 0, ExecMode.NO_CYCLES);
|
|
295
|
+
// If proof passes, we're done (waypoint already satisfied)
|
|
296
|
+
if (proofResult.ok) {
|
|
297
|
+
this.getWorld().logger.debug(`ActivitiesStepper: proof passed for outcome "${outcome}", skipping activity body`);
|
|
298
|
+
const interpolatedProof = expandStatements(outcomeProofStatements);
|
|
299
|
+
return actionOK({
|
|
300
|
+
messageContext: {
|
|
301
|
+
incident: EExecutionMessageType.ACTION,
|
|
302
|
+
incidentDetails: { proofStatements: interpolatedProof, proofSatisfied: true }
|
|
303
|
+
}
|
|
304
|
+
});
|
|
305
|
+
}
|
|
306
|
+
// Proof failed - execute activity body (WITHOUT waypoint line), then verify proof
|
|
307
|
+
// Flow: 1) Execute activity body steps, 2) Execute proof to verify, 3) Success or fail
|
|
308
|
+
if (activityBlockSteps && activityBlockSteps.length > 0) {
|
|
309
|
+
this.getWorld().logger.debug(`ActivitiesStepper: proof failed for outcome "${outcome}", running activity body`);
|
|
310
|
+
// Step 1: Execute activity body (does NOT include the waypoint line to avoid recursion)
|
|
311
|
+
// Use WITH_CYCLES so that activity body steps can trigger hooks
|
|
312
|
+
const activityResult = await resolveAndExecute(activityBlockSteps, 100, ExecMode.WITH_CYCLES);
|
|
313
|
+
if (!activityResult.ok) {
|
|
314
|
+
return actionNotOK(`ActivitiesStepper: activity body failed for outcome "${outcome}"`);
|
|
315
|
+
}
|
|
316
|
+
// Step 2: Activity body succeeded - now verify the proof passes
|
|
317
|
+
// Use NO_CYCLES for proof verification to avoid triggering hooks
|
|
318
|
+
this.getWorld().logger.debug(`ActivitiesStepper: verifying proof after activity body for outcome "${outcome}"`);
|
|
319
|
+
const verifyResult = await resolveAndExecute(proofStatements, 200, ExecMode.NO_CYCLES);
|
|
320
|
+
if (!verifyResult.ok) {
|
|
321
|
+
return actionNotOK(`ActivitiesStepper: proof verification failed after activity body for outcome "${outcome}"`);
|
|
322
|
+
}
|
|
323
|
+
// Step 3: Success - proof now passes
|
|
324
|
+
const interpolatedProof = expandStatements(outcomeProofStatements);
|
|
325
|
+
return actionOK({
|
|
326
|
+
messageContext: {
|
|
327
|
+
incident: EExecutionMessageType.ACTION,
|
|
328
|
+
incidentDetails: { proofStatements: interpolatedProof }
|
|
329
|
+
}
|
|
330
|
+
});
|
|
331
|
+
}
|
|
332
|
+
else {
|
|
333
|
+
// No activity body, just proof - and it failed
|
|
334
|
+
return actionNotOK(`ActivitiesStepper: proof failed and no activity body available for outcome "${outcome}"`);
|
|
335
|
+
}
|
|
336
|
+
}
|
|
337
|
+
};
|
|
338
|
+
this.getWorld().logger.info(`ActivitiesStepper: registered outcome pattern "${outcome}" with ${proofStatements.length} proof steps`);
|
|
339
|
+
}
|
|
340
|
+
}
|
|
341
|
+
export default ActivitiesStepper;
|
|
342
|
+
//# sourceMappingURL=activities-stepper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"activities-stepper.js","sourceRoot":"","sources":["../../src/steps/activities-stepper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { AStepper } from '../lib/astepper.js';
|
|
2
|
+
import { TStepperSteps } from '../lib/astepper.js';
|
|
3
|
+
/**
|
|
4
|
+
* Virtual stepper that dynamically builds steps from `remember` statements.
|
|
5
|
+
* During pre-Resolve phase, this stepper is populated with conditions
|
|
6
|
+
* extracted from all `remember {condition} with {proof}` statements in features.
|
|
7
|
+
*
|
|
8
|
+
* When `ensure {condition}` is called, it will match against these conditions via
|
|
9
|
+
* normal GWTA resolution, check if already cached, and execute the recipe if needed.
|
|
10
|
+
*/
|
|
11
|
+
export declare class ConditionsStepper extends AStepper {
|
|
12
|
+
steps: TStepperSteps;
|
|
13
|
+
steppers: AStepper[];
|
|
14
|
+
forgetsMap: Record<string, string[]>;
|
|
15
|
+
/**
|
|
16
|
+
* Register a condition with its proof steps.
|
|
17
|
+
* This is called when parsing `remember` statements.
|
|
18
|
+
*
|
|
19
|
+
* @param condition - The condition (e.g., "Is logged in as {user}")
|
|
20
|
+
* @param proofStatements - Array of statement strings that prove this condition
|
|
21
|
+
* @param proofPath - The path of the feature containing the proof
|
|
22
|
+
* @param forgets - Optional condition that this condition forgets
|
|
23
|
+
*/
|
|
24
|
+
registerCondition(condition: string, proofStatements: string[], proofPath: string, forgets?: string): void;
|
|
25
|
+
}
|
|
26
|
+
export default ConditionsStepper;
|
|
27
|
+
//# sourceMappingURL=conditions-stepper.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conditions-stepper.d.ts","sourceRoot":"","sources":["../../src/steps/conditions-stepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAMnD;;;;;;;GAOG;AACH,qBAAa,iBAAkB,SAAQ,QAAQ;IAC7C,KAAK,EAAE,aAAa,CAAM;IAC1B,QAAQ,EAAE,QAAQ,EAAE,CAAM;IAG1B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAM;IAE1C;;;;;;;;OAQG;IACH,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;CA0FpG;AAED,eAAe,iBAAiB,CAAC"}
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import { AStepper } from '../lib/astepper.js';
|
|
2
|
+
import { executeSubFeatureSteps, findFeatureStepsFromStatement } from '../lib/util/featureStep-executor.js';
|
|
3
|
+
import { ExecMode } from '../lib/defs.js';
|
|
4
|
+
import { actionOK, actionNotOK } from '../lib/util/index.js';
|
|
5
|
+
/**
|
|
6
|
+
* Virtual stepper that dynamically builds steps from `remember` statements.
|
|
7
|
+
* During pre-Resolve phase, this stepper is populated with conditions
|
|
8
|
+
* extracted from all `remember {condition} with {proof}` statements in features.
|
|
9
|
+
*
|
|
10
|
+
* When `ensure {condition}` is called, it will match against these conditions via
|
|
11
|
+
* normal GWTA resolution, check if already cached, and execute the recipe if needed.
|
|
12
|
+
*/
|
|
13
|
+
export class ConditionsStepper extends AStepper {
|
|
14
|
+
steps = {};
|
|
15
|
+
steppers = [];
|
|
16
|
+
// Track which conditions cause other conditions to be forgotten
|
|
17
|
+
// Key: condition, Value: array of conditions to forget
|
|
18
|
+
forgetsMap = {};
|
|
19
|
+
/**
|
|
20
|
+
* Register a condition with its proof steps.
|
|
21
|
+
* This is called when parsing `remember` statements.
|
|
22
|
+
*
|
|
23
|
+
* @param condition - The condition (e.g., "Is logged in as {user}")
|
|
24
|
+
* @param proofStatements - Array of statement strings that prove this condition
|
|
25
|
+
* @param proofPath - The path of the feature containing the proof
|
|
26
|
+
* @param forgets - Optional condition that this condition forgets
|
|
27
|
+
*/
|
|
28
|
+
registerCondition(condition, proofStatements, proofPath, forgets) {
|
|
29
|
+
// Prevent duplicate condition registration
|
|
30
|
+
if (this.steps[condition]) {
|
|
31
|
+
throw new Error(`Condition "${condition}" is already registered. Each condition can only be defined once.`);
|
|
32
|
+
}
|
|
33
|
+
// Store forgets relationship if provided
|
|
34
|
+
if (forgets) {
|
|
35
|
+
this.forgetsMap[condition] = [forgets];
|
|
36
|
+
}
|
|
37
|
+
this.getWorld().logger.info(`ConditionsStepper: registerCondition called with ${proofStatements.length} steps for "${condition}"`);
|
|
38
|
+
this.steps[condition] = {
|
|
39
|
+
gwta: condition,
|
|
40
|
+
description: `Condition: ${condition}. Proof: ${proofStatements.join('; ')}`,
|
|
41
|
+
action: async (args, featureStep) => {
|
|
42
|
+
this.getWorld().logger.debug(`ConditionsStepper: executing recipe for condition "${condition}" with args ${JSON.stringify(args)}`);
|
|
43
|
+
// If this condition forgets other conditions, handle that first
|
|
44
|
+
if (this.forgetsMap[condition]) {
|
|
45
|
+
const satisfied = this.getWorld().runtime.satisfiedConditions;
|
|
46
|
+
for (const forgottenCondition of this.forgetsMap[condition]) {
|
|
47
|
+
// Build the forgotten key the same way ensure builds it: from resolved step.in
|
|
48
|
+
// We need to resolve the forgotten condition with the same args
|
|
49
|
+
let forgottenKey = forgottenCondition;
|
|
50
|
+
// Replace placeholders with their values as they appear in featureStep.in
|
|
51
|
+
// The args values already have quotes if they were quoted in the input
|
|
52
|
+
for (const [key, value] of Object.entries(args)) {
|
|
53
|
+
// Need to add quotes back since args are unquoted
|
|
54
|
+
const quotedValue = typeof value === 'string' ? `"${value}"` : String(value);
|
|
55
|
+
forgottenKey = forgottenKey.replace(new RegExp(`\\{${key}\\}`, 'g'), quotedValue);
|
|
56
|
+
}
|
|
57
|
+
// Delete the matching cache entry
|
|
58
|
+
if (satisfied[forgottenKey]) {
|
|
59
|
+
delete satisfied[forgottenKey];
|
|
60
|
+
this.getWorld().logger.debug(`ConditionsStepper: auto-forgot "${forgottenKey}" due to forgets clause`);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
// Expand variables in proof statements using the matched args
|
|
65
|
+
const expandedProofStatements = proofStatements.map(statement => {
|
|
66
|
+
let expanded = statement;
|
|
67
|
+
for (const [key, value] of Object.entries(args)) {
|
|
68
|
+
expanded = expanded.replace(new RegExp(`\\{${key}\\}`, 'g'), String(value));
|
|
69
|
+
}
|
|
70
|
+
return expanded;
|
|
71
|
+
});
|
|
72
|
+
// Re-resolve the proof statements in the current execution context
|
|
73
|
+
const resolvedProofSteps = [];
|
|
74
|
+
for (let i = 0; i < expandedProofStatements.length; i++) {
|
|
75
|
+
const statement = expandedProofStatements[i];
|
|
76
|
+
this.getWorld().logger.debug(`ConditionsStepper: resolving proof statement ${i}: "${statement}"`);
|
|
77
|
+
const resolved = findFeatureStepsFromStatement(statement, this.steppers, this.world, proofPath, [...featureStep.seqPath, i], 1);
|
|
78
|
+
resolvedProofSteps.push(...resolved);
|
|
79
|
+
}
|
|
80
|
+
// Execute the re-resolved proof steps
|
|
81
|
+
const result = await executeSubFeatureSteps(featureStep, resolvedProofSteps, this.steppers, this.getWorld(), ExecMode.WITH_CYCLES);
|
|
82
|
+
if (!result.ok) {
|
|
83
|
+
return actionNotOK(`ConditionsStepper: failed to satisfy condition "${condition}"`);
|
|
84
|
+
}
|
|
85
|
+
// Cache the satisfied condition with provenance
|
|
86
|
+
const conditionKey = featureStep.in;
|
|
87
|
+
this.getWorld().runtime.satisfiedConditions[conditionKey] = {
|
|
88
|
+
seqPath: featureStep.seqPath,
|
|
89
|
+
proof: expandedProofStatements
|
|
90
|
+
};
|
|
91
|
+
this.getWorld().logger.debug(`ConditionsStepper: cached condition "${conditionKey}" at ${JSON.stringify(featureStep.seqPath)}`);
|
|
92
|
+
return actionOK();
|
|
93
|
+
}
|
|
94
|
+
};
|
|
95
|
+
this.getWorld().logger.info(`ConditionsStepper: registered condition "${condition}" with ${proofStatements.length} proof steps`);
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
export default ConditionsStepper;
|
|
99
|
+
//# sourceMappingURL=conditions-stepper.js.map
|