@neocompose/cli 0.70.3 → 0.70.4

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.70.4] - 2026-10-06
+
+- `neo test <file>` runs in a workspace reached through a symlink, such as one under `/tmp` or `/var` on macOS or a symlinked dev folder. Before, every explicit selector failed with "resolves outside the workspace through a symlink", because the selector's real path was compared with the unresolved workspace root. A selector that really does leave the workspace through a symlink still fails.
+- `neo doctor` accepts a VS Code analysis cache written before 0.70.3. 0.70.3 required the new initializer location on every configuration global, so doctor reported an older cache as incompatible until `neo status` or `neo pull` rewrote it.
+
 ## [0.70.3] - 2026-10-06
 
 - `neo export` reads each project file from the path its declaration names. Moving a file to another folder without renaming it changes no record, so nothing is pushed. Before, the export kept reading the old path and failed with "missing". A new file dropped at the old path is now discovered as a new file, and `neo resolve` writes a conflicted file to its moved path.

package/dist/neo.mjs

@@ -31614,16 +31614,12 @@ function assertEnum(value, path) {
 }
 function assertGlobal(value, path) {
   const global = record(value, path);
-  exactKeys(global, path, [
-    "id",
-    "state",
-    "source",
-    "name",
-    "type",
-    "annotations",
-    "initializer",
-    "initializerSource"
-  ]);
+  exactKeysWithOptional(
+    global,
+    path,
+    ["id", "state", "source", "name", "type", "annotations", "initializer"],
+    ["initializerSource"]
+  );
   assertIdentity(global, path);
   if (global.initializerSource !== void 0)
     assertLocation(global.initializerSource, `${path}.initializerSource`);
@@ -31937,7 +31933,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.70.3",
+      cliVersion: "0.70.4",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -112869,6 +112865,22 @@ function createGenerationContext(exportData, diagnostics, docs = EMPTY_UNITY_COD
     `${exportData.project.name}Neo`,
     "NeoProject"
   );
+  const enums = Object.values(exportData.enums);
+  const enumNames = buildEnumNameMap(enums, diagnostics);
+  const typeNames = buildNameMap(
+    Object.values(exportData.classes),
+    "Type",
+    diagnostics
+  );
+  const interfaceNames = buildNameMap(
+    Object.values(exportData.interfaces),
+    "Interface",
+    diagnostics
+  );
+  const dialogueGroupClassNames = buildDialogueGroupClassNameMap(
+    dialogueGroups,
+    diagnostics
+  );
   return {
     exportData,
     docs,
@@ -112876,22 +112888,23 @@ function createGenerationContext(exportData, diagnostics, docs = EMPTY_UNITY_COD
     classes: Object.values(exportData.classes),
     interfaces: Object.values(exportData.interfaces),
     diagnostics,
-    enumNames: buildEnumNameMap(Object.values(exportData.enums), diagnostics),
-    enumOptionFieldNames: /* @__PURE__ */ new Map(),
-    typeNames: buildNameMap(
-      Object.values(exportData.classes),
-      "Type",
-      diagnostics
-    ),
-    interfaceNames: buildNameMap(
-      Object.values(exportData.interfaces),
-      "Interface",
-      diagnostics
-    ),
-    dialogueGroupClassNames: buildDialogueGroupClassNameMap(
-      dialogueGroups,
+    enumNames,
+    enumOptionsNames: buildEnumOptionsNameMap(
+      enums,
+      enumNames,
+      [
+        projectClassName,
+        ...enumNames.values(),
+        ...typeNames.values(),
+        ...interfaceNames.values(),
+        ...dialogueGroupClassNames.values()
+      ],
       diagnostics
     ),
+    enumOptionFieldNames: /* @__PURE__ */ new Map(),
+    typeNames,
+    interfaceNames,
+    dialogueGroupClassNames,
     dialogueGroupPropertyNames: buildDialogueGroupPropertyNameMap(
       dialogueGroups,
       diagnostics
@@ -112972,6 +112985,29 @@ function buildEnumNameMap(enums, diagnostics) {
   }
   return names;
 }
+function buildEnumOptionsNameMap(enums, enumNames, typeNames, diagnostics) {
+  const taken = new Set(typeNames);
+  const names = /* @__PURE__ */ new Map();
+  for (const enumDef of enums) {
+    const enumName = enumNames.get(enumDef.id);
+    if (enumName === void 0) continue;
+    const baseName = `${enumName}Options`;
+    if (sdkRuntimeEnumBinding(enumDef.id) !== void 0 || !taken.has(baseName)) {
+      taken.add(baseName);
+      names.set(enumDef.id, baseName);
+      continue;
+    }
+    const uniqueName = `${baseName}_${shortId(enumDef.id)}`;
+    diagnostics.push({
+      severity: "warning",
+      message: `Generated C# options class "${baseName}" for enum "${enumDef.name}" collides with another generated type; using "${uniqueName}".`,
+      path: `enums.${enumDef.id}.name`
+    });
+    taken.add(uniqueName);
+    names.set(enumDef.id, uniqueName);
+  }
+  return names;
+}
 function buildDialogueGroupClassNameMap(groups, diagnostics) {
   const baseNames = buildNameMap(groups, "DialogueGroup", diagnostics);
   const used = /* @__PURE__ */ new Map();
@@ -146676,8 +146712,13 @@ function staticDelegate(target, parameters) {
   const list = parameters.join(", ");
   return `static (${list}) => ${target}(${list})`;
 }
-function enumParser(enumName) {
-  return staticDelegate(`${enumName}.FromOptionId`, ["factoryOptionId"]);
+function enumOptionsName(ctx, enumId) {
+  return ctx.enumOptionsNames.get(enumId) ?? "NeoEnumOptions";
+}
+function enumParser(ctx, enumId) {
+  return staticDelegate(`${enumOptionsName(ctx, enumId)}.FromOptionId`, [
+    "factoryOptionId"
+  ]);
 }
 function immediateInvocationArguments(receiver, argumentNames) {
   const values = argumentNames.length === 1 ? [`(object?)(${argumentNames[0]})`] : argumentNames.length <= 4 ? argumentNames : [`new object?[] { ${argumentNames.join(", ")} }`];
@@ -146691,10 +146732,7 @@ function enumOptionFieldName(ctx, enumId, optionId) {
     const enumDef = ctx.exportData.enums[enumId];
     if (enumDef !== void 0) {
       const enumName = ctx.enumNames.get(enumId) ?? toCSharpTypeName(enumDef.name, "NeoEnum");
-      const taken = /* @__PURE__ */ new Set([
-        enumName,
-        ...GENERATED_ENUM_CLASS_MEMBER_NAMES
-      ]);
+      const taken = /* @__PURE__ */ new Set(["value__"]);
       for (const key of getEnumOptionKeyOrder(enumDef)) {
         const option = enumDef.options[key];
         if (option === void 0) continue;
@@ -146707,7 +146745,7 @@ function enumOptionFieldName(ctx, enumId, optionId) {
           unique = `${preferred}_${ordinal}`;
           ctx.diagnostics.push({
             severity: "warning",
-            message: `Enum option "${option.name}" collides with a member the generated C# enum class "${enumName}" declares; using "${unique}".`,
+            message: `Enum option "${option.name}" collides with another member of the generated C# enum "${enumName}"; using "${unique}".`,
             path: `enums.${enumId}.options.${key}`
           });
         }
@@ -146718,118 +146756,141 @@ function enumOptionFieldName(ctx, enumId, optionId) {
   }
   return names.get(optionId) ?? null;
 }
+function enumMemberValue(optionId) {
+  let hash = 2166136261;
+  for (let index = 0; index < optionId.length; index++) {
+    hash = Math.imul(hash ^ optionId.charCodeAt(index), 16777619);
+  }
+  return (hash >>> 0) % 2147483647 + 1;
+}
 function generateEnumClass(ctx, enumId) {
   const enumDef = ctx.exportData.enums[enumId];
   if (enumDef === void 0) return [];
   if (sdkRuntimeEnumBinding(enumId) !== void 0) return [];
   const enumName = ctx.enumNames.get(enumId) ?? toCSharpTypeName(enumDef.name, "NeoEnum");
-  const optionKeyOrder = getEnumOptionKeyOrder(enumDef);
+  const optionsName = enumOptionsName(ctx, enumId);
+  const optionsByValue = /* @__PURE__ */ new Map();
+  const options = getEnumOptionKeyOrder(enumDef).flatMap((optionId) => {
+    const option = enumDef.options[optionId];
+    if (option === void 0) {
+      throw new Error(
+        `Enum ${enumId} option order references missing option ${optionId}.`
+      );
+    }
+    const fieldName = enumOptionFieldName(ctx, enumId, optionId);
+    if (fieldName === null) {
+      ctx.diagnostics.push({
+        severity: "error",
+        message: `Enum option name "${option.name}" is not a valid C# identifier.`,
+        path: `enums.${enumId}.options.${optionId}`
+      });
+      return [];
+    }
+    const value = enumMemberValue(optionId);
+    const clash = optionsByValue.get(value);
+    if (clash !== void 0) {
+      ctx.diagnostics.push({
+        severity: "error",
+        message: `Enum options "${clash}" and "${option.name}" generate the same C# enum value; recreate one of them to give it a new option id.`,
+        path: `enums.${enumId}.options.${optionId}`
+      });
+      return [];
+    }
+    optionsByValue.set(value, option.name);
+    return [
+      {
+        optionId,
+        value,
+        id: `"${escapeCSharpString(optionId)}"`,
+        member: `${enumName}.${fieldName}`,
+        fieldName,
+        text: `"${escapeCSharpString(option.text)}"`
+      }
+    ];
+  });
+  const switchBody = (subject, arms, fallback) => [
+    `return ${subject} switch`,
+    "{",
+    ...indent([...arms, `_ => ${fallback},`]),
+    "};"
+  ];
+  const method2 = (signature, body) => [
+    signature,
+    "{",
+    ...indent(body),
+    "}"
+  ];
   return [
     ...xmlSummary(ctx.docs.enums[enumId]),
-    `public sealed class ${enumName} : IEquatable<${enumName}>, global::NeoCompose.Runtime.INeoEnumOption`,
+    `[NeoEnum(typeof(${optionsName}))]`,
+    `public enum ${enumName}`,
+    "{",
+    ...indent(
+      options.flatMap((option) => [
+        ...xmlSummary(ctx.docs.enumOptions[option.optionId]),
+        `${option.fieldName} = ${option.value},`
+      ])
+    ),
+    "}",
+    "",
+    "/// <summary>",
+    `/// Converts <see cref="${enumName}"/> to and from the option ids Neo stores.`,
+    "/// </summary>",
+    `public static class ${optionsName}`,
     "{",
     ...indent([
-      `private static readonly Dictionary<string, ${enumName}> values = new Dictionary<string, ${enumName}>();`,
-      "public string optionId { get; }",
-      "public string Text => TextForOptionId(optionId);",
-      "public string TextId => TextIdForOptionId(optionId);",
-      "",
-      `private ${enumName}(string optionId)`,
-      "{",
-      ...indent(["this.optionId = optionId;"]),
-      "}",
-      "",
-      ...optionKeyOrder.flatMap((optionId) => {
-        const option = enumDef.options[optionId];
-        if (option === void 0) {
-          throw new Error(
-            `Enum ${enumId} option order references missing option ${optionId}.`
-          );
-        }
-        const optionName = option.name;
-        const fieldName = enumOptionFieldName(ctx, enumId, optionId);
-        if (fieldName === null) {
-          ctx.diagnostics.push({
-            severity: "error",
-            message: `Enum option name "${optionName}" is not a valid C# identifier.`,
-            path: `enums.${enumId}.options.${optionId}`
-          });
-          return [`// Skipped invalid option id: ${optionId}`];
-        }
-        return [
-          ...xmlSummary(ctx.docs.enumOptions[optionId]),
-          `public static readonly ${enumName} ${fieldName} = FromOptionId("${escapeCSharpString(optionId)}");`
-        ];
-      }),
-      "",
-      `public static ${enumName} FromOptionId(string optionId)`,
-      "{",
-      ...indent([
-        "if (values.TryGetValue(optionId, out var known)) return known;",
-        `var created = new ${enumName}(optionId);`,
-        "values[optionId] = created;",
-        "return created;"
-      ]),
-      "}",
+      ...method2(
+        `public static ${enumName} FromOptionId(string optionId)`,
+        switchBody(
+          "optionId",
+          options.map((option) => `${option.id} => ${option.member},`),
+          `NeoUndeclaredEnumOptions<${enumName}>.FromOptionId(optionId)`
+        )
+      ),
       "",
-      `public static string[] ToOptionIds(IEnumerable<${enumName}>? options)`,
-      "{",
-      ...indent([
-        "if (options is null) return Array.Empty<string>();",
-        "var ids = new List<string>();",
-        "foreach (var option in options) ids.Add(option.optionId);",
-        "return ids.ToArray();"
-      ]),
-      "}",
+      ...method2(
+        `public static string OptionId(this ${enumName} value)`,
+        switchBody(
+          "value",
+          options.map((option) => `${option.member} => ${option.id},`),
+          `NeoUndeclaredEnumOptions<${enumName}>.OptionId(value)`
+        )
+      ),
       "",
-      "public static bool IsKnown(string id)",
-      "{",
-      ...indent([
-        "return id switch",
-        "{",
-        ...indent([
-          ...optionKeyOrder.map(
-            (optionId) => `"${escapeCSharpString(optionId)}" => true,`
-          ),
-          "_ => false,"
-        ]),
-        "};"
-      ]),
-      "}",
+      ...method2(
+        `public static string[] ToOptionIds(IEnumerable<${enumName}>? options)`,
+        [
+          "if (options is null) return Array.Empty<string>();",
+          "var ids = new List<string>();",
+          "foreach (var option in options) ids.Add(option.OptionId());",
+          "return ids.ToArray();"
+        ]
+      ),
       "",
-      "public static string TextIdForOptionId(string optionId)",
-      "{",
-      ...indent([
-        "return optionId switch",
-        "{",
-        ...indent([
-          ...optionKeyOrder.flatMap((optionId) => {
-            const option = enumDef.options[optionId];
-            return [
-              `"${escapeCSharpString(optionId)}" => "${escapeCSharpString(option.text)}",`
-            ];
-          }),
-          "_ => optionId,"
-        ]),
-        "};"
-      ]),
-      "}",
+      ...method2(
+        "public static bool IsKnown(string optionId)",
+        switchBody(
+          "optionId",
+          options.map((option) => `${option.id} => true,`),
+          "false"
+        )
+      ),
       "",
-      "public static string TextForOptionId(string optionId, NeoClient? client = null)",
-      "{",
-      ...indent([
-        ctx.singleton ? `return (client ?? ${ctx.projectClassName}.RequireInstance().Client).Localization.ResolveText(TextIdForOptionId(optionId));` : "return client is null ? TextIdForOptionId(optionId) : client.Localization.ResolveText(TextIdForOptionId(optionId));"
-      ]),
-      "}",
+      ...method2(
+        `public static string TextId(this ${enumName} value)`,
+        switchBody(
+          "value",
+          options.map((option) => `${option.member} => ${option.text},`),
+          "value.OptionId()"
+        )
+      ),
       "",
-      `public static implicit operator string(${enumName} value) => value.optionId;`,
-      `public static implicit operator ${enumName}(string optionId) => FromOptionId(optionId);`,
-      "public override string ToString() => optionId;",
-      `public bool Equals(${enumName}? other) => other is not null && optionId == other.optionId;`,
-      `public override bool Equals(object? obj) => Equals(obj as ${enumName});`,
-      "public override int GetHashCode() => optionId.GetHashCode();",
-      `public static bool operator ==(${enumName}? left, ${enumName}? right) => ReferenceEquals(left, right) || (left is not null && left.Equals(right));`,
-      `public static bool operator !=(${enumName}? left, ${enumName}? right) => !(left == right);`
+      ...method2(
+        `public static string Text(this ${enumName} value, NeoClient? client = null)`,
+        [
+          ctx.singleton ? `return (client ?? ${ctx.projectClassName}.RequireInstance().Client).Localization.ResolveText(value.TextId());` : "return client is null ? value.TextId() : client.Localization.ResolveText(value.TextId());"
+        ]
+      )
     ]),
     "}"
   ];
@@ -147059,7 +147120,7 @@ function generateIndexedListWrappers(ctx, ownerClass, schemaKey, memberId, env)
         {
           definition: definition2,
           keyType: enumName,
-          codecs: enumKeyCodecArguments(indexedMember.enumId, enumName)
+          codecs: enumKeyCodecArguments(ctx, indexedMember.enumId)
         }
       ];
     }
@@ -148329,7 +148390,7 @@ function generateExplicitInterfaceMember(ctx, schemaKey, memberId, interfaceName
     genericEnv,
     ownerClassId
   );
-  const setter = isMemberNSPropertyBase(member) && typeof member.setterCode === "string" && !suppressesInheritedSetter(interfaceContract) ? nsPropertyWriteExpression(schemaKey) : null;
+  const setter = isMemberNSPropertyBase(member) && typeof member.setterCode === "string" && !suppressesInheritedSetter(interfaceContract) ? nsPropertyWriteExpression(ctx, member, schemaKey) : null;
   return [
     `${interfaceType2} ${interfaceName}.${memberName}`,
     "{",
@@ -149083,7 +149144,7 @@ function planWorldObjectEmission(ctx, classDef, worldKind) {
         // conversion runs through the wrapper's implicit operator, which is
         // where the required-member throw now lives.
         `Sprite ${SPRITE_OBJECT_VALUE_INTERFACE}.${schemaKeyToMemberName(SPRITE_OBJECT_SPRITE_SCHEMA_KEY)} => ${schemaKeyToMemberName(SPRITE_OBJECT_SPRITE_SCHEMA_KEY)};`,
-        `string ${SPRITE_OBJECT_VALUE_INTERFACE}.${schemaKeyToMemberName(SPRITE_OBJECT_MASK_INTERACTION_SCHEMA_KEY)} => ${schemaKeyToMemberName(SPRITE_OBJECT_MASK_INTERACTION_SCHEMA_KEY)}.optionId;`
+        `string ${SPRITE_OBJECT_VALUE_INTERFACE}.${schemaKeyToMemberName(SPRITE_OBJECT_MASK_INTERACTION_SCHEMA_KEY)} => ${schemaKeyToMemberName(SPRITE_OBJECT_MASK_INTERACTION_SCHEMA_KEY)}.OptionId();`
       ],
       shadowedSchemaKeys: /* @__PURE__ */ new Set([
         SPRITE_OBJECT_SPRITE_SCHEMA_KEY,
@@ -149105,7 +149166,7 @@ function planSmartTileEmission(ctx, classDef) {
     return planValidatedContractEmission(ctx, classDef, worldKind, () => ({
       runtimeInterfaces: [SMART_TILE_INTERFACE],
       classMembers: [
-        `string ${SMART_TILE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_DEFAULT_COLLIDER_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_DEFAULT_COLLIDER_SCHEMA_KEY)}.optionId;`,
+        `string ${SMART_TILE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_DEFAULT_COLLIDER_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_DEFAULT_COLLIDER_SCHEMA_KEY)}.OptionId();`,
         `IReadOnlyList<${SMART_TILE_RULE_INTERFACE}> ${SMART_TILE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULES_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULES_SCHEMA_KEY)};`
       ],
       shadowedSchemaKeys: /* @__PURE__ */ new Set([
@@ -149120,9 +149181,9 @@ function planSmartTileEmission(ctx, classDef) {
       classMembers: [
         `IReadOnlyList<${SMART_TILE_NEIGHBOR_INTERFACE}> ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_NEIGHBORS_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_NEIGHBORS_SCHEMA_KEY)};`,
         `IReadOnlyList<Sprite> ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_SPRITES_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_SPRITES_SCHEMA_KEY)};`,
-        `string ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_OUTPUT_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_OUTPUT_SCHEMA_KEY)}.optionId;`,
-        `string ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_COLLIDER_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_COLLIDER_SCHEMA_KEY)}.optionId;`,
-        `string ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_TRANSFORM_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_TRANSFORM_SCHEMA_KEY)}.optionId;`,
+        `string ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_OUTPUT_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_OUTPUT_SCHEMA_KEY)}.OptionId();`,
+        `string ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_COLLIDER_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_COLLIDER_SCHEMA_KEY)}.OptionId();`,
+        `string ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_TRANSFORM_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_TRANSFORM_SCHEMA_KEY)}.OptionId();`,
         `float ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_MIN_ANIMATION_SPEED_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_MIN_ANIMATION_SPEED_SCHEMA_KEY)};`,
         `float ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_MAX_ANIMATION_SPEED_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_MAX_ANIMATION_SPEED_SCHEMA_KEY)};`
       ],
@@ -149142,7 +149203,7 @@ function planSmartTileEmission(ctx, classDef) {
       runtimeInterfaces: [SMART_TILE_NEIGHBOR_INTERFACE],
       classMembers: [
         `Vector2Int ${SMART_TILE_NEIGHBOR_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_NEIGHBOR_CELL_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_NEIGHBOR_CELL_SCHEMA_KEY)}.Value;`,
-        `string ${SMART_TILE_NEIGHBOR_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_NEIGHBOR_CONDITION_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_NEIGHBOR_CONDITION_SCHEMA_KEY)}.optionId;`,
+        `string ${SMART_TILE_NEIGHBOR_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_NEIGHBOR_CONDITION_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_NEIGHBOR_CONDITION_SCHEMA_KEY)}.OptionId();`,
         `string? ${SMART_TILE_NEIGHBOR_INTERFACE}.TileClassId => ${SMART_TILE_NEIGHBOR_TILE_RELATION_EXPRESSION};`
       ],
       shadowedSchemaKeys: /* @__PURE__ */ new Set([
@@ -150366,37 +150427,16 @@ function declaredConstructorParameters(ctx, classId, declared, genericEnv) {
     }
     identifiers.add(identifier2);
     const baseType = csharpFunctionTypeInfoValueType(ctx, argument2, true, genericEnv) ?? "object?";
-    const rendered = renderCSharpParameterDefault(
-      ctx,
-      argument2,
-      `constructors.${declared.id}.argumentTypes`
-    );
-    if (rendered === null) {
-      parameters.push({
-        declaredName: argument2.name,
-        identifier: identifier2,
-        csharpType: baseType,
-        defaultLiteral: null,
-        enumFallback: null
-      });
-      continue;
-    }
-    if (rendered.enumFallback === null) {
-      parameters.push({
-        declaredName: argument2.name,
-        identifier: identifier2,
-        csharpType: baseType,
-        defaultLiteral: rendered.literal,
-        enumFallback: null
-      });
-      continue;
-    }
     parameters.push({
       declaredName: argument2.name,
       identifier: identifier2,
-      csharpType: baseType.endsWith("?") ? baseType : `${baseType}?`,
-      defaultLiteral: rendered.literal,
-      enumFallback: rendered.enumFallback
+      csharpType: baseType,
+      defaultLiteral: renderCSharpParameterDefault(
+        ctx,
+        argument2,
+        `constructors.${declared.id}.argumentTypes`
+      ),
+      scriptArgument: scriptValueExpression(ctx, argument2, identifier2)
     });
   }
   return parameters;
@@ -150470,10 +150510,9 @@ function generateDeclaredConstructor(ctx, classId, className, constructorId, par
   );
   const signatureParameters = [...declaredParameters, ...appendedParameters];
   const parameterText = ctx.singleton ? signatureParameters.join(", ") : [`${ctx.projectClassName} project`, ...signatureParameters].join(", ");
-  const argumentEntries = parameters.map((parameter4) => {
-    const valueExpression = parameter4.enumFallback === null ? parameter4.identifier : `${parameter4.identifier} ?? ${parameter4.enumFallback}`;
-    return `new global::NeoCompose.Runtime.NeoDeclaredConstructorArgument("${escapeCSharpString(parameter4.declaredName)}", ${valueExpression})`;
-  }).join(", ");
+  const argumentEntries = parameters.map(
+    (parameter4) => `new global::NeoCompose.Runtime.NeoDeclaredConstructorArgument("${escapeCSharpString(parameter4.declaredName)}", ${parameter4.scriptArgument})`
+  ).join(", ");
   const argumentArray = argumentEntries.length === 0 ? "new global::NeoCompose.Runtime.NeoDeclaredConstructorArgument[] { }" : `new global::NeoCompose.Runtime.NeoDeclaredConstructorArgument[] { ${argumentEntries} }`;
   const suppliedValues = appendedMembers.map(
     (member) => `new global::NeoCompose.Runtime.NeoGeneratedConstructorValue("${escapeCSharpString(member.schemaKey)}", "${escapeCSharpString(member.memberId)}", ${member.identifier})`
@@ -150590,21 +150629,18 @@ function generateStaticFunctionMethod(ctx, ownerClass, member, genericEnv) {
     `members.${member.id}.argumentTypes`
   );
   const parameters = parameterList.map((parameter4) => parameter4.declaration).join(", ");
-  const coalesceStatements = parameterList.flatMap(
-    (parameter4) => parameter4.coalesceStatement === null ? [] : [parameter4.coalesceStatement]
+  const argumentNames = parameterList.map((parameter4) => parameter4.identifier);
+  const scriptArguments = parameterList.map(
+    (parameter4) => parameter4.scriptArgument
   );
-  const argumentNames = parameterList.map(
-    (parameter4) => parameter4.valueExpression
-  );
-  const args = argumentNames.length === 0 ? "{ }" : `{ ${argumentNames.join(", ")} }`;
+  const args = scriptArguments.length === 0 ? "{ }" : `{ ${scriptArguments.join(", ")} }`;
   const asyncModifier = member.kind === 23 /* NSFunction */ && callableIsDeferred(member) ? "async " : "";
   const declaration = `${memberAccessKeyword(member)} static ${asyncModifier}${returnType} ${functionMethodName(member.name)}(${parameters})`;
   const docs = xmlSummary(ctx.docs.members[member.id]);
   const stamp = memberMethodStamp(member);
   if (member.kind === 23 /* NSFunction */) {
-    const invocation = callableIsDeferred(member) ? `await node.InvokeStaticAsync(new object?[] ${args})` : `node.InvokeStatic(${immediateInvocationArguments(null, argumentNames)})`;
+    const invocation = callableIsDeferred(member) ? `await node.InvokeStaticAsync(new object?[] ${args})` : `node.InvokeStatic(${immediateInvocationArguments(null, scriptArguments)})`;
     const body = [
-      ...coalesceStatements,
       `var client = ${ctx.projectClassName}.RequireInstance().Client;`,
       `var node = NeoMemberNSFunction.GetOrCreateStatic(client, "${escapeCSharpString(member.id)}");`,
       ...isFunctionVoidTypeInfo(member.returnTypeInfo) ? [`${invocation};`] : [
@@ -150641,7 +150677,6 @@ function generateStaticFunctionMethod(ctx, ownerClass, member, genericEnv) {
     declaration,
     "{",
     ...indent([
-      ...coalesceStatements,
       `if (${handler} is null)`,
       "{",
       ...indent([
@@ -150874,7 +150909,7 @@ function generateStaticNSProperty(ctx, member, memberName, memberId, genericEnv)
   ];
   const setter = typeof member.setterCode === "string" ? [
     ...prelude,
-    "var result = node.Set(value);",
+    `var result = node.Set(${scriptValueExpression(ctx, member.returnTypeInfo, "value")});`,
     'if (!result.ok) throw new InvalidOperationException(result.error ?? "Static NSProperty setter failed.");'
   ] : null;
   return [
@@ -151044,7 +151079,7 @@ function generateMember(ctx, schemaKey, memberId, saved, modifier, emitBody, own
     genericEnv,
     ownerClassId
   );
-  const declaredPropertySetter = isMemberNSPropertyBase(member) && typeof member.setterCode === "string" ? nsPropertyWriteExpression(schemaKey) : null;
+  const declaredPropertySetter = isMemberNSPropertyBase(member) && typeof member.setterCode === "string" ? nsPropertyWriteExpression(ctx, member, schemaKey) : null;
   const propertySetter = suppressesInheritedSetter(inheritedContract) ? null : declaredPropertySetter;
   const emitsStoredSetter = bindingContract === null ? memberSaved : bindingContract.hasSetter;
   const storedSetterBody = suppressesInheritedSetter(inheritedContract) || !emitsStoredSetter ? null : writeExpression(ctx, member, schemaKey, ownerClassName, ownerClassId);
@@ -151397,10 +151432,10 @@ function descendsFromWorldObject(ctx, classId) {
   }
   return false;
 }
-function nsPropertyWriteExpression(schemaKey) {
+function nsPropertyWriteExpression(ctx, member, schemaKey) {
   const getNode = `writableNode.Get<NeoMemberNSProperty>("${escapeCSharpString(schemaKey)}")`;
   return [
-    `var result = ${getNode}.Set(valueId!, value);`,
+    `var result = ${getNode}.Set(valueId!, ${scriptValueExpression(ctx, member.returnTypeInfo, "value")});`,
     'if (!result.ok) throw new InvalidOperationException(result.error ?? "NSProperty setter failed.");'
   ];
 }
@@ -151470,49 +151505,37 @@ function renderCSharpParameterDefault(ctx, argument2, path) {
     case 1 /* Bool */: {
       const defaultValue = argument2.defaultValue;
       if (defaultValue === void 0) return null;
-      if (defaultValue.value === null)
-        return { literal: "null", enumFallback: null };
-      return {
-        literal: defaultValue.value ? "true" : "false",
-        enumFallback: null
-      };
+      if (defaultValue.value === null) return "null";
+      return defaultValue.value ? "true" : "false";
     }
     case 2 /* Int */: {
       const defaultValue = argument2.defaultValue;
       if (defaultValue === void 0) return null;
-      if (defaultValue.value === null)
-        return { literal: "null", enumFallback: null };
-      return { literal: String(defaultValue.value), enumFallback: null };
+      if (defaultValue.value === null) return "null";
+      return String(defaultValue.value);
     }
     case 4 /* Float */: {
       const defaultValue = argument2.defaultValue;
       if (defaultValue === void 0) return null;
-      if (defaultValue.value === null)
-        return { literal: "null", enumFallback: null };
-      return { literal: `${String(defaultValue.value)}f`, enumFallback: null };
+      if (defaultValue.value === null) return "null";
+      return `${String(defaultValue.value)}f`;
     }
     case 20 /* Decimal */: {
       const defaultValue = argument2.defaultValue;
       if (defaultValue === void 0) return null;
-      if (defaultValue.value === null)
-        return { literal: "null", enumFallback: null };
-      return { literal: `${defaultValue.value}m`, enumFallback: null };
+      if (defaultValue.value === null) return "null";
+      return `${defaultValue.value}m`;
     }
     case 3 /* String */: {
       const defaultValue = argument2.defaultValue;
       if (defaultValue === void 0) return null;
-      if (defaultValue.value === null)
-        return { literal: "null", enumFallback: null };
-      return {
-        literal: `"${escapeCSharpString(defaultValue.value)}"`,
-        enumFallback: null
-      };
+      if (defaultValue.value === null) return "null";
+      return `"${escapeCSharpString(defaultValue.value)}"`;
     }
     case 8 /* Enum */: {
       const defaultValue = argument2.defaultValue;
       if (defaultValue === void 0) return null;
-      if (defaultValue.value === null)
-        return { literal: "null", enumFallback: null };
+      if (defaultValue.value === null) return "null";
       const enumDef = ctx.exportData.enums[argument2.enumId];
       if (enumDef === void 0) {
         ctx.diagnostics.push({
@@ -151554,22 +151577,22 @@ function renderCSharpParameterDefault(ctx, argument2, path) {
         return null;
       }
       if (argument2.enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID)
-        return {
-          literal: `NeoCompose.Runtime.NeoCellPatternExcluding.${schemaKeyToMemberName(option.name)}`,
-          enumFallback: null
-        };
-      return { literal: "null", enumFallback: `${enumName}.${accessor}` };
+        return `NeoCompose.Runtime.NeoCellPatternExcluding.${schemaKeyToMemberName(option.name)}`;
+      return `${enumName}.${accessor}`;
     }
     default: {
       if (argument2.defaultValue === void 0) return null;
-      return { literal: "null", enumFallback: null };
+      return "null";
     }
   }
 }
+function scriptValueExpression(ctx, typeInfo, expression) {
+  return typeInfo.type === 8 /* Enum */ && typeInfo.enumId !== NEO_CELL_PATTERN_EXCLUDING_ENUM_ID && ctx.enumNames.has(typeInfo.enumId) ? `${expression}${typeInfo.required ? "" : "?"}.OptionId()` : expression;
+}
 function renderFunctionParameters(ctx, member, genericBindingSaved, genericEnv, path) {
   return member.argumentTypes.map((argument2, index) => {
     const identifier2 = functionParameterName(argument2.name, index);
-    const baseType = csharpFunctionTypeInfoValueType(
+    const type = csharpFunctionTypeInfoValueType(
       ctx,
       argument2,
       genericBindingSaved,
@@ -151577,10 +151600,9 @@ function renderFunctionParameters(ctx, member, genericBindingSaved, genericEnv,
     ) ?? "object?";
     const bare = {
       identifier: identifier2,
-      type: baseType,
-      declaration: `${baseType} ${identifier2}`,
-      valueExpression: identifier2,
-      coalesceStatement: null
+      type,
+      declaration: `${type} ${identifier2}`,
+      scriptArgument: scriptValueExpression(ctx, argument2, identifier2)
     };
     if (callableIsDeferred(member) && parameterHasDefault(argument2)) {
       ctx.diagnostics.push({
@@ -151590,26 +151612,8 @@ function renderFunctionParameters(ctx, member, genericBindingSaved, genericEnv,
       });
       return bare;
     }
-    const rendered = renderCSharpParameterDefault(ctx, argument2, path);
-    if (rendered === null) return bare;
-    if (rendered.enumFallback === null) {
-      return {
-        identifier: identifier2,
-        type: baseType,
-        declaration: `${baseType} ${identifier2} = ${rendered.literal}`,
-        valueExpression: identifier2,
-        coalesceStatement: null
-      };
-    }
-    const nullableType = baseType.endsWith("?") ? baseType : `${baseType}?`;
-    const coalescedLocal = `${identifier2}Value`;
-    return {
-      identifier: identifier2,
-      type: nullableType,
-      declaration: `${nullableType} ${identifier2} = null`,
-      valueExpression: coalescedLocal,
-      coalesceStatement: `var ${coalescedLocal} = ${identifier2} ?? ${rendered.enumFallback};`
-    };
+    const literal3 = renderCSharpParameterDefault(ctx, argument2, path);
+    return literal3 === null ? bare : { ...bare, declaration: `${type} ${identifier2} = ${literal3}` };
   });
 }
 function functionSignature(ctx, member, genericEnv) {
@@ -151677,12 +151681,12 @@ function generateFunctionMethod(ctx, member, schemaKey, modifier = "", emitBody
   ];
   if (!emitBody) return [...docs, `${declaration};`];
   const stamp = memberMethodStamp(member);
-  const coalesceStatements = parameterList.flatMap(
-    (parameter4) => parameter4.coalesceStatement === null ? [] : [parameter4.coalesceStatement]
-  );
-  const argumentList = parameterList.map((parameter4) => parameter4.valueExpression).join(", ");
+  const argumentList = parameterList.map((parameter4) => parameter4.identifier).join(", ");
   const call = `FunctionHandler.${methodName}(${argumentList})`;
-  const deferredArgs = member.argumentTypes.length === 0 ? "{ }" : `{ ${argumentList} }`;
+  const scriptArguments = parameterList.map(
+    (parameter4) => parameter4.scriptArgument
+  );
+  const deferredArgs = scriptArguments.length === 0 ? "{ }" : `{ ${scriptArguments.join(", ")} }`;
   const deferredCall = isFunctionVoidTypeInfo(member.returnTypeInfo) ? `return client.InvokeDeferredNativeFunction("${escapeCSharpString(member.id)}", this, new object?[] ${deferredArgs});` : `return client.InvokeDeferredNativeFunction<${csharpFunctionReturnType(ctx, member.returnTypeInfo, genericEnv, true)}>("${escapeCSharpString(member.id)}", this, new object?[] ${deferredArgs});`;
   if (member.id === NEO_TILE_CONVERT_MEMBER_ID) {
     return [
@@ -151690,10 +151694,7 @@ function generateFunctionMethod(ctx, member, schemaKey, modifier = "", emitBody
       ...stamp,
       declaration,
       "{",
-      ...indent([
-        ...coalesceStatements,
-        `return base.TryConvert(${argumentList});`
-      ]),
+      ...indent([`return base.TryConvert(${argumentList});`]),
       "}"
     ];
   }
@@ -151704,7 +151705,6 @@ function generateFunctionMethod(ctx, member, schemaKey, modifier = "", emitBody
       declaration,
       "{",
       ...indent([
-        ...coalesceStatements,
         `var result = client.ScriptGridQueries.Invoke("${member.id}", this, new object?[] ${deferredArgs});`,
         ...nsGetterResultReturnExpression(
           ctx,
@@ -151720,11 +151720,10 @@ function generateFunctionMethod(ctx, member, schemaKey, modifier = "", emitBody
   if (isNSFunction2) {
     const invocation = callableIsDeferred(member) ? `writableNode.Get<NeoMemberNSFunction>("${escapeCSharpString(schemaKey)}").InvokeAsync(valueId!, new object?[] ${deferredArgs})` : `InvokeFunction(${immediateInvocationArguments(
       `"${escapeCSharpString(schemaKey)}"`,
-      parameterList.map((parameter4) => parameter4.valueExpression)
+      scriptArguments
     )})`;
     const resultStatement = callableIsDeferred(member) ? `var result = await ${invocation};` : `var result = ${invocation};`;
     const body = [
-      ...coalesceStatements,
       ...callableIsDeferred(member) ? [
         `if (valueId is null) throw new InvalidOperationException("Cannot invoke NSFunction '${escapeCSharpString(member.name)}' without a backing receiver value id.");`
       ] : [],
@@ -151749,7 +151748,6 @@ function generateFunctionMethod(ctx, member, schemaKey, modifier = "", emitBody
     declaration,
     "{",
     ...indent([
-      ...coalesceStatements,
       ...callableIsDeferred(member) ? [deferredCall] : [
         "if (FunctionHandler is null)",
         "{",
@@ -151822,8 +151820,8 @@ function nativeFunctionArgExpression(ctx, typeInfo, valueExpression, argumentNam
     case 8 /* Enum */: {
       if (typeInfo.enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID)
         return `NeoCellPatternStorage.${required2 ? "ReadExcluding" : "ReadOptionalExcluding"}(${valueExpression})`;
-      const enumName = ctx.enumNames.get(typeInfo.enumId) ?? "string";
-      return required2 ? `NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${enumParser(enumName)}) ?? throw new InvalidOperationException("Required enum argument '${escapeCSharpString(argumentName)}' could not be resolved.")` : `NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${enumParser(enumName)})`;
+      const parser = enumParser(ctx, typeInfo.enumId);
+      return required2 ? `NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${parser}) ?? throw new InvalidOperationException("Required enum argument '${escapeCSharpString(argumentName)}' could not be resolved.")` : `NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${parser})`;
     }
     case 18 /* DialogueLookup */: {
       const dialogueIds = `NeoGeneratedTypesSupport.ToStringArray(${valueExpression})`;
@@ -151862,8 +151860,7 @@ function nativeFunctionArgExpression(ctx, typeInfo, valueExpression, argumentNam
       if (isMemberEnumBase(binding) && isMultiSelectionMember(binding)) {
         if (binding.enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID)
           return `NeoCellPatternStorage.ReadExcludingList(${valueExpression})`;
-        const enumName = ctx.enumNames.get(binding.enumId) ?? "string";
-        return `NeoGeneratedTypesSupport.ReadEnumList(${valueExpression}, ${enumParser(enumName)})`;
+        return `NeoGeneratedTypesSupport.ReadEnumList(${valueExpression}, ${enumParser(ctx, binding.enumId)})`;
       }
       if (isMemberClassBase(binding)) {
         const typeName = ctx.typeNames.get(binding.classId);
@@ -152107,10 +152104,9 @@ function nsGetterResultReturnExpression(ctx, returnTypeInfo, valueExpression, sa
           ...prefix,
           `return NeoCellPatternStorage.${optional2 ? "ReadOptionalExcluding" : "ReadExcluding"}(${valueExpression});`
         ];
-      const enumName = ctx.enumNames.get(returnTypeInfo.enumId) ?? "string";
       return [
         ...prefix,
-        `var selected = NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${enumParser(enumName)});`,
+        `var selected = NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${enumParser(ctx, returnTypeInfo.enumId)});`,
         optional2 ? "return selected;" : 'return selected ?? throw new InvalidOperationException("NSProperty returned null for a required enum value.");'
       ];
     }
@@ -152226,11 +152222,11 @@ function nsGetterGenericResultExpression(ctx, typeInfo, valueExpression, saved,
   if (isMemberEnumBase(binding)) {
     if (binding.enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID)
       return `NeoCellPatternStorage.${isMultiSelectionMember(binding) ? "ReadExcludingList" : required2 ? "ReadExcluding" : "ReadOptionalExcluding"}(${valueExpression})`;
-    const enumName = ctx.enumNames.get(binding.enumId) ?? "string";
+    const parser = enumParser(ctx, binding.enumId);
     if (isMultiSelectionMember(binding)) {
-      return `NeoGeneratedTypesSupport.ReadEnumList(${valueExpression}, ${enumParser(enumName)})`;
+      return `NeoGeneratedTypesSupport.ReadEnumList(${valueExpression}, ${parser})`;
     }
-    const read = `NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${enumParser(enumName)})`;
+    const read = `NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${parser})`;
     return required2 ? `${read} ?? throw new InvalidOperationException("Required generic enum result was null.")` : read;
   }
   if (isMemberClassBase(binding)) {
@@ -152380,11 +152376,11 @@ function detachedValueExpression(ctx, member, value, required2, saved, genericEn
   if (isMemberEnumBase(member)) {
     if (member.enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID)
       return `NeoCellPatternStorage.${isMultiSelectionMember(member) ? "ReadExcludingList" : required2 ? "ReadExcluding" : "ReadOptionalExcluding"}(${value})`;
-    const enumName = ctx.enumNames.get(member.enumId);
-    if (enumName === void 0) return null;
+    if (!ctx.enumNames.has(member.enumId)) return null;
+    const parser = enumParser(ctx, member.enumId);
     if (isMultiSelectionMember(member))
-      return `NeoGeneratedTypesSupport.ReadEnumList(${value}, ${enumParser(enumName)})`;
-    const read = `NeoGeneratedTypesSupport.ReadEnumSingle(${value}, ${enumParser(enumName)})`;
+      return `NeoGeneratedTypesSupport.ReadEnumList(${value}, ${parser})`;
+    const read = `NeoGeneratedTypesSupport.ReadEnumSingle(${value}, ${parser})`;
     return required2 ? `${read} ?? throw new InvalidOperationException("Required enum '${escapeCSharpString(member.name)}' has no selected option.")` : `${value} is null ? null : ${read}`;
   }
   if (isMemberClassBase(member) && member.classArguments == null) {
@@ -152553,15 +152549,15 @@ function storedReadExpression(ctx, member, schemaKey, nodeType, saved, ownerClas
       return [
         `return NeoCellPatternStorage.${isMultiSelectionMember(member) ? "ReadExcludingList" : isRequiredMember2(member) ? "ReadExcluding" : "ReadOptionalExcluding"}(${getNode}.Selected());`
       ];
-    const enumName = ctx.enumNames.get(member.enumId) ?? "string";
+    const optionsName = enumOptionsName(ctx, member.enumId);
     return isMultiSelectionMember(member) ? [
-      `return NeoGeneratedTypesSupport.ReadEnumList(${getNode}.Selected(), ${enumParser(enumName)});`
+      `return NeoGeneratedTypesSupport.ReadEnumList(${getNode}.Selected(), ${enumParser(ctx, member.enumId)});`
     ] : isRequiredMember2(member) ? [
       `var selected = NeoGeneratedTypesSupport.ReadSingleSelected(${getNode});`,
-      `return selected is null ? throw new InvalidOperationException("Required enum '${escapeCSharpString(schemaKey)}' has no selected option.") : ${enumName}.FromOptionId(selected);`
+      `return selected is null ? throw new InvalidOperationException("Required enum '${escapeCSharpString(schemaKey)}' has no selected option.") : ${optionsName}.FromOptionId(selected);`
     ] : [
       `var selected = NeoGeneratedTypesSupport.ReadSingleSelected(${getNode});`,
-      `return selected is null ? null : ${enumName}.FromOptionId(selected);`
+      `return selected is null ? null : ${optionsName}.FromOptionId(selected);`
     ];
   }
   if (isMemberLookupBase(member)) {
@@ -152718,13 +152714,12 @@ function writeExpression(ctx, member, schemaKey, ownerClassName, ownerClassId) {
       return [
         `NeoGeneratedTypesSupport.SetValue(writableNode, "${key}", NeoGeneratedTypesSupport.Value(NeoCellPatternStorage.${isMultiSelectionMember(member) ? "ExcludingListIds" : "OptionalExcludingIds"}(value)));`
       ];
-    const enumName = ctx.enumNames.get(member.enumId) ?? "string";
     return isMultiSelectionMember(member) ? [
-      `NeoGeneratedTypesSupport.SetValue(writableNode, "${key}", NeoGeneratedTypesSupport.Value(${enumName}.ToOptionIds(value)));`
+      `NeoGeneratedTypesSupport.SetValue(writableNode, "${key}", NeoGeneratedTypesSupport.Value(${enumOptionsName(ctx, member.enumId)}.ToOptionIds(value)));`
     ] : isRequiredMember2(member) ? [
-      `NeoGeneratedTypesSupport.SetValue(writableNode, "${key}", NeoGeneratedTypesSupport.Value(new[] { value.optionId }));`
+      `NeoGeneratedTypesSupport.SetValue(writableNode, "${key}", NeoGeneratedTypesSupport.Value(new[] { value.OptionId() }));`
     ] : [
-      `NeoGeneratedTypesSupport.SetValue(writableNode, "${key}", NeoGeneratedTypesSupport.Value(value is null ? null : new[] { value.optionId }));`
+      `NeoGeneratedTypesSupport.SetValue(writableNode, "${key}", NeoGeneratedTypesSupport.Value(value is null ? null : new[] { value.Value.OptionId() }));`
     ];
   }
   if (isMemberLookupBase(member)) {
@@ -152839,14 +152834,13 @@ function collectionReadExpression(ctx, member, getNode, schemaKey, entryMember,
     `new ${collectionType}(client, memberNode, (client, child) => ${childConverter(ctx, entryMember, false, false, genericEnv)}${keyCodecArguments})`
   );
 }
-function enumKeyCodecArguments(enumId, enumName) {
-  return enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID ? ", id => NeoCellPatternStorage.ReadExcluding(new[] { id }), key => NeoCellPatternStorage.ExcludingIds(key)[0]" : `, ${enumParser(enumName)}, key => key.optionId`;
+function enumKeyCodecArguments(ctx, enumId) {
+  return enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID ? ", id => NeoCellPatternStorage.ReadExcluding(new[] { id }), key => NeoCellPatternStorage.ExcludingIds(key)[0]" : `, ${enumParser(ctx, enumId)}, key => key.OptionId()`;
 }
 function dictionaryKeyCodecArguments(ctx, member) {
   if (!isEnumKeyedDictionaryMember(member)) return "";
-  const keyEnumName = ctx.enumNames.get(member.keyEnumId);
-  if (keyEnumName === void 0) return "";
-  return enumKeyCodecArguments(member.keyEnumId, keyEnumName);
+  if (!ctx.enumNames.has(member.keyEnumId)) return "";
+  return enumKeyCodecArguments(ctx, member.keyEnumId);
 }
 function serializeItemExpression(ctx, member, valueExpression) {
   if (member === null) return valueExpression;
@@ -152855,7 +152849,7 @@ function serializeItemExpression(ctx, member, valueExpression) {
   if (isMemberEnumBase(member)) {
     if (member.enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID)
       return `NeoGeneratedTypesSupport.Value(NeoCellPatternStorage.${isMultiSelectionMember(member) ? "ExcludingListIds" : "OptionalExcludingIds"}(${valueExpression}))`;
-    const rawExpression = isMultiSelectionMember(member) ? `${ctx.enumNames.get(member.enumId) ?? "NeoEnum"}.ToOptionIds(${valueExpression})` : `${valueExpression} is null ? null : new[] { ${valueExpression}.optionId }`;
+    const rawExpression = isMultiSelectionMember(member) ? `${enumOptionsName(ctx, member.enumId)}.ToOptionIds(${valueExpression})` : `${valueExpression} is ${ctx.enumNames.get(member.enumId) ?? "NeoEnum"} enumOption ? new[] { enumOption.OptionId() } : null`;
     return `NeoGeneratedTypesSupport.Value(${rawExpression})`;
   }
   if (isMemberLookupBase(member)) {
@@ -153044,8 +153038,8 @@ function childConverter(ctx, member, saved = false, branchOnReadOnly = false, ge
   if (isMemberEnumBase(member)) {
     if (member.enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID)
       return `NeoCellPatternStorage.${isMultiSelectionMember(member) ? "ReadExcludingList" : isRequiredMember2(member) ? "ReadExcluding" : "ReadOptionalExcluding"}(((NeoMemberEnum)child).Selected())`;
-    const enumName = ctx.enumNames.get(member.enumId) ?? "string";
-    return isMultiSelectionMember(member) ? `NeoGeneratedTypesSupport.ReadEnumList(((NeoMemberEnum)child).Selected(), ${enumParser(enumName)})` : isRequiredMember2(member) ? `NeoGeneratedTypesSupport.ReadEnumSingle(((NeoMemberEnum)child).Selected(), ${enumParser(enumName)}) ?? throw new InvalidOperationException("Required enum '${escapeCSharpString(member.name)}' has no selected option.")` : `NeoGeneratedTypesSupport.ReadEnumSingle(((NeoMemberEnum)child).Selected(), ${enumParser(enumName)})`;
+    const parser = enumParser(ctx, member.enumId);
+    return isMultiSelectionMember(member) ? `NeoGeneratedTypesSupport.ReadEnumList(((NeoMemberEnum)child).Selected(), ${parser})` : isRequiredMember2(member) ? `NeoGeneratedTypesSupport.ReadEnumSingle(((NeoMemberEnum)child).Selected(), ${parser}) ?? throw new InvalidOperationException("Required enum '${escapeCSharpString(member.name)}' has no selected option.")` : `NeoGeneratedTypesSupport.ReadEnumSingle(((NeoMemberEnum)child).Selected(), ${parser})`;
   }
   if (isMemberLookupBase(member)) return "((NeoMemberLookup)child).Selected()";
   if (isMemberDialogueLookupBase(member))
@@ -153099,8 +153093,8 @@ function nsGetterChildConverter(ctx, returnTypeInfo, saved, genericEnv) {
     case 8 /* Enum */: {
       if (returnTypeInfo.enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID)
         return `NeoCellPatternStorage.${returnTypeInfo.required ? "ReadExcluding" : "ReadOptionalExcluding"}(${valueExpression})`;
-      const enumName = ctx.enumNames.get(returnTypeInfo.enumId) ?? "string";
-      return `NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${enumParser(enumName)})`;
+      const readExpression2 = `NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${enumParser(ctx, returnTypeInfo.enumId)})`;
+      return returnTypeInfo.required ? `${readExpression2} ?? throw new InvalidOperationException("NSProperty returned null for a required enum value.")` : readExpression2;
     }
     case 18 /* DialogueLookup */: {
       const dialogueIds = `NeoGeneratedTypesSupport.ToStringArray(${valueExpression})`;
@@ -153167,7 +153161,7 @@ function escapeCSharpString(value) {
     (character) => CSHARP_STRING_ESCAPES.get(character) ?? `\\u${character.charCodeAt(0).toString(16).padStart(4, "0")}`
   );
 }
-var NEO_MEMORY_SCHEMA_KEYS, NEO_MEMORY_CLASS_NAMES, GENERATED_ENUM_CLASS_MEMBER_NAMES, CHILDREN_SCHEMA_KEY, TILE_LAYER_LINK_INTERFACE, OBJECT_LAYER_LINK_INTERFACE, OBJECT_SPAWN_HOOKS_INTERFACE, TILE_LAYER_RENDER_TARGET_PROVIDER_INTERFACE, SMART_TILE_SOURCE_INTERFACE, SMART_TILE_INTERFACE, SMART_TILE_RULE_INTERFACE, SMART_TILE_NEIGHBOR_INTERFACE, WORLD_OBJECT_VALUE_INTERFACE, OBJECT_COMPOSITION_SOURCE_INTERFACE, COLLIDER_SOURCE_INTERFACE, SORTING_GROUP_SOURCE_INTERFACE, COLLIDER_INTERFACE, SORTING_GROUP_INTERFACE, SPRITE_OBJECT_VALUE_INTERFACE, SORTING_GROUP_SOURCE_MEMBER_NAME, OBJECT_BASE_NAME_SCHEMA_KEY, OBJECT_BASE_POSITION_SCHEMA_KEY, OBJECT_BASE_SIZE_SCHEMA_KEY, SPRITE_OBJECT_SPRITE_SCHEMA_KEY, SPRITE_OBJECT_FLIP_X_SCHEMA_KEY, SPRITE_OBJECT_FLIP_Y_SCHEMA_KEY, SPRITE_OBJECT_MASK_INTERACTION_SCHEMA_KEY, SPRITE_OBJECT_SORTING_ORDER_SCHEMA_KEY, TILE_CELL_SCHEMA_KEY, EMPTY_RUNTIME_CONTRACT_PLAN, SMART_TILE_CONTRACT_WORLD_KINDS, WORLD_OBJECT_CONTRACT_WORLD_KINDS, SMART_TILE_NEIGHBOR_TILE_RELATION_EXPRESSION, REQUIRED_STRING_CONTRACT_FIELD, REQUIRED_BOOL_CONTRACT_FIELD, OPTIONAL_BOOL_CONTRACT_FIELD, OPTIONAL_INT_CONTRACT_FIELD, REQUIRED_FLOAT_CONTRACT_FIELD, REQUIRED_SPRITE_CONTRACT_FIELD, REQUIRED_VECTOR2_CONTRACT_FIELD, OPTIONAL_VECTOR2_CONTRACT_FIELD, REQUIRED_VECTOR2_INT_CONTRACT_FIELD, REQUIRED_VECTOR3_CONTRACT_FIELD, VARIANTS_SCOPE_NAME, BASE_VARIANT_NAME, VARIANT_APPLY_METHOD_NAME, VARIANT_FOLDER_SEPARATOR, CSHARP_STRING_ESCAPES, UNRESOLVED_VARIANT_TARGET;
+var NEO_MEMORY_SCHEMA_KEYS, NEO_MEMORY_CLASS_NAMES, CHILDREN_SCHEMA_KEY, TILE_LAYER_LINK_INTERFACE, OBJECT_LAYER_LINK_INTERFACE, OBJECT_SPAWN_HOOKS_INTERFACE, TILE_LAYER_RENDER_TARGET_PROVIDER_INTERFACE, SMART_TILE_SOURCE_INTERFACE, SMART_TILE_INTERFACE, SMART_TILE_RULE_INTERFACE, SMART_TILE_NEIGHBOR_INTERFACE, WORLD_OBJECT_VALUE_INTERFACE, OBJECT_COMPOSITION_SOURCE_INTERFACE, COLLIDER_SOURCE_INTERFACE, SORTING_GROUP_SOURCE_INTERFACE, COLLIDER_INTERFACE, SORTING_GROUP_INTERFACE, SPRITE_OBJECT_VALUE_INTERFACE, SORTING_GROUP_SOURCE_MEMBER_NAME, OBJECT_BASE_NAME_SCHEMA_KEY, OBJECT_BASE_POSITION_SCHEMA_KEY, OBJECT_BASE_SIZE_SCHEMA_KEY, SPRITE_OBJECT_SPRITE_SCHEMA_KEY, SPRITE_OBJECT_FLIP_X_SCHEMA_KEY, SPRITE_OBJECT_FLIP_Y_SCHEMA_KEY, SPRITE_OBJECT_MASK_INTERACTION_SCHEMA_KEY, SPRITE_OBJECT_SORTING_ORDER_SCHEMA_KEY, TILE_CELL_SCHEMA_KEY, EMPTY_RUNTIME_CONTRACT_PLAN, SMART_TILE_CONTRACT_WORLD_KINDS, WORLD_OBJECT_CONTRACT_WORLD_KINDS, SMART_TILE_NEIGHBOR_TILE_RELATION_EXPRESSION, REQUIRED_STRING_CONTRACT_FIELD, REQUIRED_BOOL_CONTRACT_FIELD, OPTIONAL_BOOL_CONTRACT_FIELD, OPTIONAL_INT_CONTRACT_FIELD, REQUIRED_FLOAT_CONTRACT_FIELD, REQUIRED_SPRITE_CONTRACT_FIELD, REQUIRED_VECTOR2_CONTRACT_FIELD, OPTIONAL_VECTOR2_CONTRACT_FIELD, REQUIRED_VECTOR2_INT_CONTRACT_FIELD, REQUIRED_VECTOR3_CONTRACT_FIELD, VARIANTS_SCOPE_NAME, BASE_VARIANT_NAME, VARIANT_APPLY_METHOD_NAME, VARIANT_FOLDER_SEPARATOR, CSHARP_STRING_ESCAPES, UNRESOLVED_VARIANT_TARGET;
 var init_generate_unity_classes = __esm({
   "../src/models/exports/unity-codegen/generate-unity-classes.ts"() {
     "use strict";
@@ -153213,24 +153207,6 @@ var init_generate_unity_classes = __esm({
       textNodeMemory: "NeoTextNodeMemory",
       choiceLog: "NeoChoiceLog"
     };
-    GENERATED_ENUM_CLASS_MEMBER_NAMES = /* @__PURE__ */ new Set([
-      "values",
-      "optionId",
-      "Text",
-      "TextId",
-      "FromOptionId",
-      "ToOptionIds",
-      "IsKnown",
-      "TextIdForOptionId",
-      "TextForOptionId",
-      "ToString",
-      "Equals",
-      "GetHashCode",
-      "GetType",
-      "ReferenceEquals",
-      "MemberwiseClone",
-      "Finalize"
-    ]);
     CHILDREN_SCHEMA_KEY = "Children";
     TILE_LAYER_LINK_INTERFACE = "INeoTileLayerLinkValue";
     OBJECT_LAYER_LINK_INTERFACE = "INeoObjectLayerLinkValue";
@@ -156488,7 +156464,7 @@ var UNITY_CODEGEN_REVISION;
 var init_unity_codegen_revision = __esm({
   "../src/models/exports/unity-codegen-revision.ts"() {
     "use strict";
-    UNITY_CODEGEN_REVISION = "03bfbde6bcc46538292d7c03998e5a684d7a0a0bff8959f9aeaa8a38d18753f5";
+    UNITY_CODEGEN_REVISION = "30d96d89e3d179ccf291e522834281f90dbd44b464cf51eea76aae87eed97e7e";
   }
 });
 
@@ -174074,6 +174050,7 @@ function selectedSpecPaths(workspace, selectors) {
   const normalizedSelectors = selectors.map(
     (selector) => selector.replaceAll("\\", "/").replace(/^\.\//u, "")
   );
+  const realRoot = realpathSync2(workspace.root);
   for (const selector of normalizedSelectors) {
     if (/[*?]/u.test(selector)) continue;
     if (isAbsolute3(selector)) {
@@ -174090,7 +174067,7 @@ function selectedSpecPaths(workspace, selectors) {
     }
     if (!existsSync19(absolute)) continue;
     const real = realpathSync2(absolute);
-    const realRelative = relative9(workspace.root, real);
+    const realRelative = relative9(realRoot, real);
     if (realRelative === ".." || realRelative.startsWith(`..${sep9}`)) {
       throw new Error(
         `Spec selector ${JSON.stringify(selector)} resolves outside the workspace through a symlink.`
@@ -182175,7 +182152,7 @@ There is no --keep-current: preserving current semantic state defines flatten.
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.70.3");
+    console.log("0.70.4");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.70.3",
+  "version": "0.70.4",
   "description": "Neo Compose native project-source CLI with bidirectional sync.",
   "license": "MIT",
   "type": "module",

package/skills/neocompose-cli/SKILL.md

@@ -9,7 +9,7 @@ description: >-
   `@neocompose/cli` or `node cli/bin/neo.mjs` in the neo-compose repository.
 ---
 
-<!-- reviewed-through-cli: 0.70.3 -->
+<!-- reviewed-through-cli: 0.70.4 -->
 
 # Neo Compose CLI
 

package/skills/neocompose-cli/references/cli-development.md

@@ -110,7 +110,7 @@ wrappers.
 The marker near the top of `SKILL.md` must exactly match the package version:
 
 ```html
-<!-- reviewed-through-cli: 0.70.3 -->
+<!-- reviewed-through-cli: 0.70.4 -->
 ```
 
 The quoted version above is checked too, so this instruction cannot go stale