@neocompose/cli 0.76.3 → 0.77.1

package/dist/test-worker.mjs

@@ -1461,36 +1461,36 @@ function isNeoSchemaClass(value) {
 }
 
 // ../packages/models/src/members/member-kind-enum.ts
-var MemberKind = /* @__PURE__ */ ((MemberKind8) => {
-  MemberKind8[MemberKind8["Null"] = 0] = "Null";
-  MemberKind8[MemberKind8["Bool"] = 1] = "Bool";
-  MemberKind8[MemberKind8["Int"] = 2] = "Int";
-  MemberKind8[MemberKind8["String"] = 3] = "String";
-  MemberKind8[MemberKind8["Float"] = 4] = "Float";
-  MemberKind8[MemberKind8["Dictionary"] = 5] = "Dictionary";
-  MemberKind8[MemberKind8["List"] = 6] = "List";
-  MemberKind8[MemberKind8["Class"] = 7] = "Class";
-  MemberKind8[MemberKind8["Enum"] = 8] = "Enum";
-  MemberKind8[MemberKind8["Lookup"] = 9] = "Lookup";
-  MemberKind8[MemberKind8["NSProperty"] = 10] = "NSProperty";
-  MemberKind8[MemberKind8["Sprite"] = 11] = "Sprite";
-  MemberKind8[MemberKind8["Audio"] = 12] = "Audio";
-  MemberKind8[MemberKind8["Function"] = 13] = "Function";
-  MemberKind8[MemberKind8["Vector2"] = 14] = "Vector2";
-  MemberKind8[MemberKind8["Vector2Int"] = 15] = "Vector2Int";
-  MemberKind8[MemberKind8["Vector3"] = 16] = "Vector3";
-  MemberKind8[MemberKind8["Vector3Int"] = 17] = "Vector3Int";
-  MemberKind8[MemberKind8["DialogueLookup"] = 18] = "DialogueLookup";
-  MemberKind8[MemberKind8["Color"] = 19] = "Color";
-  MemberKind8[MemberKind8["Decimal"] = 20] = "Decimal";
-  MemberKind8[MemberKind8["Generic"] = 21] = "Generic";
-  MemberKind8[MemberKind8["Interface"] = 22] = "Interface";
-  MemberKind8[MemberKind8["NSFunction"] = 23] = "NSFunction";
-  MemberKind8[MemberKind8["FunctionRef"] = 24] = "FunctionRef";
-  MemberKind8[MemberKind8["NSDelegate"] = 25] = "NSDelegate";
-  MemberKind8[MemberKind8["NSAction"] = 26] = "NSAction";
-  MemberKind8[MemberKind8["Variant"] = 27] = "Variant";
-  return MemberKind8;
+var MemberKind = /* @__PURE__ */ ((MemberKind7) => {
+  MemberKind7[MemberKind7["Null"] = 0] = "Null";
+  MemberKind7[MemberKind7["Bool"] = 1] = "Bool";
+  MemberKind7[MemberKind7["Int"] = 2] = "Int";
+  MemberKind7[MemberKind7["String"] = 3] = "String";
+  MemberKind7[MemberKind7["Float"] = 4] = "Float";
+  MemberKind7[MemberKind7["Dictionary"] = 5] = "Dictionary";
+  MemberKind7[MemberKind7["List"] = 6] = "List";
+  MemberKind7[MemberKind7["Class"] = 7] = "Class";
+  MemberKind7[MemberKind7["Enum"] = 8] = "Enum";
+  MemberKind7[MemberKind7["Lookup"] = 9] = "Lookup";
+  MemberKind7[MemberKind7["NSProperty"] = 10] = "NSProperty";
+  MemberKind7[MemberKind7["Sprite"] = 11] = "Sprite";
+  MemberKind7[MemberKind7["Audio"] = 12] = "Audio";
+  MemberKind7[MemberKind7["Function"] = 13] = "Function";
+  MemberKind7[MemberKind7["Vector2"] = 14] = "Vector2";
+  MemberKind7[MemberKind7["Vector2Int"] = 15] = "Vector2Int";
+  MemberKind7[MemberKind7["Vector3"] = 16] = "Vector3";
+  MemberKind7[MemberKind7["Vector3Int"] = 17] = "Vector3Int";
+  MemberKind7[MemberKind7["DialogueLookup"] = 18] = "DialogueLookup";
+  MemberKind7[MemberKind7["Color"] = 19] = "Color";
+  MemberKind7[MemberKind7["Decimal"] = 20] = "Decimal";
+  MemberKind7[MemberKind7["Generic"] = 21] = "Generic";
+  MemberKind7[MemberKind7["Interface"] = 22] = "Interface";
+  MemberKind7[MemberKind7["NSFunction"] = 23] = "NSFunction";
+  MemberKind7[MemberKind7["FunctionRef"] = 24] = "FunctionRef";
+  MemberKind7[MemberKind7["NSDelegate"] = 25] = "NSDelegate";
+  MemberKind7[MemberKind7["NSAction"] = 26] = "NSAction";
+  MemberKind7[MemberKind7["Variant"] = 27] = "Variant";
+  return MemberKind7;
 })(MemberKind || {});
 
 // ../packages/models/src/members/member-kind-taxonomy.ts
@@ -4046,6 +4046,13 @@ function isNSVoidBody(value) {
 function parameterHasDefault(argument2) {
   return argument2.defaultValue !== void 0;
 }
+function unnamedArgumentTypes(argumentTypes) {
+  return argumentTypes.map((argument2) => {
+    const { name, ...typeInfo } = argument2;
+    void name;
+    return typeInfo;
+  });
+}
 function hasAnyParameterDefault(argumentTypes) {
   return argumentTypes.some(parameterHasDefault);
 }
@@ -4124,6 +4131,15 @@ function typeInfosInvariantlyEqual(left, right) {
     if (left.keyEnumId !== right.keyEnumId) return false;
     return typeInfosInvariantlyEqual(left.entryTypeInfo, right.entryTypeInfo);
   }
+  if (left.type === 25 /* NSDelegate */ && right.type === 25 /* NSDelegate */) {
+    if (!typeInfosInvariantlyEqual(left.returnTypeInfo, right.returnTypeInfo)) {
+      return false;
+    }
+    if (left.argumentTypes.length !== right.argumentTypes.length) return false;
+    return left.argumentTypes.every(
+      (argument2, index) => typeInfosInvariantlyEqual(argument2, right.argumentTypes[index])
+    );
+  }
   if (left.type === 26 /* NSAction */ && right.type === 26 /* NSAction */) {
     if (left.argumentTypes.length !== right.argumentTypes.length) return false;
     return left.argumentTypes.every(
@@ -4587,7 +4603,10 @@ function isMemberEnum(value) {
   if (!isWithId(value)) return false;
   return isWithId(value);
 }
-function isMemberLookupBase(value) {
+function isLookupSelection(selection) {
+  return selection === void 0 || selection === 0 /* Single */ || selection === 1 /* Multi */;
+}
+function isMemberCollectionLookupBase(value) {
   const v = asMemberBaseForKind(value, 9 /* Lookup */);
   if (v === null) return false;
   if (typeof v.collectionMemberId !== "string") return false;
@@ -4598,7 +4617,22 @@ function isMemberLookupBase(value) {
   if (v.declaredTypeInfo !== void 0 && v.declaredTypeInfo !== null && !isNSTypeInfo(v.declaredTypeInfo)) {
     return false;
   }
-  return v.selection === void 0 || v.selection === 0 /* Single */ || v.selection === 1 /* Multi */;
+  return isLookupSelection(v.selection);
+}
+function isMemberTypeLookupBase(value) {
+  const v = asMemberBaseForKind(value, 9 /* Lookup */);
+  if (v === null) return false;
+  if (v.collectionMemberId !== void 0) return false;
+  if (v.collectionValueId !== void 0) return false;
+  if (!isLookupTargetTypeInfo(v.declaredTypeInfo)) return false;
+  return isLookupSelection(v.selection);
+}
+function isLookupTargetTypeInfo(value) {
+  if (!isNSTypeInfo(value)) return false;
+  return value.type === 7 /* Class */ || value.type === 21 /* Generic */;
+}
+function isMemberLookupBase(value) {
+  return isMemberCollectionLookupBase(value) || isMemberTypeLookupBase(value);
 }
 function isMemberLookup(value) {
   if (!isMemberLookupBase(value)) return false;
@@ -8614,12 +8648,6 @@ function resolveParamAtChainIndex(chain, declarerIndex, paramId) {
   }
   return { kind: "unbound", paramId: cursor };
 }
-function isClosedClass(classId, classes, draft) {
-  for (const entry of resolveGenericEnv(classId, classes, draft).values()) {
-    if (entry.kind === "unbound") return false;
-  }
-  return true;
-}
 function resolveInstanceEnv(effectiveClassId, classArguments2, classes) {
   const env = resolveGenericEnv(effectiveClassId, classes);
   if (classArguments2 === void 0 || classArguments2 === null) {
@@ -8631,6 +8659,10 @@ function resolveInstanceEnv(effectiveClassId, classArguments2, classes) {
     if (existing !== void 0 && existing.kind !== "unbound") continue;
     env.set(paramId, { kind: "member", memberId: arg.memberId });
   }
+  closeForwardedGenericParams(env);
+  return env;
+}
+function closeForwardedGenericParams(env) {
   for (const [paramId, entry] of env) {
     if (entry.kind !== "unbound") continue;
     const seen = /* @__PURE__ */ new Set([paramId]);
@@ -8646,7 +8678,6 @@ function resolveInstanceEnv(effectiveClassId, classArguments2, classes) {
       targetParamId = target.paramId;
     }
   }
-  return env;
 }
 function firstUnboundParamId(env) {
   for (const entry of env.values()) {
@@ -9080,10 +9111,13 @@ function typeInfoFromArgumentSignature(signature) {
       ...dictionarySignature.keyEnumId === void 0 ? {} : { keyEnumId: dictionarySignature.keyEnumId }
     };
   }
+  if (signature.type === 25 /* NSDelegate */) {
+    return signature;
+  }
   const typeInfo = { type: signature.type, required: signature.required };
   if (!isNSTypeInfo(typeInfo)) {
     throw new Error(
-      `substituteMember: generic binding kind ${signature.type} cannot appear in a NeoScript callable type.`
+      `substituteMember: generic binding kind ${MemberKind[signature.type] ?? signature.type} cannot appear in a NeoScript callable type.`
     );
   }
   return typeInfo;
@@ -9173,6 +9207,20 @@ function typeArgumentSignatureOfMember(member, env, members, seen = /* @__PURE__
       entry: entrySignature(resolved.entryMemberId, env, members, seen)
     };
   }
+  if (isMemberDelegateBase(resolved)) {
+    return {
+      type: 25 /* NSDelegate */,
+      required,
+      returnTypeInfo: substituteNestedTypeInfo(
+        resolved.returnTypeInfo,
+        env,
+        members
+      ),
+      argumentTypes: unnamedArgumentTypes(resolved.argumentTypes).map(
+        (argument2) => substituteNestedTypeInfo(argument2, env, members)
+      )
+    };
+  }
   if (isMemberStringBase(resolved)) {
     return {
       type: 3 /* String */,
@@ -9260,6 +9308,12 @@ function signaturesEqual(a, b) {
     if (ad.keyEnumId !== bd.keyEnumId) return false;
     return signaturesEqual(ad.entry, bd.entry);
   }
+  if (a.type === 25 /* NSDelegate */ && b.type === 25 /* NSDelegate */) {
+    return typeInfosInvariantlyEqual(
+      a,
+      b
+    );
+  }
   return true;
 }
 function constructedSlotAccepts(slotMember, valueClassId, contextEnv, classes, members) {
@@ -9714,6 +9768,14 @@ function suppliedValueSettlesConstruction(member, value, context, path) {
   }
   return valueSettlesConstruction(member, { value }, context, path);
 }
+function genericParameterName(parameterId, classes) {
+  for (const neoClass of classes) {
+    for (const parameter3 of neoClass.genericParams ?? []) {
+      if (parameter3.id === parameterId) return parameter3.name;
+    }
+  }
+  return void 0;
+}
 function resolveConstructionTypeArguments(typeArguments, document2) {
   if (typeArguments === void 0) return void 0;
   const bindings = {};
@@ -9738,8 +9800,10 @@ function resolveConstructionTypeArguments(typeArguments, document2) {
       }
     }
     if (binding === void 0) {
+      const parameter3 = genericParameterName(parameterId, document2.classes) ?? parameterId;
+      const kind = typeof typeInfo.type === "number" ? MemberKind[typeInfo.type] : typeInfo.type;
       throw new Error(
-        `Construction type argument "${parameterId}" has no matching type descriptor in the document.`
+        `Construction type argument "${parameter3}" (${kind}) has no matching type descriptor in the document.`
       );
     }
     bindings[parameterId] = {
@@ -12925,10 +12989,10 @@ function compiledConstructionTypeMembers(members, bodies, projectId) {
       } else if (type.type === 25 /* NSDelegate */) {
         return {
           returnTypeInfo: type.returnTypeInfo,
-          argumentTypes: type.argumentTypes
+          argumentTypes: namedArguments(type.argumentTypes)
         };
       } else if (type.type === 26 /* NSAction */) {
-        return { argumentTypes: type.argumentTypes };
+        return { argumentTypes: namedArguments(type.argumentTypes) };
       } else if (type.type === 22 /* Interface */ || type.type === 9 /* Lookup */ || type.type === 18 /* DialogueLookup */) {
         return null;
       } else {
@@ -12959,6 +13023,12 @@ function compiledConstructionTypeMembers(members, bodies, projectId) {
   for (const body of bodies) visit(body);
   return created;
 }
+function namedArguments(argumentTypes) {
+  return argumentTypes.map((type, index) => ({
+    ...type,
+    name: `p${index + 1}`
+  }));
+}
 function withCompiledConstructionTypes(document2, body) {
   const members = document2.members;
   const projectId = getField(document2.project, "id");
@@ -13905,6 +13975,132 @@ function changeListenerWriteEdit(write) {
   return write.operation === "clear" ? { kind: "replace", targets: [] } : { kind: write.operation, target: write.listener };
 }
 
+// ../packages/models/src/classes/constructor-parameter-settlement.ts
+function createConstructorSettlementResolver(view) {
+  const classesById = new Map(
+    view.classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
+  );
+  const membersById = new Map(
+    view.members.map((member) => [member.id, member])
+  );
+  const constructorsById = new Map(
+    (view.constructors ?? []).map((constructor) => [
+      constructor.id,
+      constructor
+    ])
+  );
+  const directResultByClassAndParameter = /* @__PURE__ */ new Map();
+  const recordedResultByConstructorAndParameter = /* @__PURE__ */ new Map();
+  const directSettlement = (classId, parameterName) => {
+    const cacheKey = `${classId}\0${parameterName}`;
+    if (directResultByClassAndParameter.has(cacheKey)) {
+      return directResultByClassAndParameter.get(cacheKey) ?? null;
+    }
+    const visited = /* @__PURE__ */ new Set();
+    let currentId = classId;
+    while (currentId !== null && !visited.has(currentId)) {
+      visited.add(currentId);
+      const schemaClass2 = classesById.get(currentId);
+      if (schemaClass2 === void 0) break;
+      for (const [schemaKey, memberId] of Object.entries(
+        schemaClass2.schema ?? {}
+      )) {
+        if (typeof memberId !== "string") continue;
+        const member = membersById.get(memberId);
+        const defaultRecord = asRecord(member?.defaultValue);
+        const initRecord = asRecord(defaultRecord?.init);
+        if (initRecord !== null && typeof initRecord.code === "string" && initRecord.code.trim() === parameterName) {
+          const result = { schemaKey, memberId };
+          directResultByClassAndParameter.set(cacheKey, result);
+          return result;
+        }
+      }
+      currentId = schemaClass2.extendsClassId ?? null;
+    }
+    directResultByClassAndParameter.set(cacheKey, null);
+    return null;
+  };
+  const memberIdForSchemaKey = (classId, schemaKey) => {
+    const visited = /* @__PURE__ */ new Set();
+    let currentId = classId;
+    while (currentId !== null && !visited.has(currentId)) {
+      visited.add(currentId);
+      const schemaClass2 = classesById.get(currentId);
+      if (schemaClass2 === void 0) return null;
+      const memberId = schemaClass2.schema?.[schemaKey];
+      if (typeof memberId === "string") return memberId;
+      currentId = schemaClass2.extendsClassId ?? null;
+    }
+    return null;
+  };
+  const recordedSettlement = (classId, parameterName, constructorId, resolving) => {
+    const cacheKey = `${classId}\0${constructorId}\0${parameterName}`;
+    if (recordedResultByConstructorAndParameter.has(cacheKey)) {
+      return recordedResultByConstructorAndParameter.get(cacheKey) ?? null;
+    }
+    if (resolving.has(cacheKey)) return null;
+    const constructor = constructorsById.get(constructorId);
+    if (constructor?.classId !== classId) {
+      recordedResultByConstructorAndParameter.set(cacheKey, null);
+      return null;
+    }
+    const direct = directSettlement(classId, parameterName);
+    if (direct !== null) {
+      recordedResultByConstructorAndParameter.set(cacheKey, direct);
+      return direct;
+    }
+    const schemaClass2 = classesById.get(classId);
+    const baseClassId = schemaClass2?.extendsClassId;
+    if (typeof baseClassId !== "string") {
+      recordedResultByConstructorAndParameter.set(cacheKey, null);
+      return null;
+    }
+    for (const field of constructor.baseInitializerFields ?? []) {
+      const record4 = asRecord(field);
+      if (typeof record4?.name !== "string" || typeof record4.code !== "string" || record4.code.trim() !== parameterName) {
+        continue;
+      }
+      const memberId = memberIdForSchemaKey(baseClassId, record4.name);
+      if (memberId !== null) {
+        const result = { schemaKey: record4.name, memberId };
+        recordedResultByConstructorAndParameter.set(cacheKey, result);
+        return result;
+      }
+    }
+    const baseConstructorId = classesById.get(baseClassId)?.requiredConstructorId;
+    if (typeof baseConstructorId !== "string") {
+      recordedResultByConstructorAndParameter.set(cacheKey, null);
+      return null;
+    }
+    resolving.add(cacheKey);
+    for (const argument2 of constructor.baseArguments ?? []) {
+      const record4 = asRecord(argument2);
+      if (typeof record4?.name !== "string" || typeof record4.code !== "string" || record4.code.trim() !== parameterName) {
+        continue;
+      }
+      const result = recordedSettlement(
+        baseClassId,
+        record4.name,
+        baseConstructorId,
+        resolving
+      );
+      resolving.delete(cacheKey);
+      recordedResultByConstructorAndParameter.set(cacheKey, result);
+      return result;
+    }
+    resolving.delete(cacheKey);
+    recordedResultByConstructorAndParameter.set(cacheKey, null);
+    return null;
+  };
+  return (classId, parameterName, constructorId) => constructorId === void 0 ? directSettlement(classId, parameterName) : recordedSettlement(classId, parameterName, constructorId, /* @__PURE__ */ new Set());
+}
+function asRecord(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    return null;
+  }
+  return value;
+}
+
 // ../packages/neoscript-runtime/src/neoscript/typed-aggregate-row-references.ts
 function visitTypedAggregateRowReferences(value, rawType, visitor) {
   visitor.beforeVisit?.();
@@ -13995,15 +14191,12 @@ function initializerOwnerContext(document2, valueId, rootOwners, valuesById, rec
     currentId = sourceValueId;
     lexicalRoot = rootOwners.get(sourceValueId) ?? lexicalRoot;
   }
-  if (lexicalRoot === void 0) {
+  if (lexicalRoot === void 0 || isStaticMember(lexicalRoot)) {
     return { ownerClass: null, lexicalThisClass: null };
   }
   const lexicalRootId = getField(lexicalRoot, "id");
   const ownerClass = typeof lexicalRootId === "string" ? findSchemaPlacement(lexicalRootId, document2.classes)?.ownerClass ?? null : null;
-  return {
-    ownerClass,
-    lexicalThisClass: isStaticMember(lexicalRoot) === true ? null : ownerClass
-  };
+  return { ownerClass, lexicalThisClass: ownerClass };
 }
 function isRecordValue(value) {
   if (value === null) return false;
@@ -18677,7 +18870,11 @@ function evalInstructions(instructions, scope, ctx, options) {
           }
           let targetTypeInfo = ins.target.typeInfo;
           if (lookupAssignment && targetTypeInfo.type !== 9 /* Lookup */ && targetTypeInfo.type !== 18 /* DialogueLookup */) {
-            targetTypeInfo = {
+            targetTypeInfo = member.collectionMemberId === void 0 ? {
+              type: 9 /* Lookup */,
+              required: targetTypeInfo.required,
+              entryTypeInfo: targetTypeInfo
+            } : {
               type: 9 /* Lookup */,
               required: targetTypeInfo.required,
               entryTypeInfo: targetTypeInfo,
@@ -21172,6 +21369,7 @@ function runtimeGenericEnvForValueRow(row, ctx, visited = /* @__PURE__ */ new Se
   );
   overlayConcreteGenericEntries(env, parentEnv);
   overlayConcreteGenericEntries(env, envFromStamp(row.genericBindings));
+  closeForwardedGenericParams(env);
   return env;
 }
 function runtimeParentGenericEnv(row, ctx, visited, readRow) {
@@ -21362,6 +21560,13 @@ function runtimeTypeInfoForMember(rawMember, env, ctx, seen) {
     };
   }
   if (isMemberLookup(member)) {
+    if (member.collectionMemberId === void 0) {
+      const entryTypeInfo2 = {
+        ...substituteRuntimeTypeInfo(member.declaredTypeInfo, env, ctx),
+        required: isMultiSelectionMember(member) ? true : false
+      };
+      return isMultiSelectionMember(member) ? { type: 9 /* Lookup */, required, entryTypeInfo: entryTypeInfo2 } : entryTypeInfo2;
+    }
     const collection = evalMemberById(ctx.vm, member.collectionMemberId);
     if (collection === null) {
       throw new NSGetterRuntimeError(
@@ -21405,6 +21610,18 @@ function runtimeTypeInfoForMember(rawMember, env, ctx, seen) {
       ctx
     );
   }
+  if (isMemberDelegateBase(member)) {
+    return substituteRuntimeTypeInfo(
+      {
+        type: 25 /* NSDelegate */,
+        required,
+        returnTypeInfo: member.returnTypeInfo,
+        argumentTypes: unnamedArgumentTypes(member.argumentTypes)
+      },
+      env,
+      ctx
+    );
+  }
   if (member.kind === 13 /* Function */ || member.kind === 23 /* NSFunction */ || member.kind === 22 /* Interface */) {
     throw new NSGetterRuntimeError(
       `Member '${member.name}' cannot be used as a concrete generic value type.`
@@ -21910,8 +22127,17 @@ function dispatchSchemaMember(receiver, schemaKey, ctx) {
       return { kind: "ok", value: null };
     case "declaration": {
       const value = readDeclarationDefault(member, ctx);
-      if (value.matched) return { kind: "ok", value: value.value };
-      return { kind: "no-info", matchedMember: true };
+      if (!value.matched) return { kind: "no-info", matchedMember: true };
+      if (!isNSDelegateClosureValue(value.value))
+        return { kind: "ok", value: value.value };
+      return {
+        kind: "ok",
+        value: {
+          ...value.value,
+          [DELEGATE_LEXICAL_THIS]: receiver,
+          [DELEGATE_LEXICAL_ROOT]: ctx.rootValue
+        }
+      };
     }
     case "missing":
       return { kind: "no-info", matchedMember: true };
@@ -24063,8 +24289,9 @@ function validateClassConstructorDescriptor(info, ctx, requireEveryRequiredField
   }
   const genericSlot = ctx.__constructionGenericSlots?.toReversed().find((slot) => slot.classId === classId) ?? ctx.__storedConstructionReplaySlot;
   const slotArguments = genericSlot?.classId === classId ? genericSlot.classArguments : void 0;
+  const typeArguments = slotArguments === void 0 ? receiverClosedTypeArguments(info.schemaClassInfo.typeArguments, ctx) : void 0;
   const descriptorCache = evaluatorValueGeneration(ctx).constructorDescriptors;
-  const descriptorCacheKey = `${requireEveryRequiredField}:${ctx.storedConstructionReplay === true}:${JSON.stringify(slotArguments ?? info.schemaClassInfo.typeArguments ?? null)}`;
+  const descriptorCacheKey = `${requireEveryRequiredField}:${ctx.storedConstructionReplay === true}:${JSON.stringify(slotArguments ?? typeArguments ?? null)}`;
   const cachedDescriptor = descriptorCache.get(info)?.get(descriptorCacheKey);
   if (cachedDescriptor !== void 0) return cachedDescriptor;
   const constructionDocument = {
@@ -24075,10 +24302,7 @@ function validateClassConstructorDescriptor(info, ctx, requireEveryRequiredField
     valueById: ctx.vm.databaseVM?.defaultValueById ?? ctx.vm.databaseVM?.valueById,
     memberById: evaluatorDefaultValueDocument(ctx).memberById
   };
-  const classArguments2 = slotArguments ?? resolveConstructionTypeArguments(
-    info.schemaClassInfo.typeArguments,
-    constructionDocument
-  );
+  const classArguments2 = slotArguments ?? resolveConstructionTypeArguments(typeArguments, constructionDocument);
   const cacheDescriptor = (descriptor) => {
     const complete = {
       ...descriptor,
@@ -24190,6 +24414,33 @@ function validateClassConstructorDescriptor(info, ctx, requireEveryRequiredField
   }
   return cacheDescriptor({ schemaClass: schemaClass2, fields, instanceEnv, classArguments: classArguments2 });
 }
+function receiverClosedTypeArguments(typeArguments, ctx) {
+  if (typeArguments === void 0) return void 0;
+  let env = null;
+  let closed = null;
+  for (const [parameterId, typeInfo] of Object.entries(typeArguments)) {
+    if (!typeInfoContainsGeneric(typeInfo)) continue;
+    if (env === null) {
+      const row = ctx.thisValueRowId ? readNeoScriptRuntimeRow(ctx, ctx.thisValueRowId) : trackedRowForValueReference(ctx.thisValue, ctx);
+      if (row) {
+        env = runtimeGenericEnvForValueRow(row, ctx, /* @__PURE__ */ new Set());
+      } else if (ctx.__initializerGenericEnv !== void 0) {
+        env = ctx.__initializerGenericEnv;
+      } else {
+        throw new NSGetterRuntimeError(
+          "Cannot close a generic construction's type arguments without its Class receiver."
+        );
+      }
+    }
+    closed ??= { ...typeArguments };
+    closed[parameterId] = substituteRuntimeTypeInfo(
+      typeInfo,
+      env,
+      ctx
+    );
+  }
+  return closed ?? typeArguments;
+}
 function validateConstructorFieldSlot(args) {
   const { schemaKey, ctx } = args;
   const rawMember = evalMemberById(ctx.vm, args.memberId);
@@ -24417,8 +24668,7 @@ function applyConstructorFields(args) {
     const existingId = rootRecord[schemaKey];
     const existing = typeof existingId === "string" ? createdById.get(existingId) : void 0;
     if (existing !== void 0 && isLiteralValueContent(existing) && !isMemberClassBase(member) && !isMemberListBase(member) && !isMemberDictionaryBase(member)) {
-      existing.value = value;
-      existing.updatedAt = Date.now();
+      overwriteConstructedLiteral(existing, value, ctx);
       continue;
     }
     const materialized = materializeConstructorArgumentValue({
@@ -24433,6 +24683,14 @@ function applyConstructorFields(args) {
     rootRecord[schemaKey] = materialized.id;
   }
 }
+function overwriteConstructedLiteral(row, value, ctx) {
+  const references = ctx.__indexes?.rowByValueReference;
+  if (typeof row.value === "object" && row.value !== null)
+    references?.delete(row.value);
+  if (typeof value === "object" && value !== null) references?.set(value, row);
+  row.value = value;
+  row.updatedAt = Date.now();
+}
 function applyExplicitNullConstructorField(args) {
   const { schemaKey, member } = args.validated;
   if (isRequiredMember(member)) {
@@ -24443,8 +24701,7 @@ function applyExplicitNullConstructorField(args) {
   const existingId = args.rootRecord[schemaKey];
   const existing = typeof existingId === "string" ? args.createdById.get(existingId) : void 0;
   if (existing !== void 0 && isLiteralValueContent(existing) && !isMemberClassBase(member) && !isMemberListBase(member) && !isMemberDictionaryBase(member)) {
-    existing.value = null;
-    existing.updatedAt = Date.now();
+    overwriteConstructedLiteral(existing, null, args.ctx);
     return;
   }
   const cleared = registerConstructorArgumentRow(
@@ -25350,9 +25607,11 @@ function evaluateInitializerInContext(init, member, ctx, createdValues, argument
     compileMemberId
   });
   const closeFrame = pushConstructionFrame(ctx, `${member.name} initializer`);
+  const initializerCtx = ctx.thisValue === null ? ctx : bindThisValue(ctx, null);
+  const previousGenericEnv = initializerCtx.__initializerGenericEnv;
+  initializerCtx.__initializerGenericEnv = genericEnv;
   let result;
   try {
-    const initializerCtx = ctx.thisValue === null ? ctx : bindThisValue(ctx, null);
     result = evaluateNSGetterWithEffects(
       compiled,
       initializerCtx,
@@ -25368,6 +25627,7 @@ function evaluateInitializerInContext(init, member, ctx, createdValues, argument
       error.sourceOwnerId ??= ownerId;
     throw error;
   } finally {
+    initializerCtx.__initializerGenericEnv = previousGenericEnv;
     closeFrame();
   }
   const created = result.createdSessionValues ?? [];
@@ -25567,6 +25827,21 @@ function retargetConstructorGroupDependencies(provisionalRootId, replacementRoot
     replacementDependencies.add(dependencyRootId);
   }
 }
+function settledConstructorParameterMember(classId, parameterName, constructorId, ctx) {
+  const cache = evaluatorResolutionCache(ctx);
+  cache.constructorSettlement ??= createConstructorSettlementResolver({
+    classes: ctx.vm.classes,
+    constructors: ctx.vm.constructors,
+    members: ctx.vm.members
+  });
+  const settled = cache.constructorSettlement(
+    classId,
+    parameterName,
+    constructorId
+  );
+  if (settled === null) return void 0;
+  return evalMemberById(ctx.vm, settled.memberId) ?? void 0;
+}
 function encodeRequiredConstructorArgument(args) {
   const trackedId = findKnownRowIdByValueReference(args.value, args.ctx);
   const replayedAggregateId = trackedId === null && args.ctx.storedConstructionReplay === true && typeof args.value === "string" && evalValueById(
@@ -25612,6 +25887,14 @@ function encodeRequiredConstructorArgument(args) {
   const aggregateId = trackedId ?? replayedAggregateId;
   if (aggregateId !== null) return adoptTracked(aggregateId, "root");
   const collectionType = args.typeInfo;
+  const settled = args.member;
+  const registerCollectionRow = (value) => {
+    const row2 = registerRow(value);
+    const genericBindings = settled === void 0 ? void 0 : rowGenericBindings({ ...args, member: settled });
+    if (genericBindings !== void 0) row2.genericBindings = genericBindings;
+    return row2;
+  };
+  const entryMember = settled !== void 0 && (isMemberListBase(settled) || isMemberDictionaryBase(settled)) ? evalMemberById(args.ctx.vm, settled.entryMemberId) ?? void 0 : void 0;
   const registerRow = (value, containerId) => {
     args.ctx.beforeValueAllocation?.();
     const row2 = buildNewValue(args.ctx.vm.project.id, { value });
@@ -25643,7 +25926,8 @@ function encodeRequiredConstructorArgument(args) {
         ...args,
         value,
         typeInfo: entryType,
-        parameterId: `${args.parameterId}:${suffix}`
+        parameterId: `${args.parameterId}:${suffix}`,
+        member: entryMember
       });
       if (typeof nested !== "string") {
         throw new NSGetterRuntimeError(
@@ -25660,7 +25944,7 @@ function encodeRequiredConstructorArgument(args) {
         `Constructor argument '${args.parameterId}' must be a List.`
       );
     }
-    const row2 = registerRow([]);
+    const row2 = registerCollectionRow([]);
     row2.value = args.value.map(
       (entry, index) => encodeEntry(entry, collectionType.entryTypeInfo, `index:${index}`)
     );
@@ -25671,7 +25955,7 @@ function encodeRequiredConstructorArgument(args) {
       `Constructor argument '${args.parameterId}' must be a Dictionary.`
     );
   }
-  const row = registerRow({});
+  const row = registerCollectionRow({});
   row.value = Object.fromEntries(
     Object.entries(args.value).map(([key, entry]) => [
       key,
@@ -26504,6 +26788,14 @@ function constructDeclaredClassValueWithinFrame(descriptor, record4, info, scope
         ownerRootId: root.id,
         createdValues,
         storageKeyDeclarations,
+        // Only collection rows carry a stamp from the settled member.
+        member: resolvedArgumentType.type === 6 /* List */ || resolvedArgumentType.type === 5 /* Dictionary */ ? settledConstructorParameterMember(
+          classId,
+          argumentType.name,
+          record4.id,
+          ctx
+        ) : void 0,
+        genericEnv: descriptor.instanceEnv,
         ctx
       });
     }
@@ -27848,132 +28140,6 @@ function declarationDefaultSource(id, stored, resolveGraph) {
   return defaultSourceWithListeners(graph?.rowsById.get(id) ?? stored, graph);
 }
 
-// ../packages/models/src/classes/constructor-parameter-settlement.ts
-function createConstructorSettlementResolver(view) {
-  const classesById = new Map(
-    view.classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
-  );
-  const membersById = new Map(
-    view.members.map((member) => [member.id, member])
-  );
-  const constructorsById = new Map(
-    (view.constructors ?? []).map((constructor) => [
-      constructor.id,
-      constructor
-    ])
-  );
-  const directResultByClassAndParameter = /* @__PURE__ */ new Map();
-  const recordedResultByConstructorAndParameter = /* @__PURE__ */ new Map();
-  const directSettlement = (classId, parameterName) => {
-    const cacheKey = `${classId}\0${parameterName}`;
-    if (directResultByClassAndParameter.has(cacheKey)) {
-      return directResultByClassAndParameter.get(cacheKey) ?? null;
-    }
-    const visited = /* @__PURE__ */ new Set();
-    let currentId = classId;
-    while (currentId !== null && !visited.has(currentId)) {
-      visited.add(currentId);
-      const schemaClass2 = classesById.get(currentId);
-      if (schemaClass2 === void 0) break;
-      for (const [schemaKey, memberId] of Object.entries(
-        schemaClass2.schema ?? {}
-      )) {
-        if (typeof memberId !== "string") continue;
-        const member = membersById.get(memberId);
-        const defaultRecord = asRecord(member?.defaultValue);
-        const initRecord = asRecord(defaultRecord?.init);
-        if (initRecord !== null && typeof initRecord.code === "string" && initRecord.code.trim() === parameterName) {
-          const result = { schemaKey, memberId };
-          directResultByClassAndParameter.set(cacheKey, result);
-          return result;
-        }
-      }
-      currentId = schemaClass2.extendsClassId ?? null;
-    }
-    directResultByClassAndParameter.set(cacheKey, null);
-    return null;
-  };
-  const memberIdForSchemaKey = (classId, schemaKey) => {
-    const visited = /* @__PURE__ */ new Set();
-    let currentId = classId;
-    while (currentId !== null && !visited.has(currentId)) {
-      visited.add(currentId);
-      const schemaClass2 = classesById.get(currentId);
-      if (schemaClass2 === void 0) return null;
-      const memberId = schemaClass2.schema?.[schemaKey];
-      if (typeof memberId === "string") return memberId;
-      currentId = schemaClass2.extendsClassId ?? null;
-    }
-    return null;
-  };
-  const recordedSettlement = (classId, parameterName, constructorId, resolving) => {
-    const cacheKey = `${classId}\0${constructorId}\0${parameterName}`;
-    if (recordedResultByConstructorAndParameter.has(cacheKey)) {
-      return recordedResultByConstructorAndParameter.get(cacheKey) ?? null;
-    }
-    if (resolving.has(cacheKey)) return null;
-    const constructor = constructorsById.get(constructorId);
-    if (constructor?.classId !== classId) {
-      recordedResultByConstructorAndParameter.set(cacheKey, null);
-      return null;
-    }
-    const direct = directSettlement(classId, parameterName);
-    if (direct !== null) {
-      recordedResultByConstructorAndParameter.set(cacheKey, direct);
-      return direct;
-    }
-    const schemaClass2 = classesById.get(classId);
-    const baseClassId = schemaClass2?.extendsClassId;
-    if (typeof baseClassId !== "string") {
-      recordedResultByConstructorAndParameter.set(cacheKey, null);
-      return null;
-    }
-    for (const field of constructor.baseInitializerFields ?? []) {
-      const record4 = asRecord(field);
-      if (typeof record4?.name !== "string" || typeof record4.code !== "string" || record4.code.trim() !== parameterName) {
-        continue;
-      }
-      const memberId = memberIdForSchemaKey(baseClassId, record4.name);
-      if (memberId !== null) {
-        const result = { schemaKey: record4.name, memberId };
-        recordedResultByConstructorAndParameter.set(cacheKey, result);
-        return result;
-      }
-    }
-    const baseConstructorId = classesById.get(baseClassId)?.requiredConstructorId;
-    if (typeof baseConstructorId !== "string") {
-      recordedResultByConstructorAndParameter.set(cacheKey, null);
-      return null;
-    }
-    resolving.add(cacheKey);
-    for (const argument2 of constructor.baseArguments ?? []) {
-      const record4 = asRecord(argument2);
-      if (typeof record4?.name !== "string" || typeof record4.code !== "string" || record4.code.trim() !== parameterName) {
-        continue;
-      }
-      const result = recordedSettlement(
-        baseClassId,
-        record4.name,
-        baseConstructorId,
-        resolving
-      );
-      resolving.delete(cacheKey);
-      recordedResultByConstructorAndParameter.set(cacheKey, result);
-      return result;
-    }
-    resolving.delete(cacheKey);
-    recordedResultByConstructorAndParameter.set(cacheKey, null);
-    return null;
-  };
-  return (classId, parameterName, constructorId) => constructorId === void 0 ? directSettlement(classId, parameterName) : recordedSettlement(classId, parameterName, constructorId, /* @__PURE__ */ new Set());
-}
-function asRecord(value) {
-  if (typeof value !== "object" || value === null || Array.isArray(value)) {
-    return null;
-  }
-  return value;
-}
-
 // ../packages/models/src/members/stored-value-placement-index.ts
 function buildStoredValuePlacementIndex(args) {
   return createStoredValuePlacementTraversal(args)();
@@ -28225,17 +28391,21 @@ function projectListenerEndpoint(args) {
 
 // ../packages/models/src/members/lookup-declared-type.ts
 function lookupDeclaredTypeInfo(member, collectionTypeInfo) {
-  if (collectionTypeInfo === null) return null;
-  if (collectionTypeInfo.type !== 6 /* List */ && collectionTypeInfo.type !== 5 /* Dictionary */) {
-    return null;
-  }
-  const entryTypeInfo = member.declaredTypeInfo ?? collectionTypeInfo.entryTypeInfo;
+  const entryTypeInfo = lookupEntryTypeInfo(member, collectionTypeInfo);
+  if (entryTypeInfo === null) return null;
   if (isMultiSelectionMember(member) !== true) {
     return {
       ...entryTypeInfo,
       required: isRequiredMember(member)
     };
   }
+  if (member.collectionMemberId === void 0) {
+    return {
+      type: 9 /* Lookup */,
+      required: isRequiredMember(member),
+      entryTypeInfo
+    };
+  }
   return {
     type: 9 /* Lookup */,
     required: isRequiredMember(member),
@@ -28244,18 +28414,28 @@ function lookupDeclaredTypeInfo(member, collectionTypeInfo) {
     collectionValueId: member.collectionValueId ?? null
   };
 }
+function lookupEntryTypeInfo(member, collectionTypeInfo) {
+  if (member.collectionMemberId === void 0) return member.declaredTypeInfo;
+  const collection = collectionTypeInfo(member.collectionMemberId);
+  if (collection === null) return null;
+  if (collection.type !== 6 /* List */ && collection.type !== 5 /* Dictionary */) {
+    return null;
+  }
+  return member.declaredTypeInfo ?? collection.entryTypeInfo;
+}
 
 // ../packages/neoscript-runtime/src/values/member-declared-type-info.ts
-function resolveMemberDeclaredTypeInfo(member, members, ownerClass = null) {
+function resolveMemberDeclaredTypeInfo(member, members, ownerClass = null, env) {
   return resolveMemberDeclaredTypeInfoInternal(
     member,
     members,
     /* @__PURE__ */ new Set(),
-    ownerClass
+    ownerClass,
+    env
   );
 }
-function resolveMemberDeclaredTypeInfoInternal(member, members, seen, ownerClass) {
-  const resolved = resolveMember(member, members);
+function resolveMemberDeclaredTypeInfoInternal(member, members, seen, ownerClass, env) {
+  const resolved = env === void 0 ? resolveMember(member, members) : substituteMember(member, env, members);
   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);
@@ -28264,7 +28444,14 @@ function resolveMemberDeclaredTypeInfoInternal(member, members, seen, ownerClass
     const typeArguments = Object.fromEntries(
       Object.entries(resolved.classArguments ?? {}).flatMap(
         ([genericParamId, binding]) => {
-          if (!isMemberGenericBinding(binding)) return [];
+          if (!isMemberGenericBinding(binding)) {
+            const forwarded = genericParamTypeInfo(
+              ownerClass,
+              binding.genericParamId,
+              true
+            );
+            return forwarded === null ? [] : [[genericParamId, forwarded]];
+          }
           const argumentMember = members.find(
             (candidate) => candidate.id === binding.memberId
           );
@@ -28273,7 +28460,8 @@ function resolveMemberDeclaredTypeInfoInternal(member, members, seen, ownerClass
             argumentMember,
             members,
             nextSeen,
-            ownerClass
+            ownerClass,
+            env
           );
           return argumentType === null ? [] : [[genericParamId, argumentType]];
         }
@@ -28313,22 +28501,14 @@ function resolveMemberDeclaredTypeInfoInternal(member, members, seen, ownerClass
       type: 25 /* NSDelegate */,
       required: isRequiredMember(resolved),
       returnTypeInfo: resolved.returnTypeInfo,
-      argumentTypes: resolved.argumentTypes.map((argument2) => {
-        const { name, ...typeInfo } = argument2;
-        void name;
-        return typeInfo;
-      })
+      argumentTypes: unnamedArgumentTypes(resolved.argumentTypes)
     };
   }
   if (isMemberActionBase(resolved)) {
     return {
       type: 26 /* NSAction */,
       required: false,
-      argumentTypes: resolved.argumentTypes.map((argument2) => {
-        const { name, ...typeInfo } = argument2;
-        void name;
-        return typeInfo;
-      })
+      argumentTypes: unnamedArgumentTypes(resolved.argumentTypes)
     };
   }
   if (isMemberListBase(resolved) || isMemberDictionaryBase(resolved)) {
@@ -28340,7 +28520,8 @@ function resolveMemberDeclaredTypeInfoInternal(member, members, seen, ownerClass
       entry,
       members,
       nextSeen,
-      ownerClass
+      ownerClass,
+      env
     );
     if (entryTypeInfo === null) return null;
     return {
@@ -28351,40 +28532,47 @@ function resolveMemberDeclaredTypeInfoInternal(member, members, seen, ownerClass
     };
   }
   if (isMemberLookupBase(resolved)) {
-    const collection = members.find(
-      (candidate) => candidate.id === resolved.collectionMemberId
-    );
-    if (collection === void 0) return null;
-    return lookupDeclaredTypeInfo(
-      resolved,
-      resolveMemberDeclaredTypeInfoInternal(
+    return lookupDeclaredTypeInfo(resolved, (collectionMemberId) => {
+      const collection = members.find(
+        (candidate) => candidate.id === collectionMemberId
+      );
+      if (collection === void 0) return null;
+      return resolveMemberDeclaredTypeInfoInternal(
         collection,
         members,
         nextSeen,
-        ownerClass
-      )
-    );
+        ownerClass,
+        env
+      );
+    });
   }
   if (resolved.kind === 9 /* Lookup */) return null;
   if (!memberKindSupportsStorage(resolved.kind)) return null;
   if (isMemberGenericBase(resolved)) {
-    if (ownerClass === null) return null;
-    const declaration = ownerClass.genericParams?.find(
-      (parameter3) => parameter3.id === resolved.genericParamId
+    return genericParamTypeInfo(
+      ownerClass,
+      resolved.genericParamId,
+      isRequiredMember(resolved)
     );
-    if (declaration === void 0) return null;
-    return {
-      type: 21 /* Generic */,
-      required: isRequiredMember(resolved),
-      ownerClassId: ownerClass.id,
-      genericParamId: declaration.id
-    };
   }
   return {
     type: resolved.kind,
     required: isRequiredMember(resolved)
   };
 }
+function genericParamTypeInfo(ownerClass, genericParamId, required) {
+  if (ownerClass === null) return null;
+  const declaration = ownerClass.genericParams?.find(
+    (parameter3) => parameter3.id === genericParamId
+  );
+  if (declaration === void 0) return null;
+  return {
+    type: 21 /* Generic */,
+    required,
+    ownerClassId: ownerClass.id,
+    genericParamId: declaration.id
+  };
+}
 
 // ../packages/neoscript-runtime/src/values/constructor-argument-ownership.ts
 var MaterializedValueGraphContext = class {
@@ -31217,7 +31405,7 @@ function materializeMemberDefaultValue(args) {
       rootOwners,
       valuesById,
       (id) => args.readTracking?.valueIds.add(id)
-    ).ownerClass : typeof Reflect.get(member, "id") === "string" ? findSchemaPlacement(
+    ).ownerClass : typeof Reflect.get(member, "id") === "string" && !isStaticMember(member) ? findSchemaPlacement(
       String(Reflect.get(member, "id")),
       args.document.classes
     )?.ownerClass ?? null : null;
@@ -33556,22 +33744,25 @@ function virtualReadRecorder(reads) {
     recordGlobalRead: reads.recordUnattributableValueRead
   };
 }
-function evaluateMemberInitializer(args) {
-  const databaseVM = initializerEvaluatorLookups(
-    args.document,
-    args.readTracking
-  );
+function compileMemberInitializer(args, databaseVM = initializerEvaluatorLookups(args.document)) {
   const initializerIndexes = databaseVM.constructorInitializerIndexes;
   const compileMemberId = initializerIndexes?.initializerScopeMemberIds.get(args.init) ?? (args.sourceValueId === null || args.sourceValueId === void 0 ? void 0 : initializerIndexes?.initializerScopeMemberIdsByValueId.get(
     args.sourceValueId
   ));
-  const compiled = ensureInitializerCompiled({
+  return ensureInitializerCompiled({
     init: args.init,
     member: args.member,
     initializerCompiler: args.document.initializerCompiler,
     sourceValueId: args.sourceValueId ?? null,
     compileMemberId
   });
+}
+function evaluateMemberInitializer(args) {
+  const databaseVM = initializerEvaluatorLookups(
+    args.document,
+    args.readTracking
+  );
+  const compiled = compileMemberInitializer(args, databaseVM);
   const ctx = {
     ...args.document.evaluationLimits,
     debugSink: args.document.debugSink,
@@ -35066,6 +35257,25 @@ function substituteTypeParameters(member, receiver, declaring) {
   };
   return visit(member);
 }
+function containsTypeParameter(type) {
+  switch (type.kind) {
+    case "typeParameter":
+      return true;
+    case "named":
+      return type.typeArguments?.some(containsTypeParameter) ?? false;
+    case "list":
+    case "set":
+      return containsTypeParameter(type.elementType);
+    case "dictionary":
+      return containsTypeParameter(type.keyType) || containsTypeParameter(type.valueType);
+    case "delegate":
+      return containsTypeParameter(type.returnType) || type.parameterTypes.some(containsTypeParameter);
+    case "action":
+      return type.parameterTypes.some(containsTypeParameter);
+    default:
+      return false;
+  }
+}
 
 // ../packages/neoscript-language/src/listener-annotation.ts
 function inspectListenerAnnotation(annotation2, parameters) {
@@ -35783,6 +35993,18 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
     }
     return { fields, errors, deferredReferences: [...deferredReferences] };
   }
+  /**
+   * P60 §2.3. A persisted delegate method group, graded exactly as the same
+   * expression assigned to `expected` in a body.
+   */
+  resolvePersistedMethodGroup(expression, expected) {
+    const resolved = this.resolveExpression(
+      expression,
+      this.initialScope(),
+      expected
+    );
+    this.requireAssignable(resolved.type, expected, expression.pos, "value");
+  }
   persistedListenerCompletions(receiver, expected) {
     const scope = this.initialScope();
     let receiverType = this.context.thisClass;
@@ -36073,7 +36295,7 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
             local,
             localType,
             "local" /* Local */,
-            initial.writability ?? "local" /* Local */,
+            localOwnership(initial),
             this.localWriteTargetRoot(initial, scope)
           )
         );
@@ -39326,6 +39548,7 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
         } : {}
       };
     }
+    const writability = member.writability ? toWritability(member.writability, this.writesUserData) : void 0;
     return {
       pointer: {
         type: "staticMember" /* StaticMember */,
@@ -39333,8 +39556,10 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
       },
       type: member.type,
       symbol: member,
-      ...member.writability ? {
-        writability: toWritability(member.writability, this.writesUserData)
+      ...writability ? { writability } : {},
+      ...member.lookup ? {
+        entryWritability: this.lookupEntryWritability(member, writability),
+        entryUserData: this.lookupEntryUserData(member)
       } : {}
     };
   }
@@ -39634,7 +39859,7 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
       const readonlySlot = member.readonlyDeclaration === true;
       const storageWritability = this.memberWritability(member, receiver);
       const writability = readonlySlot ? "readOnly" /* ReadOnly */ : storageWritability;
-      const entryWritability = member.lookup ? this.lookupEntryWritability(member, receiver) : readonlySlot ? storageWritability : void 0;
+      const entryWritability = member.lookup ? this.lookupEntryWritability(member, receiver.writability) : readonlySlot ? storageWritability : void 0;
       const userData = this.memberUserData(member, receiver);
       const entryUserData = member.lookup ? this.lookupEntryUserData(member) : readonlySlot && userData;
       const lookupWire = member.lookup?.multiselect === true && memberType2.kind === "set" ? {
@@ -39644,7 +39869,7 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
           { ...memberType2.elementType, nullable: false },
           this.project
         ),
-        collectionMemberId: member.lookup.collectionMemberId,
+        ...member.lookup.collectionMemberId !== void 0 ? { collectionMemberId: member.lookup.collectionMemberId } : {},
         ...member.lookup.collectionValueId !== void 0 ? { collectionValueId: member.lookup.collectionValueId } : {}
       } : void 0;
       return {
@@ -39768,16 +39993,18 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
   }
   lookupEntryUserData(member) {
     if (!member.lookup) return false;
-    const collectionWritability = member.lookup.collectionWritability ?? this.project.symbolById.get(member.lookup.collectionMemberId)?.writability;
+    const collectionMemberId = member.lookup.collectionMemberId;
+    if (collectionMemberId === void 0) return false;
+    const collectionWritability = member.lookup.collectionWritability ?? this.project.symbolById.get(collectionMemberId)?.writability;
     return collectionWritability === "user";
   }
-  lookupEntryWritability(member, receiver) {
+  lookupEntryWritability(member, receiverWritability) {
     if (!member.lookup) return "readOnly" /* ReadOnly */;
-    const target = this.project.symbolById.get(
-      member.lookup.collectionMemberId
-    );
+    const collectionMemberId = member.lookup.collectionMemberId;
+    if (collectionMemberId === void 0) return "runtime" /* Runtime */;
+    const target = this.project.symbolById.get(collectionMemberId);
     const targetWritability = member.lookup.collectionWritability ? toWritability(member.lookup.collectionWritability, this.writesUserData) : target?.writability ? toWritability(target.writability, this.writesUserData) : target?.writable ? "runtime" /* Runtime */ : "readOnly" /* ReadOnly */;
-    if (receiver.writability === "immutable" /* Immutable */) {
+    if (receiverWritability === "immutable" /* Immutable */) {
       if (targetWritability === "save" /* Save */) {
         return "immutableToSaveLookup" /* ImmutableToSaveLookup */;
       }
@@ -40799,7 +41026,8 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
   resolveExecutableObjectInitializer(schemaClass2, expression, scope, expected) {
     const settling = this.generatedConstructorSettlingEntries(
       schemaClass2,
-      expression
+      expression,
+      expected
     );
     const constructed = settling.length > 0 ? this.resolveClassConstructor(
       schemaClass2.name,
@@ -40878,7 +41106,7 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
     };
   }
   /** Block entries naming a required parameter the positional arguments skip. */
-  generatedConstructorSettlingEntries(schemaClass2, expression) {
+  generatedConstructorSettlingEntries(schemaClass2, expression, expected) {
     const signature = schemaClass2.constructorSignature;
     if (signature === void 0) return [];
     const generated = isGeneratedPositionalCall(schemaClass2, expression) || (schemaClass2.declaredConstructors?.length ?? 0) === 0 && expression.argumentNames === void 0;
@@ -40886,7 +41114,11 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
     const required = new Set(
       requiredMembersAfterArguments(
         schemaClass2,
-        signature.parameters,
+        closedConstructorParameters(
+          signature.parameters,
+          this.constructorTargetType(schemaClass2, expression, expected),
+          schemaClass2
+        ),
         expression.args.length
       ).map((name) => name.toLowerCase())
     );
@@ -40923,9 +41155,8 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
     }
     const signature = replayingStoredConstruction ? schemaClass2.storedConstructionReplaySignature ?? schemaClass2.constructorSignature : schemaClass2.constructorSignature;
     if (!signature) {
-      const open = (schemaClass2.typeParameters?.length ?? 0) > 0;
       throw new CompileError(
-        open ? `Cannot construct open generic Class '${className}'; construct a closed named descendant.` : `Class '${className}' does not expose a generated public constructor.`,
+        `Class '${className}' does not expose a generated public constructor.`,
         pos
       );
     }
@@ -40934,19 +41165,11 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
       expression,
       expected
     );
-    const parameters = signature.parameters.map((parameter3) => ({
-      ...parameter3,
-      valueType: substituteTypeParameters(
-        parameter3.valueType,
-        targetType,
-        schemaClass2
-      ),
-      parameterType: substituteTypeParameters(
-        parameter3.parameterType,
-        targetType,
-        schemaClass2
-      )
-    }));
+    const parameters = closedConstructorParameters(
+      signature.parameters,
+      targetType,
+      schemaClass2
+    );
     const argumentsList2 = expression.args;
     if (expression.argumentNames !== void 0) {
       throw new CompileError(
@@ -41035,15 +41258,34 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
       );
     }
     if (typeArguments !== void 0) {
-      return {
+      const target = {
         kind: "named",
         typeId: schemaClass2.id,
         typeArguments
       };
+      assertTypeArgumentConstraints(
+        schemaClass2,
+        target,
+        expression.pos,
+        this.project
+      );
+      assertDirectTypeParameterArguments(target, expression.pos, this.project);
+      return target;
     }
     if (expected?.kind === "named" && expected.typeId === schemaClass2.id) {
+      assertDirectTypeParameterArguments(
+        expected,
+        expression.pos,
+        this.project
+      );
       return { ...expected, nullable: false };
     }
+    if ((schemaClass2.typeParameters?.length ?? 0) > 0) {
+      throw new CompileError(
+        `Cannot construct open generic Class '${schemaClass2.name}'; pass its type arguments.`,
+        expression.pos
+      );
+    }
     return {
       kind: "named",
       typeId: schemaClass2.id
@@ -43923,6 +44165,25 @@ function variable(id, type, pointer, project) {
 function isGeneratedPositionalCall(target, expression) {
   return neoScriptRequiredConstructor(target) === null && target.constructorSignature !== void 0 && expression.argumentNames === void 0 && callHasPositionalArguments(expression);
 }
+function closedConstructorParameters(parameters, targetType, schemaClass2) {
+  return parameters.map((parameter3) => {
+    const valueType = substituteTypeParameters(
+      parameter3.valueType,
+      targetType,
+      schemaClass2
+    );
+    return {
+      ...parameter3,
+      valueType,
+      parameterType: substituteTypeParameters(
+        parameter3.parameterType,
+        targetType,
+        schemaClass2
+      ),
+      required: parameter3.required && valueType.nullable !== true
+    };
+  });
+}
 function requiredMembersAfterArguments(schemaClass2, parameters, positionalCount) {
   const names = [];
   for (const parameter3 of parameters.slice(positionalCount)) {
@@ -43974,6 +44235,12 @@ function bindConstructorArgumentNames(className, declared, argumentNames, pos) {
     return parameter3.name;
   });
 }
+function localOwnership(initial) {
+  if (initial.entryWritability !== void 0 && (initial.type.kind === "named" || initial.type.kind === "typeParameter")) {
+    return initial.entryWritability;
+  }
+  return initial.writability ?? "local" /* Local */;
+}
 function scopeVariable(name, value, sourceType, writability, ownership, writeRoot, readonlyBinding) {
   return {
     name,
@@ -45251,6 +45518,7 @@ function resolveNeoScriptType(type, context, project) {
           )
         } : {}
       };
+      assertTypeArgumentConstraints(named, resolved, type.pos, project);
       break;
     }
     case "list":
@@ -45283,6 +45551,31 @@ function resolveNeoScriptType(type, context, project) {
   }
   return { ...resolved, nullable: !type.required };
 }
+function wrappedTypeParameterMessage(target, project) {
+  for (const argument2 of target.typeArguments ?? []) {
+    if (argument2.kind === "typeParameter") continue;
+    if (!containsTypeParameter(argument2)) continue;
+    return `Cannot construct '${formatType(target, project)}': type argument '${formatType(argument2, project)}' wraps a type parameter. Pass the type parameter itself or a closed type.`;
+  }
+  return null;
+}
+function assertDirectTypeParameterArguments(target, pos, project) {
+  const message = wrappedTypeParameterMessage(target, project);
+  if (message !== null) throw new CompileError(message, pos);
+}
+function assertTypeArgumentConstraints(declaring, type, pos, project) {
+  declaring.typeParameters?.forEach((parameter3, index) => {
+    const argument2 = type.typeArguments?.[index];
+    const constraint = parameter3.type.kind === "typeParameter" ? parameter3.type.constraint : void 0;
+    if (argument2 === void 0 || constraint === void 0) return;
+    const expected = substituteTypeParameters(constraint, type, declaring);
+    if (isNeoScriptTypeAssignable(argument2, expected, project)) return;
+    throw new CompileError(
+      `Type argument '${formatType(argument2, project)}' does not satisfy '${parameter3.name} extends ${formatType(expected, project)}' on '${declaring.name}'.`,
+      pos
+    );
+  });
+}
 function intersectCollectionWritability(left, right) {
   if (left === right) return left;
   const writable = (value) => value === "local" /* Local */ || value === "save" /* Save */ || value === "session" /* Session */ || value === "runtime" /* Runtime */;
@@ -45687,9 +45980,6 @@ function attachConstructorSignature(type, environment) {
     type.id,
     environment
   );
-  for (const binding of genericEnvironment.values()) {
-    if (binding.kind === "unbound") return type;
-  }
   return {
     ...type,
     ...buildNeoScriptConstructionSignatures(
@@ -45702,7 +45992,7 @@ function attachConstructorSignature(type, environment) {
           environment
         );
         return member ? {
-          required: boolean(member.required, `member ${memberId}.required`),
+          required: member.kind === "generic" || boolean(member.required, `member ${memberId}.required`),
           defaultValue: member.defaultValue,
           immutable: declaredStorage(
             environment.members.get(memberId),
@@ -46055,12 +46345,10 @@ function memberSymbol(member, schemaKey, environment, field) {
       environment
     );
   }
-  const lookupCollectionMemberId = kind === "lookup" ? string(member.collectionMemberId, `${field}.collectionMemberId`) : null;
-  const lookupCollectionWritability = lookupCollectionMemberId === null ? void 0 : environment.effectiveWritabilityByMemberId.get(
-    lookupCollectionMemberId
-  );
+  const lookupCollection = kind === "lookup" ? lookupCollectionMemberId(member, field) : null;
+  const lookupCollectionWritability = lookupCollection === null ? void 0 : environment.effectiveWritabilityByMemberId.get(lookupCollection);
   const lookup = kind === "lookup" ? {
-    collectionMemberId: lookupCollectionMemberId,
+    ...lookupCollection === null ? {} : { collectionMemberId: lookupCollection },
     ...member.collectionValueId === null || typeof member.collectionValueId === "string" ? { collectionValueId: member.collectionValueId } : {},
     multiselect: boolean(member.multiselect, `${field}.multiselect`),
     ...lookupCollectionWritability === void 0 ? {} : { collectionWritability: lookupCollectionWritability }
@@ -46074,6 +46362,10 @@ function memberSymbol(member, schemaKey, environment, field) {
     ...lookup ? { lookup } : {}
   };
 }
+function lookupCollectionMemberId(member, field) {
+  if (member.collectionMemberId === null) return null;
+  return string(member.collectionMemberId, `${field}.collectionMemberId`);
+}
 function interfaceType(value, environment, field) {
   const id = string(value.id, `${field}.id`);
   return {
@@ -46542,9 +46834,8 @@ function memberType(member, environment, visiting, field) {
     };
   }
   if (kind === "lookup") {
-    const collection = environment.members.get(
-      string(member.collectionMemberId, `${field}.collectionMemberId`)
-    );
+    const collectionMemberId = lookupCollectionMemberId(member, field);
+    const collection = collectionMemberId === null ? void 0 : environment.members.get(collectionMemberId);
     const collectionType = collection ? memberType(collection, environment, next, `${field}.collection`) : unknownType();
     const declared = optionalRecord(member.declaredType);
     const declaredType = declared ? manifestType(declared, environment, `${field}.declaredType`) : null;
@@ -47978,9 +48269,6 @@ function classToLanguageType(schemaClass2, context) {
 }
 function constructorSignature(schemaClass2, members, context, genericEnvironment) {
   if (isAbstractClass(schemaClass2)) return {};
-  if (!isClosedClass(schemaClass2.id, context.vm.classes)) {
-    return {};
-  }
   return buildNeoScriptConstructionSignatures(
     schemaClass2.id,
     members,
@@ -47988,14 +48276,16 @@ function constructorSignature(schemaClass2, members, context, genericEnvironment
       const record4 = analyzerMemberById(context, memberId);
       if (!record4) return null;
       try {
-        const resolved = substituteMember(
+        const declared = resolveAnalyzerMember(context, record4);
+        const open = isMemberGenericBase(declared) && genericEnvironment.get(declared.genericParamId)?.kind === "unbound";
+        const resolved = open ? declared : substituteMember(
           record4,
           genericEnvironment,
           context.vm.members,
-          resolveAnalyzerMember(context, record4)
+          declared
         );
         return {
-          required: isRequiredMember(resolved),
+          required: open || isRequiredMember(resolved),
           defaultValue: "defaultValue" in resolved ? resolved.defaultValue : void 0,
           immutable: declaredMemberStorage(record4.id, context.vm.members) === 1 /* Immutable */
         };
@@ -48159,6 +48449,13 @@ function memberToSymbol(record4, schemaKey, containingClass, ownerClassId, index
     };
   }
   if (isMemberLookupBase(resolved)) {
+    if (resolved.collectionMemberId === void 0) {
+      return {
+        ...common,
+        kind: "property",
+        lookup: { multiselect: isMultiSelectionMember(resolved) }
+      };
+    }
     const collectionWritability = uniqueEffectiveWritability(
       resolved.collectionMemberId,
       context
@@ -48520,12 +48817,12 @@ function memberRuntimeType(record4, context, seen = /* @__PURE__ */ new Set(), g
       if (!isMemberLookupBase(member)) return UNKNOWN_TYPE;
       const declared = member.declaredTypeInfo ? toLanguageType(member.declaredTypeInfo, context, genericEnvironment) : null;
       const narrowed = declared && !isUnknownType3(declared) ? declared : null;
-      const entry = narrowed ?? lookupCollectionEntryType(
+      const entry = narrowed ?? (member.collectionMemberId === void 0 ? null : lookupCollectionEntryType(
         member.collectionMemberId,
         context,
         nextSeen,
         genericEnvironment
-      );
+      ));
       if (!entry) return UNKNOWN_TYPE;
       return isMultiSelectionMember(member) ? {
         kind: "set",
@@ -49204,25 +49501,33 @@ function compileNSInitializer(code, ctx) {
     );
   }
   try {
-    const { lexicalThisClass, ...compilerContext } = ctx;
+    const { lexicalThisClass, declaringClass, ...compilerContext } = ctx;
+    const context = createContext(
+      {
+        ...compilerContext,
+        thisClass: lexicalThisClass ?? null,
+        implicitMemberAccess: lexicalThisClass !== null,
+        staticMember: false
+      },
+      {
+        scriptKind: "initializer",
+        returnTypeInfo: ctx.returnTypeInfo,
+        ...ctx.argumentTypes === void 0 ? {} : { functionArguments: ctx.argumentTypes },
+        ...ctx.initializerName === void 0 ? {} : { functionName: ctx.initializerName },
+        dialogueContext: null
+      }
+    );
     return compileStrict(
       `return
 ${code};`,
-      createContext(
-        {
-          ...compilerContext,
-          thisClass: lexicalThisClass ?? null,
-          implicitMemberAccess: lexicalThisClass !== null,
-          staticMember: false
-        },
-        {
-          scriptKind: "initializer",
-          returnTypeInfo: ctx.returnTypeInfo,
-          ...ctx.argumentTypes === void 0 ? {} : { functionArguments: ctx.argumentTypes },
-          ...ctx.initializerName === void 0 ? {} : { functionName: ctx.initializerName },
-          dialogueContext: null
+      declaringClass ? {
+        ...context,
+        declaringType: {
+          kind: "named",
+          typeId: declaringClass.id,
+          nullable: false
         }
-      )
+      } : context
     );
   } catch (error) {
     throw withInitializerSourcePosition(error);
@@ -49459,6 +49764,7 @@ function compileMemberInitializerBody(args) {
       `Member "${args.member.name}" has an initializer but no resolvable declared type.`
     );
   }
+  const instanceClass = isStaticMember(args.member) ? null : args.thisClass;
   let compiled;
   try {
     compiled = compileUnit2(
@@ -49470,8 +49776,10 @@ function compileMemberInitializerBody(args) {
         variantFolders: args.variantFolders ?? [],
         returnTypeInfo,
         initializerName: args.member.name,
+        lexicalThisClass: parseExpression(defaultValue.init.code).kind === "lambda" ? instanceClass : null,
+        declaringClass: instanceClass,
         argumentTypes: initializerArgumentTypes(
-          args.thisClass,
+          instanceClass,
           args.constructors ?? []
         )
       })
@@ -49516,6 +49824,7 @@ function compileValueRowInitializerBody(args) {
         returnTypeInfo,
         initializerName: args.member.name,
         lexicalThisClass: args.lexicalThisClass ?? null,
+        declaringClass: args.initializerOwnerClass,
         argumentTypes: initializerArgumentTypes(
           args.initializerOwnerClass,
           args.constructors ?? []
@@ -54156,12 +54465,23 @@ var schemaMemberSchema = variant("kind", [
     enumId: nonEmptyString,
     multiselect: boolean2()
   }),
-  memberSchema("lookup", {
-    collectionMemberId: nonEmptyString,
-    collectionValueId: nullableId,
-    multiselect: boolean2(),
-    declaredType: nullable(schemaTypeSchema)
-  }),
+  pipe(
+    memberSchema("lookup", {
+      /** `null` on an unbound `Reference<T>` (P107), typed by `declaredType`. */
+      collectionMemberId: nullable(nonEmptyString),
+      collectionValueId: nullableId,
+      multiselect: boolean2(),
+      declaredType: nullable(schemaTypeSchema)
+    }),
+    check(
+      (member) => member.collectionMemberId !== null || member.collectionValueId === null,
+      "A lookup collection value requires a collection member."
+    ),
+    check(
+      (member) => member.collectionMemberId !== null || member.declaredType?.kind === "class" || member.declaredType?.kind === "generic",
+      "A lookup without a collection needs a class or generic declared type."
+    )
+  ),
   memberSchema("dialogueLookup", {
     dialogueGroupId: nullableId,
     multiselect: boolean2()
@@ -54559,10 +54879,8 @@ function memberFromDocument(record4, members, owners, classNames, context) {
     return {
       ...common,
       kind: "lookup",
-      collectionMemberId: requiredStringValue(
-        field("collectionMemberId", void 0),
-        record4,
-        "collectionMemberId"
+      collectionMemberId: optionalStringOrNull(
+        field("collectionMemberId", null)
       ),
       collectionValueId: optionalStringOrNull(field("collectionValueId", null)),
       multiselect: ordinalValue(
@@ -54880,7 +55198,9 @@ function memberToDocumentFields(member, baseData) {
     }
   }
   if (member.kind === "lookup") {
-    fields.collectionMemberId = member.collectionMemberId;
+    if (member.collectionMemberId !== null) {
+      fields.collectionMemberId = member.collectionMemberId;
+    }
     if (member.collectionValueId !== null) {
       fields.collectionValueId = member.collectionValueId;
     }
@@ -56869,7 +57189,7 @@ var INITIALIZER_KEY_PLACEHOLDER = new RegExp(
 
 // ../packages/manifest/schema-contract/registry.mjs
 var PROJECT_SCHEMA_CONTRACT = Object.freeze({
-  cliVersion: "0.76.3",
+  cliVersion: "0.77.1",
   projectFileUploadBatchSize: 32,
   documentRecords: {
     member: {