@neocompose/cli 0.7.3 → 0.7.4

package/CHANGELOG.md

@@ -7,6 +7,15 @@
 - Document the final relation-only world layer-link contract and keep the
   format-4 Hello World corpus free of the retired value-side binding field.
 
+## [0.7.4] - 2026-07-22
+
+### Fixed
+
+- Emit Generic member slots without nullable syntax while preserving their
+  binding-owned nullability in the manifest.
+- Project stored Generic values through their concrete class bindings during
+  pull and source lowering.
+
 ## [0.7.3] - 2026-07-22
 
 ### Fixed

package/dist/neo.mjs

@@ -16613,6 +16613,15 @@ function validateAllTypeApplications(documents, environment, diagnostics) {
           member.name,
           diagnostics
         );
+        if (member.kind === "field" && generics.has(member.type.name) && member.type.typeArguments.length === 0 && member.type.nullable) {
+          diagnose(
+            diagnostics,
+            uri,
+            member.type.range,
+            "nullable-generic-member-slot",
+            `Generic member slot '${member.name}' cannot declare '${member.type.name}?' because nullability comes from the concrete '${member.type.name}' binding. Use '${member.type.name}'.`
+          );
+        }
         if (member.kind !== "function") continue;
         for (const parameter3 of member.parameters) {
           validateTypeApplication(
@@ -28431,7 +28440,16 @@ function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, ba
     };
   }
   const genericParamId = context.genericParametersByClass.get(materializedId(ownerClass, "class", ownerClass.name))?.get(name);
-  if (genericParamId) return { ...common, kind: "generic", genericParamId };
+  if (genericParamId) {
+    return {
+      ...common,
+      // Generic slots never own nullability. The concrete binding member
+      // supplies `required` and the default for every use of this parameter.
+      required: false,
+      kind: "generic",
+      genericParamId
+    };
+  }
   const classId = context.classIdsByName.get(name);
   if (classId) {
     return {
@@ -30283,6 +30301,7 @@ function renderMemberType(context, member) {
       value = renderReturnType(context, member.returnType);
       break;
   }
+  if (member.kind === "generic") return value;
   return nullable && value !== "null" ? `${value}?` : value;
 }
 function renderType(context, type) {
@@ -40362,13 +40381,13 @@ var init_dialogue_sources = __esm({
 });
 
 // src/project-source/value-sources.ts
-function emitStaticValueSourcesV4(records2) {
+function emitStaticValueSourcesV4(records2, manifest) {
   const memberIds = [...records2.values()].flatMap(
     (record3) => record3.recordKind === "member" && !record3.deleted && isObjectRecord2(record3.data) && record3.data.isStatic === true && typeof record3.data.valueId === "string" ? [record3.recordId] : []
   );
-  return emitStoredValueBindingSourcesV4(records2, memberIds);
+  return emitStoredValueBindingSourcesV4(records2, memberIds, { manifest });
 }
-function buildValueEmitContext(records2) {
+function buildValueEmitContext(records2, manifest) {
   const members = dataById(records2, "member");
   const classes = dataById(records2, "class");
   const values = dataById(records2, "value");
@@ -40379,6 +40398,12 @@ function buildValueEmitContext(records2) {
   return {
     members,
     classes,
+    manifestMembers: new Map(
+      manifest.members.map((member) => [member.id, member])
+    ),
+    manifestClasses: new Map(
+      manifest.classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
+    ),
     values,
     enums,
     localizedTexts,
@@ -40394,8 +40419,8 @@ function buildValueEmitContext(records2) {
     localizedTextIds: /* @__PURE__ */ new Set()
   };
 }
-function emitStoredValueBindingSourcesV4(records2, memberIds, options = {}) {
-  const context = buildValueEmitContext(records2);
+function emitStoredValueBindingSourcesV4(records2, memberIds, options) {
+  const context = buildValueEmitContext(records2, options.manifest);
   const members = context.members;
   const initializers = /* @__PURE__ */ new Map();
   const recordKeysByMember = /* @__PURE__ */ new Map();
@@ -40464,8 +40489,8 @@ function rowBackedDefaultMemberIdsV4(state) {
   }
   return result;
 }
-function emitMemberDefaultSourcesV4(records2) {
-  const context = buildValueEmitContext(records2);
+function emitMemberDefaultSourcesV4(records2, manifest) {
+  const context = buildValueEmitContext(records2, manifest);
   const initializers = /* @__PURE__ */ new Map();
   const recordKeysByMember = /* @__PURE__ */ new Map();
   for (const record3 of records2.values()) {
@@ -40489,7 +40514,12 @@ function emitMemberDefaultSourcesV4(records2) {
     } else if (backed.kind === "list") {
       expression = listValue(context, member, { value: backed.body }, visited);
     } else {
-      expression = dictionaryValue(context, member, backed.body, visited);
+      expression = dictionaryValue(
+        context,
+        member,
+        { value: backed.body },
+        visited
+      );
     }
     initializers.set(record3.recordId, expression);
     recordKeysByMember.set(
@@ -40961,7 +40991,7 @@ function lowerSeedChild(context, member, expression, source, path, rows, localiz
   );
   return valueId;
 }
-function lowerValueRow(context, member, sourceExpression, expectedValueId, source) {
+function lowerValueRow(context, member, sourceExpression, expectedValueId, source, environment) {
   const { expression, id: id2 } = annotatedValue(sourceExpression);
   if (id2 !== null && id2 !== expectedValueId) {
     throw new Error(
@@ -40969,11 +40999,23 @@ function lowerValueRow(context, member, sourceExpression, expectedValueId, sourc
     );
   }
   const base = valueBase(context, expectedValueId);
-  const value = lowerValueBody(context, member, expression, base, source);
+  const resolvedMember = resolveGenericSchemaMember(
+    context,
+    member,
+    environment
+  );
+  const value = lowerValueBody(
+    context,
+    resolvedMember,
+    expression,
+    base,
+    source,
+    environment
+  );
   addReconstructed(context, "value", expectedValueId, value, source.source);
   return expectedValueId;
 }
-function lowerValueBody(context, member, expression, base, source) {
+function lowerValueBody(context, member, expression, base, source, environment) {
   const next = valueFileFields(base);
   if (expression.kind === "litNull") return { ...next, value: null };
   switch (member.kind) {
@@ -41019,18 +41061,39 @@ function lowerValueBody(context, member, expression, base, source) {
     case "audio":
       return { ...next, value: lowerFileValue(context, member, expression) };
     case "class":
-      return lowerClassValue(context, member, expression, base, source);
+      return lowerClassValue(
+        context,
+        member,
+        expression,
+        base,
+        source,
+        environment
+      );
     case "list":
-      return lowerListValue(context, member, expression, base, source);
+      return lowerListValue(
+        context,
+        member,
+        expression,
+        base,
+        source,
+        environment
+      );
     case "dictionary":
-      return lowerDictionaryValue(context, member, expression, base, source);
+      return lowerDictionaryValue(
+        context,
+        member,
+        expression,
+        base,
+        source,
+        environment
+      );
     default:
       throw new Error(
         `Stored static value lowering does not support member kind ${member.kind}.`
       );
   }
 }
-function lowerClassValue(context, member, expression, base, source) {
+function lowerClassValue(context, member, expression, base, source, outerEnvironment) {
   if (expression.kind !== "new")
     throw new Error("Class values require new(...).");
   const currentClassId = stringOrNull(base.classId) ?? member.classId;
@@ -41043,6 +41106,12 @@ function lowerClassValue(context, member, expression, base, source) {
       `Cannot instantiate abstract class ${schemaClass2.name} for value ${String(base.id)}. Use a concrete descendant instead.`
     );
   }
+  const environment = lowerInstanceGenericEnvironment(
+    context,
+    classId,
+    member,
+    outerEnvironment
+  );
   const baseBody = isObjectRecord2(base.value) ? base.value : {};
   const body = { ...baseBody };
   for (const assignment of expression.initializer ?? []) {
@@ -41068,7 +41137,8 @@ function lowerClassValue(context, member, expression, base, source) {
       childMember,
       assignment.value,
       childId,
-      source
+      source,
+      environment
     );
   }
   return {
@@ -41077,12 +41147,13 @@ function lowerClassValue(context, member, expression, base, source) {
     ...classId === currentClassId ? {} : { classId }
   };
 }
-function lowerListValue(context, member, expression, base, source) {
+function lowerListValue(context, member, expression, base, source, inheritedEnvironment) {
   if (expression.kind === "litNull")
     return { ...valueFileFields(base), value: null };
   if (expression.kind !== "litList")
     throw new Error("List values require [...].");
   const entryMember = requiredMember(context, member.entryMemberId);
+  const environment = valueGenericEnvironment(base, inheritedEnvironment);
   const existingIds = existingListItemIds(context, member, base);
   const ids = [];
   for (const element of expression.elements) {
@@ -41108,7 +41179,9 @@ function lowerListValue(context, member, expression, base, source) {
         `Unordered list item ${itemId} belongs to a different container.`
       );
     }
-    ids.push(lowerValueRow(context, entryMember, element, itemId, source));
+    ids.push(
+      lowerValueRow(context, entryMember, element, itemId, source, environment)
+    );
   }
   return {
     ...valueFileFields(base),
@@ -41125,7 +41198,7 @@ function existingListItemIds(context, member, base) {
     Array.isArray(base.value) ? base.value.filter((entry) => typeof entry === "string") : []
   );
 }
-function lowerDictionaryValue(context, member, expression, base, source) {
+function lowerDictionaryValue(context, member, expression, base, source, inheritedEnvironment) {
   if (expression.kind === "litNull")
     return { ...valueFileFields(base), value: null };
   if (expression.kind !== "litDict") {
@@ -41133,6 +41206,7 @@ function lowerDictionaryValue(context, member, expression, base, source) {
   }
   const baseBody = isObjectRecord2(base.value) ? base.value : {};
   const entryMember = requiredMember(context, member.entryMemberId);
+  const environment = valueGenericEnvironment(base, inheritedEnvironment);
   const body = {};
   for (const entry of expression.entries) {
     if (entry.key.kind !== "litString") {
@@ -41161,7 +41235,8 @@ function lowerDictionaryValue(context, member, expression, base, source) {
       entryMember,
       entry.value,
       valueId,
-      source
+      source,
+      environment
     );
   }
   return { ...valueFileFields(base), value: body };
@@ -41839,18 +41914,24 @@ function emitValue(context, member, valueId, options) {
     throw new Error(`Stored member value ${valueId} was not pulled.`);
   }
   options.visited.add(valueId);
-  const expression = emitValueBody(
+  const resolvedMember = resolveGenericValueMember(
     context,
     member,
+    options.environment
+  );
+  const expression = emitValueBody(
+    context,
+    resolvedMember,
     value,
     options.visited,
-    options.targetTyped ?? false
+    options.targetTyped ?? false,
+    options.environment
   );
   const prefix = options.exposeIdentity ? `@id(${quote4(valueId)})
 ` : "";
   return `${prefix}${expression}`;
 }
-function emitValueBody(context, member, value, visited, targetTyped) {
+function emitValueBody(context, member, value, visited, targetTyped, environment) {
   const kind = numberField(member, "kind");
   const body = value.value;
   if (kind === 0) return "null";
@@ -41865,19 +41946,34 @@ function emitValueBody(context, member, value, visited, targetTyped) {
   if (kind === 9) return referenceValue(context, member, body, false);
   if (kind === 18) return referenceValue(context, member, body, true);
   if (kind === 11 || kind === 12) return fileValue(context, kind, body);
-  if (kind === 5) return dictionaryValue(context, member, body, visited);
-  if (kind === 6) return listValue(context, member, value, visited);
+  if (kind === 5)
+    return dictionaryValue(context, member, value, visited, environment);
+  if (kind === 6)
+    return listValue(context, member, value, visited, environment);
   if (kind === 7)
-    return classValue(context, member, value, visited, targetTyped);
+    return classValue(
+      context,
+      member,
+      value,
+      visited,
+      targetTyped,
+      environment
+    );
   throw new Error(
     `Stored member ${String(member.name ?? member.id)} has unsupported value kind ${kind}.`
   );
 }
-function classValue(context, member, value, visited, targetTyped) {
+function classValue(context, member, value, visited, targetTyped, outerEnvironment) {
   const classId = stringOrNull(value.classId) ?? stringField2(member, "classId");
   const schemaClass2 = context.classes.get(classId);
   if (schemaClass2 === void 0)
     throw new Error(`Unknown value class ${classId}.`);
+  const environment = instanceGenericEnvironment(
+    context,
+    classId,
+    member,
+    outerEnvironment
+  );
   const name = stringField2(schemaClass2, "name");
   if (!isObjectRecord2(value.value))
     return targetTyped ? "new()" : `new ${name}()`;
@@ -41899,6 +41995,7 @@ function classValue(context, member, value, visited, targetTyped) {
       throw new Error(`Class ${name}.${key} has no member record.`);
     fields.push(
       `${key} = ${emitValue(context, childMember, childId, {
+        environment,
         exposeIdentity: !context.symbolsByValueId.has(childId) && context.referencedValueIds.has(childId),
         visited
       })}`
@@ -41908,6 +42005,153 @@ function classValue(context, member, value, visited, targetTyped) {
 ${fields.map((field) => indentNeoSourceNonEmptyLines(field, 2)).join(",\n")}
 }`;
 }
+function resolveGenericValueMember(context, member, environment) {
+  if (numberField(member, "kind") !== 21) return member;
+  const genericParamId = stringField2(member, "genericParamId");
+  const bindingMemberId = environment?.get(genericParamId);
+  if (bindingMemberId === void 0) {
+    throw new Error(
+      `Stored Generic member ${String(member.name ?? member.id)} cannot be emitted because generic parameter ${genericParamId} is unbound in the value's concrete class.`
+    );
+  }
+  const bindingMember = context.members.get(bindingMemberId);
+  if (bindingMember === void 0) {
+    throw new Error(
+      `Stored Generic member ${String(member.name ?? member.id)} resolves to missing binding member ${bindingMemberId}.`
+    );
+  }
+  return bindingMember;
+}
+function instanceGenericEnvironment(context, classId, member, outerEnvironment) {
+  const bindings = classGenericBindings(context.manifestClasses, classId);
+  const memberId = stringField2(member, "id");
+  const manifestMember = context.manifestMembers.get(memberId);
+  if (manifestMember?.kind === "class") {
+    for (const [genericParamId, argument2] of Object.entries(
+      manifestMember.classArguments
+    )) {
+      if (bindings.get(genericParamId)?.kind === "member") continue;
+      if (argument2.kind === "member") {
+        bindings.set(genericParamId, argument2);
+        continue;
+      }
+      const outerMemberId = outerEnvironment?.get(argument2.genericParamId);
+      if (outerMemberId !== void 0) {
+        bindings.set(genericParamId, {
+          kind: "member",
+          memberId: outerMemberId
+        });
+      }
+    }
+  }
+  const environment = /* @__PURE__ */ new Map();
+  for (const genericParamId of bindings.keys()) {
+    const memberIdValue = terminalGenericBindingMemberId(
+      genericParamId,
+      bindings
+    );
+    if (memberIdValue !== void 0) {
+      environment.set(genericParamId, memberIdValue);
+    }
+  }
+  return environment;
+}
+function classGenericBindings(classes, classId) {
+  const chain = [];
+  const visited = /* @__PURE__ */ new Set();
+  let current = classes.get(classId);
+  while (current !== void 0 && !visited.has(current.id)) {
+    visited.add(current.id);
+    chain.push(current);
+    current = current.extendsClassId ? classes.get(current.extendsClassId) : void 0;
+  }
+  const bindings = /* @__PURE__ */ new Map();
+  for (let declarerIndex = 0; declarerIndex < chain.length; declarerIndex++) {
+    const declarer = chain[declarerIndex];
+    for (const parameter3 of declarer.genericParameters) {
+      let cursor = parameter3.id;
+      let terminal = {
+        kind: "generic",
+        genericParamId: cursor
+      };
+      for (let level = declarerIndex; level > 0; level--) {
+        const child = chain[level - 1];
+        const binding = child.extendsGenericBindings[cursor];
+        if (binding === void 0) break;
+        terminal = binding;
+        if (binding.kind === "member") break;
+        cursor = binding.genericParamId;
+      }
+      bindings.set(parameter3.id, terminal);
+    }
+  }
+  return bindings;
+}
+function terminalGenericBindingMemberId(genericParamId, bindings) {
+  const visited = /* @__PURE__ */ new Set();
+  let cursor = genericParamId;
+  while (!visited.has(cursor)) {
+    visited.add(cursor);
+    const binding = bindings.get(cursor);
+    if (binding === void 0) return void 0;
+    if (binding.kind === "member") return binding.memberId;
+    cursor = binding.genericParamId;
+  }
+  return void 0;
+}
+function resolveGenericSchemaMember(context, member, environment) {
+  if (member.kind !== "generic") return member;
+  const bindingMemberId = environment?.get(member.genericParamId);
+  if (bindingMemberId === void 0) {
+    throw new Error(
+      `Stored Generic member ${member.name} cannot be lowered because generic parameter ${member.genericParamId} is unbound in the value's concrete class.`
+    );
+  }
+  const bindingMember = context.members.get(bindingMemberId);
+  if (bindingMember === void 0) {
+    throw new Error(
+      `Stored Generic member ${member.name} resolves to missing binding member ${bindingMemberId}.`
+    );
+  }
+  return bindingMember;
+}
+function lowerInstanceGenericEnvironment(context, classId, member, outerEnvironment) {
+  const bindings = classGenericBindings(context.classes, classId);
+  for (const [genericParamId, argument2] of Object.entries(
+    member.classArguments
+  )) {
+    if (bindings.get(genericParamId)?.kind === "member") continue;
+    if (argument2.kind === "member") {
+      bindings.set(genericParamId, argument2);
+      continue;
+    }
+    const outerMemberId = outerEnvironment?.get(argument2.genericParamId);
+    if (outerMemberId !== void 0) {
+      bindings.set(genericParamId, {
+        kind: "member",
+        memberId: outerMemberId
+      });
+    }
+  }
+  const environment = /* @__PURE__ */ new Map();
+  for (const genericParamId of bindings.keys()) {
+    const memberId = terminalGenericBindingMemberId(genericParamId, bindings);
+    if (memberId !== void 0) environment.set(genericParamId, memberId);
+  }
+  return environment;
+}
+function valueGenericEnvironment(value, inherited) {
+  const environment = new Map(inherited ?? []);
+  if (!isObjectRecord2(value.genericBindings)) return environment;
+  for (const [genericParamId, memberId] of Object.entries(
+    value.genericBindings
+  )) {
+    if (typeof memberId === "string") {
+      environment.set(genericParamId, memberId);
+    }
+  }
+  return environment;
+}
 function inheritedSchemaMemberId(context, schemaClass2, key) {
   const visited = /* @__PURE__ */ new Set();
   let current = typeof schemaClass2.extendsClassId === "string" ? schemaClass2.extendsClassId : void 0;
@@ -41922,11 +42166,12 @@ function inheritedSchemaMemberId(context, schemaClass2, key) {
   }
   return void 0;
 }
-function listValue(context, member, value, visited) {
+function listValue(context, member, value, visited, inheritedEnvironment) {
   if (value.value === null) return "null";
   const entryMember = context.members.get(stringField2(member, "entryMemberId"));
   if (entryMember === void 0)
     throw new Error(`List entry member was not pulled.`);
+  const environment = valueGenericEnvironment(value, inheritedEnvironment);
   const ids = member.listKind === "unordered" ? [...context.values].filter(([, candidate]) => candidate.containerId === value.id).map(([id2]) => id2).sort(compareCodePoints) : Array.isArray(value.value) ? value.value.filter(
     (entry) => typeof entry === "string"
   ) : [];
@@ -41935,6 +42180,7 @@ function listValue(context, member, value, visited) {
 ${ids.map(
     (id2) => indentNeoSourceNonEmptyLines(
       emitValue(context, entryMember, id2, {
+        environment,
         exposeIdentity: context.symbolsByValueId.get(id2) === void 0,
         visited
       }),
@@ -41943,12 +42189,14 @@ ${ids.map(
   ).join(",\n\n")}
 ]`;
 }
-function dictionaryValue(context, member, body, visited) {
+function dictionaryValue(context, member, value, visited, inheritedEnvironment) {
+  const body = value.value;
   if (body === null) return "null";
   if (!isObjectRecord2(body)) return "{}";
   const entryMember = context.members.get(stringField2(member, "entryMemberId"));
   if (entryMember === void 0)
     throw new Error(`Dictionary entry member was not pulled.`);
+  const environment = valueGenericEnvironment(value, inheritedEnvironment);
   const entries = Object.entries(body).sort(
     ([left], [right]) => compareCodePoints(left, right)
   );
@@ -41958,6 +42206,7 @@ ${entries.flatMap(
     ([key, id2]) => typeof id2 === "string" ? [
       indentNeoSourceNonEmptyLines(
         `${quote4(key)}: ${emitValue(context, entryMember, id2, {
+          environment,
           exposeIdentity: !context.symbolsByValueId.has(id2) && context.referencedValueIds.has(id2),
           visited
         })}`,
@@ -42175,6 +42424,7 @@ function emitProjectRootSourceV4(records2, manifest) {
   );
   const classes = new Map(manifest.classes.map((entry) => [entry.id, entry]));
   const values = emitStoredValueBindingSourcesV4(records2, memberIds, {
+    manifest,
     targetTypedRoot: true
   });
   const declarations = PROJECT_ROOT_SOURCE_SLOTS.map((slot, index) => {
@@ -42340,8 +42590,8 @@ function emitProjectDocumentFilesV4(records2) {
     });
   }
   const manifest = documentsToProjectSchemaManifest(schemaRecords);
-  const staticValues = emitStaticValueSourcesV4(records2);
-  const memberDefaults = emitMemberDefaultSourcesV4(records2);
+  const staticValues = emitStaticValueSourcesV4(records2, manifest);
+  const memberDefaults = emitMemberDefaultSourcesV4(records2, manifest);
   const baseSource = emitProjectSourcesV4(manifest, {
     staticInitializers: staticValues.initializers,
     defaultInitializers: memberDefaults.initializers,

package/package.json

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