@neocompose/cli 0.31.11 → 0.31.13

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.31.13] - 2026-08-18
+
+### Fixed
+
+- Encode native and NeoScript function overrides with sparse inherited
+  signatures, preventing validation from rejecting callable overrides.
+
+## [0.31.12] - 2026-08-17
+
+### Fixed
+
+- Re-emit stored variant member selections through canonical
+  `<Class>.Variants...` paths, including variants nested in class and list
+  rows, instead of failing with an unsupported numeric value kind.
+
 ## [0.31.11] - 2026-08-17
 
 ### Fixed

package/dist/neo.mjs

@@ -35383,9 +35383,11 @@ function memberToDocumentFields(member, baseData3) {
     fields.templateId = member.templateId;
   }
   if (member.kind === "function" || member.kind === "scriptFunction") {
-    fields.returnTypeInfo = manifestReturnTypeToDocument(member.returnType);
-    fields.argumentTypes = member.arguments.map(manifestArgumentToDocument);
-    fields.deferred = member.deferred;
+    if (member.overrideOf === null) {
+      fields.returnTypeInfo = manifestReturnTypeToDocument(member.returnType);
+      fields.argumentTypes = member.arguments.map(manifestArgumentToDocument);
+      fields.deferred = member.deferred;
+    }
     if (member.kind === "scriptFunction" && member.script !== null && member.bodyMode !== "ui") {
       fields.code = member.script.sourceText;
     }
@@ -49634,6 +49636,93 @@ var init_structured_leaf_source = __esm({
   }
 });
 
+// src/project-source/variant-selection-source.ts
+function isObject2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function buildVariantPathsByIdV4(manifest) {
+  const variants = manifest.variants ?? [];
+  if (variants.length === 0) return /* @__PURE__ */ new Map();
+  const classNames = new Map(
+    manifest.classes.map((entry) => [entry.id, entry.name])
+  );
+  const folderPaths = new Map(
+    (manifest.variantFolders ?? []).map(
+      (entry) => [entry.id, entry.path]
+    )
+  );
+  const paths = /* @__PURE__ */ new Map();
+  for (const variant of variants) {
+    const className = classNames.get(variant.classId);
+    if (className === void 0) continue;
+    paths.set(
+      variant.id,
+      neoVariantDottedPath({
+        className,
+        folderPath: variant.folderId === null ? "" : folderPaths.get(variant.folderId) ?? "",
+        variantName: variant.name
+      })
+    );
+  }
+  return paths;
+}
+function renderVariantSelectionV4(context, memberName, value) {
+  if (value === null) return "null";
+  if (!isObject2(value)) {
+    throw new Error(
+      `Variant member ${memberName} stores ${JSON.stringify(value)}, which is not a { classId, variantId } selection.`
+    );
+  }
+  const variantId = value.variantId;
+  if (variantId === null) {
+    const classId = value.classId;
+    if (typeof classId !== "string") {
+      throw new Error(
+        `Variant member ${memberName} selects the base entry without naming a class.`
+      );
+    }
+    const className = context.classes.get(classId)?.name;
+    if (className === void 0) {
+      throw new Error(
+        `Variant member ${memberName} selects class ${JSON.stringify(classId)}, which this project does not declare.`
+      );
+    }
+    return neoVariantDottedPath({
+      className,
+      folderPath: "",
+      variantName: null
+    });
+  }
+  if (typeof variantId !== "string") {
+    throw new Error(
+      `Variant member ${memberName} stores a variant id that is neither a string nor null.`
+    );
+  }
+  const path = context.variantPathsById.get(variantId);
+  if (path === void 0) {
+    throw new Error(
+      `Variant member ${memberName} selects variant ${JSON.stringify(variantId)}, which this project does not declare.`
+    );
+  }
+  const rowValueId = value.rowValueId;
+  if (rowValueId === null || rowValueId === void 0) return path;
+  if (typeof rowValueId !== "string") {
+    throw new Error(
+      `Variant member ${memberName} stores a malformed rowValueId.`
+    );
+  }
+  const rootPath = context.collectionValuePaths.get(rowValueId);
+  const reference2 = rootPath === void 0 ? `Reference(id: ${quoteNeoString(rowValueId)})` : `Reference(${rootPath})`;
+  return `${path}.Bind(${reference2})`;
+}
+var init_variant_selection_source = __esm({
+  "src/project-source/variant-selection-source.ts"() {
+    "use strict";
+    init_src();
+    init_source_format();
+  }
+});
+
 // src/project-source/emitter.ts
 function emitProjectSourcesV4(manifest, options = {}) {
   const context = {
@@ -49649,7 +49738,7 @@ function emitProjectSourcesV4(manifest, options = {}) {
     defaultInitializers: options.defaultInitializers ?? /* @__PURE__ */ new Map(),
     fileSymbols: options.fileSymbols ?? /* @__PURE__ */ new Map(),
     collectionValuePaths: options.collectionValuePaths ?? /* @__PURE__ */ new Map(),
-    variantPathsById: buildVariantPathsById(manifest),
+    variantPathsById: buildVariantPathsByIdV4(manifest),
     templateNames: new Map(
       [...manifest.textureTemplates, ...manifest.audioTemplates].map(
         (template) => [template.id, template.name]
@@ -50525,7 +50614,7 @@ function renderDefault(context, member) {
   return renderDefaultValue(context, member, value);
 }
 function renderActionListeners(context, member, value) {
-  if (!isObject2(value)) {
+  if (!isObject3(value)) {
     throw new Error(
       `NeoAction member ${member.name} stores a default that is not a listener set.`
     );
@@ -50537,7 +50626,7 @@ function renderActionListeners(context, member, value) {
     );
   }
   const names = listeners.map((listener, index) => {
-    if (!isObject2(listener)) {
+    if (!isObject3(listener)) {
       throw new Error(
         `NeoAction member ${member.name} listener ${index} is not a member target.`
       );
@@ -50598,7 +50687,7 @@ function renderDefaultValue(context, member, wrapper) {
     const entry = required(context.members, member.entryMemberId, "list entry");
     return `[${value.map((item) => renderNestedValue(context, entry, item)).join(", ")}]`;
   }
-  if (member.kind === "dictionary" && isObject2(value)) {
+  if (member.kind === "dictionary" && isObject3(value)) {
     const entry = required(
       context.members,
       member.entryMemberId,
@@ -50608,7 +50697,7 @@ function renderDefaultValue(context, member, wrapper) {
       ([key, item]) => `${quote(key)}: ${renderNestedValue(context, entry, item)}`
     ).join(", ")} }`;
   }
-  if (member.kind === "class" && isObject2(value)) {
+  if (member.kind === "class" && isObject3(value)) {
     const target = required(context.classes, member.classId, "class");
     const assignments = Object.entries(value).map(([key, item]) => {
       const childId = target.schema[key];
@@ -50625,9 +50714,9 @@ function renderDefaultValue(context, member, wrapper) {
     return renderActionListeners(context, member, value);
   }
   if (member.kind === "variant") {
-    return renderVariantSelection(context, member, value);
+    return renderVariantSelectionV4(context, member.name, value);
   }
-  if (member.kind === "functionRef" && isObject2(value) && typeof value.functionMemberId === "string") {
+  if (member.kind === "functionRef" && isObject3(value) && typeof value.functionMemberId === "string") {
     return required(
       context.members,
       value.functionMemberId,
@@ -50663,7 +50752,7 @@ function renderDefaultValue(context, member, wrapper) {
     return `new { ${assignments.join(", ")} }`;
   }
   if (member.kind === "sprite" || member.kind === "audio") {
-    if (!isObject2(value)) return jsonValue2(value);
+    if (!isObject3(value)) return jsonValue2(value);
     if (typeof value.fileId !== "string") {
       throw new Error(
         `${member.kind === "sprite" ? "Sprite" : "Audio"} member ${JSON.stringify(member.name)} default stores a file value with no fileId. Emitting it as null would delete the default on the next push.`
@@ -50682,7 +50771,7 @@ function renderDefaultValue(context, member, wrapper) {
     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 (leafKind !== null && isObject2(value)) {
+  if (leafKind !== null && isObject3(value)) {
     return `new(${structuredLeafFieldKeys(leafKind).map((key) => jsonValue2(value[key])).join(", ")})`;
   }
   return jsonValue2(value);
@@ -50977,7 +51066,7 @@ function jsonValue2(value) {
   if (typeof value === "boolean") return String(value);
   if (value === null || value === void 0) return "null";
   if (Array.isArray(value)) return `[${value.map(jsonValue2).join(", ")}]`;
-  if (isObject2(value))
+  if (isObject3(value))
     return `{ ${Object.entries(value).map(([key, entry]) => `${quote(key)}: ${jsonValue2(entry)}`).join(", ")} }`;
   throw new Error(`Cannot emit Neo value ${String(value)}.`);
 }
@@ -51182,81 +51271,9 @@ function required(map, key, kind) {
   if (!value) throw new Error(`Unknown ${kind} ${quote(key)}.`);
   return value;
 }
-function isObject2(value) {
+function isObject3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function buildVariantPathsById(manifest) {
-  if (manifest.variants.length === 0) return /* @__PURE__ */ new Map();
-  const classNames = new Map(
-    manifest.classes.map((entry) => [entry.id, entry.name])
-  );
-  const folderPaths = new Map(
-    manifest.variantFolders.map((entry) => [entry.id, entry.path])
-  );
-  const paths = /* @__PURE__ */ new Map();
-  for (const variant of manifest.variants) {
-    const className = classNames.get(variant.classId);
-    if (className === void 0) continue;
-    paths.set(
-      variant.id,
-      neoVariantDottedPath({
-        className,
-        folderPath: variant.folderId === null ? "" : folderPaths.get(variant.folderId) ?? "",
-        variantName: variant.name
-      })
-    );
-  }
-  return paths;
-}
-function renderVariantSelection(context, member, value) {
-  if (value === null) return "null";
-  if (!isObject2(value)) {
-    throw new Error(
-      `Variant member ${member.name} stores ${JSON.stringify(value)}, which is not a { classId, variantId } selection.`
-    );
-  }
-  const variantId = value.variantId;
-  if (variantId === null) {
-    const classId = value.classId;
-    if (typeof classId !== "string") {
-      throw new Error(
-        `Variant member ${member.name} selects the base entry without naming a class.`
-      );
-    }
-    const className = context.classes.get(classId)?.name;
-    if (className === void 0) {
-      throw new Error(
-        `Variant member ${member.name} selects class ${JSON.stringify(classId)}, which this project does not declare.`
-      );
-    }
-    return neoVariantDottedPath({
-      className,
-      folderPath: "",
-      variantName: null
-    });
-  }
-  if (typeof variantId !== "string") {
-    throw new Error(
-      `Variant member ${member.name} stores a variant id that is neither a string nor null.`
-    );
-  }
-  const path = context.variantPathsById.get(variantId);
-  if (path === void 0) {
-    throw new Error(
-      `Variant member ${member.name} selects variant ${JSON.stringify(variantId)}, which this project does not declare.`
-    );
-  }
-  const rowValueId = value.rowValueId;
-  if (rowValueId === null || rowValueId === void 0) return path;
-  if (typeof rowValueId !== "string") {
-    throw new Error(
-      `Variant member ${member.name} stores a malformed rowValueId.`
-    );
-  }
-  const rootPath = context.collectionValuePaths.get(rowValueId);
-  const reference2 = rootPath === void 0 ? `Reference(id: ${quote(rowValueId)})` : `Reference(${rootPath})`;
-  return `${path}.Bind(${reference2})`;
-}
 var SPECIALIZED_RELATION_PROPERTIES;
 var init_emitter = __esm({
   "src/project-source/emitter.ts"() {
@@ -51267,6 +51284,7 @@ var init_emitter = __esm({
     init_class_generics();
     init_members();
     init_structured_leaf_source();
+    init_variant_selection_source();
     SPECIALIZED_RELATION_PROPERTIES = /* @__PURE__ */ new Map([
       ["world.grid.tile-import", { property: "tileImports", collection: true }],
       ["world.grid.object-import", { property: "objectImports", collection: true }],
@@ -73235,7 +73253,7 @@ async function fetchProjectDocumentPartitionRecords(runner, mapKey) {
   });
 }
 function readProjectDocumentManifestPage(value) {
-  if (!isObject3(value)) {
+  if (!isObject4(value)) {
     throw new Error("Convex project document manifest page must be an object.");
   }
   const continueCursor = value.continueCursor;
@@ -73245,7 +73263,7 @@ function readProjectDocumentManifestPage(value) {
     );
   }
   const metadata = value.metadata ?? null;
-  if (metadata !== null && !isObject3(metadata)) {
+  if (metadata !== null && !isObject4(metadata)) {
     throw new Error(
       "Convex project document manifest page metadata must be an object or null."
     );
@@ -73270,7 +73288,7 @@ function readProjectDocumentManifestRecords(value) {
     );
   }
   return value.map((record3, index) => {
-    if (!isObject3(record3)) {
+    if (!isObject4(record3)) {
       throw new Error(
         `Convex project document manifest record at index ${index} was not an object.`
       );
@@ -73304,7 +73322,7 @@ function readProjectDocumentManifestRecords(value) {
   });
 }
 function readProjectDocumentManifestPageRecords(value) {
-  if (!isObject3(value)) {
+  if (!isObject4(value)) {
     throw new Error("Convex project document manifest page must be an object.");
   }
   return readProjectDocumentManifestRecords(value.records);
@@ -73342,7 +73360,7 @@ async function fetchProjectDocumentSnapshots(fetchBatch, snapshotIds) {
   return snapshotsById;
 }
 function readProjectDocumentSnapshotBatch(value, requestedIds) {
-  if (!isObject3(value)) {
+  if (!isObject4(value)) {
     throw new Error("Convex project record snapshot batch must be an object.");
   }
   const snapshots = value.snapshots;
@@ -73362,7 +73380,7 @@ function readProjectDocumentSnapshotBatch(value, requestedIds) {
     );
   }
   return snapshots.map((snapshot, index) => {
-    if (!isObject3(snapshot)) {
+    if (!isObject4(snapshot)) {
       throw new Error(
         `Convex project record snapshot at index ${index} was not an object.`
       );
@@ -73544,7 +73562,7 @@ function appendBucketRecord(buckets, recordKind, data) {
   buckets[bucket].push(data);
 }
 function readProjectDocument(value, options = {}) {
-  if (!isObject3(value)) {
+  if (!isObject4(value)) {
     throw new Error("Convex project document query returned a non-object.");
   }
   const localizationConfig = options.localizationConfig === "nullable" ? readOptionalNullableField(
@@ -73634,7 +73652,7 @@ function readProjectDocument(value, options = {}) {
   };
 }
 function readProjectDocumentRevisionMarker(value) {
-  if (!isObject3(value)) return null;
+  if (!isObject4(value)) return null;
   if (!("documentRevision" in value)) return null;
   const marker = value.documentRevision;
   if (isProjectDocumentRevisionMarker(marker)) return marker;
@@ -73643,7 +73661,7 @@ function readProjectDocumentRevisionMarker(value) {
   );
 }
 function readProjectDocumentContentHashHeads(value) {
-  if (!isObject3(value)) {
+  if (!isObject4(value)) {
     throw new Error(
       "Convex project document content hash source must be an object."
     );
@@ -73651,7 +73669,7 @@ function readProjectDocumentContentHashHeads(value) {
   return readArrayField(value, "projectDocumentContentHashHeads", isHashHead);
 }
 function isHashHead(value) {
-  if (!isObject3(value)) return false;
+  if (!isObject4(value)) return false;
   if (!isProjectRecordKind(value.recordKind)) return false;
   if (typeof value.recordId !== "string") return false;
   if (typeof value.deleted !== "boolean") return false;
@@ -73687,12 +73705,12 @@ function readOptionalArrayField(source, key, isValid) {
   if (!Object.prototype.hasOwnProperty.call(source, key)) return [];
   return readArrayField(source, key, isValid);
 }
-function isObject3(value) {
+function isObject4(value) {
   if (typeof value !== "object") return false;
   return value !== null;
 }
 function describeInvalidReadItem(value) {
-  if (!isObject3(value)) {
+  if (!isObject4(value)) {
     return `received ${typeof value}`;
   }
   const parts = [];
@@ -93439,6 +93457,9 @@ function replayAnimationDeclarationInitializersV4(records2, document, fallbackDo
     rootOwners,
     rootKinds
   );
+  const resolvedMembers = new Map(
+    document.members.map((member) => [member.id, member])
+  );
   const pulled = /* @__PURE__ */ new Map();
   for (const record3 of records2) {
     const recordId = record3.data.id;
@@ -93448,7 +93469,10 @@ function replayAnimationDeclarationInitializersV4(records2, document, fallbackDo
       recordId,
       contentHash: "prospective-animation-validation",
       deleted: false,
-      data: record3.data
+      // Initializer replay consumes the runtime document shape too. Reuse the
+      // transiently hydrated member instead of feeding sparse callable
+      // overrides back through the strict full-record reader.
+      data: record3.recordKind === "member" ? resolvedMembers.get(recordId) ?? record3.data : record3.data
     });
   }
   const replayDocument = readPulledProjectDocumentV4(pulled);
@@ -93566,6 +93590,11 @@ function prospectiveAnimationDocumentV4(records2) {
     (record3) => record3.recordKind === "class" && (Array.isArray(record3.data.constructorProjections) || declaresAnimationWorldKind(record3.data.system))
   );
   if (!hasAnimationSchema) return null;
+  const memberRecords = new Map(
+    candidates.flatMap(
+      (record3) => record3.recordKind === "member" && typeof record3.data.id === "string" ? [[record3.data.id, record3.data]] : []
+    )
+  );
   let project;
   const classes = [];
   const members = [];
@@ -93586,12 +93615,16 @@ function prospectiveAnimationDocumentV4(records2) {
       }
       classes.push(record3.data);
     } else if (record3.recordKind === "member") {
-      if (!isMember(record3.data)) {
+      const member = hydrateProspectiveCallableOverride(
+        record3.data,
+        memberRecords
+      );
+      if (!isMember(member)) {
         throw new Error(
           `Prospective animation validation received an invalid member record ${recordLabel(record3.data)}.`
         );
       }
-      members.push(record3.data);
+      members.push(member);
     } else if (record3.recordKind === "value") {
       if (!isMemberValue(record3.data)) {
         throw new Error(
@@ -93625,6 +93658,34 @@ function prospectiveAnimationDocumentV4(records2) {
   });
   return { project, classes, members, values: validationValues };
 }
+function hydrateProspectiveCallableOverride(data, members) {
+  if (data.kind !== 13 /* Function */ && data.kind !== 23 /* NSFunction */ || typeof data.extendsMemberId !== "string") {
+    return data;
+  }
+  const hydrated = { ...data };
+  for (const field of [
+    "returnTypeInfo",
+    "argumentTypes",
+    "deferred"
+  ]) {
+    if (Object.hasOwn(hydrated, field)) continue;
+    const inherited = resolveProspectiveMemberField(data, field, members);
+    if (inherited !== void 0) hydrated[field] = inherited;
+  }
+  return hydrated;
+}
+function resolveProspectiveMemberField(start, field, members) {
+  let current = start;
+  const visited = /* @__PURE__ */ new Set();
+  while (current !== void 0) {
+    if (Object.hasOwn(current, field)) return current[field];
+    const parentId = current.extendsMemberId;
+    if (typeof parentId !== "string" || visited.has(parentId)) return void 0;
+    visited.add(parentId);
+    current = members.get(parentId);
+  }
+  return void 0;
+}
 function declaresAnimationWorldKind(system) {
   if (!isObjectRecord2(system)) return false;
   const worldKind = system.worldKind;
@@ -95207,6 +95268,7 @@ function buildValueEmitContext(records2, manifest) {
     mainLocale: projectMainLocale(records2),
     symbolsByValueId,
     rootPathsByValueId: rootValuePathsByValueId(records2.values()),
+    variantPathsById: buildVariantPathsByIdV4(manifest),
     symbolsByDialogueId: new Map(
       [...dialogues].flatMap(
         ([id2, dialogue]) => typeof dialogue.sourceName === "string" ? [[id2, dialogue.sourceName]] : []
@@ -100098,6 +100160,17 @@ function emitValueBody(context, member, value, visited, targetTyped, environment
   if (kind === 24) return functionReferenceValue(context, body);
   if (kind === 25) return delegateValue(context, body);
   if (kind === 26) return actionValue(context, body);
+  if (kind === 27 /* Variant */) {
+    return renderVariantSelectionV4(
+      {
+        classes: context.manifestClasses,
+        variantPathsById: context.variantPathsById,
+        collectionValuePaths: context.rootPathsByValueId
+      },
+      String(member.name ?? member.id),
+      body
+    );
+  }
   if (kind === 12) {
     return fileValue(
       context,
@@ -100120,8 +100193,9 @@ function emitValueBody(context, member, value, visited, targetTyped, environment
       targetTyped,
       environment
     );
+  const kindName = MemberKind[kind];
   throw new Error(
-    `Stored member ${String(member.name ?? member.id)} has unsupported value kind ${kind}.`
+    typeof kindName === "string" ? `Stored member ${String(member.name ?? member.id)} uses unsupported ${kindName} value kind (${kind}).` : `Stored member ${String(member.name ?? member.id)} has unknown value kind ${kind}.`
   );
 }
 function classValue(context, member, value, visited, targetTyped, outerEnvironment) {
@@ -101690,6 +101764,7 @@ var init_value_sources = __esm({
     init_structured_leaf_source();
     init_member_kind_type_names();
     init_initializer_replay();
+    init_variant_selection_source();
     INFERRED_GENERIC_CLASS_PREFIX = "__inferred_class__:";
     MEMBER_KIND_DICTIONARY2 = 5;
     MEMBER_KIND_LIST2 = 6;
@@ -111519,7 +111594,7 @@ var init_registry2 = __esm({
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
       formatVersion: 3,
       contractVersion: "3.13",
-      cliVersion: "0.31.11",
+      cliVersion: "0.31.13",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -118114,7 +118189,7 @@ There is no --keep-current: preserving current semantic state defines flatten.
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.31.11");
+    console.log("0.31.13");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {

package/package.json

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

package/skills/neocompose-cli/SKILL.md

@@ -9,7 +9,7 @@ description: >-
   `@neocompose/cli` or `node cli/bin/neo.mjs` in the neo-compose repository.
 ---
 
-<!-- reviewed-through-cli: 0.31.11 -->
+<!-- reviewed-through-cli: 0.31.13 -->
 
 # Neo Compose CLI
 

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

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

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

@@ -56,6 +56,17 @@ or narrowing guard before the next access.
 
 Treat lookup-return values with the same nullable narrowing rules.
 
+A declaration pattern introduced by `is` stays available after a guard when
+every path that falls through matched the pattern, including when the guard's
+other paths return from a nested block:
+
+```neo
+if (!(item is BedItem bedItem)) {
+  throw "Expected a bed item";
+}
+return bedItem.Name;
+```
+
 Use `SpriteInfo.Empty` when a required sprite should intentionally render no
 image. It is the canonical non-null empty sprite: it has no backing file and
 uses slice index zero.