@neocompose/cli 0.89.7 → 0.89.8

package/dist/neo-runtime.mjs

@@ -19407,7 +19407,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.89.7",
+      cliVersion: "0.89.8",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -28481,15 +28481,7 @@ function calculateDeclarationSignature(ctx, projectionClassId, schemaKey, declar
     declarationClassId: declaration.classDef.id,
     memberId: declaration.memberId,
     isAbstract: isAbstractMember(member) === true,
-    isVirtual: isVirtualMember(member) !== false,
-    // Openness belongs to the DECLARING class, not to whoever is asking: a
-    // descendant that closes the param still has to see a declaration it is
-    // obliged to implement.
-    requiresClosingImplementation: lookupDeclaredTypeInfo(member) === null ? false : lookupNarrowingAwaitsClosingBinding(
-      ctx,
-      member,
-      resolveGenericEnvForEmission(ctx, declaration.classDef.id)
-    )
+    isVirtual: isVirtualMember(member) !== false
   };
   if (isCallableMemberForCodegen(member)) {
     const parameterTypes = member.argumentTypes.map(
@@ -28699,7 +28691,7 @@ function generatedInstanceMemberSignaturesEqual(left, right) {
   return false;
 }
 function emitsAbstractDeclaration(signature2) {
-  return signature2.isAbstract || signature2.requiresClosingImplementation;
+  return signature2.isAbstract;
 }
 function resolveGeneratedInstanceMemberPlan(ctx, classDef, schemaKey) {
   const declaration = ownInstanceMemberDeclaration(classDef, schemaKey);
@@ -30892,11 +30884,6 @@ function lookupHasRuntimeOwnership(member) {
 function lookupNarrowsThroughGenericParam(member) {
   return lookupDeclaredTypeInfo(member)?.type === 21 /* Generic */;
 }
-function lookupNarrowingAwaitsClosingBinding(ctx, member, env) {
-  if (!lookupNarrowsThroughGenericParam(member)) return false;
-  if (lookupProjection(ctx, member) !== "class" /* Class */) return false;
-  return lookupTargetClassProjection(ctx, member, env) === null;
-}
 function lookupTargetValueType(ctx, member, saved, env) {
   if (!isMemberLookupBase(member)) return "NeoLookupSelection";
   const targetSaved = lookupTargetSaved(ctx, member) ?? saved;
@@ -40831,11 +40818,10 @@ function remapRuntimeReferences(value, overlay2, seen, preservedReferences) {
   const next = {};
   seen.set(value, next);
   for (const [key, entry] of Object.entries(value)) {
-    next[key] = remapRuntimeReferences(
-      entry,
-      overlay2,
-      seen,
-      preservedReferences
+    setOwnField(
+      next,
+      key,
+      remapRuntimeReferences(entry, overlay2, seen, preservedReferences)
     );
   }
   return next;
@@ -42635,7 +42621,7 @@ function applyOverlayAssignment(target, targetTypeInfo, value, scope, ctx, desti
     if (entryId !== null) {
       const collection = Array.isArray(receiver) ? receiver : objectArg(receiver, "Assignment target");
       const entryKey = typeof key === "number" ? key : String(key);
-      Reflect.set(collection, String(entryKey), entryId);
+      setOwnField(collection, String(entryKey), entryId);
       recordWrittenEntry(collection, entryKey, true, ctx);
       if (!indexRuntimeCollectionChange(
         collection,
@@ -42731,7 +42717,7 @@ function applyOverlayAssignment(target, targetTypeInfo, value, scope, ctx, desti
       );
       noteDetachedRow(object2[stringKey], referenceValueId, ctx);
     }
-    object2[stringKey] = referenceValueId;
+    setOwnField(object2, stringKey, referenceValueId);
     if (!field) recordWrittenEntry(object2, stringKey, true, ctx);
     if (field || !indexRuntimeCollectionEntryWrite(
       object2,
@@ -42747,7 +42733,7 @@ function applyOverlayAssignment(target, targetTypeInfo, value, scope, ctx, desti
     return;
   if (field && (targetTypeInfo.type === 7 /* Class */ || targetTypeInfo.type === 22 /* Interface */))
     noteDetachedRow(object2[stringKey], value, ctx);
-  object2[stringKey] = value;
+  setOwnField(object2, stringKey, value);
   if (!field) recordWrittenEntry(object2, stringKey, false, ctx);
   const scalarField = (previous == null || typeof previous === "number" || typeof previous === "boolean" || typeof previous === "string") && (value == null || typeof value === "number" || typeof value === "boolean" || typeof value === "string");
   if (field && !scalarField || !indexRuntimeCollectionEntryWrite(object2, previous, value, stringKey, ctx))
@@ -42829,7 +42815,7 @@ function copiedCollectionContents(source, entryTypeInfo, slotId, ctx) {
       }
     }
     if (Array.isArray(copy)) copy.push(entry);
-    else copy[String(key)] = entry;
+    else setOwnField(copy, String(key), entry);
     return 0 /* Continue */;
   });
   const cache = unorderedListProjectionCache(ctx);
@@ -42898,107 +42884,6 @@ function keepAssignedCollectionValues(value, targetTypeInfo, row, ctx) {
     return 0 /* Continue */;
   });
 }
-function pendingConstructorRootsForRow(valueId, ctx) {
-  const roots = /* @__PURE__ */ new Set();
-  const open2 = ctx.__executionState?.openConstructions;
-  if (open2 === void 0 || open2.size === 0) return roots;
-  const visited = /* @__PURE__ */ new Set();
-  const pending = [valueId];
-  const parentEntries = /* @__PURE__ */ new Map();
-  const placingMembers = /* @__PURE__ */ new Map();
-  while (pending.length > 0) {
-    const id2 = pending.pop();
-    if (id2 === void 0 || visited.has(id2)) continue;
-    visited.add(id2);
-    const row = evalValueById(
-      ctx,
-      id2,
-      ctx.__runtimeSessionValues,
-      ctx.__valueOverlay
-    );
-    if (row === null) continue;
-    if (typeof row.value === "object" && row.value !== null && open2.has(row.value))
-      roots.add(id2);
-    for (const owner of currentOwnedValueAttachments(
-      id2,
-      ctx,
-      parentEntries,
-      placingMembers
-    )) {
-      if (!owner.identity.startsWith("value:")) continue;
-      const parent = evalValueById(
-        ctx,
-        owner.label,
-        ctx.__runtimeSessionValues,
-        ctx.__valueOverlay
-      );
-      if (parent === null) continue;
-      if (parent.classId === void 0 || parent.classId === null) {
-        const raw = placingMember(
-          parent,
-          ctx,
-          void 0,
-          0,
-          placingMembers,
-          parentEntries
-        );
-        if (raw === null) continue;
-        const member = raw.kind === 21 /* Generic */ ? substituteMember(raw, rowGenericEnv(parent, ctx), ctx.vm.members) : resolveMember(raw, ctx.vm.members);
-        if (isMemberWithEntries(member)) {
-          const rawEntry = evalMemberById(ctx.vm, member.entryMemberId);
-          if (rawEntry === null) continue;
-          const entry = rawEntry.kind === 21 /* Generic */ ? substituteMember(
-            rawEntry,
-            rowGenericEnv(parent, ctx),
-            ctx.vm.members
-          ) : resolveMember(rawEntry, ctx.vm.members);
-          if (entry.kind === 21 /* Generic */ || isMemberLookupBase(entry))
-            continue;
-        }
-      }
-      pending.push(owner.label);
-    }
-    for (const link of evaluatorParentLinks(evaluatorIndexes(ctx), id2)) {
-      const parent = evalValueById(
-        ctx,
-        link.parentId,
-        ctx.__runtimeSessionValues,
-        ctx.__valueOverlay
-      );
-      if (parent === null || !Array.isArray(parent.value)) continue;
-      const member = placingMember(
-        parent,
-        ctx,
-        void 0,
-        0,
-        placingMembers,
-        parentEntries
-      );
-      if (member === null || !isMemberTupleBase(member)) continue;
-      const positions = ownershipParentEntryKeys(
-        parent.value,
-        id2,
-        parentEntries
-      );
-      for (const position of positions ?? []) {
-        if (typeof position !== "number") continue;
-        const entryId = member.elementMemberIds[position];
-        const rawEntry = entryId === void 0 ? null : evalMemberById(ctx.vm, entryId);
-        if (rawEntry === null) continue;
-        const entry = rawEntry.kind === 21 /* Generic */ ? substituteMember(
-          rawEntry,
-          rowGenericEnv(parent, ctx),
-          ctx.vm.members
-        ) : resolveMember(rawEntry, ctx.vm.members);
-        if (entry.kind === 21 /* Generic */ || isMemberLookupBase(entry))
-          continue;
-        pending.push(parent.id);
-        break;
-      }
-    }
-  }
-  return roots;
-}
 function preflightAssignedCollection(collection, member, row, ctx) {
   if (member === null) return;
   const env = rowGenericEnv(row, ctx);
@@ -43011,8 +42896,6 @@ function preflightAssignedCollection(collection, member, row, ctx) {
   const attached = /* @__PURE__ */ new Set();
   const preflight = {
     parentEntries: /* @__PURE__ */ new Map(),
-    constructorRootIds: pendingConstructorRootsForRow(row.id, ctx),
-    constructorArgumentTransfers: /* @__PURE__ */ new Map(),
     dependencies: /* @__PURE__ */ new Map()
   };
   forEachRawCollectionEntry(collection, ctx, ({ raw, key, valueId }) => {
@@ -43035,8 +42918,6 @@ function preflightAssignedCollection(collection, member, row, ctx) {
     );
     return 0 /* Continue */;
   });
-  for (const [id2, destination] of preflight.constructorArgumentTransfers)
-    ctx.__executionState?.ownedValueAttachments.set(id2, destination);
   for (const [id2, destination] of preflight.dependencies)
     recordConstructorGroupDependency(id2, destination, ctx);
 }
@@ -44874,7 +44755,11 @@ function applyLocalCollectionMutation(targetValue, mutation, args, ctx, unique =
         }
         return null;
       }
-      objectArg(targetValue, "Dictionary Add target")[String(args[0])] = args[1];
+      setOwnField(
+        objectArg(targetValue, "Dictionary Add target"),
+        String(args[0]),
+        args[1]
+      );
       return null;
     case "Remove" /* Remove */:
       if (Array.isArray(targetValue)) {
@@ -51206,6 +51091,7 @@ function publishConstructedRows(args) {
   if (beforeRetain !== null) {
     for (const rowId of beforeRetain) {
       if (retained.has(rowId)) continue;
+      if (constructorGroupForRow(rowId, ctx) !== null) continue;
       deleteRuntimeSessionValue(ctx, rowId);
     }
   }
@@ -51291,16 +51177,55 @@ function assertImplicitConstructionAllowed(schemaClass2) {
     `Class '${schemaClass2.name}' declares a required constructor, so it cannot be constructed without one.`
   );
 }
+function constructionReplayContext(descriptor, ctx) {
+  if (ctx.storedConstructionReplay !== true) return ctx;
+  const target = ctx.__storedInitializerReplay;
+  let rowId;
+  let candidate;
+  if (target !== void 0) {
+    const row = storedReplayRowById(target.rowId, ctx);
+    if (row !== null && classIdForValueRow(row, ctx) === descriptor.schemaClass.id) {
+      rowId = target.rowId;
+      candidate = { reattached: false };
+      target.candidates.push(candidate);
+    }
+  } else if (ctx.__executionState?.constructionStack.length === 0 && ctx.__storedConstructionReplaySlot?.classId === descriptor.schemaClass.id) {
+    rowId = ctx.__storedConstructionReplayRowId;
+  }
+  return {
+    ...ctx,
+    __storedInitializerReplay: void 0,
+    __storedReplayCandidate: candidate,
+    __storedConstructionReplayRowId: rowId,
+    __storedConstructionReplayRootId: void 0,
+    __storedConstructionReplaySlot: rowId === void 0 ? ctx.__storedConstructionReplaySlot : {
+      classId: descriptor.schemaClass.id,
+      classArguments: descriptor.classArguments ?? {}
+    }
+  };
+}
+function rollbackStoredConstructionReplay(ctx, checkpoint) {
+  if (checkpoint === void 0) return;
+  for (const row of createdSessionValuesSince(ctx, checkpoint))
+    deleteRuntimeSessionValue(ctx, row.id);
+  if (ctx.__storedReplayCandidate !== void 0)
+    ctx.__storedReplayCandidate.reattached = false;
+}
 function constructClassValue(info, scope, ctx) {
   const descriptor = validateClassConstructorDescriptor(
     info,
     ctx,
     ctx.constructionBaselineReplay !== true
   );
+  ctx = constructionReplayContext(descriptor, ctx);
   assertImplicitConstructionAllowed(descriptor.schemaClass);
+  const replayCheckpoint = ctx.__storedConstructionReplayRowId === void 0 ? void 0 : sessionCreationCheckpoint(ctx);
   const closeFrame = pushConstructionFrame(ctx, descriptor.schemaClass.name);
   try {
     return constructClassValueWithinFrame(descriptor, scope, ctx);
+  } catch (error) {
+    rollbackStoredConstructionReplay(ctx, replayCheckpoint);
+    throw error;
   } finally {
     closeFrame();
   }
@@ -51400,6 +51325,8 @@ function constructClassValueWithinFrame(descriptor, scope, ctx) {
     });
     root.classId = classId;
     stampConstructedRootGenericBindings(root, descriptor);
+    if (ctx.__storedReplayCandidate !== void 0)
+      ctx.__storedReplayCandidate.value = root.value;
     if (typeof root.value !== "object" || root.value === null || Array.isArray(root.value)) {
       throw new Error(
         `Class constructor for '${schemaClass2.name}' produced a non-record root.`
@@ -51829,15 +51756,20 @@ function constructionInitEvaluator(ctx, createdValues, argumentScopes, construct
       sourceValueId: sourceValueId ?? null,
       compileMemberId: scopeMemberId
     });
+    const childId = storedInitializerChildId(member, ctx);
+    const initializerCtx = childId === void 0 ? ctx : {
+      ...ctx,
+      __storedInitializerReplay: { rowId: childId, candidates: [] }
+    };
     const evaluate = (argumentValues = []) => {
-      return withConstructionGenericSlots(
+      const result = withConstructionGenericSlots(
         member,
-        ctx,
+        initializerCtx,
         genericEnv,
         () => evaluateInitializerInContext(
           init,
           member,
-          ctx,
+          initializerCtx,
           createdValues,
           argumentValues,
           sourceValueId ?? null,
@@ -51845,6 +51777,17 @@ function constructionInitEvaluator(ctx, createdValues, argumentScopes, construct
           genericEnv
         )
       );
+      for (const candidate of initializerCtx.__storedInitializerReplay?.candidates ?? []) {
+        if (!candidate.reattached) continue;
+        if (candidate.value !== result.value) {
+          throw new NSGetterRuntimeError(
+            `Stored initializer '${member.name}' constructed an already owned value outside its returned child. Call Clone() explicitly.`
+          );
+        }
+        if (ctx.__storedReplayCandidate !== void 0)
+          ctx.__storedReplayCandidate.reattached = true;
+      }
+      return result;
     };
     const ownerClassId = scopeMemberId === null ? null : owningClassId(scopeMemberId);
     const expectedArgumentCount = compiled.parameters.slice(2).length;
@@ -52057,6 +52000,13 @@ function evaluateInitializerInContext(init, member, ctx, createdValues, argument
       (argument2) => trackedRowForValueReference(argument2, ctx)?.id === existingValueRow.id
     )) {
       assertInitializerPlacement(existingValueRow.id, member, ctx);
+      if (storedInitializerChildId(member, ctx) === existingValueRow.id) {
+        return {
+          value: result.value,
+          classId: existingRuntimeClassId,
+          existingValueRow
+        };
+      }
     }
     if (existingValueRow !== null && existingRuntimeClassId !== null && isClassSlotMember(member)) {
       const storage = constructorArgumentStorage(existingValueRow.id, ctx);
@@ -52260,18 +52210,14 @@ function encodeRequiredConstructorArgument(args) {
     args.ctx.__valueOverlay
   ) !== null ? args.value : null;
   const adoptTracked = (id2, suffix) => {
-    if (constructorGroupForRow(id2, args.ctx) !== null) {
-      assertOwnedValueAttachable(
-        id2,
-        {
-          identity: `value:${args.ownerRootId}:constructorArg:${args.parameterId}:${suffix}`,
-          label: args.ownerRootId
-        },
-        `constructor argument '${args.parameterId}'`,
-        args.ctx,
-        true
-      );
-    }
+    recordConstructorGroupDependency(
+      id2,
+      {
+        identity: `value:${args.ownerRootId}:constructorArg:${args.parameterId}:${suffix}`,
+        label: args.ownerRootId
+      },
+      args.ctx
+    );
     return id2;
   };
   if (args.typeInfo.type === 21 /* Generic */) {
@@ -53192,7 +53138,8 @@ function constructDeclaredClassValue(info, scope, ctx) {
   const descriptor = validateClassConstructorDescriptor(info, ctx, false);
   const schemaClass2 = descriptor.schemaClass;
   const record7 = resolveDeclaredConstructorRecord(info, schemaClass2, ctx);
-  const replayCheckpoint = ctx.storedConstructionReplay === true && ctx.__storedConstructionReplayRowId !== void 0 && ctx.__storedConstructionReplaySlot?.classId === schemaClass2.id && ctx.__executionState?.constructionStack.length === 0 ? sessionCreationCheckpoint(ctx) : void 0;
+  ctx = constructionReplayContext(descriptor, ctx);
+  const replayCheckpoint = ctx.storedConstructionReplay === true && ctx.__storedConstructionReplayRowId !== void 0 && ctx.__storedConstructionReplaySlot?.classId === schemaClass2.id ? sessionCreationCheckpoint(ctx) : void 0;
   const closeFrame = pushConstructionFrame(ctx, schemaClass2.name);
   try {
     return constructDeclaredClassValueWithinFrame(
@@ -53203,11 +53150,7 @@ function constructDeclaredClassValue(info, scope, ctx) {
       ctx
     );
   } catch (error) {
-    if (replayCheckpoint !== void 0) {
-      for (const row of createdSessionValuesSince(ctx, replayCheckpoint)) {
-        deleteRuntimeSessionValue(ctx, row.id);
-      }
-    }
+    rollbackStoredConstructionReplay(ctx, replayCheckpoint);
     throw error;
   } finally {
     closeFrame();
@@ -53268,6 +53211,8 @@ function constructDeclaredClassValueWithinFrame(descriptor, record7, info, scope
     });
     root.classId = classId;
     stampConstructedRootGenericBindings(root, descriptor);
+    if (ctx.__storedReplayCandidate !== void 0)
+      ctx.__storedReplayCandidate.value = root.value;
   } catch (error) {
     if (error instanceof NSGetterRuntimeError) {
       positionAtPassingArgument(error, info, record7, argumentValues, ctx);
@@ -53280,7 +53225,7 @@ function constructDeclaredClassValueWithinFrame(descriptor, record7, info, scope
       `Declared constructor for '${schemaClass2.name}' produced a non-record root.`
     );
   }
-  if (ctx.storedConstructionReplay === true && ctx.__storedConstructionReplayRowId !== void 0 && ctx.__storedConstructionReplaySlot?.classId === classId && ctx.__executionState?.constructionStack.length === 1) {
+  if (ctx.storedConstructionReplay === true && ctx.__storedConstructionReplayRowId !== void 0 && ctx.__storedConstructionReplaySlot?.classId === classId) {
     ctx = { ...ctx, __storedConstructionReplayRootId: root.id };
   }
   const rootRecord = root.value;
@@ -53444,8 +53389,13 @@ function assertOwnedValueAttachable(valueId, destination, destinationName2, ctx,
     ctx,
     preflight?.parentEntries
   )) {
-    if (mode === "assign" && ownedAttachmentIdentity(owner, ctx) === ownedAttachmentIdentity(destination, ctx))
+    if (mode === "assign" && ownedAttachmentIdentity(owner, ctx) === ownedAttachmentIdentity(destination, ctx)) {
+      if (ctx.__storedReplayCandidate !== void 0 && ctx.__storedConstructionReplayRowId !== void 0 && owner.identity.startsWith(
+        `value:${ctx.__storedConstructionReplayRowId}:slot:`
+      ))
+        ctx.__storedReplayCandidate.reattached = true;
       continue;
+    }
     const error = new NSGetterRuntimeError(
       `Aggregate value '${valueId}' is already owned by parent value '${owner.label}' and cannot be attached to '${destinationName2}'. Call Clone() explicitly.`
     );
@@ -53454,23 +53404,6 @@ function assertOwnedValueAttachable(valueId, destination, destinationName2, ctx,
   }
   const reserved = ctx.__executionState?.ownedValueAttachments.get(valueId);
   if (reserved !== void 0 && (mode === "insert" || reserved.identity !== destination.identity)) {
-    const constructorArgumentReservation = reserved.identity.startsWith(
-      `value:${reserved.label}:constructorArg:`
-    );
-    const destinationConstructorGroup = constructorGroupForRow(
-      destination.label,
-      ctx
-    );
-    if (constructorArgumentReservation && (destination.label === reserved.label || destinationConstructorGroup === reserved.label || preflight?.constructorRootIds.has(reserved.label) === true)) {
-      if (preflight === void 0) {
-        ctx.__executionState?.ownedValueAttachments.set(valueId, destination);
-        recordConstructorGroupDependency(valueId, destination, ctx);
-      } else {
-        preflight.constructorArgumentTransfers.set(valueId, destination);
-        preflight.dependencies.set(valueId, destination);
-      }
-      return;
-    }
     throw new NSGetterRuntimeError(
       `Aggregate value '${valueId}' is already owned by parent value '${reserved.label}' and cannot be attached to '${destinationName2}'. Call Clone() explicitly.`
     );
@@ -53482,6 +53415,29 @@ function assertOwnedValueAttachable(valueId, destination, destinationName2, ctx,
     recordConstructorGroupDependency(valueId, destination, ctx);
   else preflight.dependencies.set(valueId, destination);
 }
+function storedReplayRowById(id2, ctx) {
+  ctx.valueDependencies?.add(id2);
+  ctx.__getterReads?.add(id2);
+  const database = ctx.vm.databaseVM;
+  if (database?.storedValueById !== void 0)
+    return database.storedValueById(id2);
+  if (database?.evaluatorIndexes !== void 0)
+    return database.evaluatorIndexes.valueById.get(id2) ?? null;
+  return ctx.vm.values.find((row) => row.id === id2) ?? null;
+}
+function storedInitializerChildId(member, ctx) {
+  if (ctx.storedConstructionReplay !== true) return void 0;
+  const parentId = ctx.__storedConstructionReplayRowId;
+  const memberId = Reflect.get(member, "id");
+  if (parentId === void 0 || typeof memberId !== "string") return void 0;
+  const parent = storedReplayRowById(parentId, ctx);
+  if (parent?.value === null || typeof parent?.value !== "object")
+    return void 0;
+  const schemaKey = cachedSchemaKeyForMember(memberId, ctx);
+  if (schemaKey === null) return void 0;
+  const childId = Reflect.get(parent.value, schemaKey);
+  return typeof childId === "string" ? childId : void 0;
+}
 function assertInitializerPlacement(valueId, member, ctx) {
   const replayRowId = ctx.__storedConstructionReplayRowId;
   const memberId = Reflect.get(member, "id");
@@ -53518,7 +53474,7 @@ function ownershipParentEntryKeys(value, valueId, cache) {
   }
   return entries.get(valueId) ?? [];
 }
-function currentOwnedValueAttachments(valueId, ctx, parentEntries, placingMembers) {
+function currentOwnedValueAttachments(valueId, ctx, parentEntries) {
   const indexes4 = evaluatorIndexes(ctx);
   const cached = indexes4.ownedValueAttachmentsByValueId.get(valueId);
   if (cached !== void 0) return [...cached];
@@ -53581,14 +53537,7 @@ function currentOwnedValueAttachments(valueId, ctx, parentEntries, placingMember
     let member = null;
     let classId = parent.classId;
     if (classId === void 0 || classId === null) {
-      member = activeStaticBindingRoot(parent.id, ctx)?.member ?? (placingMembers === void 0 ? memberForValueRow(parent, ctx) : placingMember(
-        parent,
-        ctx,
-        void 0,
-        0,
-        placingMembers,
-        parentEntries
-      ));
+      member = activeStaticBindingRoot(parent.id, ctx)?.member ?? memberForValueRow(parent, ctx);
       if (member !== null) {
         try {
           member = resolveMember(member, ctx.vm.members);
@@ -69866,8 +69815,8 @@ var init_strict_resolver = __esm({
           this.persistingMethodGroup = false;
         }
       }
-      /** P112 §2.2. Checks a stored default's `Reference(place)` the push can't settle. */
-      resolvePersistedReference(expression, expected) {
+      /** Check an initializer with its expected type, including contextual expressions. */
+      validateInitializerExpression(expression, expected) {
         const resolved = this.resolveExpression(
           expression,
           this.initialScope(),
@@ -75641,6 +75590,8 @@ var init_strict_resolver = __esm({
           }
           const staticType = this.project.typeByName.get(receiverAst.name);
           if (staticType && staticType.kind !== "enum") {
+            if (receiverAst.typeQualifier)
+              this.resolveType(receiverAst.typeQualifier);
             this.assertUserSafe(
               { kind: "named", typeId: staticType.id },
               "a static receiver",
@@ -75780,6 +75731,9 @@ var init_strict_resolver = __esm({
             pointer: listIndexPointer(receiver.pointer, index),
             type: viewType,
             writability: "readOnly" /* ReadOnly */,
+            ...receiver.entryWritability !== void 0 ? { entryWritability: receiver.entryWritability } : {},
+            entryUserData: receiver.entryUserData === true,
+            ...receiver.writeRoot !== void 0 ? { writeRoot: receiver.writeRoot } : {},
             indexDefinition: index,
             indexCollectionPointer: receiver.pointer
           };
@@ -75788,7 +75742,10 @@ var init_strict_resolver = __esm({
           return {
             pointer: receiver.pointer,
             type: { kind: "primitive", name: "unknown" },
-            indexSurface: receiver.type
+            indexSurface: receiver.type,
+            entryWritability: receiver.entryWritability ?? receiver.writability ?? "runtime" /* Runtime */,
+            entryUserData: receiver.entryWritability === void 0 ? receiver.userData === true : receiver.entryUserData === true,
+            writeRoot: this.expressionWriteRoot(receiver, scope)
           };
         }
         if ((name === "Keys" || name === "Values") && receiver.type.kind === "dictionary") {
@@ -76063,7 +76020,7 @@ var init_strict_resolver = __esm({
             pos
           );
         }
-        if (entry.id.startsWith(NEOSCRIPT_PENDING_SYMBOL_ID_PREFIX)) {
+        if (entry.id.startsWith(NEOSCRIPT_PENDING_SYMBOL_ID_PREFIX) && !this.options.allowPendingRegistryEntries) {
           throw new CompileError(
             `${registry.entryType} '${name}' has no @id, so it has never been pushed and has no project file to reference. Push the file before referencing it.`,
             pos
@@ -76191,7 +76148,10 @@ var init_strict_resolver = __esm({
               key.pointer
             ),
             type: resultType,
-            writability: "readOnly" /* ReadOnly */
+            writability: "readOnly" /* ReadOnly */,
+            ...receiver.entryWritability !== void 0 ? { entryWritability: receiver.entryWritability } : {},
+            entryUserData: receiver.entryUserData === true,
+            ...receiver.writeRoot !== void 0 ? { writeRoot: receiver.writeRoot } : {}
           };
         }
         const readonlyCollection = receiver.symbol?.readonlyDeclaration === true && receiver.initWritability !== void 0 ? {
@@ -77027,6 +76987,8 @@ var init_strict_resolver = __esm({
           }
           const staticType = this.project.typeByName.get(callee.receiver.name);
           if (staticType && staticType.kind !== "enum") {
+            if (callee.receiver.typeQualifier)
+              this.resolveType(callee.receiver.typeQualifier);
             this.assertUserSafe(
               { kind: "named", typeId: staticType.id },
               "a static receiver",
@@ -85628,7 +85590,10 @@ function formatNeoScript(text, options = {}) {
   const literalNewlines = /* @__PURE__ */ new Set();
   const delimiterTokensByLine = /* @__PURE__ */ new Map();
   const tokensByLine = /* @__PURE__ */ new Map();
-  const lambdaBraceOffsets = /* @__PURE__ */ new Set();
+  const braceHeaderLines = /* @__PURE__ */ new Map();
+  const parenthesisLines = [];
+  const genericLines = [];
+  let previousHeaderLine = 0;
   const genericOffsets = genericAngleOffsets(syntax.lexed.tokens);
   const continuationOperator = (token) => !genericOffsets.has(token.start) && isContinuationOperator(token);
   let annotationState = "none";
@@ -85664,9 +85629,22 @@ function formatNeoScript(text, options = {}) {
         tripleString = { token, previous: previousSignificantToken };
     }
     if (token.kind !== "comment" && token.kind !== "eof") {
-      if (token.kind === "punctuation" && token.text === "{" && previousSignificantToken?.kind === "operator" && previousSignificantToken.text === "=>") {
-        lambdaBraceOffsets.add(token.start);
-      }
+      let headerLine = token.range.start.line;
+      const followsTypeOrName = previousSignificantToken?.kind === "identifier" || previousSignificantToken?.text === "new" || previousSignificantToken?.text === ">" && genericOffsets.has(previousSignificantToken.start);
+      if (token.kind === "identifier" && previousSignificantToken?.text === "new" || token.text === "(" && followsTypeOrName)
+        headerLine = previousHeaderLine;
+      if (genericOffsets.has(token.start)) {
+        if (token.text === "<") genericLines.push(previousHeaderLine);
+        if (token.text === ">") headerLine = genericLines.pop() ?? headerLine;
+      }
+      if (token.text === "(") parenthesisLines.push(headerLine);
+      if (token.text === ")") headerLine = parenthesisLines.pop() ?? headerLine;
+      if (token.text === "{")
+        braceHeaderLines.set(
+          token.start,
+          previousSignificantToken?.text === ")" || previousSignificantToken?.text === "=>" || previousSignificantToken?.kind === "identifier" || previousSignificantToken?.text === ">" && genericOffsets.has(previousSignificantToken.start) ? previousHeaderLine : headerLine
+        );
+      previousHeaderLine = headerLine;
       let annotationEnd = false;
       if (token.kind === "punctuation" && token.text === "@" && annotationDepth === 0)
         annotationState = "name";
@@ -85695,6 +85673,8 @@ function formatNeoScript(text, options = {}) {
   }
   const formatted = [];
   const delimiters = [];
+  const lineDepths = /* @__PURE__ */ new Map();
+  const braceHeaderDepth = (token) => lineDepths.get(braceHeaderLines.get(token.start) ?? -1);
   const continuations = /* @__PURE__ */ new Set();
   let preceding;
   let aligning;
@@ -85728,14 +85708,21 @@ function formatNeoScript(text, options = {}) {
     const sectionDepth = switchSectionIndentDepth(syntax.parsed, contentOffset);
     const leadingState = cloneDelimiterStack(delimiters);
     for (const token of leadingClosers) {
-      applyDelimiterToken(leadingState, token, lambdaBraceOffsets);
+      applyDelimiterToken(leadingState, token);
     }
-    const depth = delimiterDepth(leadingState);
+    let depth = delimiterDepth(leadingState);
     const significant = tokensByLine.get(lineIndex) ?? [];
-    pruneContinuations(continuations, leadingState);
+    lineDepths.set(lineIndex, depth);
     const first = significant[0];
+    const continuationScope = leadingState.at(-1)?.openingOffset ?? -1;
+    if (first?.text === "{") {
+      applyDelimiterToken(leadingState, first, braceHeaderDepth(first));
+      depth = delimiterDepth(leadingState) - 1;
+      lineDepths.set(lineIndex, depth);
+    }
+    pruneContinuations(continuations, leadingState);
     if (leadingClosers.length === 0 && (first !== void 0 && continuationOperator(first) && preceding !== void 0 && canEndExpression(preceding) || preceding !== void 0 && continuationOperator(preceding)))
-      continuations.add(leadingState.at(-1)?.openingOffset ?? -1);
+      continuations.add(continuationScope);
     const lineDepth = depth + sectionDepth + continuations.size;
     const normalized = first?.range.start.character === firstContentCharacter ? normalizeControlHeaderSpacing(content) : content;
     const indent2 = indentUnit.repeat(lineDepth);
@@ -85746,7 +85733,7 @@ function formatNeoScript(text, options = {}) {
     if (standalone !== void 0 && standalone.closingIndent !== indent2)
       aligning = { ...standalone, indent: indent2 };
     for (const token of lineTokens) {
-      applyDelimiterToken(delimiters, token, lambdaBraceOffsets);
+      applyDelimiterToken(delimiters, token, braceHeaderDepth(token));
     }
     pruneContinuations(continuations, delimiters);
     const last = significant.at(-1);
@@ -85887,25 +85874,26 @@ function leadingClosingTokens(lineTokens, firstContentCharacter) {
   }
   return result;
 }
-function applyDelimiterToken(stack, token, lambdaBraceOffsets) {
+function applyDelimiterToken(stack, token, headerDepth) {
   if (isOpeningDelimiter(token.text)) {
-    let restores;
-    if (token.text === "{" && lambdaBraceOffsets.has(token.start)) {
-      for (let index = stack.length - 1; index >= 0; index--) {
+    const restores = [];
+    if (token.text === "{" && headerDepth !== void 0) {
+      let depth = delimiterDepth(stack);
+      for (let index = stack.length - 1; index >= 0 && depth > headerDepth; index--) {
         const candidate = stack[index];
-        if (candidate?.text === "(" && candidate.contributes && candidate.openingLine === token.range.start.line) {
-          restores = candidate;
-          break;
+        if (candidate?.text === "{") break;
+        if (candidate?.text === "(" && candidate.contributes) {
+          restores.push(candidate);
+          candidate.contributes = false;
+          depth--;
         }
       }
-      if (restores) restores.contributes = false;
     }
     stack.push({
       text: token.text,
-      openingLine: token.range.start.line,
       openingOffset: token.start,
       contributes: true,
-      ...restores ? { restores } : {}
+      ...restores.length > 0 ? { restores } : {}
     });
     return;
   }
@@ -85919,7 +85907,7 @@ function applyDelimiterToken(stack, token, lambdaBraceOffsets) {
   }
   if (frameIndex < 0) return;
   const [frame] = stack.splice(frameIndex, 1);
-  if (frame?.restores) frame.restores.contributes = true;
+  for (const restored of frame?.restores ?? []) restored.contributes = true;
 }
 function pruneContinuations(continuations, stack) {
   const scopes = /* @__PURE__ */ new Set([-1, ...stack.map((frame) => frame.openingOffset)]);
@@ -85930,20 +85918,11 @@ function delimiterDepth(stack) {
   return stack.filter((frame) => frame.contributes).length;
 }
 function cloneDelimiterStack(stack) {
-  const clones = stack.map((frame) => ({
+  return stack.map((frame) => ({
     text: frame.text,
-    openingLine: frame.openingLine,
     openingOffset: frame.openingOffset,
     contributes: frame.contributes
   }));
-  for (let index = 0; index < stack.length; index++) {
-    const restores = stack[index]?.restores;
-    if (!restores) continue;
-    const restoreIndex = stack.indexOf(restores);
-    if (restoreIndex < 0) continue;
-    clones[index] = { ...clones[index], restores: clones[restoreIndex] };
-  }
-  return clones;
 }
 function matchingOpeningDelimiter(value) {
   switch (value) {
@@ -97695,7 +97674,11 @@ function validateMember(uri, member, ownerName, documentKind, ownerScope, enviro
       member.initializer.text,
       memberType2,
       scope,
-      member.modifiers.includes("static") ? { ...environment, staticMember: true } : environment,
+      {
+        ...environment,
+        staticMember: member.modifiers.includes("static"),
+        checkComputedInitializers: true
+      },
       member.initializer.range,
       diagnostics,
       anchorOf(member.initializer),
@@ -98619,6 +98602,80 @@ function knownGeneratorExpression(expression, scope, environment) {
   return candidates !== void 0 && candidates.length > 0 && candidates.every((member) => member.generator === true);
 }
 function validateExpression(expression, expected, scope, environment, uri, range2, diagnostics, anchor, storedValue = true) {
+  const sourceOnly = expected !== void 0 && (isNeoVariantTypeName(expected.name) || expected.name === "NeoAction" || expected.name === "ImageRef");
+  let receiver = expression;
+  if (environment.checkComputedInitializers) {
+    while (receiver.kind === "member") receiver = receiver.receiver;
+  }
+  const computed = environment.checkComputedInitializers && !sourceOnly && (expression.kind === "member" && (receiver.kind !== "ident" || receiver.typeQualifier !== void 0) || [
+    "binary",
+    "unary",
+    "force",
+    "coalesce",
+    "conditional",
+    "switchExpression",
+    "is",
+    "lambda",
+    "index",
+    "litInterp",
+    "litTripleString",
+    "call"
+  ].includes(expression.kind)) && !isReferenceCall(expression);
+  const count = diagnostics.length;
+  validateStoredExpression(
+    expression,
+    expected,
+    scope,
+    computed || sourceOnly || expression.kind === "member" ? { ...environment, checkComputedInitializers: false } : environment,
+    uri,
+    range2,
+    diagnostics,
+    anchor,
+    storedValue
+  );
+  if (!computed || diagnostics.length !== count) return;
+  const { context, resolver, parameterNames, parameterTypes } = initializerResolver(
+    environment,
+    scope.get("this")?.name ?? "",
+    environment.staticMember,
+    "initializer"
+  );
+  try {
+    const reads = new Set(
+      collectIdentifierReads(expression, parameterNames).map(
+        (read) => read.name
+      )
+    );
+    const parameters = [...reads].map((name) => ({
+      name,
+      type: parameterTypes.get(name)
+    }));
+    const scopedResolver = parameters.length === 0 ? resolver : new StrictNeoScriptResolver(
+      { ...context, parameters },
+      environment.projectIndex,
+      void 0,
+      { allowPendingRegistryEntries: true }
+    );
+    scopedResolver.validateInitializerExpression(
+      expression,
+      expected === void 0 ? void 0 : resolveNeoScriptType(
+        semanticAst(expected, expression.pos),
+        context,
+        environment.projectIndex
+      )
+    );
+  } catch (error) {
+    if (!(error instanceof CompileError)) throw error;
+    pushDiagnostic(
+      diagnostics,
+      uri,
+      anchor ? anchorSpan(anchor, error, 1) : range2,
+      "invalid-computed-initializer",
+      error.message.replace(/^\d+:\d+: /, "")
+    );
+  }
+}
+function validateStoredExpression(expression, expected, scope, environment, uri, range2, diagnostics, anchor, storedValue = true) {
   if (anchor !== void 0 && expression.kind === "call") {
     const error = sourceCallBinding(expression, scope, environment)?.error;
     if (error?.message.includes(
@@ -98843,7 +98900,7 @@ function validateExpression(expression, expected, scope, environment, uri, range
         // Enum dictionaries also preserve quoted option IDs, including orphaned IDs.
         entry.key.kind === "litString" ? void 0 : key,
         scope,
-        environment,
+        { ...environment, checkComputedInitializers: false },
         uri,
         range2,
         diagnostics,
@@ -99025,6 +99082,17 @@ function validateExpression(expression, expected, scope, environment, uri, range
   }
   if (expression.kind === "new") {
     const typeName = expression.className ?? expected?.name;
+    if (typeName === "List" || typeName === "Set" || typeName === "Dictionary") {
+      const literal3 = typeName === "Dictionary" ? "{}" : "[]";
+      pushDiagnostic(
+        diagnostics,
+        uri,
+        anchor ? anchorSpan(anchor, expression.pos, 3) : range2,
+        "collection-construction",
+        `${typeName} has no constructor. Use ${literal3} for an empty collection.`
+      );
+      return;
+    }
     const declaration = typeName ? environment.types.get(typeName) : void 0;
     for (const entry of expression.initializer ?? []) {
       if (entry.name !== "layerClassId") continue;
@@ -99958,24 +100026,49 @@ function wrappedTypeParameterConstruction(declaration, typeArguments, scope, env
   }
   return target.kind === "named" ? wrappedTypeParameterMessage(target, environment.projectIndex) : null;
 }
-function initializerResolver(environment, thisName, staticMember) {
+function initializerResolver(environment, thisName, staticMember, kind = "initializerExpression") {
   const declaring = environment.projectIndex.typeByName.get(thisName);
-  const key = `${declaring?.id ?? ""}:${staticMember}`;
+  const key = `${declaring?.id ?? ""}:${staticMember}:${kind}`;
   let entry = environment.initializerResolvers.get(key);
   if (entry === void 0) {
     const declaringType = declaring ? { kind: "named", typeId: declaring.id } : void 0;
     const context = {
       project: environment.project,
-      kind: "initializerExpression",
+      kind,
       ...declaringType ? {
         declaringType,
         implicitMemberAccess: true,
         ...staticMember ? { staticMember } : { thisClass: declaringType }
       } : {}
     };
+    const parameterTypes = /* @__PURE__ */ new Map();
+    if (kind === "initializer" && !staticMember) {
+      const owner = environment.types.get(thisName);
+      for (const parameter4 of owner?.headerParameters ?? []) {
+        try {
+          parameterTypes.set(
+            parameter4.name,
+            resolveNeoScriptType(
+              semanticAst(semanticType(parameter4.type), { line: 1, column: 1 }),
+              context,
+              environment.projectIndex
+            )
+          );
+        } catch (error) {
+          if (!(error instanceof CompileError)) throw error;
+        }
+      }
+    }
     entry = {
       context,
-      resolver: new StrictNeoScriptResolver(context, environment.projectIndex)
+      parameterNames: new Set(parameterTypes.keys()),
+      parameterTypes,
+      resolver: new StrictNeoScriptResolver(
+        context,
+        environment.projectIndex,
+        void 0,
+        { allowPendingRegistryEntries: true }
+      )
     };
     environment.initializerResolvers.set(key, entry);
   }
@@ -100525,7 +100618,7 @@ function validatePlaceReference(expression, expected, thisName, environment, rep
     environment.staticMember
   );
   try {
-    resolver.resolvePersistedReference(
+    resolver.validateInitializerExpression(
       expression,
       expected === void 0 ? void 0 : resolveNeoScriptType(
         semanticAst(expected, expression.pos),
@@ -240314,7 +240407,7 @@ var releaseWorkspaceLock = () => void 0;
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.89.7");
+    console.log("0.89.8");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {