@kernlang/core 4.0.1-canary.225.1.f5c8d5fe → 4.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.
- package/dist/codegen/body-ts.js +6 -0
- package/dist/codegen/body-ts.js.map +1 -1
- package/dist/codegen/stdlib-preamble.d.ts +29 -0
- package/dist/codegen/stdlib-preamble.js +52 -1
- package/dist/codegen/stdlib-preamble.js.map +1 -1
- package/dist/codegen/type-system.js +8 -1
- package/dist/codegen/type-system.js.map +1 -1
- package/dist/codegen-expression.d.ts +10 -0
- package/dist/codegen-expression.js +40 -9
- package/dist/codegen-expression.js.map +1 -1
- package/dist/index.d.ts +3 -3
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/ir/semantics/portable-error.d.ts +51 -0
- package/dist/ir/semantics/portable-error.js +70 -0
- package/dist/ir/semantics/portable-error.js.map +1 -0
- package/dist/ir/semantics/portable-scalar.d.ts +12 -0
- package/dist/ir/semantics/portable-scalar.js +59 -10
- package/dist/ir/semantics/portable-scalar.js.map +1 -1
- package/dist/ir/semantics/primitives.js +82 -18
- package/dist/ir/semantics/primitives.js.map +1 -1
- package/dist/ir/semantics/trace.d.ts +12 -0
- package/dist/ir/semantics/trace.js +4 -0
- package/dist/ir/semantics/trace.js.map +1 -1
- package/dist/ir/semantics/try.js +33 -3
- package/dist/ir/semantics/try.js.map +1 -1
- package/dist/ir/semantics/ts-leg.js +17 -0
- package/dist/ir/semantics/ts-leg.js.map +1 -1
- package/dist/rag-embed-resolver.js +1 -0
- package/dist/rag-embed-resolver.js.map +1 -1
- package/dist/rag-embedding-node.d.ts +6 -0
- package/dist/rag-embedding-node.js +90 -5
- package/dist/rag-embedding-node.js.map +1 -1
- package/dist/rag-retrieve-runner.d.ts +2 -3
- package/dist/rag-retrieve-runner.js +204 -20
- package/dist/rag-retrieve-runner.js.map +1 -1
- package/dist/rag-runtime.d.ts +13 -2
- package/dist/rag-runtime.js +110 -14
- package/dist/rag-runtime.js.map +1 -1
- package/dist/semantic-validator.d.ts +9 -0
- package/dist/semantic-validator.js +59 -5
- package/dist/semantic-validator.js.map +1 -1
- package/dist/spec.d.ts +1 -1
- package/dist/spec.js +1 -1
- package/dist/spec.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"portable-error.js","sourceRoot":"","sources":["../../../src/ir/semantics/portable-error.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAIH,OAAO,EAAE,gBAAgB,EAAyB,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGlG;;;;mBAImB;AACnB,MAAM,UAAU,oBAAoB,CAAC,KAAqB;IACxD,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IACnD,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,CAAC,EAAE,IAAa,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;AACxG,CAAC;AAED;;;;;yCAKyC;AACzC,MAAM,UAAU,oBAAoB,CAAC,IAAa;IAChD,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IACtC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC;IAC1B,OAAO,CACL,GAAG,CAAC,IAAI,KAAK,MAAM;QACnB,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO;QAC3B,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO;QAC3B,CAAC,GAAG,CAAC,QAAQ;QACb,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CACtB,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAAa,EAAE,GAAgB;IACpE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;IACrF,CAAC;IACD,MAAM,GAAG,GAAI,IAAI,CAAC,QAA+C,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5C,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;IACxF,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;AACpC,CAAC"}
|
|
@@ -36,6 +36,18 @@ export interface DecimalValue {
|
|
|
36
36
|
}
|
|
37
37
|
/** Build a tagged runtime Decimal value from its canonical rendered string. */
|
|
38
38
|
export declare function makeDecimalValue(canonical: string): DecimalValue;
|
|
39
|
+
/** Brand symbol marking a runtime CAUGHT-ERROR value (see `portable-error.ts`). */
|
|
40
|
+
export declare const CAUGHT_ERROR_TAG: unique symbol;
|
|
41
|
+
/** The runner's tagged caught-error value: a frozen object carrying the brand,
|
|
42
|
+
* the canonical error `kind`, and the evaluated literal `message`. NOT a
|
|
43
|
+
* portable scalar. */
|
|
44
|
+
export interface CaughtErrorValue {
|
|
45
|
+
readonly [CAUGHT_ERROR_TAG]: true;
|
|
46
|
+
readonly kind: string;
|
|
47
|
+
readonly message: string;
|
|
48
|
+
}
|
|
49
|
+
/** True iff `value` is a tagged caught-error value. */
|
|
50
|
+
export declare function isCaughtErrorValue(value: unknown): value is CaughtErrorValue;
|
|
39
51
|
/** True iff `value` is a tagged runtime Decimal value produced by
|
|
40
52
|
* {@link makeDecimalValue}. */
|
|
41
53
|
export declare function isDecimalValue(value: unknown): value is DecimalValue;
|
|
@@ -103,6 +103,27 @@ export const DECIMAL_VALUE_TAG = Symbol('kern.decimalValue');
|
|
|
103
103
|
export function makeDecimalValue(canonical) {
|
|
104
104
|
return Object.freeze({ [DECIMAL_VALUE_TAG]: true, canonical });
|
|
105
105
|
}
|
|
106
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
107
|
+
// TAGGED runtime CAUGHT-ERROR VALUE — the runner's internal representation of an
|
|
108
|
+
// error bound to a `catch name=…` binding (error-substrate Slice 1). Like the
|
|
109
|
+
// Decimal tag above it is DELIBERATELY not a portable scalar, so any downstream
|
|
110
|
+
// read of the catch binding OTHER than the admitted `.message` access hits
|
|
111
|
+
// `assertPortableScalar` and throws → the precondition catches it → the runner
|
|
112
|
+
// ABSTAINS (the fail-close fence: a bare `return e`, `e.name`, `e.stack` never
|
|
113
|
+
// produce a divergent value). Only the `member` case below reads through the
|
|
114
|
+
// tag, and ONLY for `.message`. The tag + recognition helpers live in
|
|
115
|
+
// `portable-error.ts`; the VALUE shape lives here so the `member` case can read
|
|
116
|
+
// it without a module cycle.
|
|
117
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
118
|
+
/** Brand symbol marking a runtime CAUGHT-ERROR value (see `portable-error.ts`). */
|
|
119
|
+
export const CAUGHT_ERROR_TAG = Symbol('kern.caughtError');
|
|
120
|
+
/** True iff `value` is a tagged caught-error value. */
|
|
121
|
+
export function isCaughtErrorValue(value) {
|
|
122
|
+
return (typeof value === 'object' &&
|
|
123
|
+
value !== null &&
|
|
124
|
+
value[CAUGHT_ERROR_TAG] === true &&
|
|
125
|
+
typeof value.message === 'string');
|
|
126
|
+
}
|
|
106
127
|
/** True iff `value` is a tagged runtime Decimal value produced by
|
|
107
128
|
* {@link makeDecimalValue}. */
|
|
108
129
|
export function isDecimalValue(value) {
|
|
@@ -165,6 +186,30 @@ export function evalPortableValue(node, env) {
|
|
|
165
186
|
return portableTruthy(evalPortableValue(node.test, env))
|
|
166
187
|
? evalPortableValue(node.consequent, env)
|
|
167
188
|
: evalPortableValue(node.alternate, env);
|
|
189
|
+
case 'member': {
|
|
190
|
+
// Error-substrate Slice 1 — the ONLY admitted member read in the portable
|
|
191
|
+
// domain is `<caughtErrorBinding>.message` (a non-optional `.message` on
|
|
192
|
+
// an ident resolving to a tagged caught-error value). It returns the
|
|
193
|
+
// EVALUATED LITERAL message stored when the explicit `throw new Error("…")`
|
|
194
|
+
// was caught — byte-identical to TS `e.message` and Python `str(e)`.
|
|
195
|
+
// EVERYTHING else (a different property, an optional `?.`, a non-ident
|
|
196
|
+
// object, an ident that is not a caught error) throws → the runner
|
|
197
|
+
// ABSTAINS. This is the fail-close fence: `e.name`/`e.stack`/`e` (bare)
|
|
198
|
+
// and any non-caught-error member access never produce a one-leg value.
|
|
199
|
+
if (node.optional)
|
|
200
|
+
throw new Error('portable: optional member access is outside the portable scalar domain');
|
|
201
|
+
if (node.object.kind !== 'ident') {
|
|
202
|
+
throw new Error('portable: member access is only admitted on a caught-error binding');
|
|
203
|
+
}
|
|
204
|
+
const obj = env.bindings.get(node.object.name);
|
|
205
|
+
if (!isCaughtErrorValue(obj)) {
|
|
206
|
+
throw new Error(`portable: member access on "${node.object.name}" is outside the portable scalar domain`);
|
|
207
|
+
}
|
|
208
|
+
if (node.property !== 'message') {
|
|
209
|
+
throw new Error(`portable: caught error has no portable property "${node.property}" (only .message is admitted)`);
|
|
210
|
+
}
|
|
211
|
+
return obj.message;
|
|
212
|
+
}
|
|
168
213
|
case 'typeAssert':
|
|
169
214
|
case 'nonNull':
|
|
170
215
|
return evalPortableValue(node.expression, env);
|
|
@@ -242,18 +287,22 @@ export function evalPortableBinary(node, env) {
|
|
|
242
287
|
return sameType(left, right) ? left === right : false;
|
|
243
288
|
case '!==':
|
|
244
289
|
return sameType(left, right) ? left !== right : true;
|
|
245
|
-
// LOOSE `==`/`!=` cross-type
|
|
246
|
-
//
|
|
247
|
-
//
|
|
248
|
-
//
|
|
290
|
+
// D1b — LOOSE `==`/`!=` cross-type equality is now RECONCILED (was the last
|
|
291
|
+
// abstaining surface here). KERN's loose `==` is NOT JS `==`: it adds ONLY the
|
|
292
|
+
// null/undefined crossing on top of strict equality and does NOT model JS
|
|
293
|
+
// coercion, so un-same-typed scalars are simply NOT loose-equal (`1 == "1"` →
|
|
294
|
+
// false, `true == 1` → false), matching core-runtime's `kernLooseEqual` AND both
|
|
295
|
+
// emitted legs (TS now routes loose ops through the `__kern_loose_eq` helper;
|
|
296
|
+
// Python through `_kern_loose_equal`). Same-type → value compare (for scalars
|
|
297
|
+
// loose === strict). Identical kind-sensitive shape to the D1a strict relax
|
|
298
|
+
// above. The null/undefined crossing is NOT reachable in this reducer: undefined
|
|
299
|
+
// is non-portable → abstains UPSTREAM in `evalPortableValue` → `assertPortableScalar`
|
|
300
|
+
// (same as D1a), so no unreachable nullish handling is added here. A tagged
|
|
301
|
+
// Decimal (or any non-portable) operand still abstains UPSTREAM.
|
|
249
302
|
case '==':
|
|
250
|
-
|
|
251
|
-
throw new Error('portable: equality operands must have the same portable type');
|
|
252
|
-
return left === right;
|
|
303
|
+
return sameType(left, right) ? left === right : false;
|
|
253
304
|
case '!=':
|
|
254
|
-
|
|
255
|
-
throw new Error('portable: equality operands must have the same portable type');
|
|
256
|
-
return left !== right;
|
|
305
|
+
return sameType(left, right) ? left !== right : true;
|
|
257
306
|
case '<':
|
|
258
307
|
case '<=':
|
|
259
308
|
case '>':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portable-scalar.js","sourceRoot":"","sources":["../../../src/ir/semantics/portable-scalar.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"portable-scalar.js","sourceRoot":"","sources":["../../../src/ir/semantics/portable-scalar.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,10 @@
|
|
|
16
16
|
* contracts for `do`/`let`/`assign`. `__trace` is a permanent fixture
|
|
17
17
|
* helper — it is never emitted by user code.
|
|
18
18
|
*/
|
|
19
|
+
import { parseExpression } from '../../parser-expression.js';
|
|
19
20
|
import { registerContract } from './index.js';
|
|
21
|
+
import { evalExplicitThrowError } from './portable-error.js';
|
|
22
|
+
import { evalPortableValue } from './portable-scalar.js';
|
|
20
23
|
const NO_FIXTURES = [];
|
|
21
24
|
/** Test-only: emits one trace event. Props.event must be a serialized TraceEvent. */
|
|
22
25
|
export const traceContract = {
|
|
@@ -49,34 +52,95 @@ export const continueContract = {
|
|
|
49
52
|
forbiddenRewrites: [],
|
|
50
53
|
fixtures: NO_FIXTURES,
|
|
51
54
|
};
|
|
55
|
+
/**
|
|
56
|
+
* Resolve a `return` node's value. Two shapes:
|
|
57
|
+
*
|
|
58
|
+
* 1. A NON-string `props.value` (a hand-built fixture's raw `42` / `9` / `7`,
|
|
59
|
+
* or `undefined`) — passed through verbatim, exactly as before. Reference-
|
|
60
|
+
* runner fixtures (each/branch/while/if/try) rely on this raw passthrough.
|
|
61
|
+
* 2. A STRING `props.value` (the parser's `return value="m"` /
|
|
62
|
+
* `return value="e.message"`) — evaluated as a portable expression against
|
|
63
|
+
* the current env, so a binding read resolves to its value and the
|
|
64
|
+
* error-substrate `<caughtBinding>.message` read returns the literal
|
|
65
|
+
* message. A string that is NOT a portable expression (`return e` bare,
|
|
66
|
+
* `return e.name`/`e.stack`) throws → the runner abstains (fail-close).
|
|
67
|
+
*
|
|
68
|
+
* `import`s are deferred-resolved (parser/portable evaluator) at call time, so
|
|
69
|
+
* this stays a tiny primitive.
|
|
70
|
+
*/
|
|
71
|
+
function resolveReturnValue(ir, env) {
|
|
72
|
+
const value = ir.props?.value;
|
|
73
|
+
if (typeof value !== 'string')
|
|
74
|
+
return value;
|
|
75
|
+
return evalPortableValue(parseExpression(value), env);
|
|
76
|
+
}
|
|
52
77
|
export const returnContract = {
|
|
53
78
|
nodeType: 'return',
|
|
54
|
-
preconditions: () =>
|
|
55
|
-
|
|
79
|
+
preconditions: (ir, env) => {
|
|
80
|
+
// A non-string value always admits (raw passthrough). A string value must be
|
|
81
|
+
// a portable expression resolvable in the current env, else the runner
|
|
82
|
+
// abstains cleanly here instead of throwing from effects.
|
|
83
|
+
if (typeof ir.props?.value !== 'string')
|
|
84
|
+
return true;
|
|
85
|
+
try {
|
|
86
|
+
resolveReturnValue(ir, env);
|
|
87
|
+
return true;
|
|
88
|
+
}
|
|
89
|
+
catch {
|
|
90
|
+
return false;
|
|
91
|
+
}
|
|
92
|
+
},
|
|
93
|
+
effects: (ir, env) => ({
|
|
56
94
|
events: [],
|
|
57
|
-
completion: { kind: 'return', value: ir
|
|
95
|
+
completion: { kind: 'return', value: resolveReturnValue(ir, env) },
|
|
58
96
|
}),
|
|
59
|
-
completion: (ir) => ({ kind: 'return', value: ir
|
|
97
|
+
completion: (ir, env) => ({ kind: 'return', value: resolveReturnValue(ir, env) }),
|
|
60
98
|
forbiddenRewrites: [],
|
|
61
99
|
fixtures: NO_FIXTURES,
|
|
62
100
|
};
|
|
101
|
+
/**
|
|
102
|
+
* Resolve a `throw` node to its canonical error, supporting BOTH forms:
|
|
103
|
+
*
|
|
104
|
+
* 1. The fixture/primitive form `{ errorKind: "Error", messagePattern?: … }`
|
|
105
|
+
* — used by the try/each/branch contract fixtures. Unchanged.
|
|
106
|
+
* 2. The body-statement form `throw value="new Error(\"boom\")"` — the
|
|
107
|
+
* EXPLICIT canonical-Error throw the parser produces. Its `value` is a
|
|
108
|
+
* string expression; it is admitted ONLY when it parses to the canonical
|
|
109
|
+
* `new Error(<string-expr>)` shape (see {@link evalExplicitThrowError}),
|
|
110
|
+
* carrying the EVALUATED LITERAL message. A bare-value throw
|
|
111
|
+
* (`throw "raw"`, `throw 42`, `new TypeError(...)`) is NOT admitted here —
|
|
112
|
+
* it throws, so the precondition fails and the runner abstains (the
|
|
113
|
+
* error-substrate fail-close fence).
|
|
114
|
+
*
|
|
115
|
+
* Throws on an unrecognized shape so the precondition (which wraps this in a
|
|
116
|
+
* try) returns false → `referenceRun` raises the normal "Preconditions failed".
|
|
117
|
+
*/
|
|
118
|
+
function resolveThrowError(ir, env) {
|
|
119
|
+
if (typeof ir.props?.errorKind === 'string') {
|
|
120
|
+
return {
|
|
121
|
+
kind: ir.props.errorKind,
|
|
122
|
+
messagePattern: ir.props.messagePattern,
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
if (typeof ir.props?.value === 'string') {
|
|
126
|
+
// Body-statement explicit throw. parseExpression is INSIDE the caller's try.
|
|
127
|
+
return evalExplicitThrowError(parseExpression(ir.props.value), env);
|
|
128
|
+
}
|
|
129
|
+
throw new Error('throw: missing errorKind or explicit `new Error(...)` value');
|
|
130
|
+
}
|
|
63
131
|
export const throwContract = {
|
|
64
132
|
nodeType: 'throw',
|
|
65
|
-
preconditions: (ir) =>
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
133
|
+
preconditions: (ir, env) => {
|
|
134
|
+
try {
|
|
135
|
+
resolveThrowError(ir, env);
|
|
136
|
+
return true;
|
|
137
|
+
}
|
|
138
|
+
catch {
|
|
139
|
+
return false;
|
|
140
|
+
}
|
|
72
141
|
},
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
error: {
|
|
76
|
-
kind: ir.props?.errorKind,
|
|
77
|
-
messagePattern: ir.props?.messagePattern,
|
|
78
|
-
},
|
|
79
|
-
}),
|
|
142
|
+
effects: (ir, env) => ({ events: [], completion: { kind: 'throw', error: resolveThrowError(ir, env) } }),
|
|
143
|
+
completion: (ir, env) => ({ kind: 'throw', error: resolveThrowError(ir, env) }),
|
|
80
144
|
forbiddenRewrites: [],
|
|
81
145
|
fixtures: NO_FIXTURES,
|
|
82
146
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"primitives.js","sourceRoot":"","sources":["../../../src/ir/semantics/primitives.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAuC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"primitives.js","sourceRoot":"","sources":["../../../src/ir/semantics/primitives.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,10 +23,22 @@ export interface CompletionRecord {
|
|
|
23
23
|
* Canonical error shape. Cross-target equality compares `kind` exactly and
|
|
24
24
|
* `messagePattern` as a regex match against the runtime error message —
|
|
25
25
|
* NOT raw text, which diverges between V8 and CPython.
|
|
26
|
+
*
|
|
27
|
+
* `message` carries an EVALUATED LITERAL message and is ONLY set for an
|
|
28
|
+
* EXPLICIT `throw new Error("…")` body-statement (where the message text is
|
|
29
|
+
* authored as a string literal and is therefore byte-identical across V8 and
|
|
30
|
+
* CPython — `Error("x").message` === `str(Exception("x"))`). It exists so a
|
|
31
|
+
* caught-binding `.message` read can return the exact literal. The
|
|
32
|
+
* messagePattern-based canonicalization (used by the fixture differential
|
|
33
|
+
* harness for IMPLICIT/primitive throws, whose raw text diverges) is left
|
|
34
|
+
* untouched: `message` and `messagePattern` are independent, and an error may
|
|
35
|
+
* carry either, both, or neither.
|
|
26
36
|
*/
|
|
27
37
|
export interface CanonicalError {
|
|
28
38
|
kind: string;
|
|
29
39
|
messagePattern?: RegExp;
|
|
40
|
+
/** Evaluated literal message of an explicit `throw new Error("…")`. */
|
|
41
|
+
message?: string;
|
|
30
42
|
}
|
|
31
43
|
export type TraceEvent = {
|
|
32
44
|
op: 'stdout';
|
|
@@ -128,6 +128,10 @@ export function completionsEqual(a, b) {
|
|
|
128
128
|
return false;
|
|
129
129
|
if (a.error.kind !== b.error.kind)
|
|
130
130
|
return false;
|
|
131
|
+
// Evaluated literal message (explicit `throw new Error("…")`). Additive: when
|
|
132
|
+
// both sides omit it (the messagePattern-canonicalized path), this is a no-op.
|
|
133
|
+
if (a.error.message !== b.error.message)
|
|
134
|
+
return false;
|
|
131
135
|
if (!a.error.messagePattern && !b.error.messagePattern)
|
|
132
136
|
return true;
|
|
133
137
|
if (!a.error.messagePattern || !b.error.messagePattern)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../src/ir/semantics/trace.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../src/ir/semantics/trace.ts"],"names":[],"mappings":"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"}
|
package/dist/ir/semantics/try.js
CHANGED
|
@@ -31,6 +31,7 @@
|
|
|
31
31
|
* throwing primitives, and abrupt finally are deferred to a later contract.
|
|
32
32
|
*/
|
|
33
33
|
import { registerContract } from './index.js';
|
|
34
|
+
import { makeCaughtErrorValue } from './portable-error.js';
|
|
34
35
|
import { referenceRunSequence } from './reference-runner.js';
|
|
35
36
|
import { emptyTrace } from './trace.js';
|
|
36
37
|
function partition(children) {
|
|
@@ -68,10 +69,39 @@ function tryEffects(ir, env) {
|
|
|
68
69
|
out.events.push(...bodyTrace.events);
|
|
69
70
|
let completion = bodyTrace.completion;
|
|
70
71
|
if (completion.kind === 'throw' && catchNode) {
|
|
71
|
-
// Catch-all: the single catch handles the canonical error.
|
|
72
|
-
//
|
|
73
|
-
//
|
|
72
|
+
// Catch-all: the single catch handles the canonical error. Error-substrate
|
|
73
|
+
// Slice 1 — bind the caught error to the catch `name` so the catch body can
|
|
74
|
+
// read `<name>.message` (the ONLY admitted error-binding read; see
|
|
75
|
+
// portable-scalar's `member` case). The binding is a TAGGED caught-error
|
|
76
|
+
// value carrying the EVALUATED LITERAL message of the explicit
|
|
77
|
+
// `throw new Error("…")`. An error WITHOUT a literal message (an implicit/
|
|
78
|
+
// primitive throw modeled by messagePattern) yields `null` from
|
|
79
|
+
// makeCaughtErrorValue → the binding stays UNSET → any read of it abstains
|
|
80
|
+
// (out of domain). The catch runs in the same env; its completion replaces
|
|
81
|
+
// the body's. The binding is local to this catch execution; a finally-only
|
|
82
|
+
// `try` never reaches here.
|
|
83
|
+
const caught = catchNode.props?.name;
|
|
84
|
+
const hasBinding = typeof caught === 'string' && caught !== '';
|
|
85
|
+
// SCOPE the catch binding to the catch body (codex review: env-binding leak).
|
|
86
|
+
// Snapshot the name's prior state and restore it after the catch runs. The
|
|
87
|
+
// tagged caught-error — and any inner shadow of the same name — must NOT
|
|
88
|
+
// survive the catch: TS block-scopes the catch parameter and Python `del`s it
|
|
89
|
+
// at the end of `except`, so a POST-catch (or finally) `<name>` read must
|
|
90
|
+
// ABSTAIN, never certify a value both emitted targets reject.
|
|
91
|
+
const hadPrev = hasBinding && env.bindings.has(caught);
|
|
92
|
+
const prevValue = hadPrev ? env.bindings.get(caught) : undefined;
|
|
93
|
+
if (completion.error && hasBinding) {
|
|
94
|
+
const caughtValue = makeCaughtErrorValue(completion.error);
|
|
95
|
+
if (caughtValue !== null)
|
|
96
|
+
env.bindings.set(caught, caughtValue);
|
|
97
|
+
}
|
|
74
98
|
const catchTrace = referenceRunSequence(catchNode.children ?? [], env);
|
|
99
|
+
if (hasBinding) {
|
|
100
|
+
if (hadPrev)
|
|
101
|
+
env.bindings.set(caught, prevValue);
|
|
102
|
+
else
|
|
103
|
+
env.bindings.delete(caught);
|
|
104
|
+
}
|
|
75
105
|
out.events.push(...catchTrace.events);
|
|
76
106
|
completion = catchTrace.completion;
|
|
77
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"try.js","sourceRoot":"","sources":["../../../src/ir/semantics/try.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAGH,OAAO,EAAuC,gBAAgB,EAAoB,MAAM,YAAY,CAAC;AACrG,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAyB,UAAU,EAAc,MAAM,YAAY,CAAC;AAQ3E,SAAS,SAAS,CAAC,QAA2B;IAC5C,OAAO;QACL,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;QACxE,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,IAAI;QAC3D,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,IAAI;KAChE,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,EAAU,EAAE,IAAiB;IACrD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,MAAM,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAClE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,CAAC,aAAa;IAC/E,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7B,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC;QACnC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,EAAE;YAAE,OAAO,KAAK,CAAC;QAC1D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC;YAAE,OAAO,KAAK,CAAC;IACvD,CAAC;IACD,IAAI,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IACxE,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,UAAU,CAAC,EAAU,EAAE,GAAgB;IAC9C,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IACtE,MAAM,GAAG,GAAU,UAAU,EAAE,CAAC;IAEhC,MAAM,SAAS,GAAG,oBAAoB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAClD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IACrC,IAAI,UAAU,GAAqB,SAAS,CAAC,UAAU,CAAC;IAExD,IAAI,UAAU,CAAC,IAAI,KAAK,OAAO,IAAI,SAAS,EAAE,CAAC;QAC7C,
|
|
1
|
+
{"version":3,"file":"try.js","sourceRoot":"","sources":["../../../src/ir/semantics/try.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,7 @@
|
|
|
26
26
|
*/
|
|
27
27
|
import vm from 'node:vm';
|
|
28
28
|
import { emitNativeKernBodyTS } from '../../codegen/body-ts.js';
|
|
29
|
+
import { detectKernStdlibUsage, emittedCodeUsesLooseEq, KERN_LOOSE_EQ_HELPER_JS, } from '../../codegen/stdlib-preamble.js';
|
|
29
30
|
import { lowerFixtureForTarget } from './fixture-lowering.js';
|
|
30
31
|
/**
|
|
31
32
|
* TS-target lowering — wraps the shared target-aware lowering.
|
|
@@ -99,6 +100,21 @@ export async function runTsEmitterLeg(fixture, env) {
|
|
|
99
100
|
const bodyCode = emitNativeKernBodyTS(handlerWrapper, {
|
|
100
101
|
traceHooks: { eachIterNext: true, forIterNext: true, letAssign: shouldTraceLetAssign(fixture.ir) },
|
|
101
102
|
});
|
|
103
|
+
// The program runs in a plain-JS `vm` context (NOT a TS-aware runtime). The ONLY
|
|
104
|
+
// stdlib helper a SEMANTIC (`==`/`!=`) fixture pulls in is looseEq, injected here
|
|
105
|
+
// type-free (`KERN_LOOSE_EQ_HELPER_JS`, sharing its body with the production typed
|
|
106
|
+
// helper — no drift). Detection is from the EMITTED body (ground truth): this harness
|
|
107
|
+
// lowers fixtures to STRUCTURED ValueIR where a `==` is not a scannable string prop,
|
|
108
|
+
// so the emitter produces `__kern_loose_eq(...)` and `emittedCodeUsesLooseEq(bodyCode)`
|
|
109
|
+
// is exact. Result/Option/unwrap/decimal preambles use syntax the vm cannot run
|
|
110
|
+
// (parameter properties, `type` aliases, ESM `import`) and are emitter concerns
|
|
111
|
+
// covered by stdlib-preamble/conformance/cli tests; they never appear in a
|
|
112
|
+
// differential SEMANTIC fixture, so fail loud if one ever does.
|
|
113
|
+
const usage = detectKernStdlibUsage(handlerWrapper);
|
|
114
|
+
if (usage.result || usage.option || usage.unwrap || usage.decimal) {
|
|
115
|
+
throw new TsLegError('TS-leg differential harness only supports the looseEq preamble; a fixture pulled in Result/Option/unwrap/decimal.');
|
|
116
|
+
}
|
|
117
|
+
const preamble = emittedCodeUsesLooseEq(bodyCode) ? KERN_LOOSE_EQ_HELPER_JS : '';
|
|
102
118
|
const events = [];
|
|
103
119
|
const traceSink = (e) => {
|
|
104
120
|
events.push(e);
|
|
@@ -118,6 +134,7 @@ export async function runTsEmitterLeg(fixture, env) {
|
|
|
118
134
|
sandbox.__KernReturn = KernReturnSentinel;
|
|
119
135
|
sandbox.__KernThrow = KernThrowSentinel;
|
|
120
136
|
const program = [
|
|
137
|
+
preamble,
|
|
121
138
|
'(async function __kernRun() {',
|
|
122
139
|
' try {',
|
|
123
140
|
bodyCode,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ts-leg.js","sourceRoot":"","sources":["../../../src/ir/semantics/ts-leg.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"ts-leg.js","sourceRoot":"","sources":["../../../src/ir/semantics/ts-leg.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,6 +80,7 @@ export function resolveAsyncRagEmbedderForPipeline(facts, pipeline, options = {}
|
|
|
80
80
|
throw new Error(`RAG embed model '${model}' requires OpenAI provider options.`);
|
|
81
81
|
return new OpenAIEmbeddingAdapter({
|
|
82
82
|
...openai,
|
|
83
|
+
apiKey: openai.apiKey,
|
|
83
84
|
model: model.replace(/^openai:/u, ''),
|
|
84
85
|
dims,
|
|
85
86
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rag-embed-resolver.js","sourceRoot":"","sources":["../src/rag-embed-resolver.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rag-embed-resolver.js","sourceRoot":"","sources":["../src/rag-embed-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,11 @@ export interface LocalPersistentRagVectorStoreOptions {
|
|
|
5
5
|
readonly fingerprint: string;
|
|
6
6
|
readonly dims: number;
|
|
7
7
|
readonly fileName?: string;
|
|
8
|
+
/**
|
|
9
|
+
* Open a stale-fingerprint snapshot as an empty in-memory store so callers can
|
|
10
|
+
* rebuild it. The stale disk snapshot is preserved until the rebuild flushes.
|
|
11
|
+
*/
|
|
12
|
+
readonly rebuildOnFingerprintMismatch?: boolean;
|
|
8
13
|
}
|
|
9
14
|
/**
|
|
10
15
|
* Directory-backed vector store for local runner-native RAG.
|
|
@@ -23,6 +28,7 @@ export declare class LocalPersistentRagVectorStoreAdapter extends InMemoryPgVect
|
|
|
23
28
|
upsert(chunk: RagChunkInput, vector: Float64Array, fingerprint?: string): void;
|
|
24
29
|
upsertMany(entries: Iterable<RagVectorStoreUpsert>): void;
|
|
25
30
|
clear(): void;
|
|
31
|
+
replaceAll(entries: Iterable<RagVectorStoreUpsert>): void;
|
|
26
32
|
search(query: string, queryVector: Float64Array, options?: RetrieveOptions, fingerprint?: string): RetrieveResult;
|
|
27
33
|
snapshot(): RagVectorStoreSnapshot;
|
|
28
34
|
close(): void;
|