@scriptc/compiler 0.0.33 → 0.0.34

package/dist/frontend/lowering/lower-containers.js

@@ -5854,6 +5854,7 @@ export function objectIterOverIndexShape(L, node, member, argIr, shape, receiver
         const body = [
             { kind: "varDecl", localId: "out.0", init: { kind: "arrayLit", elems: [], type: resultT, loc }, loc },
         ];
+        const fieldStmts = new Map();
         // Declared fields, in declaration order. Undefined-valued fields
         // skip at runtime (the unset-optional convention); values surface
         // into the element type or the site fences with the field named.
@@ -5921,7 +5922,7 @@ export function objectIterOverIndexShape(L, node, member, argIr, shape, receiver
                             loc,
                         };
             }
-            body.push(utag >= 0 && f.type.kind === "union"
+            const fieldStmt = utag >= 0 && f.type.kind === "union"
                 ? {
                     kind: "if",
                     cond: { kind: "unionIsTag", unionId: f.type.unionId, tag: utag, negated: true, value: raw, type: BOOL, loc },
@@ -5929,7 +5930,9 @@ export function objectIterOverIndexShape(L, node, member, argIr, shape, receiver
                     else_: null,
                     loc,
                 }
-                : push(pushed));
+                : push(pushed);
+            fieldStmts.set(f.name, fieldStmt);
+            body.push(fieldStmt);
         }
         // The overflow walk: a fresh key snapshot in JS own-key order, each
         // value read back through the overflow-only keyed read (declared
@@ -5976,8 +5979,9 @@ export function objectIterOverIndexShape(L, node, member, argIr, shape, receiver
             ],
             loc,
         }, { kind: "return", value: outRef, loc });
+        const suffix = body.slice(1 + fieldStmts.size);
         L.arrHofHelpers.set(key, helper);
-        L.liftedFns.push({
+        const fn = {
             name: helper,
             params: [{ localId: "r.0", name: "r", type: argIr }],
             returnType: resultT,
@@ -5990,7 +5994,16 @@ export function objectIterOverIndexShape(L, node, member, argIr, shape, receiver
             ],
             body,
             loc,
+        };
+        L.shapeOrderHelperFinalizers.push(() => {
+            const current = L.shapes.get(argIr.shapeId) ?? shape;
+            const currentOrder = current.declaredOrder ?? current.fields.map((f) => f.name);
+            fn.body = [body[0], ...currentOrder.flatMap((name) => {
+                    const stmt = fieldStmts.get(name);
+                    return stmt ? [stmt] : [];
+                }), ...suffix];
         });
+        L.liftedFns.push(fn);
     }
     return { kind: "call", callee: helper, args: [receiver], type: resultT, loc };
 }
@@ -6356,6 +6369,7 @@ export function lowerRecordOvfCaptureHelper(L, fromId, toId, loc) {
             loc,
         },
     ];
+    const fieldStmts = new Map();
     // Source declared fields in declaration order, skipping unset
     // optionals (stance 37) and the direct-initialized (consumed) names.
     for (const ff of orderedFields) {
@@ -6374,7 +6388,7 @@ export function lowerRecordOvfCaptureHelper(L, fromId, toId, loc) {
             ...(to.fields.some((f) => f.name === ff.name) ? {} : { overflowOnly: true }),
             loc,
         };
-        body.push(utag >= 0 && ff.type.kind === "union"
+        const fieldStmt = utag >= 0 && ff.type.kind === "union"
             ? {
                 kind: "if",
                 cond: { kind: "unionIsTag", unionId: ff.type.unionId, tag: utag, negated: true, value: raw, type: BOOL, loc },
@@ -6382,7 +6396,9 @@ export function lowerRecordOvfCaptureHelper(L, fromId, toId, loc) {
                 else_: null,
                 loc,
             }
-            : write);
+            : write;
+        fieldStmts.set(ff.name, fieldStmt);
+        body.push(fieldStmt);
     }
     // The source overflow, in JS own-key order (only index-signature
     // sources carry one).
@@ -6421,7 +6437,8 @@ export function lowerRecordOvfCaptureHelper(L, fromId, toId, loc) {
         });
     }
     body.push({ kind: "return", value: outRef, loc });
-    L.liftedFns.push({
+    const suffix = body.slice(1 + fieldStmts.size);
+    const fn = {
         name,
         params: [{ localId: "s.0", name: "s", type: fromT }],
         returnType: toT,
@@ -6438,7 +6455,16 @@ export function lowerRecordOvfCaptureHelper(L, fromId, toId, loc) {
         ],
         body,
         loc,
+    };
+    L.shapeOrderHelperFinalizers.push(() => {
+        const current = L.shapes.get(fromId) ?? from;
+        const currentOrder = current.declaredOrder ?? current.fields.map((f) => f.name);
+        fn.body = [body[0], ...currentOrder.flatMap((field) => {
+                const stmt = fieldStmts.get(field);
+                return stmt ? [stmt] : [];
+            }), ...suffix];
     });
+    L.liftedFns.push(fn);
     return name;
 }
 /** `Object.assign(target, ...sources)` into an INDEX-SIGNATURE record:
@@ -6531,6 +6557,7 @@ export function lowerObjectAssignIndexShape(L, call) {
         const sRef = ref("s.0", fromT);
         const intoSlot = (v, lift) => lift === "dyn" ? { kind: "dynFrom", value: v, type: DYN, loc } : L.applyWidthLift(lift, v, tIv, loc);
         const body = [];
+        const fieldStmts = new Map();
         for (const ff of plan.fields) {
             const raw = { kind: "recordGet", obj: sRef, shapeId: plan.fromId, field: ff.name, type: ff.type, loc };
             const utag = ff.type.kind === "union" ? L.armTag(ff.type.unionId, UNDEFINED_T) : -1;
@@ -6542,7 +6569,7 @@ export function lowerObjectAssignIndexShape(L, call) {
                 value: intoSlot(raw, ff.lift),
                 loc,
             };
-            body.push(utag >= 0 && ff.type.kind === "union"
+            const fieldStmt = utag >= 0 && ff.type.kind === "union"
                 ? {
                     kind: "if",
                     cond: { kind: "unionIsTag", unionId: ff.type.unionId, tag: utag, negated: true, value: raw, type: BOOL, loc },
@@ -6550,7 +6577,9 @@ export function lowerObjectAssignIndexShape(L, call) {
                     else_: null,
                     loc,
                 }
-                : write);
+                : write;
+            fieldStmts.set(ff.name, fieldStmt);
+            body.push(fieldStmt);
         }
         const ksT = arrayOf(STRING);
         const fromShape = L.shapes.get(plan.fromId);
@@ -6588,7 +6617,8 @@ export function lowerObjectAssignIndexShape(L, call) {
             });
         }
         body.push({ kind: "return", value: tRef, loc });
-        L.liftedFns.push({
+        const suffix = body.slice(fieldStmts.size);
+        const fn = {
             name,
             params: [
                 { localId: "t.0", name: "t", type: toT },
@@ -6608,7 +6638,16 @@ export function lowerObjectAssignIndexShape(L, call) {
             ],
             body,
             loc,
+        };
+        L.shapeOrderHelperFinalizers.push(() => {
+            const current = L.shapes.get(plan.fromId) ?? fromShape;
+            const currentOrder = current.declaredOrder ?? current.fields.map((f) => f.name);
+            fn.body = [...currentOrder.flatMap((field) => {
+                    const stmt = fieldStmts.get(field);
+                    return stmt ? [stmt] : [];
+                }), ...suffix];
         });
+        L.liftedFns.push(fn);
         return name;
     };
     let acc = L.lowerExprExpecting(call.arguments[0], targetIr);