@neocompose/cli 0.82.0 → 0.82.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.82.2
+
+### Patch Changes
+
+- 9e3a8d3: Fix post-push exports of class defaults that spell a field's declared default, such as animation FPS. Keep those fields sparse on subsequent analysis and preserve existing child-row ownership when adding a real default override.
+
+## 0.82.1
+
+### Patch Changes
+
+- 8d58730: Fix collection-bound Reference<T> and Set<Reference<T>> declarations whose generic target extends a class. Preserve inherited lookup overrides during export, and report authored source diagnostics instead of secondary manifest errors when a base declaration is invalid.
+
 ## 0.82.0
 
 ### Minor Changes

package/dist/neo.mjs

@@ -45146,6 +45146,7 @@ function contextualAnnotationFields(document, position) {
       if (annotation2) {
         return fieldsForAnnotation(annotation2.name, {
           kind: "member",
+          ownerName: declaration.name,
           type: semanticType(member.type),
           memberKind: member.kind
         });
@@ -45569,6 +45570,7 @@ function validateMember(uri, member, ownerName, documentKind, ownerScope, enviro
     member.annotations,
     documentKind === "flow" ? member.kind === "field" && member.flowInitializer ? { kind: "flowGraph" } : member.kind === "field" ? { kind: "flowBinding", type: memberType2 } : { kind: "flowMember", type: memberType2 } : {
       kind: "member",
+      ownerName,
       type: memberType2,
       memberKind: member.kind,
       reference: member.type.name === "Reference"
@@ -45854,6 +45856,7 @@ function validateAnnotations(uri, annotations, context, environment, diagnostics
           argument2.text,
           argument2.range,
           context.type,
+          context.kind === "member" ? context.ownerName : void 0,
           environment,
           diagnostics
         );
@@ -45871,7 +45874,7 @@ function validateAnnotations(uri, annotations, context, environment, diagnostics
     }
   }
 }
-function validateLookupCollectionType(uri, collection, range2, declared, environment, diagnostics) {
+function validateLookupCollectionType(uri, collection, range2, declared, ownerName, environment, diagnostics) {
   const path = collection.trim().split(".");
   const [owner, name] = path;
   if (path.length !== 2 || owner === void 0 || name === void 0) return;
@@ -45885,15 +45888,45 @@ function validateLookupCollectionType(uri, collection, range2, declared, environ
   const entry = entryIndex === null ? void 0 : collectionType.arguments?.[entryIndex];
   const target = declared.name === "List" || declared.name === "Set" ? declared.arguments?.[0] : declared;
   if (!entry || !target) return;
-  const classes = environment.types.has(target.name) && environment.types.has(entry.name);
-  const [actual, expected] = classes ? [target, entry] : [entry, target];
-  if (constructionTypesAssignable(
-    { ...actual, nullable: false },
-    { ...expected, nullable: false },
-    environment.globals,
-    environment
-  ))
-    return;
+  const key = `lookup:${ownerName ?? ""}:${describeType(target)}>${describeType(entry)}`;
+  let assignable = environment.assignability.get(key);
+  if (assignable === void 0) {
+    const declaringClass2 = ownerName === void 0 ? void 0 : environment.projectIndex.typeByName.get(ownerName);
+    const context = {
+      project: environment.project,
+      kind: "initializerExpression",
+      ...declaringClass2 ? {
+        declaringType: {
+          kind: "named",
+          typeId: declaringClass2.id
+        }
+      } : {}
+    };
+    const resolve7 = (type) => resolveNeoScriptType(
+      semanticAst({ ...type, nullable: false }, { line: 1, column: 1 }),
+      context,
+      environment.projectIndex
+    );
+    const isClass = (type) => {
+      const bound = neoScriptMemberLookupType(type);
+      return bound.kind === "named" && environment.projectIndex.typeById.get(bound.typeId)?.kind === "class";
+    };
+    try {
+      const targetType = resolve7(target);
+      const entryType = resolve7(entry);
+      const classes = isClass(targetType) && isClass(entryType);
+      assignable = isNeoScriptTypeAssignable(
+        classes ? targetType : entryType,
+        classes ? entryType : targetType,
+        environment.projectIndex
+      );
+      environment.assignability.set(key, assignable);
+    } catch (error) {
+      if (!(error instanceof CompileError)) throw error;
+      return;
+    }
+  }
+  if (assignable) return;
   pushDiagnostic(
     diagnostics,
     uri,
@@ -55922,7 +55955,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.82.0",
+      cliVersion: "0.82.2",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -121069,6 +121102,7 @@ function* prepareServerOwnedSchemaCommitPasses(args) {
   );
   const pendingConstructedGraphValidations = materializeAuthoredValueSeeds({
     document: seedPostDocument,
+    previousMembers: args.document.members,
     prepared,
     authoredValueSeeds: args.authoredValueSeeds ?? [],
     contentHashHeads: args.contentHashHeads,
@@ -121996,6 +122030,11 @@ function materializeAuthoredValueSeeds(args) {
   if (seedByMemberId.size !== args.authoredValueSeeds.length) {
     throw new Error("Schema commit contains duplicate member value seeds.");
   }
+  const previousSeedMembers = /* @__PURE__ */ new Map();
+  for (const member of args.previousMembers) {
+    if (seedByMemberId.has(member.id))
+      previousSeedMembers.set(member.id, member);
+  }
   const evaluationDocument = withProspectiveAuthoredSeedValues(
     args.document,
     args.authoredValueSeeds
@@ -122014,6 +122053,7 @@ function materializeAuthoredValueSeeds(args) {
       consumedSeedMemberIds.add(member.id);
       materializeInstanceDefaultSeed({
         document: evaluationDocument,
+        previousMember: previousSeedMembers.get(member.id),
         documentIndex,
         prepared: args.prepared,
         pendingGraphValidations,
@@ -122168,6 +122208,7 @@ function materializeAuthoredValueSeeds(args) {
     if (member !== void 0 && isStaticMember(member) !== true && !isProjectRootMember(args.document.project, member.id)) {
       materializeInstanceDefaultSeed({
         document: evaluationDocument,
+        previousMember: previousSeedMembers.get(member.id),
         documentIndex,
         prepared: args.prepared,
         pendingGraphValidations,
@@ -122502,19 +122543,42 @@ function materializeInstanceDefaultSeed(args) {
     ...args.member,
     defaultValue: seedValueContent(args.seed)
   };
+  const heldChildren = args.documentIndex.heldChildIdsByParentId;
+  const previousHeld = heldChildren.get(args.seed.valueId);
+  const declarationDefault = !isProjectRootMember(
+    args.document.project,
+    args.member.id
+  );
+  if (declarationDefault) {
+    heldChildren.set(
+      args.seed.valueId,
+      storedChildIds(
+        args.previousMember && !isStaticMember(args.previousMember) ? args.previousMember.defaultValue?.value : void 0
+      )
+    );
+  }
+  let materialized;
+  try {
+    materialized = materializeAuthoredStaticSeed({
+      document: args.document,
+      documentIndex: args.documentIndex,
+      member: materializationMember,
+      seed: { ...args.seed, values: args.seed.values },
+      allowExistingRows: args.memberChange === null || args.memberChange.change.operation === "update"
+    });
+  } finally {
+    if (declarationDefault) {
+      if (previousHeld === void 0) heldChildren.delete(args.seed.valueId);
+      else heldChildren.set(args.seed.valueId, previousHeld);
+    }
+  }
   const {
     createdValues,
     localizedTexts,
     storageKeyDeclarations,
     rootValue,
     existingValueIds
-  } = materializeAuthoredStaticSeed({
-    document: args.document,
-    documentIndex: args.documentIndex,
-    member: materializationMember,
-    seed: { ...args.seed, values: args.seed.values },
-    allowExistingRows: args.memberChange === null || args.memberChange.change.operation === "update"
-  });
+  } = materialized;
   stampCreatedValuesMapKey(createdValues, null);
   applyDeclaredStorageKeyOverrides({
     createdValues,
@@ -137443,18 +137507,32 @@ function lowerRowBackedDefault(context, member, backed, baseData3, binding) {
         environment
       ))
         continue;
-      body[assignment.name] = lowerSeedChild(
+      const rows = /* @__PURE__ */ new Map();
+      const localizedTexts = /* @__PURE__ */ new Map();
+      const childId = lowerSeedChild(
         context,
         childValueMember,
         assignment.value,
         binding,
         `${binding.label}.${assignment.name}`,
-        /* @__PURE__ */ new Map(),
-        /* @__PURE__ */ new Map(),
+        rows,
+        localizedTexts,
         void 0,
         environment,
         childSlice
       );
+      if (member.partial !== true && !(assignment.value.kind === "ident" && context.localValues.has(assignment.value.name)) && freshChildReplaysDeclaredDefault({
+        context,
+        childMember,
+        childId,
+        rows,
+        localizedTexts,
+        environment
+      })) {
+        deleteSeedRow(context, rows, childId);
+        continue;
+      }
+      body[assignment.name] = childId;
     }
     return {
       value: body,
@@ -152354,7 +152432,8 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
           }
         }
       } catch (error) {
-        parseErrors.push(diagnostic(error));
+        if (!parseErrors.some(isBlockingSchemaSourceError))
+          parseErrors.push(diagnostic(error));
       }
       invalidSchema = parseErrors.some(isBlockingSchemaSourceError);
     }
@@ -152383,6 +152462,8 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
     );
     return refusedStatus(conflictedFiles, parseErrors, parseWarnings);
   }
+  if (schemaDocuments === void 0 && invalidSchema)
+    return refusedStatus(conflictedFiles, parseErrors, parseWarnings);
   const sourceByKey = manifestRecordSources(manifest);
   const documents = schemaDocuments ?? projectSchemaManifestToDocuments(manifest, documentContext);
   const documentsByKey = new Map(
@@ -205722,7 +205803,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.82.0");
+    console.log("0.82.2");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {

package/dist/test-worker.mjs

@@ -61885,7 +61885,7 @@ var INITIALIZER_KEY_PLACEHOLDER = new RegExp(
 
 // ../packages/manifest/schema-contract/registry.mjs
 var PROJECT_SCHEMA_CONTRACT = Object.freeze({
-  cliVersion: "0.82.0",
+  cliVersion: "0.82.2",
   projectFileUploadBatchSize: 32,
   documentRecords: {
     member: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.82.0",
+  "version": "0.82.2",
   "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.82.0 -->
+<!-- reviewed-through-cli: 0.82.2 -->
 
 # Neo Compose CLI
 

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

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

package/skills/neocompose-cli/references/values-identities-and-references.md

@@ -196,6 +196,12 @@ not clone it or turn it into a separate wrapper object. An optional generic
 argument checks the target type. Lookup assignment still requires an existing
 backing row and enforces its declared target and collection constraints.
 
+A class-constrained generic lookup may select from a collection of its bound
+class. For example, `Reference<TAsset>` with `TAsset extends HeldItemAsset`
+may use `@settings(collection: CosmeticAssets.HeldItems)` when that collection
+holds `HeldItemAsset`. Derived classes may specialize the target and override
+the member; retain the collection setting on each override.
+
 Use the `Reference` intrinsic. Prefer the most readable form the target
 supports:
 
@@ -259,6 +265,10 @@ that instance. Leaving the emitted construction unchanged creates no redundant
 value rows. A nullable member with no default remains bare; an explicit null
 default emits `= null`.
 
+Spelling an unchanged child default, such as `FPS = 8`, stays a no-op after
+push even when sibling fields own stored rows. Adding a different child default
+preserves those siblings' row identities; it does not transfer their ownership.
+
 Omitted members are virtual projections of the instance's recorded constructor
 or variant. Later edits to that source update every omitted member. Writing a
 member creates a sparse override with its deterministic projected ID; removing