@neocompose/cli 0.76.3 → 0.77.0

package/dist/test-worker.mjs

@@ -4587,7 +4587,10 @@ function isMemberEnum(value) {
   if (!isWithId(value)) return false;
   return isWithId(value);
 }
-function isMemberLookupBase(value) {
+function isLookupSelection(selection) {
+  return selection === void 0 || selection === 0 /* Single */ || selection === 1 /* Multi */;
+}
+function isMemberCollectionLookupBase(value) {
   const v = asMemberBaseForKind(value, 9 /* Lookup */);
   if (v === null) return false;
   if (typeof v.collectionMemberId !== "string") return false;
@@ -4598,7 +4601,22 @@ function isMemberLookupBase(value) {
   if (v.declaredTypeInfo !== void 0 && v.declaredTypeInfo !== null && !isNSTypeInfo(v.declaredTypeInfo)) {
     return false;
   }
-  return v.selection === void 0 || v.selection === 0 /* Single */ || v.selection === 1 /* Multi */;
+  return isLookupSelection(v.selection);
+}
+function isMemberTypeLookupBase(value) {
+  const v = asMemberBaseForKind(value, 9 /* Lookup */);
+  if (v === null) return false;
+  if (v.collectionMemberId !== void 0) return false;
+  if (v.collectionValueId !== void 0) return false;
+  if (!isLookupTargetTypeInfo(v.declaredTypeInfo)) return false;
+  return isLookupSelection(v.selection);
+}
+function isLookupTargetTypeInfo(value) {
+  if (!isNSTypeInfo(value)) return false;
+  return value.type === 7 /* Class */ || value.type === 21 /* Generic */;
+}
+function isMemberLookupBase(value) {
+  return isMemberCollectionLookupBase(value) || isMemberTypeLookupBase(value);
 }
 function isMemberLookup(value) {
   if (!isMemberLookupBase(value)) return false;
@@ -18677,7 +18695,11 @@ function evalInstructions(instructions, scope, ctx, options) {
           }
           let targetTypeInfo = ins.target.typeInfo;
           if (lookupAssignment && targetTypeInfo.type !== 9 /* Lookup */ && targetTypeInfo.type !== 18 /* DialogueLookup */) {
-            targetTypeInfo = {
+            targetTypeInfo = member.collectionMemberId === void 0 ? {
+              type: 9 /* Lookup */,
+              required: targetTypeInfo.required,
+              entryTypeInfo: targetTypeInfo
+            } : {
               type: 9 /* Lookup */,
               required: targetTypeInfo.required,
               entryTypeInfo: targetTypeInfo,
@@ -21362,6 +21384,13 @@ function runtimeTypeInfoForMember(rawMember, env, ctx, seen) {
     };
   }
   if (isMemberLookup(member)) {
+    if (member.collectionMemberId === void 0) {
+      const entryTypeInfo2 = {
+        ...substituteRuntimeTypeInfo(member.declaredTypeInfo, env, ctx),
+        required: isMultiSelectionMember(member) ? true : false
+      };
+      return isMultiSelectionMember(member) ? { type: 9 /* Lookup */, required, entryTypeInfo: entryTypeInfo2 } : entryTypeInfo2;
+    }
     const collection = evalMemberById(ctx.vm, member.collectionMemberId);
     if (collection === null) {
       throw new NSGetterRuntimeError(
@@ -28225,17 +28254,21 @@ function projectListenerEndpoint(args) {
 
 // ../packages/models/src/members/lookup-declared-type.ts
 function lookupDeclaredTypeInfo(member, collectionTypeInfo) {
-  if (collectionTypeInfo === null) return null;
-  if (collectionTypeInfo.type !== 6 /* List */ && collectionTypeInfo.type !== 5 /* Dictionary */) {
-    return null;
-  }
-  const entryTypeInfo = member.declaredTypeInfo ?? collectionTypeInfo.entryTypeInfo;
+  const entryTypeInfo = lookupEntryTypeInfo(member, collectionTypeInfo);
+  if (entryTypeInfo === null) return null;
   if (isMultiSelectionMember(member) !== true) {
     return {
       ...entryTypeInfo,
       required: isRequiredMember(member)
     };
   }
+  if (member.collectionMemberId === void 0) {
+    return {
+      type: 9 /* Lookup */,
+      required: isRequiredMember(member),
+      entryTypeInfo
+    };
+  }
   return {
     type: 9 /* Lookup */,
     required: isRequiredMember(member),
@@ -28244,6 +28277,15 @@ function lookupDeclaredTypeInfo(member, collectionTypeInfo) {
     collectionValueId: member.collectionValueId ?? null
   };
 }
+function lookupEntryTypeInfo(member, collectionTypeInfo) {
+  if (member.collectionMemberId === void 0) return member.declaredTypeInfo;
+  const collection = collectionTypeInfo(member.collectionMemberId);
+  if (collection === null) return null;
+  if (collection.type !== 6 /* List */ && collection.type !== 5 /* Dictionary */) {
+    return null;
+  }
+  return member.declaredTypeInfo ?? collection.entryTypeInfo;
+}
 
 // ../packages/neoscript-runtime/src/values/member-declared-type-info.ts
 function resolveMemberDeclaredTypeInfo(member, members, ownerClass = null) {
@@ -28351,19 +28393,18 @@ function resolveMemberDeclaredTypeInfoInternal(member, members, seen, ownerClass
     };
   }
   if (isMemberLookupBase(resolved)) {
-    const collection = members.find(
-      (candidate) => candidate.id === resolved.collectionMemberId
-    );
-    if (collection === void 0) return null;
-    return lookupDeclaredTypeInfo(
-      resolved,
-      resolveMemberDeclaredTypeInfoInternal(
+    return lookupDeclaredTypeInfo(resolved, (collectionMemberId) => {
+      const collection = members.find(
+        (candidate) => candidate.id === collectionMemberId
+      );
+      if (collection === void 0) return null;
+      return resolveMemberDeclaredTypeInfoInternal(
         collection,
         members,
         nextSeen,
         ownerClass
-      )
-    );
+      );
+    });
   }
   if (resolved.kind === 9 /* Lookup */) return null;
   if (!memberKindSupportsStorage(resolved.kind)) return null;
@@ -36073,7 +36114,7 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
             local,
             localType,
             "local" /* Local */,
-            initial.writability ?? "local" /* Local */,
+            localOwnership(initial),
             this.localWriteTargetRoot(initial, scope)
           )
         );
@@ -39326,6 +39367,7 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
         } : {}
       };
     }
+    const writability = member.writability ? toWritability(member.writability, this.writesUserData) : void 0;
     return {
       pointer: {
         type: "staticMember" /* StaticMember */,
@@ -39333,8 +39375,10 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
       },
       type: member.type,
       symbol: member,
-      ...member.writability ? {
-        writability: toWritability(member.writability, this.writesUserData)
+      ...writability ? { writability } : {},
+      ...member.lookup ? {
+        entryWritability: this.lookupEntryWritability(member, writability),
+        entryUserData: this.lookupEntryUserData(member)
       } : {}
     };
   }
@@ -39634,7 +39678,7 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
       const readonlySlot = member.readonlyDeclaration === true;
       const storageWritability = this.memberWritability(member, receiver);
       const writability = readonlySlot ? "readOnly" /* ReadOnly */ : storageWritability;
-      const entryWritability = member.lookup ? this.lookupEntryWritability(member, receiver) : readonlySlot ? storageWritability : void 0;
+      const entryWritability = member.lookup ? this.lookupEntryWritability(member, receiver.writability) : readonlySlot ? storageWritability : void 0;
       const userData = this.memberUserData(member, receiver);
       const entryUserData = member.lookup ? this.lookupEntryUserData(member) : readonlySlot && userData;
       const lookupWire = member.lookup?.multiselect === true && memberType2.kind === "set" ? {
@@ -39644,7 +39688,7 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
           { ...memberType2.elementType, nullable: false },
           this.project
         ),
-        collectionMemberId: member.lookup.collectionMemberId,
+        ...member.lookup.collectionMemberId !== void 0 ? { collectionMemberId: member.lookup.collectionMemberId } : {},
         ...member.lookup.collectionValueId !== void 0 ? { collectionValueId: member.lookup.collectionValueId } : {}
       } : void 0;
       return {
@@ -39768,16 +39812,18 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
   }
   lookupEntryUserData(member) {
     if (!member.lookup) return false;
-    const collectionWritability = member.lookup.collectionWritability ?? this.project.symbolById.get(member.lookup.collectionMemberId)?.writability;
+    const collectionMemberId = member.lookup.collectionMemberId;
+    if (collectionMemberId === void 0) return false;
+    const collectionWritability = member.lookup.collectionWritability ?? this.project.symbolById.get(collectionMemberId)?.writability;
     return collectionWritability === "user";
   }
-  lookupEntryWritability(member, receiver) {
+  lookupEntryWritability(member, receiverWritability) {
     if (!member.lookup) return "readOnly" /* ReadOnly */;
-    const target = this.project.symbolById.get(
-      member.lookup.collectionMemberId
-    );
+    const collectionMemberId = member.lookup.collectionMemberId;
+    if (collectionMemberId === void 0) return "runtime" /* Runtime */;
+    const target = this.project.symbolById.get(collectionMemberId);
     const targetWritability = member.lookup.collectionWritability ? toWritability(member.lookup.collectionWritability, this.writesUserData) : target?.writability ? toWritability(target.writability, this.writesUserData) : target?.writable ? "runtime" /* Runtime */ : "readOnly" /* ReadOnly */;
-    if (receiver.writability === "immutable" /* Immutable */) {
+    if (receiverWritability === "immutable" /* Immutable */) {
       if (targetWritability === "save" /* Save */) {
         return "immutableToSaveLookup" /* ImmutableToSaveLookup */;
       }
@@ -43974,6 +44020,12 @@ function bindConstructorArgumentNames(className, declared, argumentNames, pos) {
     return parameter3.name;
   });
 }
+function localOwnership(initial) {
+  if (initial.entryWritability !== void 0 && (initial.type.kind === "named" || initial.type.kind === "typeParameter")) {
+    return initial.entryWritability;
+  }
+  return initial.writability ?? "local" /* Local */;
+}
 function scopeVariable(name, value, sourceType, writability, ownership, writeRoot, readonlyBinding) {
   return {
     name,
@@ -46055,12 +46107,10 @@ function memberSymbol(member, schemaKey, environment, field) {
       environment
     );
   }
-  const lookupCollectionMemberId = kind === "lookup" ? string(member.collectionMemberId, `${field}.collectionMemberId`) : null;
-  const lookupCollectionWritability = lookupCollectionMemberId === null ? void 0 : environment.effectiveWritabilityByMemberId.get(
-    lookupCollectionMemberId
-  );
+  const lookupCollection = kind === "lookup" ? lookupCollectionMemberId(member, field) : null;
+  const lookupCollectionWritability = lookupCollection === null ? void 0 : environment.effectiveWritabilityByMemberId.get(lookupCollection);
   const lookup = kind === "lookup" ? {
-    collectionMemberId: lookupCollectionMemberId,
+    ...lookupCollection === null ? {} : { collectionMemberId: lookupCollection },
     ...member.collectionValueId === null || typeof member.collectionValueId === "string" ? { collectionValueId: member.collectionValueId } : {},
     multiselect: boolean(member.multiselect, `${field}.multiselect`),
     ...lookupCollectionWritability === void 0 ? {} : { collectionWritability: lookupCollectionWritability }
@@ -46074,6 +46124,10 @@ function memberSymbol(member, schemaKey, environment, field) {
     ...lookup ? { lookup } : {}
   };
 }
+function lookupCollectionMemberId(member, field) {
+  if (member.collectionMemberId === null) return null;
+  return string(member.collectionMemberId, `${field}.collectionMemberId`);
+}
 function interfaceType(value, environment, field) {
   const id = string(value.id, `${field}.id`);
   return {
@@ -46542,9 +46596,8 @@ function memberType(member, environment, visiting, field) {
     };
   }
   if (kind === "lookup") {
-    const collection = environment.members.get(
-      string(member.collectionMemberId, `${field}.collectionMemberId`)
-    );
+    const collectionMemberId = lookupCollectionMemberId(member, field);
+    const collection = collectionMemberId === null ? void 0 : environment.members.get(collectionMemberId);
     const collectionType = collection ? memberType(collection, environment, next, `${field}.collection`) : unknownType();
     const declared = optionalRecord(member.declaredType);
     const declaredType = declared ? manifestType(declared, environment, `${field}.declaredType`) : null;
@@ -48159,6 +48212,13 @@ function memberToSymbol(record4, schemaKey, containingClass, ownerClassId, index
     };
   }
   if (isMemberLookupBase(resolved)) {
+    if (resolved.collectionMemberId === void 0) {
+      return {
+        ...common,
+        kind: "property",
+        lookup: { multiselect: isMultiSelectionMember(resolved) }
+      };
+    }
     const collectionWritability = uniqueEffectiveWritability(
       resolved.collectionMemberId,
       context
@@ -48520,12 +48580,12 @@ function memberRuntimeType(record4, context, seen = /* @__PURE__ */ new Set(), g
       if (!isMemberLookupBase(member)) return UNKNOWN_TYPE;
       const declared = member.declaredTypeInfo ? toLanguageType(member.declaredTypeInfo, context, genericEnvironment) : null;
       const narrowed = declared && !isUnknownType3(declared) ? declared : null;
-      const entry = narrowed ?? lookupCollectionEntryType(
+      const entry = narrowed ?? (member.collectionMemberId === void 0 ? null : lookupCollectionEntryType(
         member.collectionMemberId,
         context,
         nextSeen,
         genericEnvironment
-      );
+      ));
       if (!entry) return UNKNOWN_TYPE;
       return isMultiSelectionMember(member) ? {
         kind: "set",
@@ -54156,12 +54216,23 @@ var schemaMemberSchema = variant("kind", [
     enumId: nonEmptyString,
     multiselect: boolean2()
   }),
-  memberSchema("lookup", {
-    collectionMemberId: nonEmptyString,
-    collectionValueId: nullableId,
-    multiselect: boolean2(),
-    declaredType: nullable(schemaTypeSchema)
-  }),
+  pipe(
+    memberSchema("lookup", {
+      /** `null` on an unbound `Reference<T>` (P107), typed by `declaredType`. */
+      collectionMemberId: nullable(nonEmptyString),
+      collectionValueId: nullableId,
+      multiselect: boolean2(),
+      declaredType: nullable(schemaTypeSchema)
+    }),
+    check(
+      (member) => member.collectionMemberId !== null || member.collectionValueId === null,
+      "A lookup collection value requires a collection member."
+    ),
+    check(
+      (member) => member.collectionMemberId !== null || member.declaredType?.kind === "class" || member.declaredType?.kind === "generic",
+      "A lookup without a collection needs a class or generic declared type."
+    )
+  ),
   memberSchema("dialogueLookup", {
     dialogueGroupId: nullableId,
     multiselect: boolean2()
@@ -54559,10 +54630,8 @@ function memberFromDocument(record4, members, owners, classNames, context) {
     return {
       ...common,
       kind: "lookup",
-      collectionMemberId: requiredStringValue(
-        field("collectionMemberId", void 0),
-        record4,
-        "collectionMemberId"
+      collectionMemberId: optionalStringOrNull(
+        field("collectionMemberId", null)
       ),
       collectionValueId: optionalStringOrNull(field("collectionValueId", null)),
       multiselect: ordinalValue(
@@ -54880,7 +54949,9 @@ function memberToDocumentFields(member, baseData) {
     }
   }
   if (member.kind === "lookup") {
-    fields.collectionMemberId = member.collectionMemberId;
+    if (member.collectionMemberId !== null) {
+      fields.collectionMemberId = member.collectionMemberId;
+    }
     if (member.collectionValueId !== null) {
       fields.collectionValueId = member.collectionValueId;
     }
@@ -56869,7 +56940,7 @@ var INITIALIZER_KEY_PLACEHOLDER = new RegExp(
 
 // ../packages/manifest/schema-contract/registry.mjs
 var PROJECT_SCHEMA_CONTRACT = Object.freeze({
-  cliVersion: "0.76.3",
+  cliVersion: "0.77.0",
   projectFileUploadBatchSize: 32,
   documentRecords: {
     member: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.76.3",
+  "version": "0.77.0",
   "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.76.3 -->
+<!-- reviewed-through-cli: 0.77.0 -->
 
 # 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.76.3 -->
+<!-- reviewed-through-cli: 0.77.0 -->
 ```
 
 The quoted version above is checked too, so this instruction cannot go stale

package/skills/neocompose-cli/references/declarations-and-construction.md

@@ -86,11 +86,11 @@ that does not authorize copying the annotation onto authored records.
 
 Use context-aware typed annotations:
 
-- `@settings(...)` for format/search/selection/editor constraints.
+- `@settings(...)` for format/search/collection/editor constraints.
 - `@storage(allowed: ...)` on classes and storage keys on members.
 - `@visibility(.Hidden)` only on a class; absence means visible.
 - Stateful settings use contextual enum cases, such as
-  `@settings(format: .Plain)` and `@settings(selection: .Multi)`.
+  `@settings(format: .Plain)` and `@settings(kind: .Unordered)`.
 - `@settings(...)` before a `List` element or `Dictionary` value type
   configures the collection's entries: `List<@settings(format: .Plain) string>`,
   `Dictionary<string, @settings(min: 0) int>`. Only the member that declares
@@ -231,14 +231,31 @@ the instance's recorded constructor or variant. They track later source-default
 edits until that field is explicitly overridden; resetting an override makes it
 virtual again.
 
-A lookup member's arity is its declared type. `public Config Config` selects one
-entry and its declared type is the entry type; `public Set<Config> Configs`
-selects several. An initializer body for a single-select lookup returns one
-entry, never a set.
+Declare a lookup member as `Reference<T>`. `public Reference<Config> Config`
+selects one row and reads as `Config`. `public Set<Reference<Config>> Configs`
+selects several and reads as `Set<Config>`. An initializer body for a single
+reference returns one row, never a set. `T` with `@settings(collection:)` is an
+error; the language server's quick fix respells it.
 
-The CLI also accepts `List<T>` with `selection: .Multi` on a member. Emitted
-source uses `Set<T>`; constructor and function parameters must use `Set<T>`
-to carry selection semantics.
+`@settings(collection: Owner.Member)` binds the reference to one collection.
+Without it the reference is unbound: it selects any stored row of `T` or a
+subclass, anywhere in the project. The selected row's store decides writes. A
+write through it to a Save row lands, and to an asset row it errors. Its
+generated C# property is the read-only interface; call `TryWritable` to write.
+
+An unbound default can name its row by a unique index:
+
+```neo
+public Reference<Item> StarterSeed = root.Assets.Items.Index.Slug["seed.carrot"]!;
+```
+
+The receiver is a `root` path to a List, `.Index.<Name>` is a unique index on
+it, and the key is a string literal. Any other shape stays initializer code.
+
+A `Reference<T>` member satisfies an interface `T Foo { get; }` or
+`{ get; set; }` and an abstract `T Foo { get; }`.
+
+Constructor and function parameters use `Set<T>` for several selections.
 
 Declare a multicast event as `NeoAction<…>`. Its value is an ordered listener
 set, so give it a bracketed list of method groups — never a lambda, and never

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

@@ -569,7 +569,7 @@ locally, like push. If another commit lands while it runs, the run is refused:
 run it again. `neo loc` writes work the same way: a write refused because
 another commit landed is run again.
 
-VS Code rename follows override families and class constructors, resolves contextual enum options such as `.Success`, renames a constructor parameter's named arguments (`new Item(count: 1)`) in bodies, initializers, specs, and base clauses, and keeps local-variable renames scoped to their declaration. Assigned IDs are not required for these refactorings. Inferred locals initialized with conditional expressions retain their common branch type for member completion, navigation, and rename. Typed delegate calls retain their return type too. Lambda returns use the delegate signature for target-typed constructors and enum argument suggestions. Member completion also follows optional access and null-forgiving receivers, including dictionary lookups.
+VS Code rename follows override families and class constructors, resolves contextual enum options such as `.Success`, renames a constructor parameter's named arguments (`new Item(count: 1)`) in bodies, initializers, specs, and base clauses, and keeps local-variable renames scoped to their declaration. Assigned IDs are not required for these refactorings. Inferred locals initialized with conditional expressions retain their common branch type for member completion, navigation, and rename. Direct parenthesized expressions and chained delegate factory calls retain their result type too. `List.Repeat` results infer their element type from the value, explicit call-site type arguments, and expected list type, including for inferred locals and direct indexed access. Lambda returns use the delegate signature for target-typed constructors and enum argument suggestions. Member completion also follows optional access and null-forgiving receivers, including dictionary lookups.
 
 ## Member change listeners