@neocompose/cli 0.77.0 → 0.78.0

package/dist/test-worker.mjs

@@ -1461,36 +1461,37 @@ 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";
+  MemberKind7[MemberKind7["Set"] = 28] = "Set";
+  return MemberKind7;
 })(MemberKind || {});
 
 // ../packages/models/src/members/member-kind-taxonomy.ts
@@ -1504,13 +1505,13 @@ var TAXONOMY = {
   [4 /* Float */]: [1 /* Direct */, BINDABLE, "number", null, 4],
   [5 /* Dictionary */]: [1 /* Direct */, BINDABLE, "collection", null, 11],
   [6 /* List */]: [1 /* Direct */, BINDABLE, "collection", null, 12],
-  [7 /* Class */]: [1 /* Direct */, BINDABLE, "class", null, 13],
-  [8 /* Enum */]: [1 /* Direct */, BINDABLE, "core", null, 14],
-  [9 /* Lookup */]: [1 /* Direct */, STORED, "collection", null, 15],
-  [10 /* NSProperty */]: [1 /* Direct */, 0, "code", null, 17],
-  [11 /* Sprite */]: [1 /* Direct */, BINDABLE, "core", null, 23],
-  [12 /* Audio */]: [1 /* Direct */, BINDABLE, "core", null, 24],
-  [13 /* Function */]: [1 /* Direct */, 8 /* Signature */, "code", null, 22],
+  [7 /* Class */]: [1 /* Direct */, BINDABLE, "class", null, 14],
+  [8 /* Enum */]: [1 /* Direct */, BINDABLE, "core", null, 15],
+  [9 /* Lookup */]: [1 /* Direct */, STORED, "collection", null, 16],
+  [10 /* NSProperty */]: [1 /* Direct */, 0, "code", null, 18],
+  [11 /* Sprite */]: [1 /* Direct */, BINDABLE, "core", null, 24],
+  [12 /* Audio */]: [1 /* Direct */, BINDABLE, "core", null, 25],
+  [13 /* Function */]: [1 /* Direct */, 8 /* Signature */, "code", null, 23],
   [14 /* Vector2 */]: [1 /* Direct */, BINDABLE, "vector", 2, 6],
   [15 /* Vector2Int */]: [1 /* Direct */, BINDABLE, "vector", 2, 7],
   [16 /* Vector3 */]: [1 /* Direct */, BINDABLE, "vector", 3, 8],
@@ -1520,7 +1521,7 @@ var TAXONOMY = {
     STORED,
     "collection",
     null,
-    16
+    17
   ],
   [19 /* Color */]: [1 /* Direct */, BINDABLE, "core", null, 10],
   [20 /* Decimal */]: [1 /* Direct */, BINDABLE, "number", null, 5],
@@ -1537,7 +1538,7 @@ var TAXONOMY = {
     8 /* Signature */,
     "code",
     null,
-    18
+    19
   ],
   [24 /* FunctionRef */]: [0 /* None */, STORED, null, null, null],
   [25 /* NSDelegate */]: [
@@ -1545,16 +1546,17 @@ var TAXONOMY = {
     STORED | 8 /* Signature */,
     "code",
     null,
-    19
+    20
   ],
   [26 /* NSAction */]: [
     1 /* Direct */,
     STORED | 8 /* Signature */,
     "code",
     null,
-    20
+    21
   ],
-  [27 /* Variant */]: [1 /* Direct */, STORED, "world", null, 21]
+  [27 /* Variant */]: [1 /* Direct */, STORED, "world", null, 22],
+  [28 /* Set */]: [1 /* Direct */, BINDABLE, "collection", null, 13]
 };
 var ALL_MEMBER_KINDS = [
   0 /* Null */,
@@ -1584,7 +1586,8 @@ var ALL_MEMBER_KINDS = [
   24 /* FunctionRef */,
   25 /* NSDelegate */,
   26 /* NSAction */,
-  27 /* Variant */
+  27 /* Variant */,
+  28 /* Set */
 ];
 var DIRECT_MEMBER_KINDS = ALL_MEMBER_KINDS.filter(
   (kind) => TAXONOMY[kind][0] === 1 /* Direct */
@@ -1656,7 +1659,9 @@ var AUTOMATIC_MEMBER_DISTRIBUTION = {
   /** Listener count grows with content. */
   [26 /* NSAction */]: { sparse: "listenerCount" },
   /** Fixed class, variant, and optional bound-row ids. */
-  [27 /* Variant */]: 1 /* Packed */
+  [27 /* Variant */]: 1 /* Packed */,
+  /** Entry count grows with content. */
+  [28 /* Set */]: { sparse: "entryCount" }
 };
 function memberKindSupportsDistribution(kind) {
   return memberKindSupportsStorage(kind);
@@ -3012,7 +3017,7 @@ function isNSTypeInfoCollection(value) {
 }
 function isNSTypeInfoCollectionInternal(value, ancestors) {
   if (!isNSTypeInfoBase(value)) return false;
-  if (value.type !== 6 /* List */ && value.type !== 5 /* Dictionary */) {
+  if (value.type !== 6 /* List */ && value.type !== 28 /* Set */ && value.type !== 5 /* Dictionary */) {
     return false;
   }
   const v = value;
@@ -3033,6 +3038,11 @@ function isNSTypeInfoCollectionInternal(value, ancestors) {
     if (v.listMemberId.length === 0) return false;
     if (v.type !== 6 /* List */) return false;
   }
+  if (v.setMemberId !== void 0) {
+    if (typeof v.setMemberId !== "string") return false;
+    if (v.setMemberId.length === 0) return false;
+    if (v.type !== 28 /* Set */) return false;
+  }
   return true;
 }
 function isNSTypeInfoLookup(value) {
@@ -3110,7 +3120,7 @@ function typeInfoContainsUnknown(value, ancestors) {
   if (ancestors.has(value)) return true;
   ancestors.add(value);
   try {
-    if (value.type === 6 /* List */ || value.type === 5 /* Dictionary */ || value.type === 9 /* Lookup */) {
+    if (value.type === 6 /* List */ || value.type === 28 /* Set */ || value.type === 5 /* Dictionary */ || value.type === 9 /* Lookup */) {
       return typeInfoContainsUnknown(value.entryTypeInfo, ancestors);
     }
     if (value.type === 25 /* NSDelegate */) {
@@ -3766,7 +3776,7 @@ function isNSFunctionCollectionQuery(value) {
     case "TakeWhile":
       return isNSCollectionBoolFunction(info);
     case "SelectMany":
-      return isNSFunctionWithReturnType(info.function) && (info.function.typeInfo.type === 6 /* List */ || info.function.typeInfo.type === 9 /* Lookup */) && info.function.typeInfo.required;
+      return isNSFunctionWithReturnType(info.function) && (info.function.typeInfo.type === 6 /* List */ || info.function.typeInfo.type === 28 /* Set */ || info.function.typeInfo.type === 9 /* Lookup */) && info.function.typeInfo.required;
     case "OrderBy":
     case "OrderByDescending":
       return isNSFunctionWithReturnType(info.function) && ["int", "float", "decimal", "string", "bool"].includes(info.keyType);
@@ -3777,6 +3787,8 @@ function isNSFunctionCollectionQuery(value) {
       return isNSPointer(info.otherPointer);
     case "Reverse":
       return true;
+    case "ToSet":
+      return info.reference === void 0 || info.reference === true;
     default:
       return false;
   }
@@ -4046,6 +4058,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);
 }
@@ -4120,10 +4139,19 @@ function typeInfosInvariantlyEqual(left, right) {
   if (left.type === 8 /* Enum */ && right.type === 8 /* Enum */) {
     return left.enumId === right.enumId;
   }
-  if ((left.type === 6 /* List */ || left.type === 5 /* Dictionary */) && (right.type === 6 /* List */ || right.type === 5 /* Dictionary */)) {
+  if ((left.type === 6 /* List */ || left.type === 28 /* Set */ || left.type === 5 /* Dictionary */) && (right.type === 6 /* List */ || right.type === 28 /* Set */ || right.type === 5 /* Dictionary */)) {
     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(
@@ -4513,10 +4541,22 @@ function isListKind(value) {
 function isMemberListBase(value) {
   const v = asMemberBaseForKind(value, 6 /* List */);
   if (v === null) return false;
-  if (typeof v.entryMemberId !== "string") return false;
   if (v.listKind !== void 0 && v.listKind !== null && !isListKind(v.listKind)) {
     return false;
   }
+  return hasValidEntryCollectionFields(v);
+}
+function isMemberSetBase(value) {
+  const v = asMemberBaseForKind(value, 28 /* Set */);
+  if (v === null) return false;
+  if (v.listKind !== void 0) return false;
+  return hasValidEntryCollectionFields(v);
+}
+function isMemberEntryCollectionBase(value) {
+  return isMemberListBase(value) || isMemberSetBase(value);
+}
+function hasValidEntryCollectionFields(v) {
+  if (typeof v.entryMemberId !== "string") return false;
   if (v.valueTypeInfo !== void 0 && v.valueTypeInfo !== null && (!isNSTypeInfo(v.valueTypeInfo) || v.valueTypeInfo.type !== 7 /* Class */)) {
     return false;
   }
@@ -4541,14 +4581,21 @@ function isMemberListBase(value) {
 }
 function isMemberList(value) {
   if (!isMemberListBase(value)) return false;
-  if (!isWithId(value)) return false;
   return isWithId(value);
 }
+function isMemberSet(value) {
+  if (!isMemberSetBase(value)) return false;
+  return isWithId(value);
+}
+function isMemberEntryCollection(value) {
+  return isMemberList(value) || isMemberSet(value);
+}
 function listKindOf(member) {
+  if (member.kind === 28 /* Set */) return 0 /* Ordered */;
   return member.listKind ?? 0 /* Ordered */;
 }
 function isMemberWithEntries(value) {
-  return isMemberListBase(value) || isMemberDictionaryBase(value);
+  return isMemberEntryCollectionBase(value) || isMemberDictionaryBase(value);
 }
 function isMemberClassBase(value) {
   const v = asMemberBaseForKind(value, 7 /* Class */);
@@ -5075,7 +5122,7 @@ function isMemberBase(value) {
   if (payload !== void 0 && v?.kind !== 7 /* Class */ && v?.kind !== 21 /* Generic */) {
     return false;
   }
-  const matchesConcreteType = isMemberNullBase(value) || isMemberBoolBase(value) || isMemberIntBase(value) || isMemberStringBase(value) || isMemberFloatBase(value) || isMemberDictionaryBase(value) || isMemberListBase(value) || isMemberClassBase(value) || isMemberEnumBase(value) || isMemberLookupBase(value) || isMemberDialogueLookupBase(value) || isMemberNSPropertyBase(value) || isMemberNSPropertyContractBase(value) || isMemberSpriteBase(value) || isMemberAudioBase(value) || isMemberFunctionBase(value) || isMemberNSFunctionBase(value) || isMemberNSFunction(value) || isMemberDelegateBase(value) || isMemberActionBase(value) || isMemberFunctionRefBase(value) || isMemberVariantBase(value) || isMemberVector2Base(value) || isMemberVector2IntBase(value) || isMemberVector3Base(value) || isMemberVector3IntBase(value) || isMemberColorBase(value) || isMemberDecimalBase(value) || isMemberGenericBase(value);
+  const matchesConcreteType = isMemberNullBase(value) || isMemberBoolBase(value) || isMemberIntBase(value) || isMemberStringBase(value) || isMemberFloatBase(value) || isMemberDictionaryBase(value) || isMemberListBase(value) || isMemberSetBase(value) || isMemberClassBase(value) || isMemberEnumBase(value) || isMemberLookupBase(value) || isMemberDialogueLookupBase(value) || isMemberNSPropertyBase(value) || isMemberNSPropertyContractBase(value) || isMemberSpriteBase(value) || isMemberAudioBase(value) || isMemberFunctionBase(value) || isMemberNSFunctionBase(value) || isMemberNSFunction(value) || isMemberDelegateBase(value) || isMemberActionBase(value) || isMemberFunctionRefBase(value) || isMemberVariantBase(value) || isMemberVector2Base(value) || isMemberVector2IntBase(value) || isMemberVector3Base(value) || isMemberVector3IntBase(value) || isMemberColorBase(value) || isMemberDecimalBase(value) || isMemberGenericBase(value);
   if (!matchesConcreteType) return false;
   if (!isValidDocsText(v?.docsText)) return false;
   if (typeof v?.name !== "string") return false;
@@ -5487,7 +5534,7 @@ var ProjectSchemaIndex = class {
     for (const member of source.members) {
       this.membersById.set(member.id, member);
       append(this.membersByName, member.name, member);
-      if (isMemberList(member) || isMemberDictionary(member)) {
+      if (isMemberEntryCollection(member) || isMemberDictionary(member)) {
         append(
           this.containerMemberIdsByEntryId,
           member.entryMemberId,
@@ -8632,12 +8679,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) {
@@ -8649,6 +8690,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]);
@@ -8664,7 +8709,6 @@ function resolveInstanceEnv(effectiveClassId, classArguments2, classes) {
       targetParamId = target.paramId;
     }
   }
-  return env;
 }
 function firstUnboundParamId(env) {
   for (const entry of env.values()) {
@@ -8978,9 +9022,9 @@ function openBindingTypeInfo(member, env, classes, members) {
       ...Object.keys(typeArguments).length === 0 ? {} : { typeArguments }
     };
   }
-  if (isMemberListBase(resolved)) {
+  if (isMemberEntryCollectionBase(resolved)) {
     return {
-      type: 6 /* List */,
+      type: resolved.kind,
       required,
       entryTypeInfo: nested(resolved.entryMemberId)
     };
@@ -9006,7 +9050,7 @@ function callableBindingMember(memberId, slotName, members) {
 }
 function mapGenericTypeInfo(typeInfo, close) {
   if (typeInfo.type === 21 /* Generic */) return close(typeInfo);
-  if (typeInfo.type === 6 /* List */ || typeInfo.type === 5 /* Dictionary */ || typeInfo.type === 9 /* Lookup */) {
+  if (typeInfo.type === 6 /* List */ || typeInfo.type === 28 /* Set */ || typeInfo.type === 5 /* Dictionary */ || typeInfo.type === 9 /* Lookup */) {
     return {
       ...typeInfo,
       entryTypeInfo: mapGenericTypeInfo(typeInfo.entryTypeInfo, close)
@@ -9089,6 +9133,14 @@ function typeInfoFromArgumentSignature(signature) {
       entryTypeInfo: typeInfoFromArgumentSignature(listSignature.entry)
     };
   }
+  if (signature.type === 28 /* Set */) {
+    const setSignature = signature;
+    return {
+      type: 28 /* Set */,
+      required: setSignature.required,
+      entryTypeInfo: typeInfoFromArgumentSignature(setSignature.entry)
+    };
+  }
   if (signature.type === 5 /* Dictionary */) {
     const dictionarySignature = signature;
     return {
@@ -9098,10 +9150,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;
@@ -9182,6 +9237,13 @@ function typeArgumentSignatureOfMember(member, env, members, seen = /* @__PURE__
       entry: entrySignature(resolved.entryMemberId, env, members, seen)
     };
   }
+  if (isMemberSetBase(resolved)) {
+    return {
+      type: 28 /* Set */,
+      required,
+      entry: entrySignature(resolved.entryMemberId, env, members, seen)
+    };
+  }
   if (isMemberDictionaryBase(resolved)) {
     return {
       type: 5 /* Dictionary */,
@@ -9191,6 +9253,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 */,
@@ -9271,6 +9347,11 @@ function signaturesEqual(a, b) {
     if (al.listKind !== bl.listKind) return false;
     return signaturesEqual(al.entry, bl.entry);
   }
+  if (a.type === 28 /* Set */ && b.type === 28 /* Set */) {
+    const as = a;
+    const bs = b;
+    return signaturesEqual(as.entry, bs.entry);
+  }
   if (a.type === 5 /* Dictionary */ && b.type === 5 /* Dictionary */) {
     const ad = a;
     const bd = b;
@@ -9278,6 +9359,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) {
@@ -9628,7 +9715,7 @@ function valueSettlesConstruction(member, body, context, path, storedRow = false
   const value = body.value;
   if (value == null) return !isRequiredMember(member);
   const isClass = isMemberClassBase(member);
-  const isCollection = isMemberListBase(member) || isMemberDictionaryBase(member);
+  const isCollection = isMemberWithEntries(member);
   if (!isClass && !isCollection) return true;
   if (isClass && member.payload === 1 /* Partial */) return true;
   if (typeof value !== "object") return false;
@@ -9732,6 +9819,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 = {};
@@ -9756,8 +9851,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] = {
@@ -9798,6 +9895,40 @@ var UNITY_TEXTURE_2D_OVERRIDE_PATHS = /* @__PURE__ */ new Set([
   "compressionQuality",
   "crunchedCompression",
   "platformSettings",
+  "platformSettings.default.maxTextureSize",
+  "platformSettings.default.resizeAlgorithm",
+  "platformSettings.default.format",
+  "platformSettings.default.textureCompression",
+  "platformSettings.default.crunchedCompression",
+  "platformSettings.default.compressionQuality",
+  "platformSettings.standalone.override",
+  "platformSettings.standalone.maxTextureSize",
+  "platformSettings.standalone.resizeAlgorithm",
+  "platformSettings.standalone.format",
+  "platformSettings.standalone.textureCompression",
+  "platformSettings.standalone.crunchedCompression",
+  "platformSettings.standalone.compressionQuality",
+  "platformSettings.web.override",
+  "platformSettings.web.maxTextureSize",
+  "platformSettings.web.resizeAlgorithm",
+  "platformSettings.web.format",
+  "platformSettings.web.textureCompression",
+  "platformSettings.web.crunchedCompression",
+  "platformSettings.web.compressionQuality",
+  "spriteSettings.pivotAlignment",
+  "spriteSettings.pivot.x",
+  "spriteSettings.pivot.y",
+  "spriteSettings.generatePhysicsShape",
+  "normalMapSettings.createFromGrayscale",
+  "normalMapSettings.bumpiness",
+  "normalMapSettings.filtering",
+  "normalMapSettings.flipGreenChannel",
+  "cookieSettings.lightType",
+  "singleChannelSettings.component",
+  "swizzle.r",
+  "swizzle.g",
+  "swizzle.b",
+  "swizzle.a",
   "spriteSettings",
   "spriteSettings.spriteMode",
   "spriteSettings.pixelsPerUnit",
@@ -10706,7 +10837,7 @@ function storedLeafFieldIssueMessage(issue) {
 }
 function* storedValueChildEntries(args) {
   const entryMemberId = args.member.entryMemberId;
-  if (args.member.kind === 6 /* List */ && typeof entryMemberId === "string") {
+  if ((args.member.kind === 6 /* List */ || args.member.kind === 28 /* Set */) && typeof entryMemberId === "string") {
     const ids = args.member.listKind === 1 /* Unordered */ && args.unorderedValueIds !== void 0 ? args.unorderedValueIds : Array.isArray(args.body) ? args.body : [];
     let pathIndex = 0;
     for (const valueId of ids) {
@@ -10954,7 +11085,7 @@ function isConstantMember(document2, resolved, reads) {
   if (fixedness === 0 /* Writable */) return false;
   const declared = resolved.defaultValue;
   if (declared == null) return false;
-  if (fixedness === 1 /* ReadOnly */ && (isMemberListBase(resolved) || isMemberDictionaryBase(resolved)))
+  if (fixedness === 1 /* ReadOnly */ && isMemberWithEntries(resolved))
     return false;
   return !declarationVaries(
     {
@@ -11035,7 +11166,7 @@ function declarationVaries(walk, member, body, rowId, scope) {
     }
     return owned !== Object.keys(value).length;
   }
-  if (isMemberListBase(member)) {
+  if (isMemberEntryCollectionBase(member)) {
     if (rowId !== null && listKindOf(member) === 1 /* Unordered */)
       walk.reads?.containerIds.add(rowId);
     const entryIds = listKindOf(member) !== 1 /* Unordered */ ? value : rowId === null ? [] : document2.unorderedListEntryIds?.(rowId) ?? (walk.membership ??= buildUnorderedListMembershipIndex(
@@ -11088,7 +11219,7 @@ function typeHoldsWritable(walk, member, fixedness) {
     }
     return false;
   }
-  if (isMemberListBase(member) || isMemberDictionaryBase(member)) {
+  if (isMemberWithEntries(member)) {
     const entryMember = resolvedInDocument(
       walk.document,
       findMemberInDocument(walk.document, member.entryMemberId)
@@ -11435,7 +11566,7 @@ function buildDefaultMemberValueCore(args, resolvedMember) {
     recordStorageKeyDeclaration(args.storageKeyDeclarations, value2.id, member);
     return value2;
   }
-  if (isMemberListBase(member)) {
+  if (isMemberEntryCollectionBase(member)) {
     const list = cloneDefaultListRecord({
       document: args.document,
       projectId: args.projectId,
@@ -11903,7 +12034,7 @@ function cloneDefaultValueForMemberCore(args, sourceValue) {
       value: record4,
       classId: effectiveClassId !== member.classId || sourceValue.constructorArgs != null || anchorsParentClassPartition ? effectiveClassId : void 0
     };
-  } else if (isMemberListBase(member)) {
+  } else if (isMemberEntryCollectionBase(member)) {
     body = cloneDefaultListRecord({
       document: args.document,
       projectId: args.projectId,
@@ -11944,7 +12075,7 @@ function cloneDefaultValueForMemberCore(args, sourceValue) {
   value.sourceValueId = sourceValue.sourceValueId ?? sourceValue.id;
   if (sourceValue.genericBindings != null) {
     value.genericBindings = { ...sourceValue.genericBindings };
-  } else if (isMemberListBase(member) || isMemberDictionaryBase(member)) {
+  } else if (isMemberWithEntries(member)) {
     stampGenericBindings(value, member, args);
   }
   args.createdValues.push(value);
@@ -12320,12 +12451,12 @@ function validateListIndexDefinitions(ctx, listMember) {
   let list;
   try {
     const resolved = resolveMember(listMember, ctx.members);
-    if (!isMemberListBase(resolved)) return errors;
+    if (!isMemberEntryCollectionBase(resolved)) return errors;
     list = resolved;
   } catch (error) {
     errors.push({
       memberId: listMember.id,
-      message: `List member "${listMember.name}" (${listMember.id}) cannot resolve its inheritance chain: ${errorMessage(error)}.`
+      message: `${MemberKind[listMember.kind]} member "${listMember.name}" (${listMember.id}) cannot resolve its inheritance chain: ${errorMessage(error)}.`
     });
     return errors;
   }
@@ -12337,7 +12468,7 @@ function validateListIndexDefinitions(ctx, listMember) {
   if (entryRecord === void 0) {
     errors.push({
       memberId: listMember.id,
-      message: `Indexed List member "${listMember.name}" (${listMember.id}) references missing entry member "${list.entryMemberId}".`
+      message: `Indexed ${MemberKind[listMember.kind]} member "${listMember.name}" (${listMember.id}) references missing entry member "${list.entryMemberId}".`
     });
     return errors;
   }
@@ -12347,14 +12478,14 @@ function validateListIndexDefinitions(ctx, listMember) {
   } catch (error) {
     errors.push({
       memberId: listMember.id,
-      message: `Indexed List member "${listMember.name}" (${listMember.id}) cannot resolve entry member "${list.entryMemberId}": ${errorMessage(error)}.`
+      message: `Indexed ${MemberKind[listMember.kind]} member "${listMember.name}" (${listMember.id}) cannot resolve entry member "${list.entryMemberId}": ${errorMessage(error)}.`
     });
     return errors;
   }
   if (!isMemberClassBase(entry)) {
     errors.push({
       memberId: listMember.id,
-      message: `Indexed List member "${listMember.name}" (${listMember.id}) must have a Class entry member; "${entry.name}" has kind ${MemberKind[entry.kind]}.`
+      message: `Indexed ${MemberKind[listMember.kind]} member "${listMember.name}" (${listMember.id}) must have a Class entry member; "${entry.name}" has kind ${MemberKind[entry.kind]}.`
     });
     return errors;
   }
@@ -12364,7 +12495,7 @@ function validateListIndexDefinitions(ctx, listMember) {
   if (entryClass === void 0) {
     errors.push({
       memberId: listMember.id,
-      message: `Indexed List member "${listMember.name}" (${listMember.id}) references missing entry class "${entry.classId}".`
+      message: `Indexed ${MemberKind[listMember.kind]} member "${listMember.name}" (${listMember.id}) references missing entry class "${entry.classId}".`
     });
     return errors;
   }
@@ -12387,7 +12518,7 @@ function validateListIndexDefinitions(ctx, listMember) {
         errors.push({
           memberId: listMember.id,
           schemaKey: definition.schemaKey,
-          message: `List index "${definition.schemaKey}" on "${listMember.name}" (${listMember.id}) does not resolve on entry class "${runtimeClass.name}" (${runtimeClass.id}).`
+          message: `${MemberKind[listMember.kind]} index "${definition.schemaKey}" on "${listMember.name}" (${listMember.id}) does not resolve on entry class "${runtimeClass.name}" (${runtimeClass.id}).`
         });
         continue;
       }
@@ -12396,7 +12527,7 @@ function validateListIndexDefinitions(ctx, listMember) {
         errors.push({
           memberId: listMember.id,
           schemaKey: definition.schemaKey,
-          message: `List index "${definition.schemaKey}" on "${listMember.name}" (${listMember.id}) is invalid for entry class "${runtimeClass.name}" (${runtimeClass.id}): ${domain.error}.`
+          message: `${MemberKind[listMember.kind]} index "${definition.schemaKey}" on "${listMember.name}" (${listMember.id}) is invalid for entry class "${runtimeClass.name}" (${runtimeClass.id}): ${domain.error}.`
         });
         continue;
       }
@@ -12408,7 +12539,7 @@ function validateListIndexDefinitions(ctx, listMember) {
         errors.push({
           memberId: listMember.id,
           schemaKey: definition.schemaKey,
-          message: `List index "${definition.schemaKey}" on "${listMember.name}" (${listMember.id}) changes key domain on entry subclass "${runtimeClass.name}" (${runtimeClass.id}); every runtime subclass must resolve the same String or Enum domain.`
+          message: `${MemberKind[listMember.kind]} index "${definition.schemaKey}" on "${listMember.name}" (${listMember.id}) changes key domain on entry subclass "${runtimeClass.name}" (${runtimeClass.id}); every runtime subclass must resolve the same String or Enum domain.`
         });
       }
     }
@@ -12419,7 +12550,7 @@ function resolveListIndexDefinitions(ctx, listMember) {
   const errors = validateListIndexDefinitions(ctx, listMember);
   if (errors.length > 0) throw new Error(errors[0].message);
   const list = resolveMember(listMember, ctx.members);
-  if (!isMemberListBase(list)) return [];
+  if (!isMemberEntryCollectionBase(list)) return [];
   const entryRecord = ctx.members.find(
     (member) => member.id === list.entryMemberId
   );
@@ -12439,7 +12570,7 @@ function resolveListIndexDefinitions(ctx, listMember) {
     );
     if (field === null) {
       throw new Error(
-        `Validated List index "${definition.schemaKey}" no longer resolves on entry class "${entryClass.name}".`
+        `Validated ${MemberKind[list.kind]} index "${definition.schemaKey}" no longer resolves on entry class "${entryClass.name}".`
       );
     }
     const domain = classifyIndexKeyDomain(field.member, ctx.enums);
@@ -12765,7 +12896,7 @@ var EffectiveStorageResolver = class {
         }
         continue;
       }
-      if (member.kind === 6 /* List */ || member.kind === 5 /* Dictionary */) {
+      if (member.kind === 6 /* List */ || member.kind === 28 /* Set */ || member.kind === 5 /* Dictionary */) {
         const entryId = this.resolvedEntryMemberId(member.id);
         if (entryId !== void 0) addEdge(entryId, member.id);
       }
@@ -12915,7 +13046,7 @@ function compiledConstructionTypeMembers(members, bodies, projectId) {
       requirement: type.required ? 1 /* Required */ : 0 /* Optional */
     };
     const fields = (() => {
-      if (type.type === 6 /* List */ || type.type === 5 /* Dictionary */) {
+      if (type.type === 6 /* List */ || type.type === 28 /* Set */ || type.type === 5 /* Dictionary */) {
         const entryMemberId = intern(type.entryTypeInfo);
         if (entryMemberId === null) return null;
         return {
@@ -12943,10 +13074,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 {
@@ -12977,6 +13108,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");
@@ -13175,6 +13312,9 @@ function createCanonicalMemberResolver(parentOf) {
     return canonical;
   };
 }
+function indexedCollectionMemberId(type) {
+  return type.kind === "list" ? type.listMemberId : type.setMemberId;
+}
 function isNeoScriptConstructionDocumentKind(kind) {
   if (kind === "initializer") return true;
   if (kind === "initializerExpression") return true;
@@ -13362,7 +13502,7 @@ function buildNeoScriptConstructorSignature(classId, members, memberDescriptor)
 }
 function buildNeoScriptConstructionSignatures(classId, members, memberDescriptor, immutableOnly) {
   const descriptors = /* @__PURE__ */ new Map();
-  const describe = (memberId) => {
+  const describe2 = (memberId) => {
     let descriptor = descriptors.get(memberId);
     if (descriptor === void 0) {
       descriptor = memberDescriptor(memberId);
@@ -13370,7 +13510,7 @@ function buildNeoScriptConstructionSignatures(classId, members, memberDescriptor
     }
     return descriptor;
   };
-  const replay = buildNeoScriptConstructorSignature(classId, members, describe);
+  const replay = buildNeoScriptConstructorSignature(classId, members, describe2);
   if (immutableOnly) {
     return {
       storedConstructionReplaySignature: replay,
@@ -13397,7 +13537,7 @@ function buildNeoScriptConstructionSignatures(classId, members, memberDescriptor
       classId,
       members,
       (memberId) => {
-        const descriptor = describe(memberId);
+        const descriptor = describe2(memberId);
         return descriptor?.immutable === true ? null : descriptor;
       }
     ),
@@ -13923,6 +14063,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?.();
@@ -13937,9 +14203,9 @@ function visitTypedAggregateRowReferences(value, rawType, visitor) {
       visitor.visitLookup?.(item.value, type);
     else if (type.type === 7 /* Class */ || type.type === 22 /* Interface */) {
       if (typeof item.value === "string") visitor.visit(item.value, type);
-    } else if (type.type === 6 /* List */ || type.type === 5 /* Dictionary */) {
+    } else if (type.type === 6 /* List */ || type.type === 28 /* Set */ || type.type === 5 /* Dictionary */) {
       if (typeof item.value === "string") visitor.visit(item.value, type);
-      else if (typeof item.value === "object" && item.value !== null && (type.type === 6 /* List */ ? Array.isArray(item.value) : !Array.isArray(item.value))) {
+      else if (typeof item.value === "object" && item.value !== null && (type.type === 5 /* Dictionary */ ? !Array.isArray(item.value) : Array.isArray(item.value))) {
         for (const value2 of Object.values(item.value)) {
           visitor.beforeVisit?.();
           pending.push({ value: value2, type: type.entryTypeInfo });
@@ -13949,6 +14215,145 @@ function visitTypedAggregateRowReferences(value, rawType, visitor) {
   }
 }
 
+// ../packages/neoscript-language/src/set-elements.ts
+var SET_ELEMENT_NULLABLE_ERROR = "`Set` elements can't be nullable.";
+var SET_ELEMENT_COLLECTION_ERROR = "`Set` elements can't be collections.";
+function setElementKindError(noun) {
+  return `\`Set\` elements can't be ${noun}.`;
+}
+
+// ../packages/models/src/members/set-entry-keys.ts
+var SET_ENTRY_MEMBER_KINDS = /* @__PURE__ */ new Set([
+  1 /* Bool */,
+  2 /* Int */,
+  4 /* Float */,
+  20 /* Decimal */,
+  3 /* String */,
+  14 /* Vector2 */,
+  15 /* Vector2Int */,
+  16 /* Vector3 */,
+  17 /* Vector3Int */,
+  19 /* Color */,
+  11 /* Sprite */,
+  12 /* Audio */,
+  7 /* Class */,
+  21 /* Generic */
+]);
+function setEntryKey(entryMember, entry) {
+  const value = entry.value;
+  switch (entryMember.kind) {
+    case 7 /* Class */:
+      return entry.id;
+    case 1 /* Bool */:
+      return String(requireBoolean(value, entryMember));
+    case 2 /* Int */:
+      return String(requireNumber(value, entryMember));
+    case 4 /* Float */:
+      return float32Key(requireNumber(value, entryMember));
+    case 20 /* Decimal */:
+      return decimalKey(requireString(value, entryMember));
+    case 3 /* String */:
+      if (isLocalizedStringMember(entryMember)) {
+        throw new Error(
+          `setEntryKey: "${entryMember.name}" is a localized string; Set<string> elements must be @settings(format: .Plain).`
+        );
+      }
+      return requireString(value, entryMember);
+    case 8 /* Enum */:
+      return requireStringArray(value, entryMember).join(",");
+    case 14 /* Vector2 */:
+      return componentsKey(value, ["x", "y"], float32Key, entryMember);
+    case 15 /* Vector2Int */:
+      return componentsKey(value, ["x", "y"], String, entryMember);
+    case 16 /* Vector3 */:
+      return componentsKey(value, ["x", "y", "z"], float32Key, entryMember);
+    case 17 /* Vector3Int */:
+      return componentsKey(value, ["x", "y", "z"], String, entryMember);
+    case 19 /* Color */:
+      return componentsKey(
+        value,
+        ["r", "g", "b", "a"],
+        float32Key,
+        entryMember
+      );
+    case 11 /* Sprite */: {
+      const sprite = requireRecord(value, entryMember);
+      return `${String(sprite.fileId)}:${String(sprite.sliceIndex)}`;
+    }
+    case 12 /* Audio */:
+      return String(requireRecord(value, entryMember).fileId);
+    default:
+      throw new Error(
+        `setEntryKey: "${entryMember.name}" has kind ${MemberKind[entryMember.kind]}, which is not a Set element kind.`
+      );
+  }
+}
+var FLOAT32_VIEW = new DataView(new ArrayBuffer(4));
+function float32Key(value) {
+  FLOAT32_VIEW.setFloat32(0, value === 0 ? 0 : value);
+  return String(FLOAT32_VIEW.getInt32(0));
+}
+function decimalKey(value) {
+  let text = value;
+  if (text.includes(".")) text = text.replace(/\.?0+$/, "");
+  return text === "-0" ? "0" : text;
+}
+function componentsKey(value, components2, encode, entryMember) {
+  const record4 = requireRecord(value, entryMember);
+  const parts = [];
+  for (const component of components2) {
+    const part = record4[component];
+    if (typeof part !== "number") {
+      throw new Error(
+        `setEntryKey: "${entryMember.name}" entry is missing numeric component "${component}".`
+      );
+    }
+    parts.push(encode(part));
+  }
+  return parts.join(",");
+}
+function requireBoolean(value, entryMember) {
+  if (typeof value === "boolean") return value;
+  throw entryTypeError(value, "a boolean", entryMember);
+}
+function requireNumber(value, entryMember) {
+  if (typeof value === "number") return value;
+  throw entryTypeError(value, "a number", entryMember);
+}
+function requireString(value, entryMember) {
+  if (typeof value === "string") return value;
+  throw entryTypeError(value, "a string", entryMember);
+}
+function requireRecord(value, entryMember) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    throw entryTypeError(value, "an object", entryMember);
+  }
+  return value;
+}
+function requireStringArray(value, entryMember) {
+  if (!Array.isArray(value)) {
+    throw entryTypeError(value, "an option id array", entryMember);
+  }
+  for (const optionId of value) {
+    if (typeof optionId !== "string") {
+      throw new Error(
+        `setEntryKey: "${entryMember.name}" entry option ids must be strings; got ${describe(optionId)}.`
+      );
+    }
+  }
+  return value;
+}
+function entryTypeError(value, expected, entryMember) {
+  return new Error(
+    `setEntryKey: "${entryMember.name}" entry must be ${expected}; got ${describe(value)}.`
+  );
+}
+function describe(value) {
+  if (value === null) return "null";
+  if (Array.isArray(value)) return "an array";
+  return typeof value;
+}
+
 // ../packages/neoscript-runtime/src/neoscript/initializer-dependencies.ts
 var PendingInitializerDependency = class extends NSGetterRuntimeError {
   constructor(valueId) {
@@ -14013,15 +14418,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;
@@ -14165,7 +14567,7 @@ function resolveOwnerMembersForValues(document2, targetValueIds, additionalRoots
       }
       return;
     }
-    if (isMemberListBase(member)) {
+    if (isMemberEntryCollectionBase(member)) {
       const entryMemberRecord = membersById.get(member.entryMemberId);
       if (entryMemberRecord === void 0) return;
       const entryEnv = overlayStamp(ambientEnv, body.genericBindings);
@@ -17224,9 +17626,8 @@ function exportInitializerCollections(created, writes, ctx) {
     if (!candidates.has(row.id)) return row;
     const member = memberForValueRow(row, ctx);
     if (member === null) return row;
-    if (!isMemberListBase(member) && !isMemberDictionaryBase(member))
-      return row;
-    if (isMemberListBase(member) && listKindOf(member) === 1 /* Unordered */) {
+    if (!isMemberWithEntries(member)) return row;
+    if (isMemberEntryCollectionBase(member) && listKindOf(member) === 1 /* Unordered */) {
       return { ...row, value: [] };
     }
     if (!assignedValues.has(row.value)) return row;
@@ -17353,7 +17754,7 @@ function evaluateNSGetterWithEffects(getter, ctx, argumentValues = [], options =
         result.value = coerceDecimalOperand(result.value, "return");
       }
       const initializerResult = options.initializerResult;
-      if (initializerResult !== void 0 && result.value !== null && (isMemberListBase(initializerResult.member) || isMemberDictionaryBase(initializerResult.member)) && findKnownRowIdByValueReference(result.value, runtimeCtx) === null) {
+      if (initializerResult !== void 0 && result.value !== null && isMemberWithEntries(initializerResult.member) && findKnownRowIdByValueReference(result.value, runtimeCtx) === null) {
         const createdValues = createdSessionValuesSince(runtimeCtx, creationCheckpoint);
         const declarations = /* @__PURE__ */ new Map();
         const root = materializeConstructorArgumentValue({
@@ -17521,6 +17922,7 @@ function getterSubscriptionsFor(ctx) {
 function withEvaluationRuntime(ctx, writes) {
   if (ctx.__runtimeSessionValues !== void 0 && ctx.__executionState !== void 0 && ctx.__valueOverlay !== void 0) {
     ctx.__unorderedListProjections ??= createUnorderedListProjectionCache();
+    ctx.__setEntryIndexes ??= /* @__PURE__ */ new WeakMap();
     ctx.__runtimeClassOverrides ??= /* @__PURE__ */ new Map();
     ctx.__getterSubscriptions ??= getterSubscriptionsFor(ctx);
     return ctx;
@@ -17554,6 +17956,7 @@ function withEvaluationRuntime(ctx, writes) {
     __sessionStaticBindings: ctx.__sessionStaticBindings ?? staticBindingMap(ctx.sessionStaticBindings),
     __valueOverlay: overlay,
     __unorderedListProjections: ctx.__unorderedListProjections ?? createUnorderedListProjectionCache(),
+    __setEntryIndexes: ctx.__setEntryIndexes ?? /* @__PURE__ */ new WeakMap(),
     __runtimeReferenceRemap: referenceRemap,
     __executionState: ctx.__executionState ?? {
       writes,
@@ -17642,7 +18045,7 @@ function ownedConstructorArgumentValues(row, ctx, readRow) {
   const constructor = evaluatorSchemaIndex(ctx).constructorRecord(constructorId);
   if (constructor === void 0 || constructor.classId !== classId) return [];
   if (!constructor.argumentTypes.some(
-    (typeInfo) => typeInfo.type === 7 /* Class */ || typeInfo.type === 22 /* Interface */ || typeInfo.type === 6 /* List */ || typeInfo.type === 5 /* Dictionary */ || typeInfo.type === 21 /* Generic */
+    (typeInfo) => typeInfo.type === 7 /* Class */ || typeInfo.type === 22 /* Interface */ || typeInfo.type === 6 /* List */ || typeInfo.type === 28 /* Set */ || typeInfo.type === 5 /* Dictionary */ || typeInfo.type === 21 /* Generic */
   ))
     return [];
   let genericEnv = /* @__PURE__ */ new Map();
@@ -17815,7 +18218,7 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
       if (groupByRowId.has(argumentId)) scanOwnedRow(argumentId);
       const argumentRow = rowForCleanup(argumentId);
       if (argumentRow === null) return;
-      if (typeInfo.type === 6 /* List */) {
+      if (typeInfo.type === 6 /* List */ || typeInfo.type === 28 /* Set */) {
         if (Array.isArray(argumentRow.value)) {
           for (const childId of argumentRow.value) {
             if (typeof childId === "string") {
@@ -17886,7 +18289,7 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
       }
       return;
     }
-    if (member !== null && isMemberListBase(member)) {
+    if (member !== null && isMemberEntryCollectionBase(member)) {
       const entryMember = evalMemberById(ctx.vm, member.entryMemberId);
       if (listKindOf(member) === 1 /* Unordered */) {
         ctx.onUnattributableValueRead?.(containerEntriesRead(row.id));
@@ -17925,7 +18328,7 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
       scannedReturnReferences.add(value);
     }
     if (typeInfo === void 0) return;
-    if (typeInfo.type === 6 /* List */ && Array.isArray(value)) {
+    if ((typeInfo.type === 6 /* List */ || typeInfo.type === 28 /* Set */) && Array.isArray(value)) {
       for (const entry of value) {
         scanReturnedValue(entry, typeInfo.entryTypeInfo);
       }
@@ -18707,7 +19110,7 @@ function evalInstructions(instructions, scope, ctx, options) {
               collectionValueId: member.collectionValueId
             };
           }
-          const assignedReferenceValueId = targetTypeInfo.type === 7 /* Class */ || targetTypeInfo.type === 6 /* List */ || targetTypeInfo.type === 5 /* Dictionary */ ? findKnownRowIdByValueReference(value, ctx) : null;
+          const assignedReferenceValueId = targetTypeInfo.type === 7 /* Class */ || targetTypeInfo.type === 6 /* List */ || targetTypeInfo.type === 28 /* Set */ || targetTypeInfo.type === 5 /* Dictionary */ ? findKnownRowIdByValueReference(value, ctx) : null;
           if (!bindOmittedConstantSlot(destination, member, value, ctx)) {
             applyOverlayAssignment(
               ins.target.pointer,
@@ -18718,7 +19121,7 @@ function evalInstructions(instructions, scope, ctx, options) {
               destination
             );
           }
-          const unorderedReplacement = assignedReferenceValueId === null && member !== null && isMemberListBase(member) && listKindOf(member) === 1 /* Unordered */ && Array.isArray(value) ? unorderedReplacementProjection(
+          const unorderedReplacement = assignedReferenceValueId === null && member !== null && isMemberEntryCollectionBase(member) && listKindOf(member) === 1 /* Unordered */ && Array.isArray(value) ? unorderedReplacementProjection(
             ins.target.pointer,
             destination,
             scope,
@@ -18728,7 +19131,7 @@ function evalInstructions(instructions, scope, ctx, options) {
             kind: "assign",
             target: targetTypeInfo === ins.target.typeInfo ? ins.target : { ...ins.target, typeInfo: targetTypeInfo },
             value: unorderedReplacement ?? value,
-            ...targetTypeInfo.type === 7 /* Class */ || targetTypeInfo.type === 6 /* List */ || targetTypeInfo.type === 5 /* Dictionary */ ? {
+            ...targetTypeInfo.type === 7 /* Class */ || targetTypeInfo.type === 6 /* List */ || targetTypeInfo.type === 28 /* Set */ || targetTypeInfo.type === 5 /* Dictionary */ ? {
               valueId: value === null || value === void 0 ? void 0 : assignedReferenceValueId ?? void 0
             } : {},
             ...resolvedDestinationFieldsForAssign(
@@ -19018,7 +19421,7 @@ function resolveNeoScriptChangeListenerSlot(ownerId, memberId, ctx) {
     return null;
   if (resolved.kind === 26 /* NSAction */ || resolved.kind === 25 /* NSDelegate */)
     return null;
-  const needsGenericEnv = resolved.kind === 21 /* Generic */ || resolved.kind === 7 /* Class */ || resolved.kind === 6 /* List */ || resolved.kind === 5 /* Dictionary */ || resolved.kind === 9 /* Lookup */ || resolved.kind === 27 /* Variant */;
+  const needsGenericEnv = resolved.kind === 21 /* Generic */ || resolved.kind === 7 /* Class */ || resolved.kind === 6 /* List */ || resolved.kind === 28 /* Set */ || resolved.kind === 5 /* Dictionary */ || resolved.kind === 9 /* Lookup */ || resolved.kind === 27 /* Variant */;
   const env = needsGenericEnv ? runtimeGenericEnvForValueRow(owner, ctx, /* @__PURE__ */ new Set()) : /* @__PURE__ */ new Map();
   const member = substituteMember(
     raw,
@@ -19390,7 +19793,7 @@ function applyOverlayAssignment(target, targetTypeInfo, value, scope, ctx, desti
   const receiver = destination === void 0 ? evalPointer(target.keyOf.pointer, scope, ctx) : destination.receiver;
   const key = destination === void 0 ? evalPointer(target.keyOf.key, scope, ctx) : destination.key;
   assertStoredReplayMutableValue(receiver, ctx, "assignment target", key);
-  const referenceValueId = targetTypeInfo.type === 7 /* Class */ || targetTypeInfo.type === 6 /* List */ || targetTypeInfo.type === 5 /* Dictionary */ ? findKnownRowIdByValueReference(value, ctx) : null;
+  const referenceValueId = targetTypeInfo.type === 7 /* Class */ || targetTypeInfo.type === 6 /* List */ || targetTypeInfo.type === 28 /* Set */ || targetTypeInfo.type === 5 /* Dictionary */ ? findKnownRowIdByValueReference(value, ctx) : null;
   if (Array.isArray(receiver)) {
     const index = numberArg(key, "List assignment index");
     if (referenceValueId !== null) {
@@ -19495,7 +19898,7 @@ function applyOverlayStaticAssignment(memberId, value, ctx) {
   }
   const currentId = staticBindingTargetId(member, ctx);
   const resolved = resolveMember(member, ctx.vm.members);
-  const referenceAssignment = isMemberClassBase(resolved) || isMemberListBase(resolved) || isMemberDictionaryBase(resolved);
+  const referenceAssignment = isMemberClassBase(resolved) || isMemberWithEntries(resolved);
   const trackedId = findKnownRowIdByValueReference(value, ctx);
   if (referenceAssignment && trackedId !== null) {
     assertOwnedValueAttachable(
@@ -19580,8 +19983,7 @@ function bindOmittedConstantSlot(destination, member, value, ctx) {
   if (construction === void 0) return false;
   const key = String(destination.key);
   if (Object.prototype.hasOwnProperty.call(receiver, key)) return false;
-  if (isMemberClassBase(member) || isMemberListBase(member) || isMemberDictionaryBase(member))
-    return false;
+  if (isMemberClassBase(member) || isMemberWithEntries(member)) return false;
   const resolved = resolveMember(member, ctx.vm.members);
   const decision = constantMemberDecision(
     constructorDefaultValueDocument(ctx, member),
@@ -19689,7 +20091,7 @@ function resolvedDestinationFieldsForAssign(target, scope, ctx, destination) {
     receiver: container,
     key
   });
-  const assignsUnorderedList = targetMember !== null && isMemberListBase(targetMember) && listKindOf(targetMember) === 1 /* Unordered */;
+  const assignsUnorderedList = targetMember !== null && isMemberEntryCollectionBase(targetMember) && listKindOf(targetMember) === 1 /* Unordered */;
   return {
     resolvedDestination: {
       containerValueId,
@@ -19836,7 +20238,13 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
     );
   }
   const args = ins.args.map((arg) => evalPointer(arg, scope, ctx));
-  const isLookupSet = ins.target.typeInfo.type === 9 /* Lookup */;
+  const setEntryMember = mutatesLocalVariable ? null : storedSetEntryMember(targetValue, ctx);
+  const isLookupSet = setEntryMember === null && ins.target.typeInfo.type === 9 /* Lookup */;
+  const setMatch = setEntryMember !== null && Array.isArray(targetValue) && (ins.mutation === "Add" /* Add */ || ins.mutation === "Remove" /* Remove */) ? findStoredSetEntry(targetValue, args[0], setEntryMember, ctx) : null;
+  if (ins.mutation === "Add" /* Add */ && setMatch !== null) return;
+  if (ins.mutation === "Remove" /* Remove */ && setEntryMember !== null && setMatch === null) {
+    return;
+  }
   if (ins.mutation === "Add" /* Add */ || ins.mutation === "Insert" /* Insert */) {
     consumeBudget(
       ctx,
@@ -19864,6 +20272,7 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
       removedIndex2,
       ctx
     );
+    if (Array.isArray(targetValue)) ctx.__setEntryIndexes?.delete(targetValue);
     invalidateEvaluatorIndexes(ctx, targetValue);
     scope.setLocal(variablePointer.variableId, targetValue);
     return;
@@ -19871,7 +20280,15 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
   validateCollectionMutation(targetValue, ins.mutation, args);
   const overlayArgs = [...args];
   if ((ins.mutation === "Add" /* Add */ || ins.mutation === "Remove" /* Remove */) && Array.isArray(targetValue)) {
-    overlayArgs[0] = isLookupSet ? lookupSetSelectionValue(args[0], ins.target.typeInfo, ctx) : findKnownRowIdByValueReference(args[0], ctx) ?? args[0];
+    if (setMatch !== null) overlayArgs[0] = setMatch.entry;
+    else if (isLookupSet)
+      overlayArgs[0] = lookupSetSelectionValue(
+        args[0],
+        ins.target.typeInfo,
+        ctx
+      );
+    else
+      overlayArgs[0] = findKnownRowIdByValueReference(args[0], ctx) ?? args[0];
   } else if (ins.mutation === "Insert" /* Insert */) {
     overlayArgs[1] = findKnownRowIdByValueReference(args[1], ctx) ?? args[1];
   } else if (ins.mutation === "Add" /* Add */ && !Array.isArray(targetValue)) {
@@ -19932,6 +20349,15 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
       ctx
     );
   }
+  if (Array.isArray(targetValue)) {
+    syncStoredSetEntries(
+      targetValue,
+      ins.mutation,
+      setMatch,
+      setEntryMember,
+      ctx
+    );
+  }
   invalidateEvaluatorIndexes(ctx, targetValue);
   switch (ins.mutation) {
     case "Insert" /* Insert */:
@@ -19973,7 +20399,7 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
           target: ins.target,
           value: isLookupSet ? overlayArgs[0] : args[0],
           ...!isLookupSet ? {
-            valueId: findKnownRowIdByValueReference(args[0], ctx) ?? void 0
+            valueId: setMatch?.valueId ?? findKnownRowIdByValueReference(args[0], ctx) ?? void 0
           } : {},
           ...resolvedDestinationFieldsForContainer(targetValue, ctx)
         });
@@ -20003,6 +20429,78 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
       return;
   }
 }
+function storedSetEntryMember(collection, ctx) {
+  const containerId = findKnownRowIdByValueReference(collection, ctx);
+  if (containerId === null) return null;
+  const container = evalValueById(
+    ctx,
+    containerId,
+    ctx.__runtimeSessionValues,
+    ctx.__valueOverlay
+  );
+  if (container === null) return null;
+  const member = memberForValueRow(container, ctx);
+  if (member === null || member.kind !== 28 /* Set */) return null;
+  const resolved = resolveMember(member, ctx.vm.members);
+  if (!isMemberSetBase(resolved)) {
+    throw new NSGetterRuntimeError(
+      `Set member '${member.name}' is not a valid Set record.`
+    );
+  }
+  const entry = evalMemberById(ctx.vm, resolved.entryMemberId);
+  if (entry === null) {
+    throw new NSGetterRuntimeError(
+      `Set member '${member.name}' references missing entry member '${resolved.entryMemberId}'.`
+    );
+  }
+  return substituteMember(
+    entry,
+    runtimeGenericEnvForValueRow(container, ctx),
+    ctx.vm.members
+  );
+}
+function storedSetEntryMatch(raw, entryMember, ctx) {
+  const byIdentity = entryMember.kind === 7 /* Class */;
+  const row = byIdentity || typeof raw !== "string" ? null : evalValueById(ctx, raw, ctx.__runtimeSessionValues, ctx.__valueOverlay);
+  const valueId = byIdentity && typeof raw === "string" ? raw : row?.id ?? null;
+  const entry = row === null ? { id: "", value: raw } : { id: row.id, value: row.value };
+  const key = byIdentity ? valueId ?? referenceIdOf(raw, ctx) : setEntryKey(entryMember, entry);
+  return key === null ? null : { key, entry: raw, valueId };
+}
+function storedSetEntries(set, entryMember, ctx) {
+  const indexes3 = ctx.__setEntryIndexes ??= /* @__PURE__ */ new WeakMap();
+  const existing = indexes3.get(set);
+  if (existing !== void 0) return existing;
+  consumeBudget(ctx, "collectionVisits", set.length, "collection visit");
+  const entries = /* @__PURE__ */ new Map();
+  for (const raw of set) {
+    const match = storedSetEntryMatch(raw, entryMember, ctx);
+    if (match !== null && !entries.has(match.key)) {
+      entries.set(match.key, match);
+    }
+  }
+  indexes3.set(set, entries);
+  return entries;
+}
+function syncStoredSetEntries(set, mutation, removed, entryMember, ctx) {
+  const entries = ctx.__setEntryIndexes?.get(set);
+  if (entries === void 0) return;
+  if (entryMember !== null && mutation === "Add" /* Add */) {
+    const added = storedSetEntryMatch(set[set.length - 1], entryMember, ctx);
+    if (added !== null) entries.set(added.key, added);
+    return;
+  }
+  if (removed !== null && mutation === "Remove" /* Remove */) {
+    entries.delete(removed.key);
+    return;
+  }
+  ctx.__setEntryIndexes?.delete(set);
+}
+function findStoredSetEntry(set, value, entryMember, ctx) {
+  const key = entryMember.kind === 7 /* Class */ ? referenceIdOf(value, ctx) : setEntryKey(entryMember, { id: "", value });
+  if (key === null) return null;
+  return storedSetEntries(set, entryMember, ctx).get(key) ?? null;
+}
 function applyLocalCollectionMutation(targetValue, mutation, args, ctx, unique = false, resolveJoinedRemovalEntries = false, reference = false) {
   validateCollectionMutation(targetValue, mutation, args);
   switch (mutation) {
@@ -20910,17 +21408,17 @@ function invokeDelegateValue(value, args, ctx, callSiteId, ownerReceiver, result
     state.delegateStack.pop();
   }
 }
-function actionListenersOf(value, describe) {
+function actionListenersOf(value, describe2) {
   if (value === null || value === void 0) return [];
   if (!isNSActionValue(value)) {
     throw new NSGetterRuntimeError(
-      `NeoAction ${describe()} holds a value that is not a valid listener set \u2014 every entry must be a distinct member target.`
+      `NeoAction ${describe2()} holds a value that is not a valid listener set \u2014 every entry must be a distinct member target.`
     );
   }
   return value.listeners;
 }
 function storedActionListeners(member, receiver, ctx) {
-  const describe = () => `target '${member.name}'`;
+  const describe2 = () => `target '${member.name}'`;
   if (receiver !== null) {
     const schemaKey = cachedSchemaKeyForMember(member.id, ctx);
     if (schemaKey === null) {
@@ -20940,11 +21438,11 @@ function storedActionListeners(member, receiver, ctx) {
         member,
         ctx
       ),
-      describe
+      describe2
     );
   }
   if (isStaticMember(member) === true) {
-    return actionListenersOf(evalStaticMember(member.id, ctx), describe);
+    return actionListenersOf(evalStaticMember(member.id, ctx), describe2);
   }
   if (member.defaultValue === void 0 || member.defaultValue === null) {
     return [];
@@ -20954,7 +21452,7 @@ function storedActionListeners(member, receiver, ctx) {
       `NeoAction target '${member.name}' has an unevaluated initializer instead of a declaration default listener set.`
     );
   }
-  return actionListenersOf(member.defaultValue.value, describe);
+  return actionListenersOf(member.defaultValue.value, describe2);
 }
 function listenerReceiverOnOwner(memberId, ownerReceiver, ctx) {
   const schemaKey = cachedSchemaKeyForMember(memberId, ctx);
@@ -21162,7 +21660,7 @@ function typeInfoContainsGeneric(typeInfo, visited = /* @__PURE__ */ new Set())
   const nextVisited = new Set(visited);
   nextVisited.add(typeInfo);
   if (typeInfo.type === 21 /* Generic */) return true;
-  if (typeInfo.type === 6 /* List */ || typeInfo.type === 5 /* Dictionary */ || typeInfo.type === 9 /* Lookup */) {
+  if (typeInfo.type === 6 /* List */ || typeInfo.type === 28 /* Set */ || typeInfo.type === 5 /* Dictionary */ || typeInfo.type === 9 /* Lookup */) {
     return typeInfoContainsGeneric(typeInfo.entryTypeInfo, nextVisited);
   }
   if (typeInfo.type !== 7 /* Class */) return false;
@@ -21194,6 +21692,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) {
@@ -21232,7 +21731,7 @@ function genericParametersConcretelyBound(typeInfo, env) {
   if (typeInfo.type === 21 /* Generic */) {
     return env.get(typeInfo.genericParamId)?.kind === "member";
   }
-  if (typeInfo.type === 6 /* List */ || typeInfo.type === 5 /* Dictionary */ || typeInfo.type === 9 /* Lookup */) {
+  if (typeInfo.type === 6 /* List */ || typeInfo.type === 28 /* Set */ || typeInfo.type === 5 /* Dictionary */ || typeInfo.type === 9 /* Lookup */) {
     return genericParametersConcretelyBound(typeInfo.entryTypeInfo, env);
   }
   if (typeInfo.type === 25 /* NSDelegate */) {
@@ -21263,7 +21762,7 @@ function substituteRuntimeTypeInfo(typeInfo, env, ctx) {
     const boundType = runtimeTypeInfoForMember(member, env, ctx, /* @__PURE__ */ new Set());
     return { ...boundType, required: boundType.required && typeInfo.required };
   }
-  if (typeInfo.type === 6 /* List */ || typeInfo.type === 5 /* Dictionary */ || typeInfo.type === 9 /* Lookup */) {
+  if (typeInfo.type === 6 /* List */ || typeInfo.type === 28 /* Set */ || typeInfo.type === 5 /* Dictionary */ || typeInfo.type === 9 /* Lookup */) {
     return {
       ...typeInfo,
       entryTypeInfo: substituteRuntimeTypeInfo(
@@ -21363,7 +21862,7 @@ function runtimeTypeInfoForMember(rawMember, env, ctx, seen) {
       enumId: member.enumId
     };
   }
-  if (isMemberList(member) || isMemberDictionary(member)) {
+  if (isMemberList(member) || isMemberSet(member) || isMemberDictionary(member)) {
     const entryMember = evalMemberById(ctx.vm, member.entryMemberId);
     if (entryMember === null) {
       throw new NSGetterRuntimeError(
@@ -21403,7 +21902,7 @@ function runtimeTypeInfoForMember(rawMember, env, ctx, seen) {
       ctx,
       new Set(seen)
     );
-    if (collectionTypeInfo.type !== 6 /* List */ && collectionTypeInfo.type !== 5 /* Dictionary */) {
+    if (collectionTypeInfo.type !== 6 /* List */ && collectionTypeInfo.type !== 28 /* Set */ && collectionTypeInfo.type !== 5 /* Dictionary */) {
       throw new NSGetterRuntimeError(
         `Lookup binding '${member.id}' does not target a collection.`
       );
@@ -21434,6 +21933,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.`
@@ -21476,7 +21987,7 @@ function formatDebugValue(value, type, ctx) {
     );
   if (type.type === 9 /* Lookup */ && type.entryTypeInfo.type === 8 /* Enum */)
     type = type.entryTypeInfo;
-  if (value !== null && value !== void 0 && (type.type === 7 /* Class */ || type.type === 6 /* List */ || type.type === 5 /* Dictionary */ || type.type === 9 /* Lookup */)) {
+  if (value !== null && value !== void 0 && (type.type === 7 /* Class */ || type.type === 6 /* List */ || type.type === 28 /* Set */ || type.type === 5 /* Dictionary */ || type.type === 9 /* Lookup */)) {
     return formatNeoScriptDebugValue(
       formatForInterp(value, type, ctx),
       3 /* String */
@@ -21518,13 +22029,14 @@ function formatForInterp(value, sourceType, ctx) {
       const rowId = findRowIdByValueReference(value, ctx);
       return `(Class<${typeName}>, Value<${rowId}>)`;
     }
-    case 6 /* List */: {
+    case 6 /* List */:
+    case 28 /* Set */: {
       const entryName = describeRuntimeType(
         sourceType.entryTypeInfo,
         ctx
       );
       const rowId = findRowIdByValueReference(value, ctx);
-      return `(List<${entryName}>, Value<${rowId}>)`;
+      return `(${MemberKind[sourceType.type]}<${entryName}>, Value<${rowId}>)`;
     }
     case 5 /* Dictionary */: {
       const entryName = describeRuntimeType(
@@ -21586,6 +22098,8 @@ function describeRuntimeType(t, ctx) {
     }
     case 6 /* List */:
       return `List<${describeRuntimeType(t.entryTypeInfo, ctx)}>`;
+    case 28 /* Set */:
+      return `Set<${describeRuntimeType(t.entryTypeInfo, ctx)}>`;
     case 5 /* Dictionary */:
       return `Dictionary<${describeRuntimeType(t.entryTypeInfo, ctx)}>`;
     case 9 /* Lookup */:
@@ -21685,6 +22199,7 @@ function runtimeTypeCheck(value, checkType, ctx, seenCollections = /* @__PURE__
     case 18 /* DialogueLookup */:
       return Array.isArray(value) && value.length === 1 && typeof value[0] === "string";
     case 6 /* List */:
+    case 28 /* Set */:
     case 9 /* Lookup */: {
       if (!Array.isArray(value)) return false;
       if (seenCollections.has(value)) return false;
@@ -21939,8 +22454,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 };
@@ -21993,7 +22517,7 @@ function readDeclarationDefault(member, ctx) {
   if (member?.defaultValue === void 0 || member.defaultValue === null) {
     return { matched: false };
   }
-  if (isInitValueContent(member.defaultValue) || isMemberClassBase(member) || isMemberListBase(member) || isMemberDictionaryBase(member)) {
+  if (isInitValueContent(member.defaultValue) || isMemberClassBase(member) || isMemberWithEntries(member)) {
     const session = ctx.__runtimeSessionValues;
     let shared;
     if (session !== void 0) {
@@ -22122,7 +22646,7 @@ function resolveValueIfId(at2, ctx) {
   );
   if (!row) return at2;
   const member = memberForValueRow(row, ctx);
-  if (member !== null && isMemberListBase(member) && listKindOf(member) === 1 /* Unordered */ && Array.isArray(row.value)) {
+  if (member !== null && isMemberEntryCollectionBase(member) && listKindOf(member) === 1 /* Unordered */ && Array.isArray(row.value)) {
     return evaluatorUnorderedListEntryIds(row.id, ctx);
   }
   const value = member === null ? resolveLocalizedRowValue(row, ctx) : resolveLocalizedRowValueForMember(row, member, ctx);
@@ -22139,7 +22663,7 @@ function resolveValueIfIdForMember(at2, member, ctx) {
     ctx.__valueOverlay
   );
   if (!row) return at2;
-  if (isMemberListBase(member) && listKindOf(member) === 1 /* Unordered */ && Array.isArray(row.value)) {
+  if (isMemberEntryCollectionBase(member) && listKindOf(member) === 1 /* Unordered */ && Array.isArray(row.value)) {
     return evaluatorUnorderedListEntryIds(row.id, ctx);
   }
   const value = resolveLocalizedRowValueForMember(row, member, ctx);
@@ -22223,7 +22747,7 @@ function invalidateUnorderedListProjection(containerValueId, ctx) {
 function updateUnorderedListProjectionAfterAssignment(row, value, ctx) {
   invalidateUnorderedListProjection(row.id, ctx);
   const member = memberForValueRow(row, ctx);
-  if (member === null || !isMemberListBase(member) || listKindOf(member) !== 1 /* Unordered */ || !Array.isArray(value)) {
+  if (member === null || !isMemberEntryCollectionBase(member) || listKindOf(member) !== 1 /* Unordered */ || !Array.isArray(value)) {
     return;
   }
   const referenceIndexes = ctx.__unorderedListProjections?.referenceEntryIndexesByArray.get(value);
@@ -22350,10 +22874,7 @@ function resolveMemberForValueRow(row, ctx, visited) {
       ctx,
       new Set(visited)
     );
-    if (parentMember !== null && isMemberList(parentMember)) {
-      return evalMemberById(ctx.vm, parentMember.entryMemberId);
-    }
-    if (parentMember !== null && isMemberDictionary(parentMember)) {
+    if (parentMember !== null && isMemberWithEntries(parentMember)) {
       return evalMemberById(ctx.vm, parentMember.entryMemberId);
     }
     const classId = parent.classId ?? (parentMember !== null && isMemberClass(parentMember) ? parentMember.classId : void 0);
@@ -23142,16 +23663,19 @@ function evalDeclaredListIndex(info, scope, ctx) {
   const collection = evalPointer(info.collectionPointer, scope, ctx);
   if (!Array.isArray(collection)) {
     throw new NSGetterRuntimeError(
-      `List index '${info.schemaKey}' requires a present List value.`
+      `List index '${info.schemaKey}' requires a present List or Set value.`
     );
   }
   const rawMember = evalMemberById(ctx.vm, info.listMemberId);
-  if (!rawMember || !isMemberListBase(rawMember)) {
+  if (!rawMember || !isMemberEntryCollectionBase(rawMember)) {
     throw new NSGetterRuntimeError(
-      `List index contract references missing List member '${info.listMemberId}'.`
+      `List index contract references missing List or Set member '${info.listMemberId}'.`
     );
   }
-  const member = resolveMember(rawMember, ctx.vm.members);
+  const member = resolveMember(
+    rawMember,
+    ctx.vm.members
+  );
   const definition = member.indexes?.find(
     (candidate) => candidate.schemaKey === info.schemaKey
   );
@@ -23566,8 +24090,20 @@ function evalCollectionQuery(info, scope, ctx) {
   }
   let visited = 0;
   let skipping = true;
+  const seenSetKeys = /* @__PURE__ */ new Set();
   iterateCollection(collection, ctx, (entry, key, valueId) => {
     switch (info.op) {
+      case "ToSet": {
+        const setKey = toSetEntryKey(
+          entry,
+          valueId,
+          info.reference === true,
+          ctx
+        );
+        if (seenSetKeys.has(setKey)) return 0 /* Continue */;
+        seenSetKeys.add(setKey);
+        return append2(entry, key, valueId);
+      }
       case "SelectMany": {
         const inner = invoke(entry, key, valueId);
         isListCollection(inner);
@@ -23617,6 +24153,10 @@ function evalCollectionQuery(info, scope, ctx) {
   }
   return finish();
 }
+function toSetEntryKey(entry, valueId, reference, ctx) {
+  if (reference) return valueId ?? referenceIdOf(entry, ctx) ?? entry;
+  return typeof entry === "object" && entry !== null ? canonicalJsonStringify(entry) : entry;
+}
 function compareCollectionKeys(left, right, keyType) {
   if (left === null) return right === null ? 0 : -1;
   if (right === null) return 1;
@@ -23747,6 +24287,15 @@ function evalFunction(fn, scope, ctx) {
         }
         return c.includes(target);
       }
+      const setEntryMember = storedSetEntryMember(c, ctx);
+      if (setEntryMember !== null) {
+        return findStoredSetEntry(
+          listArg(c, "Set Contains receiver"),
+          target,
+          setEntryMember,
+          ctx
+        ) !== null;
+      }
       if (fn.info.reference === true) {
         return referenceIndexOf(c, target, ctx) !== null;
       }
@@ -24092,8 +24641,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 = {
@@ -24104,10 +24654,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,
@@ -24219,6 +24766,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);
@@ -24275,7 +24849,7 @@ function constructionGenericSlotsForMember(rawMember, ctx, instanceEnv, visitedM
     const classArguments2 = member.classArguments ?? {};
     return Object.keys(classArguments2).length === 0 ? [] : [{ classId: member.classId, classArguments: classArguments2 }];
   }
-  if (!isMemberListBase(member) && !isMemberDictionaryBase(member)) return [];
+  if (!isMemberWithEntries(member)) return [];
   const entryMember = evalMemberById(ctx.vm, member.entryMemberId);
   if (entryMember === null) return [];
   return constructionGenericSlotsForMember(
@@ -24445,9 +25019,8 @@ 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();
+    if (existing !== void 0 && isLiteralValueContent(existing) && !isMemberClassBase(member) && !isMemberWithEntries(member)) {
+      overwriteConstructedLiteral(existing, value, ctx);
       continue;
     }
     const materialized = materializeConstructorArgumentValue({
@@ -24462,6 +25035,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)) {
@@ -24471,9 +25052,8 @@ 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();
+  if (existing !== void 0 && isLiteralValueContent(existing) && !isMemberClassBase(member) && !isMemberWithEntries(member)) {
+    overwriteConstructedLiteral(existing, null, args.ctx);
     return;
   }
   const cleared = registerConstructorArgumentRow(
@@ -25379,9 +25959,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,
@@ -25397,6 +25979,7 @@ function evaluateInitializerInContext(init, member, ctx, createdValues, argument
       error.sourceOwnerId ??= ownerId;
     throw error;
   } finally {
+    initializerCtx.__initializerGenericEnv = previousGenericEnv;
     closeFrame();
   }
   const created = result.createdSessionValues ?? [];
@@ -25596,6 +26179,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(
@@ -25634,13 +26232,21 @@ function encodeRequiredConstructorArgument(args) {
     }
     return adoptTracked(aggregateId2, "root");
   }
-  if (args.typeInfo.type !== 6 /* List */ && args.typeInfo.type !== 5 /* Dictionary */) {
+  if (args.typeInfo.type !== 6 /* List */ && args.typeInfo.type !== 28 /* Set */ && args.typeInfo.type !== 5 /* Dictionary */) {
     return cloneConstructorLiteralValue(args.value);
   }
   if (args.value === null || args.value === void 0) return null;
   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 && isMemberWithEntries(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 });
@@ -25667,12 +26273,13 @@ function encodeRequiredConstructorArgument(args) {
       }
       return adoptTracked(id, suffix);
     }
-    if (entryType.type === 6 /* List */ || entryType.type === 5 /* Dictionary */) {
+    if (entryType.type === 6 /* List */ || entryType.type === 28 /* Set */ || entryType.type === 5 /* Dictionary */) {
       const nested = encodeRequiredConstructorArgument({
         ...args,
         value,
         typeInfo: entryType,
-        parameterId: `${args.parameterId}:${suffix}`
+        parameterId: `${args.parameterId}:${suffix}`,
+        member: entryMember
       });
       if (typeof nested !== "string") {
         throw new NSGetterRuntimeError(
@@ -25683,13 +26290,13 @@ function encodeRequiredConstructorArgument(args) {
     }
     return registerRow(cloneConstructorLiteralValue(value)).id;
   };
-  if (collectionType.type === 6 /* List */) {
+  if (collectionType.type === 6 /* List */ || collectionType.type === 28 /* Set */) {
     if (!Array.isArray(args.value)) {
       throw new NSGetterRuntimeError(
-        `Constructor argument '${args.parameterId}' must be a List.`
+        `Constructor argument '${args.parameterId}' must be a ${MemberKind[collectionType.type]}.`
       );
     }
-    const row2 = registerRow([]);
+    const row2 = registerCollectionRow([]);
     row2.value = args.value.map(
       (entry, index) => encodeEntry(entry, collectionType.entryTypeInfo, `index:${index}`)
     );
@@ -25700,7 +26307,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,
@@ -26533,6 +27140,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 === 28 /* Set */ || resolvedArgumentType.type === 5 /* Dictionary */ ? settledConstructorParameterMember(
+          classId,
+          argumentType.name,
+          record4.id,
+          ctx
+        ) : void 0,
+        genericEnv: descriptor.instanceEnv,
         ctx
       });
     }
@@ -26765,7 +27380,7 @@ function currentOwnedValueAttachments(valueId, ctx) {
       }
       continue;
     }
-    if (member !== null && isMemberListBase(member) && Array.isArray(parent.value)) {
+    if (member !== null && isMemberEntryCollectionBase(member) && Array.isArray(parent.value)) {
       for (const [index, childId] of parent.value.entries()) {
         if (childId !== valueId) continue;
         add({
@@ -26883,7 +27498,7 @@ function cloneConstructorArgumentGraph(args) {
       ...isLiteralValueContent(source) ? clonedConstructorProvenance(source) : {}
     });
     if (clonedContainerId !== void 0) clone.containerId = clonedContainerId;
-    if (isMemberListBase(member) || isMemberDictionaryBase(member)) {
+    if (isMemberWithEntries(member)) {
       const stamp = computeGenericBindingsStamp(
         member,
         genericEnv,
@@ -26987,7 +27602,7 @@ function cloneConstructorArgumentGraph(args) {
       }
       return clone;
     }
-    if (isMemberListBase(member)) {
+    if (isMemberEntryCollectionBase(member)) {
       if (source.value === null) {
         clone.value = null;
         return clone;
@@ -27063,7 +27678,7 @@ function cloneConstructorLiteralValue(value) {
 }
 function materializeConstructorArgumentValue(args) {
   const trackedValueId = findKnownRowIdByValueReference(args.value, args.ctx);
-  if (args.value === null && !isRequiredMember(args.member) && (isMemberListBase(args.member) || isMemberDictionaryBase(args.member))) {
+  if (args.value === null && !isRequiredMember(args.member) && isMemberWithEntries(args.member)) {
     return registerConstructorArgumentRow(args, null);
   }
   if (isMemberClassBase(args.member)) {
@@ -27121,7 +27736,7 @@ function materializeConstructorArgumentValue(args) {
       `Constructor argument for Class field '${args.member.name}' has no backing value row.`
     );
   }
-  if (isMemberListBase(args.member)) {
+  if (isMemberEntryCollectionBase(args.member)) {
     if (!Array.isArray(args.value)) {
       throw new NSGetterRuntimeError(
         `Constructor argument for List field '${args.member.name}' must be a list.`
@@ -27161,7 +27776,7 @@ function materializeConstructorArgumentValue(args) {
       const entryValue = constructorCollectionEntryValue(
         rawEntry,
         args.ctx,
-        isMemberClassBase(resolvedEntry) || isMemberListBase(resolvedEntry) || isMemberDictionaryBase(resolvedEntry) || (referenceIndexes?.has(index) ?? args.collectionEntriesAreReferences ?? trackedValueId !== null)
+        isMemberClassBase(resolvedEntry) || isMemberWithEntries(resolvedEntry) || (referenceIndexes?.has(index) ?? args.collectionEntriesAreReferences ?? trackedValueId !== null)
       );
       const child = materializeConstructorArgumentValue({
         ...args,
@@ -27209,7 +27824,7 @@ function materializeConstructorArgumentValue(args) {
       const entry = constructorCollectionEntryValue(
         rawEntry,
         args.ctx,
-        isMemberClassBase(resolvedEntry) || isMemberListBase(resolvedEntry) || isMemberDictionaryBase(resolvedEntry) || (args.collectionEntriesAreReferences ?? trackedValueId !== null)
+        isMemberClassBase(resolvedEntry) || isMemberWithEntries(resolvedEntry) || (args.collectionEntriesAreReferences ?? trackedValueId !== null)
       );
       record4[key] = materializeConstructorArgumentValue({
         ...args,
@@ -27244,7 +27859,7 @@ function registerConstructorArgumentRow(args, value) {
   return row;
 }
 function rowGenericBindings(args) {
-  if (!isMemberListBase(args.member) && !isMemberDictionaryBase(args.member)) {
+  if (!isMemberWithEntries(args.member)) {
     return void 0;
   }
   return computeGenericBindingsStamp(
@@ -27423,7 +28038,7 @@ function cloneClassValueGraph(receiver, expectedClassId, ctx) {
       argumentValues,
       sourceRow.id,
       compileMemberId,
-      isMemberListBase(sourceMember) || isMemberDictionaryBase(sourceMember) ? runtimeGenericEnvForValueRow(sourceRow, ctx, /* @__PURE__ */ new Set()) : void 0
+      isMemberWithEntries(sourceMember) ? runtimeGenericEnvForValueRow(sourceRow, ctx, /* @__PURE__ */ new Set()) : void 0
     );
     if (evaluated.existingValueRow !== void 0) {
       const adoptedClone = cloneRow2(
@@ -27540,9 +28155,9 @@ function cloneClassValueGraph(receiver, expectedClassId, ctx) {
         );
         clonedRecord[key] = clonedChild.id;
       }
-    } else if (Array.isArray(sourceRow.value) && (isMemberList(sourceMember) || sourceTypeInfo?.type === 6 /* List */)) {
-      const entryMember = isMemberList(sourceMember) ? evalMemberById(ctx.vm, sourceMember.entryMemberId) : null;
-      const entryTypeInfo = sourceTypeInfo?.type === 6 /* List */ ? sourceTypeInfo.entryTypeInfo : void 0;
+    } else if (Array.isArray(sourceRow.value) && (isMemberEntryCollectionBase(sourceMember) || sourceTypeInfo?.type === 6 /* List */ || sourceTypeInfo?.type === 28 /* Set */)) {
+      const entryMember = isMemberEntryCollectionBase(sourceMember) ? evalMemberById(ctx.vm, sourceMember.entryMemberId) : null;
+      const entryTypeInfo = sourceTypeInfo?.type === 6 /* List */ || sourceTypeInfo?.type === 28 /* Set */ ? sourceTypeInfo.entryTypeInfo : void 0;
       if (entryMember !== null || entryTypeInfo !== void 0) {
         clone.value = sourceRow.value.map((childId) => {
           if (typeof childId !== "string") return childId;
@@ -27877,132 +28492,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)();
@@ -28150,7 +28639,7 @@ function createStoredValuePlacementTraversal(args, trackReferences = false) {
         }
         continue;
       }
-      if (!isMemberListBase(member) && !isMemberDictionaryBase(member)) {
+      if (!isMemberWithEntries(member)) {
         continue;
       }
       const entryMember = membersById.get(member.entryMemberId);
@@ -28281,23 +28770,24 @@ 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 */) {
+  if (collection.type !== 6 /* List */ && collection.type !== 28 /* Set */ && 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);
@@ -28306,7 +28796,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
           );
@@ -28315,7 +28812,8 @@ function resolveMemberDeclaredTypeInfoInternal(member, members, seen, ownerClass
             argumentMember,
             members,
             nextSeen,
-            ownerClass
+            ownerClass,
+            env
           );
           return argumentType === null ? [] : [[genericParamId, argumentType]];
         }
@@ -28355,38 +28853,31 @@ 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)) {
-    const entry = members.find(
-      (candidate) => candidate.id === resolved.entryMemberId
-    );
+  const collectionKind = resolved.kind;
+  if (collectionKind === 6 /* List */ || collectionKind === 28 /* Set */ || collectionKind === 5 /* Dictionary */ && isMemberDictionaryBase(resolved)) {
+    const entryMemberId = getField(resolved, "entryMemberId");
+    const entry = members.find((candidate) => candidate.id === entryMemberId);
     if (entry === void 0) return null;
     const entryTypeInfo = resolveMemberDeclaredTypeInfoInternal(
       entry,
       members,
       nextSeen,
-      ownerClass
+      ownerClass,
+      env
     );
     if (entryTypeInfo === null) return null;
     return {
-      type: resolved.kind,
+      type: collectionKind,
       required: isRequiredMember(resolved),
       entryTypeInfo,
       ...isMemberDictionaryBase(resolved) && resolved.keyEnumId ? { keyEnumId: resolved.keyEnumId } : {}
@@ -28402,30 +28893,38 @@ function resolveMemberDeclaredTypeInfoInternal(member, members, seen, ownerClass
         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 {
@@ -28610,7 +29109,7 @@ var MaterializedValueGraphContext = class {
     const rewriteId = (value2) => replacements.get(value2) ?? value2;
     let value = row.value;
     if (owner !== void 0 || aggregateType !== void 0) {
-      if ((owner !== void 0 ? isMemberListBase(owner) : aggregateType === 6 /* List */) && Array.isArray(value)) {
+      if ((owner !== void 0 ? isMemberEntryCollectionBase(owner) : aggregateType === 6 /* List */ || aggregateType === 28 /* Set */) && Array.isArray(value)) {
         value = value.map(
           (entry) => typeof entry === "string" ? rewriteId(entry) : entry
         );
@@ -28669,7 +29168,7 @@ var MaterializedValueGraphContext = class {
       if (member === void 0) return null;
       return this.memberTypeInfo(member, env);
     }
-    if (rawTypeInfo.type === 6 /* List */ || rawTypeInfo.type === 5 /* Dictionary */) {
+    if (rawTypeInfo.type === 6 /* List */ || rawTypeInfo.type === 28 /* Set */ || rawTypeInfo.type === 5 /* Dictionary */) {
       const entryTypeInfo = this.resolveTypeInfo(
         rawTypeInfo.entryTypeInfo,
         env
@@ -28739,7 +29238,7 @@ function collectSoftOwnedConstructorArgumentValueIds(index, ownerValueId, preser
     collectNestedConstructorArguments(valueId);
     if (typeInfo.type === 7 /* Class */ || typeInfo.type === 22 /* Interface */) {
       collectClassChildren(row, typeInfo);
-    } else if (typeInfo.type === 6 /* List */) {
+    } else if (typeInfo.type === 6 /* List */ || typeInfo.type === 28 /* Set */) {
       const unorderedChildren = childrenByContainerId.get(row.id) ?? [];
       if (unorderedChildren.length > 0) {
         for (const child of unorderedChildren) {
@@ -28824,7 +29323,7 @@ function tryResolveTypeInfo(document2, rawTypeInfo, env) {
     if (member === void 0) return null;
     return tryMemberTypeInfo(document2, member, env);
   }
-  if (rawTypeInfo.type === 6 /* List */ || rawTypeInfo.type === 5 /* Dictionary */) {
+  if (rawTypeInfo.type === 6 /* List */ || rawTypeInfo.type === 28 /* Set */ || rawTypeInfo.type === 5 /* Dictionary */) {
     const entryTypeInfo = tryResolveTypeInfo(
       document2,
       rawTypeInfo.entryTypeInfo,
@@ -28846,7 +29345,7 @@ function tryMemberTypeInfo(document2, rawMember, env) {
   }
 }
 function isAggregateTypeInfo(typeInfo) {
-  return typeInfo.type === 7 /* Class */ || typeInfo.type === 22 /* Interface */ || typeInfo.type === 6 /* List */ || typeInfo.type === 5 /* Dictionary */;
+  return typeInfo.type === 7 /* Class */ || typeInfo.type === 22 /* Interface */ || typeInfo.type === 6 /* List */ || typeInfo.type === 28 /* Set */ || typeInfo.type === 5 /* Dictionary */;
 }
 function isStringRecord3(value) {
   if (value === null || typeof value !== "object" || Array.isArray(value)) {
@@ -31258,7 +31757,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;
@@ -31694,7 +32193,7 @@ function resolveVirtualInstanceGraph(args) {
             schemaKey: settled2.schemaKey
           })
         )?.member;
-        if (destination === void 0 || !(isMemberClassBase(destination) || isMemberListBase(destination) || isMemberDictionaryBase(destination)))
+        if (destination === void 0 || !(isMemberClassBase(destination) || isMemberWithEntries(destination)))
           continue;
         result.set(settled2.schemaKey, edge.targetValueId);
       }
@@ -31744,7 +32243,7 @@ function resolveVirtualInstanceGraph(args) {
     };
     if (indexed.parentSegment?.kind === "list" && parentId !== null) {
       const parent = indexed.parentPathKey === null ? void 0 : expansion.nodesByPath.get(indexed.parentPathKey);
-      if (parent !== void 0 && isMemberListBase(parent.member) && listKindOf(parent.member) === 1 /* Unordered */)
+      if (parent !== void 0 && isMemberEntryCollectionBase(parent.member) && listKindOf(parent.member) === 1 /* Unordered */)
         effective.containerId = parentId;
     }
     if (isMemberClassBase(indexed.member) && effective.value !== null) {
@@ -31775,7 +32274,7 @@ function resolveVirtualInstanceGraph(args) {
         if (effectiveRecord[key] === void 0) effectiveRecord[key] = childId;
       }
       effective.value = effectiveRecord;
-    } else if (isMemberListBase(indexed.member)) {
+    } else if (isMemberEntryCollectionBase(indexed.member)) {
       const effectiveListValue = materialized === null ? indexed.expandedRow.value : materialized.value;
       if (effectiveListValue === null) {
         effective.value = null;
@@ -32524,7 +33023,7 @@ function indexExpansion(args) {
       }
       return;
     }
-    if (isMemberListBase(member)) {
+    if (isMemberEntryCollectionBase(member)) {
       if (listKindOf(member) === 1 /* Unordered */) {
         const entryMember3 = membersById.get(member.entryMemberId);
         if (entryMember3 === void 0) return;
@@ -32641,7 +33140,7 @@ function rewriteExpandedRow(node, expansion) {
         rewrite(childId)
       ])
     );
-  } else if (isMemberListBase(node.member) && Array.isArray(row.value)) {
+  } else if (isMemberEntryCollectionBase(node.member) && Array.isArray(row.value)) {
     row.value = row.value.map(
       (childId) => typeof childId === "string" ? rewrite(childId) : childId
     );
@@ -32661,7 +33160,7 @@ function remapMemberDelegateReceiver(value, remap) {
 }
 function normalizeLeafPayload(row, member, remapReceiver = (id) => id) {
   const literal3 = literalRow(row);
-  if (isMemberListBase(member) || isMemberDictionaryBase(member)) {
+  if (isMemberWithEntries(member)) {
     return {
       value: literal3.value,
       classId: literal3.classId ?? null,
@@ -32694,7 +33193,7 @@ function compareContextualCreationProvenance(left, right, context) {
       member.classArguments,
       context.document.classes
     ) : /* @__PURE__ */ new Map();
-    if (isMemberListBase(member) || isMemberDictionaryBase(member)) {
+    if (isMemberWithEntries(member)) {
       for (const paramId of referencedGenericParams(
         member,
         context.document.members
@@ -32886,7 +33385,7 @@ function storedConstructorReplayInitializer(args) {
   };
 }
 function storedArgumentPointer(value, typeInfo) {
-  if ((typeInfo.type === 7 /* Class */ || typeInfo.type === 22 /* Interface */ || typeInfo.type === 6 /* List */ || typeInfo.type === 5 /* Dictionary */) && typeof value === "string") {
+  if ((typeInfo.type === 7 /* Class */ || typeInfo.type === 22 /* Interface */ || typeInfo.type === 6 /* List */ || typeInfo.type === 28 /* Set */ || typeInfo.type === 5 /* Dictionary */) && typeof value === "string") {
     return { type: "reference" /* reference */, valueId: value };
   }
   return {
@@ -33597,22 +34096,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,
@@ -35107,6 +35609,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) {
@@ -35257,7 +35778,8 @@ var COLLECTION_QUERY_METHODS = {
   SkipWhile: "predicate",
   TakeWhile: "predicate",
   Reverse: "none",
-  Concat: "collection"
+  Concat: "collection",
+  ToSet: "none"
 };
 var COLLECTION_FUNCTION_ARGUMENTS = {
   Where: "predicate",
@@ -35276,6 +35798,19 @@ function collectionFunctionContract(name) {
     return COLLECTION_FUNCTION_ALIASES[name];
   return isCollectionFunctionName(name) ? name : null;
 }
+var SET_PRESERVING_COLLECTION_QUERIES = /* @__PURE__ */ new Set([
+  "Where",
+  "Skip",
+  "Take",
+  "SkipWhile",
+  "TakeWhile",
+  "OrderBy",
+  "OrderByDescending",
+  "Reverse"
+]);
+function isSetPreservingCollectionQuery(name) {
+  return SET_PRESERVING_COLLECTION_QUERIES.has(name);
+}
 function isCollectionQueryName(name) {
   return Object.hasOwn(COLLECTION_QUERY_METHODS, name);
 }
@@ -35824,6 +36359,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;
@@ -39546,7 +40093,7 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
         indexCollectionPointer: receiver.pointer
       };
     }
-    if (receiver.type.kind === "list" && name === "Index" && this.indexesFor(receiver.type).length > 0) {
+    if ((receiver.type.kind === "list" || receiver.type.kind === "set") && name === "Index" && this.indexesFor(receiver.type).length > 0) {
       return {
         pointer: receiver.pointer,
         type: { kind: "primitive", name: "unknown" },
@@ -39727,10 +40274,11 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
       declaring
     );
   }
-  /** The indexes declared on a schema-backed List, keyed by its member. */
+  /** The indexes declared on a schema-backed List or Set, keyed by its member. */
   indexesFor(type) {
-    if (type.listMemberId === void 0) return [];
-    return this.project.indexesByListMemberId.get(type.listMemberId) ?? [];
+    const memberId = indexedCollectionMemberId(type);
+    if (memberId === void 0) return [];
+    return this.project.indexesByListMemberId.get(memberId) ?? [];
   }
   /**
    * P42 §2.3. `Images.<Name>` / `AudioClips.<Name>`.
@@ -40845,7 +41393,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,
@@ -40924,7 +41473,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;
@@ -40932,7 +41481,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())
     );
@@ -40969,9 +41522,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
       );
     }
@@ -40980,19 +41532,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(
@@ -41081,15 +41625,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
@@ -42273,6 +42836,33 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
       case "Reverse":
         info = { ...base, op: name };
         break;
+      case "ToSet": {
+        if (collection.kind === "dictionary")
+          throw new CompileError("ToSet requires a List or Set receiver.", pos);
+        const elementError = setElementTypeError(
+          collection.valueType,
+          this.project
+        );
+        if (elementError !== null) throw new CompileError(elementError, pos);
+        info = {
+          ...base,
+          op: name,
+          ...hasReferenceEquality(collection.valueType, this.project) ? { reference: true } : {}
+        };
+        resultType = {
+          kind: "set",
+          elementType: collection.valueType,
+          readOnly: true
+        };
+        break;
+      }
+    }
+    if (collection.kind === "set" && isSetPreservingCollectionQuery(name)) {
+      resultType = {
+        kind: "set",
+        elementType: collection.valueType,
+        readOnly: true
+      };
     }
     return {
       ...intrinsic(
@@ -42280,7 +42870,7 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
         {
           ...info,
           ...toWireType(
-            resultType.kind === "list" ? resultType.elementType : resultType,
+            resultType.kind === "list" || resultType.kind === "set" ? resultType.elementType : resultType,
             this.project
           ).type === 8 /* Enum */ ? { enumEntries: true } : {}
         },
@@ -43969,6 +44559,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)) {
@@ -44594,10 +45203,16 @@ function toWireType(type, project) {
         ...type.readOnly ? { readOnly: true } : {}
       };
     case "set": {
+      const entryTypeInfo = toWireType(type.elementType, project);
+      if (type.setMemberId === void 0) {
+        return { type: 9 /* Lookup */, required, entryTypeInfo };
+      }
       return {
-        type: 9 /* Lookup */,
+        type: 28 /* Set */,
         required,
-        entryTypeInfo: toWireType(type.elementType, project)
+        entryTypeInfo,
+        setMemberId: type.setMemberId,
+        ...type.readOnly ? { readOnly: true } : {}
       };
     }
     case "dictionary": {
@@ -44680,6 +45295,15 @@ function fromWireType(type) {
       nullable: nullable2
     };
   }
+  if (type.type === 28 /* Set */) {
+    return {
+      kind: "set",
+      elementType: fromWireType(type.entryTypeInfo),
+      nullable: nullable2,
+      ...type.setMemberId ? { setMemberId: type.setMemberId } : {},
+      ...type.readOnly ? { readOnly: true } : {}
+    };
+  }
   if (type.type === 25 /* Delegate */) {
     return {
       kind: "delegate",
@@ -44777,6 +45401,23 @@ function valueKindPrimitive(kind) {
       return "Color";
   }
 }
+function setElementTypeError(type, project) {
+  if (type.nullable === true) return SET_ELEMENT_NULLABLE_ERROR;
+  switch (type.kind) {
+    case "list":
+    case "set":
+    case "dictionary":
+      return SET_ELEMENT_COLLECTION_ERROR;
+    case "delegate":
+      return setElementKindError("delegates");
+    case "action":
+      return setElementKindError("actions");
+    case "named":
+      return project.typeById.get(type.typeId)?.kind === "interface" ? setElementKindError("interfaces") : null;
+    default:
+      return null;
+  }
+}
 function hasReferenceEquality(type, project) {
   const lookup = neoScriptMemberLookupType(type);
   switch (lookup.kind) {
@@ -45303,6 +45944,7 @@ function resolveNeoScriptType(type, context, project) {
           )
         } : {}
       };
+      assertTypeArgumentConstraints(named, resolved, type.pos, project);
       break;
     }
     case "list":
@@ -45335,6 +45977,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 */;
@@ -45739,9 +46406,6 @@ function attachConstructorSignature(type, environment) {
     type.id,
     environment
   );
-  for (const binding of genericEnvironment.values()) {
-    if (binding.kind === "unbound") return type;
-  }
   return {
     ...type,
     ...buildNeoScriptConstructionSignatures(
@@ -45754,7 +46418,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),
@@ -46493,7 +47157,7 @@ function orderMergedMembers(type, members, environment) {
   return ordered;
 }
 function listIndexes(member, environment, field) {
-  if (member.kind !== "list") return [];
+  if (member.kind !== "list" && member.kind !== "set") return [];
   const id = string(member.id, `${field}.id`);
   const entryId = string(member.entryMemberId, `${field}.entryMemberId`);
   const entry = environment.members.get(entryId);
@@ -46572,7 +47236,7 @@ function memberType(member, environment, visiting, field) {
     };
     return member.multiselect === true ? { kind: "set", elementType: enumType2, nullable: nullable2 } : { ...enumType2, nullable: nullable2 };
   }
-  if (kind === "list" || kind === "dictionary") {
+  if (kind === "list" || kind === "set" || kind === "dictionary") {
     const entry = environment.members.get(
       string(member.entryMemberId, `${field}.entryMemberId`)
     );
@@ -46586,6 +47250,9 @@ function memberType(member, environment, visiting, field) {
         readOnly: false
       };
     }
+    if (kind === "set") {
+      return { kind: "set", elementType: entryType, nullable: nullable2, setMemberId: id };
+    }
     const key = optionalRecord(member.key);
     return {
       kind: "dictionary",
@@ -46730,6 +47397,18 @@ function manifestType(value, environment, field) {
       readOnly: boolean(type.readOnly, `${field}.readOnly`)
     };
   }
+  if (kind === "set") {
+    return {
+      kind: "set",
+      elementType: manifestType(
+        type.entryType,
+        environment,
+        `${field}.entryType`
+      ),
+      nullable: nullable2,
+      setMemberId: string(type.setMemberId, `${field}.setMemberId`)
+    };
+  }
   if (kind === "dictionary") {
     const keyEnumId = nullableString(type.keyEnumId, `${field}.keyEnumId`);
     return {
@@ -47243,7 +47922,7 @@ function interfacePropertyIsSettable(member) {
 function containsForbiddenMemberTypeInfo(typeInfo) {
   if (typeInfo.type === NS_TYPE_UNKNOWN) return true;
   if (typeInfo.type === 21 /* Generic */) return true;
-  if (typeInfo.type === 6 /* List */ || typeInfo.type === 5 /* Dictionary */ || typeInfo.type === 9 /* Lookup */) {
+  if (typeInfo.type === 6 /* List */ || typeInfo.type === 28 /* Set */ || typeInfo.type === 5 /* Dictionary */ || typeInfo.type === 9 /* Lookup */) {
     return containsForbiddenMemberTypeInfo(typeInfo.entryTypeInfo);
   }
   if (typeInfo.type === 7 /* Class */ && typeInfo.typeArguments) {
@@ -47628,8 +48307,7 @@ function storedDialogueGroupSources(groups, memberById, classById) {
 }
 function lookupEntry(collectionMemberId, memberById, classById) {
   const collection = memberById(collectionMemberId);
-  if (!isMemberListBase(collection) && !isMemberDictionaryBase(collection))
-    return void 0;
+  if (!isMemberWithEntries(collection)) return void 0;
   const entry = memberById(collection.entryMemberId);
   if (!isMemberClassBase(entry)) return void 0;
   const entryClass = classById(entry.classId);
@@ -48031,9 +48709,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,
@@ -48041,14 +48716,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 */
         };
@@ -48454,7 +49131,7 @@ function createListIndexes(context) {
     } catch {
       continue;
     }
-    if (!isMemberListBase(resolved)) continue;
+    if (!isMemberEntryCollectionBase(resolved)) continue;
     const definitions = resolveListIndexDefinitions(
       {
         members: context.vm.members,
@@ -48464,7 +49141,7 @@ function createListIndexes(context) {
       record4
     );
     const listType = memberRuntimeType(record4, context);
-    if (listType.kind !== "list") continue;
+    if (listType.kind !== "list" && listType.kind !== "set") continue;
     for (const definition of definitions) {
       result.push({
         id: `${record4.id}:index:${definition.schemaKey}`,
@@ -48560,6 +49237,22 @@ function memberRuntimeType(record4, context, seen = /* @__PURE__ */ new Set(), g
         nullable: !required
       };
     }
+    case 28 /* Set */: {
+      if (!isMemberSetBase(member)) return UNKNOWN_TYPE;
+      const entry = analyzerMemberById(context, member.entryMemberId);
+      const projectedEntry = entry ? substituteForGenericEnvironment(entry, genericEnvironment, context) : null;
+      return {
+        kind: "set",
+        elementType: projectedEntry ? memberRuntimeType(
+          projectedEntry,
+          context,
+          nextSeen,
+          genericEnvironment
+        ) : UNKNOWN_TYPE,
+        setMemberId: record4.id,
+        nullable: !required
+      };
+    }
     case 5 /* Dictionary */: {
       if (!isMemberDictionaryBase(member)) return UNKNOWN_TYPE;
       const entry = analyzerMemberById(context, member.entryMemberId);
@@ -48804,6 +49497,18 @@ function toLanguageType(type, context, genericEnvironment) {
         ...type.listMemberId ? { listMemberId: type.listMemberId } : {},
         ...type.readOnly ? { readOnly: true } : {}
       };
+    case 28 /* Set */:
+      return {
+        kind: "set",
+        elementType: toLanguageType(
+          type.entryTypeInfo,
+          context,
+          genericEnvironment
+        ),
+        nullable: !required,
+        ...type.setMemberId ? { setMemberId: type.setMemberId } : {},
+        ...type.readOnly ? { readOnly: true } : {}
+      };
     case 5 /* Dictionary */:
       return {
         kind: "dictionary",
@@ -49264,25 +49969,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);
@@ -49519,6 +50232,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(
@@ -49530,8 +50244,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 ?? []
         )
       })
@@ -49576,6 +50292,7 @@ function compileValueRowInitializerBody(args) {
         returnTypeInfo,
         initializerName: args.member.name,
         lexicalThisClass: args.lexicalThisClass ?? null,
+        declaringClass: args.initializerOwnerClass,
         argumentTypes: initializerArgumentTypes(
           args.initializerOwnerClass,
           args.constructors ?? []
@@ -53938,6 +54655,10 @@ function schemaTypeOptionsAtDepth(depth) {
       listMemberId: nullableId,
       readOnly: boolean2()
     }),
+    nullableTypeSchema("set", {
+      entryType: schemaTypeAtDepth(depth + 1),
+      setMemberId: nonEmptyString
+    }),
     nullableTypeSchema("dictionary", {
       entryType: schemaTypeAtDepth(depth + 1),
       keyEnumId: nullableId,
@@ -54206,6 +54927,12 @@ var schemaMemberSchema = variant("kind", [
     indexes: array(schemaListIndexSchema),
     columns: array(schemaListColumnSchema)
   }),
+  /** P108 §2: insertion-ordered owned entries, no two equal. */
+  memberSchema("set", {
+    entryMemberId: nonEmptyString,
+    indexes: array(schemaListIndexSchema),
+    columns: array(schemaListColumnSchema)
+  }),
   memberSchema("class", {
     classId: nonEmptyString,
     partial: optional(boolean2()),
@@ -54282,6 +55009,9 @@ var schemaMemberSchema = variant("kind", [
     partial: optional(boolean2())
   })
 ]);
+function isSchemaEntryCollectionMember(member) {
+  return member.kind === "list" || member.kind === "set";
+}
 
 // node_modules/valibot/dist/index.mjs
 var store$42;
@@ -54349,7 +55079,8 @@ var MEMBER_KIND = {
   FunctionRef: 24,
   NSDelegate: 25,
   NSAction: 26,
-  Variant: 27
+  Variant: 27,
+  Set: 28
 };
 var MEMBER_MODIFIERS = ["virtual", "sealed", "abstract", "static"];
 var MEMBER_ACCESS = ["public", "protected", "private"];
@@ -54409,6 +55140,7 @@ var MEMBER_KIND_BY_KIND = /* @__PURE__ */ new Map([
   ["float", MEMBER_KIND.Float],
   ["dictionary", MEMBER_KIND.Dictionary],
   ["list", MEMBER_KIND.List],
+  ["set", MEMBER_KIND.Set],
   ["class", MEMBER_KIND.Class],
   ["enum", MEMBER_KIND.Enum],
   ["lookup", MEMBER_KIND.Lookup],
@@ -54595,6 +55327,19 @@ function memberFromDocument(record4, members, owners, classNames, context) {
       columns: listColumnsFromDocument(field("columnSettings", []), record4)
     };
   }
+  if (kind === MEMBER_KIND.Set) {
+    return {
+      ...common,
+      kind: "set",
+      entryMemberId: requiredStringValue(
+        field("entryMemberId", void 0),
+        record4,
+        "entryMemberId"
+      ),
+      indexes: listIndexesFromDocument(field("indexes", []), record4),
+      columns: listColumnsFromDocument(field("columnSettings", []), record4)
+    };
+  }
   if (kind === MEMBER_KIND.Class) {
     return {
       ...common,
@@ -54848,10 +55593,13 @@ var INHERITED_MEMBER_ORDINAL_FIELDS = /* @__PURE__ */ new Set([
   "dispatch",
   "bodyMode"
 ]);
+function schemaMemberKindOrdinal(kind) {
+  const ordinal = MEMBER_KIND_BY_KIND.get(kind);
+  if (ordinal === void 0) throw new Error(`No document kind for ${kind}.`);
+  return ordinal;
+}
 function memberToDocumentFields(member, baseData) {
-  const kind = MEMBER_KIND_BY_KIND.get(member.kind);
-  if (kind === void 0)
-    throw new Error(`No document kind for ${member.kind}.`);
+  const kind = schemaMemberKindOrdinal(member.kind);
   const isOverride = member.overrideOf !== null;
   const fields = {
     id: member.id,
@@ -54909,9 +55657,9 @@ function memberToDocumentFields(member, baseData) {
     }
     if (member.key.kind === "enum") fields.keyEnumId = member.key.enumId;
   }
-  if (member.kind === "list") {
+  if (isSchemaEntryCollectionMember(member)) {
     fields.entryMemberId = member.entryMemberId;
-    if (member.listKind === "unordered" || isOverride) {
+    if (member.kind === "list" && (member.listKind === "unordered" || isOverride)) {
       fields.listKind = member.listKind === "unordered" ? 1 : 0;
     }
     if (!isOverride) {
@@ -55223,6 +55971,22 @@ function documentTypeToManifest(value, record4, path) {
       readOnly: typeInfo.readOnly === true
     };
   }
+  if (kind === MEMBER_KIND.Set) {
+    return {
+      kind: "set",
+      nullable: nullable2,
+      entryType: documentTypeToManifest(
+        typeInfo.entryTypeInfo,
+        record4,
+        `${path}.entryTypeInfo`
+      ),
+      setMemberId: requiredStringValue(
+        typeInfo.setMemberId,
+        record4,
+        `${path}.setMemberId`
+      )
+    };
+  }
   if (kind === MEMBER_KIND.Lookup) {
     const collectionValueId = optionalStringOrNull(typeInfo.collectionValueId);
     const collectionMemberId = optionalStringOrNull(
@@ -55346,6 +56110,14 @@ function manifestTypeToDocument(type) {
       readOnly: type.readOnly || void 0
     });
   }
+  if (type.kind === "set") {
+    return {
+      type: MEMBER_KIND.Set,
+      required,
+      entryTypeInfo: manifestTypeToDocument(type.entryType),
+      setMemberId: type.setMemberId
+    };
+  }
   if (type.kind === "dictionary") {
     return omitUndefined({
       type: MEMBER_KIND.Dictionary,
@@ -56940,7 +57712,7 @@ var INITIALIZER_KEY_PLACEHOLDER = new RegExp(
 
 // ../packages/manifest/schema-contract/registry.mjs
 var PROJECT_SCHEMA_CONTRACT = Object.freeze({
-  cliVersion: "0.77.0",
+  cliVersion: "0.78.0",
   projectFileUploadBatchSize: 32,
   documentRecords: {
     member: {
@@ -58770,9 +59542,15 @@ var WORLD_OBJECT_CONTRACT_WORLD_KINDS = /* @__PURE__ */ new Set([
   NeoWorldSystemClassKind.SortingGroup,
   NeoWorldSystemClassKind.SpriteObject
 ]);
+var SCRIPT_COLLECTION_READERS = {
+  [6 /* List */]: "ReadScriptList",
+  [28 /* Set */]: "ReadScriptSet",
+  [9 /* Lookup */]: "ReadScriptSet",
+  [5 /* Dictionary */]: "ReadScriptDictionary"
+};
 
 // ../src/models/exports/unity-codegen-revision.ts
-var UNITY_CODEGEN_REVISION = "ac7f9812e3b16cc37d09ba5006316dda6bac23884c83b368a10880bc3f2c765b";
+var UNITY_CODEGEN_REVISION = "8e940ebfec562d0be7fe7b82014f66293ea075c2ca394c3a3eaac419eaddfeb8";
 
 // src/export-cache.ts
 var CACHE_BUILD = JSON.stringify([