@neocompose/cli 0.82.3 → 0.82.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.82.5
+
+### Patch Changes
+
+- 7d9a013: Preserve generic arguments in Unity animation clip target types and reference lookup factories. Generate clip getters with the declared target type so clips targeting a base class compile correctly. Report incompatible owner/target generic bindings during export instead of emitting C# that cannot compile. Run `neo export` after updating to regenerate the corrected C#.
+
+## 0.82.4
+
+### Patch Changes
+
+- 8ce5b54: Accept Reference<T> constructor and method parameters during record validation, including enum and scalar slots. Invalid callable parameters now report the parameter name and validation cause.
+
 ## 0.82.3
 
 ### Patch Changes

package/dist/neo-runtime.mjs

@@ -15508,7 +15508,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.82.3",
+      cliVersion: "0.82.5",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -24459,7 +24459,7 @@ function csharpPropertyValueType(ctx, member, saved = false, env, genericBinding
   }
   return csharpValueType(ctx, member, saved, env, genericBindingSaved);
 }
-function animationClipTargetType(ctx, member, env) {
+function animationClipTargetType(ctx, member, env, ownerClassId) {
   const clipClass = resolveInheritanceChain(member.classId, ctx.classes).find(
     (candidate) => candidate.system?.worldKind === NeoWorldSystemClassKind.AnimationClip
   );
@@ -24540,7 +24540,47 @@ function animationClipTargetType(ctx, member, env) {
     });
     return null;
   }
-  return targetType;
+  const suffix = constructedTypeArgumentsSuffix(ctx, bindingMember, true, env);
+  if (suffix === null) return null;
+  const constructedTarget = `${targetType}${suffix}`;
+  if (ownerClassId !== void 0) {
+    const ownerName = ctx.typeNames.get(ownerClassId) ?? ownerClassId;
+    if (!resolveInheritanceChain(ownerClassId, ctx.classes).some(
+      (ancestor) => ancestor.id === bindingMember.classId
+    )) {
+      ctx.diagnostics.push({
+        severity: "error",
+        message: `Animation clip "${member.name}" targets ${constructedTarget}, which is not its owner ${ownerName} or a base of it.`,
+        path: memberPath3
+      });
+      return null;
+    }
+    const ownerArguments = [];
+    for (const { param } of resolveGenericScopeForEmission(
+      ctx,
+      bindingMember.classId
+    )) {
+      const argument2 = csharpGenericParamType(
+        ctx,
+        param.id,
+        true,
+        env,
+        memberPath3
+      );
+      if (argument2 === null) return null;
+      ownerArguments.push(argument2);
+    }
+    const ownerTarget = `${targetType}${ownerArguments.length === 0 ? "" : `<${ownerArguments.join(", ")}>`}`;
+    if (ownerTarget !== constructedTarget) {
+      ctx.diagnostics.push({
+        severity: "error",
+        message: `Animation clip "${member.name}" targets ${constructedTarget}, but owner ${ownerName} has target type ${ownerTarget}. A clip must target its owner or a constructed base of it.`,
+        path: memberPath3
+      });
+      return null;
+    }
+  }
+  return constructedTarget;
 }
 function csharpTypeInfoValueType(ctx, typeInfo, saved, genericEnv, genericBindingSaved = saved) {
   const optional2 = !typeInfo.required;
@@ -128632,6 +128672,8 @@ function typeInfoInterfaceIds(value) {
   }
   if ("entryTypeInfo" in value)
     ids.push(...typeInfoInterfaceIds(value.entryTypeInfo));
+  if ("targetTypeInfo" in value)
+    ids.push(...typeInfoInterfaceIds(value.targetTypeInfo));
   if (isRecord8(value.typeArguments)) {
     for (const argument2 of Object.values(value.typeArguments)) {
       ids.push(...typeInfoInterfaceIds(argument2));
@@ -128711,6 +128753,15 @@ function isOpaqueNSTypeInfo(value, ancestors = /* @__PURE__ */ new Set()) {
   if (value.type === 22) {
     return typeof value.interfaceId === "string" && value.interfaceId.length > 0;
   }
+  if (value.type === 29 /* Reference */) {
+    if (ancestors.has(value)) return false;
+    ancestors.add(value);
+    try {
+      return isOpaqueNSTypeInfo(value.targetTypeInfo, ancestors);
+    } finally {
+      ancestors.delete(value);
+    }
+  }
   if (value.type === 25) {
     if (!Array.isArray(value.argumentTypes) || ancestors.has(value)) {
       return false;
@@ -128750,6 +128801,9 @@ function isOpaqueNSTypeInfo(value, ancestors = /* @__PURE__ */ new Set()) {
 }
 function opaqueTypeInfoContainsUnknown(value) {
   if (value.type === "Unknown") return true;
+  if (value.type === 29 /* Reference */) {
+    return isRecord8(value.targetTypeInfo) && opaqueTypeInfoContainsUnknown(value.targetTypeInfo);
+  }
   if (value.type === 5 /* Dictionary */ || value.type === 6 /* List */ || value.type === 28 /* Set */ || value.type === 9 /* Lookup */) {
     return isRecord8(value.entryTypeInfo) && opaqueTypeInfoContainsUnknown(value.entryTypeInfo);
   }
@@ -128838,6 +128892,7 @@ function opaqueFunctionGenericReference(value, matches) {
   }
   const children = [
     value.entryTypeInfo,
+    value.targetTypeInfo,
     value.returnTypeInfo,
     ...Array.isArray(value.argumentTypes) ? value.argumentTypes : [],
     ...isRecord8(value.typeArguments) ? Object.values(value.typeArguments) : []
@@ -128855,7 +128910,38 @@ function isOpaqueNSFunctionReturnTypeInfo(value) {
   return isOpaqueNSTypeInfo(value);
 }
 function isOpaqueCallableArgumentTypeInfo(value) {
-  return isOpaqueNSTypeInfo(value) && isOpaqueCallableArgumentIdentifier(value.name) && !opaqueTypeInfoContainsUnknown(value) && hasValidOpaqueParameterDefault(value);
+  return opaqueCallableArgumentError(value) === null;
+}
+function opaqueCallableArgumentError(value) {
+  if (!isRecord8(value)) return "must be an argument type object.";
+  const { type, required: required2 } = value;
+  if (!isOpaqueNSTypeInfo(value)) {
+    if (type === 29 /* Reference */) {
+      if (typeof required2 !== "boolean") {
+        return "Reference required must be a boolean.";
+      }
+      return "Reference targetTypeInfo is invalid.";
+    }
+    return "type information is invalid.";
+  }
+  if (!isOpaqueCallableArgumentIdentifier(value.name)) {
+    return "name is invalid or reserved.";
+  }
+  if (opaqueTypeInfoContainsUnknown(value)) {
+    return "type contains Unknown.";
+  }
+  if (!hasValidOpaqueParameterDefault(value)) {
+    return "defaultValue is invalid for its type.";
+  }
+  return null;
+}
+function assertOpaqueCallableArgumentsValid(arguments_, owner) {
+  for (const [index, argument2] of arguments_.entries()) {
+    const error = opaqueCallableArgumentError(argument2);
+    if (error === null) continue;
+    const label = isRecord8(argument2) && typeof argument2.name === "string" ? `"${argument2.name}"` : `at index ${index}`;
+    throw new Error(`${owner} parameter ${label} ${error}`);
+  }
 }
 function hasValidOpaqueParameterDefault(value) {
   const wrapper = value.defaultValue;
@@ -128914,7 +129000,7 @@ function assertOpaqueParameterDefaultsValid(member) {
   for (const argument2 of argumentTypes) {
     if (!isRecord8(argument2) || !hasValidOpaqueParameterDefault(argument2)) {
       throw new Error(
-        `Function "${member.name}" (${member.id}) declares a parameter default value that does not match the parameter's type.`
+        `Function "${member.name}" (${member.id}) parameter "${isRecord8(argument2) ? String(argument2.name) : "<invalid>"}" defaultValue is invalid for its type.`
       );
     }
     parameters.push(argument2);
@@ -129756,6 +129842,15 @@ function assertProjectInterfaceDocumentValid(view, options = {}) {
         )
       };
     }
+    if (typeInfo.type === 29 /* Reference */) {
+      return {
+        ...typeInfo,
+        targetTypeInfo: substituteTypeInfoForClass(
+          typeInfo.targetTypeInfo,
+          schemaClass2
+        )
+      };
+    }
     if (typeInfo.type === 25 && Array.isArray(typeInfo.argumentTypes)) {
       return {
         ...typeInfo,
@@ -130224,11 +130319,10 @@ function assertOpaqueConstructorValid(declaredConstructor) {
     );
   }
   const argumentTypes = declaredConstructor.argumentTypes;
-  if (!argumentTypes.every(isOpaqueCallableArgumentTypeInfo)) {
-    throw new Error(
-      `Constructor "${declaredConstructor.id}" argumentTypes are invalid.`
-    );
-  }
+  assertOpaqueCallableArgumentsValid(
+    argumentTypes,
+    `Constructor "${declaredConstructor.id}"`
+  );
   const names = /* @__PURE__ */ new Set();
   for (const argument2 of argumentTypes) {
     const name = argument2.name;
@@ -130529,9 +130623,10 @@ function assertOpaqueNSFunctionValid(member, membersById, typeInfoInDeclaringCla
   if (!Array.isArray(member.argumentTypes)) {
     throw new Error(`NSFunction "${member.id}" argumentTypes are invalid.`);
   }
-  if (!member.argumentTypes.every(isOpaqueCallableArgumentTypeInfo)) {
-    throw new Error(`NSFunction "${member.id}" has an invalid argument type.`);
-  }
+  assertOpaqueCallableArgumentsValid(
+    member.argumentTypes,
+    `NSFunction "${member.id}"`
+  );
   const argumentNames = /* @__PURE__ */ new Set();
   for (const argument2 of member.argumentTypes) {
     const name = argument2.name;
@@ -181269,7 +181364,12 @@ function generateMember(ctx, schemaKey, memberId, saved, modifier, emitBody, own
     );
   }
   if (isMemberClassBase(member) && (ctx.worldKinds.get(member.classId) ?? null) === NeoWorldSystemClassKind.AnimationClip) {
-    const targetType = animationClipTargetType(ctx, member, genericEnv);
+    const targetType = animationClipTargetType(
+      ctx,
+      member,
+      genericEnv,
+      ownerClassId
+    );
     if (targetType === null) {
       return [`// Skipped invalid animation clip member: ${memberName}`];
     }
@@ -181288,7 +181388,7 @@ function generateMember(ctx, schemaKey, memberId, saved, modifier, emitBody, own
         "get",
         "{",
         ...indent([
-          `return client.GetOrCreateAnimationClip(this, "${escapeCSharpString(schemaKey)}");`
+          `return client.GetOrCreateAnimationClip<${targetType}>(this, "${escapeCSharpString(schemaKey)}");`
         ]),
         "}"
       ]),
@@ -183325,7 +183425,7 @@ function lookupSelectionFactory(ctx, member, selection2, saved, writeGuardMember
   const targetClass = lookupTargetClassProjection(ctx, member, genericEnv);
   if (targetClass === null) return null;
   const typeName = ctx.typeNames.get(targetClass.classId) ?? "NeoNode";
-  const savedTypeRef = qualifyGeneratedType(ctx, savedTypeName(typeName));
+  const savedTypeRef = `${qualifyGeneratedType(ctx, savedTypeName(typeName))}${targetClass.constructedSuffix}`;
   const writable = `writable${selection2[0].toUpperCase()}${selection2.slice(1)}`;
   if (lookupHasRuntimeOwnership(member) && schemaClassHasWritableFamily(ctx, targetClass.classId))
     return `${selection2} is NeoMemberClassWritable ${writable} ? ${savedTypeRef}.CreateWritable(client, ${writable}) : ${savedTypeRef}.Create(client, (NeoMemberClass)${selection2})`;
@@ -187038,7 +187138,7 @@ var UNITY_CODEGEN_REVISION;
 var init_unity_codegen_revision = __esm({
   "../src/models/exports/unity-codegen-revision.ts"() {
     "use strict";
-    UNITY_CODEGEN_REVISION = "4eae63e39962f0ceb684c43fe8932b031b420c82ad6319670c46608bd9cd1470";
+    UNITY_CODEGEN_REVISION = "2734215e6a19e5f077e5f76093f84e82b0ee6fe9e3bc92a4f44c43c2448c63ba";
   }
 });
 
@@ -208017,7 +208117,7 @@ var releaseWorkspaceLock = () => void 0;
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.82.3");
+    console.log("0.82.5");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {

package/dist/test-worker.mjs

@@ -60511,7 +60511,7 @@ function csharpPropertyValueType(ctx, member, saved = false, env, genericBinding
   }
   return csharpValueType(ctx, member, saved, env, genericBindingSaved);
 }
-function animationClipTargetType(ctx, member, env) {
+function animationClipTargetType(ctx, member, env, ownerClassId) {
   const clipClass = resolveInheritanceChain(member.classId, ctx.classes).find(
     (candidate) => candidate.system?.worldKind === NeoWorldSystemClassKind.AnimationClip
   );
@@ -60592,7 +60592,47 @@ function animationClipTargetType(ctx, member, env) {
     });
     return null;
   }
-  return targetType;
+  const suffix = constructedTypeArgumentsSuffix(ctx, bindingMember, true, env);
+  if (suffix === null) return null;
+  const constructedTarget = `${targetType}${suffix}`;
+  if (ownerClassId !== void 0) {
+    const ownerName = ctx.typeNames.get(ownerClassId) ?? ownerClassId;
+    if (!resolveInheritanceChain(ownerClassId, ctx.classes).some(
+      (ancestor) => ancestor.id === bindingMember.classId
+    )) {
+      ctx.diagnostics.push({
+        severity: "error",
+        message: `Animation clip "${member.name}" targets ${constructedTarget}, which is not its owner ${ownerName} or a base of it.`,
+        path: memberPath
+      });
+      return null;
+    }
+    const ownerArguments = [];
+    for (const { param } of resolveGenericScopeForEmission(
+      ctx,
+      bindingMember.classId
+    )) {
+      const argument2 = csharpGenericParamType(
+        ctx,
+        param.id,
+        true,
+        env,
+        memberPath
+      );
+      if (argument2 === null) return null;
+      ownerArguments.push(argument2);
+    }
+    const ownerTarget = `${targetType}${ownerArguments.length === 0 ? "" : `<${ownerArguments.join(", ")}>`}`;
+    if (ownerTarget !== constructedTarget) {
+      ctx.diagnostics.push({
+        severity: "error",
+        message: `Animation clip "${member.name}" targets ${constructedTarget}, but owner ${ownerName} has target type ${ownerTarget}. A clip must target its owner or a constructed base of it.`,
+        path: memberPath
+      });
+      return null;
+    }
+  }
+  return constructedTarget;
 }
 function csharpTypeInfoValueType(ctx, typeInfo, saved, genericEnv, genericBindingSaved = saved) {
   const optional2 = !typeInfo.required;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.82.3",
+  "version": "0.82.5",
   "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.82.3 -->
+<!-- reviewed-through-cli: 0.82.5 -->
 
 # Neo Compose CLI
 

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

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

package/skills/neocompose-cli/references/commands-and-sync.md

@@ -331,6 +331,10 @@ to earlier content reuses that result after verifying output bytes; changed or
 missing outputs are regenerated. Edited content is validated
 even when C# generation is skipped. After a CLI code-generation fix, run
 `neo export` again; generator revision changes invalidate cached C# output.
+Generated animation clip targets and reference lookup factories retain constructed
+generic arguments, including supported forwarded bindings. Clip getters use the
+declared target type when the owner is a derived class. Export reports an error
+when a clip target does not match the owner or one of its constructed base types.
 New instances that reuse existing member-localized text retain its shared ID
 and translations in the export.
 

package/skills/neocompose-cli/references/declarations-and-construction.md

@@ -256,11 +256,11 @@ code types; see the NeoScript reference for handle and slot references.
 `public Reference<Config> Config` selects one row and reads as `Config`.
 `public Set<Reference<Config>> Configs` selects several and reads as
 `Set<Config>`. `public Reference<int> TrackedStat` names another member's int.
-`Reference<T>` also works as a collection element, a dictionary value, and an
-unbound generic argument such as `Box<Reference<int>>`. An initializer body for
-a single reference returns one row, never a set. `T` with
-`@settings(collection:)` is an error; the language server's quick fix respells
-it.
+`Reference<T>` also works as a constructor or method parameter, a collection
+element, a dictionary value, and an unbound generic argument such as
+`Box<Reference<int>>`. An initializer body for a single reference returns one
+row, never a set. `T` with `@settings(collection:)` is an error; the language
+server's quick fix respells it.
 
 `@settings(collection: Owner.Member)` binds a class reference to one
 collection. Without it the reference is unbound: it selects any stored row of