@neocompose/cli 0.31.3 → 0.31.5

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.31.5] - 2026-08-15
+
+### Fixed
+
+- Resolve callable members through generic class and interface constraints, so
+  an open generic value can call guaranteed APIs such as `Class.Clone()`.
+
+## [0.31.4] - 2026-08-14
+
+### Fixed
+
+- Preserve generic class constraints while compiling project-source bodies, so
+  an open generic member such as `TStackData extends InventoryStackData` can
+  be assigned to its declared base type in an `init` block.
+
 ## [0.31.3] - 2026-08-14
 
 ### Added

package/dist/neo.mjs

@@ -1832,6 +1832,21 @@ var init_generated_csharp_identifiers = __esm({
 });
 
 // ../packages/neoscript-language/src/project.ts
+function neoScriptMemberLookupType(type) {
+  if (type.kind !== "typeParameter") return type;
+  const visited = /* @__PURE__ */ new Set();
+  let current = type;
+  let nullable = type.nullable === true;
+  while (current.kind === "typeParameter") {
+    if (visited.has(current.id) || current.constraint === void 0) {
+      return type;
+    }
+    visited.add(current.id);
+    nullable ||= current.constraint.nullable === true;
+    current = current.constraint;
+  }
+  return nullable && current.nullable !== true ? { ...current, nullable: true } : current;
+}
 function neoScriptParameterIsOmittable(parameter4) {
   return parameter4.defaultValue !== void 0;
 }
@@ -3160,7 +3175,8 @@ function completionItemsForResolution(snapshot, resolved, word) {
       (member) => member.static === true && isMemberCompletionAccessible(snapshot, staticType, member)
     ).map((member) => symbolCompletion(member, word, snapshot));
   }
-  const owner = resolved.type.kind === "named" ? snapshot.project.typeById.get(resolved.type.typeId) : void 0;
+  const memberType2 = neoScriptMemberLookupType(resolved.type);
+  const owner = memberType2.kind === "named" ? snapshot.project.typeById.get(memberType2.typeId) : void 0;
   return membersForType(snapshot, resolved.type).filter(
     (symbol) => owner === void 0 || isMemberCompletionAccessible(snapshot, owner, symbol)
   ).map((symbol) => symbolCompletion(symbol, word, snapshot));
@@ -3174,6 +3190,17 @@ function isMemberCompletionAccessible(snapshot, owner, symbol) {
   }) === null;
 }
 function membersForType(snapshot, type) {
+  const memberType2 = neoScriptMemberLookupType(type);
+  if (memberType2 !== type) {
+    const members = [...membersForType(snapshot, memberType2)];
+    if (type.kind !== "typeParameter" || type.nullable === true) return members;
+    const named = memberType2.kind === "named" ? snapshot.project.typeById.get(memberType2.typeId) : void 0;
+    if (named?.kind !== "class") return members;
+    const cloneId = `builtin:${named.id}:Clone`;
+    return members.map(
+      (member) => member.id === cloneId ? cloneSymbol(named, type) : member
+    );
+  }
   if (type.kind === "named") {
     const named = snapshot.project.typeById.get(type.typeId);
     if (!named) return [];
@@ -3950,13 +3977,13 @@ function stringContainsSymbol() {
     "Returns true when the string contains the substring."
   );
 }
-function cloneSymbol(type) {
+function cloneSymbol(type, returnType = { kind: "named", typeId: type.id }) {
   return {
     id: `builtin:${type.id}:Clone`,
     name: "Clone",
     kind: "method",
-    type: { kind: "named", typeId: type.id },
-    returnType: { kind: "named", typeId: type.id },
+    type: returnType,
+    returnType,
     parameters: [],
     documentation: `Deep-copy this ${type.name} into a new parentless writable value.`
   };
@@ -11871,11 +11898,12 @@ var init_strict_resolver = __esm({
             pos
           );
         }
-        if (receiver.type.kind === "named") {
-          const type = this.project.typeById.get(receiver.type.typeId);
+        const memberReceiverType = neoScriptMemberLookupType(receiver.type);
+        if (memberReceiverType.kind === "named") {
+          const type = this.project.typeById.get(memberReceiverType.typeId);
           if (!type) {
             throw new CompileError(
-              `Type ${receiver.type.typeId} was not found in the project.`,
+              `Type ${memberReceiverType.typeId} was not found in the project.`,
               pos
             );
           }
@@ -11909,7 +11937,7 @@ var init_strict_resolver = __esm({
           }
           const memberType2 = substituteTypeParameters(
             member.type,
-            receiver.type,
+            memberReceiverType,
             type
           );
           if (member.computed === true) {
@@ -12350,8 +12378,9 @@ var init_strict_resolver = __esm({
             pos
           );
         }
-        if (receiver.type.kind === "named") {
-          const type = this.project.typeById.get(receiver.type.typeId);
+        const memberReceiverType = neoScriptMemberLookupType(receiver.type);
+        if (memberReceiverType.kind === "named") {
+          const type = this.project.typeById.get(memberReceiverType.typeId);
           const member = type?.members.find(
             (candidate) => (candidate.kind === "function" || candidate.kind === "method") && candidate.name === callee.name
           );
@@ -12365,7 +12394,10 @@ var init_strict_resolver = __esm({
             }
             return this.resolveSymbolCall(
               member,
-              { kind: "instance", expression: receiver },
+              {
+                kind: "instance",
+                expression: memberReceiverType === receiver.type ? receiver : { ...receiver, type: memberReceiverType }
+              },
               argumentsList2,
               scope,
               pos,
@@ -12385,7 +12417,7 @@ var init_strict_resolver = __esm({
                 pos
               );
             }
-            const schemaClass2 = toWireType(receiver.type, this.project);
+            const schemaClass2 = toWireType(memberReceiverType, this.project);
             return {
               pointer: {
                 type: "function" /* Function */,
@@ -14815,7 +14847,7 @@ function applyDelimiterToken(stack, token, lambdaBraceOffsets) {
     if (token.text === "{" && lambdaBraceOffsets.has(token.start)) {
       for (let index = stack.length - 1; index >= 0; index--) {
         const candidate = stack[index];
-        if (candidate?.text === "(" && candidate.contributes) {
+        if (candidate?.text === "(" && candidate.contributes && candidate.openingLine === token.range.start.line) {
           restores = candidate;
           break;
         }
@@ -14824,6 +14856,7 @@ function applyDelimiterToken(stack, token, lambdaBraceOffsets) {
     }
     stack.push({
       text: token.text,
+      openingLine: token.range.start.line,
       contributes: true,
       ...restores ? { restores } : {}
     });
@@ -14847,6 +14880,7 @@ function delimiterDepth(stack) {
 function cloneDelimiterStack(stack) {
   const clones = stack.map((frame) => ({
     text: frame.text,
+    openingLine: frame.openingLine,
     contributes: frame.contributes
   }));
   for (let index = 0; index < stack.length; index++) {
@@ -23605,7 +23639,11 @@ function compileProjectSourceBodies(documents) {
       if (declaration.kind !== "class") continue;
       const owner = graph.declarationsByName.get(declaration.name);
       if (!owner) continue;
-      const declaringType = declarationTypeRef(owner, declaration);
+      const declaringType = declarationTypeRef(
+        owner,
+        declaration,
+        graph.typeIdsByName
+      );
       diagnostics.push(
         ...declaredConstructorOverloadDiagnostics(
           uri,
@@ -23921,16 +23959,22 @@ function buildProjectGraph(documents) {
         const target = declarationsByName.get(base.name);
         return target?.declaration.kind === "interface" ? [target.id] : [];
       }) : [];
-      const typeParameters = classDeclaration ? classDeclaration.genericParameters.map((parameter4) => ({
-        id: sourceIdentity(
-          parameter4.annotations,
-          `generic:${info.id}:${parameter4.name}`
-        ),
-        name: parameter4.name,
-        type: { kind: "primitive", name: "unknown" },
-        location: location(info.uri, parameter4.range),
-        selectionLocation: location(info.uri, parameter4.nameRange)
-      })) : [];
+      const typeParameters = classDeclaration ? classDeclaration.genericParameters.map((parameter4) => {
+        const type = sourceTypeParameterRef(
+          parameter4,
+          info,
+          typeIds,
+          /* @__PURE__ */ new Set(),
+          false
+        );
+        return {
+          id: type.id,
+          name: parameter4.name,
+          type,
+          location: location(info.uri, parameter4.range),
+          selectionLocation: location(info.uri, parameter4.nameRange)
+        };
+      }) : [];
       return {
         id: info.id,
         name: info.declaration.name,
@@ -24268,50 +24312,49 @@ function projectRootType(documents, declarations) {
   }
   return { id: "builtin:Root", name: "Root", kind: "synthetic", members };
 }
-function sourceTypeRef(type, owner, typeIds) {
+function sourceTypeRef(type, owner, typeIds, resolvingTypeParameters = /* @__PURE__ */ new Set()) {
   const nullable = type.nullable || void 0;
+  const resolveNested = (nested) => sourceTypeRef(nested, owner, typeIds, resolvingTypeParameters);
   if (type.name === "List") {
     return {
       kind: "list",
-      elementType: type.typeArguments[0] ? sourceTypeRef(type.typeArguments[0], owner, typeIds) : { kind: "primitive", name: "unknown" },
+      elementType: type.typeArguments[0] ? resolveNested(type.typeArguments[0]) : { kind: "primitive", name: "unknown" },
       ...nullable ? { nullable } : {}
     };
   }
   if (type.name === "Set") {
     return {
       kind: "set",
-      elementType: type.typeArguments[0] ? sourceTypeRef(type.typeArguments[0], owner, typeIds) : { kind: "primitive", name: "unknown" },
+      elementType: type.typeArguments[0] ? resolveNested(type.typeArguments[0]) : { kind: "primitive", name: "unknown" },
       ...nullable ? { nullable } : {}
     };
   }
   if (type.name === "Dictionary") {
     return {
       kind: "dictionary",
-      keyType: type.typeArguments[0] ? sourceTypeRef(type.typeArguments[0], owner, typeIds) : { kind: "primitive", name: "unknown" },
-      valueType: type.typeArguments[1] ? sourceTypeRef(type.typeArguments[1], owner, typeIds) : { kind: "primitive", name: "unknown" },
+      keyType: type.typeArguments[0] ? resolveNested(type.typeArguments[0]) : { kind: "primitive", name: "unknown" },
+      valueType: type.typeArguments[1] ? resolveNested(type.typeArguments[1]) : { kind: "primitive", name: "unknown" },
       ...nullable ? { nullable } : {}
     };
   }
   if (type.name === "NeoDelegate") {
-    const returnType = type.typeArguments[0] ? sourceTypeRef(type.typeArguments[0], owner, typeIds) : { kind: "primitive", name: "unknown" };
+    const returnType = type.typeArguments[0] ? resolveNested(type.typeArguments[0]) : { kind: "primitive", name: "unknown" };
     return {
       kind: "delegate",
       returnType,
-      parameterTypes: type.typeArguments.slice(1).map((argument2) => sourceTypeRef(argument2, owner, typeIds)),
+      parameterTypes: type.typeArguments.slice(1).map(resolveNested),
       ...nullable ? { nullable } : {}
     };
   }
   if (type.name === "NeoAction") {
     return {
       kind: "action",
-      parameterTypes: type.typeArguments.map(
-        (argument2) => sourceTypeRef(argument2, owner, typeIds)
-      )
+      parameterTypes: type.typeArguments.map(resolveNested)
     };
   }
   if (type.name === "Reference" && type.typeArguments[0]) {
     return {
-      ...sourceTypeRef(type.typeArguments[0], owner, typeIds),
+      ...resolveNested(type.typeArguments[0]),
       ...nullable ? { nullable } : {}
     };
   }
@@ -24320,16 +24363,13 @@ function sourceTypeRef(type, owner, typeIds) {
       (candidate) => candidate.name === type.name
     );
     if (parameter4) {
-      return {
-        kind: "typeParameter",
-        id: sourceIdentity(
-          parameter4.annotations,
-          `generic:${owner.id}:${parameter4.name}`
-        ),
-        name: parameter4.name,
-        ownerClassId: owner.id,
-        ...nullable ? { nullable } : {}
-      };
+      return sourceTypeParameterRef(
+        parameter4,
+        owner,
+        typeIds,
+        resolvingTypeParameters,
+        nullable === true
+      );
     }
   }
   const primitive3 = primitiveTypeName(type.name);
@@ -24345,27 +24385,37 @@ function sourceTypeRef(type, owner, typeIds) {
     kind: "named",
     typeId: targetId ?? `builtin:${type.name}`,
     ...type.typeArguments.length ? {
-      typeArguments: type.typeArguments.map(
-        (argument2) => sourceTypeRef(argument2, owner, typeIds)
-      )
+      typeArguments: type.typeArguments.map(resolveNested)
     } : {},
     ...nullable ? { nullable } : {}
   };
 }
-function declarationTypeRef(info, declaration) {
+function sourceTypeParameterRef(parameter4, owner, typeIds, resolvingTypeParameters, nullable) {
+  const id2 = sourceIdentity(
+    parameter4.annotations,
+    `generic:${owner.id}:${parameter4.name}`
+  );
+  const next = new Set(resolvingTypeParameters);
+  next.add(id2);
+  const constraintSource = parameter4.constraint;
+  const constraint = constraintSource !== void 0 && !resolvingTypeParameters.has(id2) ? sourceTypeRef(constraintSource, owner, typeIds, next) : void 0;
+  return {
+    kind: "typeParameter",
+    id: id2,
+    name: parameter4.name,
+    ownerClassId: owner.id,
+    ...constraint === void 0 ? {} : { constraint },
+    ...nullable ? { nullable: true } : {}
+  };
+}
+function declarationTypeRef(info, declaration, typeIds) {
   return {
     kind: "named",
     typeId: info.id,
     ...declaration.genericParameters.length ? {
-      typeArguments: declaration.genericParameters.map((parameter4) => ({
-        kind: "typeParameter",
-        id: sourceIdentity(
-          parameter4.annotations,
-          `generic:${info.id}:${parameter4.name}`
-        ),
-        name: parameter4.name,
-        ownerClassId: info.id
-      }))
+      typeArguments: declaration.genericParameters.map(
+        (parameter4) => sourceTypeParameterRef(parameter4, info, typeIds, /* @__PURE__ */ new Set(), false)
+      )
     } : {}
   };
 }
@@ -110633,7 +110683,7 @@ var init_registry2 = __esm({
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
       formatVersion: 3,
       contractVersion: "3.12",
-      cliVersion: "0.31.3",
+      cliVersion: "0.31.5",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -117228,7 +117278,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.31.3");
+    console.log("0.31.5");
     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.31.3",
+  "version": "0.31.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.31.3 -->
+<!-- reviewed-through-cli: 0.31.5 -->
 
 # Neo Compose CLI
 

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

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