@rcrsr/rill 0.8.6 → 0.9.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/dist/ast-nodes.d.ts +189 -49
- package/dist/ast-nodes.d.ts.map +1 -1
- package/dist/ast-unions.d.ts +1 -1
- package/dist/ast-unions.d.ts.map +1 -1
- package/dist/constants.d.ts +14 -0
- package/dist/constants.d.ts.map +1 -0
- package/dist/constants.js +29 -0
- package/dist/constants.js.map +1 -0
- package/dist/error-classes.d.ts +3 -1
- package/dist/error-classes.d.ts.map +1 -1
- package/dist/error-classes.js +11 -5
- package/dist/error-classes.js.map +1 -1
- package/dist/error-registry.d.ts.map +1 -1
- package/dist/error-registry.js +293 -9
- package/dist/error-registry.js.map +1 -1
- package/dist/ext/crypto/index.d.ts +2 -1
- package/dist/ext/crypto/index.d.ts.map +1 -1
- package/dist/ext/crypto/index.js +7 -0
- package/dist/ext/crypto/index.js.map +1 -1
- package/dist/ext/exec/index.d.ts +2 -1
- package/dist/ext/exec/index.d.ts.map +1 -1
- package/dist/ext/exec/index.js +6 -0
- package/dist/ext/exec/index.js.map +1 -1
- package/dist/ext/fetch/index.d.ts +2 -1
- package/dist/ext/fetch/index.d.ts.map +1 -1
- package/dist/ext/fetch/index.js +6 -0
- package/dist/ext/fetch/index.js.map +1 -1
- package/dist/ext/fs/index.d.ts +2 -1
- package/dist/ext/fs/index.d.ts.map +1 -1
- package/dist/ext/fs/index.js +3 -0
- package/dist/ext/fs/index.js.map +1 -1
- package/dist/ext/kv/index.d.ts +2 -1
- package/dist/ext/kv/index.d.ts.map +1 -1
- package/dist/ext/kv/index.js +5 -1
- package/dist/ext/kv/index.js.map +1 -1
- package/dist/generated/introspection-data.d.ts +1 -1
- package/dist/generated/introspection-data.d.ts.map +1 -1
- package/dist/generated/introspection-data.js +194 -185
- package/dist/generated/introspection-data.js.map +1 -1
- package/dist/generated/version-data.d.ts +1 -1
- package/dist/generated/version-data.js +3 -3
- package/dist/highlight-map.d.ts.map +1 -1
- package/dist/highlight-map.js +8 -2
- package/dist/highlight-map.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/lexer/operators.d.ts.map +1 -1
- package/dist/lexer/operators.js +0 -2
- package/dist/lexer/operators.js.map +1 -1
- package/dist/lexer/readers.d.ts +18 -1
- package/dist/lexer/readers.d.ts.map +1 -1
- package/dist/lexer/readers.js +55 -0
- package/dist/lexer/readers.js.map +1 -1
- package/dist/parser/helpers.d.ts +8 -13
- package/dist/parser/helpers.d.ts.map +1 -1
- package/dist/parser/helpers.js +42 -35
- package/dist/parser/helpers.js.map +1 -1
- package/dist/parser/index.d.ts +1 -0
- package/dist/parser/index.d.ts.map +1 -1
- package/dist/parser/index.js +1 -0
- package/dist/parser/index.js.map +1 -1
- package/dist/parser/parser-collect.d.ts.map +1 -1
- package/dist/parser/parser-collect.js +34 -5
- package/dist/parser/parser-collect.js.map +1 -1
- package/dist/parser/parser-control.d.ts.map +1 -1
- package/dist/parser/parser-control.js +9 -0
- package/dist/parser/parser-control.js.map +1 -1
- package/dist/parser/parser-expr.d.ts +3 -1
- package/dist/parser/parser-expr.d.ts.map +1 -1
- package/dist/parser/parser-expr.js +377 -100
- package/dist/parser/parser-expr.js.map +1 -1
- package/dist/parser/parser-extract.d.ts +3 -5
- package/dist/parser/parser-extract.d.ts.map +1 -1
- package/dist/parser/parser-extract.js +37 -69
- package/dist/parser/parser-extract.js.map +1 -1
- package/dist/parser/parser-functions.d.ts +2 -2
- package/dist/parser/parser-functions.d.ts.map +1 -1
- package/dist/parser/parser-functions.js +112 -36
- package/dist/parser/parser-functions.js.map +1 -1
- package/dist/parser/parser-literals.d.ts +4 -3
- package/dist/parser/parser-literals.d.ts.map +1 -1
- package/dist/parser/parser-literals.js +257 -42
- package/dist/parser/parser-literals.js.map +1 -1
- package/dist/parser/parser-script.d.ts.map +1 -1
- package/dist/parser/parser-script.js +25 -12
- package/dist/parser/parser-script.js.map +1 -1
- package/dist/parser/parser-shape.d.ts +13 -0
- package/dist/parser/parser-shape.d.ts.map +1 -0
- package/dist/parser/parser-shape.js +72 -0
- package/dist/parser/parser-shape.js.map +1 -0
- package/dist/parser/parser-types.d.ts +21 -0
- package/dist/parser/parser-types.d.ts.map +1 -0
- package/dist/parser/parser-types.js +30 -0
- package/dist/parser/parser-types.js.map +1 -0
- package/dist/parser/parser-variables.d.ts.map +1 -1
- package/dist/parser/parser-variables.js +10 -1
- package/dist/parser/parser-variables.js.map +1 -1
- package/dist/runtime/core/callable.d.ts +23 -20
- package/dist/runtime/core/callable.d.ts.map +1 -1
- package/dist/runtime/core/callable.js +26 -24
- package/dist/runtime/core/callable.js.map +1 -1
- package/dist/runtime/core/context.d.ts.map +1 -1
- package/dist/runtime/core/context.js +8 -8
- package/dist/runtime/core/context.js.map +1 -1
- package/dist/runtime/core/equals.d.ts.map +1 -1
- package/dist/runtime/core/equals.js +142 -30
- package/dist/runtime/core/equals.js.map +1 -1
- package/dist/runtime/core/eval/base.d.ts +2 -2
- package/dist/runtime/core/eval/base.d.ts.map +1 -1
- package/dist/runtime/core/eval/evaluator.d.ts.map +1 -1
- package/dist/runtime/core/eval/evaluator.js +3 -1
- package/dist/runtime/core/eval/evaluator.js.map +1 -1
- package/dist/runtime/core/eval/index.d.ts +16 -1
- package/dist/runtime/core/eval/index.d.ts.map +1 -1
- package/dist/runtime/core/eval/index.js +22 -2
- package/dist/runtime/core/eval/index.js.map +1 -1
- package/dist/runtime/core/eval/mixins/annotations.d.ts.map +1 -1
- package/dist/runtime/core/eval/mixins/annotations.js +14 -8
- package/dist/runtime/core/eval/mixins/annotations.js.map +1 -1
- package/dist/runtime/core/eval/mixins/closures.d.ts +0 -2
- package/dist/runtime/core/eval/mixins/closures.d.ts.map +1 -1
- package/dist/runtime/core/eval/mixins/closures.js +286 -105
- package/dist/runtime/core/eval/mixins/closures.js.map +1 -1
- package/dist/runtime/core/eval/mixins/collections.d.ts.map +1 -1
- package/dist/runtime/core/eval/mixins/collections.js +65 -25
- package/dist/runtime/core/eval/mixins/collections.js.map +1 -1
- package/dist/runtime/core/eval/mixins/control-flow.d.ts.map +1 -1
- package/dist/runtime/core/eval/mixins/control-flow.js +21 -17
- package/dist/runtime/core/eval/mixins/control-flow.js.map +1 -1
- package/dist/runtime/core/eval/mixins/conversion.d.ts +30 -0
- package/dist/runtime/core/eval/mixins/conversion.d.ts.map +1 -0
- package/dist/runtime/core/eval/mixins/conversion.js +203 -0
- package/dist/runtime/core/eval/mixins/conversion.js.map +1 -0
- package/dist/runtime/core/eval/mixins/core.d.ts.map +1 -1
- package/dist/runtime/core/eval/mixins/core.js +101 -32
- package/dist/runtime/core/eval/mixins/core.js.map +1 -1
- package/dist/runtime/core/eval/mixins/extraction.d.ts.map +1 -1
- package/dist/runtime/core/eval/mixins/extraction.js +136 -30
- package/dist/runtime/core/eval/mixins/extraction.js.map +1 -1
- package/dist/runtime/core/eval/mixins/list-dispatch.d.ts +17 -0
- package/dist/runtime/core/eval/mixins/list-dispatch.d.ts.map +1 -0
- package/dist/runtime/core/eval/mixins/list-dispatch.js +97 -0
- package/dist/runtime/core/eval/mixins/list-dispatch.js.map +1 -0
- package/dist/runtime/core/eval/mixins/literals.d.ts.map +1 -1
- package/dist/runtime/core/eval/mixins/literals.js +64 -82
- package/dist/runtime/core/eval/mixins/literals.js.map +1 -1
- package/dist/runtime/core/eval/mixins/types.d.ts +4 -0
- package/dist/runtime/core/eval/mixins/types.d.ts.map +1 -1
- package/dist/runtime/core/eval/mixins/types.js +202 -3
- package/dist/runtime/core/eval/mixins/types.js.map +1 -1
- package/dist/runtime/core/eval/mixins/variables.d.ts.map +1 -1
- package/dist/runtime/core/eval/mixins/variables.js +42 -7
- package/dist/runtime/core/eval/mixins/variables.js.map +1 -1
- package/dist/runtime/core/execute.d.ts.map +1 -1
- package/dist/runtime/core/execute.js +2 -15
- package/dist/runtime/core/execute.js.map +1 -1
- package/dist/runtime/core/field-descriptor.d.ts +29 -0
- package/dist/runtime/core/field-descriptor.d.ts.map +1 -0
- package/dist/runtime/core/field-descriptor.js +27 -0
- package/dist/runtime/core/field-descriptor.js.map +1 -0
- package/dist/runtime/core/types.d.ts +15 -6
- package/dist/runtime/core/types.d.ts.map +1 -1
- package/dist/runtime/core/types.js.map +1 -1
- package/dist/runtime/core/values.d.ts +107 -9
- package/dist/runtime/core/values.d.ts.map +1 -1
- package/dist/runtime/core/values.js +453 -43
- package/dist/runtime/core/values.js.map +1 -1
- package/dist/runtime/ext/builtins.d.ts.map +1 -1
- package/dist/runtime/ext/builtins.js +47 -107
- package/dist/runtime/ext/builtins.js.map +1 -1
- package/dist/runtime/ext/extensions.d.ts +21 -2
- package/dist/runtime/ext/extensions.d.ts.map +1 -1
- package/dist/runtime/ext/extensions.js.map +1 -1
- package/dist/runtime/index.d.ts +6 -4
- package/dist/runtime/index.d.ts.map +1 -1
- package/dist/runtime/index.js +7 -2
- package/dist/runtime/index.js.map +1 -1
- package/dist/token-types.d.ts +7 -2
- package/dist/token-types.d.ts.map +1 -1
- package/dist/token-types.js +9 -2
- package/dist/token-types.js.map +1 -1
- package/dist/value-types.d.ts +19 -1
- package/dist/value-types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -10,14 +10,19 @@
|
|
|
10
10
|
* - evaluateTypeCheck(node, input) -> Promise<boolean>
|
|
11
11
|
* - evaluateTypeAssertionPrimary(node) -> Promise<RillValue>
|
|
12
12
|
* - evaluateTypeCheckPrimary(node) -> Promise<boolean>
|
|
13
|
+
* - evaluateTypeConstructor(node) -> Promise<RillTypeValue> [IR-7]
|
|
14
|
+
* - evaluateClosureSigLiteral(node) -> Promise<RillTypeValue> [IR-8]
|
|
13
15
|
*
|
|
14
16
|
* Error Handling:
|
|
15
17
|
* - Type assertion failures throw RuntimeError(RUNTIME_TYPE_ERROR) [EC-24]
|
|
18
|
+
* - Type constructor argument errors throw RuntimeError [EC-4 through EC-7]
|
|
19
|
+
* - Closure sig literal errors throw RuntimeError [EC-8, EC-9]
|
|
16
20
|
*
|
|
17
21
|
* @internal
|
|
18
22
|
*/
|
|
19
23
|
import { RuntimeError } from '../../../../types.js';
|
|
20
|
-
import { inferType, checkType } from '../../values.js';
|
|
24
|
+
import { inferType, checkType, isTypeValue } from '../../values.js';
|
|
25
|
+
import { getVariable } from '../../context.js';
|
|
21
26
|
/**
|
|
22
27
|
* TypesMixin implementation.
|
|
23
28
|
*
|
|
@@ -28,6 +33,7 @@ import { inferType, checkType } from '../../values.js';
|
|
|
28
33
|
* Depends on:
|
|
29
34
|
* - EvaluatorBase: ctx, checkAborted(), getNodeLocation()
|
|
30
35
|
* - evaluatePostfixExpr() (from future CoreMixin composition)
|
|
36
|
+
* - evaluateExpression() (from CoreMixin, for type constructor arg evaluation)
|
|
31
37
|
*
|
|
32
38
|
* Methods added:
|
|
33
39
|
* - assertType(value, expected, location?) -> RillValue
|
|
@@ -35,15 +41,46 @@ import { inferType, checkType } from '../../values.js';
|
|
|
35
41
|
* - evaluateTypeCheck(node, input) -> Promise<boolean>
|
|
36
42
|
* - evaluateTypeAssertionPrimary(node) -> Promise<RillValue>
|
|
37
43
|
* - evaluateTypeCheckPrimary(node) -> Promise<boolean>
|
|
44
|
+
* - evaluateTypeConstructor(node) -> Promise<RillTypeValue>
|
|
45
|
+
* - evaluateClosureSigLiteral(node) -> Promise<RillTypeValue>
|
|
38
46
|
*/
|
|
39
47
|
function createTypesMixin(Base) {
|
|
40
48
|
return class TypesEvaluator extends Base {
|
|
49
|
+
/**
|
|
50
|
+
* Resolve a TypeRef to a RillTypeValue [IR-12].
|
|
51
|
+
*
|
|
52
|
+
* Static refs return a frozen RillTypeValue directly.
|
|
53
|
+
* Dynamic refs call getVariable, then dispatch on the result:
|
|
54
|
+
* - RillTypeValue → return as-is
|
|
55
|
+
* - Otherwise → throw RILL-R004
|
|
56
|
+
*
|
|
57
|
+
* EC-1: Variable not found → undefined from getVariable → RILL-R005.
|
|
58
|
+
* EC-2/EC-3: Non-type value → RILL-R004.
|
|
59
|
+
*/
|
|
60
|
+
resolveTypeRef(typeRef, getVariable) {
|
|
61
|
+
if (typeRef.kind === 'static') {
|
|
62
|
+
return Object.freeze({
|
|
63
|
+
__rill_type: true,
|
|
64
|
+
typeName: typeRef.typeName,
|
|
65
|
+
structure: { kind: 'primitive', name: typeRef.typeName },
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
const result = getVariable(typeRef.varName);
|
|
69
|
+
if (result === undefined) {
|
|
70
|
+
throw new RuntimeError('RILL-R005', `Variable $${typeRef.varName} is not defined`);
|
|
71
|
+
}
|
|
72
|
+
if (isTypeValue(result))
|
|
73
|
+
return result;
|
|
74
|
+
throw new RuntimeError('RILL-R004', `Variable $${typeRef.varName} is not a valid type reference (got ${inferType(result)})`);
|
|
75
|
+
}
|
|
41
76
|
/**
|
|
42
77
|
* Assert that a value is of the expected type.
|
|
43
78
|
* Returns the value unchanged if assertion passes, throws on mismatch.
|
|
44
79
|
* Exported for use by type assertion evaluation.
|
|
45
80
|
*/
|
|
46
81
|
assertType(value, expected, location) {
|
|
82
|
+
if (expected === 'any')
|
|
83
|
+
return value;
|
|
47
84
|
const actual = inferType(value);
|
|
48
85
|
if (actual !== expected) {
|
|
49
86
|
throw new RuntimeError('RILL-R004', `Type assertion failed: expected ${expected}, got ${actual}`, location, { expectedType: expected, actualType: actual });
|
|
@@ -61,7 +98,8 @@ function createTypesMixin(Base) {
|
|
|
61
98
|
? // eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
62
99
|
await this.evaluatePostfixExpr(node.operand)
|
|
63
100
|
: input;
|
|
64
|
-
|
|
101
|
+
const resolved = this.resolveTypeRef(node.typeRef, (name) => getVariable(this.ctx, name));
|
|
102
|
+
return this.assertType(value, resolved.typeName, node.span.start);
|
|
65
103
|
}
|
|
66
104
|
/**
|
|
67
105
|
* Evaluate type check: expr:?type or :?type (shorthand for $:?type).
|
|
@@ -74,7 +112,8 @@ function createTypesMixin(Base) {
|
|
|
74
112
|
? // eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
75
113
|
await this.evaluatePostfixExpr(node.operand)
|
|
76
114
|
: input;
|
|
77
|
-
|
|
115
|
+
const resolved = this.resolveTypeRef(node.typeRef, (name) => getVariable(this.ctx, name));
|
|
116
|
+
return checkType(value, resolved.typeName);
|
|
78
117
|
}
|
|
79
118
|
/**
|
|
80
119
|
* Evaluate postfix type assertion: expr:type.
|
|
@@ -100,6 +139,166 @@ function createTypesMixin(Base) {
|
|
|
100
139
|
const value = await this.evaluatePostfixExpr(node.operand);
|
|
101
140
|
return this.evaluateTypeCheck(node, value);
|
|
102
141
|
}
|
|
142
|
+
/**
|
|
143
|
+
* Evaluate a type constructor node into a RillTypeValue [IR-7].
|
|
144
|
+
*
|
|
145
|
+
* Handles list(T), dict(k: T, ...), tuple(T1, T2, ...), ordered(k: T, ...).
|
|
146
|
+
* All arguments must evaluate to RillTypeValue.
|
|
147
|
+
*
|
|
148
|
+
* Error contracts:
|
|
149
|
+
* - EC-4: list() with != 1 arg -> RILL-R004
|
|
150
|
+
* - EC-5: non-type argument -> RILL-R004
|
|
151
|
+
* - EC-6: positional arg in dict/ordered -> RILL-R004
|
|
152
|
+
* - EC-7: named arg in tuple -> RILL-R004
|
|
153
|
+
*/
|
|
154
|
+
async evaluateTypeConstructor(node) {
|
|
155
|
+
const name = node.constructorName;
|
|
156
|
+
const location = node.span.start;
|
|
157
|
+
// Helper: evaluate one arg expression and assert it is a RillTypeValue
|
|
158
|
+
const resolveArgAsType = async (argValue) => {
|
|
159
|
+
if (!isTypeValue(argValue)) {
|
|
160
|
+
throw new RuntimeError('RILL-R004', `Type constructor argument must be a type value, got ${inferType(argValue)}`, location);
|
|
161
|
+
}
|
|
162
|
+
return argValue.structure.kind === 'any' &&
|
|
163
|
+
argValue.typeName !== 'any'
|
|
164
|
+
? { kind: 'primitive', name: argValue.typeName }
|
|
165
|
+
: argValue.structure;
|
|
166
|
+
};
|
|
167
|
+
if (name === 'list') {
|
|
168
|
+
// EC-4: list() requires exactly 1 argument
|
|
169
|
+
if (node.args.length !== 1) {
|
|
170
|
+
throw new RuntimeError('RILL-R004', 'list() requires exactly 1 type argument', location);
|
|
171
|
+
}
|
|
172
|
+
const arg = node.args[0];
|
|
173
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
174
|
+
const argVal = await this.evaluateExpression(arg.value);
|
|
175
|
+
const elementType = await resolveArgAsType(argVal);
|
|
176
|
+
const structure = {
|
|
177
|
+
kind: 'list',
|
|
178
|
+
element: elementType,
|
|
179
|
+
};
|
|
180
|
+
return Object.freeze({
|
|
181
|
+
__rill_type: true,
|
|
182
|
+
typeName: 'list',
|
|
183
|
+
structure,
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
if (name === 'dict') {
|
|
187
|
+
// EC-6: dict() requires named arguments
|
|
188
|
+
for (const arg of node.args) {
|
|
189
|
+
if (arg.kind === 'positional') {
|
|
190
|
+
throw new RuntimeError('RILL-R004', 'dict() requires named arguments (field: type)', location);
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
const fields = {};
|
|
194
|
+
for (const arg of node.args) {
|
|
195
|
+
if (arg.kind === 'named') {
|
|
196
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
197
|
+
const argVal = await this.evaluateExpression(arg.value);
|
|
198
|
+
fields[arg.name] = await resolveArgAsType(argVal);
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
const structure = { kind: 'dict', fields };
|
|
202
|
+
return Object.freeze({
|
|
203
|
+
__rill_type: true,
|
|
204
|
+
typeName: 'dict',
|
|
205
|
+
structure,
|
|
206
|
+
});
|
|
207
|
+
}
|
|
208
|
+
if (name === 'tuple') {
|
|
209
|
+
// EC-7: tuple() requires positional arguments
|
|
210
|
+
for (const arg of node.args) {
|
|
211
|
+
if (arg.kind === 'named') {
|
|
212
|
+
throw new RuntimeError('RILL-R004', 'tuple() requires positional arguments', location);
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
const elements = [];
|
|
216
|
+
for (const arg of node.args) {
|
|
217
|
+
if (arg.kind === 'positional') {
|
|
218
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
219
|
+
const argVal = await this.evaluateExpression(arg.value);
|
|
220
|
+
elements.push(await resolveArgAsType(argVal));
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
const structure = { kind: 'tuple', elements };
|
|
224
|
+
return Object.freeze({
|
|
225
|
+
__rill_type: true,
|
|
226
|
+
typeName: 'tuple',
|
|
227
|
+
structure,
|
|
228
|
+
});
|
|
229
|
+
}
|
|
230
|
+
// name === 'ordered'
|
|
231
|
+
// EC-6: ordered() requires named arguments
|
|
232
|
+
for (const arg of node.args) {
|
|
233
|
+
if (arg.kind === 'positional') {
|
|
234
|
+
throw new RuntimeError('RILL-R004', 'ordered() requires named arguments (field: type)', location);
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
const orderedFields = [];
|
|
238
|
+
for (const arg of node.args) {
|
|
239
|
+
if (arg.kind === 'named') {
|
|
240
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
241
|
+
const argVal = await this.evaluateExpression(arg.value);
|
|
242
|
+
orderedFields.push([arg.name, await resolveArgAsType(argVal)]);
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
const structure = {
|
|
246
|
+
kind: 'ordered',
|
|
247
|
+
fields: orderedFields,
|
|
248
|
+
};
|
|
249
|
+
return Object.freeze({
|
|
250
|
+
__rill_type: true,
|
|
251
|
+
typeName: 'ordered',
|
|
252
|
+
structure,
|
|
253
|
+
});
|
|
254
|
+
}
|
|
255
|
+
/**
|
|
256
|
+
* Evaluate a closure signature literal into a RillTypeValue [IR-8].
|
|
257
|
+
*
|
|
258
|
+
* Creates a closure type value from |param: T, ...|: R syntax.
|
|
259
|
+
* Each parameter produces a [name, RillStructuralType] entry.
|
|
260
|
+
*
|
|
261
|
+
* Error contracts:
|
|
262
|
+
* - EC-8: missing return type -> RILL-R004 (enforced at parse time; node always has returnType)
|
|
263
|
+
* - EC-9: non-type in parameter position -> RILL-R004
|
|
264
|
+
*/
|
|
265
|
+
async evaluateClosureSigLiteral(node) {
|
|
266
|
+
const location = node.span.start;
|
|
267
|
+
// Helper: evaluate a type expression and extract RillStructuralType
|
|
268
|
+
const resolveTypeExpr = async (argVal) => {
|
|
269
|
+
if (!isTypeValue(argVal)) {
|
|
270
|
+
throw new RuntimeError('RILL-R004', `Parameter type must be a type value, got ${inferType(argVal)}`, location);
|
|
271
|
+
}
|
|
272
|
+
return argVal.structure.kind === 'any' &&
|
|
273
|
+
argVal.typeName !== 'any'
|
|
274
|
+
? { kind: 'primitive', name: argVal.typeName }
|
|
275
|
+
: argVal.structure;
|
|
276
|
+
};
|
|
277
|
+
// Evaluate parameter types
|
|
278
|
+
const params = [];
|
|
279
|
+
for (const param of node.params) {
|
|
280
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
281
|
+
const paramVal = await this.evaluateExpression(param.typeExpr);
|
|
282
|
+
const paramType = await resolveTypeExpr(paramVal);
|
|
283
|
+
params.push([param.name, paramType]);
|
|
284
|
+
}
|
|
285
|
+
// Evaluate return type (EC-8: required — parser enforces this at parse time)
|
|
286
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
287
|
+
const retVal = await this.evaluateExpression(node.returnType);
|
|
288
|
+
if (!isTypeValue(retVal)) {
|
|
289
|
+
throw new RuntimeError('RILL-R004', `Closure type literal requires return type after |, got ${inferType(retVal)}`, location);
|
|
290
|
+
}
|
|
291
|
+
const ret = retVal.structure.kind === 'any' &&
|
|
292
|
+
retVal.typeName !== 'any'
|
|
293
|
+
? { kind: 'primitive', name: retVal.typeName }
|
|
294
|
+
: retVal.structure;
|
|
295
|
+
const structure = { kind: 'closure', params, ret };
|
|
296
|
+
return Object.freeze({
|
|
297
|
+
__rill_type: true,
|
|
298
|
+
typeName: 'closure',
|
|
299
|
+
structure,
|
|
300
|
+
});
|
|
301
|
+
}
|
|
103
302
|
};
|
|
104
303
|
}
|
|
105
304
|
// Export with type assertion to work around TS4094 limitation
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/runtime/core/eval/mixins/types.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/runtime/core/eval/mixins/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/core/eval/mixins/variables.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;
|
|
1
|
+
{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/core/eval/mixins/variables.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AA4wBH,eAAO,MAAM,cAAc,EAA2B,GAAG,CAAC"}
|
|
@@ -31,9 +31,10 @@
|
|
|
31
31
|
* @internal
|
|
32
32
|
*/
|
|
33
33
|
import { RuntimeError } from '../../../../types.js';
|
|
34
|
-
import { inferType } from '../../values.js';
|
|
34
|
+
import { inferType, isTypeValue } from '../../values.js';
|
|
35
35
|
import { getVariable, hasVariable } from '../../context.js';
|
|
36
36
|
import { isDict, isCallable } from '../../callable.js';
|
|
37
|
+
import { BUILTIN_METHODS } from '../../../ext/builtins.js';
|
|
37
38
|
/**
|
|
38
39
|
* VariablesMixin implementation.
|
|
39
40
|
*
|
|
@@ -63,7 +64,10 @@ function createVariablesMixin(Base) {
|
|
|
63
64
|
setVariable(name, value, explicitType, location) {
|
|
64
65
|
const valueType = inferType(value);
|
|
65
66
|
// Check explicit type annotation matches value
|
|
66
|
-
|
|
67
|
+
// 'any' type bypasses type checking: accepts any value by definition
|
|
68
|
+
if (explicitType !== undefined &&
|
|
69
|
+
explicitType !== 'any' &&
|
|
70
|
+
explicitType !== valueType) {
|
|
67
71
|
throw new RuntimeError('RILL-R001', `Type mismatch: cannot assign ${valueType} to $${name}:${explicitType}`, location, {
|
|
68
72
|
variableName: name,
|
|
69
73
|
expectedType: explicitType,
|
|
@@ -79,7 +83,9 @@ function createVariablesMixin(Base) {
|
|
|
79
83
|
}
|
|
80
84
|
// Check if variable already has a locked type in current scope
|
|
81
85
|
const lockedType = this.ctx.variableTypes.get(name);
|
|
82
|
-
if (lockedType !== undefined &&
|
|
86
|
+
if (lockedType !== undefined &&
|
|
87
|
+
lockedType !== 'any' &&
|
|
88
|
+
lockedType !== valueType) {
|
|
83
89
|
throw new RuntimeError('RILL-R001', `Type mismatch: cannot assign ${valueType} to $${name} (locked as ${lockedType})`, location, {
|
|
84
90
|
variableName: name,
|
|
85
91
|
expectedType: lockedType,
|
|
@@ -212,6 +218,27 @@ function createVariablesMixin(Base) {
|
|
|
212
218
|
}
|
|
213
219
|
}
|
|
214
220
|
}
|
|
221
|
+
else if (field in BUILTIN_METHODS) {
|
|
222
|
+
// Field is a built-in method - invoke it
|
|
223
|
+
// Create a synthetic MethodCallNode with no args and call evaluateMethod
|
|
224
|
+
const methodNode = {
|
|
225
|
+
type: 'MethodCall',
|
|
226
|
+
name: field,
|
|
227
|
+
args: [],
|
|
228
|
+
receiverSpan: null,
|
|
229
|
+
span: node.span,
|
|
230
|
+
};
|
|
231
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
232
|
+
value = await this.evaluateMethod(methodNode, value);
|
|
233
|
+
}
|
|
234
|
+
else if (isTypeValue(value)) {
|
|
235
|
+
if (field === 'name') {
|
|
236
|
+
value = value.typeName;
|
|
237
|
+
}
|
|
238
|
+
else {
|
|
239
|
+
throw new RuntimeError('RILL-R003', `Type value has no property "${field}"`, this.getNodeLocation(node));
|
|
240
|
+
}
|
|
241
|
+
}
|
|
215
242
|
else if (isDict(value)) {
|
|
216
243
|
// Allow missing fields if there's a default value or existence check
|
|
217
244
|
const allowMissing = node.defaultValue !== null || node.existenceCheck !== null;
|
|
@@ -486,8 +513,16 @@ function createVariablesMixin(Base) {
|
|
|
486
513
|
* Handles capture syntax which assigns the piped value to a variable.
|
|
487
514
|
* Calls setVariable for type checking and fires observability callback.
|
|
488
515
|
*/
|
|
489
|
-
evaluateCapture(node, input) {
|
|
490
|
-
|
|
516
|
+
async evaluateCapture(node, input) {
|
|
517
|
+
if (node.typeRef !== null) {
|
|
518
|
+
// Resolve TypeRef and validate against the declared type
|
|
519
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
520
|
+
const resolved = this.resolveTypeRef(node.typeRef, (name) => getVariable(this.ctx, name));
|
|
521
|
+
this.setVariable(node.name, input, resolved.typeName, node.span.start);
|
|
522
|
+
}
|
|
523
|
+
else {
|
|
524
|
+
this.setVariable(node.name, input, undefined, node.span.start);
|
|
525
|
+
}
|
|
491
526
|
this.ctx.observability.onCapture?.({ name: node.name, value: input });
|
|
492
527
|
return input;
|
|
493
528
|
}
|
|
@@ -496,10 +531,10 @@ function createVariablesMixin(Base) {
|
|
|
496
531
|
* Returns capture info if a capture occurred.
|
|
497
532
|
* This overrides the stub in EvaluatorBase.
|
|
498
533
|
*/
|
|
499
|
-
handleCapture(capture, value) {
|
|
534
|
+
async handleCapture(capture, value) {
|
|
500
535
|
if (!capture)
|
|
501
536
|
return undefined;
|
|
502
|
-
this.evaluateCapture(capture, value);
|
|
537
|
+
await this.evaluateCapture(capture, value);
|
|
503
538
|
return { name: capture.name, value };
|
|
504
539
|
}
|
|
505
540
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../../../../src/runtime/core/eval/mixins/variables.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../../../../src/runtime/core/eval/mixins/variables.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/runtime/core/execute.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAGV,UAAU,EAEX,MAAM,gBAAgB,CAAC;AAQxB,OAAO,KAAK,EACV,eAAe,EACf,gBAAgB,EAChB,cAAc,EAEf,MAAM,YAAY,CAAC;AAGpB;;;;;;GAMG;AACH,wBAAsB,OAAO,CAC3B,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,eAAe,CAAC,CAM1B;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,cAAc,GACtB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/runtime/core/execute.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAGV,UAAU,EAEX,MAAM,gBAAgB,CAAC;AAQxB,OAAO,KAAK,EACV,eAAe,EACf,gBAAgB,EAChB,cAAc,EAEf,MAAM,YAAY,CAAC;AAGpB;;;;;;GAMG;AACH,wBAAsB,OAAO,CAC3B,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,eAAe,CAAC,CAM1B;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,cAAc,GACtB,gBAAgB,CA4IlB"}
|
|
@@ -35,13 +35,6 @@ export function createStepper(script, context) {
|
|
|
35
35
|
let index = 0;
|
|
36
36
|
let lastValue = null;
|
|
37
37
|
let isDone = total === 0;
|
|
38
|
-
const collectVariables = () => {
|
|
39
|
-
const vars = {};
|
|
40
|
-
for (const [name, value] of context.variables) {
|
|
41
|
-
vars[name] = value;
|
|
42
|
-
}
|
|
43
|
-
return vars;
|
|
44
|
-
};
|
|
45
38
|
return {
|
|
46
39
|
get done() {
|
|
47
40
|
return isDone;
|
|
@@ -148,15 +141,9 @@ export function createStepper(script, context) {
|
|
|
148
141
|
if (context.pipeValue === null) {
|
|
149
142
|
throw new RuntimeError('RILL-R005', 'Undefined variable: $', undefined, { variable: '$' });
|
|
150
143
|
}
|
|
151
|
-
return {
|
|
152
|
-
value: context.pipeValue,
|
|
153
|
-
variables: collectVariables(),
|
|
154
|
-
};
|
|
144
|
+
return { result: context.pipeValue };
|
|
155
145
|
}
|
|
156
|
-
return {
|
|
157
|
-
value: lastValue,
|
|
158
|
-
variables: collectVariables(),
|
|
159
|
-
};
|
|
146
|
+
return { result: lastValue };
|
|
160
147
|
},
|
|
161
148
|
};
|
|
162
149
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/runtime/core/execute.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,GACb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAS5C;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,MAAkB,EAClB,OAAuB;IAEvB,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/C,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IACD,OAAO,OAAO,CAAC,SAAS,EAAE,CAAC;AAC7B,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAC3B,MAAkB,EAClB,OAAuB;IAEvB,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IACrC,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC;IAChC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,SAAS,GAAc,IAAI,CAAC;IAChC,IAAI,MAAM,GAAG,KAAK,KAAK,CAAC,CAAC;IAEzB,
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/runtime/core/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Field Descriptor Builder
|
|
3
|
+
*
|
|
4
|
+
* Constructs a frozen RillFieldDescriptor for a named field within a
|
|
5
|
+
* RillStructuralType dict. Used during structural type field access to carry
|
|
6
|
+
* field name and field type.
|
|
7
|
+
*
|
|
8
|
+
* @internal
|
|
9
|
+
*/
|
|
10
|
+
import type { SourceLocation } from '../../types.js';
|
|
11
|
+
import type { RillStructuralType } from './values.js';
|
|
12
|
+
/**
|
|
13
|
+
* Field descriptor — carries field name and structural type when accessing a
|
|
14
|
+
* dict-kind RillStructuralType field.
|
|
15
|
+
*/
|
|
16
|
+
export interface RillFieldDescriptor {
|
|
17
|
+
readonly __rill_field_descriptor: true;
|
|
18
|
+
readonly fieldName: string;
|
|
19
|
+
readonly fieldType: RillStructuralType;
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Build a frozen RillFieldDescriptor for the given field in a structural dict type.
|
|
23
|
+
*
|
|
24
|
+
* EC-1: Throws RILL-R003 when fieldName is absent from structuralType.fields.
|
|
25
|
+
*/
|
|
26
|
+
export declare function buildFieldDescriptor(structuralType: RillStructuralType & {
|
|
27
|
+
kind: 'dict';
|
|
28
|
+
}, fieldName: string, location: SourceLocation): RillFieldDescriptor;
|
|
29
|
+
//# sourceMappingURL=field-descriptor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"field-descriptor.d.ts","sourceRoot":"","sources":["../../../src/runtime/core/field-descriptor.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtD;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,uBAAuB,EAAE,IAAI,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,kBAAkB,CAAC;CACxC;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,cAAc,EAAE,kBAAkB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,cAAc,GACvB,mBAAmB,CAcrB"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Field Descriptor Builder
|
|
3
|
+
*
|
|
4
|
+
* Constructs a frozen RillFieldDescriptor for a named field within a
|
|
5
|
+
* RillStructuralType dict. Used during structural type field access to carry
|
|
6
|
+
* field name and field type.
|
|
7
|
+
*
|
|
8
|
+
* @internal
|
|
9
|
+
*/
|
|
10
|
+
import { RuntimeError } from '../../types.js';
|
|
11
|
+
/**
|
|
12
|
+
* Build a frozen RillFieldDescriptor for the given field in a structural dict type.
|
|
13
|
+
*
|
|
14
|
+
* EC-1: Throws RILL-R003 when fieldName is absent from structuralType.fields.
|
|
15
|
+
*/
|
|
16
|
+
export function buildFieldDescriptor(structuralType, fieldName, location) {
|
|
17
|
+
const fieldType = structuralType.fields[fieldName];
|
|
18
|
+
if (fieldType === undefined) {
|
|
19
|
+
throw new RuntimeError('RILL-R003', `Shape has no field "${fieldName}"`, location);
|
|
20
|
+
}
|
|
21
|
+
return Object.freeze({
|
|
22
|
+
__rill_field_descriptor: true,
|
|
23
|
+
fieldName,
|
|
24
|
+
fieldType,
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=field-descriptor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"field-descriptor.js","sourceRoot":"","sources":["../../../src/runtime/core/field-descriptor.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAa9C;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAClC,cAAqD,EACrD,SAAiB,EACjB,QAAwB;IAExB,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACnD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,YAAY,CACpB,WAAW,EACX,uBAAuB,SAAS,GAAG,EACnC,QAAQ,CACT,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,uBAAuB,EAAE,IAAa;QACtC,SAAS;QACT,SAAS;KACV,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
import type { RillTypeName } from '../../types.js';
|
|
8
8
|
import type { CallableFn, HostFunctionDefinition } from './callable.js';
|
|
9
9
|
import type { RillValue } from './values.js';
|
|
10
|
+
export type { NativeArray, NativePlainObject, NativeValue } from './values.js';
|
|
10
11
|
/**
|
|
11
12
|
* Method signature for built-in methods.
|
|
12
13
|
* Methods are called on a receiver value: $val.method(args)
|
|
@@ -16,7 +17,7 @@ export type RillMethod = (receiver: RillValue, args: RillValue[], ctx: RuntimeCo
|
|
|
16
17
|
/** I/O callbacks for runtime operations */
|
|
17
18
|
export interface RuntimeCallbacks {
|
|
18
19
|
/** Called when .log is invoked */
|
|
19
|
-
onLog: (
|
|
20
|
+
onLog: (message: string) => void;
|
|
20
21
|
/** Called when extensions emit diagnostic events */
|
|
21
22
|
onLogEvent?: (event: ExtensionEvent) => void;
|
|
22
23
|
}
|
|
@@ -125,14 +126,22 @@ export interface RuntimeContext {
|
|
|
125
126
|
/**
|
|
126
127
|
* Annotation stack for statement annotations.
|
|
127
128
|
* Each entry is a dict of annotation key-value pairs.
|
|
128
|
-
*
|
|
129
|
+
* Annotations do not inherit — each annotated statement carries only its own annotations.
|
|
129
130
|
*/
|
|
130
131
|
readonly annotationStack: Record<string, RillValue>[];
|
|
132
|
+
/**
|
|
133
|
+
* Annotations for the immediate next child statement only.
|
|
134
|
+
* Set by executeAnnotatedStatement() and read by captureClosureAnnotations().
|
|
135
|
+
* Not inherited through the scope chain — cleared after one statement.
|
|
136
|
+
*/
|
|
137
|
+
immediateAnnotation: Record<string, RillValue> | undefined;
|
|
131
138
|
/**
|
|
132
139
|
* Call stack for error context.
|
|
133
140
|
* Managed by evaluator; pushed on function entry, popped on exit.
|
|
134
141
|
*/
|
|
135
142
|
readonly callStack: import('../../types.js').CallFrame[];
|
|
143
|
+
/** Arbitrary string metadata passed from the host (e.g. request IDs, user IDs) */
|
|
144
|
+
readonly metadata?: Record<string, string> | undefined;
|
|
136
145
|
}
|
|
137
146
|
/** Options for creating a runtime context */
|
|
138
147
|
export interface RuntimeOptions {
|
|
@@ -154,13 +163,13 @@ export interface RuntimeOptions {
|
|
|
154
163
|
requireDescriptions?: boolean;
|
|
155
164
|
/** Maximum call stack depth (default: 100) */
|
|
156
165
|
maxCallStackDepth?: number;
|
|
166
|
+
/** Arbitrary string metadata passed through to the runtime context */
|
|
167
|
+
metadata?: Record<string, string>;
|
|
157
168
|
}
|
|
158
169
|
/** Result of script execution */
|
|
159
170
|
export interface ExecutionResult {
|
|
160
|
-
/** Final
|
|
161
|
-
|
|
162
|
-
/** All captured variables */
|
|
163
|
-
variables: Record<string, RillValue>;
|
|
171
|
+
/** Final result returned by the script */
|
|
172
|
+
result: RillValue;
|
|
164
173
|
}
|
|
165
174
|
/** Result of a single step execution */
|
|
166
175
|
export interface StepResult {
|