@neocompose/cli 0.31.3 → 0.31.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [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

@@ -14815,7 +14815,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 +14824,7 @@ function applyDelimiterToken(stack, token, lambdaBraceOffsets) {
     }
     stack.push({
       text: token.text,
+      openingLine: token.range.start.line,
       contributes: true,
       ...restores ? { restores } : {}
     });
@@ -14847,6 +14848,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 +23607,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 +23927,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 +24280,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 +24331,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 +24353,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 +110651,7 @@ var init_registry2 = __esm({
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
       formatVersion: 3,
       contractVersion: "3.12",
-      cliVersion: "0.31.3",
+      cliVersion: "0.31.4",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -117228,7 +117246,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.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.31.3",
+  "version": "0.31.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.31.3 -->
+<!-- reviewed-through-cli: 0.31.4 -->
 
 # 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.4 -->
 ```
 
 The quoted version above is checked too, so this instruction cannot go stale