@neocompose/cli 0.84.3 → 0.84.4

package/dist/neo-runtime.mjs

@@ -3100,14 +3100,14 @@ function isNSFunctionContains(value) {
   if (v?.type !== "contains" /* contains */) return false;
   const info = v.info;
   if (typeof info !== "object" || info === null) return false;
-  return isNSPointer(info.collectionPointer) && isNSPointer(info.valuePointer) && isReferenceFlag(info.reference);
+  return isNSPointer(info.collectionPointer) && isNSPointer(info.valuePointer) && isReferenceFlag(info.reference) && (info.float === void 0 || info.float === true) && (info.decimal === void 0 || info.decimal === true);
 }
 function isNSFunctionIndexOf(value) {
   const v = value;
   if (v?.type !== "indexOf" /* indexOf */) return false;
   const info = v.info;
   if (typeof info !== "object" || info === null) return false;
-  return isNSPointer(info.collectionPointer) && isNSPointer(info.valuePointer) && isReferenceFlag(info.reference);
+  return isNSPointer(info.collectionPointer) && isNSPointer(info.valuePointer) && isReferenceFlag(info.reference) && (info.float === void 0 || info.float === true) && (info.decimal === void 0 || info.decimal === true);
 }
 function isNSFunctionStringOp(value) {
   const v = value;
@@ -3255,7 +3255,7 @@ function isNSFunctionCollectionQuery(value) {
     case "Reverse":
       return true;
     case "ToSet":
-      return info.reference === void 0 || info.reference === true;
+      return (info.reference === void 0 || info.reference === true) && (info.decimalEntries === void 0 || info.decimalEntries === true);
     default:
       return false;
   }
@@ -17587,7 +17587,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.84.3",
+      cliVersion: "0.84.4",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -42195,7 +42195,7 @@ var init_strict_resolver = __esm({
             scope
           )
         );
-        const schemaClassInfo = toWireType(targetType, this.project);
+        const schemaClassInfo = this.constructorWireType(targetType, expression);
         if (schemaClassInfo.type !== 7 /* Class */) {
           throw new Error(
             `NeoScript constructor ${className} has non-Class return type ${this.describe(signature.returnType)}.`
@@ -42213,6 +42213,16 @@ var init_strict_resolver = __esm({
           writability: "session" /* Session */
         };
       }
+      /** Constructor storage arguments stay distinct from their expression read types. */
+      constructorWireType(target, expression) {
+        const typeArguments = expression.typeArguments?.map(
+          (argument2) => resolveStoredReferenceTarget(argument2, this.context, this.project)
+        );
+        return toWireType(
+          typeArguments === void 0 ? target : { ...target, typeArguments },
+          this.project
+        );
+      }
       constructorTargetType(schemaClass2, expression, expected) {
         const typeArguments = expression.typeArguments?.map(
           (argument2) => this.resolveType(argument2)
@@ -42343,7 +42353,7 @@ var init_strict_resolver = __esm({
           scope
         );
         const classType = targetType;
-        const schemaClassInfo = toWireType(classType, this.project);
+        const schemaClassInfo = this.constructorWireType(classType, expression);
         if (schemaClassInfo.type !== 7 /* Class */) {
           throw new Error(
             `NeoScript declared constructor ${className} projected a non-Class wire type.`
@@ -43206,6 +43216,8 @@ var init_strict_resolver = __esm({
             {
               collectionPointer: receiver.pointer,
               valuePointer: value.pointer,
+              ...isPrimitive(expectedValueType, "float") ? { float: true } : {},
+              ...isPrimitive(expectedValueType, "decimal") ? { decimal: true } : {},
               ...hasReferenceEquality(collection.valueType, this.project) ? { reference: true } : {}
             },
             { kind: "primitive", name: "int" }
@@ -43235,6 +43247,8 @@ var init_strict_resolver = __esm({
             {
               collectionPointer: receiver.pointer,
               valuePointer: value.pointer,
+              ...isPrimitive(expectedValueType, "float") ? { float: true } : {},
+              ...isPrimitive(expectedValueType, "decimal") ? { decimal: true } : {},
               ...hasReferenceEquality(collection.valueType, this.project) ? { reference: true } : {}
             },
             { kind: "primitive", name: "bool" }
@@ -43467,6 +43481,7 @@ var init_strict_resolver = __esm({
             info = {
               ...base,
               op: name,
+              ...isPrimitive(collection.valueType, "decimal") ? { decimalEntries: true } : {},
               ...hasReferenceEquality(collection.valueType, this.project) ? { reference: true } : {}
             };
             resultType = {
@@ -52181,7 +52196,9 @@ function subscriptKeyType(receiver) {
   return void 0;
 }
 function validateReferenceExpression(expression, declared, scope, environment, uri, range2, diagnostics) {
-  const expected = declared?.name === "NeoDialogueReference" ? { ...declared, name: "NeoDialogue" } : declared;
+  let expected = declared?.name === "Reference" ? declared.arguments?.[0] : declared;
+  if (expected?.name === "NeoDialogueReference")
+    expected = { ...expected, name: "NeoDialogue" };
   const typeArguments = expression.typeArguments ?? [];
   const names = expression.argumentNames ?? [];
   const idIndex = names.findIndex((name) => name === "id");
@@ -79252,16 +79269,18 @@ var init_runtime_set = __esm({
   "../packages/neoscript-runtime/src/neoscript/runtime-set.ts"() {
     "use strict";
     RuntimeSet = class {
-      constructor(source, reference2, enumEntries, slotReferences = null) {
+      constructor(source, reference2, enumEntries, slotReferences = null, decimalEntries = false) {
         this.source = source;
         this.reference = reference2;
         this.enumEntries = enumEntries;
         this.slotReferences = slotReferences;
+        this.decimalEntries = decimalEntries;
       }
       source;
       reference;
       enumEntries;
       slotReferences;
+      decimalEntries;
       entries = /* @__PURE__ */ new Map();
       validations = /* @__PURE__ */ new Map();
       snapshot;
@@ -79271,6 +79290,9 @@ var init_runtime_set = __esm({
       has(key) {
         return this.entries.has(key);
       }
+      *values() {
+        for (const entry of this.entries.values()) yield entry.raw;
+      }
       add(key, raw, reference2) {
         if (this.entries.has(key)) return;
         this.entries.set(key, { raw, reference: reference2 });
@@ -82925,7 +82947,14 @@ function evaluateNSGetterWithEffects(getter, ctx, argumentValues = [], options =
   for (let index = 0; index < argumentValues.length; index += 1) {
     const parameter4 = parameters[index];
     if (parameter4 === void 0) continue;
-    scope.setLocal(parameter4.id, argumentValues[index]);
+    scope.setLocal(
+      parameter4.id,
+      coerceAssignmentValue(
+        argumentValues[index],
+        parameter4.typeInfo,
+        "getter argument"
+      )
+    );
   }
   try {
     const result = evalBody(
@@ -82935,9 +82964,11 @@ function evaluateNSGetterWithEffects(getter, ctx, argumentValues = [], options =
       evaluationOptions(runtimeCtx, false)
     );
     if (result.kind === "return") {
-      if (getter.typeInfo.type === 20 /* Decimal */ && typeof result.value === "number") {
-        result.value = coerceDecimalOperand(result.value, "return");
-      }
+      result.value = coerceAssignmentValue(
+        result.value,
+        getter.typeInfo,
+        "return"
+      );
       if (ownsInvocationState) {
         flushRuntimeSets(runtimeCtx);
         result.value = exportRuntimeSetValue(result.value, runtimeCtx);
@@ -83772,7 +83803,11 @@ function executeCompiledFunction(action, ctx, args, allowFallthroughReturn, runt
     const parameter4 = action.parameters[index + 2];
     const runtimeTypeInfo = runtimeArgumentTypes[index];
     const value2 = asDeclaredRuntimeSet(
-      restoreExportedReferences(filledArgs[index], runtimeTypeInfo, ctx),
+      coerceAssignmentValue(
+        restoreExportedReferences(filledArgs[index], runtimeTypeInfo, ctx),
+        runtimeTypeInfo,
+        "function argument"
+      ),
       runtimeTypeInfo,
       ctx
     );
@@ -83806,9 +83841,7 @@ function executeCompiledFunction(action, ctx, args, allowFallthroughReturn, runt
     }
     return null;
   }
-  if (runtimeReturnType.type === 20 /* Decimal */ && typeof value === "number") {
-    value = coerceDecimalOperand(value, "function return");
-  }
+  value = coerceAssignmentValue(value, runtimeReturnType, "function return");
   if (!runtimeValueMatchesType(value, runtimeReturnType, ctx)) {
     throw new NSGetterRuntimeError(
       "NSFunction returned a value that does not match its compiled return type."
@@ -84147,9 +84180,11 @@ function evalInstructions(instructions, scope, ctx, options) {
         }
         case "variable" /* variable */: {
           let value = evalPointer(ins.variable.pointer, scope, ctx);
-          if (ins.variable.typeInfo.type === 20 /* Decimal */ && typeof value === "number") {
-            value = coerceDecimalOperand(value, "variable initialization");
-          }
+          value = coerceAssignmentValue(
+            value,
+            ins.variable.typeInfo,
+            "variable initialization"
+          );
           value = asDeclaredRuntimeSet(value, ins.variable.typeInfo, ctx);
           scope.setLocal(ins.variable.id, value);
           break;
@@ -84185,9 +84220,11 @@ function evalInstructions(instructions, scope, ctx, options) {
         }
         case "assign" /* assign */: {
           let value = evalPointer(ins.pointer, scope, ctx);
-          if (ins.target.typeInfo.type === 20 /* Decimal */ && typeof value === "number") {
-            value = coerceDecimalOperand(value, "assignment");
-          }
+          value = coerceAssignmentValue(
+            value,
+            ins.target.typeInfo,
+            "assignment"
+          );
           if (ins.target.pointer.type === "variable" /* variable */) {
             assertVariableBindingWritable(scope, ins.target.pointer.variableId);
             scope.setLocal(ins.target.pointer.variableId, value);
@@ -85961,6 +85998,21 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
     );
   }
   const args = ins.args.map((arg) => evalPointer(arg, scope, ctx));
+  const decimalEntries = "entryTypeInfo" in ins.target.typeInfo && ins.target.typeInfo.entryTypeInfo.type === 20 /* Decimal */;
+  let entryArgumentIndex = null;
+  const dictionary = ins.target.typeInfo.type === 5 /* Dictionary */;
+  if (ins.mutation === "Add" /* Add */)
+    entryArgumentIndex = dictionary ? 1 : 0;
+  if (ins.mutation === "Insert" /* Insert */) entryArgumentIndex = 1;
+  if (ins.mutation === "Remove" /* Remove */ && !dictionary)
+    entryArgumentIndex = 0;
+  if (entryArgumentIndex !== null && "entryTypeInfo" in ins.target.typeInfo) {
+    args[entryArgumentIndex] = coerceAssignmentValue(
+      args[entryArgumentIndex],
+      ins.target.typeInfo.entryTypeInfo,
+      "collection mutation entry"
+    );
+  }
   const setEntryMember = mutatesLocalVariable ? null : storedSetEntryMember(targetValue, ctx);
   const isLookupSet = setEntryMember === null && ins.target.typeInfo.type === 9 /* Lookup */;
   if (isLookupSet && Array.isArray(targetValue)) {
@@ -85968,7 +86020,8 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
       targetValue,
       ins.reference === true,
       ins.target.typeInfo.type === 9 /* Lookup */ && (ins.target.typeInfo.entryTypeInfo.type === 8 /* Enum */ || ins.target.typeInfo.entryTypeInfo.type === 18 /* DialogueLookup */),
-      ctx
+      ctx,
+      decimalEntries
     );
   }
   const setMatch = setEntryMember !== null && Array.isArray(targetValue) && (ins.mutation === "Add" /* Add */ || ins.mutation === "Remove" /* Remove */) ? findStoredSetEntry(targetValue, args[0], setEntryMember, ctx) : null;
@@ -85987,7 +86040,8 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
       ctx,
       isLookupSet,
       false,
-      ins.reference === true
+      ins.reference === true,
+      decimalEntries
     );
     updateCollectionReferenceProvenance(
       targetValue,
@@ -86065,7 +86119,8 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
     ctx,
     isLookupSet,
     ins.reference !== true && ins.mutation === "Remove" /* Remove */ && isArrayCollection(targetValue) && setEntryMember === null && !isLookupSet && findKnownRowIdByValueReference(args[0], ctx) === null,
-    ins.reference === true
+    ins.reference === true,
+    setEntryMember === null && decimalEntries
   );
   updateCollectionReferenceProvenance(
     targetValue,
@@ -86341,21 +86396,28 @@ function asDeclaredRuntimeSet(value, type, ctx) {
     value,
     entry === 7 /* Class */ || entry === 22 /* Interface */ || entry === 6 /* List */ || entry === 5 /* Dictionary */ || entry === 9 /* Lookup */,
     entry === 8 /* Enum */ || entry === 18 /* DialogueLookup */,
-    ctx
+    ctx,
+    entry === 20 /* Decimal */
   );
 }
 function runtimeSetKey(value, set, ctx) {
   if (set.slotReferences !== null) return slotReferenceKey(value);
   if (set.enumEntries && Array.isArray(value) && value.length === 1)
     value = value[0];
-  return toSetEntryKey(value, null, set.reference, ctx);
+  return toSetEntryKey(value, null, set.reference, ctx, set.decimalEntries);
 }
-function runtimeSet(array3, reference2, enumEntries, ctx) {
+function runtimeSet(array3, reference2, enumEntries, ctx, decimalEntries = false) {
   const sets = ctx.__runtimeSets ??= /* @__PURE__ */ new WeakMap();
   ctx.__dirtyRuntimeSets ??= /* @__PURE__ */ new Set();
   const existing = sets.get(array3);
   if (existing !== void 0) return existing;
-  const set = new RuntimeSet(array3, reference2, enumEntries);
+  const set = new RuntimeSet(
+    array3,
+    reference2,
+    enumEntries,
+    null,
+    decimalEntries
+  );
   const references = collectionReferences(array3, ctx);
   for (let index = 0; index < array3.length; index++) {
     const raw = array3[index];
@@ -86474,7 +86536,7 @@ function removableEntryRowIds(targetValue, mutation, args, ctx) {
   }
   return rowIds;
 }
-function applyLocalCollectionMutation(targetValue, mutation, args, ctx, unique = false, resolveRemovalEntries = false, reference2 = false) {
+function applyLocalCollectionMutation(targetValue, mutation, args, ctx, unique = false, resolveRemovalEntries = false, reference2 = false, decimal2 = false) {
   if (targetValue instanceof RuntimeSet) {
     (ctx.__dirtyRuntimeSets ??= /* @__PURE__ */ new Set()).add(targetValue);
     switch (mutation) {
@@ -86526,6 +86588,7 @@ function applyLocalCollectionMutation(targetValue, mutation, args, ctx, unique =
     case "Remove" /* Remove */:
       if (Array.isArray(targetValue)) {
         const references = resolveRemovalEntries ? collectionReferences(targetValue, ctx) : recordedReferenceEntries(targetValue, ctx) ?? 1 /* Values */;
+        const targetKey = decimal2 ? decimalCollectionKey(args[0]) : args[0];
         let index = -1;
         for (let candidate = 0; candidate < targetValue.length; candidate += 1) {
           const entry = targetValue[candidate];
@@ -86536,10 +86599,8 @@ function applyLocalCollectionMutation(targetValue, mutation, args, ctx, unique =
             }
             continue;
           }
-          if (jsEqual(
-            typeof entry === "string" && isReferenceEntry(references, candidate) ? resolveValueIfId(entry, ctx) : entry,
-            args[0]
-          )) {
+          const value = typeof entry === "string" && isReferenceEntry(references, candidate) ? resolveValueIfId(entry, ctx) : entry;
+          if (jsEqual(decimal2 ? decimalCollectionKey(value) : value, targetKey)) {
             index = candidate;
             break;
           }
@@ -87026,12 +87087,22 @@ function evalPointerCore(pointer, scope, ctx, resultUsage = "value") {
     case "function" /* function */:
       return evalFunction(pointer.function, scope, ctx);
     case "listLiteral" /* listLiteral */:
-      return pointer.entries.map((e) => evalPointer(e, scope, ctx));
+      return pointer.entries.map(
+        (entry) => coerceAssignmentValue(
+          evalPointer(entry, scope, ctx),
+          pointer.typeInfo.entryTypeInfo,
+          "list entry"
+        )
+      );
     case "dictLiteral" /* dictLiteral */: {
       const out = {};
       for (const e of pointer.entries) {
         const k = evalPointer(e.key, scope, ctx);
-        out[String(k)] = evalPointer(e.value, scope, ctx);
+        out[String(k)] = coerceAssignmentValue(
+          evalPointer(e.value, scope, ctx),
+          pointer.typeInfo.entryTypeInfo,
+          "dictionary entry"
+        );
       }
       return out;
     }
@@ -88693,9 +88764,9 @@ function readRecordKey(receiver, k, memberId, ctx) {
     if (receiver === ctx.thisValue && typeof ctx.thisValueRowId === "string") {
       return ctx.thisValueRowId;
     }
-    const rowId = findKnownRowIdByValueReference(receiver, ctx);
-    if (rowId) return rowId;
-    throw new NSGetterRuntimeError("Class value has no backing row id.");
+    const row = trackedRowForValueReference(receiver, ctx);
+    if (row !== null && classIdForValueRow(row, ctx) !== void 0)
+      return row.id;
   }
   const assetMember = resolveAssetRuntimeMember(receiver, k, ctx);
   if (assetMember.kind === "ok") return assetMember.value;
@@ -89993,7 +90064,11 @@ function evalDecimalMathOp(info, fn, scope, ctx) {
   }
 }
 function evalListRepeat(info, scope, ctx) {
-  const value = evalPointer(info.valuePointer, scope, ctx);
+  const value = coerceAssignmentValue(
+    evalPointer(info.valuePointer, scope, ctx),
+    info.entryTypeInfo,
+    "List.Repeat entry"
+  );
   const count = numberArg(
     evalPointer(info.countPointer, scope, ctx),
     "List.Repeat count"
@@ -90081,13 +90156,18 @@ function jsEqual(a, b) {
     return a instanceof NSSlotReference && b instanceof NSSlotReference && a.targetId === b.targetId;
   }
   if (a === b) return true;
-  if (Array.isArray(a) && Array.isArray(b)) {
-    if (a.length !== b.length) return false;
-    for (let i2 = 0; i2 < a.length; i2++) {
-      if (!jsEqual(a[i2], b[i2])) return false;
+  if (Array.isArray(a) || a instanceof RuntimeSet) {
+    if (!Array.isArray(b) && !(b instanceof RuntimeSet)) return false;
+    const aSize = a instanceof RuntimeSet ? a.size : a.length;
+    const bSize = b instanceof RuntimeSet ? b.size : b.length;
+    if (aSize !== bSize) return false;
+    const other = b.values();
+    for (const entry of a.values()) {
+      if (!jsEqual(entry, other.next().value)) return false;
     }
     return true;
   }
+  if (b instanceof RuntimeSet) return false;
   if (typeof a === "object" && typeof b === "object" && a !== null && b !== null && !Array.isArray(a) && !Array.isArray(b)) {
     const aKeys = Object.keys(a);
     const bKeys = Object.keys(b);
@@ -90523,7 +90603,8 @@ function evalCollectionQuery(info, scope, ctx) {
       output,
       info.reference === true,
       info.enumEntries === true,
-      ctx
+      ctx,
+      info.decimalEntries === true
     ) : output;
   };
   if (info.op === "OrderBy" || info.op === "OrderByDescending") {
@@ -90575,7 +90656,8 @@ function evalCollectionQuery(info, scope, ctx) {
           entry,
           valueId,
           info.reference === true,
-          ctx
+          ctx,
+          info.decimalEntries === true
         );
         if (seenSetKeys.has(setKey)) return 0 /* Continue */;
         seenSetKeys.add(setKey);
@@ -90630,10 +90712,15 @@ function evalCollectionQuery(info, scope, ctx) {
   }
   return finish();
 }
-function toSetEntryKey(entry, valueId, reference2, ctx) {
+function toSetEntryKey(entry, valueId, reference2, ctx, decimal2 = false) {
   if (reference2) return valueId ?? referenceIdOf(entry, ctx) ?? entry;
+  if (decimal2) return decimalCollectionKey(entry);
   return typeof entry === "object" && entry !== null ? canonicalJsonStringify(entry) : entry;
 }
+function decimalCollectionKey(value) {
+  if (value === null) return null;
+  return decimalKey(coerceDecimalOperand(value, "decimal collection entry"));
+}
 function compareCollectionKeys(left, right, keyType) {
   if (left === null) return right === null ? 0 : -1;
   if (right === null) return 1;
@@ -90751,7 +90838,11 @@ function evalFunction(fn, scope, ctx) {
     }
     case "contains" /* contains */: {
       let c = evalPointer(fn.info.collectionPointer, scope, ctx);
-      const target = evalPointer(fn.info.valuePointer, scope, ctx);
+      let target = evalPointer(fn.info.valuePointer, scope, ctx);
+      if (fn.info.float === true && typeof target === "number")
+        target = Math.fround(target);
+      if (fn.info.decimal === true && target !== null)
+        target = coerceDecimalOperand(target, "collection search");
       if (typeof c === "string") {
         if (typeof target !== "string") {
           throw new NSGetterRuntimeError(
@@ -90784,9 +90875,13 @@ function evalFunction(fn, scope, ctx) {
         return referenceIndexOf(c, target, ctx) !== null;
       }
       const targetReferenceId = typeof target === "string" ? null : findKnownRowIdByValueReference(target, ctx);
+      const targetKey = fn.info.decimal ? decimalCollectionKey(target) : target;
       let containsResolvedEntry = false;
       iterateCollection(c, ctx, (entry, _key, valueId) => {
-        if (valueId !== null && valueId === targetReferenceId || jsEqual(entry, target)) {
+        if (valueId !== null && valueId === targetReferenceId || jsEqual(
+          fn.info.decimal ? decimalCollectionKey(entry) : entry,
+          targetKey
+        )) {
           containsResolvedEntry = true;
           return 1 /* Break */;
         }
@@ -90799,15 +90894,21 @@ function evalFunction(fn, scope, ctx) {
         evalPointer(fn.info.collectionPointer, scope, ctx),
         "IndexOf receiver"
       );
-      const target = evalPointer(fn.info.valuePointer, scope, ctx);
+      let target = evalPointer(fn.info.valuePointer, scope, ctx);
+      if (fn.info.float === true && typeof target === "number")
+        target = Math.fround(target);
       if (fn.info.reference === true) {
         const index = referenceIndexOf(collection, target, ctx);
         return index === null ? -1 : numberArg(index, "IndexOf index");
       }
       const targetReferenceId = typeof target === "string" ? null : findKnownRowIdByValueReference(target, ctx);
+      const targetKey = fn.info.decimal ? decimalCollectionKey(target) : target;
       let found = -1;
       iterateCollection(collection, ctx, (entry, key, valueId) => {
-        if (valueId !== null && valueId === targetReferenceId || jsEqual(entry, target)) {
+        if (valueId !== null && valueId === targetReferenceId || jsEqual(
+          fn.info.decimal ? decimalCollectionKey(entry) : entry,
+          targetKey
+        )) {
           found = numberArg(key, "IndexOf index");
           return 1 /* Break */;
         }
@@ -91015,7 +91116,19 @@ function evalFunction(fn, scope, ctx) {
         );
         iterateCollection(c, ctx, callback);
       }
-      if (found !== sentinel) return found;
+      if (found !== sentinel) {
+        if (typeof found === "string") {
+          if (c instanceof RuntimeSet) {
+            if (c.enumEntries) return [found];
+          } else {
+            const row = trackedRowForValueReference(c, ctx);
+            const member = row === null ? null : memberForValueRow(row, ctx);
+            if (member?.kind === 8 /* Enum */ || member?.kind === 18 /* DialogueLookup */)
+              return [found];
+          }
+        }
+        return found;
+      }
       if (fn.type === "first" /* first */) {
         throw new NSGetterRuntimeError(
           innerFn ? "First() found no matching entry. Use FirstOrDefault() and handle null if no match is expected." : "First() called on an empty collection. Check that it has entries, or use FirstOrDefault() and handle null."
@@ -92228,10 +92341,19 @@ function constructionInitEvaluator(ctx, createdValues, argumentScopes, construct
     }
     return null;
   };
+  const defaultScopeMemberId = (memberId) => walkExtendsMemberChain(
+    memberId,
+    ctx.vm.members,
+    (declaration) => declaration.defaultValue === void 0 ? void 0 : declaration.id,
+    {
+      memberById: (id2) => indexes4.schemaIndex.member(id2) ?? null,
+      maxHops: ctx.vm.members.length
+    }
+  );
   return (member, init, sourceValueId, genericEnv = instanceEnv) => {
     const memberId = Reflect.get(member, "id");
     const effectiveMemberId = typeof memberId === "string" ? memberId : null;
-    const scopeMemberId = indexes4.initializerScopeMemberIds.get(init) ?? (typeof sourceValueId !== "string" ? void 0 : indexes4.initializerScopeMemberIdsByValueId.get(sourceValueId)) ?? effectiveMemberId;
+    const scopeMemberId = indexes4.initializerScopeMemberIds.get(init) ?? (typeof sourceValueId !== "string" ? void 0 : indexes4.initializerScopeMemberIdsByValueId.get(sourceValueId)) ?? (sourceValueId === void 0 && effectiveMemberId !== null ? defaultScopeMemberId(effectiveMemberId) : void 0) ?? effectiveMemberId;
     const compiled = ensureInitializerCompiled({
       init,
       member,
@@ -118854,21 +118976,25 @@ function projectValueHeadPlacementGraph(args) {
       );
     return { ...substituteMember(member, bindings, genericMembers, member) };
   };
-  const instanceBindings = (classId, member) => {
+  const instanceBindings = (classId, member, value) => {
     if (classId === null || !genericClassIds.has(classId)) return emptyBindings;
-    if (isInterfaceTypedMember(member)) {
-      return resolveInstanceEnv(
-        classId,
-        slotClassArguments(member, classId, implementerIndex()),
-        genericClasses
-      );
-    }
-    const arguments_ = member.classArguments;
+    const arguments_ = isInterfaceTypedMember(member) ? slotClassArguments(member, classId, implementerIndex()) : member.classArguments;
     if (arguments_ != null && !isGenericBindingsRecord(arguments_))
       throw new Error(
         `Class placement "${classId}" has malformed generic arguments.`
       );
-    return resolveInstanceEnv(classId, arguments_, genericClasses);
+    const env = resolveInstanceEnv(classId, arguments_, genericClasses);
+    const stamp = value?.genericBindings;
+    if (stamp !== void 0) {
+      if (!isStringRecord7(stamp))
+        throw new Error(
+          `Class value "${String(value?.id)}" has malformed genericBindings.`
+        );
+      for (const [paramId, entry] of envFromStamp(stamp))
+        env.set(paramId, entry);
+      closeForwardedGenericParams(env);
+    }
+    return env;
   };
   const unorderedByContainer = /* @__PURE__ */ new Map();
   for (const value of values.values()) {
@@ -119013,7 +119139,7 @@ function projectValueHeadPlacementGraph(args) {
     }
     result.set(item.valueId, projection);
     args.contextualMembers?.set(item.valueId, member);
-    const childBindings = classId === null ? item.bindings ?? emptyBindings : instanceBindings(classId, member);
+    const childBindings = classId === null ? item.bindings ?? emptyBindings : instanceBindings(classId, member, value);
     if ((member.kind === 5 /* Dictionary */ || member.kind === 6 /* List */ || member.kind === 28 /* Set */) && childBindings.size > 0) {
       if (!isMemberBase(member))
         throw new Error(
@@ -119213,6 +119339,9 @@ function joinPath(parent, child2) {
 function placementsEqual(left, right) {
   return JSON.stringify(left) === JSON.stringify(right);
 }
+function isStringRecord7(value) {
+  return isRecord6(value) && Object.values(value).every((entry) => typeof entry === "string");
+}
 function isRecord6(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -124498,6 +124627,61 @@ var init_stored_closure_captures = __esm({
   }
 });
 
+// ../src/database/construction-replay-equality.ts
+function createConstructionReplayComparer(reader, ownedValueIds) {
+  let graph;
+  return (args) => {
+    if (!isLiteralValueContent(args.currentRoot)) return false;
+    if (!isLiteralValueContent(args.replayRoot)) return false;
+    if (args.currentRoot.instanceConstructorId !== args.replayRoot.instanceConstructorId)
+      return false;
+    const replayArgs = args.replayRoot.constructorArgs;
+    if (replayArgs === void 0 || replayArgs === null) return true;
+    if (args.currentArguments === void 0 || args.currentArguments === null)
+      return false;
+    graph ??= new MaterializedValueGraphContext(reader.documentView);
+    let owned;
+    for (const edge of graph.constructorEdges(
+      args.currentRoot,
+      args.rootMember
+    )) {
+      const replayed2 = replayArgs[edge.parameterId];
+      if (replayed2 === edge.targetValueId) continue;
+      if (typeof replayed2 === "string" && !args.replayRows.has(replayed2))
+        return false;
+      owned ??= new Set(ownedValueIds(args.currentRoot, args.rootMember));
+      if (!owned.has(edge.targetValueId)) return false;
+    }
+    const stored = { ...args.currentArguments };
+    const replayed = { ...replayArgs };
+    for (const [slot, value] of Object.entries(stored)) {
+      if (typeof value !== "string" || replayed[slot] !== value) continue;
+      delete stored[slot];
+      delete replayed[slot];
+    }
+    return effectiveValuesEqual(
+      reader.normalizeConstructorArguments(
+        stored,
+        args.currentRoot,
+        args.rootMember
+      ),
+      reader.withRowOverrides(args.replayRows).normalizeConstructorArguments(
+        replayed,
+        args.replayRoot,
+        args.rootMember
+      )
+    );
+  };
+}
+var init_construction_replay_equality = __esm({
+  "../src/database/construction-replay-equality.ts"() {
+    "use strict";
+    init_effective_value_comparison();
+    init_constructor_argument_ownership();
+    init_members();
+  }
+});
+
 // ../src/models/project/world-layer-compatibility-error.ts
 var WorldLayerCompatibilityError;
 var init_world_layer_compatibility_error = __esm({
@@ -126505,9 +126689,9 @@ function assertNumberRange(member, value, path) {
   }
 }
 function stringRecord3(value) {
-  return isStringRecord7(value) ? value : null;
+  return isStringRecord8(value) ? value : null;
 }
-function isStringRecord7(value) {
+function isStringRecord8(value) {
   if (typeof value !== "object" || value === null || Array.isArray(value)) {
     return false;
   }
@@ -128143,8 +128327,7 @@ function materializePreparedInstanceInitializers(args) {
     compiledDocument,
     compiledDocument.variants ?? []
   );
-  let currentReader = null;
-  const requireCurrentReader = () => currentReader ??= new EffectiveValueReader(materializationScope.document);
+  let compareConstruction;
   let ownedValueCollector;
   let valueHashes;
   const liveValueHashes = () => valueHashes ??= indexLiveContentHashesByRecordId(
@@ -128210,16 +128393,28 @@ function materializePreparedInstanceInitializers(args) {
           `construction-arguments-conflict: Value "${valueId}" is already materialized as class "${String(existingConstructedRoot.classId)}", and this construction builds class "${String(materialized.root.classId)}". Delete and recreate the value to change its class.`
         );
       }
-      if (replayedCreationDataMatches({
-        // The synthetic variant binding members are part of the ownership
-        // scope that compiled and evaluated this initializer. Stored replay
-        // closes its generic slot from the same ephemeral member id, so its
-        // expansion must read that scoped document too.
-        currentReader: requireCurrentReader(),
+      compareConstruction ??= createConstructionReplayComparer(
+        new EffectiveValueReader(materializationScope.document),
+        (root, rootMember) => {
+          ownedValueCollector ??= createOwnedValueDeletionCollector(
+            args.document
+          );
+          return ownedValueCollector.collect({
+            rootIds: [root.id],
+            rootMembers: /* @__PURE__ */ new Map([[root.id, rootMember]])
+          });
+        }
+      );
+      const replayRows = new Map(
+        materialized.createdValues.map((row) => [row.id, row])
+      );
+      replayRows.set(materialized.root.id, materialized.root);
+      if (compareConstruction({
         currentRoot: existingConstructedRoot,
+        currentArguments: isLiteralValueContent(existingConstructedRoot) ? existingConstructedRoot.constructorArgs : void 0,
         rootMember: member,
         replayRoot: materialized.root,
-        replayCreated: materialized.createdValues
+        replayRows
       })) {
         replayOnlyIndexes.push(site.index);
         batch.upsert([existingConstructedRoot]);
@@ -128340,46 +128535,6 @@ function materializePreparedInstanceInitializers(args) {
     args.prepared.splice(index, 1);
   }
 }
-function replayedCreationDataMatches(args) {
-  if (!isLiteralValueContent(args.currentRoot) || !isLiteralValueContent(args.replayRoot)) {
-    return false;
-  }
-  const replayArgs = args.replayRoot.constructorArgs;
-  if (replayArgs !== void 0 && replayArgs !== null) {
-    const currentArgs = args.currentRoot.constructorArgs;
-    if (currentArgs === void 0 || currentArgs === null || !constructorArgumentsSemanticallyEqual({
-      currentReader: args.currentReader,
-      currentRoot: args.currentRoot,
-      rootMember: args.rootMember,
-      current: currentArgs,
-      replayRoot: args.replayRoot,
-      replayCreated: args.replayCreated,
-      replay: replayArgs
-    })) {
-      return false;
-    }
-  }
-  return true;
-}
-function constructorArgumentsSemanticallyEqual(args) {
-  const current = args.currentReader;
-  const replayRows = /* @__PURE__ */ new Map([
-    [args.replayRoot.id, args.replayRoot]
-  ]);
-  for (const row of args.replayCreated) replayRows.set(row.id, row);
-  const replay = current.withRowOverrides(replayRows);
-  const currentNormalized = current.normalizeConstructorArguments(
-    args.current,
-    args.currentRoot,
-    args.rootMember
-  );
-  const replayNormalized = replay.normalizeConstructorArguments(
-    args.replay,
-    args.replayRoot,
-    args.rootMember
-  );
-  return effectiveValuesEqual(currentNormalized, replayNormalized);
-}
 function completeLocalizedTextCreateEnvelopes(args) {
   const createsLocalizedText = args.changes.some(
     (change) => change.recordKind === "localized-text" && change.operation === "create"
@@ -131423,7 +131578,7 @@ var init_project_version_schema_commit = __esm({
     init_declared_binding_targets();
     init_stored_closure_captures();
     init_document_initializer_compiler();
-    init_effective_value_comparison();
+    init_construction_replay_equality();
     init_classes();
     init_constructor_parameter_settlement();
     init_generics();
@@ -137913,7 +138068,7 @@ function toWorldReferenceClassRecord(value) {
   return {
     id: id2,
     extendsClassId: nullableStringField(value, "extendsClassId"),
-    schema: isStringRecord8(value.schema) ? value.schema : void 0,
+    schema: isStringRecord9(value.schema) ? value.schema : void 0,
     system: isPlainRecord8(value.system) ? value.system : null
   };
 }
@@ -137931,7 +138086,7 @@ function worldReferenceValueClassId(value) {
   if (value === void 0) return null;
   return typeof value.classId === "string" && value.classId.length > 0 ? value.classId : null;
 }
-function isStringRecord8(value) {
+function isStringRecord9(value) {
   if (!isPlainRecord8(value)) return false;
   return Object.values(value).every((entry) => typeof entry === "string");
 }
@@ -147051,15 +147206,27 @@ function retainConstructionArguments(context, row, schemaClass2, expression, sou
   const constructorArgs2 = row.constructorArgs;
   if (!isObjectRecord(constructorArgs2)) return;
   if (row.instanceConstructorId === null) return;
-  const constructor2 = storedValueConstructor(
-    context,
-    schemaClass2,
-    recordedStoredConstructorId(row, schemaClass2)
+  const constructorId = recordedStoredConstructorId(row, schemaClass2);
+  const stored = context.state[`constructor:${constructorId}`]?.data;
+  if (!isObjectRecord(stored)) {
+    throw new Error(
+      `Stored construction for ${schemaClass2.name} names missing pulled constructor ${constructorId}.`
+    );
+  }
+  if (stored.classId !== schemaClass2.id) {
+    throw new Error(
+      `Stored constructor ${constructorId} does not belong to ${schemaClass2.name}.`
+    );
+  }
+  const argumentsValue = documentArgumentsToManifest(
+    stored.argumentTypes,
+    { recordKind: "constructor", recordId: constructorId, data: stored },
+    schemaClass2.source.span
   );
   const authoredArguments = constructorArgumentExpressions(expression);
   const argumentEnvironment = valueGenericEnvironment(row, environment);
-  for (let index = 0; index < constructor2.arguments.length; index += 1) {
-    const argument2 = constructor2.arguments[index];
+  for (let index = 0; index < argumentsValue.length; index += 1) {
+    const argument2 = argumentsValue[index];
     if (argument2 === void 0) continue;
     const valueId = constructorArgs2[`__arg_${index}__`];
     if (typeof valueId !== "string") continue;
@@ -147845,6 +148012,7 @@ function lowerRawMemberTypeName(context, memberId) {
   if (member.kind === 8 /* Enum */ && typeof member.enumId === "string") {
     return context.enumNames.get(member.enumId) ?? null;
   }
+  if (member.kind === 9 /* Lookup */) return "Reference";
   if (member.kind === 6 /* List */) return "List";
   if (member.kind === 28 /* Set */) return "Set";
   if (member.kind === 5 /* Dictionary */) return "Dictionary";
@@ -147859,6 +148027,8 @@ function lowerSchemaMemberTypeName(context, member) {
       return context.referenceTypes().interfaceImplementers().interface(member.interfaceId)?.name ?? null;
     case "enum":
       return context.enumNames.get(member.enumId) ?? null;
+    case "lookup":
+      return "Reference";
     case "list":
       return "List";
     case "set":
@@ -150859,10 +151029,15 @@ function storedConstructorArgumentSource(context, type, value, environment, visi
       throw new Error(
         `Stored constructor argument cannot be typed by interface type parameter ${type.genericParamId} of ${type.ownerInterfaceId}.`
       );
-    case "generic":
+    case "generic": {
+      const binding = storedGenericArgumentType(context, type, environment);
+      const argumentType = binding.kind === "reference" ? withSchemaTypeNullability(
+        referenceReadType2(context, binding.target),
+        binding.nullable
+      ) : binding;
       return storedConstructorArgumentSource(
         context,
-        storedGenericArgumentType(context, type, environment),
+        argumentType,
         value,
         environment,
         visited,
@@ -150870,6 +151045,7 @@ function storedConstructorArgumentSource(context, type, value, environment, visi
         partial,
         constructorOwnsGraph
       );
+    }
     case "interface":
     case "list":
     case "set":
@@ -151066,8 +151242,14 @@ function schemaTypeForBindingMember(context, memberId, environment, visited = /*
       };
     case "lookup": {
       if (member.declaredType !== null) {
-        const target = referenceReadType2(context, member.declaredType);
-        return member.collectionMemberId === null && member.multiselect ? { kind: "lookup", nullable: nullable2, entryType: target } : withSchemaTypeNullability(target, nullable2);
+        if (member.collectionMemberId === null && member.multiselect) {
+          return {
+            kind: "lookup",
+            nullable: nullable2,
+            entryType: referenceReadType2(context, member.declaredType)
+          };
+        }
+        return { kind: "reference", nullable: nullable2, target: member.declaredType };
       }
       if (member.collectionMemberId === null) {
         throw new Error(
@@ -151636,7 +151818,8 @@ function resolveGenericValueMember(context, member, environment) {
   }
   return {
     ...bindingMember,
-    id: member.id,
+    // Lookup emission reads the binding's declared target and collection.
+    id: bindingMember.kind === 9 /* Lookup */ ? bindingMemberId : member.id,
     name: member.name,
     defaultValue: member.defaultValue,
     ...member.payload === 1 /* Partial */ ? { payload: 1 /* Partial */ } : {}
@@ -151714,7 +151897,8 @@ function resolveGenericSchemaMember(context, member, environment) {
   }
   const resolved = {
     ...bindingMember,
-    id: member.id,
+    // Deferred reference checks resolve this concrete lookup declaration.
+    id: bindingMember.kind === "lookup" ? bindingMemberId : member.id,
     name: member.name,
     defaultValue: member.defaultValue
   };
@@ -153373,8 +153557,15 @@ function reconcileMaterializedInitializersV4(args) {
     );
   }
   let currentRows;
-  let currentReader;
+  let compareConstruction;
   let ownedValues;
+  const storedOwnedValues = () => {
+    if (ownedValues !== void 0) return ownedValues;
+    const storedDocument = currentState().document;
+    compilePulledUncompiledConstructorsV4(storedDocument);
+    assertPulledConstructorsCompiled(storedDocument);
+    return ownedValues = createOwnedValueDeletionCollector(storedDocument);
+  };
   const rebuilds = [];
   for (const reconciliation of constructions.values()) {
     if (!replayableValueIds.has(reconciliation.valueId)) continue;
@@ -153426,8 +153617,14 @@ function reconcileMaterializedInitializersV4(args) {
       currentState().document,
       replayDocument
     );
-    currentReader ??= new EffectiveValueReader(
-      storedRowsDocument(replayDocument, currentRows)
+    compareConstruction ??= createConstructionReplayComparer(
+      new EffectiveValueReader(storedRowsDocument(replayDocument, currentRows)),
+      (root, member) => {
+        return storedOwnedValues().collect({
+          rootIds: [root.id],
+          rootMembers: /* @__PURE__ */ new Map([[root.id, member]])
+        });
+      }
     );
     const replay = replayRows.get(reconciliation.valueId);
     if (replay === void 0) {
@@ -153457,13 +153654,12 @@ function reconcileMaterializedInitializersV4(args) {
       );
       continue;
     }
-    if (reconciliation.kind === "storedArguments" && storedArgumentsMatch({
-      reader: currentReader,
-      stored: reconciliation.storedConstructorArgs,
+    if (reconciliation.kind === "storedArguments" && compareConstruction({
       currentRoot,
-      replay,
+      currentArguments: reconciliation.storedConstructorArgs,
+      replayRoot: replay,
       replayRows,
-      owner
+      rootMember: owner
     })) {
       continue;
     }
@@ -153475,11 +153671,10 @@ function reconcileMaterializedInitializersV4(args) {
         `Cannot rebuild construction for value "${reconciliation.valueId}": its pulled row is missing.`
       );
     }
-    ownedValues ??= createOwnedValueDeletionCollector(replayDocument);
     rebuilds.push({
       valueId: reconciliation.valueId,
       row: rebuiltConstructionRow(stored, reconciliation.code),
-      ownedValueIds: ownedValues.collect({
+      ownedValueIds: storedOwnedValues().collect({
         rootIds: [reconciliation.valueId],
         rootMembers: /* @__PURE__ */ new Map([[reconciliation.valueId, owner]])
       })
@@ -153522,22 +153717,6 @@ function sameCompiledProgram(left, right) {
     return literal3 && key === "value" ? isDeepStrictEqual(left[key], right[key]) : sameCompiledProgram(left[key], right[key]);
   });
 }
-function storedArgumentsMatch(args) {
-  const replayArgs = isLiteralValueContent(args.replay) ? args.replay.constructorArgs : void 0;
-  if (!isObjectRecord(replayArgs)) return false;
-  const [storedArgs, replayedArgs] = withoutSharedArguments(
-    args.stored,
-    replayArgs
-  );
-  return effectiveValuesEqual(
-    args.reader.normalizeConstructorArguments(
-      storedArgs,
-      args.currentRoot,
-      args.owner
-    ),
-    args.reader.withRowOverrides(args.replayRows).normalizeConstructorArguments(replayedArgs, args.replay, args.owner)
-  );
-}
 function rebuiltConstructionRow(data, code) {
   return { ...withoutMaterializedInstanceFields(data), init: { code } };
 }
@@ -153652,16 +153831,6 @@ function storedRowsWithRenamedKeys(before, after) {
   }
   return rows;
 }
-function withoutSharedArguments(stored, replayed) {
-  const storedRest = { ...stored };
-  const replayedRest = { ...replayed };
-  for (const [slot, value] of Object.entries(stored)) {
-    if (typeof value !== "string" || replayed[slot] !== value) continue;
-    delete storedRest[slot];
-    delete replayedRest[slot];
-  }
-  return [storedRest, replayedRest];
-}
 function pulledStateDocumentV4(workspace) {
   const state = workspace.state.records;
   const remembered = pulledStateDocuments.get(state);
@@ -154128,7 +154297,7 @@ var init_local_initializer_materialization = __esm({
     init_stored_closure_captures();
     init_initializer_dependencies();
     init_initializer_replay();
-    init_effective_value_comparison();
+    init_construction_replay_equality();
     init_constructor_argument_ownership();
     init_neo_script_recompile_scope();
     init_compiler_adapter();
@@ -182029,7 +182198,7 @@ function collectUnityReferencedProjectFileIds(args) {
     )) {
       instanceEnv.set(paramId, { kind: "member", memberId: boundMemberId });
     }
-    const childValueIds = isStringRecord9(storedValue) ? storedValue : {};
+    const childValueIds = isStringRecord10(storedValue) ? storedValue : {};
     for (const entry of schema) {
       if (entry.memberId === null) continue;
       const childMember = substituteWalkMember(
@@ -182092,7 +182261,7 @@ function collectUnityReferencedProjectFileIds(args) {
     return;
   }
   if (isMemberDictionaryBase(member)) {
-    const childValueIds = isStringRecord9(storedValue) ? storedValue : {};
+    const childValueIds = isStringRecord10(storedValue) ? storedValue : {};
     const substitutedEntryMember = substituteWalkMember(
       member.entryMemberId,
       args.genericEnv,
@@ -182126,7 +182295,7 @@ function readGenericBindingsFromValue(value) {
   if (value == null) return {};
   if (!isLiteralValueContent(value)) return {};
   const bindings = Reflect.get(value, "genericBindings");
-  return isStringRecord9(bindings) ? bindings : {};
+  return isStringRecord10(bindings) ? bindings : {};
 }
 function readClassIdFromMemberValueBase(value) {
   if (value === null) return null;
@@ -182146,7 +182315,7 @@ function readFileIdFromMemberValue(value) {
   if (fileId.trim().length === 0) return null;
   return fileId;
 }
-function isStringRecord9(value) {
+function isStringRecord10(value) {
   if (value === null) return false;
   if (typeof value !== "object") return false;
   return Object.values(value).every((entry) => typeof entry === "string");
@@ -186683,18 +186852,36 @@ function generateInheritedPropertyInterfaceAdapters(ctx, classDef, genericEnv) {
         continue;
       }
       const source = `((${receiverType})this).${memberName}`;
-      const getter = isMemberWithEntries(member) ? collectionReadExpression(
+      const memberSaved = memberSavedForStorage(
         ctx,
-        member,
-        `node.Get<${neoMemberNodeType(member)}>("${escapeCSharpString(schemaKey)}")`,
-        schemaKey,
-        resolveMemberById(ctx, member.entryMemberId, "entryMemberId"),
-        memberSavedForStorage(ctx, memberId, false, declarationClass.id),
-        null,
-        genericEnv,
-        interfaceValueType,
-        false
-      ) : [`return (${interfaceValueType})(object)${source}!;`];
+        memberId,
+        false,
+        declarationClass.id
+      );
+      const getter = isMemberWithEntries(member) ? [
+        ...detachedReadExpression(
+          ctx,
+          member,
+          schemaKey,
+          memberSaved,
+          null,
+          genericEnv,
+          declarationClass.id,
+          false
+        ),
+        ...collectionReadExpression(
+          ctx,
+          member,
+          `node.Get<${neoMemberNodeType(member)}>("${escapeCSharpString(schemaKey)}")`,
+          schemaKey,
+          resolveMemberById(ctx, member.entryMemberId, "entryMemberId"),
+          memberSaved,
+          null,
+          genericEnv,
+          interfaceValueType,
+          false
+        )
+      ] : [`return (${interfaceValueType})(object)${source}!;`];
       const hasSetter = isMemberNSPropertyBase(member) && typeof member.setterCode === "string";
       const adapter = [
         `${interfaceValueType} ${interfaceType2}.${memberName}`,
@@ -190637,7 +190824,7 @@ function readExpression(ctx, member, schemaKey, nodeType, saved, ownerClassName,
     )
   ];
 }
-function detachedReadExpression(ctx, member, schemaKey, saved, writeGuardMemberName, genericEnv, ownerClassId) {
+function detachedReadExpression(ctx, member, schemaKey, saved, writeGuardMemberName, genericEnv, ownerClassId, genericBindingSaved = saved) {
   if (ownerClassId === void 0 || !classSupportsDetachedViews(ctx, ownerClassId)) {
     return [];
   }
@@ -190667,7 +190854,13 @@ function detachedReadExpression(ctx, member, schemaKey, saved, writeGuardMemberN
       saved,
       genericEnv
     );
-    const entryType = csharpValueType(ctx, entryMember, saved, genericEnv);
+    const entryType = csharpValueType(
+      ctx,
+      entryMember,
+      saved,
+      genericEnv,
+      genericBindingSaved
+    );
     if (readEntry2 === null || entryType === null) return [];
     const guardArguments = collectionGuardArguments(
       member,
@@ -190675,10 +190868,10 @@ function detachedReadExpression(ctx, member, schemaKey, saved, writeGuardMemberN
     );
     const [viewType, view] = saved ? [
       `NeoList<${entryType}>`,
-      `DetachedList<${entryType}>("${key}", entry => ${readEntry2}, (client, child) => ${childConverter(ctx, entryMember, true, writeGuardMemberName != null, genericEnv)}, item => ${entrySerializeExpression(ctx, entryMember, `writableNode.Get<NeoMemberListWritable>("${key}")`, member.name, genericEnv)}${guardArguments})`
+      `DetachedList<${entryType}>("${key}", entry => ${readEntry2}, (client, child) => ${childConverter(ctx, entryMember, true, writeGuardMemberName != null, genericEnv, genericBindingSaved)}, item => ${entrySerializeExpression(ctx, entryMember, `writableNode.Get<NeoMemberListWritable>("${key}")`, member.name, genericEnv, genericBindingSaved)}${guardArguments})`
     ] : [
       `NeoReadOnlyList<${entryType}>`,
-      `DetachedReadOnlyList<${entryType}>("${key}", entry => ${readEntry2}, (client, child) => ${childConverter(ctx, entryMember, false, false, genericEnv)})`
+      `DetachedReadOnlyList<${entryType}>("${key}", entry => ${readEntry2}, (client, child) => ${childConverter(ctx, entryMember, false, false, genericEnv, genericBindingSaved)})`
     ];
     return [
       `if (TryReadDetached("${key}", out _))`,
@@ -191556,7 +191749,13 @@ function childConverter(ctx, member, saved = false, branchOnReadOnly = false, ge
   }
   if (isClassTypedMember(member)) {
     const typeName = ctx.typeNames.get(member.classId) ?? "NeoNode";
-    const constructedSuffix = constructedTypeArgumentsSuffix(ctx, member, true, genericEnv) ?? "";
+    const constructedSuffix = constructedTypeArgumentsSuffix(
+      ctx,
+      member,
+      true,
+      genericEnv,
+      genericBindingSaved
+    ) ?? "";
     const savedTypeRef = `${qualifyGeneratedType(ctx, savedTypeName(typeName))}${constructedSuffix}`;
     const hasWritableFamily = schemaClassHasWritableFamily(ctx, member.classId);
     if (saved && branchOnReadOnly && hasWritableFamily) {
@@ -195138,7 +195337,7 @@ var UNITY_CODEGEN_REVISION;
 var init_unity_codegen_revision = __esm({
   "../src/models/exports/unity-codegen-revision.ts"() {
     "use strict";
-    UNITY_CODEGEN_REVISION = "e875228ee779f868c2c818eb9e245604cd074598712ffd3f8394f460317b1a28";
+    UNITY_CODEGEN_REVISION = "f748ddae5544d547b4d1139dcdbc86b86b01ab0aae4a9a24656ad8858258b460";
   }
 });
 
@@ -216276,7 +216475,7 @@ var releaseWorkspaceLock = () => void 0;
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.84.3");
+    console.log("0.84.4");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {