@neocompose/cli 0.5.1 → 0.5.3

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [0.5.3] - 2026-07-19
+
+### Fixed
+
+- Emit row-backed instance-member defaults (class fields, ordered lists,
+  dictionaries) as inline constructed source instead of opaque `Reference(id)`
+  calls and raw value-row ID strings. Also resolve sprite/audio `@settings`
+  template references to their template symbol, file defaults to
+  `Images.X`/`AudioClips.X` registry symbols, and scalar enum default option
+  IDs to contextual `.Option` literals; resolve inherited class fields when
+  emitting nested value graphs; and stop indenting blank separator lines in
+  multi-line value emission.
+
+## [0.5.2] - 2026-07-18
+
+### Fixed
+
+- Stop `neo pull` from emitting inherited `@system` annotations on member
+  overrides and abstract implementations whose own records are not system
+  protected.
+
 ## [0.5.1] - 2026-07-18
 
 ### Fixed

package/dist/neo.mjs

@@ -1513,7 +1513,9 @@ function memberFromDocument(record3, members, owners, classNames, context) {
     required: booleanValue(field("required", false), record3, "required"),
     defaultValue,
     overrideOf,
-    system: systemFromDocument(field("system", null), record3, "system"),
+    // System protection belongs to the declaration record. An override is
+    // user-authored unless its own document explicitly marks it as system.
+    system: systemFromDocument(data.system, record3, "system"),
     storage: normalizedStorage(field("storage", null), record3),
     storageKey: normalizedStorageKey(field("storageKey", null), record3)
   };
@@ -26943,7 +26945,8 @@ function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, ba
       declaration.initializer,
       declaration.type,
       ownerClass,
-      base
+      base,
+      id2
     )
   };
   const settings = annotation(declaration.annotations, "settings");
@@ -26992,7 +26995,7 @@ function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, ba
     return {
       ...common,
       kind: primitive3,
-      templateId: referenceIdArgument(settings, "template") ?? (base?.kind === primitive3 ? base.templateId : null)
+      templateId: referenceIdArgument(settings, "template") ?? templateSymbolArgument(context, settings, ownerClass, declaration) ?? (base?.kind === primitive3 ? base.templateId : null)
     };
   }
   if (primitive3) return { ...common, kind: primitive3 };
@@ -27259,10 +27262,13 @@ function lowerType(context, type, ownerClass) {
   if (type.name === "object") return { kind: "unknown", nullable };
   throw new Error(`Unknown Neo type ${JSON.stringify(type.name)}.`);
 }
-function lowerDefault(context, initializer, type, ownerClass, base) {
+function lowerDefault(context, initializer, type, ownerClass, base, memberId) {
   if (initializer === null) {
     return base?.defaultValue && "serverValueId" in base.defaultValue ? base.defaultValue : null;
   }
+  if (context.rowBackedDefaultMemberIds.has(memberId) && base?.defaultValue && !("serverValueId" in base.defaultValue)) {
+    return base.defaultValue;
+  }
   const expression = parseExpression(initializer);
   let value = lowerExpressionValue(context, expression, type, ownerClass);
   if (value !== null && context.enumIdsByName.has(type.name) && !Array.isArray(value)) {
@@ -27399,16 +27405,25 @@ function lowerExpressionValue(context, expression, expected, ownerClass) {
         const idArgument = expression.args[index >= 0 ? index : 0];
         if (idArgument?.kind === "litString") return idArgument.value;
       }
-      if (expression.callee.kind === "member" && expression.callee.name === "Slice" && expression.callee.receiver.kind === "call") {
-        const receiver = expression.callee.receiver;
-        const index = receiver.argumentNames?.findIndex((name) => name === "id") ?? -1;
-        const fileId = receiver.args[index >= 0 ? index : 0];
+      if (expression.callee.kind === "member" && expression.callee.name === "Slice") {
         const sliceIndex = expression.args[0];
-        if (fileId?.kind === "litString" && (sliceIndex?.kind === "litInt" || sliceIndex === void 0)) {
-          return {
-            fileId: fileId.value,
-            sliceIndex: sliceIndex?.value ?? 0
-          };
+        if (sliceIndex !== void 0 && sliceIndex.kind !== "litInt") {
+          throw new Error("Sprite Slice defaults require an int literal.");
+        }
+        const receiver = expression.callee.receiver;
+        if (receiver.kind === "call") {
+          const index = receiver.argumentNames?.findIndex((name) => name === "id") ?? -1;
+          const fileId2 = receiver.args[index >= 0 ? index : 0];
+          if (fileId2?.kind === "litString") {
+            return {
+              fileId: fileId2.value,
+              sliceIndex: sliceIndex?.value ?? 0
+            };
+          }
+        }
+        const fileId = projectFileIdForPath(context, receiver);
+        if (fileId !== null) {
+          return { fileId, sliceIndex: sliceIndex?.value ?? 0 };
         }
       }
       throw new Error(
@@ -27416,6 +27431,8 @@ function lowerExpressionValue(context, expression, expected, ownerClass) {
       );
     }
     case "member": {
+      const fileId = projectFileIdForPath(context, expression);
+      if (fileId !== null) return { fileId };
       if (expression.name === "Slice" || expression.receiver.kind === "call") {
         throw new Error(
           "File defaults are lowered by the project-file compiler."
@@ -27429,6 +27446,17 @@ function lowerExpressionValue(context, expression, expected, ownerClass) {
       );
   }
 }
+function projectFileIdForPath(context, expression) {
+  const path = expressionMemberPath(expression);
+  if (path === null) return null;
+  return context.projectFileIdsBySymbol.get(path) ?? null;
+}
+function expressionMemberPath(expression) {
+  if (expression.kind === "ident") return expression.name;
+  if (expression.kind !== "member") return null;
+  const receiver = expressionMemberPath(expression.receiver);
+  return receiver === null ? null : `${receiver}.${expression.name}`;
+}
 function manifestTypeForMember(context, member) {
   const nullable = !member.required;
   if (primitiveMemberKinds.has(member.kind)) {
@@ -27645,6 +27673,19 @@ function referenceIdArgument(value, name) {
   const raw = argument(value, name);
   return raw === null ? null : referenceId(raw);
 }
+function templateSymbolArgument(context, settings, ownerClass, declaration) {
+  const raw = argument(settings, "template");
+  if (raw === null) return null;
+  const expression = parseAnnotationExpression(raw);
+  if (expression.kind !== "ident") return null;
+  const templateId = context.templateIdsByName.get(expression.name);
+  if (templateId === void 0) {
+    throw new Error(
+      `Member ${ownerClass.name}.${declaration.name} references unknown template ${JSON.stringify(expression.name)}.`
+    );
+  }
+  return templateId;
+}
 function referenceId(raw) {
   try {
     const expression = parseExpression(raw);
@@ -28175,7 +28216,24 @@ function lowerProjectSchemaV4(base, analysis, options = {}) {
     enumOptionsByName,
     loweredMembers: /* @__PURE__ */ new Map(),
     placements: /* @__PURE__ */ new Map(),
-    staticValueIdsBySymbol: options.staticValueIdsBySymbol ?? /* @__PURE__ */ new Map()
+    staticValueIdsBySymbol: options.staticValueIdsBySymbol ?? /* @__PURE__ */ new Map(),
+    templateIdsByName: new Map(
+      analysis.configuration.globals.flatMap(
+        (global) => global.type.name === "TextureTemplate" ? [
+          [
+            global.name,
+            materializedId(global, "texture-template", global.name)
+          ]
+        ] : global.type.name === "AudioTemplate" ? [
+          [
+            global.name,
+            materializedId(global, "audio-template", global.name)
+          ]
+        ] : []
+      )
+    ),
+    projectFileIdsBySymbol: options.projectFileIdsBySymbol ?? /* @__PURE__ */ new Map(),
+    rowBackedDefaultMemberIds: options.rowBackedDefaultMemberIds ?? /* @__PURE__ */ new Set()
   };
   const classes = analysis.schema.classes.map(
     (declaration) => lowerClass(context, declaration)
@@ -28324,7 +28382,14 @@ function emitProjectSourcesV4(manifest, options = {}) {
     interfaces: new Map(manifest.interfaces.map((entry) => [entry.id, entry])),
     enums: new Map(manifest.enums.map((entry) => [entry.id, entry])),
     members: new Map(manifest.members.map((entry) => [entry.id, entry])),
-    staticInitializers: options.staticInitializers ?? /* @__PURE__ */ new Map()
+    staticInitializers: options.staticInitializers ?? /* @__PURE__ */ new Map(),
+    defaultInitializers: options.defaultInitializers ?? /* @__PURE__ */ new Map(),
+    fileSymbols: options.fileSymbols ?? /* @__PURE__ */ new Map(),
+    templateNames: new Map(
+      [...manifest.textureTemplates, ...manifest.audioTemplates].map(
+        (template) => [template.id, template.name]
+      )
+    )
   };
   const files = [];
   const localizationStatusNames = new Map(
@@ -28659,7 +28724,7 @@ ${indentNeoSourceNonEmptyLines(tracked.trim(), 2)}
 ${body ? `${signature} ${body}` : abstractContract ? `${signature};` : `native ${signature};`}`;
   }
   const type = renderMemberType(context, member);
-  const initializer = (member.isStatic ? context.staticInitializers.get(member.id) : void 0) ?? renderDefault(context, member);
+  const initializer = (member.isStatic ? context.staticInitializers.get(member.id) : void 0) ?? context.defaultInitializers.get(member.id) ?? renderDefault(context, member);
   return `${annotations.join("\n")}
 ${prefix}${type} ${member.name}${initializer === null ? ";" : ` = ${initializer};`}`;
 }
@@ -28720,7 +28785,10 @@ function memberSettings(context, member) {
     }
     if (member.multiselect) settings.push("multiselect: true");
   } else if ((member.kind === "sprite" || member.kind === "audio") && member.templateId) {
-    settings.push(`template: Reference<Type>(id: ${quote(member.templateId)})`);
+    const templateName = context.templateNames.get(member.templateId);
+    settings.push(
+      templateName !== void 0 ? `template: ${templateName}` : `template: Reference<Type>(id: ${quote(member.templateId)})`
+    );
   }
   return settings.length ? [`@settings(${settings.join(", ")})`] : [];
 }
@@ -28898,6 +28966,13 @@ function renderDefaultValue(context, member, wrapper) {
     );
     return member.multiselect ? `[${values.join(", ")}]` : values[0] ?? "null";
   }
+  if (member.kind === "enum" && typeof value === "string") {
+    const schemaEnum = required(context.enums, member.enumId, "enum");
+    const option = schemaEnum.options.find(
+      (candidate) => candidate.id === value || candidate.key === value
+    );
+    if (option !== void 0) return `.${option.name}`;
+  }
   if (member.kind === "list" && Array.isArray(value)) {
     const entry = required(context.members, member.entryMemberId, "list entry");
     return `[${value.map((item) => renderNestedValue(context, entry, item)).join(", ")}]`;
@@ -28929,7 +29004,9 @@ function renderDefaultValue(context, member, wrapper) {
     return member.multiselect ? `[${refs.join(", ")}]` : refs[0] ?? "null";
   }
   if ((member.kind === "sprite" || member.kind === "audio") && isObject(value) && typeof value.fileId === "string") {
-    return member.kind === "sprite" ? `Reference<NeoImage>(id: ${quote(value.fileId)}).Slice(${typeof value.sliceIndex === "number" ? value.sliceIndex : 0})` : `Reference<NeoAudioClip>(id: ${quote(value.fileId)})`;
+    const symbol = context.fileSymbols.get(value.fileId);
+    const target = symbol ?? (member.kind === "sprite" ? `Reference<NeoImage>(id: ${quote(value.fileId)})` : `Reference<NeoAudioClip>(id: ${quote(value.fileId)})`);
+    return member.kind === "sprite" ? `${target}.Slice(${typeof value.sliceIndex === "number" ? value.sliceIndex : 0})` : target;
   }
   if (isObject(value) && ["vector2", "vector2Int", "vector3", "vector3Int", "color"].includes(
     member.kind
@@ -38744,7 +38821,7 @@ function emitStaticValueSourcesV4(records2) {
   );
   return emitStoredValueBindingSourcesV4(records2, memberIds);
 }
-function emitStoredValueBindingSourcesV4(records2, memberIds, options = {}) {
+function buildValueEmitContext(records2) {
   const members = dataById(records2, "member");
   const classes = dataById(records2, "class");
   const values = dataById(records2, "value");
@@ -38752,7 +38829,7 @@ function emitStoredValueBindingSourcesV4(records2, memberIds, options = {}) {
   const localizedTexts = dataById(records2, "localized-text");
   const dialogues = dataById(records2, "dialogue");
   const symbolsByValueId = staticSymbols(classes, members);
-  const context = {
+  return {
     members,
     classes,
     values,
@@ -38769,6 +38846,10 @@ function emitStoredValueBindingSourcesV4(records2, memberIds, options = {}) {
     referencedValueIds: externallyReferencedValueIds(records2),
     localizedTextIds: /* @__PURE__ */ new Set()
   };
+}
+function emitStoredValueBindingSourcesV4(records2, memberIds, options = {}) {
+  const context = buildValueEmitContext(records2);
+  const members = context.members;
   const initializers = /* @__PURE__ */ new Map();
   const recordKeysByMember = /* @__PURE__ */ new Map();
   for (const memberId of memberIds) {
@@ -38798,6 +38879,102 @@ function emitStoredValueBindingSourcesV4(records2, memberIds, options = {}) {
   }
   return { initializers, recordKeysByMember };
 }
+function rowBackedDefaultBody(member, isPulledValueRow) {
+  if (member.isStatic === true) return null;
+  const defaultValue = member.defaultValue;
+  if (!isObjectRecord2(defaultValue)) return null;
+  const body = defaultValue.value;
+  const referencesRows = (children) => children.length > 0 && children.every(
+    (child) => typeof child === "string" && isPulledValueRow(child)
+  );
+  if (member.kind === MEMBER_KIND_CLASS && isObjectRecord2(body)) {
+    return referencesRows(Object.values(body)) ? { kind: "class", body } : null;
+  }
+  if (member.kind === MEMBER_KIND_LIST && member.listKind !== "unordered" && Array.isArray(body)) {
+    const rows = body.filter(
+      (child) => typeof child === "string" && isPulledValueRow(child)
+    );
+    return rows.length > 0 && rows.length === body.length ? { kind: "list", body: rows } : null;
+  }
+  if (member.kind === MEMBER_KIND_DICTIONARY && isObjectRecord2(body)) {
+    return referencesRows(Object.values(body)) ? { kind: "dictionary", body } : null;
+  }
+  return null;
+}
+function rowBackedDefaultMemberIdsV4(state) {
+  const values = /* @__PURE__ */ new Set();
+  for (const record3 of Object.values(state)) {
+    if (record3.recordKind === "value") values.add(record3.recordId);
+  }
+  const result = /* @__PURE__ */ new Set();
+  for (const record3 of Object.values(state)) {
+    if (record3.recordKind !== "member" || !isObjectRecord2(record3.data)) {
+      continue;
+    }
+    if (rowBackedDefaultBody(record3.data, (id2) => values.has(id2)) !== null) {
+      result.add(record3.recordId);
+    }
+  }
+  return result;
+}
+function emitMemberDefaultSourcesV4(records2) {
+  const context = buildValueEmitContext(records2);
+  const initializers = /* @__PURE__ */ new Map();
+  const recordKeysByMember = /* @__PURE__ */ new Map();
+  for (const record3 of records2.values()) {
+    if (record3.deleted || record3.recordKind !== "member" || !isObjectRecord2(record3.data)) {
+      continue;
+    }
+    const member = record3.data;
+    const backed = rowBackedDefaultBody(member, (id2) => context.values.has(id2));
+    if (backed === null) continue;
+    const visited = /* @__PURE__ */ new Set();
+    const defaultValue = isObjectRecord2(member.defaultValue) ? member.defaultValue : {};
+    let expression;
+    if (backed.kind === "class") {
+      expression = classValue(
+        context,
+        member,
+        { classId: defaultValue.classId ?? null, value: backed.body },
+        visited,
+        false
+      );
+    } else if (backed.kind === "list") {
+      expression = listValue(context, member, { value: backed.body }, visited);
+    } else {
+      expression = dictionaryValue(context, member, backed.body, visited);
+    }
+    initializers.set(record3.recordId, expression);
+    recordKeysByMember.set(
+      record3.recordId,
+      /* @__PURE__ */ new Set([
+        ...[...visited].map((id2) => `value:${id2}`),
+        ...[...context.localizedTextIds].map((id2) => `localized-text:${id2}`)
+      ])
+    );
+    context.localizedTextIds.clear();
+  }
+  return { initializers, recordKeysByMember };
+}
+function qualifiedProjectFileSymbolsV4(records2) {
+  const symbols = projectFileSymbols(records2);
+  const result = /* @__PURE__ */ new Map();
+  for (const record3 of records2.values()) {
+    if (record3.deleted || record3.recordKind !== "project-file" || !isObjectRecord2(record3.data)) {
+      continue;
+    }
+    const kind = record3.data.fileType;
+    const symbol = symbols.get(record3.recordId);
+    if (symbol === void 0 || kind !== "image" && kind !== "audio") {
+      continue;
+    }
+    result.set(
+      record3.recordId,
+      `${kind === "image" ? "Images" : "AudioClips"}.${symbol}`
+    );
+  }
+  return result;
+}
 function lowerStaticValueSourcesV4(state, analysis, manifest) {
   const bindings = [];
   for (const sourceClass of analysis.schema.classes) {
@@ -38820,7 +38997,7 @@ function lowerStaticValueSourcesV4(state, analysis, manifest) {
   }
   return lowerStoredValueBindingsV4(state, manifest, bindings, { analysis });
 }
-function lowerStoredValueBindingsV4(state, manifest, bindings, options = {}) {
+function buildValueLowerContext(state, manifest, options = {}) {
   const members = new Map(
     manifest.members.map((member) => [member.id, member])
   );
@@ -38834,7 +39011,7 @@ function lowerStoredValueBindingsV4(state, manifest, bindings, options = {}) {
     manifest,
     parsedInitializers
   );
-  const context = {
+  return {
     state,
     members,
     classes,
@@ -38858,6 +39035,9 @@ function lowerStoredValueBindingsV4(state, manifest, bindings, options = {}) {
     parsedInitializers,
     reconstructed: /* @__PURE__ */ new Map()
   };
+}
+function lowerStoredValueBindingsV4(state, manifest, bindings, options = {}) {
+  const context = buildValueLowerContext(state, manifest, options);
   const memberValueIds = /* @__PURE__ */ new Map();
   const seeds = /* @__PURE__ */ new Map();
   for (const binding of bindings) {
@@ -38869,6 +39049,143 @@ function lowerStoredValueBindingsV4(state, manifest, bindings, options = {}) {
     seeds
   };
 }
+function lowerMemberDefaultSourcesV4(state, analysis, manifest) {
+  const context = buildValueLowerContext(state, manifest, { analysis });
+  const pulledValueIds = /* @__PURE__ */ new Set();
+  for (const record3 of Object.values(state)) {
+    if (record3.recordKind === "value") pulledValueIds.add(record3.recordId);
+  }
+  const memberDefaultValues = /* @__PURE__ */ new Map();
+  for (const sourceClass of analysis.schema.classes) {
+    for (const declaration of sourceClass.members) {
+      if (declaration.kind !== "field" || declaration.initializer === null) {
+        continue;
+      }
+      if (declaration.modifiers.includes("static")) continue;
+      const label = `${sourceClass.name}.${declaration.name}`;
+      const memberId = sourceIdentityId(declaration, "member", label);
+      const baseData3 = stateData(context, "member", memberId);
+      if (baseData3 === null) continue;
+      const backed = rowBackedDefaultBody(
+        baseData3,
+        (id2) => pulledValueIds.has(id2)
+      );
+      if (backed === null) continue;
+      const member = context.members.get(memberId);
+      if (member === void 0) continue;
+      const binding = {
+        memberId,
+        initializer: declaration.initializer,
+        source: declaration.source,
+        label
+      };
+      memberDefaultValues.set(
+        memberId,
+        lowerRowBackedDefault(context, member, backed, baseData3, binding)
+      );
+    }
+  }
+  return {
+    records: [...context.reconstructed.values()],
+    memberDefaultValues
+  };
+}
+function lowerRowBackedDefault(context, member, backed, baseData3, binding) {
+  const baseDefault = isObjectRecord2(baseData3.defaultValue) ? baseData3.defaultValue : {};
+  const storedClassId = stringOrNull(baseDefault.classId);
+  const expression = annotatedValue(
+    parseCachedInitializer(context.parsedInitializers, binding.initializer)
+  ).expression;
+  if (member.kind === "class" && backed.kind === "class") {
+    if (expression.kind !== "new") {
+      throw new Error(`Default value ${binding.label} requires new(...).`);
+    }
+    const currentClassId = storedClassId ?? member.classId;
+    const classId = expression.className === null ? currentClassId : requiredClassByName(context, expression.className).id;
+    const baseBody = backed.body;
+    const body = {};
+    for (const assignment of expression.initializer ?? []) {
+      const childMember = classMemberByName(context, classId, assignment.name);
+      const existingId = isObjectRecord2(baseBody) ? baseBody[assignment.name] : void 0;
+      const childId = typeof existingId === "string" ? existingId : annotatedValue(assignment.value).id;
+      if (childId === null || childId === void 0) {
+        throw new Error(
+          `Default value ${binding.label}.${assignment.name} has no existing owned value row. Creating new default rows from source is not implemented by this slice.`
+        );
+      }
+      body[assignment.name] = lowerValueRow(
+        context,
+        childMember,
+        assignment.value,
+        childId,
+        binding
+      );
+    }
+    return {
+      value: body,
+      classId: classId === currentClassId ? storedClassId : classId
+    };
+  }
+  if (member.kind === "list" && backed.kind === "list") {
+    if (expression.kind !== "litList") {
+      throw new Error(`Default value ${binding.label} requires [...].`);
+    }
+    const entryMember = requiredMember(context, member.entryMemberId);
+    const existingIds = new Set(backed.body);
+    const ids = expression.elements.map((element, index) => {
+      const symbolId = sourceValueSymbol(context, element);
+      if (symbolId !== null) {
+        if (!existingIds.has(symbolId)) {
+          throw new Error(
+            `Default list ${binding.label} adds value ${symbolId}. Changing default value placement is not implemented by this slice.`
+          );
+        }
+        return symbolId;
+      }
+      const itemId = annotatedValue(element).id;
+      if (itemId === null) {
+        throw new Error(
+          `Default list ${binding.label}[${index}] has no @id. Creating new default rows from source is not implemented by this slice.`
+        );
+      }
+      return lowerValueRow(context, entryMember, element, itemId, binding);
+    });
+    return { value: ids, classId: storedClassId };
+  }
+  if (member.kind === "dictionary" && backed.kind === "dictionary") {
+    if (expression.kind !== "litDict") {
+      throw new Error(`Default value ${binding.label} requires {...}.`);
+    }
+    const entryMember = requiredMember(context, member.entryMemberId);
+    const baseBody = backed.body;
+    const body = {};
+    for (const entry of expression.entries) {
+      if (entry.key.kind !== "litString") {
+        throw new Error(
+          `Default dictionary ${binding.label} requires string keys.`
+        );
+      }
+      const existingId = isObjectRecord2(baseBody) ? baseBody[entry.key.value] : void 0;
+      const entryId = typeof existingId === "string" ? existingId : annotatedValue(entry.value).id;
+      if (entryId === null || entryId === void 0) {
+        throw new Error(
+          `Default dictionary ${binding.label}[${JSON.stringify(entry.key.value)}] has no existing owned value row. Creating new default rows from source is not implemented by this slice.`
+        );
+      }
+      body[entry.key.value] = lowerValueRow(
+        context,
+        entryMember,
+        entry.value,
+        entryId,
+        binding
+      );
+    }
+    return { value: body, classId: storedClassId };
+  }
+  throw new Error(
+    `Default value ${binding.label} does not match its persisted ${member.kind} container shape.`
+  );
+}
 function lowerStoredBinding(context, binding, memberValueIds, seeds) {
   const member = context.members.get(binding.memberId);
   if (member === void 0) {
@@ -39143,18 +39460,7 @@ function lowerClassValue(context, member, expression, base, source) {
   const baseBody = isObjectRecord2(base.value) ? base.value : {};
   const body = { ...baseBody };
   for (const assignment of expression.initializer ?? []) {
-    const childMemberId = schemaClass2.schema[assignment.name];
-    if (typeof childMemberId !== "string") {
-      throw new Error(
-        `Class ${schemaClass2.name} has no stored member ${assignment.name}.`
-      );
-    }
-    const childMember = context.members.get(childMemberId);
-    if (childMember === void 0) {
-      throw new Error(
-        `Class ${schemaClass2.name}.${assignment.name} is missing its member record.`
-      );
-    }
+    const childMember = classMemberByName(context, classId, assignment.name);
     const childId = baseBody[assignment.name];
     if (typeof childId !== "string") {
       throw new Error(
@@ -39999,7 +40305,7 @@ function classValue(context, member, value, visited, targetTyped) {
     ...Object.keys(value.value).filter((key2) => !order.includes(key2))
   ]) {
     const childId = value.value[key];
-    const childMemberId = schema[key];
+    const childMemberId = schema[key] ?? inheritedSchemaMemberId(context, schemaClass2, key);
     if (typeof childId !== "string" || typeof childMemberId !== "string")
       continue;
     const childMember = context.members.get(childMemberId);
@@ -40013,9 +40319,23 @@ function classValue(context, member, value, visited, targetTyped) {
     );
   }
   return fields.length === 0 ? targetTyped ? "new()" : `new ${name}()` : `${targetTyped ? "new()" : `new ${name}`} {
-${fields.map((field) => indentNeoSource(field, 2)).join(",\n")}
+${fields.map((field) => indentNeoSourceNonEmptyLines(field, 2)).join(",\n")}
 }`;
 }
+function inheritedSchemaMemberId(context, schemaClass2, key) {
+  const visited = /* @__PURE__ */ new Set();
+  let current = typeof schemaClass2.extendsClassId === "string" ? schemaClass2.extendsClassId : void 0;
+  while (current !== void 0 && !visited.has(current)) {
+    visited.add(current);
+    const parent = context.classes.get(current);
+    if (parent === void 0) return void 0;
+    const schema = isObjectRecord2(parent.schema) ? parent.schema : {};
+    const memberId = schema[key];
+    if (typeof memberId === "string") return memberId;
+    current = typeof parent.extendsClassId === "string" ? parent.extendsClassId : void 0;
+  }
+  return void 0;
+}
 function listValue(context, member, value, visited) {
   if (value.value === null) return "null";
   const entryMember = context.members.get(stringField2(member, "entryMemberId"));
@@ -40027,7 +40347,7 @@ function listValue(context, member, value, visited) {
   if (ids.length === 0) return "[]";
   return `[
 ${ids.map(
-    (id2) => indentNeoSource(
+    (id2) => indentNeoSourceNonEmptyLines(
       emitValue(context, entryMember, id2, {
         exposeIdentity: context.symbolsByValueId.get(id2) === void 0,
         visited
@@ -40050,7 +40370,7 @@ function dictionaryValue(context, member, body, visited) {
   return `{
 ${entries.flatMap(
     ([key, id2]) => typeof id2 === "string" ? [
-      indentNeoSource(
+      indentNeoSourceNonEmptyLines(
         `${quote4(key)}: ${emitValue(context, entryMember, id2, {
           exposeIdentity: !context.symbolsByValueId.has(id2) && context.referencedValueIds.has(id2),
           visited
@@ -40241,6 +40561,7 @@ function numberOr2(value, fallback) {
 function quote4(value) {
   return quoteNeoString(value);
 }
+var MEMBER_KIND_DICTIONARY, MEMBER_KIND_LIST, MEMBER_KIND_CLASS;
 var init_value_sources = __esm({
   "src/project-source/value-sources.ts"() {
     "use strict";
@@ -40249,6 +40570,9 @@ var init_value_sources = __esm({
     init_project_files();
     init_lower_members();
     init_source_format();
+    MEMBER_KIND_DICTIONARY = 5;
+    MEMBER_KIND_LIST = 6;
+    MEMBER_KIND_CLASS = 7;
   }
 });
 
@@ -40431,8 +40755,11 @@ function emitProjectDocumentFilesV4(records2) {
   }
   const manifest = documentsToProjectSchemaManifest(schemaRecords);
   const staticValues = emitStaticValueSourcesV4(records2);
+  const memberDefaults = emitMemberDefaultSourcesV4(records2);
   const baseSource = emitProjectSourcesV4(manifest, {
     staticInitializers: staticValues.initializers,
+    defaultInitializers: memberDefaults.initializers,
+    fileSymbols: qualifiedProjectFileSymbolsV4(records2),
     relationEndpointExpressions: relationEndpointExpressions(records2)
   });
   const source = {
@@ -40440,7 +40767,11 @@ function emitProjectDocumentFilesV4(records2) {
     files: baseSource.files.map((file) => {
       const ownedKeys = file.recordKeys.flatMap((key) => {
         if (!key.startsWith("member:")) return [];
-        return [...staticValues.recordKeysByMember.get(key.slice(7)) ?? []];
+        const memberId = key.slice(7);
+        return [
+          ...staticValues.recordKeysByMember.get(memberId) ?? [],
+          ...memberDefaults.recordKeysByMember.get(memberId) ?? []
+        ];
       });
       return ownedKeys.length === 0 ? file : { ...file, recordKeys: [...file.recordKeys, ...ownedKeys] };
     })
@@ -42732,6 +43063,10 @@ function computeWorkspaceStatus(workspace, options = {}) {
   let manifest;
   let staticValueSeeds = /* @__PURE__ */ new Map();
   let staticMemberValueIds = /* @__PURE__ */ new Map();
+  let memberDefaults = {
+    records: [],
+    memberDefaultValues: /* @__PURE__ */ new Map()
+  };
   let projectAnalysisV4 = null;
   try {
     if (!baseManifest) {
@@ -42795,8 +43130,26 @@ function computeWorkspaceStatus(workspace, options = {}) {
       };
     }
     manifest = lowerProjectSchemaV4(baseManifest, analysis, {
-      staticValueIdsBySymbol: staticValueIdsBySymbol2(workspace.state.records)
+      staticValueIdsBySymbol: staticValueIdsBySymbol2(workspace.state.records),
+      projectFileIdsBySymbol: projectFileIdsBySymbol(workspace.state.records),
+      rowBackedDefaultMemberIds: rowBackedDefaultMemberIdsV4(
+        workspace.state.records
+      )
     });
+    memberDefaults = lowerMemberDefaultSourcesV4(
+      workspace.state.records,
+      analysis,
+      manifest
+    );
+    if (memberDefaults.memberDefaultValues.size > 0) {
+      manifest = {
+        ...manifest,
+        members: manifest.members.map((member) => {
+          const lowered = memberDefaults.memberDefaultValues.get(member.id);
+          return lowered === void 0 ? member : { ...member, defaultValue: lowered };
+        })
+      };
+    }
     (options.writeProjectAnalysisCache ?? writeProjectSourceAnalysisCacheV4)(
       workspace.root,
       analysis
@@ -42878,7 +43231,12 @@ function computeWorkspaceStatus(workspace, options = {}) {
   const dialogueState = overlayProspectiveSourceRecords(
     workspace.state.records,
     documents,
-    [...staticValues.records, ...rootRecords, ...supplementalRecords],
+    [
+      ...staticValues.records,
+      ...memberDefaults.records,
+      ...rootRecords,
+      ...supplementalRecords
+    ],
     staticMemberValueIds
   );
   const dialogueRecords = lowerDialogueProjectSourcesV4(
@@ -42887,6 +43245,7 @@ function computeWorkspaceStatus(workspace, options = {}) {
   );
   records2.push(
     ...staticValues.records,
+    ...memberDefaults.records,
     ...rootRecords,
     ...supplementalRecords,
     ...dialogueRecords

package/package.json

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