@neocompose/cli 0.16.0 → 0.16.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.16.1] - 2026-07-30
+
+### Fixed
+
+- Lower member defaults that read their declaring class's constructor
+  parameters, including nested class and collection entries, while preserving
+  authored row identities and source-positioned diagnostics.
+- Seed structural rows for newly authored class-valued members, including root
+  scope members, so a new object graph can be created in the same push that
+  declares it.
+- Resolve shared collection entry types in the overriding class's concrete
+  generic environment. A `List<NeoAnimationSegmentFrame<SpriteInfo>>` override
+  now agrees with its inherited `List<NeoAnimationSegmentFrame<T>>` declaration
+  and generates the corresponding concrete C# property signature.
+
 ## [0.16.0] - 2026-07-30
 
 ### Added

package/dist/neo.mjs

@@ -30222,14 +30222,18 @@ function declaresParameterlessConstructor(index, className) {
   if (declared === void 0) return false;
   return declared.some((entry) => entry.parameters.length === 0);
 }
-function initializerRequiresEvaluation(index, expression, targetClassName) {
+function initializerRequiresEvaluation(index, expression, targetClassName, runtimeIdentifiers = /* @__PURE__ */ new Set()) {
   if (expression.kind === "annotated") {
     return initializerRequiresEvaluation(
       index,
       expression.expression,
-      targetClassName
+      targetClassName,
+      runtimeIdentifiers
     );
   }
+  if (expressionReadsRuntimeIdentifier(expression, runtimeIdentifiers)) {
+    return true;
+  }
   if (expression.kind === "call") return !isLiteralCall(expression);
   if (expression.kind !== "new") return false;
   const className = expression.className ?? targetClassName;
@@ -30239,6 +30243,73 @@ function initializerRequiresEvaluation(index, expression, targetClassName) {
   }
   return declaresParameterlessConstructor(index, className);
 }
+function declaredConstructorParameterNames(index, className) {
+  if (className === null) return /* @__PURE__ */ new Set();
+  return new Set(
+    (index.byClassName.get(className) ?? []).flatMap(
+      (constructor2) => constructor2.parameters.map((parameter3) => parameter3.name)
+    )
+  );
+}
+function expressionReadsRuntimeIdentifier(expression, runtimeIdentifiers) {
+  if (runtimeIdentifiers.size === 0) return false;
+  switch (expression.kind) {
+    case "ident":
+      return runtimeIdentifiers.has(expression.name);
+    case "annotated":
+      return expressionReadsRuntimeIdentifier(
+        expression.expression,
+        runtimeIdentifiers
+      );
+    case "new":
+      return expression.args.some(
+        (argument2) => expressionReadsRuntimeIdentifier(argument2, runtimeIdentifiers)
+      );
+    case "call":
+      return expressionReadsRuntimeIdentifier(
+        expression.callee,
+        runtimeIdentifiers
+      ) || expression.args.some(
+        (argument2) => expressionReadsRuntimeIdentifier(argument2, runtimeIdentifiers)
+      );
+    case "member":
+      return expressionReadsRuntimeIdentifier(
+        expression.receiver,
+        runtimeIdentifiers
+      );
+    case "index":
+      return expressionReadsRuntimeIdentifier(
+        expression.receiver,
+        runtimeIdentifiers
+      ) || expressionReadsRuntimeIdentifier(expression.index, runtimeIdentifiers);
+    case "binary":
+    case "coalesce":
+      return expressionReadsRuntimeIdentifier(expression.left, runtimeIdentifiers) || expressionReadsRuntimeIdentifier(expression.right, runtimeIdentifiers);
+    case "unary":
+    case "force":
+    case "is":
+      return expressionReadsRuntimeIdentifier(
+        expression.operand,
+        runtimeIdentifiers
+      );
+    case "litInterp":
+      return expression.parts.some(
+        (part) => part.kind === "expr" && expressionReadsRuntimeIdentifier(part.expr, runtimeIdentifiers)
+      );
+    case "lambda":
+      return false;
+    case "litList":
+    case "litDict":
+    case "litNull":
+    case "litBool":
+    case "litInt":
+    case "litFloat":
+    case "litString":
+    case "litTripleString":
+    case "contextualEnum":
+      return false;
+  }
+}
 function isLiteralCall(expression) {
   if (expression.callee.kind === "ident" && expression.callee.name === "Reference") {
     return true;
@@ -38124,13 +38195,21 @@ function lowerClass(context, declaration) {
     const placements = context.placements.get(memberId) ?? [];
     placements.push(placement);
     context.placements.set(memberId, placements);
-    const lowered = lowerMember(
-      context,
-      declaration,
-      memberDeclaration,
-      memberId,
-      { kind: "classMember", ...placement }
-    );
+    let lowered;
+    try {
+      lowered = lowerMember(context, declaration, memberDeclaration, memberId, {
+        kind: "classMember",
+        ...placement
+      });
+    } catch (error) {
+      if (error instanceof SchemaSourceError) throw error;
+      throw new SchemaSourceError(
+        error instanceof Error ? error.message : String(error),
+        memberDeclaration.source.uri,
+        memberDeclaration.source.range.start.line + 1,
+        memberDeclaration.source.range.start.character + 1
+      );
+    }
     const existing = context.loweredMembers.get(memberId);
     if (existing && !sameSharedMember(existing, lowered)) {
       throw new Error(
@@ -38551,10 +38630,20 @@ function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, ba
         multiselect: true
       };
     }
-    const entryId = collectionEntryMemberId(
-      declaringCollectionMemberId(context, id2, common.overrideOf)
+    const declaringMemberId = declaringCollectionMemberId(
+      context,
+      id2,
+      common.overrideOf
+    );
+    const entryId = collectionEntryMemberId(declaringMemberId);
+    lowerCollectionEntry(
+      context,
+      ownerClass,
+      entryType,
+      entryId,
+      id2,
+      declaringMemberId
     );
-    lowerCollectionEntry(context, ownerClass, entryType, entryId, id2);
     return {
       ...common,
       kind: "list",
@@ -38570,10 +38659,20 @@ function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, ba
     }
     const keyType = requiredTypeArgument(fieldType, 0);
     const entryType = requiredTypeArgument(fieldType, 1);
-    const entryId = collectionEntryMemberId(
-      declaringCollectionMemberId(context, id2, common.overrideOf)
+    const declaringMemberId = declaringCollectionMemberId(
+      context,
+      id2,
+      common.overrideOf
+    );
+    const entryId = collectionEntryMemberId(declaringMemberId);
+    lowerCollectionEntry(
+      context,
+      ownerClass,
+      entryType,
+      entryId,
+      id2,
+      declaringMemberId
     );
-    lowerCollectionEntry(context, ownerClass, entryType, entryId, id2);
     return {
       ...common,
       kind: "dictionary",
@@ -38723,12 +38822,24 @@ function overrideParentMemberId(context, memberId) {
   const overrides = member.modifiers.includes("override") || member.modifiers.includes("sealed");
   return overrides ? inheritedMemberId(context, ownerClass, member.name) : null;
 }
-function lowerCollectionEntry(context, ownerClass, entryType, entryId, parentMemberId) {
+function lowerCollectionEntry(context, ownerClass, entryType, entryId, parentMemberId, declaringMemberId) {
+  const declared = declaredCollectionEntryType(context, declaringMemberId);
+  const expected = declared === null ? null : resolveManifestTypeInDescendant(
+    context,
+    declared.type,
+    declared.ownerClass,
+    ownerClass
+  );
+  if (expected !== null && !sameManifestType(expected, entryType)) {
+    throw new Error(
+      `Collection member ${ownerClass.name}.${parentMemberId} declares entry type ${formatManifestType(entryType)}, but the member it overrides declares ${formatManifestType(expected)}. An override cannot change a collection's element type.`
+    );
+  }
   const already = context.entryTypesByEntryId.get(entryId);
   if (already !== void 0) {
-    if (JSON.stringify(already) !== JSON.stringify(entryType)) {
+    if (expected === null && !sameManifestType(already, entryType)) {
       throw new Error(
-        `Collection member ${ownerClass.name}.${parentMemberId} declares entry type ${entryType.name}, but the member it overrides declares ${already.name}. An override cannot change a collection's element type.`
+        `Collection member ${ownerClass.name}.${parentMemberId} declares entry type ${formatManifestType(entryType)}, but the member it overrides declares ${formatManifestType(already)}. An override cannot change a collection's element type.`
       );
     }
     return;
@@ -38772,6 +38883,82 @@ function lowerCollectionEntry(context, ownerClass, entryType, entryId, parentMem
     lowerFieldMember(context, ownerClass, declaration, entryId, common, base)
   );
 }
+function declaredCollectionEntryType(context, declaringMemberId) {
+  const placement = context.sourceMembersById.get(declaringMemberId);
+  if (placement === void 0) return null;
+  const collectionType = placement.member.type;
+  const argumentIndex = collectionType.name === "Dictionary" ? 1 : 0;
+  const type = collectionType.arguments[argumentIndex];
+  return type === void 0 ? null : { type, ownerClass: placement.ownerClass };
+}
+function resolveManifestTypeInDescendant(context, type, declaringOwner, descendantOwner) {
+  const declaringOwnerId = materializedId(
+    declaringOwner,
+    "class",
+    declaringOwner.name
+  );
+  let current = descendantOwner;
+  let environment = new Map(
+    current.genericParameters.map((parameter3) => [
+      parameter3.name,
+      manifestNamedType(parameter3.name)
+    ])
+  );
+  const visited = /* @__PURE__ */ new Set();
+  while (true) {
+    const currentId = materializedId(current, "class", current.name);
+    if (currentId === declaringOwnerId) {
+      return substituteManifestType2(type, environment);
+    }
+    if (visited.has(currentId)) return null;
+    visited.add(currentId);
+    const baseType = current.baseTypes[0];
+    if (baseType === void 0) return null;
+    const baseId = context.classIdsByName.get(baseType.name);
+    if (baseId === void 0) return null;
+    const baseClass = context.sourceClasses.get(baseId);
+    if (baseClass === void 0) return null;
+    if (baseType.arguments.length !== baseClass.genericParameters.length) {
+      return null;
+    }
+    environment = new Map(
+      baseClass.genericParameters.map((parameter3, index) => [
+        parameter3.name,
+        substituteManifestType2(baseType.arguments[index], environment)
+      ])
+    );
+    current = baseClass;
+  }
+}
+function substituteManifestType2(type, environment) {
+  if (type.arguments.length === 0) {
+    const binding = environment.get(type.name);
+    if (binding !== void 0) {
+      return {
+        ...binding,
+        nullable: type.nullable || binding.nullable
+      };
+    }
+  }
+  return {
+    ...type,
+    arguments: type.arguments.map(
+      (argument2) => substituteManifestType2(argument2, environment)
+    )
+  };
+}
+function sameManifestType(left, right) {
+  return left.name === right.name && left.nullable === right.nullable && left.arguments.length === right.arguments.length && left.arguments.every(
+    (argument2, index) => sameManifestType(argument2, right.arguments[index])
+  );
+}
+function manifestNamedType(name) {
+  return { name, nullable: false, arguments: [] };
+}
+function formatManifestType(type) {
+  const argumentsText = type.arguments.length === 0 ? "" : `<${type.arguments.map(formatManifestType).join(", ")}>`;
+  return `${type.name}${argumentsText}${type.nullable ? "?" : ""}`;
+}
 function lowerInterface(context, declaration) {
   const id2 = materializedId(declaration, "interface", declaration.name);
   const base = context.baseInterfaces.get(id2);
@@ -38962,7 +39149,11 @@ function lowerDefault(context, initializer, type, ownerClass, base, memberId, st
   if (initializerRequiresEvaluation(
     context.declaredConstructors,
     expression,
-    type.name
+    type.name,
+    declaredConstructorParameterNames(
+      context.declaredConstructors,
+      ownerClass.name
+    )
   )) {
     return { init: { code: normalizeInitializerSource(initializer) } };
   }
@@ -39021,6 +39212,17 @@ function lowerExpressionValue(context, expression, declaredExpected, ownerClass,
     declaredExpected,
     genericEnvironment
   );
+  if (initializerRequiresEvaluation(
+    context.declaredConstructors,
+    expression,
+    expected.name,
+    declaredConstructorParameterNames(
+      context.declaredConstructors,
+      ownerClass.name
+    )
+  )) {
+    return null;
+  }
   if (expression.kind === "annotated") {
     return lowerExpressionValue(
       context,
@@ -39755,6 +39957,7 @@ var init_lower_members = __esm({
     init_generic_argument_member_id();
     init_structured_leaf_source();
     init_member_kind_type_names();
+    init_source_diagnostics();
     UNSET_LIST_COLUMN_WIDTH = -1;
     EMPTY_GENERIC_TYPE_ENVIRONMENT = /* @__PURE__ */ new Map();
     primitiveMemberKinds = /* @__PURE__ */ new Set([
@@ -46244,14 +46447,15 @@ function indexInitializerAuthoredRowIds(analysis, declaredConstructors2, classes
         declaration.initializer,
         declaration.type,
         declaredConstructors2,
-        classesByName
+        classesByName,
+        sourceClass.name
       );
       for (const source of sources) indexAuthoredRowIds(index, source, label);
     }
   }
   return index;
 }
-function initializerSourcesRequiringEvaluation(initializer, declaredType, declaredConstructors2, classesByName) {
+function initializerSourcesRequiringEvaluation(initializer, declaredType, declaredConstructors2, classesByName, ownerClassName) {
   let expression;
   try {
     expression = parseExpression(initializer);
@@ -46262,7 +46466,8 @@ function initializerSourcesRequiringEvaluation(initializer, declaredType, declar
   if (initializerRequiresEvaluation(
     declaredConstructors2,
     expression,
-    targetClassName
+    targetClassName,
+    declaredConstructorParameterNames(declaredConstructors2, ownerClassName)
   )) {
     return [normalizeInitializerSource(initializer)];
   }
@@ -46270,7 +46475,12 @@ function initializerSourcesRequiringEvaluation(initializer, declaredType, declar
   const entryClassName = declaredEntryClassName(declaredType, classesByName);
   if (body.kind === "litList") {
     return topLevelEntrySlices(initializer, "[", "]").filter(
-      (entry) => entrySliceRequiresEvaluation(entry, declaredConstructors2, entryClassName)
+      (entry) => entrySliceRequiresEvaluation(
+        entry,
+        declaredConstructors2,
+        entryClassName,
+        ownerClassName
+      )
     );
   }
   if (body.kind === "litDict") {
@@ -46278,7 +46488,8 @@ function initializerSourcesRequiringEvaluation(initializer, declaredType, declar
       (entry) => entrySliceRequiresEvaluation(
         entry,
         declaredConstructors2,
-        entryClassName
+        entryClassName,
+        ownerClassName
       )
     );
   }
@@ -46292,12 +46503,13 @@ function declaredEntryClassName(declaredType, classesByName) {
   if (entryType === void 0) return null;
   return declaredClassName(entryType, classesByName);
 }
-function entrySliceRequiresEvaluation(entry, declaredConstructors2, entryClassName) {
+function entrySliceRequiresEvaluation(entry, declaredConstructors2, entryClassName, ownerClassName) {
   try {
     return initializerRequiresEvaluation(
       declaredConstructors2,
       parseExpression(entry),
-      entryClassName
+      entryClassName,
+      declaredConstructorParameterNames(declaredConstructors2, ownerClassName)
     );
   } catch {
     return false;
@@ -46384,7 +46596,8 @@ function lowerMemberDefaultSourcesV4(state, analysis, manifest, options = {}) {
       const requiresEvaluation = initializerRequiresEvaluation(
         context.declaredConstructors,
         annotatedValue(expression).expression,
-        memberClassName(context, member)
+        memberClassName(context, member),
+        bindingRuntimeIdentifiers(context, binding)
       );
       const baseData3 = stateData(context, "member", memberId);
       const backed = baseData3 === null || requiresEvaluation ? null : rowBackedDefaultBody(baseData3, (id2) => pulledValueIds.has(id2));
@@ -46395,7 +46608,9 @@ function lowerMemberDefaultSourcesV4(state, analysis, manifest, options = {}) {
         );
         continue;
       }
-      if (!defaultRequiresOwnedRows(context, member, expression)) continue;
+      if (!defaultRequiresOwnedRows(context, member, expression, binding)) {
+        continue;
+      }
       const rootValueId = pendingValueId(binding, `${label}.default`);
       const seed = lowerStaticSeed(
         context,
@@ -46783,12 +46998,13 @@ function declaredCollectionMemberIds(context, collectionMemberId) {
   }
   return ids;
 }
-function defaultRequiresOwnedRows(context, member, sourceExpression) {
+function defaultRequiresOwnedRows(context, member, sourceExpression, source) {
   const expression = annotatedValue(sourceExpression).expression;
   if (initializerRequiresEvaluation(
     context.declaredConstructors,
     expression,
-    memberClassName(context, member)
+    memberClassName(context, member),
+    bindingRuntimeIdentifiers(context, source)
   )) {
     return false;
   }
@@ -46847,12 +47063,33 @@ function memberClassName(context, member) {
   if (member.kind !== "class") return null;
   return context.classes.get(member.classId)?.name ?? null;
 }
+function bindingRuntimeIdentifiers(context, source) {
+  const ownerClassName = source.ownerClassId === void 0 ? null : context.classes.get(source.ownerClassId)?.name ?? null;
+  return declaredConstructorParameterNames(
+    context.declaredConstructors,
+    ownerClassName
+  );
+}
+function bindingGenericEnvironment(context, source) {
+  if (source.ownerClassId === void 0) return /* @__PURE__ */ new Map();
+  return classGenericEnvironment(context, source.ownerClassId);
+}
+function classGenericEnvironment(context, classId) {
+  const bindings = classGenericBindings(context.classes, classId);
+  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 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;
+  const bindingEnvironment = bindingGenericEnvironment(context, binding);
   if (member.kind === "class" && backed.kind === "class") {
     if (expression.kind !== "new") {
       throw new Error(`Default value ${binding.label} requires new(...).`);
@@ -46870,7 +47107,7 @@ function lowerRowBackedDefault(context, member, backed, baseData3, binding) {
       context,
       classId,
       member,
-      void 0
+      bindingEnvironment
     );
     const environment = inferAnimationChildOverrideLowerEnvironment(
       context,
@@ -46956,7 +47193,7 @@ function lowerRowBackedDefault(context, member, backed, baseData3, binding) {
         element,
         itemId,
         binding,
-        void 0,
+        bindingEnvironment,
         entrySlices[index]
       );
     });
@@ -46990,7 +47227,7 @@ function lowerRowBackedDefault(context, member, backed, baseData3, binding) {
         entry.value,
         entryId,
         binding,
-        void 0,
+        bindingEnvironment,
         dictionaryValueSlice(entrySlices[entryIndex])
       );
       entryIndex += 1;
@@ -47033,7 +47270,15 @@ function lowerStoredBinding(context, binding, memberValueIds, seeds) {
         (pending) => pending.id
       )
     );
-    lowerValueRow(context, member, expression, valueId, binding);
+    lowerValueRow(
+      context,
+      member,
+      expression,
+      valueId,
+      binding,
+      bindingGenericEnvironment(context, binding),
+      binding.initializer
+    );
     const pendingRows = [...context.pendingValues.values()].filter(
       (row) => !existingPendingValueIds.has(row.id)
     );
@@ -47133,7 +47378,7 @@ function lowerStaticSeed(context, member, sourceExpression, source, valueId) {
     rows,
     localizedTexts,
     void 0,
-    void 0,
+    bindingGenericEnvironment(context, source),
     void 0,
     source.initializer
   );
@@ -47164,7 +47409,8 @@ function lowerSeedRow(context, member, sourceExpression, source, valueId, path,
   if (initializerRequiresEvaluation(
     context.declaredConstructors,
     expression,
-    memberClassName(context, resolvedMember)
+    memberClassName(context, resolvedMember),
+    bindingRuntimeIdentifiers(context, source)
   )) {
     const code = initializerExpressionSlice(authoredSlice);
     if (code === void 0) {
@@ -47543,7 +47789,8 @@ function lowerValueRow(context, member, sourceExpression, expectedValueId, sourc
   if (initializerRequiresEvaluation(
     context.declaredConstructors,
     expression,
-    memberClassName(context, resolvedMember)
+    memberClassName(context, resolvedMember),
+    bindingRuntimeIdentifiers(context, source)
   )) {
     const code = initializerExpressionSlice(authoredSlice);
     if (code === void 0) {
@@ -47570,12 +47817,13 @@ function lowerValueRow(context, member, sourceExpression, expectedValueId, sourc
     expression,
     base,
     source,
-    environment
+    environment,
+    authoredSlice
   );
   addReconstructed(context, "value", expectedValueId, value, source.source);
   return expectedValueId;
 }
-function lowerValueBody(context, member, expression, base, source, environment) {
+function lowerValueBody(context, member, expression, base, source, environment, authoredSlice) {
   const next = valueFileFields(base);
   if (expression.kind === "litNull") return { ...next, value: null };
   switch (member.kind) {
@@ -47635,7 +47883,8 @@ function lowerValueBody(context, member, expression, base, source, environment)
         expression,
         base,
         source,
-        environment
+        environment,
+        authoredSlice
       );
     case "list":
       return lowerListValue(
@@ -47661,7 +47910,7 @@ function lowerValueBody(context, member, expression, base, source, environment)
       );
   }
 }
-function lowerClassValue(context, member, expression, base, source, outerEnvironment) {
+function lowerClassValue(context, member, expression, base, source, outerEnvironment, authoredSlice) {
   if (expression.kind !== "new")
     throw new Error("Class values require new(...).");
   const currentClassId = stringOrNull(base.classId) ?? member.classId;
@@ -47699,6 +47948,7 @@ function lowerClassValue(context, member, expression, base, source, outerEnviron
   );
   const baseBody = isObjectRecord2(base.value) ? base.value : {};
   const body = { ...baseBody };
+  const assignmentSlices = objectInitializerSlices(authoredSlice);
   lowerConstructorProjections(
     context,
     schemaClass2,
@@ -47720,9 +47970,26 @@ function lowerClassValue(context, member, expression, base, source, outerEnviron
     }
     const childId = baseBody[assignment.name];
     if (typeof childId !== "string") {
-      throw new Error(
-        `Class value ${String(base.id)}.${assignment.name} has no existing structural row. New structural rows are not implemented by this slice.`
+      const symbolId2 = sourceValueSymbol(context, assignment.value);
+      if (symbolId2 !== null) {
+        throw new Error(
+          `Class value ${String(base.id)}.${assignment.name} cannot place existing value ${symbolId2} into a new structural slot. Create the nested value inline so the atomic construction transaction can own it.`
+        );
+      }
+      body[assignment.name] = lowerSeedChild(
+        context,
+        recursivePartialMember(member, childMember),
+        assignment.value,
+        source,
+        `${String(base.id)}.${assignment.name}`,
+        /* @__PURE__ */ new Map(),
+        /* @__PURE__ */ new Map(),
+        void 0,
+        environment,
+        void 0,
+        assignmentSlices.get(assignment.name)
       );
+      continue;
     }
     const symbolId = sourceValueSymbol(context, assignment.value);
     if (symbolId !== null) {
@@ -47740,7 +48007,8 @@ function lowerClassValue(context, member, expression, base, source, outerEnviron
       assignment.value,
       childId,
       source,
-      environment
+      environment,
+      assignmentSlices.get(assignment.name)
     );
   }
   return {
@@ -49587,7 +49855,7 @@ function lowerInstanceGenericEnvironment(context, classId, member, outerEnvironm
       });
     }
   }
-  const environment = /* @__PURE__ */ new Map();
+  const environment = new Map(classGenericEnvironment(context, classId));
   for (const genericParamId of bindings.keys()) {
     const memberId = terminalGenericBindingMemberId(genericParamId, bindings);
     if (memberId !== void 0) environment.set(genericParamId, memberId);
@@ -54187,7 +54455,7 @@ function computeWorkspaceStatus(workspace, options = {}) {
     );
   } catch (error) {
     parseErrors.push(
-      new SchemaSourceError(
+      error instanceof SchemaSourceError ? error : new SchemaSourceError(
         error instanceof Error ? error.message : String(error),
         "<project>",
         1,
@@ -54256,9 +54524,15 @@ function computeWorkspaceStatus(workspace, options = {}) {
     { registry: valueLowerRegistry }
   );
   staticValueSeeds = new Map([...staticValueSeeds, ...rootValues.seeds]);
+  const rootPathResolutionState = overlayProspectiveSourceRecords(
+    workspace.state.records,
+    documents,
+    [...staticValues.records, ...memberDefaults.records, ...rootValues.records],
+    staticMemberValueIds
+  );
   const resolvedCollectionPaths = resolveRootPathCollectionValuesV4({
     manifest,
-    state: workspace.state.records,
+    state: rootPathResolutionState,
     registry: valueLowerRegistry,
     siteForMember: (memberId) => {
       const span2 = sourceByKey.get(recordStateKey("member", memberId))?.span;
@@ -54587,7 +54861,28 @@ function prospectiveAnimationDocumentV4(records2) {
     }
   }
   if (project === void 0) return null;
-  return { project, classes, members, values };
+  const classIdByName = new Map(classes.map((value) => [value.name, value.id]));
+  const validationValues = values.map((value) => {
+    if (typeof value.classId === "string") return value;
+    const authoredInit = Reflect.get(value, "init");
+    const init = isObjectRecord2(authoredInit) ? authoredInit : null;
+    if (typeof init?.code !== "string") return value;
+    let expression;
+    try {
+      expression = parseExpression(init.code);
+      while (expression.kind === "annotated") {
+        expression = expression.expression;
+      }
+    } catch {
+      return value;
+    }
+    if (expression.kind !== "new" || expression.className === null)
+      return value;
+    const classId = classIdByName.get(expression.className);
+    if (classId === void 0) return value;
+    return { ...value, classId };
+  });
+  return { project, classes, members, values: validationValues };
 }
 function declaresAnimationWorldKind(system) {
   if (!isObjectRecord2(system)) return false;
@@ -61525,13 +61820,24 @@ function createdSessionValuesSince(session, existingIds) {
 function evaluateNSGetter(getter, ctx) {
   return evaluateNSGetterWithEffects(getter, ctx).value;
 }
-function evaluateNSGetterWithEffects(getter, ctx) {
+function evaluateNSGetterWithEffects(getter, ctx, argumentValues = []) {
   const ownsInvocationState = ctx.__executionState === void 0;
   const requestedWrites = [];
   const runtimeCtx = withEvaluationRuntime(ctx, requestedWrites);
   const writes = runtimeCtx.__executionState?.writes ?? requestedWrites;
   const existingIds = new Set(runtimeCtx.__runtimeSessionValues.keys());
   const scope = createTopLevelScope(runtimeCtx);
+  const parameters = getter.parameters.slice(2);
+  if (parameters.length !== argumentValues.length) {
+    throw new NSGetterRuntimeError(
+      `NeoScript getter expected ${parameters.length} argument(s), got ${argumentValues.length}.`
+    );
+  }
+  for (let index = 0; index < argumentValues.length; index += 1) {
+    const parameter3 = parameters[index];
+    if (parameter3 === void 0) continue;
+    scope.set(parameter3.id, argumentValues[index]);
+  }
   try {
     const result = evalInstructions(
       getter.instructions,
@@ -64931,10 +65237,16 @@ function runDeclaredConstructorChain(args) {
     true
   );
 }
-function constructionInitEvaluator(ctx, createdValues) {
-  return (member, init) => evaluateInitializerInContext(init, member, ctx, createdValues);
+function constructionInitEvaluator(ctx, createdValues, argumentValues = []) {
+  return (member, init) => evaluateInitializerInContext(
+    init,
+    member,
+    ctx,
+    createdValues,
+    argumentValues
+  );
 }
-function evaluateInitializerInContext(init, member, ctx, createdValues) {
+function evaluateInitializerInContext(init, member, ctx, createdValues, argumentValues = []) {
   const compiled = init.compiled;
   if (compiled === void 0) {
     throw new NSGetterRuntimeError(
@@ -64944,7 +65256,11 @@ function evaluateInitializerInContext(init, member, ctx, createdValues) {
   const closeFrame = pushConstructionFrame(ctx, `${member.name} initializer`);
   let result;
   try {
-    result = evaluateNSGetterWithEffects(compiled, { ...ctx, thisValue: null });
+    result = evaluateNSGetterWithEffects(
+      compiled,
+      { ...ctx, thisValue: null },
+      argumentValues
+    );
   } finally {
     closeFrame();
   }
@@ -65004,7 +65320,11 @@ function constructDeclaredClassValueWithinFrame(descriptor, record3, info, scope
       topLevelClassId: classId,
       createdValues,
       storageKeyDeclarations,
-      initEvaluator: constructionInitEvaluator(ctx, createdValues),
+      initEvaluator: constructionInitEvaluator(
+        ctx,
+        createdValues,
+        argumentValues
+      ),
       constructorRoot: {
         providedSchemaKeys: new Set(
           descriptor.fields.map((validated) => validated.field.schemaKey)

package/package.json

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