@haibun/core 3.0.5 → 3.1.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.
Files changed (206) hide show
  1. package/build/currentVersion.d.ts +1 -1
  2. package/build/currentVersion.js +1 -1
  3. package/build/lib/EventLogger.d.ts +22 -0
  4. package/build/lib/EventLogger.d.ts.map +1 -0
  5. package/build/lib/EventLogger.js +95 -0
  6. package/build/lib/EventLogger.js.map +1 -0
  7. package/build/lib/astepper.d.ts +9 -0
  8. package/build/lib/astepper.d.ts.map +1 -1
  9. package/build/lib/astepper.js +8 -0
  10. package/build/lib/astepper.js.map +1 -1
  11. package/build/lib/core/flow-runner.d.ts +25 -0
  12. package/build/lib/core/flow-runner.d.ts.map +1 -0
  13. package/build/lib/core/flow-runner.js +128 -0
  14. package/build/lib/core/flow-runner.js.map +1 -0
  15. package/build/lib/core/protocol.d.ts +58 -0
  16. package/build/lib/core/protocol.d.ts.map +1 -0
  17. package/build/lib/core/protocol.js +18 -0
  18. package/build/lib/core/protocol.js.map +1 -0
  19. package/build/lib/core-domains.d.ts +2 -16
  20. package/build/lib/core-domains.d.ts.map +1 -1
  21. package/build/lib/core-domains.js +46 -27
  22. package/build/lib/core-domains.js.map +1 -1
  23. package/build/lib/defs.d.ts +31 -6
  24. package/build/lib/defs.d.ts.map +1 -1
  25. package/build/lib/defs.js +1 -1
  26. package/build/lib/defs.js.map +1 -1
  27. package/build/lib/domain-types.d.ts +12 -1
  28. package/build/lib/domain-types.d.ts.map +1 -1
  29. package/build/lib/domain-types.js +63 -3
  30. package/build/lib/domain-types.js.map +1 -1
  31. package/build/lib/event-bridge.d.ts +28 -0
  32. package/build/lib/event-bridge.d.ts.map +1 -0
  33. package/build/lib/event-bridge.js +114 -0
  34. package/build/lib/event-bridge.js.map +1 -0
  35. package/build/lib/feature-variables.d.ts +13 -0
  36. package/build/lib/feature-variables.d.ts.map +1 -1
  37. package/build/lib/feature-variables.js +125 -6
  38. package/build/lib/feature-variables.js.map +1 -1
  39. package/build/lib/namedVars.d.ts.map +1 -1
  40. package/build/lib/namedVars.js +18 -10
  41. package/build/lib/namedVars.js.map +1 -1
  42. package/build/lib/populateActionArgs.d.ts +1 -1
  43. package/build/lib/populateActionArgs.d.ts.map +1 -1
  44. package/build/lib/populateActionArgs.js +11 -49
  45. package/build/lib/populateActionArgs.js.map +1 -1
  46. package/build/lib/test/TestSteps.d.ts +1 -0
  47. package/build/lib/test/TestSteps.d.ts.map +1 -1
  48. package/build/lib/test/TestStepsWithOptions.d.ts +1 -0
  49. package/build/lib/test/TestStepsWithOptions.d.ts.map +1 -1
  50. package/build/lib/test/lib.d.ts.map +1 -1
  51. package/build/lib/test/lib.js +2 -0
  52. package/build/lib/test/lib.js.map +1 -1
  53. package/build/lib/util/actualURI.js +1 -1
  54. package/build/lib/util/actualURI.js.map +1 -1
  55. package/build/lib/util/index.d.ts +11 -2
  56. package/build/lib/util/index.d.ts.map +1 -1
  57. package/build/lib/util/index.js +46 -2
  58. package/build/lib/util/index.js.map +1 -1
  59. package/build/lib/util/variables.d.ts +9 -0
  60. package/build/lib/util/variables.d.ts.map +1 -0
  61. package/build/lib/util/variables.js +40 -0
  62. package/build/lib/util/variables.js.map +1 -0
  63. package/build/lib/util/workspace-lib.d.ts.map +1 -1
  64. package/build/lib/util/workspace-lib.js +30 -3
  65. package/build/lib/util/workspace-lib.js.map +1 -1
  66. package/build/monitor/browser-stubs.d.ts +12 -0
  67. package/build/monitor/browser-stubs.d.ts.map +1 -0
  68. package/build/monitor/browser-stubs.js +20 -0
  69. package/build/monitor/browser-stubs.js.map +1 -0
  70. package/build/monitor/constants.d.ts +9 -0
  71. package/build/monitor/constants.d.ts.map +1 -0
  72. package/build/monitor/constants.js +9 -0
  73. package/build/monitor/constants.js.map +1 -0
  74. package/build/monitor/event-view.d.ts +40 -0
  75. package/build/monitor/event-view.d.ts.map +1 -0
  76. package/build/monitor/event-view.js +104 -0
  77. package/build/monitor/event-view.js.map +1 -0
  78. package/build/monitor/filters.d.ts +17 -0
  79. package/build/monitor/filters.d.ts.map +1 -0
  80. package/build/monitor/filters.js +32 -0
  81. package/build/monitor/filters.js.map +1 -0
  82. package/build/monitor/formatters.d.ts +27 -0
  83. package/build/monitor/formatters.d.ts.map +1 -0
  84. package/build/monitor/formatters.js +89 -0
  85. package/build/monitor/formatters.js.map +1 -0
  86. package/build/monitor/index.d.ts +11 -0
  87. package/build/monitor/index.d.ts.map +1 -0
  88. package/build/monitor/index.js +15 -0
  89. package/build/monitor/index.js.map +1 -0
  90. package/build/monitor/jit-serialization.d.ts +9 -0
  91. package/build/monitor/jit-serialization.d.ts.map +1 -0
  92. package/build/monitor/jit-serialization.js +73 -0
  93. package/build/monitor/jit-serialization.js.map +1 -0
  94. package/build/monitor/monitor-types.d.ts +119 -0
  95. package/build/monitor/monitor-types.d.ts.map +1 -0
  96. package/build/monitor/monitor-types.js +43 -0
  97. package/build/monitor/monitor-types.js.map +1 -0
  98. package/build/monitor/speculative-tracker.d.ts +20 -0
  99. package/build/monitor/speculative-tracker.d.ts.map +1 -0
  100. package/build/monitor/speculative-tracker.js +38 -0
  101. package/build/monitor/speculative-tracker.js.map +1 -0
  102. package/build/monitor/state.d.ts +31 -0
  103. package/build/monitor/state.d.ts.map +1 -0
  104. package/build/monitor/state.js +110 -0
  105. package/build/monitor/state.js.map +1 -0
  106. package/build/monitor/timer.d.ts +11 -0
  107. package/build/monitor/timer.d.ts.map +1 -0
  108. package/build/monitor/timer.js +13 -0
  109. package/build/monitor/timer.js.map +1 -0
  110. package/build/monitor/tree-builder.d.ts +25 -0
  111. package/build/monitor/tree-builder.d.ts.map +1 -0
  112. package/build/monitor/tree-builder.js +36 -0
  113. package/build/monitor/tree-builder.js.map +1 -0
  114. package/build/phases/Executor.d.ts.map +1 -1
  115. package/build/phases/Executor.js +71 -22
  116. package/build/phases/Executor.js.map +1 -1
  117. package/build/phases/Resolver.d.ts +2 -1
  118. package/build/phases/Resolver.d.ts.map +1 -1
  119. package/build/phases/Resolver.js +64 -1
  120. package/build/phases/Resolver.js.map +1 -1
  121. package/build/runner.d.ts.map +1 -1
  122. package/build/runner.js +5 -0
  123. package/build/runner.js.map +1 -1
  124. package/build/schema/events.d.ts +174 -0
  125. package/build/schema/events.d.ts.map +1 -0
  126. package/build/schema/events.js +55 -0
  127. package/build/schema/events.js.map +1 -0
  128. package/build/steps/activities-stepper.d.ts +49 -8
  129. package/build/steps/activities-stepper.d.ts.map +1 -1
  130. package/build/steps/activities-stepper.js +277 -141
  131. package/build/steps/activities-stepper.js.map +1 -1
  132. package/build/steps/conformance.d.ts +1 -0
  133. package/build/steps/conformance.d.ts.map +1 -1
  134. package/build/steps/console-monitor-stepper.d.ts +44 -0
  135. package/build/steps/console-monitor-stepper.d.ts.map +1 -0
  136. package/build/steps/console-monitor-stepper.js +106 -0
  137. package/build/steps/console-monitor-stepper.js.map +1 -0
  138. package/build/steps/debugger-stepper.d.ts +5 -3
  139. package/build/steps/debugger-stepper.d.ts.map +1 -1
  140. package/build/steps/debugger-stepper.js +32 -8
  141. package/build/steps/debugger-stepper.js.map +1 -1
  142. package/build/steps/haibun.d.ts +6 -18
  143. package/build/steps/haibun.d.ts.map +1 -1
  144. package/build/steps/haibun.js +33 -54
  145. package/build/steps/haibun.js.map +1 -1
  146. package/build/steps/logic-stepper.d.ts +42 -0
  147. package/build/steps/logic-stepper.d.ts.map +1 -0
  148. package/build/steps/logic-stepper.js +143 -0
  149. package/build/steps/logic-stepper.js.map +1 -0
  150. package/build/steps/narrator.js +1 -1
  151. package/build/steps/narrator.js.map +1 -1
  152. package/build/steps/parse.d.ts +1 -0
  153. package/build/steps/parse.d.ts.map +1 -1
  154. package/build/steps/variables-stepper.d.ts +11 -75
  155. package/build/steps/variables-stepper.d.ts.map +1 -1
  156. package/build/steps/variables-stepper.js +527 -85
  157. package/build/steps/variables-stepper.js.map +1 -1
  158. package/package.json +16 -3
  159. package/build/applyEffectFeatures.d.ts +0 -4
  160. package/build/applyEffectFeatures.d.ts.map +0 -1
  161. package/build/applyEffectFeatures.js +0 -31
  162. package/build/applyEffectFeatures.js.map +0 -1
  163. package/build/jsprolog/converter.d.ts +0 -9
  164. package/build/jsprolog/converter.d.ts.map +0 -1
  165. package/build/jsprolog/converter.js +0 -42
  166. package/build/jsprolog/converter.js.map +0 -1
  167. package/build/jsprolog/stepper-utils.d.ts +0 -8
  168. package/build/jsprolog/stepper-utils.d.ts.map +0 -1
  169. package/build/jsprolog/stepper-utils.js +0 -8
  170. package/build/jsprolog/stepper-utils.js.map +0 -1
  171. package/build/jsprolog/test.jsprolog.d.ts +0 -4
  172. package/build/jsprolog/test.jsprolog.d.ts.map +0 -1
  173. package/build/jsprolog/test.jsprolog.js +0 -19
  174. package/build/jsprolog/test.jsprolog.js.map +0 -1
  175. package/build/jsprolog/test.kireji.d.ts +0 -4
  176. package/build/jsprolog/test.kireji.d.ts.map +0 -1
  177. package/build/jsprolog/test.kireji.js +0 -19
  178. package/build/jsprolog/test.kireji.js.map +0 -1
  179. package/build/jsprolog/withAction.d.ts +0 -32
  180. package/build/jsprolog/withAction.d.ts.map +0 -1
  181. package/build/jsprolog/withAction.js +0 -65
  182. package/build/jsprolog/withAction.js.map +0 -1
  183. package/build/kireji/test.kireji.d.ts +0 -4
  184. package/build/kireji/test.kireji.d.ts.map +0 -1
  185. package/build/kireji/test.kireji.js +0 -19
  186. package/build/kireji/test.kireji.js.map +0 -1
  187. package/build/lib/errors.d.ts +0 -13
  188. package/build/lib/errors.d.ts.map +0 -1
  189. package/build/lib/errors.js +0 -18
  190. package/build/lib/errors.js.map +0 -1
  191. package/build/lib/util/featureStep-executor.d.ts +0 -7
  192. package/build/lib/util/featureStep-executor.d.ts.map +0 -1
  193. package/build/lib/util/featureStep-executor.js +0 -63
  194. package/build/lib/util/featureStep-executor.js.map +0 -1
  195. package/build/steps/conditions-stepper.d.ts +0 -27
  196. package/build/steps/conditions-stepper.d.ts.map +0 -1
  197. package/build/steps/conditions-stepper.js +0 -99
  198. package/build/steps/conditions-stepper.js.map +0 -1
  199. package/build/steps/outcomesRegistry.d.ts +0 -8
  200. package/build/steps/outcomesRegistry.d.ts.map +0 -1
  201. package/build/steps/outcomesRegistry.js +0 -3
  202. package/build/steps/outcomesRegistry.js.map +0 -1
  203. package/build/steps/registeredOutcomesStore.d.ts +0 -12
  204. package/build/steps/registeredOutcomesStore.d.ts.map +0 -1
  205. package/build/steps/registeredOutcomesStore.js +0 -11
  206. package/build/steps/registeredOutcomesStore.js.map +0 -1
@@ -1,4 +1,6 @@
1
- import { DOMAIN_JSON } from "./domain-types.js";
1
+ import { isLiteralValue } from "./util/index.js";
2
+ import { Origin } from "./defs.js";
3
+ import { DOMAIN_JSON, DOMAIN_STRING, normalizeDomainKey } from "./domain-types.js";
2
4
  export class FeatureVariables {
3
5
  world;
4
6
  values;
@@ -28,26 +30,39 @@ export class FeatureVariables {
28
30
  if (sv.term.match(/.*\..*/)) {
29
31
  throw Error('non-stepper variables cannot use dots');
30
32
  }
33
+ if (this.world.options.envVariables[sv.term]) {
34
+ throw Error(`Cannot overwrite environment variable "${sv.term}"`);
35
+ }
36
+ if (this.values[sv.term]?.readonly) {
37
+ throw Error(`Cannot overwrite read-only variable "${sv.term}"`);
38
+ }
31
39
  return this._set(sv, provenance);
32
40
  }
33
41
  _set(sv, provenance) {
34
- const domain = this.world.domains[sv.domain];
42
+ const domainKey = normalizeDomainKey(sv.domain);
43
+ const domain = this.world.domains[domainKey];
35
44
  if (domain === undefined) {
36
45
  throw Error(`Cannot set variable "${sv.term}": unknown domain "${sv.domain}"`);
37
46
  }
38
- this.world.domains[sv.domain].coerce(sv);
47
+ const normalized = { ...sv, domain: domainKey };
48
+ domain.coerce(normalized);
39
49
  const existingProvenance = this.values[sv.term]?.provenance;
40
50
  const provenances = existingProvenance ? [...existingProvenance, provenance] : [provenance];
41
51
  this.values[sv.term] = {
42
- ...sv,
52
+ ...normalized,
43
53
  provenance: provenances
44
54
  };
45
- this.world.logger.debug(`Set variable "${sv.term}" to "${sv.value}" (domain ${sv.domain}, origin ${sv.origin})`);
55
+ this.world.logger.debug(`Set variable "${normalized.term}" to "${normalized.value}" (domain ${normalized.domain}, origin ${normalized.origin})`);
46
56
  }
47
57
  get(name) {
48
58
  if (!this.values[name])
49
59
  return undefined;
50
- const ret = this.world.domains[this.values[name].domain].coerce(this.values[name]);
60
+ const domainKey = normalizeDomainKey(this.values[name].domain);
61
+ const domain = this.world.domains[domainKey];
62
+ if (!domain) {
63
+ throw Error(`Cannot read variable "${name}": unknown domain "${this.values[name].domain}"`);
64
+ }
65
+ const ret = domain.coerce({ ...this.values[name], domain: domainKey });
51
66
  return ret;
52
67
  }
53
68
  getJSON(name) {
@@ -57,5 +72,109 @@ export class FeatureVariables {
57
72
  throw Error(`${name} is ${this.values[name].domain}, not json`);
58
73
  return JSON.parse(this.values[name].value);
59
74
  }
75
+ /**
76
+ * Resolves a variable and its domain based on its actual origin.
77
+ */
78
+ resolveVariable(input, featureStep, steppers) {
79
+ const resolved = {
80
+ term: input.term,
81
+ value: undefined,
82
+ };
83
+ // Handle {varName} syntax - extract variable name from braces
84
+ let lookupTerm = input.term;
85
+ if (lookupTerm.startsWith('{') && lookupTerm.endsWith('}')) {
86
+ lookupTerm = lookupTerm.slice(1, -1);
87
+ }
88
+ const storedEntry = this.values[lookupTerm];
89
+ if (!input.origin || input.origin === Origin.statement) {
90
+ resolved.value = input.term;
91
+ resolved.domain = input.domain;
92
+ }
93
+ else if (input.origin === Origin.env) {
94
+ resolved.value = this.world.options.envVariables[lookupTerm]; // might be undefined
95
+ resolved.domain = DOMAIN_STRING;
96
+ }
97
+ else if (input.origin === Origin.var) {
98
+ if (storedEntry) {
99
+ resolved.domain = storedEntry.domain;
100
+ resolved.value = storedEntry.value;
101
+ resolved.provenance = storedEntry.provenance;
102
+ }
103
+ }
104
+ else if (input.origin === Origin.defined) {
105
+ if (featureStep?.runtimeArgs?.[lookupTerm] !== undefined) {
106
+ resolved.value = featureStep.runtimeArgs[lookupTerm];
107
+ resolved.domain = DOMAIN_STRING;
108
+ resolved.origin = Origin.var;
109
+ }
110
+ else if (this.world.options.envVariables[lookupTerm]) {
111
+ resolved.value = this.world.options.envVariables[lookupTerm];
112
+ resolved.domain = DOMAIN_STRING;
113
+ resolved.origin = Origin.env;
114
+ }
115
+ else if (storedEntry) {
116
+ resolved.value = storedEntry.value;
117
+ resolved.domain = storedEntry.domain;
118
+ resolved.provenance = storedEntry.provenance;
119
+ resolved.origin = Origin.var;
120
+ }
121
+ else if (isLiteralValue(input.term)) {
122
+ // Fallback: treat unquoted terms that look like literals as string values
123
+ resolved.value = input.term;
124
+ resolved.domain = DOMAIN_STRING;
125
+ }
126
+ // Note: for {varName} syntax, storedEntry is looked up using lookupTerm (without braces)
127
+ // so this naturally resolves quantifier-bound variables
128
+ }
129
+ else if (input.origin === Origin.quoted) {
130
+ // Check if this is {varName} syntax - if so, resolve as variable
131
+ if (input.term.startsWith('{') && input.term.endsWith('}') && !input.term.includes(':')) {
132
+ if (featureStep?.runtimeArgs?.[lookupTerm] !== undefined) {
133
+ resolved.value = featureStep.runtimeArgs[lookupTerm];
134
+ resolved.domain = DOMAIN_STRING;
135
+ resolved.origin = Origin.var;
136
+ }
137
+ else if (storedEntry) {
138
+ resolved.value = storedEntry.value;
139
+ resolved.domain = storedEntry.domain;
140
+ resolved.provenance = storedEntry.provenance;
141
+ resolved.origin = Origin.var;
142
+ }
143
+ }
144
+ else {
145
+ resolved.value = input.term.replace(/^"|"$/g, '');
146
+ resolved.domain = DOMAIN_STRING;
147
+ }
148
+ }
149
+ else {
150
+ throw new Error(`Unsupported origin type: ${input.origin}`);
151
+ }
152
+ if (resolved.value !== undefined) {
153
+ // Ensure domain is defined before coercion, fallback to string if undefined
154
+ const domainKey = resolved.domain ?? DOMAIN_STRING;
155
+ const domain = this.world.domains[domainKey];
156
+ if (!domain) {
157
+ throw new Error(`Cannot resolve variable "${input.term}": unknown domain "${domainKey}"`);
158
+ }
159
+ resolved.value = domain.coerce({ ...resolved, domain: domainKey }, featureStep, steppers);
160
+ resolved.domain = domainKey;
161
+ }
162
+ return resolved;
163
+ }
164
+ getDomainValues(domainName) {
165
+ const domainKey = normalizeDomainKey(domainName);
166
+ const domainDef = this.world.domains[domainKey];
167
+ if (!domainDef) {
168
+ return { values: [], error: `Domain "${domainName}" is not defined` };
169
+ }
170
+ if (Array.isArray(domainDef.values) && domainDef.values.length > 0) {
171
+ return { values: domainDef.values };
172
+ }
173
+ const allVars = this.all();
174
+ const memberValues = Object.values(allVars)
175
+ .filter(v => v.domain && normalizeDomainKey(v.domain) === domainKey)
176
+ .map(v => v.value);
177
+ return { values: memberValues };
178
+ }
60
179
  }
61
180
  //# sourceMappingURL=feature-variables.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"feature-variables.js","sourceRoot":"","sources":["../../src/lib/feature-variables.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"feature-variables.js","sourceRoot":"","sources":["../../src/lib/feature-variables.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"namedVars.d.ts","sourceRoot":"","sources":["../../src/lib/namedVars.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAmB,MAAM,WAAW,CAAC;AAGnF,eAAO,MAAM,WAAW,OAAO,CAAC;AAChC,eAAO,MAAM,QAAQ,OAAO,CAAC;AAC7B,eAAO,MAAM,QAAQ,OAAO,CAAC;AAC7B,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,kBAAkB,GAAI,KAAK,MAAM,KAAG;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;CA0ElH,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,EAAE,YAAY,MAAM,EAAE,YAAY,MAAM,EAAE,aAAa,MAAM,EAAE,MAAM,YAAY,gBAM9H,CAAC;AAUF,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;;EAG3D;AAED,eAAO,MAAM,QAAQ,GAAI,YAAY,MAAM,EAAE,GAAG,MAAM,EAAE,YAAY,MAAM,EAAE,aAAa,MAAM,EAAE,MAAM,YAAY,EAAE,gBAAgB,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,gBAkD9J,CAAC"}
1
+ {"version":3,"file":"namedVars.d.ts","sourceRoot":"","sources":["../../src/lib/namedVars.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAmB,MAAM,WAAW,CAAC;AAGnF,eAAO,MAAM,WAAW,OAAO,CAAC;AAChC,eAAO,MAAM,QAAQ,OAAO,CAAC;AAC7B,eAAO,MAAM,QAAQ,OAAO,CAAC;AAC7B,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,kBAAkB,GAAI,KAAK,MAAM,KAAG;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;CA+ElH,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,EAAE,YAAY,MAAM,EAAE,YAAY,MAAM,EAAE,aAAa,MAAM,EAAE,MAAM,YAAY,gBAO9H,CAAC;AAUF,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;;EAG3D;AAED,eAAO,MAAM,QAAQ,GAAI,YAAY,MAAM,EAAE,GAAG,MAAM,EAAE,YAAY,MAAM,EAAE,aAAa,MAAM,EAAE,MAAM,YAAY,EAAE,gBAAgB,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,gBAoD9J,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import { Origin } from './defs.js';
2
- import { DOMAIN_STATEMENT, DOMAIN_STRING } from './domain-types.js';
2
+ import { DOMAIN_STATEMENT } from './domain-types.js';
3
3
  export const TYPE_QUOTED = 'q_';
4
4
  export const TYPE_ENV = 'e_';
5
5
  export const TYPE_VAR = 'b_';
@@ -35,9 +35,13 @@ export const namedInterpolation = (inp) => {
35
35
  stepValuesMap[name] = { term: name, domain, origin };
36
36
  // Look ahead to see what comes after this placeholder
37
37
  const nextCharAfterBrace = inp.substring(be + 1, be + 2);
38
- // Only use negative lookahead for specific separators (comma, colon) that won't appear in values
38
+ const nextChunk = inp.substring(be + 1);
39
+ // Only use negative lookahead for specific separators that won't appear in values
39
40
  let placeholderRegex = '.+';
40
- if (nextCharAfterBrace === ',' || nextCharAfterBrace === ':') {
41
+ if (nextChunk.startsWith(' is ')) {
42
+ placeholderRegex = '.+?(?= is )';
43
+ }
44
+ else if (nextCharAfterBrace === ',' || nextCharAfterBrace === ':') {
41
45
  // Use negative lookahead to prevent matching these separators
42
46
  placeholderRegex = `.+?(?=${nextCharAfterBrace.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')})`;
43
47
  }
@@ -80,12 +84,13 @@ export const matchGwtaToAction = (gwta, actionable, actionName, stepperName, ste
80
84
  // anchor the pattern so the whole actionable matches
81
85
  // use case-insensitive matching to be consistent with dePolite handling
82
86
  const r = new RegExp(`^${regexPattern}$`, 'i');
83
- return getMatch(actionable, r, actionName, stepperName, step, stepValuesMap);
87
+ const match = getMatch(actionable, r, actionName, stepperName, step, stepValuesMap);
88
+ return match;
84
89
  };
85
90
  // no-op
86
91
  function pairToVar(pair) {
87
92
  const [name, domainRaw] = pair.split(':').map((i) => i.trim());
88
- const domain = domainRaw || DOMAIN_STRING;
93
+ const domain = domainRaw;
89
94
  return { name, domain };
90
95
  }
91
96
  export function getNamedMatches(regexp, what) {
@@ -127,13 +132,16 @@ export const getMatch = (actionable, r, actionName, stepperName, step, stepValue
127
132
  if (envMatch) {
128
133
  ph.term = envMatch[1];
129
134
  ph.origin = Origin.env;
135
+ ph.origin = Origin.env;
130
136
  }
131
137
  else {
132
- ph.origin = Origin.fallthrough;
133
- // If the bare literal looks like JSON, treat it as fallthrough.
134
138
  const tTrim = String(t).trim();
135
- if (tTrim.startsWith('{') || tTrim.startsWith('[')) {
139
+ if (tTrim.startsWith('{') || tTrim.startsWith('[') || /^-?\d+(\.\d+)?$/.test(tTrim)) {
136
140
  ph.term = tTrim;
141
+ ph.origin = Origin.quoted;
142
+ }
143
+ else {
144
+ ph.origin = Origin.defined;
137
145
  }
138
146
  }
139
147
  }
@@ -144,7 +152,7 @@ export const getMatch = (actionable, r, actionName, stepperName, step, stepValue
144
152
  i++;
145
153
  }
146
154
  }
147
- return { actionName, stepperName, step, stepValuesMap };
155
+ return { actionName, stepperName, step, stepValuesMap: stepValuesMap || {} };
148
156
  };
149
157
  const inferOrigin = (char) => {
150
158
  switch (char) {
@@ -155,7 +163,7 @@ const inferOrigin = (char) => {
155
163
  case '"':
156
164
  return Origin.quoted;
157
165
  default:
158
- return Origin.fallthrough;
166
+ return Origin.defined;
159
167
  }
160
168
  };
161
169
  //# sourceMappingURL=namedVars.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"namedVars.js","sourceRoot":"","sources":["../../src/lib/namedVars.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"namedVars.js","sourceRoot":"","sources":["../../src/lib/namedVars.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
1
  import { AStepper } from './astepper.js';
2
2
  import { TFeatureStep, TStepArgs, TWorld } from './defs.js';
3
- export declare function populateActionArgs(featureStep: TFeatureStep, world: TWorld, steppers: AStepper[]): Promise<TStepArgs>;
3
+ export declare function populateActionArgs(featureStep: TFeatureStep, world: TWorld, steppers: AStepper[]): TStepArgs;
4
4
  //# sourceMappingURL=populateActionArgs.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"populateActionArgs.d.ts","sourceRoot":"","sources":["../../src/lib/populateActionArgs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAU,MAAM,WAAW,CAAC;AAIpE,wBAAsB,kBAAkB,CAAC,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAkD3H"}
1
+ {"version":3,"file":"populateActionArgs.d.ts","sourceRoot":"","sources":["../../src/lib/populateActionArgs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAE5D,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,CAkB5G"}
@@ -1,57 +1,19 @@
1
- import { Origin } from './defs.js';
2
- import { asDomainKey, DOMAIN_STRING } from './domain-types.js';
3
- // Given a feature step and the current world, populate the action args. This will update the existing stepValuesMap as actionVal
4
- export async function populateActionArgs(featureStep, world, steppers) {
1
+ export function populateActionArgs(featureStep, world, steppers) {
5
2
  const stepArgs = {};
6
3
  if (!featureStep?.action?.stepValuesMap)
7
- return stepArgs; // no variables for this step
4
+ return stepArgs;
8
5
  for (const [name, actionVal] of Object.entries(featureStep.action.stepValuesMap)) {
9
- const storedEntry = world.shared.all()[actionVal.term];
10
- if (actionVal.origin === Origin.statement) {
11
- actionVal.value = actionVal.term;
12
- }
13
- else if (actionVal.origin === Origin.env) {
14
- actionVal.value = world.options.envVariables[actionVal.term]; // might be undefined
15
- actionVal.domain = DOMAIN_STRING;
16
- }
17
- else if (actionVal.origin === Origin.var) {
18
- if (storedEntry) {
19
- actionVal.domain = storedEntry.domain;
20
- actionVal.value = storedEntry.value;
21
- actionVal.provenance = storedEntry.provenance;
22
- }
23
- }
24
- else if (actionVal.origin === Origin.fallthrough) {
25
- if (world.options.envVariables[actionVal.term]) {
26
- actionVal.value = world.options.envVariables[actionVal.term];
27
- }
28
- else if (storedEntry) {
29
- actionVal.value = storedEntry.value;
30
- actionVal.domain = storedEntry.domain;
31
- actionVal.provenance = storedEntry.provenance;
6
+ const resolved = world.shared.resolveVariable(actionVal, featureStep, steppers);
7
+ // FIXME all steps except set steps should fail if a variable is undefined and it's authoritative
8
+ if (resolved.value === undefined) {
9
+ const handlesUndefined = (featureStep.action.step.handlesUndefined);
10
+ if (handlesUndefined === true || handlesUndefined?.includes(name)) {
11
+ continue;
32
12
  }
33
- else {
34
- actionVal.value = actionVal.term;
35
- actionVal.domain = DOMAIN_STRING;
36
- }
37
- }
38
- else if (actionVal.origin === Origin.quoted) {
39
- actionVal.value = actionVal.term;
40
- actionVal.domain = DOMAIN_STRING;
41
- }
42
- else {
43
- throw new Error(`Unsupported origin type: ${actionVal.origin}`);
44
- }
45
- if (actionVal.value === undefined) {
46
- continue;
47
- }
48
- const actionDomainKey = asDomainKey(actionVal.domain.split('|').map(d => d.trim()));
49
- if (!world.domains[actionDomainKey]) {
50
- throw new Error(`No domain coercer found for domain "${actionDomainKey}"`);
13
+ console.error(`undefined ${name} in "${featureStep.in}" for ${featureStep.action.stepperName}.${featureStep.action.actionName}`, name, resolved, featureStep.action.step);
14
+ throw Error(`undefined ${name} in "${featureStep.in}" for ${featureStep.action.stepperName}.${featureStep.action.actionName}`);
51
15
  }
52
- actionVal.value = await Promise.resolve(world.domains[actionDomainKey].coerce(actionVal, featureStep, steppers));
53
- // actionVal has been updated, update the actionVal in place for downstream processing
54
- stepArgs[name] = actionVal.value;
16
+ stepArgs[name] = resolved.value;
55
17
  }
56
18
  return stepArgs;
57
19
  }
@@ -1 +1 @@
1
- {"version":3,"file":"populateActionArgs.js","sourceRoot":"","sources":["../../src/lib/populateActionArgs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"populateActionArgs.js","sourceRoot":"","sources":["../../src/lib/populateActionArgs.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,kBAAkB,CAAC,WAAyB,EAAE,KAAa,EAAE,QAAoB;IAChG,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa;QAAE,OAAO,QAAQ,CAAC;IAEzD,KAAK,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAClF,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QAChF,iGAAiG;QACjG,IAAI,QAAQ,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAClC,MAAM,gBAAgB,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACpE,IAAI,gBAAgB,KAAK,IAAI,IAAI,gBAAgB,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnE,SAAS;YACV,CAAC;YACD,OAAO,CAAC,KAAK,CAAC,aAAa,IAAI,QAAQ,WAAW,CAAC,EAAE,SAAS,WAAW,CAAC,MAAM,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC1K,MAAM,KAAK,CAAC,aAAa,IAAI,QAAQ,WAAW,CAAC,EAAE,SAAS,WAAW,CAAC,MAAM,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;QAChI,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC;IACjC,CAAC;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC"}
@@ -20,6 +20,7 @@ declare const TestSteps: {
20
20
  };
21
21
  };
22
22
  world?: import("../defs.js").TWorld;
23
+ kind?: import("../astepper.js").TStepperKind;
23
24
  setWorld(world: import("../defs.js").TWorld, _steppers: AStepper[]): Promise<void>;
24
25
  getWorld(): import("../defs.js").TWorld;
25
26
  };
@@ -1 +1 @@
1
- {"version":3,"file":"TestSteps.d.ts","sourceRoot":"","sources":["../../../src/lib/test/TestSteps.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,QAAA,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;CAqBd,CAAC;AAEF,eAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"TestSteps.d.ts","sourceRoot":"","sources":["../../../src/lib/test/TestSteps.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,QAAA,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;CAqBd,CAAC;AAEF,eAAe,SAAS,CAAC"}
@@ -16,6 +16,7 @@ export declare const TestStepsWithOptions: {
16
16
  };
17
17
  };
18
18
  world?: import("../defs.js").TWorld;
19
+ kind?: import("../astepper.js").TStepperKind;
19
20
  setWorld(world: import("../defs.js").TWorld, _steppers: AStepper[]): Promise<void>;
20
21
  getWorld(): import("../defs.js").TWorld;
21
22
  };
@@ -1 +1 @@
1
- {"version":3,"file":"TestStepsWithOptions.d.ts","sourceRoot":"","sources":["../../../src/lib/test/TestStepsWithOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAI1C,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;CAiBhC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
1
+ {"version":3,"file":"TestStepsWithOptions.d.ts","sourceRoot":"","sources":["../../../src/lib/test/TestStepsWithOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAI1C,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;CAiBhC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../../src/lib/test/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAgB,eAAe,EAAa,MAAM,YAAY,CAAC;AAcvG,eAAO,MAAM,iBAAiB;;;;;CAA4D,CAAC;AAE3F,eAAO,MAAM,oCAAoC,yCAAyC,CAAC;AAE3F,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,EAAE,QAAQ,EAAE,gDAGnF;AAGD,KAAK,aAAa,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC;AAExE,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,YAAY,GAAE,aAAiC,EAAE,aAAa,GAAE,aAAkB;WAmBC,MAAM;GAb5L;AACD,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,YAAY,GAAE,aAAiC,EAAE,aAAa,GAAE,aAAkB;WAYC,MAAM;GAN5L;AAMD,wBAAsB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,GAAG,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,aAAa,GAAE,aAAkB,GAAG,OAAO,CAAC,eAAe,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAU/L;AAED,wBAAgB,uBAAuB,CAAC,YAAY,GAAE,aAAiC,EAAE,GAAG;;CAA+B,UAQ1H;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,oBAAc,GAAG,MAAM,CAc3E;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,GAAG,SAAqB,6BAEnF"}
1
+ {"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../../src/lib/test/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAgB,eAAe,EAAa,MAAM,YAAY,CAAC;AAevG,eAAO,MAAM,iBAAiB;;;;;CAA4D,CAAC;AAE3F,eAAO,MAAM,oCAAoC,yCAAyC,CAAC;AAE3F,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,EAAE,QAAQ,EAAE,gDAGnF;AAGD,KAAK,aAAa,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC;AAExE,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,YAAY,GAAE,aAAiC,EAAE,aAAa,GAAE,aAAkB;WAmBC,MAAM;GAb5L;AACD,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,YAAY,GAAE,aAAiC,EAAE,aAAa,GAAE,aAAkB;WAYC,MAAM;GAN5L;AAMD,wBAAsB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,GAAG,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,aAAa,GAAE,aAAkB,GAAG,OAAO,CAAC,eAAe,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAU/L;AAED,wBAAgB,uBAAuB,CAAC,YAAY,GAAE,aAAiC,EAAE,GAAG;;CAA+B,UAQ1H;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,oBAAc,GAAG,MAAM,CAe3E;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,GAAG,SAAqB,6BAEnF"}
@@ -10,6 +10,7 @@ import { FeatureVariables } from '../feature-variables.js';
10
10
  import { Prompter } from '../prompter.js';
11
11
  import { getCoreDomains } from '../core-domains.js';
12
12
  import assert from 'assert';
13
+ import { EventLogger } from '../EventLogger.js';
13
14
  const DEF_PROTO_DEFAULT_OPTIONS = { DEST: DEFAULT_DEST };
14
15
  export const DEF_PROTO_OPTIONS = { options: DEF_PROTO_DEFAULT_OPTIONS, moduleOptions: {} };
15
16
  export const HAIBUN_O_TESTSTEPSWITHOPTIONS_EXISTS = 'HAIBUN_O_TESTSTEPSWITHOPTIONS_EXISTS';
@@ -58,6 +59,7 @@ export function getDefaultWorld(sequence, env = process.env) {
58
59
  timer: new Timer(),
59
60
  tag: getRunTag(sequence, 0),
60
61
  logger: new Logger(env.HAIBUN_LOG_LEVEL ? { level: env.HAIBUN_LOG_LEVEL } : LOGGER_LOG),
62
+ eventLogger: new EventLogger(),
61
63
  prompter: new Prompter(),
62
64
  runtime: { stepResults: [] },
63
65
  options: { DEST: DEFAULT_DEST, envVariables: env },
@@ -1 +1 @@
1
- {"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../src/lib/test/lib.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../src/lib/test/lib.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { resolve } from 'path/posix';
1
+ import { resolve } from 'path';
2
2
  import { pathToFileURL } from 'url';
3
3
  export const HOST_PROJECT_DIR = 'HOST_PROJECT_DIR';
4
4
  export const containerHostPath = process.env[HOST_PROJECT_DIR];
@@ -1 +1 @@
1
- {"version":3,"file":"actualURI.js","sourceRoot":"","sources":["../../../src/lib/util/actualURI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AACnD,MAAM,CAAC,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAE/D,uDAAuD;AACvD,MAAM,UAAU,SAAS,CAAC,IAAY;IACrC,MAAM,UAAU,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACvG,OAAO,UAAU,CAAC;AACnB,CAAC"}
1
+ {"version":3,"file":"actualURI.js","sourceRoot":"","sources":["../../../src/lib/util/actualURI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AACnD,MAAM,CAAC,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAE/D,uDAAuD;AACvD,MAAM,UAAU,SAAS,CAAC,IAAY;IACrC,MAAM,UAAU,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACvG,OAAO,UAAU,CAAC;AACnB,CAAC"}
@@ -1,12 +1,22 @@
1
- import { TNotOKActionResult, TOKActionResult, TSpecl, TWorld, TRuntime, TModuleOptions, CStepper, TSeqPath } from '../defs.js';
1
+ import { TNotOKActionResult, TOKActionResult, TSpecl, TWorld, TRuntime, TModuleOptions, CStepper, TSeqPath, TFeatureStep } from '../defs.js';
2
2
  import { TAnyFixme } from '../fixme.js';
3
3
  import { AStepper } from '../astepper.js';
4
4
  import { TTag } from '../ttag.js';
5
5
  import { TArtifact, TMessageContext } from '../interfaces/logger.js';
6
+ export * from './actualURI.js';
7
+ export declare function getStepTerm(featureStep: TFeatureStep, key: string): string | undefined;
8
+ export declare function isLiteralValue(term: string): boolean;
6
9
  type TClass = {
7
10
  new <T>(...args: unknown[]): T;
8
11
  };
9
12
  export declare const basesFrom: (s: any) => string[];
13
+ /**
14
+ * Resolve and import a stepper module.
15
+ * Supports:
16
+ * - Package names: @haibun/monitor-tui → resolves main from package.json
17
+ * - Explicit paths: @haibun/monitor-tui/build/index → imports directly
18
+ * - Relative paths: ./build-local/test-server → imports from cwd
19
+ */
10
20
  export declare function use(module: string): Promise<TClass>;
11
21
  export declare function checkModuleIsClass(re: object, module: string): void;
12
22
  export declare function actionNotOK(message: string, w?: {
@@ -87,5 +97,4 @@ export declare function formattedSteppers(steppers: AStepper[]): {
87
97
  };
88
98
  export declare const formatCurrentSection: (runtime: TRuntime) => string;
89
99
  export declare const formatCurrentSeqPath: (seqPath: TSeqPath) => string;
90
- export {};
91
100
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/util/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/util/index.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,31 @@
1
1
  import { OK } from '../defs.js';
2
+ export * from './actualURI.js';
3
+ // Helper to get term from stepValuesMap with null safety
4
+ export function getStepTerm(featureStep, key) {
5
+ return featureStep?.action?.stepValuesMap?.[key]?.term;
6
+ }
7
+ // Checks if an unquoted term should be treated as a string literal
8
+ // A term is literal if it:
9
+ // - doesn't start with [a-zA-Z_], OR
10
+ // - contains characters outside [a-zA-Z0-9_ ], OR
11
+ // - contains / (paths like /count, MIME types like application/json)
12
+ export function isLiteralValue(term) {
13
+ return !/^[a-zA-Z_]/.test(term) || /[^a-zA-Z0-9_ ]/.test(term);
14
+ }
2
15
  export const basesFrom = (s) => s?.split(',').map((b) => b.trim());
3
- // FIXME tired of wrestling with ts/import issues
16
+ import nodeFS from 'fs';
17
+ import path from 'path';
18
+ /**
19
+ * Resolve and import a stepper module.
20
+ * Supports:
21
+ * - Package names: @haibun/monitor-tui → resolves main from package.json
22
+ * - Explicit paths: @haibun/monitor-tui/build/index → imports directly
23
+ * - Relative paths: ./build-local/test-server → imports from cwd
24
+ */
4
25
  export async function use(module) {
5
26
  try {
6
- const re = (await import(`${module}.js`)).default;
27
+ const resolvedPath = resolveModulePath(module);
28
+ const re = (await import(resolvedPath)).default;
7
29
  checkModuleIsClass(re, module);
8
30
  return re;
9
31
  }
@@ -12,6 +34,28 @@ export async function use(module) {
12
34
  throw e;
13
35
  }
14
36
  }
37
+ function resolveModulePath(module) {
38
+ // Check if this is a directory with package.json (package reference)
39
+ if (nodeFS.existsSync(module)) {
40
+ const pkgPath = path.join(module, 'package.json');
41
+ if (nodeFS.existsSync(pkgPath)) {
42
+ const pkg = JSON.parse(nodeFS.readFileSync(pkgPath, 'utf-8'));
43
+ const main = pkg.main || 'index.js';
44
+ return path.join(module, main);
45
+ }
46
+ // Directory exists but no package.json, try as file
47
+ if (nodeFS.existsSync(`${module}.js`)) {
48
+ return `${module}.js`;
49
+ }
50
+ // Maybe it's a directory with index.js
51
+ const indexPath = path.join(module, 'index.js');
52
+ if (nodeFS.existsSync(indexPath)) {
53
+ return indexPath;
54
+ }
55
+ }
56
+ // Default: append .js extension
57
+ return `${module}.js`;
58
+ }
15
59
  export function checkModuleIsClass(re, module) {
16
60
  // this is early morning code
17
61
  const type = re?.toString().replace(/^ /g, '').split('\n')[0].replace(/\s.*/, '');