@scriptc/compiler 0.4.1 → 0.4.3

package/dist/frontend/lowering/containers/filter-predicates.js

@@ -0,0 +1,205 @@
+/* Checked narrowing for `.filter` with a written type predicate.
+ *
+ * A written predicate (`(p): p is Cat => ...`, or a guard function passed
+ * as a value) is an assertion TypeScript does not check, so the filter loop
+ * keeps the receiver's element type and the result converts to the
+ * predicate's type afterwards, element by element:
+ *
+ *   - a union element to one of its arms, or to a union of some of its
+ *     arms, by its tag;
+ *   - a checked-dynamic element by dynCheck;
+ *   - a class instance to a subclass by its class;
+ *   - a tuple or record to one with the same fields, field by field.
+ *
+ * Each conversion throws the catchable TypeError of a checked extraction
+ * when a kept element is not of the predicate's type, which is when the
+ * predicate returned true for a value it does not describe. */
+import { varRef } from "../../../ir/build.js";
+import { BOOL, F64, STRING, isUnitType, typeEquals, } from "../../../ir/ir.js";
+import { checkedClassAssertion } from "../class-assertions.js";
+import { buildArrayConversion } from "../coercions/builders.js";
+import { keyedHelperName } from "../stable-names.js";
+import { typeKey } from "../../type-mapper.js";
+/** The interned helper converting a `from[]` filter result to `to[]`, or
+ * null when an element of `from` has no checked conversion to `to`.
+ * `typeText` names the predicate's type in the TypeError. */
+export function checkedFilterNarrowing(lowerer, from, to, typeText, loc) {
+    const element = elementHelper(lowerer, from, to, loc, typeText);
+    if (element === null)
+        return null;
+    const key = `filter.narrow:${typeKey(from)}:${typeKey(to)}:${typeText}`;
+    const existing = lowerer.valueHelpers.get(key);
+    if (existing)
+        return existing;
+    const name = keyedHelperName(lowerer, "%arr.narrow", key);
+    lowerer.valueHelpers.set(key, name);
+    const outT = { kind: "array", elem: to };
+    lowerer.liftedFns.push(buildArrayConversion(name, { kind: "array", elem: from }, { kind: "arrayLit", elems: [], type: outT, loc }, (value, _index, result) => ({
+        kind: "arrIntrinsic",
+        method: "push",
+        receiver: result,
+        args: [{ kind: "call", callee: element, args: [value], type: to, loc }],
+        type: F64,
+        loc,
+    }), loc));
+    return name;
+}
+/** The interned helper converting one `from` value to `to`, or null. */
+function elementHelper(lowerer, from, to, loc, typeText = lowerer.fmt(to)) {
+    const key = `filter.narrow.value:${typeKey(from)}:${typeKey(to)}:${typeText}`;
+    const existing = lowerer.valueHelpers.get(key);
+    if (existing)
+        return existing;
+    // A recursive type pair converts through the helper being built.
+    if (lowerer.coercions.planning.has(key))
+        return null;
+    lowerer.coercions.planning.add(key);
+    const input = varRef("v.0", from, loc);
+    let body;
+    try {
+        body = conversionBody(lowerer, input, from, to, typeText, loc);
+    }
+    finally {
+        lowerer.coercions.planning.delete(key);
+    }
+    if (body === null)
+        return null;
+    const name = keyedHelperName(lowerer, "%narrow.checked", key);
+    lowerer.valueHelpers.set(key, name);
+    lowerer.liftedFns.push({
+        name,
+        params: [{ localId: "v.0", name: "v", type: from }],
+        returnType: to,
+        locals: [{ id: "v.0", name: "v", type: from, mutable: false }],
+        body,
+        loc,
+    });
+    return name;
+}
+/** A converted value: `value` itself when the types are equal, or a call of
+ * the conversion helper. */
+function converted(lowerer, value, from, to, loc) {
+    if (typeEquals(from, to))
+        return value;
+    const helper = elementHelper(lowerer, from, to, loc);
+    return helper === null ? null : { kind: "call", callee: helper, args: [value], type: to, loc };
+}
+/** The TypeError a kept element of another type throws. */
+function typeError(message, loc) {
+    return {
+        kind: "throw",
+        value: {
+            kind: "libCall",
+            fn: "error.new",
+            args: [{ kind: "strLit", value: message, type: STRING, loc }],
+            type: { kind: "object", className: "%TypeError" },
+            loc,
+        },
+        loc,
+    };
+}
+function conversionBody(lowerer, input, from, to, typeText, loc) {
+    if (typeEquals(from, to))
+        return [{ kind: "return", value: input, loc }];
+    if (from.kind === "dyn")
+        return [{ kind: "return", value: { kind: "dynCheck", value: input, type: to, loc }, loc }];
+    if (from.kind === "object" && to.kind === "object") {
+        const asserted = checkedClassAssertion(lowerer, input, to, loc);
+        return asserted === null ? null : [{ kind: "return", value: asserted, loc }];
+    }
+    if (from.kind === "union")
+        return unionConversion(lowerer, input, from.unionId, to, typeText, loc);
+    if (from.kind === "record" && to.kind === "record") {
+        const source = lowerer.shapes.get(from.shapeId);
+        const target = lowerer.shapes.get(to.shapeId);
+        if (!source ||
+            !target ||
+            source.tuple !== target.tuple ||
+            source.indexValue ||
+            target.indexValue)
+            return null;
+        if (source.fields.length !== target.fields.length)
+            return null;
+        const fields = [];
+        for (const field of target.fields) {
+            const own = source.fields.find((f) => f.name === field.name);
+            if (!own)
+                return null;
+            const read = {
+                kind: "recordGet",
+                obj: input,
+                shapeId: from.shapeId,
+                field: field.name,
+                type: own.type,
+                loc,
+            };
+            const value = converted(lowerer, read, own.type, field.type, loc);
+            if (value === null)
+                return null;
+            fields.push({
+                name: field.name,
+                value: keepAbsence(lowerer, input, from.shapeId, field, value, loc),
+            });
+        }
+        // The copy keeps the source's own keys in the source's order, as a width
+        // copy does (key-order-witness.ts).
+        const copy = { kind: "recordLit", fields, type: to, loc };
+        return [{ kind: "return", value: lowerer.keyOrder.copy(copy, from.shapeId), loc }];
+    }
+    return null;
+}
+/** A converted field value that keeps the source field's absence: an
+ * optional field the source object lacks stays absent in the copy rather
+ * than becoming a property that holds undefined. */
+function keepAbsence(lowerer, input, shapeId, field, value, loc) {
+    if (field.type.kind !== "union")
+        return value;
+    if (!lowerer.unions.get(field.type.unionId)?.arms.some((arm) => arm.kind === "undefinedT"))
+        return value;
+    return {
+        kind: "ternary",
+        cond: { kind: "recordHas", obj: input, shapeId, field: field.name, type: BOOL, loc },
+        then: value,
+        else_: { kind: "fieldAbsent", unionId: field.type.unionId, type: field.type, loc },
+        type: field.type,
+        loc,
+    };
+}
+/** A union value to one of its arms, or to a union of some of its arms:
+ * each arm the target holds returns, any other arm throws. */
+function unionConversion(lowerer, input, unionId, to, typeText, loc) {
+    const source = lowerer.unions.get(unionId);
+    if (!source)
+        return null;
+    const targetArms = to.kind === "union" ? (lowerer.unions.get(to.unionId)?.arms ?? null) : [to];
+    if (targetArms === null)
+        return null;
+    const body = [];
+    let kept = 0;
+    for (let tag = 0; tag < source.arms.length; tag++) {
+        const arm = source.arms[tag];
+        const targetTag = targetArms.findIndex((t) => typeEquals(t, arm));
+        if (targetTag < 0)
+            continue;
+        kept++;
+        const payload = isUnitType(arm)
+            ? { kind: "unitLit", unit: arm.kind === "undefinedT" ? "undefined" : "null", type: arm, loc }
+            : { kind: "unionNarrow", unionId, tag, value: input, type: arm, loc };
+        const value = to.kind === "union"
+            ? { kind: "unionWrap", unionId: to.unionId, tag: targetTag, value: payload, type: to, loc }
+            : payload;
+        body.push({
+            kind: "if",
+            cond: { kind: "unionIsTag", unionId, tag, negated: false, value: input, type: BOOL, loc },
+            then: [{ kind: "return", value, loc }],
+            else_: null,
+            loc,
+        });
+    }
+    // Every arm the target names must be one of the union's own arms.
+    if (kept === 0 || kept !== targetArms.length)
+        return null;
+    body.push(typeError(`a kept element is not a '${typeText}' (a type predicate returned true for a value of another type)`, loc));
+    return body;
+}
+//# sourceMappingURL=filter-predicates.js.map

package/dist/frontend/lowering/containers/filter-predicates.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"filter-predicates.js","sourceRoot":"","sources":["../../../../src/frontend/lowering/containers/filter-predicates.ts"],"names":[],"mappings":"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"}

package/dist/frontend/lowering/containers/indexed-objects.d.ts

@@ -109,18 +109,6 @@ export type IndexMergeContributor = {
     name: string;
     value: IrExpr;
 };
-/** The interned merge helper behind `{ ...a, ...b, K: v }` literals whose
- * TARGET shape is a PURE index-signature record (no declared fields) —
- * the spawn-env pattern (`{ ...process.env, ...extraEnv }`). Contributors
- * apply in literal order with keyed writes, so JS's last-write-wins holds
- * for colliding runtime keys. Spread sources must be index-signature
- * records whose value slot IS the target's or LIFTS into it (a
- * `Record<string, string>` spreads into a `string | undefined` target by
- * wrapping each copied value); their declared fields copy first (skipping
- * undefined-armed absents — the unset convention), then their overflow in
- * JS own-key order. Explicit values arrive pre-coerced to the target's
- * value slot. Null when a spread source is outside that matrix (the
- * caller keeps its fence). */
 export declare function lowerIndexMergeHelper(lowerer: Lowerer, toId: string, contributors: IndexMergeContributor[], loc: SrcLoc): string | null;
 /** The interned helper flattening an env-shaped record into the
  * [k0, v0, k1, v1, ...] string[] cp.execSync consumes — declared string

package/dist/frontend/lowering/containers/indexed-objects.js

@@ -1,3 +1,4 @@
+import { keyedHelperName } from "../stable-names.js";
 import { nullProtoRecordShape, recordNullProtoTest } from "../null-prototype.js";
 import { countedFor, numLit, varRef } from "../../../ir/build.js";
 import { objectEnumerationReceiver } from "../object-enumeration-receiver.js";
@@ -115,7 +116,7 @@ export function objectIterOverIndexShape(lowerer, node, member, argIr, shape, re
     const key = `obj.${member}:ovf:${argIr.shapeId}:${typeKey(resultT)}`;
     let helper = lowerer.arrHofHelpers.get(key);
     if (!helper) {
-        helper = `%obj.${member}.${lowerer.arrHofHelpers.size}`;
+        helper = keyedHelperName(lowerer, `%obj.${member}`, key);
         const outRef = varRef("out.0", resultT, loc);
         const rRef = varRef("r.0", argIr, loc);
         const push = (value) => ({
@@ -513,7 +514,7 @@ function lowerTypedObjectFromEntriesCall(lowerer, call, callee) {
     const key = `obj.fromEntries:${argIr.elem.shapeId}:${resultT.shapeId}`;
     let helper = lowerer.arrHofHelpers.get(key);
     if (!helper) {
-        helper = `%obj.fromEntries.${lowerer.arrHofHelpers.size}`;
+        helper = keyedHelperName(lowerer, "%obj.fromEntries", key);
         const tupleT = argIr.elem;
         const tRef = varRef("t.0", tupleT, loc);
         const body = [
@@ -606,7 +607,7 @@ function lowerFromEntriesStringRows(lowerer, call, argNode, argIr) {
     const key = `obj.fromEntries:strrows:${resultT.shapeId}`;
     let helper = lowerer.arrHofHelpers.get(key);
     if (!helper) {
-        helper = `%obj.fromEntries.${lowerer.arrHofHelpers.size}`;
+        helper = keyedHelperName(lowerer, "%obj.fromEntries", key);
         const tRef = varRef("t.0", rowT, loc);
         const rowLen = {
             kind: "arrIntrinsic",
@@ -804,7 +805,7 @@ export function lowerRecordOvfCaptureHelper(lowerer, fromId, toId, loc) {
     const existing = lowerer.valueHelpers.get(key);
     if (existing)
         return existing;
-    const name = `%rec.capture.${lowerer.valueHelpers.size}`;
+    const name = keyedHelperName(lowerer, "%rec.capture", key);
     lowerer.valueHelpers.set(key, name);
     const fromT = { kind: "record", shapeId: fromId };
     const toT = { kind: "record", shapeId: toId };
@@ -1053,7 +1054,7 @@ export function lowerObjectAssignIndexShape(lowerer, call) {
         const existing = lowerer.valueHelpers.get(key);
         if (existing)
             return existing;
-        const name = `%obj.assign.${lowerer.valueHelpers.size}`;
+        const name = keyedHelperName(lowerer, "%obj.assign", key);
         lowerer.valueHelpers.set(key, name);
         const toT = { kind: "record", shapeId: targetIr.shapeId };
         const fromT = { kind: "record", shapeId: plan.fromId };
@@ -1201,6 +1202,17 @@ export function lowerObjectAssignIndexShape(lowerer, call) {
  * JS own-key order. Explicit values arrive pre-coerced to the target's
  * value slot. Null when a spread source is outside that matrix (the
  * caller keeps its fence). */
+/** A value of an index slot's type that holds a key's place until a later
+ * write replaces it, or null for slot types without a literal. */
+function indexSlotPlaceholder(slot, loc) {
+    if (slot.kind === "string")
+        return { kind: "strLit", value: "", type: STRING, loc };
+    if (slot.kind === "f64")
+        return { kind: "numLit", value: 0, type: slot, loc };
+    if (slot.kind === "bool")
+        return { kind: "boolLit", value: false, type: slot, loc };
+    return null;
+}
 export function lowerIndexMergeHelper(lowerer, toId, contributors, loc) {
     const to = lowerer.shapes.get(toId);
     if (!to?.indexValue || to.tuple || to.fields.length > 0)
@@ -1216,7 +1228,7 @@ export function lowerIndexMergeHelper(lowerer, toId, contributors, loc) {
     // width lift — the capture helper's matrix); accessor/reserved slots
     // decline (a spread would need the getter's computed value).
     const srcPlans = [];
-    for (const c of contributors) {
+    for (const [ci, c] of contributors.entries()) {
         // A conditional spread needs the undefined arm as its "absent"
         // value — a target slot without one can't carry the empty arm.
         if (c.kind === "condField" &&
@@ -1238,9 +1250,20 @@ export function lowerIndexMergeHelper(lowerer, toId, contributors, loc) {
                     : tIv.kind === "dyn" && (ff.type.kind === "dyn" || lowerer.dynConvertible(ff.type))
                         ? "dyn"
                         : lowerer.widthLiftPlan(ff.type, tIv);
-                if (lift === null)
+                if (lift !== null) {
+                    fields.set(ff.name, lift);
+                    continue;
+                }
+                // A field a later plain property overrides (`{ ...tags, status:
+                // String(tags.status) }`): its value never survives, but its key
+                // keeps the spread's position, so a placeholder of the slot's
+                // type holds the place until the override writes.
+                const overridden = contributors
+                    .slice(ci + 1)
+                    .some((later) => later.kind === "field" && later.name === ff.name);
+                if (!overridden || indexSlotPlaceholder(tIv, loc) === null)
                     return null;
-                fields.set(ff.name, lift);
+                fields.set(ff.name, "placeholder");
             }
             srcPlans.push({ shapeId: c.shapeId, wrapTag: -1, retag: null, fields });
             continue;
@@ -1282,7 +1305,7 @@ export function lowerIndexMergeHelper(lowerer, toId, contributors, loc) {
     const existing = lowerer.valueHelpers.get(key);
     if (existing)
         return existing;
-    const name = `%rec.merge.${lowerer.valueHelpers.size}`;
+    const name = keyedHelperName(lowerer, "%rec.merge", key);
     lowerer.valueHelpers.set(key, name);
     const toT = { kind: "record", shapeId: toId };
     const ksT = arrayOf(STRING);
@@ -1369,6 +1392,11 @@ export function lowerIndexMergeHelper(lowerer, toId, contributors, loc) {
         // own planned lift (absent optionals skip — the unset convention);
         // no overflow exists to walk.
         if (plan.fields !== null) {
+            // Keys enter in the source's enumeration order, as its own keys do.
+            // That order settles only after lowering (key-order witnesses), so
+            // the writes go into one block that a finalizer orders.
+            lowerer.keyOrder.observed.add(from.id);
+            const fieldStmts = new Map();
             for (const ff of from.fields) {
                 const lift = plan.fields.get(ff.name);
                 const raw = {
@@ -1385,13 +1413,15 @@ export function lowerIndexMergeHelper(lowerer, toId, contributors, loc) {
                     obj: outRef,
                     shapeId: toId,
                     key: { kind: "strLit", value: ff.name, type: STRING, loc },
-                    value: lift === "dyn"
-                        ? { kind: "dynFrom", value: raw, type: DYN, loc }
-                        : lowerer.applyWidthLift(lift, raw, tIv, loc),
+                    value: lift === "placeholder"
+                        ? indexSlotPlaceholder(tIv, loc)
+                        : lift === "dyn"
+                            ? { kind: "dynFrom", value: raw, type: DYN, loc }
+                            : lowerer.applyWidthLift(lift, raw, tIv, loc),
                     overflowOnly: true,
                     loc,
                 };
-                body.push(utag >= 0 && ff.type.kind === "union"
+                fieldStmts.set(ff.name, utag >= 0 && ff.type.kind === "union"
                     ? {
                         kind: "if",
                         cond: lowerer.recordFieldPresent(sRef, plan.shapeId, ff.name, loc),
@@ -1401,6 +1431,16 @@ export function lowerIndexMergeHelper(lowerer, toId, contributors, loc) {
                     }
                     : write);
             }
+            // declaredOrder omits internal '%'-fields, which never copy.
+            const ordered = (shape) => (shape.declaredOrder ?? shape.fields.map((f) => f.name)).flatMap((field) => {
+                const stmt = fieldStmts.get(field);
+                return stmt ? [stmt] : [];
+            });
+            const group = { kind: "block", body: ordered(from), loc };
+            lowerer.shapeOrderHelperFinalizers.push(() => {
+                group.body = ordered(lowerer.shapes.get(plan.shapeId) ?? from);
+            });
+            body.push(group);
             return;
         }
         const fIv = from.indexValue;
@@ -1591,7 +1631,7 @@ export function lowerEnvToPairsHelper(lowerer, shapeId, loc) {
     const existing = lowerer.valueHelpers.get(key);
     if (existing)
         return existing;
-    const name = `%env.pairs.${lowerer.valueHelpers.size}`;
+    const name = keyedHelperName(lowerer, "%env.pairs", key);
     lowerer.valueHelpers.set(key, name);
     const recT = { kind: "record", shapeId };
     const arrT = arrayOf(STRING);