@neocompose/cli 0.89.1 → 0.89.3

package/dist/neo-runtime.mjs

@@ -19377,7 +19377,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.89.1",
+      cliVersion: "0.89.3",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -28182,7 +28182,7 @@ function suppressesInheritedSetter(contract) {
 function generatedValueTypeInfo(ctx, member) {
   const required2 = isRequiredMember(member);
   if (isMemberTupleBase(member)) return memberTypeInfoForCodegen(ctx, member);
-  const slotType = classSlotTypeInfo(member, required2);
+  const slotType = classSlotTypeInfo(ctx, member, required2);
   if (slotType !== null) return slotType;
   const returnType = nsPropertyReturnTypeInfo(member);
   if (returnType !== null) return returnType;
@@ -28191,19 +28191,64 @@ function generatedValueTypeInfo(ctx, member) {
     if (declaredType !== null) return declaredType;
     const entry = resolveLookupEntryMember(ctx, member);
     if (entry === null) return null;
-    return classSlotTypeInfo(entry, required2);
+    return classSlotTypeInfo(ctx, entry, required2);
   }
   return null;
 }
-function classSlotTypeInfo(member, required2) {
+function genericParamTypeInfo(ctx, genericParamId, required2) {
+  const declaration = findGenericParamDeclaration(genericParamId, ctx.classes);
+  if (declaration === null) {
+    ctx.diagnostics.push({
+      severity: "error",
+      message: `Generic param "${genericParamId}" is not declared by any type in the export.`,
+      path: "genericParamId"
+    });
+    return null;
+  }
+  return {
+    type: 21 /* Generic */,
+    required: required2,
+    ownerClassId: declaration.declaringClass.id,
+    genericParamId
+  };
+}
+function classSlotTypeInfo(ctx, member, required2) {
+  if (!isClassSlotMember(member)) return null;
+  const typeArguments = {};
+  for (const [parameterId, binding] of Object.entries(
+    declaredSlotArguments(member) ?? {}
+  )) {
+    if (isForwardedGenericBinding(binding)) {
+      const typeInfo = genericParamTypeInfo(ctx, binding.genericParamId, true);
+      if (typeInfo === null) return null;
+      typeArguments[parameterId] = typeInfo;
+    } else {
+      const argument2 = resolveMemberById(
+        ctx,
+        binding.memberId,
+        "classArguments"
+      );
+      if (argument2 === null) return null;
+      const typeInfo = memberTypeInfoForCodegen(ctx, argument2);
+      if (typeInfo === null) return null;
+      typeArguments[parameterId] = typeInfo;
+    }
+  }
+  const argumentsField = Object.keys(typeArguments).length === 0 ? {} : { typeArguments };
   if (isClassTypedMember(member)) {
-    return { type: 7 /* Class */, classId: member.classId, required: required2 };
+    return {
+      type: 7 /* Class */,
+      classId: member.classId,
+      required: required2,
+      ...argumentsField
+    };
   }
   if (isInterfaceTypedMember(member)) {
     return {
       type: 22 /* Interface */,
       interfaceId: member.interfaceId,
-      required: required2
+      required: required2,
+      ...argumentsField
     };
   }
   return null;
@@ -30341,6 +30386,8 @@ function pointerOwnershipForStorage(storage) {
 }
 function memberTypeInfoForCodegen(ctx, member) {
   const required2 = isRequiredMember(member);
+  if (isMemberGenericBase(member))
+    return genericParamTypeInfo(ctx, member.genericParamId, required2);
   if (isMemberTupleBase(member)) {
     const elements = [];
     for (const [index, id2] of member.elementMemberIds.entries()) {
@@ -30355,7 +30402,7 @@ function memberTypeInfoForCodegen(ctx, member) {
     }
     return { type: 30 /* Tuple */, required: required2, elements };
   }
-  const slotType = classSlotTypeInfo(member, required2);
+  const slotType = classSlotTypeInfo(ctx, member, required2);
   if (slotType !== null) return slotType;
   if (isMemberLookupBase(member)) {
     if (member.collectionMemberId === void 0) {
@@ -30880,6 +30927,337 @@ var init_NSGetterRuntimeError = __esm({
   }
 });
 
+// ../packages/models/src/decimal/decimal-math.ts
+function pow10(exponent) {
+  return TEN ** BigInt(exponent);
+}
+function assertCanonicalInput(value, argName) {
+  const violation = getDecimalStringViolation(value);
+  if (violation !== null) {
+    throw new Error(
+      `Decimal argument "${argName}" (${JSON.stringify(value)}) ${violation}.`
+    );
+  }
+}
+function parseDecimalString(value) {
+  return parseDecimalArg(value, "value");
+}
+function parseDecimalArg(value, argName) {
+  assertCanonicalInput(value, argName);
+  const negative = value.startsWith("-");
+  const unsigned = negative ? value.slice(1) : value;
+  const pointIndex = unsigned.indexOf(".");
+  const digits = pointIndex === -1 ? unsigned : unsigned.slice(0, pointIndex) + unsigned.slice(pointIndex + 1);
+  const scale = pointIndex === -1 ? 0 : unsigned.length - pointIndex - 1;
+  const magnitude = BigInt(digits);
+  return { coefficient: negative ? -magnitude : magnitude, scale };
+}
+function formatDecimalParts(parts) {
+  const negative = parts.coefficient < 0n;
+  const digits = (negative ? -parts.coefficient : parts.coefficient).toString();
+  let unsigned;
+  if (parts.scale === 0) {
+    unsigned = digits;
+  } else {
+    const padded = digits.padStart(parts.scale + 1, "0");
+    const pointIndex = padded.length - parts.scale;
+    unsigned = `${padded.slice(0, pointIndex)}.${padded.slice(pointIndex)}`;
+  }
+  if (parts.coefficient === 0n) return unsigned;
+  return negative ? `-${unsigned}` : unsigned;
+}
+function significantDigitCount(coefficient) {
+  const magnitude = coefficient < 0n ? -coefficient : coefficient;
+  return magnitude.toString().length;
+}
+function assertWithinEnvelope(parts, operation) {
+  if (significantDigitCount(parts.coefficient) > DECIMAL_MAX_SIGNIFICANT_DIGITS) {
+    throw new DecimalOverflowError(
+      `Decimal overflow in ${operation}: the exact result exceeds ${DECIMAL_MAX_SIGNIFICANT_DIGITS} significant digits. Round explicitly (Round/Divide) to reduce precision.`
+    );
+  }
+  if (parts.scale > DECIMAL_MAX_SCALE) {
+    throw new DecimalOverflowError(
+      `Decimal overflow in ${operation}: the exact result exceeds scale ${DECIMAL_MAX_SCALE}. Round explicitly (Round/Divide) to reduce precision.`
+    );
+  }
+  return parts;
+}
+function alignScales(a, b) {
+  const scale = Math.max(a.scale, b.scale);
+  return {
+    a: a.coefficient * pow10(scale - a.scale),
+    b: b.coefficient * pow10(scale - b.scale),
+    scale
+  };
+}
+function compareDecimalStrings(a, b) {
+  const aligned = alignScales(parseDecimalArg(a, "a"), parseDecimalArg(b, "b"));
+  if (aligned.a < aligned.b) return -1;
+  if (aligned.a > aligned.b) return 1;
+  return 0;
+}
+function minDecimalStrings(a, b) {
+  return compareDecimalStrings(a, b) <= 0 ? a : b;
+}
+function maxDecimalStrings(a, b) {
+  return compareDecimalStrings(a, b) >= 0 ? a : b;
+}
+function clampDecimalStrings(value, min, max) {
+  if (compareDecimalStrings(min, max) > 0) {
+    throw new DecimalClampRangeError(MATH_CLAMP_RANGE_MESSAGE);
+  }
+  if (compareDecimalStrings(value, min) < 0) return min;
+  if (compareDecimalStrings(value, max) > 0) return max;
+  return value;
+}
+function absDecimalString(value) {
+  const parts = parseDecimalArg(value, "value");
+  const magnitude = parts.coefficient < 0n ? -parts.coefficient : parts.coefficient;
+  return formatDecimalParts({ coefficient: magnitude, scale: parts.scale });
+}
+function addDecimalStrings(a, b) {
+  const aligned = alignScales(parseDecimalArg(a, "a"), parseDecimalArg(b, "b"));
+  return formatDecimalParts(
+    assertWithinEnvelope(
+      { coefficient: aligned.a + aligned.b, scale: aligned.scale },
+      "addition"
+    )
+  );
+}
+function subtractDecimalStrings(a, b) {
+  const aligned = alignScales(parseDecimalArg(a, "a"), parseDecimalArg(b, "b"));
+  return formatDecimalParts(
+    assertWithinEnvelope(
+      { coefficient: aligned.a - aligned.b, scale: aligned.scale },
+      "subtraction"
+    )
+  );
+}
+function multiplyDecimalStrings(a, b) {
+  const left = parseDecimalArg(a, "a");
+  const right = parseDecimalArg(b, "b");
+  return formatDecimalParts(
+    assertWithinEnvelope(
+      {
+        coefficient: left.coefficient * right.coefficient,
+        scale: left.scale + right.scale
+      },
+      "multiplication"
+    )
+  );
+}
+function assertDigitsInRange(digits, operation) {
+  if (!Number.isInteger(digits)) {
+    throw new DecimalDigitsRangeError(
+      `Decimal ${operation} digits must be an integer (received ${digits}).`
+    );
+  }
+  if (digits < 0 || digits > DECIMAL_MAX_SCALE) {
+    throw new DecimalDigitsRangeError(
+      `Decimal ${operation} digits must be between 0 and ${DECIMAL_MAX_SCALE} (received ${digits}).`
+    );
+  }
+}
+function roundDecimalParts(parts, digits, midpoint) {
+  if (digits >= parts.scale) return parts;
+  const divisor = pow10(parts.scale - digits);
+  const negative = parts.coefficient < 0n;
+  const magnitude = negative ? -parts.coefficient : parts.coefficient;
+  let quotient = magnitude / divisor;
+  const doubled = magnitude % divisor * 2n;
+  const tieRoundsUp = midpoint === "awayFromZero" || quotient % 2n === 1n;
+  if (doubled > divisor || doubled === divisor && tieRoundsUp) {
+    quotient += 1n;
+  }
+  return { coefficient: negative ? -quotient : quotient, scale: digits };
+}
+function roundDecimalString(value, digits) {
+  assertDigitsInRange(digits, "round");
+  const rounded = roundDecimalParts(
+    parseDecimalArg(value, "value"),
+    digits,
+    "toEven"
+  );
+  return formatDecimalParts(assertWithinEnvelope(rounded, "round"));
+}
+function toIntegralParts(parts, direction) {
+  if (parts.scale === 0) return parts;
+  const divisor = pow10(parts.scale);
+  const quotient = parts.coefficient / divisor;
+  const remainder = parts.coefficient % divisor;
+  if (remainder === 0n) return { coefficient: quotient, scale: 0 };
+  if (direction === "floor" && remainder < 0n) {
+    return { coefficient: quotient - 1n, scale: 0 };
+  }
+  if (direction === "ceiling" && remainder > 0n) {
+    return { coefficient: quotient + 1n, scale: 0 };
+  }
+  return { coefficient: quotient, scale: 0 };
+}
+function floorDecimalString(value) {
+  const parts = toIntegralParts(parseDecimalArg(value, "value"), "floor");
+  return formatDecimalParts(assertWithinEnvelope(parts, "floor"));
+}
+function ceilingDecimalString(value) {
+  const parts = toIntegralParts(parseDecimalArg(value, "value"), "ceiling");
+  return formatDecimalParts(assertWithinEnvelope(parts, "ceiling"));
+}
+function truncateDecimalString(value) {
+  const parts = toIntegralParts(parseDecimalArg(value, "value"), "truncate");
+  return formatDecimalParts(assertWithinEnvelope(parts, "truncate"));
+}
+function divideDecimalStrings(a, b, digits) {
+  assertDigitsInRange(digits, "divide");
+  const dividend = parseDecimalArg(a, "a");
+  const divisor = parseDecimalArg(b, "b");
+  if (divisor.coefficient === 0n) {
+    throw new DecimalDivisionByZeroError(
+      `Decimal division by zero: ${JSON.stringify(a)} / ${JSON.stringify(b)}.`
+    );
+  }
+  const exponent = divisor.scale - dividend.scale + digits;
+  let numerator = dividend.coefficient;
+  let denominator = divisor.coefficient;
+  if (exponent >= 0) {
+    numerator *= pow10(exponent);
+  } else {
+    denominator *= pow10(-exponent);
+  }
+  const negative = numerator < 0n !== denominator < 0n;
+  const absNumerator = numerator < 0n ? -numerator : numerator;
+  const absDenominator = denominator < 0n ? -denominator : denominator;
+  let quotient = absNumerator / absDenominator;
+  const remainder = absNumerator % absDenominator;
+  const doubled = remainder * 2n;
+  if (doubled > absDenominator || doubled === absDenominator && quotient % 2n === 1n) {
+    quotient += 1n;
+  }
+  const parts = {
+    coefficient: negative ? -quotient : quotient,
+    scale: digits
+  };
+  return formatDecimalParts(assertWithinEnvelope(parts, "division"));
+}
+function exactPartsFromFloat(value) {
+  if (Number.isNaN(value)) {
+    throw new DecimalNonFiniteError("Cannot convert NaN to a decimal.");
+  }
+  if (!Number.isFinite(value)) {
+    throw new DecimalNonFiniteError(
+      `Cannot convert ${value > 0 ? "Infinity" : "-Infinity"} to a decimal.`
+    );
+  }
+  const view = new DataView(new ArrayBuffer(8));
+  view.setFloat64(0, value);
+  const bits = view.getBigUint64(0);
+  const negative = bits >> 63n === 1n;
+  const exponentBits = Number(bits >> 52n & 0x7ffn);
+  const mantissaBits = bits & 0xfffffffffffffn;
+  let mantissa;
+  let exponent;
+  if (exponentBits === 0) {
+    mantissa = mantissaBits;
+    exponent = -1074;
+  } else {
+    mantissa = mantissaBits | 1n << 52n;
+    exponent = exponentBits - 1075;
+  }
+  if (mantissa === 0n) return { coefficient: 0n, scale: 0 };
+  if (negative) mantissa = -mantissa;
+  let parts;
+  if (exponent >= 0) {
+    parts = { coefficient: mantissa * (1n << BigInt(exponent)), scale: 0 };
+  } else {
+    parts = {
+      coefficient: mantissa * 5n ** BigInt(-exponent),
+      scale: -exponent
+    };
+  }
+  while (parts.scale > 0 && parts.coefficient % TEN === 0n) {
+    parts = { coefficient: parts.coefficient / TEN, scale: parts.scale - 1 };
+  }
+  return parts;
+}
+function decimalStringFromFloat(value, digits) {
+  assertDigitsInRange(digits, "float conversion");
+  const rounded = roundDecimalParts(
+    exactPartsFromFloat(value),
+    digits,
+    "toEven"
+  );
+  return formatDecimalParts(assertWithinEnvelope(rounded, "float conversion"));
+}
+function floatFromDecimalString(value) {
+  assertCanonicalInput(value, "value");
+  return Number(value);
+}
+var DecimalOverflowError, DecimalDivisionByZeroError, DecimalDigitsRangeError, DecimalNonFiniteError, DecimalClampRangeError, MATH_CLAMP_RANGE_MESSAGE, TEN;
+var init_decimal_math = __esm({
+  "../packages/models/src/decimal/decimal-math.ts"() {
+    "use strict";
+    init_member_kinds();
+    DecimalOverflowError = class extends Error {
+    };
+    DecimalDivisionByZeroError = class extends Error {
+    };
+    DecimalDigitsRangeError = class extends Error {
+    };
+    DecimalNonFiniteError = class extends Error {
+    };
+    DecimalClampRangeError = class extends Error {
+    };
+    MATH_CLAMP_RANGE_MESSAGE = "Math.Clamp requires min <= max.";
+    TEN = 10n;
+  }
+});
+
+// ../packages/neoscript-runtime/src/neoscript/unity-value-format.ts
+function formatUnityFloat(value, digits) {
+  const single = Math.fround(value);
+  if (!Number.isFinite(single)) return String(single);
+  const [mantissa, exponent] = single.toExponential(6).split("e");
+  const coefficient = BigInt(mantissa.replace(".", ""));
+  const scale = 6 - Number(exponent);
+  const parts = scale < 0 ? { coefficient: coefficient * 10n ** BigInt(-scale), scale: 0 } : { coefficient, scale };
+  const rounded = roundDecimalParts(parts, digits, "awayFromZero");
+  return formatDecimalParts({
+    coefficient: rounded.coefficient * 10n ** BigInt(digits - rounded.scale),
+    scale: digits
+  });
+}
+function formatUnityValue(value, kind) {
+  if (typeof value !== "object" || value === null)
+    throw new NSGetterRuntimeError(
+      `Cannot interpolate an invalid ${MemberKind[kind]} value.`
+    );
+  const components2 = structuredLeafFields(kind).map((field) => {
+    const component = Reflect.get(value, field.key);
+    if (typeof component !== "number")
+      throw new NSGetterRuntimeError(
+        `${MemberKind[kind]}.${field.key} must be a number for interpolation.`
+      );
+    if (field.type === "int") {
+      if (!Number.isInteger(component))
+        throw new NSGetterRuntimeError(
+          `${MemberKind[kind]}.${field.key} must be an integer for interpolation.`
+        );
+      return String(component);
+    }
+    return formatUnityFloat(component, kind === 19 /* Color */ ? 3 : 2);
+  });
+  return `${kind === 19 /* Color */ ? "RGBA" : ""}(${components2.join(", ")})`;
+}
+var init_unity_value_format = __esm({
+  "../packages/neoscript-runtime/src/neoscript/unity-value-format.ts"() {
+    "use strict";
+    init_member_kind_enum();
+    init_structured_leaf_fields();
+    init_NSGetterRuntimeError();
+    init_decimal_math();
+  }
+});
+
 // ../packages/neoscript-runtime/src/world-grid-query-reads.ts
 function worldGridQueryReadKey(read) {
   return read.kind === "placement" ? JSON.stringify([read.kind, read.valueId]) : JSON.stringify([read.kind, read.gridId, read.cell.x, read.cell.y]);
@@ -33871,6 +34249,8 @@ function tupleKeyFragment(entryMember, entry, graph) {
         ];
       case 30 /* Tuple */:
         return [member.kind, tupleKeyFragment(member, child2, graph)];
+      case 3 /* String */:
+        return [member.kind, requireString(child2.value, member)];
       default:
         return [member.kind, setEntryKey(member, child2, graph)];
     }
@@ -34864,291 +35244,6 @@ var init_cell_pattern2 = __esm({
   }
 });
 
-// ../packages/models/src/decimal/decimal-math.ts
-function pow10(exponent) {
-  return TEN ** BigInt(exponent);
-}
-function assertCanonicalInput(value, argName) {
-  const violation = getDecimalStringViolation(value);
-  if (violation !== null) {
-    throw new Error(
-      `Decimal argument "${argName}" (${JSON.stringify(value)}) ${violation}.`
-    );
-  }
-}
-function parseDecimalString(value) {
-  return parseDecimalArg(value, "value");
-}
-function parseDecimalArg(value, argName) {
-  assertCanonicalInput(value, argName);
-  const negative = value.startsWith("-");
-  const unsigned = negative ? value.slice(1) : value;
-  const pointIndex = unsigned.indexOf(".");
-  const digits = pointIndex === -1 ? unsigned : unsigned.slice(0, pointIndex) + unsigned.slice(pointIndex + 1);
-  const scale = pointIndex === -1 ? 0 : unsigned.length - pointIndex - 1;
-  const magnitude = BigInt(digits);
-  return { coefficient: negative ? -magnitude : magnitude, scale };
-}
-function formatDecimalParts(parts) {
-  const negative = parts.coefficient < 0n;
-  const digits = (negative ? -parts.coefficient : parts.coefficient).toString();
-  let unsigned;
-  if (parts.scale === 0) {
-    unsigned = digits;
-  } else {
-    const padded = digits.padStart(parts.scale + 1, "0");
-    const pointIndex = padded.length - parts.scale;
-    unsigned = `${padded.slice(0, pointIndex)}.${padded.slice(pointIndex)}`;
-  }
-  if (parts.coefficient === 0n) return unsigned;
-  return negative ? `-${unsigned}` : unsigned;
-}
-function significantDigitCount(coefficient) {
-  const magnitude = coefficient < 0n ? -coefficient : coefficient;
-  return magnitude.toString().length;
-}
-function assertWithinEnvelope(parts, operation) {
-  if (significantDigitCount(parts.coefficient) > DECIMAL_MAX_SIGNIFICANT_DIGITS) {
-    throw new DecimalOverflowError(
-      `Decimal overflow in ${operation}: the exact result exceeds ${DECIMAL_MAX_SIGNIFICANT_DIGITS} significant digits. Round explicitly (Round/Divide) to reduce precision.`
-    );
-  }
-  if (parts.scale > DECIMAL_MAX_SCALE) {
-    throw new DecimalOverflowError(
-      `Decimal overflow in ${operation}: the exact result exceeds scale ${DECIMAL_MAX_SCALE}. Round explicitly (Round/Divide) to reduce precision.`
-    );
-  }
-  return parts;
-}
-function alignScales(a, b) {
-  const scale = Math.max(a.scale, b.scale);
-  return {
-    a: a.coefficient * pow10(scale - a.scale),
-    b: b.coefficient * pow10(scale - b.scale),
-    scale
-  };
-}
-function compareDecimalStrings(a, b) {
-  const aligned = alignScales(parseDecimalArg(a, "a"), parseDecimalArg(b, "b"));
-  if (aligned.a < aligned.b) return -1;
-  if (aligned.a > aligned.b) return 1;
-  return 0;
-}
-function minDecimalStrings(a, b) {
-  return compareDecimalStrings(a, b) <= 0 ? a : b;
-}
-function maxDecimalStrings(a, b) {
-  return compareDecimalStrings(a, b) >= 0 ? a : b;
-}
-function clampDecimalStrings(value, min, max) {
-  if (compareDecimalStrings(min, max) > 0) {
-    throw new DecimalClampRangeError(MATH_CLAMP_RANGE_MESSAGE);
-  }
-  if (compareDecimalStrings(value, min) < 0) return min;
-  if (compareDecimalStrings(value, max) > 0) return max;
-  return value;
-}
-function absDecimalString(value) {
-  const parts = parseDecimalArg(value, "value");
-  const magnitude = parts.coefficient < 0n ? -parts.coefficient : parts.coefficient;
-  return formatDecimalParts({ coefficient: magnitude, scale: parts.scale });
-}
-function addDecimalStrings(a, b) {
-  const aligned = alignScales(parseDecimalArg(a, "a"), parseDecimalArg(b, "b"));
-  return formatDecimalParts(
-    assertWithinEnvelope(
-      { coefficient: aligned.a + aligned.b, scale: aligned.scale },
-      "addition"
-    )
-  );
-}
-function subtractDecimalStrings(a, b) {
-  const aligned = alignScales(parseDecimalArg(a, "a"), parseDecimalArg(b, "b"));
-  return formatDecimalParts(
-    assertWithinEnvelope(
-      { coefficient: aligned.a - aligned.b, scale: aligned.scale },
-      "subtraction"
-    )
-  );
-}
-function multiplyDecimalStrings(a, b) {
-  const left = parseDecimalArg(a, "a");
-  const right = parseDecimalArg(b, "b");
-  return formatDecimalParts(
-    assertWithinEnvelope(
-      {
-        coefficient: left.coefficient * right.coefficient,
-        scale: left.scale + right.scale
-      },
-      "multiplication"
-    )
-  );
-}
-function assertDigitsInRange(digits, operation) {
-  if (!Number.isInteger(digits)) {
-    throw new DecimalDigitsRangeError(
-      `Decimal ${operation} digits must be an integer (received ${digits}).`
-    );
-  }
-  if (digits < 0 || digits > DECIMAL_MAX_SCALE) {
-    throw new DecimalDigitsRangeError(
-      `Decimal ${operation} digits must be between 0 and ${DECIMAL_MAX_SCALE} (received ${digits}).`
-    );
-  }
-}
-function roundDecimalParts(parts, digits, midpoint) {
-  if (digits >= parts.scale) return parts;
-  const divisor = pow10(parts.scale - digits);
-  const negative = parts.coefficient < 0n;
-  const magnitude = negative ? -parts.coefficient : parts.coefficient;
-  let quotient = magnitude / divisor;
-  const doubled = magnitude % divisor * 2n;
-  const tieRoundsUp = midpoint === "awayFromZero" || quotient % 2n === 1n;
-  if (doubled > divisor || doubled === divisor && tieRoundsUp) {
-    quotient += 1n;
-  }
-  return { coefficient: negative ? -quotient : quotient, scale: digits };
-}
-function roundDecimalString(value, digits) {
-  assertDigitsInRange(digits, "round");
-  const rounded = roundDecimalParts(
-    parseDecimalArg(value, "value"),
-    digits,
-    "toEven"
-  );
-  return formatDecimalParts(assertWithinEnvelope(rounded, "round"));
-}
-function toIntegralParts(parts, direction) {
-  if (parts.scale === 0) return parts;
-  const divisor = pow10(parts.scale);
-  const quotient = parts.coefficient / divisor;
-  const remainder = parts.coefficient % divisor;
-  if (remainder === 0n) return { coefficient: quotient, scale: 0 };
-  if (direction === "floor" && remainder < 0n) {
-    return { coefficient: quotient - 1n, scale: 0 };
-  }
-  if (direction === "ceiling" && remainder > 0n) {
-    return { coefficient: quotient + 1n, scale: 0 };
-  }
-  return { coefficient: quotient, scale: 0 };
-}
-function floorDecimalString(value) {
-  const parts = toIntegralParts(parseDecimalArg(value, "value"), "floor");
-  return formatDecimalParts(assertWithinEnvelope(parts, "floor"));
-}
-function ceilingDecimalString(value) {
-  const parts = toIntegralParts(parseDecimalArg(value, "value"), "ceiling");
-  return formatDecimalParts(assertWithinEnvelope(parts, "ceiling"));
-}
-function truncateDecimalString(value) {
-  const parts = toIntegralParts(parseDecimalArg(value, "value"), "truncate");
-  return formatDecimalParts(assertWithinEnvelope(parts, "truncate"));
-}
-function divideDecimalStrings(a, b, digits) {
-  assertDigitsInRange(digits, "divide");
-  const dividend = parseDecimalArg(a, "a");
-  const divisor = parseDecimalArg(b, "b");
-  if (divisor.coefficient === 0n) {
-    throw new DecimalDivisionByZeroError(
-      `Decimal division by zero: ${JSON.stringify(a)} / ${JSON.stringify(b)}.`
-    );
-  }
-  const exponent = divisor.scale - dividend.scale + digits;
-  let numerator = dividend.coefficient;
-  let denominator = divisor.coefficient;
-  if (exponent >= 0) {
-    numerator *= pow10(exponent);
-  } else {
-    denominator *= pow10(-exponent);
-  }
-  const negative = numerator < 0n !== denominator < 0n;
-  const absNumerator = numerator < 0n ? -numerator : numerator;
-  const absDenominator = denominator < 0n ? -denominator : denominator;
-  let quotient = absNumerator / absDenominator;
-  const remainder = absNumerator % absDenominator;
-  const doubled = remainder * 2n;
-  if (doubled > absDenominator || doubled === absDenominator && quotient % 2n === 1n) {
-    quotient += 1n;
-  }
-  const parts = {
-    coefficient: negative ? -quotient : quotient,
-    scale: digits
-  };
-  return formatDecimalParts(assertWithinEnvelope(parts, "division"));
-}
-function exactPartsFromFloat(value) {
-  if (Number.isNaN(value)) {
-    throw new DecimalNonFiniteError("Cannot convert NaN to a decimal.");
-  }
-  if (!Number.isFinite(value)) {
-    throw new DecimalNonFiniteError(
-      `Cannot convert ${value > 0 ? "Infinity" : "-Infinity"} to a decimal.`
-    );
-  }
-  const view = new DataView(new ArrayBuffer(8));
-  view.setFloat64(0, value);
-  const bits = view.getBigUint64(0);
-  const negative = bits >> 63n === 1n;
-  const exponentBits = Number(bits >> 52n & 0x7ffn);
-  const mantissaBits = bits & 0xfffffffffffffn;
-  let mantissa;
-  let exponent;
-  if (exponentBits === 0) {
-    mantissa = mantissaBits;
-    exponent = -1074;
-  } else {
-    mantissa = mantissaBits | 1n << 52n;
-    exponent = exponentBits - 1075;
-  }
-  if (mantissa === 0n) return { coefficient: 0n, scale: 0 };
-  if (negative) mantissa = -mantissa;
-  let parts;
-  if (exponent >= 0) {
-    parts = { coefficient: mantissa * (1n << BigInt(exponent)), scale: 0 };
-  } else {
-    parts = {
-      coefficient: mantissa * 5n ** BigInt(-exponent),
-      scale: -exponent
-    };
-  }
-  while (parts.scale > 0 && parts.coefficient % TEN === 0n) {
-    parts = { coefficient: parts.coefficient / TEN, scale: parts.scale - 1 };
-  }
-  return parts;
-}
-function decimalStringFromFloat(value, digits) {
-  assertDigitsInRange(digits, "float conversion");
-  const rounded = roundDecimalParts(
-    exactPartsFromFloat(value),
-    digits,
-    "toEven"
-  );
-  return formatDecimalParts(assertWithinEnvelope(rounded, "float conversion"));
-}
-function floatFromDecimalString(value) {
-  assertCanonicalInput(value, "value");
-  return Number(value);
-}
-var DecimalOverflowError, DecimalDivisionByZeroError, DecimalDigitsRangeError, DecimalNonFiniteError, DecimalClampRangeError, MATH_CLAMP_RANGE_MESSAGE, TEN;
-var init_decimal_math = __esm({
-  "../packages/models/src/decimal/decimal-math.ts"() {
-    "use strict";
-    init_member_kinds();
-    DecimalOverflowError = class extends Error {
-    };
-    DecimalDivisionByZeroError = class extends Error {
-    };
-    DecimalDigitsRangeError = class extends Error {
-    };
-    DecimalNonFiniteError = class extends Error {
-    };
-    DecimalClampRangeError = class extends Error {
-    };
-    MATH_CLAMP_RANGE_MESSAGE = "Math.Clamp requires min <= max.";
-    TEN = 10n;
-  }
-});
-
 // ../packages/neoscript-language/src/text-formats.ts
 function formatSpecifier(letter) {
   switch (letter) {
@@ -43212,13 +43307,6 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
   } else if (ins.mutation === "Add" /* Add */ && !isArrayCollection(targetValue)) {
     overlayArgs[1] = findKnownRowIdByValueReference(args[1], ctx) ?? args[1];
   }
-  if (ins.mutation === "Add" /* Add */ && isArrayCollection(targetValue) && unorderedContainerValueId !== null && !isLookupSet && findKnownRowIdByValueReference(args[0], ctx) === null) {
-    overlayArgs[0] = createUnorderedScalarProjectionEntry(
-      unorderedContainerValueId,
-      args[0] instanceof NSSlotReference ? [args[0].targetId] : args[0],
-      ctx
-    );
-  }
   const unorderedEntriesBeforeMutation = unorderedContainerValueId === null || !Array.isArray(targetValue) || ins.mutation === "Add" /* Add */ ? null : [...targetValue];
   const writesEntry = (ins.mutation === "Add" /* Add */ || ins.mutation === "Insert" /* Insert */) && !isLookupSet;
   let attachedValueId = null;
@@ -43253,6 +43341,13 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
       );
     }
   }
+  if (ins.mutation === "Add" /* Add */ && isArrayCollection(targetValue) && unorderedContainerValueId !== null && !isLookupSet && findKnownRowIdByValueReference(args[0], ctx) === null) {
+    overlayArgs[0] = createUnorderedScalarProjectionEntry(
+      unorderedContainerValueId,
+      args[0] instanceof NSSlotReference ? [args[0].targetId] : args[0],
+      ctx
+    );
+  }
   const removableRowIds = isLookupSet || ins.reference === true ? null : removableEntryRowIds(targetValue, ins.mutation, overlayArgs, ctx);
   const removedIndex = applyLocalCollectionMutation(
     targetValue,
@@ -45970,9 +46065,16 @@ function formatDebugValue(value, type2, ctx) {
 }
 function formatForInterp(value, sourceType, ctx) {
   if (value === null || value === void 0) return "";
+  sourceType = runtimeConcreteTypeInfo(sourceType, ctx);
   const sequenceType = inspectNeoScriptSequenceType(ctx, sourceType);
-  if (sequenceType !== null) return `(${sequenceType}, unenumerated)`;
+  if (sequenceType !== null) return `<${sequenceType} unenumerated>`;
   switch (sourceType.type) {
+    case 14 /* Vector2 */:
+    case 16 /* Vector3 */:
+    case 15 /* Vector2Int */:
+    case 17 /* Vector3Int */:
+    case 19 /* Color */:
+      return formatUnityValue(value, sourceType.type);
     case 8 /* Enum */: {
       const cbId = sourceType.enumId;
       const cb = evaluatorSchemaIndex(ctx).enum(cbId);
@@ -53965,6 +54067,7 @@ var DELEGATE_LEXICAL_THIS, DELEGATE_LEXICAL_ROOT, DELEGATE_LEXICAL_TYPE_ARGUMENT
 var init_evaluateNSGetter = __esm({
   "../packages/neoscript-runtime/src/neoscript/evaluateNSGetter.ts"() {
     "use strict";
+    init_unity_value_format();
     init_sequence_dependencies();
     init_sequence_contract();
     init_type_info_compatibility();
@@ -55733,7 +55836,7 @@ function resolveMemberDeclaredTypeInfoInternal(member, members2, seen, ownerClas
       Object.entries(declaredSlotArguments(resolved) ?? {}).flatMap(
         ([genericParamId, binding]) => {
           if (!isMemberGenericBinding(binding)) {
-            const forwarded = genericParamTypeInfo(
+            const forwarded = genericParamTypeInfo2(
               ownerClass,
               binding.genericParamId,
               true
@@ -55881,7 +55984,7 @@ function resolveMemberDeclaredTypeInfoInternal(member, members2, seen, ownerClas
   if (resolved.kind === 9 /* Lookup */) return null;
   if (!memberKindSupportsStorage(resolved.kind)) return null;
   if (isMemberGenericBase(resolved)) {
-    return genericParamTypeInfo(
+    return genericParamTypeInfo2(
       ownerClass,
       resolved.genericParamId,
       isRequiredMember(resolved)
@@ -55892,7 +55995,7 @@ function resolveMemberDeclaredTypeInfoInternal(member, members2, seen, ownerClas
     required: isRequiredMember(resolved)
   };
 }
-function genericParamTypeInfo(ownerClass, genericParamId, required2) {
+function genericParamTypeInfo2(ownerClass, genericParamId, required2) {
   if (ownerClass === null) return null;
   const declaration = ownerClass.genericParams?.find(
     (parameter4) => parameter4.id === genericParamId
@@ -62535,18 +62638,19 @@ function buildNeoScriptEditorIndex(lexed, kind) {
       lexed,
       diagnostics
     );
+    const regionCalls = indexCalls(executable, executablePairs, lexed);
     const regionLocals = applySwitchSectionScopes(
       indexLocals(
         executable,
         executablePairs,
         lexed,
         diagnostics,
-        lambdaBodies
+        lambdaBodies,
+        regionCalls
       ),
       regionSwitches,
       lexed
     );
-    const regionCalls = indexCalls(executable, executablePairs, lexed);
     const declarations = new Set(
       regionLocals.map(
         (local) => `${local.nameRange.start.line}:${local.nameRange.start.character}`
@@ -62999,9 +63103,10 @@ function duplicateUnitDiagnostic(label, units, diagnostics) {
     ]
   });
 }
-function indexLocals(tokens, pairs, lexed, diagnostics, lambdaBodies) {
+function indexLocals(tokens, pairs, lexed, diagnostics, lambdaBodies, calls) {
   const locals = [];
   const braceScope = braceScopeIndex(tokens, lexed.end);
+  const switchArrows = switchExpressionArrowIndexes(tokens, calls);
   for (let index = 0; index < tokens.length; index++) {
     const caught = tryParseCatchParameter(tokens, index, pairs, lexed);
     if (caught) {
@@ -63022,7 +63127,13 @@ function indexLocals(tokens, pairs, lexed, diagnostics, lambdaBodies) {
       index = loop.resumeTokenIndex;
       continue;
     }
-    const lambda = tryParseLambdaParameters(tokens, index, pairs, lexed);
+    const lambda = tryParseLambdaParameters(
+      tokens,
+      index,
+      pairs,
+      lexed,
+      switchArrows
+    );
     if (lambda) {
       locals.push(...lambda.locals);
       lambdaBodies.push(lambda.body);
@@ -63183,7 +63294,35 @@ function statementEndTokenIndex(tokens, start) {
   }
   return tokens.length;
 }
-function tryParseLambdaParameters(tokens, start, pairs, lexed) {
+function switchExpressionArrowIndexes(tokens, calls) {
+  const enclosing = enclosingOpenerIndex(tokens);
+  const inResult = /* @__PURE__ */ new Set();
+  const arrows = /* @__PURE__ */ new Set();
+  const genericEnds = /* @__PURE__ */ new Map();
+  for (const call of calls) {
+    const first = call.typeArgumentTokens?.[0];
+    if (first) genericEnds.set(first.start, call.openParenOffset);
+  }
+  for (let index = 0; index < tokens.length; index++) {
+    const token = tokens[index];
+    const genericEnd = genericEnds.get(token.start);
+    if (genericEnd !== void 0) {
+      while (tokens[index + 1] && tokens[index + 1].start < genericEnd)
+        index++;
+      continue;
+    }
+    const opener = enclosing[index];
+    if (tokens[opener]?.text !== "{" || tokens[opener - 1]?.text !== "switch")
+      continue;
+    if (token.text === ",") inResult.delete(opener);
+    else if (token.text === "=>" && !inResult.has(opener)) {
+      arrows.add(index);
+      inResult.add(opener);
+    }
+  }
+  return arrows;
+}
+function tryParseLambdaParameters(tokens, start, pairs, lexed, switchArrows) {
   const open2 = tokens[start];
   if (!open2) return null;
   if (open2.kind === "identifier") {
@@ -63191,6 +63330,7 @@ function tryParseLambdaParameters(tokens, start, pairs, lexed) {
     if (!arrow2 || arrow2.kind !== "operator" || arrow2.text !== "=>") {
       return null;
     }
+    if (switchArrows.has(start + 1)) return null;
     const body2 = lambdaBodySpan(tokens, start + 1, pairs, lexed);
     return {
       locals: [
@@ -63215,6 +63355,7 @@ function tryParseLambdaParameters(tokens, start, pairs, lexed) {
   if (closeIndex === void 0) return null;
   const arrow = tokens[closeIndex + 1];
   if (!arrow || arrow.kind !== "operator" || arrow.text !== "=>") return null;
+  if (switchArrows.has(closeIndex + 1)) return null;
   const body = lambdaBodySpan(tokens, closeIndex + 1, pairs, lexed);
   const locals = [];
   for (const [parameterIndex, [from, to]] of patternSegments(
@@ -85559,6 +85700,20 @@ function substituteManifestType(type2, genericEnvironment, environment, seenPara
       )
     };
   }
+  if (type2.kind === "tuple") {
+    return {
+      ...type2,
+      elements: type2.elements.map((element) => ({
+        ...element,
+        type: substituteManifestType(
+          element.type,
+          genericEnvironment,
+          environment,
+          seenParameters
+        )
+      }))
+    };
+  }
   if (type2.kind === "dictionary") {
     return {
       ...type2,
@@ -87287,6 +87442,10 @@ function createNeoScriptDocumentContextInScope(context, projectOverride) {
     ...parameterDefaultDescriptor(argument2, context)
   }));
   const member = context.memberId ? analyzerMemberById(context, context.memberId) : void 0;
+  const declaringClass2 = context.declaringClass ?? context.thisClass ?? (member && isStaticMember(member) ? context.vm.classes.find(
+    (candidate) => Object.values(candidate.schema).includes(member.id)
+  ) : void 0);
+  const declaringType = declaringClass2 ? namedType(declaringClass2.id, true) : void 0;
   let functionName = context.functionName;
   if (functionName === void 0 && member) {
     const accessor = documentKind === "getter" || documentKind === "setter" ? documentKind : void 0;
@@ -87296,10 +87455,15 @@ function createNeoScriptDocumentContextInScope(context, projectOverride) {
     kind: documentKind,
     project,
     ...thisClass ? { thisClass } : {},
+    ...declaringType ? {
+      declaringType,
+      implicitMemberAccess: true,
+      staticMember: context.staticMember ?? isStaticMember(member) === true
+    } : {},
     ...isExtensionMember(member) ? {
       declaringType: null,
       implicitMemberAccess: false,
-      staticMember: isStaticMember(member) === true,
+      staticMember: context.staticMember ?? isStaticMember(member) === true,
       extensionReceiver: toLanguageType(
         member.extension.receiverType,
         context
@@ -88895,7 +89059,9 @@ function projectLanguageVersion(context) {
     context.vm.project.id,
     context.vm.project.updatedAt,
     ...projectRootMemberIds(context.vm.project),
-    ...records3.map((record7) => `${record7.id}:${record7.updatedAt}`).sort()
+    ...records3.map((record7) => `${record7.id}:${record7.updatedAt}`).sort(),
+    JSON.stringify(context.variants ?? []),
+    JSON.stringify(context.variantFolders ?? [])
   ].join("|");
 }
 function virtualSourceUri(context, directory, fileName2) {
@@ -89390,6 +89556,8 @@ function createContext(ctx, options) {
   const analyzer = {
     vm: prepared ?? createAnalyzerProject(ctx),
     thisClass: ctx.thisClass,
+    declaringClass: ctx.declaringClass,
+    staticMember: ctx.staticMember,
     memberId: ctx.memberId,
     functionName: ctx.functionName,
     ...ctx.valueAliases ? { valueAliases: ctx.valueAliases } : {},
@@ -89409,6 +89577,8 @@ function createContext(ctx, options) {
   );
   const replayContext = ctx.storedConstructionReplay === true ? { ...adapted, storedConstructionReplay: true } : adapted;
   if (adapted.extensionReceiver) return replayContext;
+  if (ctx.implicitMemberAccess === false)
+    return { ...replayContext, implicitMemberAccess: false };
   if (ctx.implicitMemberAccess !== true) return replayContext;
   return {
     ...replayContext,
@@ -89532,6 +89702,48 @@ var init_compiler_adapter = __esm({
   }
 });
 
+// ../src/database/neoscript/initializer-context.ts
+function memberInitializerContext(code, declaringClass2, isStatic, constructors) {
+  const instanceClass = isStatic ? null : declaringClass2;
+  let lexicalThisClass = null;
+  try {
+    if (parseExpression(code).kind === "lambda")
+      lexicalThisClass = instanceClass;
+  } catch {
+  }
+  return {
+    declaringClass: declaringClass2,
+    lexicalThisClass,
+    argumentTypes: initializerArgumentTypes(instanceClass, constructors)
+  };
+}
+function initializerArgumentTypes(ownerClass, constructors) {
+  if (ownerClass === null) return void 0;
+  const requiredConstructorId2 = ownerClass.requiredConstructorId;
+  if (requiredConstructorId2 === void 0) return void 0;
+  if (requiredConstructorId2 === null) return void 0;
+  const required2 = constructors.find(
+    (constructor2) => constructor2.id === requiredConstructorId2
+  );
+  if (required2 === void 0) {
+    throw new Error(
+      `Class "${ownerClass.name}" names required constructor "${requiredConstructorId2}", but no such constructor record was loaded.`
+    );
+  }
+  if (required2.classId !== ownerClass.id) {
+    throw new Error(
+      `Class "${ownerClass.name}" names required constructor "${requiredConstructorId2}", which is owned by class "${required2.classId}".`
+    );
+  }
+  return required2.argumentTypes.map((argument2) => ({ ...argument2 }));
+}
+var init_initializer_context2 = __esm({
+  "../src/database/neoscript/initializer-context.ts"() {
+    "use strict";
+    init_executable_parser();
+  }
+});
+
 // ../src/database/compile-ns-property.ts
 function compilationProjectContext(args, members2 = args.members) {
   return {
@@ -89726,7 +89938,6 @@ 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(
@@ -89738,10 +89949,10 @@ function compileMemberInitializerBody(args) {
         variantFolders: args.variantFolders ?? [],
         returnTypeInfo,
         initializerName: args.member.name,
-        lexicalThisClass: parseExpression(defaultValue.init.code).kind === "lambda" ? instanceClass : null,
-        declaringClass: args.thisClass,
-        argumentTypes: initializerArgumentTypes(
-          instanceClass,
+        ...memberInitializerContext(
+          defaultValue.init.code,
+          args.thisClass,
+          isStaticMember(args.member) === true,
           args.constructors ?? []
         )
       })
@@ -89805,26 +90016,6 @@ function compileValueRowInitializerBody(args) {
   }
   Object.assign(container.init, { compiled });
 }
-function initializerArgumentTypes(ownerClass, constructors) {
-  if (ownerClass === null) return void 0;
-  const requiredConstructorId2 = ownerClass.requiredConstructorId;
-  if (requiredConstructorId2 === void 0) return void 0;
-  if (requiredConstructorId2 === null) return void 0;
-  const required2 = constructors.find(
-    (constructor2) => constructor2.id === requiredConstructorId2
-  );
-  if (required2 === void 0) {
-    throw new Error(
-      `Class "${ownerClass.name}" names required constructor "${requiredConstructorId2}", but no such constructor record was loaded.`
-    );
-  }
-  if (required2.classId !== ownerClass.id) {
-    throw new Error(
-      `Class "${ownerClass.name}" names required constructor "${requiredConstructorId2}", which is owned by class "${required2.classId}".`
-    );
-  }
-  return required2.argumentTypes.map((argument2) => ({ ...argument2 }));
-}
 function compileAuthoredMemberBodies(args) {
   compileNSPropertyBodies(args);
   compileNSFunctionBody(args);
@@ -90203,7 +90394,7 @@ var init_compile_ns_property = __esm({
     init_compile_delegate_closure();
     init_compiler_adapter();
     init_compiler_adapter();
-    init_executable_parser();
+    init_initializer_context2();
     NeoScriptBodyCompileError = class extends Error {
       memberId;
       memberName;
@@ -95922,6 +96113,8 @@ function validateOwnedStaticDefault(uri, member, ownerName, scope, environment,
   const initializer = member.initializer;
   if (initializer === void 0) return;
   if (member.type.name === "Reference") return;
+  if (member.type.name === "Set" && member.type.typeArguments[0]?.name === "Reference")
+    return;
   let expression;
   try {
     expression = parseExpression(initializer.text);
@@ -97044,6 +97237,21 @@ function knownGeneratorExpression(expression, scope, environment) {
   return candidates !== void 0 && candidates.length > 0 && candidates.every((member) => member.generator === true);
 }
 function validateExpression(expression, expected, scope, environment, uri, range2, diagnostics, anchor, storedValue = true) {
+  if (anchor !== void 0 && expression.kind === "call") {
+    const error = sourceCallBinding(expression, scope, environment)?.error;
+    if (error?.message.includes(
+      "Named arguments are not supported for this call."
+    )) {
+      pushDiagnostic(
+        diagnostics,
+        uri,
+        anchorSpan(anchor, error, 1),
+        "invalid-function-call",
+        error.message.replace(/^\d+:\d+: /, "")
+      );
+      return;
+    }
+  }
   if (expression.kind === "new" && expression.typeArguments?.length) {
     const { context } = initializerResolver(
       environment,
@@ -100825,6 +101033,15 @@ function substituteInheritedSourceMember(member, baseInfo, resolvedBaseType) {
     if (type2.kind === "list" || type2.kind === "set") {
       return { ...type2, elementType: substitute2(type2.elementType) };
     }
+    if (type2.kind === "tuple") {
+      return {
+        ...type2,
+        elements: type2.elements.map((element) => ({
+          ...element,
+          type: substitute2(element.type)
+        }))
+      };
+    }
     if (type2.kind === "dictionary") {
       return {
         ...type2,
@@ -119786,7 +120003,7 @@ function genericEnvironmentKey(env) {
     [...env].sort(([left], [right]) => left.localeCompare(right))
   );
 }
-function createTypedValueNormalizer(reader, document, childrenByContainerId, parameterTypesForRow, memberById2, memberTypeInfo2, genericEnvironmentForRow, rowIdentities, readTracking, referenceTargets, localizedTexts) {
+function createTypedValueNormalizer(reader, document, childrenByContainerId, parameterTypesForRow, memberById2, memberTypeInfo2, genericEnvironmentForRow, rowIdentities, readTracking, referenceTargets, localizedTexts, classMemberIdentities) {
   const visiting = /* @__PURE__ */ new Set();
   const completed = /* @__PURE__ */ new Map();
   const compare2 = createEffectiveValueComparator();
@@ -119993,23 +120210,26 @@ function createTypedValueNormalizer(reader, document, childrenByContainerId, par
       document.members
     );
     const members2 = /* @__PURE__ */ new Map();
-    const keys = /* @__PURE__ */ new Set();
+    const keys = /* @__PURE__ */ new Map();
     for (const entry of merged) {
       if (entry.memberId === null) continue;
       const member = memberById2(entry.memberId);
       if (member === void 0) continue;
       members2.set(entry.schemaKey, member);
-      keys.add(entry.schemaKey);
+      keys.set(entry.schemaKey, `member:${entry.memberId}`);
+    }
+    for (const key of Object.keys(row.value)) {
+      if (!keys.has(key)) keys.set(key, `key:${key}`);
     }
-    for (const key of Object.keys(row.value)) keys.add(key);
     const result = /* @__PURE__ */ Object.create(null);
-    for (const schemaKey of keys) {
+    for (const [schemaKey, identity3] of keys) {
+      const outputKey = classMemberIdentities ? identity3 : schemaKey;
       const rawMember = members2.get(schemaKey);
       const member = rawMember === void 0 ? void 0 : substituteMember(rawMember, env, document.members);
       if (member === void 0) {
         const childId2 = row.value[schemaKey];
         if (childId2 !== void 0)
-          result[schemaKey] = normalizeOpaqueOwnedRow(childId2);
+          result[outputKey] = normalizeOpaqueOwnedRow(childId2);
         continue;
       }
       if (!memberKindOwnsStoredValue(member.kind)) continue;
@@ -120022,17 +120242,17 @@ function createTypedValueNormalizer(reader, document, childrenByContainerId, par
       });
       if (slot.kind === "missing") continue;
       if (slot.kind === "null") {
-        result[schemaKey] = { value: null };
+        result[outputKey] = { value: null };
         continue;
       }
       const childId = slot.kind === "declaration" ? reader.declarationRow(member, env).id : slot.value;
       const type2 = memberTypeInfo2(member, env);
       if (typeof childId !== "string") {
-        result[schemaKey] = normalizeLiteral(childId);
+        result[outputKey] = normalizeLiteral(childId);
       } else if (type2 === null) {
-        result[schemaKey] = normalizeOpaqueOwnedRow(childId);
+        result[outputKey] = normalizeOpaqueOwnedRow(childId);
       } else {
-        result[schemaKey] = normalizeTypedRow(childId, type2, member, env);
+        result[outputKey] = normalizeTypedRow(childId, type2, member, env);
       }
     }
     return result;
@@ -120142,7 +120362,8 @@ var init_effective_value_reader = __esm({
       materializedIndex;
       storedPlacements;
       graphCache;
-      createNormalizer(rowIdentities, referenceTargets) {
+      constructorArgumentNormalizer;
+      createNormalizer(rowIdentities, referenceTargets, classMemberIdentities = false) {
         return createTypedValueNormalizer(
           this,
           this.document,
@@ -120154,7 +120375,8 @@ var init_effective_value_reader = __esm({
           rowIdentities,
           this.context.readTracking,
           referenceTargets,
-          this.localizedTextsById()
+          this.localizedTextsById(),
+          classMemberIdentities
         );
       }
       localizedTextsById() {
@@ -120574,7 +120796,15 @@ var init_effective_value_reader = __esm({
       normalizeConstructorArguments(args, root, placement) {
         if (placement !== void 0) this.placements.set(root.id, placement);
         assertStoredConstructionStamp(root);
-        return this.normalizer.normalizeConstructorArgs(args, root);
+        this.constructorArgumentNormalizer ??= this.createNormalizer(
+          void 0,
+          void 0,
+          true
+        );
+        return this.constructorArgumentNormalizer.normalizeConstructorArgs(
+          args,
+          root
+        );
       }
       normalizeTypedRow(valueId, typeInfo, placement, env, rowIdentities, referenceTargets) {
         if (placement !== void 0) this.placements.set(valueId, placement);
@@ -123968,7 +124198,7 @@ function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, ba
       storesSelectionArray,
       `${ownerClass.name}.${declaration.name}`,
       !declaration.modifiers.includes("static") && contextualEnumArgument(settings, "kind") === "Unordered",
-      reference2 !== null
+      reference2 !== null ? fieldType : null
     )
   };
   if (fieldType.tupleElements) {
@@ -125246,7 +125476,7 @@ function spellsReference(expression) {
   }
   return expression.kind === "call" && expression.callee.kind === "ident" && expression.callee.name === "Reference";
 }
-function lowerDefault(context, initializer, type2, ownerClass, base, memberId, storesSelectionArray, path, unorderedList = false, reference2 = false) {
+function lowerDefault(context, initializer, type2, ownerClass, base, memberId, storesSelectionArray, path, unorderedList = false, referenceType = null) {
   if (initializer === null) {
     return base?.defaultValue && "serverValueId" in base.defaultValue ? base.defaultValue : null;
   }
@@ -125268,9 +125498,14 @@ function lowerDefault(context, initializer, type2, ownerClass, base, memberId, s
   }
   if (base?.defaultValue != null && matchesStoredInitializer(base.defaultValue, initializer))
     return base.defaultValue;
-  const deferred = reference2 ? deferredReferenceDefault(context, expression) : null;
+  const deferred = referenceType !== null && (referenceType.name !== "Set" || expression.kind === "litList") ? deferredReferenceDefault(context, expression) : null;
   if (deferred !== null) return { value: deferred, classId: null };
-  if (unorderedList && expression.kind === "litList" && expression.elements.length > 0 || constructsValue(expression) && slotForwardsTypeParameter(context, type2, ownerClass) || positionRequiresEvaluation(context, expression, type2, ownerClass)) {
+  if (unorderedList && expression.kind === "litList" && expression.elements.length > 0 || constructsValue(expression) && slotForwardsTypeParameter(context, type2, ownerClass) || positionRequiresEvaluation(
+    context,
+    expression,
+    referenceType ?? type2,
+    ownerClass
+  )) {
     return {
       init: {
         code: context.settleInitializerReferences(
@@ -125286,7 +125521,7 @@ function lowerDefault(context, initializer, type2, ownerClass, base, memberId, s
   if (context.rowBackedDefaultMemberIds.has(memberId) && base?.defaultValue && !("serverValueId" in base.defaultValue)) {
     return base.defaultValue;
   }
-  const slot = reference2 ? slotReferenceType(type2) : null;
+  const slot = referenceType !== null ? slotReferenceType(type2) : null;
   if (slot !== null && !spellsReference(expression)) {
     throw new Error(
       `A ${formatManifestType(slot)} default names a stored ${formatManifestType(requiredTypeArgument(slot, 0))}, not a value. Wrap a member path in Reference(), or give a row id.`
@@ -140476,22 +140711,23 @@ var init_project_commit_preparation_scoped_loader = __esm({
 // ../src/database/compiled-construction-types.ts
 function compiledConstructionTypeMembers(members2, bodies, projectId) {
   const created = [];
+  const createdKeys = [];
   let existingIds;
   const byType = /* @__PURE__ */ new Map();
   const key = (type2) => canonicalJsonStringify(type2);
-  const intern = (type2) => {
-    const signature2 = key(type2);
-    const existing = byType.get(signature2);
+  const intern = (type2, slot) => {
+    const cacheKey = slot?.id ?? key(type2);
+    const existing = byType.get(cacheKey);
     if (existing !== void 0) return existing;
     if (type2.type === 21 /* Generic */ || type2.type === NS_TYPE_UNKNOWN)
       return null;
-    const id2 = v5_default(
-      `neo:compiled-construction-type:${projectId}:${signature2}`,
+    const id2 = slot?.id ?? v5_default(
+      `neo:compiled-construction-type:${projectId}:${cacheKey}`,
       v5_default.URL
     );
     existingIds ??= new Set(members2.map((member) => member.id));
     if (existingIds.has(id2)) {
-      byType.set(signature2, id2);
+      byType.set(cacheKey, id2);
       return id2;
     }
     const common = {
@@ -140499,11 +140735,24 @@ function compiledConstructionTypeMembers(members2, bodies, projectId) {
       projectId,
       createdAt: 0,
       updatedAt: 0,
-      name: "Type argument",
+      name: slot?.name ?? "Type argument",
       kind: type2.type,
       requirement: type2.required ? 1 /* Required */ : 0 /* Optional */
     };
+    const mark = created.length;
     const fields = (() => {
+      if (type2.type === 30 /* Tuple */) {
+        const elementMemberIds = [];
+        for (const [index, element] of type2.elements.entries()) {
+          const memberId = intern(element.typeInfo, {
+            id: derivedTupleElementMemberId(id2, index),
+            name: element.name ?? `Item${index + 1}`
+          });
+          if (memberId === null) return null;
+          elementMemberIds.push(memberId);
+        }
+        return { elementMemberIds };
+      }
       if (type2.type === 6 /* List */ || type2.type === 28 /* Set */ || type2.type === 5 /* Dictionary */) {
         const entryMemberId = intern(type2.entryTypeInfo);
         if (entryMemberId === null) return null;
@@ -140547,10 +140796,15 @@ function compiledConstructionTypeMembers(members2, bodies, projectId) {
         return {};
       }
     })();
-    if (fields === null) return null;
+    if (fields === null) {
+      for (const member of created.splice(mark)) existingIds.delete(member.id);
+      for (const key2 of createdKeys.splice(mark)) byType.delete(key2);
+      return null;
+    }
     created.push({ ...common, ...fields });
+    createdKeys.push(cacheKey);
     existingIds.add(id2);
-    byType.set(signature2, id2);
+    byType.set(cacheKey, id2);
     return id2;
   };
   const visited = /* @__PURE__ */ new Set();
@@ -140604,6 +140858,7 @@ var init_compiled_construction_types = __esm({
     init_neoscript_guards();
     init_neoscript();
     init_project_content_hash();
+    init_tuple_element_member_id();
   }
 });
 
@@ -141524,7 +141779,7 @@ var init_stored_closure_captures = __esm({
 });
 
 // ../src/database/construction-replay-equality.ts
-function createConstructionReplayComparer(reader, ownedValueIds) {
+function createConstructionReplayComparer(reader, ownedValueIds, replayReader = reader) {
   let graph;
   return (args) => {
     if (!isLiteralValueContent(args.currentRoot)) return false;
@@ -141561,7 +141816,7 @@ function createConstructionReplayComparer(reader, ownedValueIds) {
         args.currentRoot,
         args.rootMember
       ),
-      reader.withRowOverrides(args.replayRows).normalizeConstructorArguments(
+      replayReader.withRowOverrides(args.replayRows).normalizeConstructorArguments(
         replayed,
         args.replayRoot,
         args.rootMember
@@ -158604,6 +158859,12 @@ function compilePulledUncompiledConstructorsV4(document, compilationProject, rep
 }
 function compilePulledProjectDocumentForEvaluationV4(document, compilationProject, targets) {
   const compiled = [];
+  for (let index = 0; index < document.values.length; index += 1) {
+    const row = document.values[index];
+    if (targets !== void 0 && !targets.valueIds?.has(row.id)) continue;
+    if (!isInitValueContent(row) || row.init.compiled === void 0) continue;
+    document.values[index] = { ...row, init: { code: row.init.code } };
+  }
   const sharedCompilationProject = compilationProject ?? createNeoScriptCompilationProject({
     project: document.project,
     projectFiles: document.projectFiles,
@@ -162374,8 +162635,14 @@ function memberInitializerRequiresEvaluation(context, member, expression, source
     return false;
   }
   if (member.kind === "lookup" && expression.kind === "litList") {
+    const elementMember = { ...member, multiselect: false };
     return expression.elements.some(
-      (element) => memberInitializerRequiresEvaluation(context, member, element, source)
+      (element) => memberInitializerRequiresEvaluation(
+        context,
+        elementMember,
+        element,
+        source
+      )
     );
   }
   const unorderedDefault = source.purpose === "memberDefault" && member.id === source.memberId && member.kind === "list" && member.listKind === "unordered" && expression.kind === "litList" && expression.elements.length > 0;
@@ -162416,6 +162683,7 @@ function deferredPathSpelling(context, expression, expected) {
 }
 function isDeferredPathReferenceValue(context, sourceExpression, expected) {
   const expression = annotatedValue(sourceExpression).expression;
+  if (expected.multiselect && expression.kind !== "litList") return false;
   const elements = expression.kind === "litList" ? expression.elements : [expression];
   let indexPaths = 0;
   for (const element of elements) {
@@ -166292,9 +166560,13 @@ function lowerEnum2(context, member, expression) {
   });
 }
 function lowerReferences(context, member, expression, ownerValueId, source) {
+  function refuse(message, at3 = expression) {
+    context.loweringFailures.push({ message, site: referenceSite(source, at3) });
+    throw new ReportedLoweringFailure(message);
+  }
   const elements = member.multiselect ? expression.kind === "litList" ? expression.elements : null : [expression];
   if (elements === null) {
-    throw new Error(`Reference member ${member.name} requires [...].`);
+    refuse(`Reference member ${member.name} requires [...].`);
   }
   const ids = [];
   for (const [index, entry] of elements.entries()) {
@@ -166312,7 +166584,7 @@ function lowerReferences(context, member, expression, ownerValueId, source) {
     }
     const target = referenceTargetSpelling(context, entry);
     if (target === null) {
-      throw new Error(`Reference member ${member.name} has an invalid target.`);
+      refuse(`Reference member ${member.name} has an invalid target.`, entry);
     }
     if (target.spelling === "key" || target.spelling === "local") {
       ids.push(`${PENDING_ID_PREFIX}reference-key:${source.label}:${index}`);
@@ -166335,9 +166607,7 @@ function lowerReferences(context, member, expression, ownerValueId, source) {
     ids.push(target.spelling === "id" ? target.id : target.resolved.id);
   }
   if (new Set(ids).size !== ids.length) {
-    throw new Error(
-      `Reference member ${member.name} cannot contain duplicate targets.`
-    );
+    refuse(`Reference member ${member.name} cannot contain duplicate targets.`);
   }
   return ids;
 }
@@ -171728,19 +171998,24 @@ function reconcileMaterializedInitializersV4(args) {
       continue;
     }
     assertPulledConstructorsCompiled(replayDocument, replayContext);
-    currentRows ??= storedRowsWithRenamedKeys(
-      currentState().document,
-      replayDocument
-    );
-    compareConstruction ??= createConstructionReplayComparer(
-      new EffectiveValueReader(storedRowsDocument(replayDocument, currentRows)),
-      (root, member) => {
-        return storedOwnedValues().collect({
-          rootIds: [root.id],
-          rootMembers: /* @__PURE__ */ new Map([[root.id, member]])
-        });
-      }
-    );
+    currentRows ??= new Map(
+      currentState().document.values.map((row) => [row.id, row])
+    );
+    if (compareConstruction === void 0) {
+      const storedDocument = currentState().document;
+      compilePulledUncompiledConstructorsV4(storedDocument);
+      assertPulledConstructorsCompiled(storedDocument);
+      compareConstruction = createConstructionReplayComparer(
+        new EffectiveValueReader(storedDocument),
+        (root, member) => {
+          return storedOwnedValues().collect({
+            rootIds: [root.id],
+            rootMembers: /* @__PURE__ */ new Map([[root.id, member]])
+          });
+        },
+        new EffectiveValueReader(replayDocument)
+      );
+    }
     const replay = replayRows.get(reconciliation.valueId);
     if (replay === void 0) {
       throw new Error(
@@ -171901,51 +172176,6 @@ function retainedLiteralFailure(args, records3, document, replayContext, compile
     );
   }
 }
-function storedRowsDocument(document, rows) {
-  const values = [];
-  for (const row of document.values) {
-    if (rows.has(row.id)) continue;
-    if (row.containerId && rows.has(row.containerId)) continue;
-    values.push(row);
-  }
-  for (const row of rows.values()) values.push(row);
-  return { ...document, values: freezeJsonData(values) };
-}
-function storedRowsWithRenamedKeys(before, after) {
-  const renamesByClass = /* @__PURE__ */ new Map();
-  const rows = /* @__PURE__ */ new Map();
-  for (const row of before.values) {
-    let renamed = row;
-    if (typeof row.classId === "string" && isObjectRecord(row.value)) {
-      const classId = row.classId;
-      let renames = renamesByClass.get(classId);
-      if (renames === void 0) {
-        const entries = (document) => mergeInstanceSurfaceSchema(
-          classId,
-          document.classes,
-          document.members
-        ).map((entry) => [entry.schemaKey, entry.memberId]);
-        renames = schemaKeyRenamesByMemberId(entries(before), entries(after));
-        renamesByClass.set(row.classId, renames);
-      }
-      if (renames.size > 0) {
-        const value = {};
-        let collision = false;
-        for (const [key, child2] of Object.entries(row.value)) {
-          const target = renames.get(key) ?? key;
-          if (target !== key && Object.hasOwn(row.value, target) && !renames.has(target)) {
-            collision = true;
-            break;
-          }
-          value[target] = child2;
-        }
-        if (!collision) renamed = { ...row, value };
-      }
-    }
-    rows.set(row.id, renamed);
-  }
-  return rows;
-}
 function pulledStateDocumentV4(workspace) {
   const state = workspace.state.records;
   const remembered = pulledStateDocuments.get(state);
@@ -172042,7 +172272,8 @@ function materializeInitializersLocallyV4(args) {
   const compilationProject = createNeoScriptCompilationProject(authoredDocument);
   const changedBodies = {
     memberIds: /* @__PURE__ */ new Set(),
-    constructorIds: /* @__PURE__ */ new Set()
+    constructorIds: /* @__PURE__ */ new Set(),
+    valueIds: new Set(valueBodyIds)
   };
   for (const change of args.changes) {
     if (change.operation === "delete") continue;
@@ -172071,6 +172302,7 @@ function materializeInitializersLocallyV4(args) {
     for (const id2 of dependentBodies.constructorIds) {
       changedBodies.constructorIds.add(id2);
     }
+    for (const id2 of dependentBodies.valueIds) changedBodies.valueIds.add(id2);
   }
   const compiledBodies = compilePulledProjectDocumentForEvaluationV4(
     authoredDocument,
@@ -172432,7 +172664,6 @@ var init_local_initializer_materialization = __esm({
     init_variant_value_graph();
     init_members();
     init_member_value_id();
-    init_inheritance();
     init_effective_value_reader();
     init_virtual_instance_values();
     init_declared_binding_targets();
@@ -185150,43 +185381,6 @@ var init_export_state = __esm({
   }
 });
 
-// ../packages/neoscript-language/src/argument-name-completions.ts
-function argumentNameCompletions(fields, tokens, start, prefixEnd, position) {
-  const edit = argumentNameCompletionEdit(tokens, start, prefixEnd, position);
-  if (!edit) return [];
-  const { range: range2, hasColon } = edit;
-  const items = [];
-  for (const field of fields) {
-    const insertText = hasColon ? field.name : `${field.name}: `;
-    items.push({
-      label: field.name,
-      kind: "property",
-      detail: field.defaultText === void 0 ? field.type : `[${field.type} = ${field.defaultText}]`,
-      insertText,
-      textEdit: { range: range2, newText: insertText }
-    });
-  }
-  return items;
-}
-function argumentNameCompletionEdit(tokens, start, prefixEnd, position) {
-  const first = tokens[start];
-  if (prefixEnd > start + 1) return null;
-  if (prefixEnd > start && (!first || !isCallArgumentLabelToken(first)))
-    return null;
-  const editingName = first !== void 0 && isCallArgumentLabelToken(first) && positionCompare(first.range.start, position) <= 0 && positionCompare(position, first.range.end) <= 0;
-  if (first && isCallArgumentLabelToken(first) && !editingName) return null;
-  const hasColon = editingName && tokens[start + 1]?.text === ":";
-  const range2 = editingName ? first.range : { start: position, end: position };
-  return { range: range2, hasColon };
-}
-var init_argument_name_completions = __esm({
-  "../packages/neoscript-language/src/argument-name-completions.ts"() {
-    "use strict";
-    init_executable_parser();
-    init_project_source_tokens();
-  }
-});
-
 // ../packages/neoscript-language/src/tuple-symbols.ts
 function tupleElementSymbol(element, index, alias = false) {
   const location3 = alias ? void 0 : element.labelLocation;
@@ -185528,15 +185722,7 @@ function complete(snapshot, position) {
   const tokens = significantTokensBefore(snapshot.lexed.tokens, word.start);
   const tail = tokens[tokens.length - 1];
   let candidates;
-  const genericMember = tail?.text === "<" ? resolveChain(
-    snapshot,
-    expressionTokensBefore(tokens, tokens.length - 1),
-    offset
-  )?.symbol : void 0;
-  const genericMemberId = genericMember?.id;
-  const firstTypeParameter = genericMember?.typeParameters?.[0]?.type;
-  const functionConstraint = firstTypeParameter?.kind === "typeParameter" && firstTypeParameter.constraint?.kind === "named" ? firstTypeParameter.constraint.typeId : void 0;
-  const nativeGenericClassId = genericMemberId === NEO_TILE_CONVERT_MEMBER_ID ? NEO_TILE_CLASS_ID : functionConstraint;
+  const genericTypes = typeArgumentCompletionItems(snapshot, tokens, word);
   const catchFilterCandidates = catchFilterCompletionItems(
     snapshot,
     word.start,
@@ -185553,7 +185739,9 @@ function complete(snapshot, position) {
     prefix,
     word
   );
-  if (catchFilterCandidates) {
+  if (genericTypes) {
+    candidates = genericTypes;
+  } else if (catchFilterCandidates) {
     candidates = catchFilterCandidates;
   } else if (catchClauseCandidates) {
     candidates = catchClauseCandidates;
@@ -185580,14 +185768,6 @@ function complete(snapshot, position) {
       word,
       expectedValueAt(snapshot, word.start)
     );
-  } else if (nativeGenericClassId) {
-    candidates = [...snapshot.project.typeByName.values()].filter(
-      (type2) => type2.kind === "class" && (genericMemberId !== NEO_TILE_CONVERT_MEMBER_ID || !type2.abstract && !type2.typeParameters?.length) && isNeoScriptTypeAssignable(
-        { kind: "named", typeId: type2.id },
-        { kind: "named", typeId: nativeGenericClassId },
-        snapshot.project
-      )
-    ).map((type2) => typeCompletion(type2, word, snapshot));
   } else if (isTypePosition(tokens)) {
     candidates = typeCompletionItems(snapshot, word);
   } else if (isLambdaParameterPosition(tokens)) {
@@ -185600,6 +185780,88 @@ function complete(snapshot, position) {
     items: rankAndDeduplicate(candidates, prefix)
   };
 }
+function completeTypeArgument(snapshot, position) {
+  const offset = snapshot.source.offsetAt(position);
+  if (insidePlainString(snapshot.lexed.tokens, offset)) return null;
+  const word = {
+    start: wordRangeAt(snapshot.source.text, offset).start,
+    end: offset
+  };
+  const tokens = significantTokensBefore(snapshot.lexed.tokens, word.start);
+  const items = typeArgumentCompletionItems(snapshot, tokens, word);
+  return items === null ? null : {
+    isIncomplete: hasUnclosedConstruct(snapshot.lexed.tokens, offset),
+    items: rankAndDeduplicate(
+      items,
+      snapshot.source.text.slice(word.start, offset)
+    )
+  };
+}
+function typeArgumentCompletionItems(snapshot, tokens, word) {
+  let depth = 0;
+  let argumentIndex = 0;
+  let tupleDepth = 0;
+  let inTuple = false;
+  for (let index = tokens.length - 1; index >= 0; index--) {
+    const token = tokens[index];
+    if (token.text === ")") tupleDepth++;
+    else if (token.text === "(") {
+      if (!["<", ",", "("].includes(tokens[index - 1]?.text ?? "")) return null;
+      if (tupleDepth > 0) tupleDepth--;
+      else inTuple = true;
+    } else if (/^>+$/.test(token.text)) depth += token.text.length;
+    else if (token.text === "<") {
+      if (depth > 0) {
+        depth--;
+        continue;
+      }
+      const name = tokens[index - 1]?.text;
+      const resolution = resolveChain(
+        snapshot,
+        expressionTokensBefore(tokens, index),
+        word.start
+      );
+      const member = resolution?.symbol;
+      const declaration = (tokens[index - 2]?.text === "new" || resolution === null) && name ? snapshot.project.typeByName.get(name) : resolution?.staticType;
+      const parameters = member?.typeParameters ?? declaration?.typeParameters;
+      const builtin = name !== void 0 && member === void 0 && tokens[index - 2]?.text !== "." && [
+        "List",
+        "Set",
+        "Dictionary",
+        "Reference",
+        "Partial",
+        "FunctionRef",
+        "NeoDelegate",
+        "NeoAction"
+      ].includes(name);
+      const tileConversion = member?.id === NEO_TILE_CONVERT_MEMBER_ID && argumentIndex === 0;
+      if (!parameters?.length && !builtin && !tileConversion) return null;
+      const parameter4 = inTuple ? void 0 : parameters?.[argumentIndex]?.type;
+      const constraint = parameter4?.kind === "typeParameter" ? parameter4.constraint : void 0;
+      const constraintId = constraint?.kind === "named" ? constraint.typeId : void 0;
+      const classId = tileConversion ? NEO_TILE_CLASS_ID : constraintId;
+      if (!classId) return typeCompletionItems(snapshot, word);
+      const candidates = [...snapshot.project.typeByName.values()].filter(
+        (type2) => type2.kind === "class" && (!tileConversion || !type2.abstract && !type2.typeParameters?.length) && isNeoScriptTypeAssignable(
+          { kind: "named", typeId: type2.id },
+          { kind: "named", typeId: classId },
+          snapshot.project
+        )
+      ).map((type2) => typeCompletion(type2, word, snapshot));
+      if (!tileConversion)
+        candidates.push(
+          ...typeParameterCompletionItems(snapshot, word, constraint)
+        );
+      return candidates;
+    } else if (!isCallTypeArgumentToken(token)) return null;
+    else if (depth === 0 && tupleDepth === 0 && token.text === ",")
+      argumentIndex++;
+  }
+  return null;
+}
+function completeLambdaBody(snapshot, position) {
+  return lambdaBodyAt(snapshot, snapshot.source.offsetAt(position)) ? complete(snapshot, position) : null;
+}
 function completeFunctionArgument(snapshot, position) {
   const argument2 = callArgumentAt(snapshot, snapshot.source.offsetAt(position));
   if (!argument2 || argument2.call.kind === "constructor" || !callSymbol(snapshot, argument2.call))
@@ -185608,76 +185870,7 @@ function completeFunctionArgument(snapshot, position) {
   for (let opener = innermostOpener(features, snapshot.source.offsetAt(position)); opener >= 0 && features.tokens[opener].start > argument2.call.openParenOffset; opener = features.enclosingOpener[opener]) {
     if (features.tokens[opener].text === "{") return null;
   }
-  const values = complete(snapshot, position);
-  const names2 = functionArgumentNames(snapshot, position);
-  if (!names2) return values;
-  const offset = snapshot.source.offsetAt(position);
-  const word = wordRangeAt(snapshot.source.text, offset);
-  return {
-    ...values,
-    items: rankAndDeduplicate(
-      names2.onlyNames ? names2.items : [...names2.items, ...values.items],
-      snapshot.source.text.slice(word.start, offset)
-    )
-  };
-}
-function functionArgumentNames(snapshot, position) {
-  const offset = snapshot.source.offsetAt(position);
-  if (lambdaBodyAt(snapshot, offset)) return null;
-  const argument2 = callArgumentAt(snapshot, offset);
-  if (argument2?.call.kind !== "function") return null;
-  const { call, index } = argument2;
-  const { tokens } = scriptFeatureIndex(snapshot);
-  const startOffset = call.argumentRanges[index] ? snapshot.source.offsetAt(call.argumentRanges[index].start) : offset;
-  const start = firstIndex(tokens, (token) => token.start >= startOffset);
-  const prefixEnd = firstIndex(tokens, (token) => token.start >= offset);
-  const edit = argumentNameCompletionEdit(tokens, start, prefixEnd, position);
-  if (!edit) return null;
-  const symbol = callSymbol(snapshot, call);
-  if (!symbol?.parameters) return null;
-  const labels = [...call.argumentNames];
-  labels[index] = null;
-  const bound = boundOverloadId(
-    snapshot,
-    snapshot.source.offsetAt(call.nameRange.start),
-    call.name
-  );
-  const overloads = callOverloads(snapshot, call, symbol, bound).map(
-    (overload) => ({ parameters: overload.parameters ?? [] })
-  );
-  const reachable = neoScriptApplicableSignatures(overloads, labels);
-  const fields = /* @__PURE__ */ new Map();
-  for (const { parameters } of reachable) {
-    const used = /* @__PURE__ */ new Set();
-    call.argumentNames.forEach((name, argumentIndex) => {
-      if (argumentIndex === index) return;
-      const parameter4 = neoScriptArgumentParameter(
-        parameters,
-        name,
-        argumentIndex
-      );
-      if (parameter4) used.add(parameter4.name.toLowerCase());
-    });
-    for (const parameter4 of parameters) {
-      const key = parameter4.name.toLowerCase();
-      if (used.has(key) || fields.has(key)) continue;
-      fields.set(key, {
-        name: parameter4.name,
-        type: formatType(parameter4.type, snapshot.project),
-        ...parameter4.defaultValue ? { defaultText: parameter4.defaultValue.displayText } : {}
-      });
-    }
-  }
-  return {
-    items: argumentNameCompletions(
-      [...fields.values()],
-      tokens,
-      start,
-      prefixEnd,
-      position
-    ),
-    onlyNames: edit.hasColon
-  };
+  return complete(snapshot, position);
 }
 function hover(snapshot, position) {
   const offset = snapshot.source.offsetAt(position);
@@ -187071,6 +187264,32 @@ function initializerConstruction(snapshot, brace, constructor2) {
   }
   return construction;
 }
+function initializerKeyContextAt(snapshot, position) {
+  const features = scriptFeatureIndex(snapshot);
+  const offset = snapshot.source.offsetAt(position);
+  const brace = innermostOpener(features, offset);
+  const constructor2 = features.objectInitializers.get(brace);
+  if (constructor2 === void 0) return null;
+  const keys = [];
+  let atKey = true;
+  for (let index = brace + 1; index < features.tokens.length; index++) {
+    const token = features.tokens[index];
+    if (token.start >= offset) break;
+    if (features.enclosingOpener[index] !== brace) continue;
+    const call = features.calls.get(token.start);
+    if (call?.typeArgumentTokens?.length) {
+      index = (features.tokenIndexes.get(call.openParenOffset) ?? index + 1) - 1;
+      continue;
+    }
+    if (token.text === "=") {
+      keys.push(features.tokens[index - 1].text);
+      atKey = false;
+    } else if (token.text === ",") atKey = true;
+  }
+  if (!atKey) return null;
+  const construction = initializerConstruction(snapshot, brace, constructor2);
+  return construction ? { typeName: construction.declaration.name, keys } : null;
+}
 function initializerExpectedType(snapshot, offset, bodyStart) {
   const features = scriptFeatureIndex(snapshot);
   const { tokens, enclosingOpener, callOpenings, objectInitializers } = features;
@@ -187484,6 +187703,27 @@ function matchingCloseBraceIndex(tokens, openIndex) {
   }
   return null;
 }
+function typeParameterCompletionItems(snapshot, word, constraint) {
+  const items = [];
+  for (const parameter4 of [
+    ...contextualTypeParameters(snapshot),
+    ...snapshot.context.typeParameters ?? []
+  ]) {
+    if (constraint && !isNeoScriptTypeAssignable(parameter4.type, constraint, snapshot.project))
+      continue;
+    items.push(
+      completion(
+        parameter4.name,
+        "typeParameter",
+        parameter4.name,
+        "Type parameter",
+        word,
+        snapshot
+      )
+    );
+  }
+  return items;
+}
 function typeCompletionItems(snapshot, word) {
   const items = NEOSCRIPT_PRIMITIVE_TYPES.map(
     (name) => completion(name, "keyword", name, "Primitive type", word, snapshot)
@@ -187499,8 +187739,9 @@ function typeCompletionItems(snapshot, word) {
       "snippet"
     )
   );
+  items.push(...typeParameterCompletionItems(snapshot, word));
   for (const type2 of snapshot.project.typeByName.values()) {
-    if (type2.id === NEOSCRIPT_MATH_TYPE_ID || type2.id === "builtin:Debug")
+    if (type2.kind === "builtin" && !ANNOTATION_TYPE_NAMES.has(type2.name))
       continue;
     items.push(typeCompletion(type2, word, snapshot));
   }
@@ -189301,6 +189542,18 @@ function inferLambdaParameterType(local, snapshot) {
   if (declarationIndex < 0) return UNKNOWN_TYPE;
   const arrow = tokens[declarationIndex + 1];
   let opener = enclosingOpener[declarationIndex];
+  let lambdaStart = arrow?.text === "=>" ? declarationIndex : opener;
+  for (let depth = 0; depth < (local.tuplePath?.length ?? 0); depth++)
+    lambdaStart = enclosingOpener[lambdaStart] ?? -1;
+  if (lambdaStart >= 0) {
+    const offset = tokens[lambdaStart].start;
+    const argument2 = resolvedCallArgumentAt(snapshot, offset);
+    const expected = isCollectionCallbackArgument(argument2) ? null : expectedTypeAt(snapshot, offset, void 0, argument2);
+    if (expected?.kind === "delegate") {
+      const parameter4 = expected.parameterTypes[local.lambdaParameterIndex ?? 0];
+      if (parameter4) return tuplePathType(parameter4, local.tuplePath);
+    }
+  }
   if (!(arrow?.kind === "operator" && arrow.text === "=>")) {
     if (opener < 0 || tokens[opener]?.text !== "(") return UNKNOWN_TYPE;
     opener = enclosingOpener[opener];
@@ -189571,17 +189824,20 @@ function expressionTokensBefore(tokens, endExclusive) {
   for (; start >= 0; start--) {
     const token = tokens[start];
     if (!token) continue;
-    if (token.kind === "punctuation" && [")", "]"].includes(token.text)) {
+    if (token.kind === "punctuation" && [")", "]", "}"].includes(token.text)) {
+      if (token.text === "}" && depth === 0 && start < endExclusive - 1 && ![".", "?.", "!"].includes(tokens[start + 1]?.text ?? ""))
+        break;
       if (depth === 0) groupEnd = start;
       depth++;
     }
-    if (token.kind === "punctuation" && ["(", "["].includes(token.text)) {
+    if (token.kind === "punctuation" && ["(", "[", "{"].includes(token.text)) {
       if (depth > 0) depth--;
       else break;
       if (depth === 0 && ["if", "while", "for", "foreach"].includes(
         tokens[start - 1]?.text ?? ""
       ))
         return tokens.slice(groupEnd + 1, endExclusive);
+      continue;
     }
     if (depth === 0 && token.kind === "operator" && token.text === ">") {
       const name = genericCallNameIndex(tokens, start);
@@ -189598,8 +189854,7 @@ function expressionTokensBefore(tokens, endExclusive) {
   return tokens.slice(start + 1, endExclusive);
 }
 function genericCallNameIndex(tokens, close) {
-  if (tokens[close + 1]?.text !== "(" && tokens[close + 1]?.text !== ".")
-    return -1;
+  if (!["(", ".", "{"].includes(tokens[close + 1]?.text ?? "")) return -1;
   let depth = 0;
   for (let cursor = close; cursor > 0; cursor--) {
     const token = tokens[cursor];
@@ -189607,7 +189862,7 @@ function genericCallNameIndex(tokens, close) {
     if (token.text === ">") depth++;
     else if (token.text === "<") {
       if (--depth === 0) {
-        const valid = tokens[close + 1]?.text === "." ? new Parser(tokens.slice(cursor - 1, close + 1)).typeEnd() === close - cursor + 2 : callOpenParenIndex(tokens, cursor - 1) === close + 1;
+        const valid = tokens[close + 1]?.text !== "(" ? new Parser(tokens.slice(cursor - 1, close + 1)).typeEnd() === close - cursor + 2 : callOpenParenIndex(tokens, cursor - 1) === close + 1;
         return valid ? cursor - 1 : -1;
       }
     } else if (!isCallTypeArgumentToken(token)) return -1;
@@ -189633,13 +189888,6 @@ function wordRangeAt(text, offset) {
 function isTypePosition(tokens) {
   const tail = tokens[tokens.length - 1];
   if (!tail) return false;
-  if (tail.kind === "operator" && tail.text === "<") {
-    const previous = tokens[tokens.length - 2];
-    return previous?.text === "Dictionary" || previous?.text === "Set";
-  }
-  if (tail.kind === "punctuation" && tail.text === ",") {
-    return tokens.some((token) => token.text === "Dictionary");
-  }
   if (tail.kind === "keyword" && tail.text === "is") return true;
   if (tail.text === "not" && tokens.at(-2)?.text === "is") return true;
   return false;
@@ -189758,11 +190006,10 @@ function isTypeAnnotationReference(snapshot, reference2) {
 function isConstructorTypeReference(snapshot, reference2) {
   return scriptFeatureIndex(snapshot).calls.get(reference2.start)?.kind === "constructor";
 }
-var SCRIPT_FEATURE_INDEX, assumedLambdaInputs, LIST_OPENERS, LIST_CLOSERS, TUPLE_LABEL_DECLARATIONS, NAMED_ARGUMENT_LABELS, NO_EXPECTED_VALUE, CONSTRUCTIONS, FLOW_PROBES, OVERLOADED_FUNCTION_NAMES, GENERIC_CALL_NAMES, LOCAL_SCOPE_INDEX, NAMED_ITEM_INDEX, COLLECTION_FUNCTION_DOCUMENTATION, LOCAL_SYMBOL_CACHE, CALL_COMMIT_CHARACTERS, GENERIC_CALL_COMMIT_CHARACTERS, SETTER_VALUE_ID_SUFFIX, LAMBDA_BODY_INDEX;
+var SCRIPT_FEATURE_INDEX, assumedLambdaInputs, LIST_OPENERS, LIST_CLOSERS, TUPLE_LABEL_DECLARATIONS, NAMED_ARGUMENT_LABELS, NO_EXPECTED_VALUE, CONSTRUCTIONS, ANNOTATION_TYPE_NAMES, FLOW_PROBES, OVERLOADED_FUNCTION_NAMES, GENERIC_CALL_NAMES, LOCAL_SCOPE_INDEX, NAMED_ITEM_INDEX, COLLECTION_FUNCTION_DOCUMENTATION, LOCAL_SYMBOL_CACHE, CALL_COMMIT_CHARACTERS, GENERIC_CALL_COMMIT_CHARACTERS, SETTER_VALUE_ID_SUFFIX, LAMBDA_BODY_INDEX;
 var init_analyzer = __esm({
   "../packages/neoscript-language/src/analyzer.ts"() {
     "use strict";
-    init_argument_name_completions();
     init_extension_members();
     init_random_contract();
     init_error_contract();
@@ -189790,6 +190037,9 @@ var init_analyzer = __esm({
     NAMED_ARGUMENT_LABELS = /* @__PURE__ */ new WeakMap();
     NO_EXPECTED_VALUE = { type: null };
     CONSTRUCTIONS = /* @__PURE__ */ new WeakMap();
+    ANNOTATION_TYPE_NAMES = new Set(
+      NEOSCRIPT_BUILTIN_ANNOTATION_TYPES
+    );
     FLOW_PROBES = /* @__PURE__ */ new WeakMap();
     OVERLOADED_FUNCTION_NAMES = /* @__PURE__ */ new WeakMap();
     GENERIC_CALL_NAMES = /* @__PURE__ */ new WeakMap();
@@ -189853,6 +190103,43 @@ var init_parity_contract = __esm({
   }
 });
 
+// ../packages/neoscript-language/src/argument-name-completions.ts
+function argumentNameCompletions(fields, tokens, start, prefixEnd, position) {
+  const edit = argumentNameCompletionEdit(tokens, start, prefixEnd, position);
+  if (!edit) return [];
+  const { range: range2, hasColon } = edit;
+  const items = [];
+  for (const field of fields) {
+    const insertText = hasColon ? field.name : `${field.name}: `;
+    items.push({
+      label: field.name,
+      kind: "property",
+      detail: field.defaultText === void 0 ? field.type : `[${field.type} = ${field.defaultText}]`,
+      insertText,
+      textEdit: { range: range2, newText: insertText }
+    });
+  }
+  return items;
+}
+function argumentNameCompletionEdit(tokens, start, prefixEnd, position) {
+  const first = tokens[start];
+  if (prefixEnd > start + 1) return null;
+  if (prefixEnd > start && (!first || !isCallArgumentLabelToken(first)))
+    return null;
+  const editingName = first !== void 0 && isCallArgumentLabelToken(first) && positionCompare(first.range.start, position) <= 0 && positionCompare(position, first.range.end) <= 0;
+  if (first && isCallArgumentLabelToken(first) && !editingName) return null;
+  const hasColon = editingName && tokens[start + 1]?.text === ":";
+  const range2 = editingName ? first.range : { start: position, end: position };
+  return { range: range2, hasColon };
+}
+var init_argument_name_completions = __esm({
+  "../packages/neoscript-language/src/argument-name-completions.ts"() {
+    "use strict";
+    init_executable_parser();
+    init_project_source_tokens();
+  }
+});
+
 // ../packages/neoscript-language/src/project-listener-annotations.ts
 function createContext2(analysis, source) {
   const project = cachedProjectIndex(analysis.project);
@@ -189948,6 +190235,20 @@ function sourceTypeAst(type2) {
       column: type2.range.start.character + 1
     }
   };
+  if (type2.tupleElements)
+    return {
+      ...common,
+      kind: "tuple",
+      elements: type2.tupleElements.map((element) => {
+        const nested = sourceTypeAst(element.type);
+        return {
+          type: nested,
+          pos: nested.pos,
+          ...element.name ? { name: element.name } : {},
+          ...element.nameRange ? { nameRange: element.nameRange } : {}
+        };
+      })
+    };
   const args = type2.typeArguments;
   if ((type2.name === "List" || type2.name === "Set") && args[0])
     return {
@@ -190828,6 +191129,63 @@ function projectDiagnostics(analysis, uri) {
   }));
 }
 function projectCompletions(analysis, document, position) {
+  const result = projectCompletionsAt(analysis, document, position);
+  const referenceNames = projectReferenceArgumentCompletions(
+    analysis,
+    document,
+    position
+  );
+  return referenceNames.length ? { ...result, items: [...referenceNames, ...result.items] } : result;
+}
+function projectReferenceArgumentCompletions(analysis, document, position) {
+  if (projectTokenAt(document, position)?.kind === "comment") return [];
+  const documentTokens = projectSignificantTokens(analysis, document);
+  const tokens = tokensBeforePosition(documentTokens, position);
+  const openIndex = activeCallOpenIndex(tokens, position);
+  if (openIndex < 0) return [];
+  const calleeIndex = projectCallCalleeIndex(tokens, openIndex);
+  if (tokens[calleeIndex]?.text !== "Reference" || tokens[calleeIndex + 1]?.text !== "<")
+    return [];
+  if ([".", "?.", "new"].includes(tokens[calleeIndex - 1]?.text ?? ""))
+    return [];
+  const active = activeCallArgument(tokens, openIndex, position);
+  if (active.label !== null) return [];
+  if (tokens.length > active.start + 1) return [];
+  const args = projectCallArguments(documentTokens, openIndex);
+  let field;
+  if (active.index === 0) field = { name: "id", type: "string" };
+  else if (active.index === 1 && args[0]?.name === "id") {
+    const source = analysis.documents.get(document.uri);
+    if (source?.listenerStatements?.some(
+      (statement) => rangeContains(statement.range, position)
+    ))
+      return [];
+    const before = tokens[calleeIndex - 1];
+    if (before?.text === ")" && !initializerRootAt(analysis, document, position) && !projectBodySnapshotAt(analysis, document, position)) {
+      const annotationOpen = activeCallOpenIndex(
+        tokens.slice(0, calleeIndex - 1),
+        before.range.start
+      );
+      if (tokens[annotationOpen - 1]?.text === "listeners" && tokens[annotationOpen - 2]?.text === "@")
+        return [];
+    }
+    const target = tokens[calleeIndex + 2]?.text;
+    if (target === "NeoImage" || target === "NeoAudioClip") return [];
+    field = { name: "withProvenance", type: "bool", defaultText: "false" };
+  } else return [];
+  if (args.some(
+    (argument2) => argument2.index !== active.index && argument2.name === field.name
+  ))
+    return [];
+  return argumentNameCompletions(
+    [field],
+    documentTokens,
+    active.start,
+    tokens.length,
+    position
+  );
+}
+function projectCompletionsAt(analysis, document, position) {
   if (projectTokenAt(document, position)?.kind === "comment") {
     return { isIncomplete: false, items: [] };
   }
@@ -190902,6 +191260,29 @@ function projectCompletions(analysis, document, position) {
     position,
     annotationSite
   );
+  const lambda = expression && completeLambdaBody(expression.snapshot, position);
+  if (lambda && expression) {
+    const members3 = projectInitializerMemberCompletions(
+      analysis,
+      document,
+      position,
+      expression.snapshot
+    );
+    if (members3) return { ...lambda, items: members3 };
+    const names2 = projectConstructorArgumentCompletions(
+      analysis,
+      document,
+      position,
+      expression.snapshot
+    );
+    const items = names2?.length ? [...names2, ...lambda.items] : lambda.items;
+    return {
+      ...lambda,
+      items: variantScopeInBody ? [...items, variantScopeInBody] : items
+    };
+  }
+  const typeArgument = expression && completeTypeArgument(expression.snapshot, position);
+  if (typeArgument) return typeArgument;
   const argument2 = expression && completeFunctionArgument(expression.snapshot, position);
   if (argument2) return argument2;
   const builtinMembers = projectBuiltinStaticMemberCompletions(
@@ -191430,7 +191811,7 @@ function projectExpressionMemberCompletions(analysis, document, position, annota
   const dot = before.at(-1);
   if (dot?.text !== "." && dot?.text !== "?.") return null;
   const receiver = before.at(-2);
-  if (!receiver || !(receiver.kind === "identifier" || receiver.kind === "type" || [")", "]", ">", "!", "this", "base", "root"].includes(receiver.text)))
+  if (!receiver || !(receiver.kind === "identifier" || receiver.kind === "type" || [")", "]", "}", ">", "!", "this", "base", "root"].includes(receiver.text)))
     return null;
   const expression = projectExpressionSnapshotAt(
     analysis,
@@ -191460,6 +191841,11 @@ function projectExpressionSnapshotAt(analysis, document, position, annotationSit
     const { thisClass: _thisClass, ...staticContext } = language.context;
     context = { ...staticContext, staticMember: true };
   }
+  if (root && !argument2) {
+    const expected = constructionSiteAt(analysis, document, root.range.start);
+    if (expected?.expectedTypeRef)
+      context = { ...context, returnType: expected.expectedTypeRef };
+  }
   const key = range2 ?? context;
   let documents = PROJECT_EXPRESSION_SNAPSHOT_CACHE.get(analysis);
   if (!documents) {
@@ -191863,6 +192249,7 @@ function projectConstructorArgumentCompletions(analysis, document, position, bod
   if (!typeName) return null;
   const active = activeCallArgument(tokens, openIndex, position);
   if (active.label !== null) return null;
+  if (tokens.length > active.start + 1) return null;
   const args = projectCallArguments(documentTokens, openIndex);
   const builtin = lookupVariantFolderArgumentFields(typeName) ?? graphConstructorNamedArguments(typeName);
   const fields = builtin ? unusedConstructorArguments(builtin, args, active.index) : declaredConstructorNamedArguments(analysis, typeName, args, active.index);
@@ -191946,18 +192333,16 @@ function parameterArgumentField(parameter4) {
     ...parameter4.defaultValue === void 0 ? {} : { defaultText: parameter4.defaultValue.text }
   };
 }
-function projectInitializerMemberCompletions(analysis, document, position) {
-  const site = constructionSiteAt(analysis, document, position);
-  if (!site?.atInitializerKey) return null;
-  const typeName = site.initializerTypeName;
-  if (typeName === null) return null;
+function projectInitializerMemberCompletions(analysis, document, position, body) {
+  const site = body ? null : constructionSiteAt(analysis, document, position);
+  const context = body ? initializerKeyContextAt(body, position) : null;
+  const typeName = body ? context?.typeName : site?.initializerTypeName;
+  if (typeName == null) return null;
+  if (!body && !site?.atInitializerKey) return null;
+  const keys = context?.keys ?? site?.initializerKeys ?? [];
   const index = projectConstructionIndex(analysis);
-  const unsettled = unsettledRequiredMembers(
-    index,
-    typeName,
-    site.initializerKeys
-  );
-  const taken = new Set(site.initializerKeys.map((key) => key.toLowerCase()));
+  const unsettled = unsettledRequiredMembers(index, typeName, keys);
+  const taken = new Set(keys.map((key) => key.toLowerCase()));
   for (const member of unsettled) taken.add(member.name.toLowerCase());
   const items = unsettled.map((member) => ({
     label: member.name,
@@ -193635,6 +194020,7 @@ function indexConstructionSites(analysis, document, root) {
     end++;
   const tokens = allTokens.slice(start, end).filter((token) => token.kind !== "comment" && token.kind !== "eof");
   let delimiterEnds;
+  const genericCallOpens = constructionGenericCallOpens(tokens);
   const language = listenerSourceContext(analysis, document, root.range.start);
   const sourceType = (type2) => resolveSourceType(type2, language.context, language.project);
   const fieldType = (owner, name) => {
@@ -193687,7 +194073,11 @@ function indexConstructionSites(analysis, document, root) {
       case "object":
       case "list":
       case "dictionary":
+      case "tuple":
+      case "group":
         return frame.slotId;
+      case "switch":
+        return frame.inResult ? frame.slotId : null;
       case "call":
       case "opaque":
         return null;
@@ -193699,7 +194089,12 @@ function indexConstructionSites(analysis, document, root) {
     switch (frame.kind) {
       case "object":
       case "dictionary":
+      case "group":
         return frame.slotTypeRef;
+      case "tuple":
+        return frame.typeRef.elements[frame.elementIndex]?.type ?? null;
+      case "switch":
+        return frame.inResult ? frame.resultTypeRef : null;
       case "list":
         return frame.elementTypeRef;
       case "opaque":
@@ -193737,7 +194132,12 @@ function indexConstructionSites(analysis, document, root) {
     switch (frame.kind) {
       case "object":
       case "dictionary":
+      case "group":
         return frame.slotType;
+      case "tuple":
+        return frame.type?.tupleElements?.[frame.elementIndex]?.type ?? null;
+      case "switch":
+        return frame.inResult ? frame.resultType : null;
       case "list":
         return frame.elementType;
       case "call":
@@ -193834,7 +194234,7 @@ function indexConstructionSites(analysis, document, root) {
       sawNew = true;
       newStart = index;
       pendingNewTypeRef = expectedTypeRef();
-      pendingNewTypeName = expectedType()?.name ?? null;
+      pendingNewTypeName = pendingNewTypeRef?.kind === "named" ? language.project.typeById.get(pendingNewTypeRef.typeId)?.name ?? null : expectedType()?.name ?? null;
       closedConstructorTypeName = null;
       continue;
     }
@@ -193872,8 +194272,24 @@ function indexConstructionSites(analysis, document, root) {
       }
       continue;
     }
+    if (!sawNew) {
+      const call = genericCallOpens.get(index) ?? -1;
+      if (call >= 0) {
+        index = call - 1;
+        closedConstructorTypeName = null;
+        continue;
+      }
+    }
     if (token.text === "{") {
-      if (sawNew || closedConstructorTypeName !== null) {
+      if (tokens[index - 1]?.text === "switch") {
+        stack.push({
+          kind: "switch",
+          resultType: expectedType(),
+          resultTypeRef: expectedTypeRef(),
+          slotId: expectedSlotId(),
+          inResult: false
+        });
+      } else if (sawNew || closedConstructorTypeName !== null) {
         const frame2 = {
           kind: "object",
           typeName: pendingNewTypeName ?? closedConstructorTypeName,
@@ -193934,7 +194350,33 @@ function indexConstructionSites(analysis, document, root) {
         sawNew = false;
         pendingNewTypeName = null;
       } else {
-        stack.push({ kind: "opaque" });
+        const ends = delimiterEnds ??= projectDelimiterEnds(tokens);
+        const expected = expectedTypeRef();
+        const kind = constructionParenthesesKind(
+          tokens,
+          index,
+          ends,
+          genericCallOpens,
+          expected?.kind === "tuple"
+        );
+        if (kind === "tuple" && expected?.kind === "tuple") {
+          stack.push({
+            kind: "tuple",
+            type: expectedType(),
+            typeRef: expected,
+            slotId: expectedSlotId(),
+            elementIndex: 0
+          });
+        } else if (kind === "group") {
+          stack.push({
+            kind: "group",
+            slotType: expectedType(),
+            slotTypeRef: expected,
+            slotId: expectedSlotId()
+          });
+        } else {
+          stack.push({ kind: "opaque" });
+        }
       }
       closedConstructorTypeName = null;
       continue;
@@ -193987,6 +194429,11 @@ function indexConstructionSites(analysis, document, root) {
         frame.slotType = null;
         frame.slotTypeRef = null;
       }
+    } else if (frame.kind === "tuple") {
+      if (token.text === ",") frame.elementIndex++;
+    } else if (frame.kind === "switch") {
+      if (token.text === "=>") frame.inResult = true;
+      else if (token.text === ",") frame.inResult = false;
     } else if (frame.kind === "call") {
       if (token.text === ",") {
         frame.argumentIndex++;
@@ -194005,6 +194452,43 @@ function indexConstructionSites(analysis, document, root) {
   sites.push({ position: previousPosition, site: snapshot() });
   return sites;
 }
+function constructionParenthesesKind(tokens, open2, ends, genericCallOpens, tupleExpected) {
+  const previous = tokens[open2 - 1];
+  const close = ends.get(open2);
+  if (previous?.kind === "identifier" || previous?.kind === "type" || [")", "]", ">", "!"].includes(previous?.text ?? "") || close !== void 0 && tokens[close + 1]?.text === "=>")
+    return null;
+  for (let index = open2 + 1; index < (close ?? tokens.length); index++) {
+    const token = tokens[index];
+    if (token.text === ",") return "tuple";
+    if (["(", "[", "{"].includes(token.text)) {
+      const end = ends.get(index);
+      if (end === void 0) return tupleExpected ? "tuple" : "group";
+      index = end;
+    } else if (token.text === "new" && tokens[index + 1]?.text !== "(") {
+      const end = new Parser(tokens, index + 1).typeEnd();
+      if (end > index + 1) index = end - 1;
+    } else {
+      const call = genericCallOpens.get(index) ?? -1;
+      if (call >= 0) index = call - 1;
+    }
+  }
+  return close === void 0 && tupleExpected ? "tuple" : "group";
+}
+function constructionGenericCallOpens(tokens) {
+  const opens = [];
+  const calls = /* @__PURE__ */ new Map();
+  for (let index = 0; index < tokens.length; index++) {
+    if (tokens[index].text === "<") opens.push(index);
+    else if (tokens[index].text === ">") {
+      const open2 = opens.pop();
+      if (open2 === void 0 || open2 === 0 || tokens[index + 1]?.text !== "(")
+        continue;
+      const end = new Parser(tokens, open2 - 1).typeEnd();
+      if (end === index + 1) calls.set(open2 - 1, end);
+    }
+  }
+  return calls;
+}
 function collectionElementType2(type2) {
   if (!type2) return null;
   if (type2.name === "List" || type2.name === "Set") {
@@ -218474,10 +218958,21 @@ async function runExport(workspace, options, session) {
   console.log(
     result.localChanges === null ? "  Clean: the export holds the pulled head." : `  Local: the export includes ${result.localChanges} local change(s). Player builds fail and saves stay local until \`neo push\` or a clean \`neo export\`.`
   );
+  let csharp14Members = 0;
   for (const diagnostic of result.diagnostics) {
     if (diagnostic.severity === "error") continue;
+    if (diagnostic.code === "extension-wrapper-target") {
+      csharp14Members++;
+      continue;
+    }
     warn(formatDiagnostic(diagnostic));
   }
+  if (csharp14Members > 0) {
+    const members2 = csharp14Members === 1 ? "member that requires" : "members that require";
+    warn(
+      `Skipping codegen for ${csharp14Members} ${members2} C# 14. NeoScript execution is unaffected.`
+    );
+  }
   if (result.schemaSkew !== null) {
     warn(
       `Unity's project.json was written at schema ${result.schemaSkew}; this export writes schema ${PROJECT_UNITY_EXPORT_SCHEMA_VERSION}. Update the Neo Compose SDK in Unity to a version that reads schema ${PROJECT_UNITY_EXPORT_SCHEMA_VERSION}.`
@@ -238168,7 +238663,7 @@ var releaseWorkspaceLock = () => void 0;
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.89.1");
+    console.log("0.89.3");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {