@neocompose/cli 0.54.0 → 0.54.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.54.1] - 2026-09-22
+
+- Variants with the same name in different folders, such as `Oak/Day1` and `Ash/Day1`, keep their own nested rows on push. Adding overrides to one of them no longer fails with "claims identity …, which another value created by this push already owns."
+
 ## [0.54.0] - 2026-09-22
 
 - `NeoSortingGroup` has a `SortPoint`: where the group sorts along the transparency sort axis, as a cell offset from the object's origin-cell corner. It defaults to `(0.5, 0)`, the bottom center of the origin cell. Generated Unity classes implement `INeoSortingGroup.SortPoint`, which requires Neo Compose SDK 0.40.0.

package/dist/neo.mjs

@@ -9164,15 +9164,15 @@ var init_strict_resolver = __esm({
             symbol
           };
         }
-        const variantPath = this.resolveVariantPath(receiverAst, name, scope, pos);
-        if (variantPath !== null) {
+        const variantPath2 = this.resolveVariantPath(receiverAst, name, scope, pos);
+        if (variantPath2 !== null) {
           if (optional2) {
             throw new CompileError(
               "Optional chaining is not valid on a variant path.",
               pos
             );
           }
-          return variantPath;
+          return variantPath2;
         }
         if (receiverAst.kind === "ident" && !scope.lookup(receiverAst.name)) {
           if (receiverAst.name === "SpriteInfo" && name === "Empty") {
@@ -29523,13 +29523,13 @@ function activeNamedArgument(text, position) {
   return /([A-Za-z_][A-Za-z0-9_]*)\s*:\s*\.[A-Za-z0-9_]*$/.exec(prefix)?.[1] ?? null;
 }
 function projectHover(analysis, document, position) {
-  const variantPath = projectVariantPathSymbolAt(analysis, document, position);
-  if (variantPath) {
+  const variantPath2 = projectVariantPathSymbolAt(analysis, document, position);
+  if (variantPath2) {
     return {
-      range: variantPath.token.range,
+      range: variantPath2.token.range,
       markdown: projectVariantHoverMarkdown(
-        variantPath.entry,
-        variantPath.entry.declaration.type.name === NEO_VARIANT_FOLDER_TYPE_NAME
+        variantPath2.entry,
+        variantPath2.entry.declaration.type.name === NEO_VARIANT_FOLDER_TYPE_NAME
       )
     };
   }
@@ -29629,12 +29629,12 @@ Construct with \`new(${parameters})\` \u2014 this class declares a required cons
 ${lines.join("\n\n")}`;
 }
 function projectDefinition(analysis, document, position) {
-  const variantPath = projectVariantPathSymbolAt(analysis, document, position);
-  if (variantPath) {
+  const variantPath2 = projectVariantPathSymbolAt(analysis, document, position);
+  if (variantPath2) {
     return [
       {
-        uri: variantPath.entry.uri,
-        range: variantPath.entry.declaration.nameRange
+        uri: variantPath2.entry.uri,
+        range: variantPath2.entry.declaration.nameRange
       }
     ];
   }
@@ -111856,6 +111856,9 @@ function variantValueBindingsV4(manifest, analysis) {
   const classNames = new Map(
     manifest.classes.map((entry) => [entry.id, entry.name])
   );
+  const folderPaths = new Map(
+    manifest.variantFolders.map((folder) => [folder.id, folder.path])
+  );
   return variantGlobals(analysis).flatMap((global) => {
     const variant2 = variantsById.get(
       variantRecordId(global, NEO_VARIANT_TYPE_NAME)
@@ -111877,11 +111880,31 @@ function variantValueBindingsV4(manifest, analysis) {
         valueId: variant2.valueId,
         initializer: global.initializer,
         source: global.source,
-        label: `${requiredClassName2(classNames, variant2.classId)}.${NEO_VARIANT_SCOPE_NAME}.${variant2.name}`
+        label: variantLabel(
+          requiredClassName2(classNames, variant2.classId),
+          variant2,
+          folderPaths
+        )
       }
     ];
   });
 }
+function variantLabel(className, variant2, folderPaths) {
+  if (variant2.folderId === null) {
+    return variantPath(className, null, variant2.name);
+  }
+  const folderPath3 = folderPaths.get(variant2.folderId);
+  if (folderPath3 === void 0) {
+    throw new Error(
+      `Variant ${variant2.name} sits in folder ${JSON.stringify(variant2.folderId)}, which this push does not declare.`
+    );
+  }
+  return variantPath(className, folderPath3, variant2.name);
+}
+function variantPath(className, folderPath3, name) {
+  const scope = folderPath3 === null || folderPath3 === "" ? `${className}.${NEO_VARIANT_SCOPE_NAME}` : `${className}.${NEO_VARIANT_SCOPE_NAME}.${folderPath3.split(NEO_VARIANT_FOLDER_PATH_SEPARATOR).join(".")}`;
+  return `${scope}.${name}`;
+}
 function requiredClassName2(classNames, classId) {
   const name = classNames.get(classId);
   if (name === void 0) {
@@ -112013,8 +112036,7 @@ function buildVariantPathIndexV4(classIdsByName, analysis) {
       annotationsForFolderLookup(global.annotations)
     );
     const path = symbol === null ? null : foldersBySymbol.get(folderSymbolKey(className, symbol)) ?? null;
-    const scope = path === null || path === "" ? `${className}.${NEO_VARIANT_SCOPE_NAME}` : `${className}.${NEO_VARIANT_SCOPE_NAME}.${path.split(NEO_VARIANT_FOLDER_PATH_SEPARATOR).join(".")}`;
-    index.set(`${scope}.${global.name}`, {
+    index.set(variantPath(className, path, global.name), {
       classId,
       variantId: variantRecordId(global, global.type.name),
       valueClassId: global.type.name === NEO_LOOKUP_VARIANT_TYPE_NAME ? classIdsByName.get(valueClassName(global)) ?? null : null
@@ -138844,7 +138866,7 @@ var init_registry2 = __esm({
   "schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.54.0",
+      cliVersion: "0.54.1",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -146665,7 +146687,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.54.0");
+    console.log("0.54.1");
     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.54.0",
+  "version": "0.54.1",
   "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.54.0 -->
+<!-- reviewed-through-cli: 0.54.1 -->
 
 # Neo Compose CLI
 

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

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