@neocompose/cli 0.89.7 → 0.89.9

package/dist/test-worker.mjs

@@ -25397,6 +25397,7 @@ function indexRuntimeCollectionChange(collection, entry, ctx, removedEntries = n
     indexes4.memberByRowId.clear();
   }
   if (Array.isArray(collection)) forgetLocalListIndexes(ctx, collection);
+  else indexes4.declaredListByArray = /* @__PURE__ */ new WeakMap();
   markOverlayMutated(ctx, collection);
   if (ctx.__valueOverlay instanceof LazyValueOverlay)
     indexes4.overlayRevision = ctx.__valueOverlay.revision;
@@ -26889,11 +26890,10 @@ function remapRuntimeReferences(value, overlay, seen, preservedReferences) {
   const next = {};
   seen.set(value, next);
   for (const [key, entry] of Object.entries(value)) {
-    next[key] = remapRuntimeReferences(
-      entry,
-      overlay,
-      seen,
-      preservedReferences
+    setOwnField(
+      next,
+      key,
+      remapRuntimeReferences(entry, overlay, seen, preservedReferences)
     );
   }
   return next;
@@ -28689,7 +28689,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,
@@ -28785,7 +28785,7 @@ function applyOverlayAssignment(target, targetTypeInfo, value, scope, ctx, desti
       );
       noteDetachedRow(object[stringKey], referenceValueId, ctx);
     }
-    object[stringKey] = referenceValueId;
+    setOwnField(object, stringKey, referenceValueId);
     if (!field) recordWrittenEntry(object, stringKey, true, ctx);
     if (field || !indexRuntimeCollectionEntryWrite(
       object,
@@ -28801,7 +28801,7 @@ function applyOverlayAssignment(target, targetTypeInfo, value, scope, ctx, desti
     return;
   if (field && (targetTypeInfo.type === 7 /* Class */ || targetTypeInfo.type === 22 /* Interface */))
     noteDetachedRow(object[stringKey], value, ctx);
-  object[stringKey] = value;
+  setOwnField(object, stringKey, value);
   if (!field) recordWrittenEntry(object, 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(object, previous, value, stringKey, ctx))
@@ -28883,7 +28883,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);
@@ -28952,107 +28952,6 @@ function keepAssignedCollectionValues(value, targetTypeInfo, row, ctx) {
     return 0 /* Continue */;
   });
 }
-function pendingConstructorRootsForRow(valueId, ctx) {
-  const roots = /* @__PURE__ */ new Set();
-  const open = ctx.__executionState?.openConstructions;
-  if (open === void 0 || open.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 id = pending.pop();
-    if (id === void 0 || visited.has(id)) continue;
-    visited.add(id);
-    const row = evalValueById(
-      ctx,
-      id,
-      ctx.__runtimeSessionValues,
-      ctx.__valueOverlay
-    );
-    if (row === null) continue;
-    if (typeof row.value === "object" && row.value !== null && open.has(row.value))
-      roots.add(id);
-    for (const owner of currentOwnedValueAttachments(
-      id,
-      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), id)) {
-      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,
-        id,
-        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);
@@ -29065,8 +28964,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 }) => {
@@ -29089,8 +28986,6 @@ function preflightAssignedCollection(collection, member, row, ctx) {
     );
     return 0 /* Continue */;
   });
-  for (const [id, destination] of preflight.constructorArgumentTransfers)
-    ctx.__executionState?.ownedValueAttachments.set(id, destination);
   for (const [id, destination] of preflight.dependencies)
     recordConstructorGroupDependency(id, destination, ctx);
 }
@@ -29118,6 +29013,7 @@ function replaceRowValue(row, value, receiver, ctx) {
   unindexEvaluatorRow(indexes4, row, true);
   row.value = value;
   indexEvaluatorRow(indexes4, row, true);
+  indexes4.declaredListByArray = /* @__PURE__ */ new WeakMap();
   markOverlayMutated(ctx, receiver);
   if (ctx.__valueOverlay instanceof LazyValueOverlay)
     indexes4.overlayRevision = ctx.__valueOverlay.revision;
@@ -30945,7 +30841,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)) {
@@ -33370,6 +33270,17 @@ function runtimeTypeCheck(value, checkType, ctx, seenCollections = /* @__PURE__
     case 8 /* Enum */:
       return Array.isArray(value) && value.every((v) => typeof v === "string");
     case 7 /* Class */: {
+      if (isVariantClassId(checkType.classId)) {
+        if (!isVariantRefValue(value)) return false;
+        const targetParameter = evaluatorSchemaIndex(ctx).classesById.get(
+          checkType.classId
+        )?.genericParams?.[0];
+        const target = targetParameter === void 0 ? void 0 : receiverClosedTypeArguments(checkType.typeArguments, ctx)?.[targetParameter.id];
+        return target?.type !== 7 /* Class */ || evaluatorSchemaIndex(ctx).classIsOrExtends(
+          value.classId,
+          target.classId
+        );
+      }
       if (typeof value !== "object") return false;
       const row = trackedRowForValueReference(value, ctx);
       const runtimeClassId = row === null ? void 0 : classIdForValueRow(row, ctx);
@@ -37432,6 +37343,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);
     }
   }
@@ -37517,16 +37429,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();
   }
@@ -37626,6 +37577,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.`
@@ -38055,15 +38008,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,
@@ -38071,6 +38029,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;
@@ -38283,6 +38252,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);
@@ -38486,18 +38462,14 @@ function encodeRequiredConstructorArgument(args) {
     args.ctx.__valueOverlay
   ) !== null ? args.value : null;
   const adoptTracked = (id, suffix) => {
-    if (constructorGroupForRow(id, args.ctx) !== null) {
-      assertOwnedValueAttachable(
-        id,
-        {
-          identity: `value:${args.ownerRootId}:constructorArg:${args.parameterId}:${suffix}`,
-          label: args.ownerRootId
-        },
-        `constructor argument '${args.parameterId}'`,
-        args.ctx,
-        true
-      );
-    }
+    recordConstructorGroupDependency(
+      id,
+      {
+        identity: `value:${args.ownerRootId}:constructorArg:${args.parameterId}:${suffix}`,
+        label: args.ownerRootId
+      },
+      args.ctx
+    );
     return id;
   };
   if (args.typeInfo.type === 21 /* Generic */) {
@@ -38505,6 +38477,21 @@ function encodeRequiredConstructorArgument(args) {
       `Constructor argument '${args.parameterId}' has an unresolved generic type.`
     );
   }
+  if (args.typeInfo.type === 7 /* Class */ && isVariantClassId(args.typeInfo.classId)) {
+    if (args.value === null || args.value === void 0) return null;
+    const selection = readVariantSelection(
+      args.value,
+      `Constructor argument '${args.parameterId}'`
+    );
+    if (selection.rowValueId !== null) {
+      adoptTracked(selection.rowValueId, "variant-row");
+    }
+    return {
+      classId: selection.classId,
+      variantId: selection.variantId,
+      ...selection.rowValueId === null ? {} : { rowValueId: selection.rowValueId }
+    };
+  }
   if (args.typeInfo.type === 7 /* Class */ || args.typeInfo.type === 22 /* Interface */) {
     if (args.value === null || args.value === void 0) return null;
     const aggregateId2 = trackedId ?? replayedAggregateId;
@@ -39419,7 +39406,8 @@ function constructDeclaredClassValue(info, scope, ctx) {
   const descriptor = validateClassConstructorDescriptor(info, ctx, false);
   const schemaClass2 = descriptor.schemaClass;
   const record4 = 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(
@@ -39430,11 +39418,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();
@@ -39495,6 +39479,8 @@ function constructDeclaredClassValueWithinFrame(descriptor, record4, 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, record4, argumentValues, ctx);
@@ -39507,7 +39493,7 @@ function constructDeclaredClassValueWithinFrame(descriptor, record4, 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;
@@ -39671,8 +39657,13 @@ function assertOwnedValueAttachable(valueId, destination, destinationName, 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 '${destinationName}'. Call Clone() explicitly.`
     );
@@ -39681,23 +39672,6 @@ function assertOwnedValueAttachable(valueId, destination, destinationName, 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 '${destinationName}'. Call Clone() explicitly.`
     );
@@ -39709,6 +39683,29 @@ function assertOwnedValueAttachable(valueId, destination, destinationName, ctx,
     recordConstructorGroupDependency(valueId, destination, ctx);
   else preflight.dependencies.set(valueId, destination);
 }
+function storedReplayRowById(id, ctx) {
+  ctx.valueDependencies?.add(id);
+  ctx.__getterReads?.add(id);
+  const database = ctx.vm.databaseVM;
+  if (database?.storedValueById !== void 0)
+    return database.storedValueById(id);
+  if (database?.evaluatorIndexes !== void 0)
+    return database.evaluatorIndexes.valueById.get(id) ?? null;
+  return ctx.vm.values.find((row) => row.id === id) ?? 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");
@@ -39746,7 +39743,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];
@@ -39809,14 +39806,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);
@@ -45542,22 +45532,29 @@ function lookupEntryTypeInfo2(member, collectionTypeInfo) {
 }
 
 // ../packages/neoscript-runtime/src/values/member-declared-type-info.ts
-function resolveMemberDeclaredTypeInfo(member, members2, ownerClass = null, env) {
+function resolveMemberDeclaredTypeInfo(member, members2, classes, ownerClass = null, env) {
   return resolveMemberDeclaredTypeInfoInternal(
     member,
     members2,
+    classes,
     /* @__PURE__ */ new Set(),
     ownerClass,
     env,
     ownerClass === null ? void 0 : classConstrainedGenerics([ownerClass])
   );
 }
-function resolveMemberDeclaredTypeInfoInternal(member, members2, seen, ownerClass, env, isClassConstrained) {
+function resolveMemberDeclaredTypeInfoInternal(member, members2, classes, seen, ownerClass, env, isClassConstrained) {
   const resolved = env === void 0 ? resolveMember(member, members2) : substituteMember(member, env, members2);
   const memberId = getField(resolved, "id");
   if (typeof memberId === "string" && seen.has(memberId)) return null;
   const nextSeen = typeof memberId === "string" ? /* @__PURE__ */ new Set([...seen, memberId]) : new Set(seen);
   if (isMemberNSPropertyBase(resolved)) return resolved.returnTypeInfo;
+  if (isMemberVariantBase(resolved)) {
+    return variantMemberDeclaredTypeInfo(
+      resolved,
+      neoVariantSystemClass(classes, resolved.valueTypeInfo != null)
+    );
+  }
   if (isClassSlotMember(resolved)) {
     const typeArguments = Object.fromEntries(
       Object.entries(declaredSlotArguments(resolved) ?? {}).flatMap(
@@ -45577,6 +45574,7 @@ function resolveMemberDeclaredTypeInfoInternal(member, members2, seen, ownerClas
           const argumentType2 = resolveMemberDeclaredTypeInfoInternal(
             argumentMember,
             members2,
+            classes,
             nextSeen,
             ownerClass,
             env,
@@ -45647,6 +45645,7 @@ function resolveMemberDeclaredTypeInfoInternal(member, members2, seen, ownerClas
       const typeInfo = resolveMemberDeclaredTypeInfoInternal(
         descriptor,
         members2,
+        classes,
         nextSeen,
         ownerClass,
         env,
@@ -45675,6 +45674,7 @@ function resolveMemberDeclaredTypeInfoInternal(member, members2, seen, ownerClas
     const entryTypeInfo = resolveMemberDeclaredTypeInfoInternal(
       entry,
       members2,
+      classes,
       nextSeen,
       ownerClass,
       env,
@@ -45699,6 +45699,7 @@ function resolveMemberDeclaredTypeInfoInternal(member, members2, seen, ownerClas
         return resolveMemberDeclaredTypeInfoInternal(
           collection,
           members2,
+          classes,
           nextSeen,
           ownerClass,
           env,
@@ -45741,6 +45742,15 @@ function recordEntries(value) {
   if (typeof value !== "object" || value === null) return [];
   return Object.values(value);
 }
+function isVariantArgument(value, typeInfo) {
+  return typeInfo?.type === 7 /* Class */ && isVariantClassId(typeInfo.classId) && isVariantRefValue(value);
+}
+function remapVariantArgument(value, typeInfo, remap) {
+  if (!isVariantArgument(value, typeInfo)) return value;
+  if (typeof value.rowValueId !== "string") return value;
+  const rowValueId = remap(value.rowValueId);
+  return rowValueId === value.rowValueId ? value : { ...value, rowValueId };
+}
 var MaterializedValueGraphContext = class _MaterializedValueGraphContext {
   /**
    * P79 §7a. Generic in the caller's document view so a pass typed against a
@@ -45977,7 +45987,7 @@ var MaterializedValueGraphContext = class _MaterializedValueGraphContext {
           const typeInfo = parameterTypes.get(parameterId);
           return [
             parameterId,
-            typeInfo !== void 0 && (isAggregateTypeInfo(typeInfo) || typeInfo.type === 29 /* Reference */) && typeof argument2 === "string" ? rewriteId(argument2) : argument2
+            typeInfo !== void 0 && (isAggregateTypeInfo(typeInfo) || typeInfo.type === 29 /* Reference */) && typeof argument2 === "string" ? rewriteId(argument2) : remapVariantArgument(argument2, typeInfo, rewriteId)
           ];
         }
       )
@@ -46013,15 +46023,18 @@ var MaterializedValueGraphContext = class _MaterializedValueGraphContext {
       ids.push(edge.targetValueId);
     return ids;
   }
-  /** The targets a row's Reference creation data names (P112 §1.1). */
+  /** Reference targets and bound lookup rows retained by creation data. */
   referenceArgumentIds(row) {
     if (!isLiteralValueContent(row)) return [];
     const args = row.constructorArgs;
     if (args === void 0 || args === null) return [];
     const ids = [];
-    for (const parameterId of this.referenceParameterIds(row)) {
+    for (const [parameterId, typeInfo] of this.constructorParameterTypes(row)) {
       const argument2 = args[parameterId];
-      if (typeof argument2 === "string") ids.push(argument2);
+      if (typeInfo.type === 29 /* Reference */ && typeof argument2 === "string")
+        ids.push(argument2);
+      else if (isVariantArgument(argument2, typeInfo) && typeof argument2.rowValueId === "string")
+        ids.push(argument2.rowValueId);
     }
     return ids;
   }
@@ -46030,23 +46043,23 @@ var MaterializedValueGraphContext = class _MaterializedValueGraphContext {
     const args = row.constructorArgs;
     if (args === void 0 || args === null) return args;
     let remapped;
-    for (const parameterId of this.referenceParameterIds(
+    for (const [parameterId, typeInfo] of this.constructorParameterTypes(
       row,
       contextualMember
     )) {
       const argument2 = args[parameterId];
-      if (typeof argument2 !== "string") continue;
-      const target = remap(argument2);
+      const target = typeInfo.type === 29 /* Reference */ && typeof argument2 === "string" ? remap(argument2) : remapVariantArgument(argument2, typeInfo, remap);
       if (target !== argument2) (remapped ??= { ...args })[parameterId] = target;
     }
     return remapped ?? args;
   }
-  *referenceParameterIds(row, contextualMember) {
-    for (const [parameterId, typeInfo] of this.constructorParameterTypes(
-      row,
-      contextualMember
-    ))
-      if (typeInfo.type === 29 /* Reference */) yield parameterId;
+  *variantArgumentSelections(row) {
+    if (!isLiteralValueContent(row)) return;
+    if (row.constructorArgs == null) return;
+    for (const [parameterId, typeInfo] of this.constructorParameterTypes(row)) {
+      const argument2 = row.constructorArgs[parameterId];
+      if (isVariantArgument(argument2, typeInfo)) yield argument2;
+    }
   }
   slotEntries(row) {
     const value = row.value;
@@ -46147,6 +46160,17 @@ var MaterializedValueGraphContext = class _MaterializedValueGraphContext {
       if (member === void 0) return null;
       return this.memberTypeInfo(member, env);
     }
+    if ((rawTypeInfo.type === 7 /* Class */ || rawTypeInfo.type === 22 /* Interface */) && rawTypeInfo.typeArguments !== void 0) {
+      const typeArguments = {};
+      for (const [parameterId, argument2] of Object.entries(
+        rawTypeInfo.typeArguments
+      )) {
+        const resolved = this.resolveTypeInfo(argument2, env);
+        if (resolved === null) return null;
+        typeArguments[parameterId] = resolved;
+      }
+      return { ...rawTypeInfo, typeArguments };
+    }
     if (rawTypeInfo.type === 30 /* Tuple */) {
       const elements = [];
       for (const element of rawTypeInfo.elements) {
@@ -46178,7 +46202,8 @@ var MaterializedValueGraphContext = class _MaterializedValueGraphContext {
       const member = substituteMember(rawMember, env, this.document.members);
       const typeInfo = resolveMemberDeclaredTypeInfo(
         member,
-        this.document.members
+        this.document.members,
+        this.document.classes
       );
       return typeInfo === null ? null : this.resolveTypeInfo(typeInfo, env);
     } catch {
@@ -46415,7 +46440,11 @@ function tryResolveTypeInfo(document2, rawTypeInfo, env) {
 function tryMemberTypeInfo(document2, rawMember, env) {
   try {
     const member = substituteMember(rawMember, env, document2.members);
-    const typeInfo = resolveMemberDeclaredTypeInfo(member, document2.members);
+    const typeInfo = resolveMemberDeclaredTypeInfo(
+      member,
+      document2.members,
+      document2.classes
+    );
     if (typeInfo === null) return null;
     return tryResolveTypeInfo(document2, typeInfo, env);
   } catch {
@@ -53856,8 +53885,8 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
       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(),
@@ -58959,11 +58988,97 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
     if (callee.kind !== "member") return null;
     const isInitialize = callee.name === VARIANT_INITIALIZE_NAME;
     const isApply = callee.name === VARIANT_APPLY_NAME;
-    if (!isInitialize && !isApply) return null;
+    const isBind = callee.name === "Bind";
+    if (!isInitialize && !isApply && !isBind) return null;
     if (callee.receiver.kind === "ident" && !this.hasValueReceiver(callee.receiver.name, scope) && this.project.typeByName.has(callee.receiver.name)) {
       return null;
     }
     const receiver = receiverValue ? receiverValue() : this.resolveExpression(callee.receiver, scope);
+    if (isBind) {
+      const variantInfo2 = this.variantTypeInfo(receiver.type);
+      if (variantInfo2 === null) return null;
+      if (variantInfo2.valueType === null) {
+        throw new CompileError("Only a lookup variant can bind a row.", pos);
+      }
+      if (callee.optional === true) {
+        throw new CompileError("Bind requires a non-null lookup variant.", pos);
+      }
+      if (receiver.pointer.type !== "variant" /* Variant */) {
+        throw new CompileError(
+          "Bind requires a declared lookup variant path.",
+          pos
+        );
+      }
+      requireArgCount("NeoLookupVariant.Bind", argumentsList2, 1, pos);
+      const row2 = argumentsList2[0];
+      if (row2.kind !== "call") {
+        throw new CompileError(
+          'Bind requires Reference(id: "value-id").',
+          row2.pos
+        );
+      }
+      if (row2.callee.kind !== "ident" || row2.callee.name !== "Reference") {
+        throw new CompileError(
+          "Bind requires a Reference row argument.",
+          row2.pos
+        );
+      }
+      requireArgCount("Bind Reference", row2.args, 1, row2.pos);
+      if (row2.argumentNames?.[0] !== "id") {
+        throw new CompileError(
+          'Bind requires Reference(id: "value-id").',
+          row2.pos
+        );
+      }
+      const id = row2.args[0];
+      if (id.kind !== "litString") {
+        throw new CompileError(
+          "Bound row id must be a string literal.",
+          id.pos
+        );
+      }
+      if (id.value.length === 0) {
+        throw new CompileError("Bound row id must not be empty.", id.pos);
+      }
+      if (row2.typeArguments !== void 0) {
+        if (row2.typeArguments.length !== 1) {
+          throw new CompileError(
+            "Reference requires exactly one generic target type.",
+            row2.pos
+          );
+        }
+        this.requireAssignable(
+          this.resolveType(row2.typeArguments[0]),
+          variantInfo2.valueType,
+          row2.pos,
+          "Lookup variant row"
+        );
+      }
+      const rowType = this.context.persistedReferenceTypes?.get(id.value);
+      if (rowType !== void 0) {
+        this.requireAssignable(
+          neoScriptReadType(rowType),
+          variantInfo2.valueType,
+          row2.pos,
+          "Lookup variant row"
+        );
+      }
+      const bound = this.project.typeByName.get(NEO_VARIANT_TYPE_NAME);
+      if (bound === void 0) {
+        throw new CompileError(
+          `The seeded '${NEO_VARIANT_TYPE_NAME}' class is missing.`,
+          pos
+        );
+      }
+      return {
+        pointer: { ...receiver.pointer, rowValueId: id.value },
+        type: {
+          kind: "named",
+          typeId: bound.id,
+          typeArguments: receiver.type.kind === "named" ? receiver.type.typeArguments?.slice(0, 1) ?? [] : []
+        }
+      };
+    }
     if (isInitialize) {
       const variantInfo2 = this.variantTypeInfo(receiver.type);
       if (variantInfo2 === null) return null;
@@ -59631,6 +59746,8 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
       }
       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",
@@ -59770,6 +59887,9 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
         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
       };
@@ -59778,7 +59898,10 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
       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") {
@@ -60053,7 +60176,7 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
         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
@@ -60181,7 +60304,10 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
           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 ? {
@@ -60854,6 +60980,33 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
         typeArguments
       );
     }
+    if (callee.kind === "lambda" && expected !== void 0) {
+      rejectTypeArguments();
+      const parameterTypes = callee.params.map((parameter3) => {
+        if (parameter3.type === null) {
+          throw new CompileError(
+            "An immediately invoked lambda requires explicit parameter types.",
+            parameter3.pos
+          );
+        }
+        return this.resolveType(parameter3.type);
+      });
+      return this.resolveDelegateCall(
+        this.resolveDelegateLambda(
+          callee,
+          {
+            kind: "delegate",
+            parameterTypes,
+            returnType: expected
+          },
+          scope
+        ),
+        argumentsList2,
+        scope,
+        pos,
+        false
+      );
+    }
     const variantCall = this.resolveVariantCall(
       callee,
       argumentsList2,
@@ -61017,6 +61170,8 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
       }
       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",
@@ -71552,7 +71707,7 @@ function resolveAnalyzerMember(context, member) {
 }
 
 // ../src/runtime/neoscript/neoscript-language-context-adapter.ts
-var NEOSCRIPT_COMPILER_ADAPTER_REVISION = 6;
+var NEOSCRIPT_COMPILER_ADAPTER_REVISION = 7;
 var UNKNOWN_TYPE = {
   kind: "primitive",
   name: "unknown"
@@ -73842,6 +73997,7 @@ function compileMemberInitializerBody(args) {
   const returnTypeInfo = resolveMemberDeclaredTypeInfo(
     args.member,
     members2,
+    args.classes,
     args.thisClass
   );
   if (returnTypeInfo === null) {
@@ -73889,7 +74045,8 @@ function compileValueRowInitializerBody(args) {
   }
   const returnTypeInfo = resolveMemberDeclaredTypeInfo(
     args.member,
-    args.members
+    args.members,
+    args.classes
   );
   if (returnTypeInfo === null) {
     throw new Error(
@@ -74022,7 +74179,9 @@ function compilationProjectForDocument(document2, state) {
     classes: document2.classes,
     enums: document2.enums,
     interfaces: document2.interfaces,
-    constructors: document2.constructors ?? []
+    constructors: document2.constructors ?? [],
+    variants: document2.variants ?? [],
+    variantFolders: document2.variantFolders ?? []
   });
   return state.compilationProject;
 }
@@ -74118,6 +74277,8 @@ function compileValueInitializerDependency(document2, valueId, compilationProjec
     enums: document2.enums,
     interfaces: document2.interfaces,
     constructors: document2.constructors ?? [],
+    variants: document2.variants ?? [],
+    variantFolders: document2.variantFolders ?? [],
     member: site.member,
     valueRow: { ...site.row },
     valueId: site.row.id,
@@ -74136,7 +74297,9 @@ function compileMemberInitializerDependency(document2, memberId, compilationProj
     classes: document2.classes,
     enums: document2.enums,
     interfaces: document2.interfaces,
-    constructors: document2.constructors ?? []
+    constructors: document2.constructors ?? [],
+    variants: document2.variants ?? [],
+    variantFolders: document2.variantFolders ?? []
   };
   const memberIndex = documentMemberCompilationIndex(document2);
   const member = memberIndex.membersById.get(memberId);
@@ -78591,15 +78754,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: lookupDeclaredTypeInfo2(member) === null ? false : lookupNarrowingAwaitsClosingBinding(
-      ctx,
-      member,
-      resolveGenericEnvForEmission(ctx, declaration.classDef.id)
-    )
+    isVirtual: isVirtualMember(member) !== false
   };
   if (isCallableMemberForCodegen(member)) {
     const parameterTypes = member.argumentTypes.map(
@@ -78809,7 +78964,7 @@ function generatedInstanceMemberSignaturesEqual(left, right) {
   return false;
 }
 function emitsAbstractDeclaration(signature) {
-  return signature.isAbstract || signature.requiresClosingImplementation;
+  return signature.isAbstract;
 }
 function resolveGeneratedInstanceMemberPlan(ctx, classDef, schemaKey) {
   const declaration = ownInstanceMemberDeclaration(classDef, schemaKey);
@@ -80867,41 +81022,6 @@ function lookupDeclaredTypeInfo2(member) {
   if (!isMemberLookupBase(member)) return null;
   return member.declaredTypeInfo ?? null;
 }
-function lookupTargetClassProjection(ctx, member, env) {
-  if (!isMemberLookupBase(member)) return null;
-  const declaredTypeInfo = lookupDeclaredTypeInfo2(member);
-  if (declaredTypeInfo === null) {
-    const entryMember = resolveLookupEntryMember(ctx, member);
-    if (entryMember === null) return null;
-    if (!isClassTypedMember(entryMember)) return null;
-    return {
-      classId: entryMember.classId,
-      constructedSuffix: constructedTypeArgumentsSuffix(ctx, entryMember, true, env) ?? ""
-    };
-  }
-  if (declaredTypeInfo.type === 7 /* Class */) {
-    return {
-      classId: declaredTypeInfo.classId,
-      constructedSuffix: typeInfoConstructedSuffix(ctx, declaredTypeInfo, true, env) ?? ""
-    };
-  }
-  if (declaredTypeInfo.type !== 21 /* Generic */) return null;
-  if (!isClassGenericParamTypeInfo(declaredTypeInfo)) return null;
-  const entry = env?.get(declaredTypeInfo.genericParamId);
-  if (entry === void 0) return null;
-  if (entry.kind !== "member") return null;
-  const bindingMember = resolveMemberById(
-    ctx,
-    entry.memberId,
-    `classes.${declaredTypeInfo.ownerClassId}.genericParams.${declaredTypeInfo.genericParamId}`
-  );
-  if (bindingMember === null) return null;
-  if (!isClassTypedMember(bindingMember)) return null;
-  return {
-    classId: bindingMember.classId,
-    constructedSuffix: constructedTypeArgumentsSuffix(ctx, bindingMember, true, env) ?? ""
-  };
-}
 function referenceHandleTypeInfo(ctx, reference) {
   const target = reference.targetTypeInfo;
   if (referenceCategory(target, classConstrainedGenerics(ctx.classes)) !== "handle" /* Handle */) {
@@ -80965,11 +81085,6 @@ function lookupReferenceElementType(ctx, member, env) {
 function lookupNarrowsThroughGenericParam(member) {
   return lookupDeclaredTypeInfo2(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;
@@ -86457,7 +86572,9 @@ function buildNeoScriptProject(document2) {
     classes: document2.classes,
     enums: document2.enums,
     interfaces: document2.interfaces,
-    constructors: document2.constructors ?? []
+    constructors: document2.constructors ?? [],
+    variants: document2.variants,
+    variantFolders: document2.variantFolders
   });
 }
 function neoScriptProjectFingerprint(document2) {