@neocompose/cli 0.84.4 → 0.84.5

package/dist/neo-runtime.mjs

@@ -17587,7 +17587,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.84.4",
+      cliVersion: "0.84.5",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -31651,13 +31651,22 @@ function neoScriptMemberLookupType(type) {
     nullable2 ||= current.constraint.nullable === true;
     current = current.constraint;
   }
+  if (current.kind === "named" && type.narrowedInterfaces !== void 0) {
+    current = {
+      ...current,
+      narrowedInterfaces: {
+        ...current.narrowedInterfaces,
+        ...type.narrowedInterfaces
+      }
+    };
+  }
   return nullable2 && current.nullable !== true ? { ...current, nullable: true } : current;
 }
 function neoScriptMemberReceiverType(type, memberName, project) {
   const primary = neoScriptMemberLookupType(type);
-  if (primary.kind !== "named" || primary.narrowedInterfaces === void 0)
+  if (primary.kind !== "named" && primary.kind !== "typeParameter" || primary.narrowedInterfaces === void 0)
     return primary;
-  const declaration = project.typeById.get(primary.typeId);
+  const declaration = primary.kind === "named" ? project.typeById.get(primary.typeId) : void 0;
   if (declaration?.kind === "class" && (memberName === NEOSCRIPT_CLASS_ID_MEMBER || memberName === "Clone"))
     return primary;
   if (declaration?.members.some((member) => member.name === memberName))
@@ -31986,12 +31995,12 @@ function isNeoScriptTypeAssignable(source, target, project) {
   if (isUnknownType(source) || isUnknownType(target)) return false;
   if (isNullType(source)) return isNullableType2(target);
   if (isNullableType2(source) && !isNullableType2(target)) return false;
-  if (target.kind === "named" && target.narrowedInterfaces !== void 0) {
+  if ((target.kind === "named" || target.kind === "typeParameter") && target.narrowedInterfaces !== void 0) {
     for (const bound of Object.values(target.narrowedInterfaces)) {
       if (!isNeoScriptTypeAssignable(source, bound, project)) return false;
     }
   }
-  if (source.kind === "named" && source.narrowedInterfaces !== void 0) {
+  if ((source.kind === "named" || source.kind === "typeParameter") && source.narrowedInterfaces !== void 0) {
     const direct = target.kind === "named" ? source.narrowedInterfaces[target.typeId] : void 0;
     if (direct !== void 0 && isNeoScriptTypeAssignable(direct, target, project))
       return true;
@@ -32019,7 +32028,7 @@ function isNeoScriptTypeAssignable(source, target, project) {
         project
       );
     }
-    if (!target.typeArguments?.length || project.typeById.get(target.typeId)?.kind !== "interface") {
+    if (!target.typeArguments?.length) {
       return isTypeDerivedFrom(
         project.typeById.get(source.typeId),
         target.typeId,
@@ -32027,7 +32036,7 @@ function isNeoScriptTypeAssignable(source, target, project) {
         /* @__PURE__ */ new Set()
       );
     }
-    const construction = interfaceConstruction(source, target.typeId, project);
+    const construction = supertypeConstruction(source, target.typeId, project);
     return construction !== void 0 && invariantTypeArguments(construction, target.typeArguments, project);
   }
   if (source.kind === "typeParameter" && target.kind === "typeParameter") {
@@ -32085,7 +32094,7 @@ function isNeoScriptTypeAssignable(source, target, project) {
   return false;
 }
 function withoutNeoScriptInterfaceProofs(type) {
-  if (type.kind !== "named" || type.narrowedInterfaces === void 0)
+  if (type.kind !== "named" && type.kind !== "typeParameter" || type.narrowedInterfaces === void 0)
     return type;
   const { narrowedInterfaces: _proofs, ...declared } = type;
   return declared;
@@ -32093,7 +32102,7 @@ function withoutNeoScriptInterfaceProofs(type) {
 function commonNeoScriptAssignableType(left, right, project) {
   if (isNeoScriptTypeAssignable(left, right, project)) return right;
   if (isNeoScriptTypeAssignable(right, left, project)) return left;
-  if (left.kind === "named" && right.kind === "named" && (left.narrowedInterfaces !== void 0 || right.narrowedInterfaces !== void 0)) {
+  if ((left.kind === "named" || left.kind === "typeParameter") && (right.kind === "named" || right.kind === "typeParameter") && (left.narrowedInterfaces !== void 0 || right.narrowedInterfaces !== void 0)) {
     const declaredLeft = withoutNeoScriptInterfaceProofs(left);
     const declaredRight = withoutNeoScriptInterfaceProofs(right);
     const common = commonNeoScriptAssignableType(
@@ -32101,7 +32110,8 @@ function commonNeoScriptAssignableType(left, right, project) {
       declaredRight,
       project
     );
-    if (common?.kind !== "named") return null;
+    if (common?.kind !== "named" && common?.kind !== "typeParameter")
+      return null;
     const proofs = {};
     for (const [source, other] of [
       [left, right],
@@ -32154,41 +32164,53 @@ function interfaceInstantiationMessage(declared, expected, project) {
   }
   return message;
 }
-function interfaceConstruction(source, interfaceId, project, seen = /* @__PURE__ */ new Set()) {
-  if (source.typeId === interfaceId) return source.typeArguments ?? [];
-  const type = project.typeById.get(source.typeId);
-  if (type === void 0 || seen.has(type.id)) return void 0;
-  seen.add(type.id);
-  const bindings = /* @__PURE__ */ new Map();
-  type.typeParameters?.forEach((parameter4, index) => {
-    const argument2 = source.typeArguments?.[index];
-    if (argument2 !== void 0)
-      bindings.set(parameter4.id ?? parameter4.name, argument2);
-  });
-  for (const id2 of [
-    ...type.baseTypeIds ?? [],
-    ...type.interfaceTypeIds ?? []
-  ]) {
-    const supertype = {
-      kind: "named",
-      typeId: id2,
-      typeArguments: (type.supertypeArguments?.[id2] ?? []).map(
-        (argument2) => substituteNeoScriptTypeParameters(
-          argument2,
-          (parameter4) => bindings.get(parameter4.id),
-          project
-        )
-      )
-    };
-    const found = interfaceConstruction(supertype, interfaceId, project, seen);
-    if (found !== void 0) return found;
+function supertypeConstruction(source, supertypeId, project) {
+  for (const type of constructedSupertypes(source, project)) {
+    if (type.typeId === supertypeId) return type.typeArguments ?? [];
   }
   return void 0;
 }
+function* constructedSupertypes(source, project) {
+  const pending = [source];
+  const seen = /* @__PURE__ */ new Set();
+  while (true) {
+    const current = pending.pop();
+    if (current === void 0) return;
+    if (seen.has(current.typeId)) continue;
+    seen.add(current.typeId);
+    yield current;
+    const type = project.typeById.get(current.typeId);
+    if (type === void 0) continue;
+    const bindings = /* @__PURE__ */ new Map();
+    type.typeParameters?.forEach((parameter4, index) => {
+      const argument2 = current.typeArguments?.[index];
+      if (argument2 !== void 0)
+        bindings.set(parameter4.id ?? parameter4.name, argument2);
+    });
+    const parents = [
+      ...type.baseTypeIds ?? [],
+      ...type.interfaceTypeIds ?? []
+    ];
+    for (const id2 of parents.reverse()) {
+      if (seen.has(id2)) continue;
+      pending.push({
+        kind: "named",
+        typeId: id2,
+        typeArguments: (type.supertypeArguments?.[id2] ?? []).map(
+          (argument2) => substituteNeoScriptTypeParameters(
+            argument2,
+            (parameter4) => bindings.get(parameter4.id),
+            project
+          )
+        )
+      });
+    }
+  }
+}
 function interfaceUndeterminedReason(classType, interfaceType2, project) {
   const params = classType.typeParameters ?? [];
   if (params.length === 0) return null;
-  const construction = interfaceConstruction(
+  const construction = supertypeConstruction(
     {
       kind: "named",
       typeId: classType.id,
@@ -33971,7 +33993,7 @@ function implementerConstruction(implementer, slotInterface, slot, project) {
     );
     if (reason !== null) return void 0;
   }
-  const implemented = interfaceConstruction(
+  const implemented = supertypeConstruction(
     {
       kind: "named",
       typeId: implementer.id,
@@ -34422,9 +34444,7 @@ function typeRefsEqual(left, right) {
   if (left.kind === "primitive" && right.kind === "primitive") {
     return left.name === right.name;
   }
-  if (left.kind === "named" && right.kind === "named") {
-    const leftArgs = left.typeArguments ?? [];
-    const rightArgs = right.typeArguments ?? [];
+  if ((left.kind === "named" || left.kind === "typeParameter") && (right.kind === "named" || right.kind === "typeParameter")) {
     if (left.narrowedInterfaces !== right.narrowedInterfaces) {
       const leftBounds = Object.entries(left.narrowedInterfaces ?? {});
       const rightBounds = right.narrowedInterfaces ?? {};
@@ -34435,6 +34455,10 @@ function typeRefsEqual(left, right) {
           return false;
       }
     }
+  }
+  if (left.kind === "named" && right.kind === "named") {
+    const leftArgs = left.typeArguments ?? [];
+    const rightArgs = right.typeArguments ?? [];
     return left.typeId === right.typeId && leftArgs.length === rightArgs.length && leftArgs.every((item, index) => {
       const other = rightArgs[index];
       return other !== void 0 && typeRefsEqual(item, other);
@@ -35416,6 +35440,20 @@ function typesOverlap(left, right, project) {
   if (isNull(right)) return isNullable(left);
   left = neoScriptMemberLookupType(left);
   right = neoScriptMemberLookupType(right);
+  const declaredLeft = withoutNeoScriptInterfaceProofs(left);
+  const declaredRight = withoutNeoScriptInterfaceProofs(right);
+  if (left.kind === "named" || left.kind === "typeParameter") {
+    for (const proof of Object.values(left.narrowedInterfaces ?? {})) {
+      if (!typesOverlap(proof, declaredRight, project)) return false;
+    }
+  }
+  if (right.kind === "named" || right.kind === "typeParameter") {
+    for (const proof of Object.values(right.narrowedInterfaces ?? {})) {
+      if (!typesOverlap(declaredLeft, proof, project)) return false;
+    }
+  }
+  left = declaredLeft;
+  right = declaredRight;
   if (left.kind === "typeParameter" || right.kind === "typeParameter")
     return true;
   if (isNeoScriptTypeAssignable(left, right, project) || isNeoScriptTypeAssignable(right, left, project))
@@ -35429,11 +35467,29 @@ function typesOverlap(left, right, project) {
     const classDeclaration = leftDeclaration?.kind === "class" ? leftDeclaration : rightDeclaration?.kind === "class" ? rightDeclaration : null;
     const interfaceDeclaration = leftDeclaration?.kind === "interface" ? leftDeclaration : rightDeclaration?.kind === "interface" ? rightDeclaration : null;
     if (classDeclaration !== null && interfaceDeclaration !== null) {
+      if (conflictingInterfaceConstructions(left, right, project)) return false;
       return classDeclaration.sealed !== true;
     }
   }
   return isNumeric(left) && isNumeric(right);
 }
+function conflictingInterfaceConstructions(left, right, project) {
+  const constructions = /* @__PURE__ */ new Map();
+  for (const type of constructedSupertypes(left, project)) {
+    if (project.typeById.get(type.typeId)?.kind === "interface" && type.typeArguments?.length)
+      constructions.set(type.typeId, type.typeArguments);
+  }
+  for (const type of constructedSupertypes(right, project)) {
+    const argumentsList2 = constructions.get(type.typeId);
+    if (!argumentsList2) continue;
+    if (argumentsList2.some((argument2, index) => {
+      const other = type.typeArguments?.[index];
+      return other !== void 0 && !containsTypeParameter(argument2) && !containsTypeParameter(other) && !(isNeoScriptTypeAssignable(argument2, other, project) && isNeoScriptTypeAssignable(other, argument2, project));
+    }))
+      return true;
+  }
+  return false;
+}
 function isUnknown(type) {
   return type.kind === "primitive" && type.name === "unknown";
 }
@@ -36144,10 +36200,12 @@ var init_strict_resolver = __esm({
       constructor(parent, probe = parent?.probe ?? false) {
         this.parent = parent;
         this.probe = probe;
+        this.externalRoots = parent?.externalRoots ?? /* @__PURE__ */ new Map();
         this.patternBindings = parent?.patternBindings ?? null;
       }
       parent;
       probe;
+      externalRoots;
       entries = /* @__PURE__ */ new Map();
       invalidatedRoots = /* @__PURE__ */ new Set();
       hiddenNarrowingRoots = /* @__PURE__ */ new Set();
@@ -36170,7 +36228,15 @@ var init_strict_resolver = __esm({
       lookup(name) {
         return this.entries.get(name) ?? this.parent?.lookup(name) ?? null;
       }
+      registerExternalRoot(name, type) {
+        if (!this.externalRoots.has(name))
+          this.externalRoots.set(name, { name, type, variableId: name });
+      }
+      lookupFlowRoot(name) {
+        return this.lookup(name) ?? this.externalRoots.get(name) ?? null;
+      }
       containsEntry(entry) {
+        if (this.externalRoots.get(entry.name) === entry) return true;
         for (const candidate of this.entries.values()) {
           if (candidate === entry) return true;
         }
@@ -36228,6 +36294,7 @@ var init_strict_resolver = __esm({
         if (path === rootEntry.name) this.updatePatternType(rootEntry, type);
       }
       updatePatternType(entry, type) {
+        if (this.externalRoots.get(entry.name) === entry) return;
         if (this.probe || entry.patternBinding)
           this.patternBindings = {
             name: entry.name,
@@ -36871,7 +36938,7 @@ var init_strict_resolver = __esm({
                 branchExitNarrowings,
                 this.project
               )) {
-                const rootEntry = scope.lookup(pathRoot(path));
+                const rootEntry = scope.lookupFlowRoot(pathRoot(path));
                 if (rootEntry === narrowed.rootEntry) {
                   scope.narrow(path, rootEntry, narrowed.type);
                 }
@@ -37804,7 +37871,7 @@ var init_strict_resolver = __esm({
         }
         for (const [path, narrowed] of merged) {
           if (!parent.containsEntry(narrowed.rootEntry)) continue;
-          const rootEntry = parent.lookup(pathRoot(path));
+          const rootEntry = parent.lookupFlowRoot(pathRoot(path));
           if (rootEntry === narrowed.rootEntry) {
             parent.narrow(path, rootEntry, narrowed.type);
           }
@@ -38031,7 +38098,7 @@ var init_strict_resolver = __esm({
           scope
         );
         if (assignedPath) {
-          const rootEntry = scope.lookup(pathRoot(assignedPath));
+          const rootEntry = scope.lookupFlowRoot(pathRoot(assignedPath));
           if (rootEntry) {
             const retainedFacts = unaffectedNarrowings(
               assignedPath,
@@ -38078,11 +38145,7 @@ var init_strict_resolver = __esm({
       referenceAssignment(statement, place, storageType, scope) {
         const source = statement.op === "=" ? statement.value ?? void 0 : void 0;
         const nullLiteral = source?.kind === "litNull";
-        const assigned = source === void 0 ? void 0 : this.resolveReferenceExpression(
-          source,
-          scope,
-          nullLiteral ? void 0 : neoScriptReadType(storageType)
-        );
+        const assigned = source === void 0 ? void 0 : this.resolveReferenceAssignmentValue(source, scope, storageType);
         const valueAt = (type) => {
           if (source === void 0 || assigned === void 0) return void 0;
           return nullLiteral ? this.resolveReferenceExpression(source, scope, type) : this.readReferences(assigned, type);
@@ -38126,6 +38189,30 @@ var init_strict_resolver = __esm({
         }
         return { target: layer, value: valueAt(layer.type), through };
       }
+      resolveReferenceAssignmentValue(expression, scope, storageType) {
+        if (expression.kind === "conditional") {
+          return this.resolveConditionalExpression(
+            expression,
+            scope,
+            neoScriptReadType(storageType),
+            storageType
+          );
+        }
+        if (expression.kind === "coalesce") {
+          return this.resolveCoalesceExpression(
+            expression,
+            scope,
+            void 0,
+            storageType
+          );
+        }
+        const expected = neoScriptReadType(storageType);
+        return this.resolveReferenceExpression(
+          expression,
+          scope,
+          expression.kind === "litNull" ? void 0 : expected
+        );
+      }
       /** `Reference<target>` as an expression type (P112 §3.1). */
       referenceType(target, nullable2) {
         return neoScriptReferenceType(
@@ -38286,7 +38373,7 @@ var init_strict_resolver = __esm({
               false
             ).type;
           }
-          return resolvedTarget.type;
+          return this.resolveIdentifierNatural(targetAst.name, scope, targetAst.pos).type;
         }
         if (targetAst.kind !== "member") return resolvedTarget.type;
         return this.resolveMemberNatural(
@@ -38529,7 +38616,7 @@ var init_strict_resolver = __esm({
           scope
         );
         if (assignedPath) {
-          const rootEntry = scope.lookup(pathRoot(assignedPath));
+          const rootEntry = scope.lookupFlowRoot(pathRoot(assignedPath));
           if (rootEntry) {
             const retainedFacts = unaffectedNarrowings(
               assignedPath,
@@ -39265,34 +39352,8 @@ var init_strict_resolver = __esm({
               ...operand.writeRoot ? { writeRoot: operand.writeRoot } : {}
             };
           }
-          case "coalesce": {
-            const left = this.resolveExpression(expression.left, scope);
-            const leftOptional = { ...left.type, nullable: true };
-            const nullLeft = isNull(left.type);
-            const right = this.resolveExpression(
-              expression.right,
-              scope,
-              nullLeft ? expected : leftOptional
-            );
-            if (!nullLeft && !isNeoScriptTypeAssignable(right.type, leftOptional, this.project)) {
-              throw new CompileError(
-                `\`??\` right operand ${this.describe(right.type)} is not assignable to ${this.describe(leftOptional)}`,
-                expression.pos
-              );
-            }
-            const resultType = nullLeft ? right.type : {
-              ...left.type,
-              nullable: isNullable(left.type) && isNullable(right.type)
-            };
-            return {
-              pointer: {
-                type: "coalesce" /* Coalesce */,
-                left: left.pointer,
-                right: right.pointer
-              },
-              type: resultType
-            };
-          }
+          case "coalesce":
+            return this.resolveCoalesceExpression(expression, scope, expected);
           case "conditional":
             return this.resolveConditionalExpression(expression, scope, expected);
           case "is": {
@@ -39869,6 +39930,21 @@ var init_strict_resolver = __esm({
         };
       }
       resolveIdentifier(name, scope, pos, usage2 = "value") {
+        const natural = this.resolveIdentifierNatural(name, scope, pos, usage2);
+        if (scope.lookup(name)) return natural;
+        const path = this.narrowingPath(name, scope);
+        const root = path === null ? null : scope.lookupFlowRoot(pathRoot(path));
+        const narrowed = root && path ? scope.lookupNarrowedType(path, root) : null;
+        const resolved = narrowed ? { ...natural, type: narrowed } : natural;
+        this.options.onFlowScope?.({
+          name,
+          position: pos,
+          type: resolved.type,
+          bindings: scope.patternBindings
+        });
+        return resolved;
+      }
+      resolveIdentifierNatural(name, scope, pos, usage2 = "value") {
         if (name === "this" && this.context.kind === "initializer" && this.delegateCaptureContexts.length === 0 && usage2 === "value") {
           throw new CompileError(
             "'this' is unavailable while an initializer runs. Defer instance access with a lambda or method group.",
@@ -39901,7 +39977,7 @@ var init_strict_resolver = __esm({
           };
         }
         const global = this.context.project.globals.find(
-          (candidate) => candidate.name === name
+          (symbol) => symbol.name === name
         );
         if (global) return this.symbolValue(global);
         const implicit = this.implicitMember(name);
@@ -40043,11 +40119,29 @@ var init_strict_resolver = __esm({
         if (path === null) return null;
         const root = pathRoot(path);
         if (scope.lookup(root)) return path;
-        if (this.context.project.globals.some((symbol) => symbol.name === root)) {
-          return path;
+        const global = this.context.project.globals.find(
+          (symbol) => symbol.name === root
+        );
+        if (global) {
+          const key = `global:${root}`;
+          scope.registerExternalRoot(key, global.type);
+          return key + path.slice(root.length);
         }
         const implicit = this.implicitMember(root);
-        return implicit && implicit.symbol.static !== true ? `this.${path}` : path;
+        if (implicit && implicit.symbol.static !== true) return `this.${path}`;
+        const owner = implicit?.owner ?? this.project.typeByName.get(root);
+        if (owner) {
+          const memberName = implicit?.symbol.name ?? path.slice(root.length + 1).split(".")[0];
+          const member = implicit?.symbol ?? owner.members.find((candidate) => candidate.name === memberName);
+          const declaring = member?.inheritedFrom;
+          const key = `static:${declaring?.typeName ?? owner.name}`;
+          scope.registerExternalRoot(key, {
+            kind: "named",
+            typeId: declaring?.typeId ?? owner.id
+          });
+          return implicit ? `${key}.${path}` : key + path.slice(root.length);
+        }
+        return path;
       }
       conditionFacts(expression, scope, whenTrue) {
         const pathOf = (value) => this.narrowingPath(canonicalPath(value), scope);
@@ -40065,7 +40159,7 @@ var init_strict_resolver = __esm({
           locals
         )) {
           const path = this.narrowingPath(assignedPath, outerScope);
-          const outerEntry = path === null ? null : outerScope.lookup(pathRoot(path));
+          const outerEntry = path === null ? null : outerScope.lookupFlowRoot(pathRoot(path));
           if (outerEntry && path !== null) {
             const retained = unaffectedNarrowings(path, outerEntry, loopEntryScope);
             loopEntryScope.hideInheritedNarrowing(outerEntry);
@@ -40083,7 +40177,7 @@ var init_strict_resolver = __esm({
             targetScope
           );
           const natural = this.readReferences(place, void 0);
-          const rootEntry = fact.path === null ? null : targetScope.lookup(pathRoot(fact.path));
+          const rootEntry = fact.path === null ? null : targetScope.lookupFlowRoot(pathRoot(fact.path));
           if (fact.nullValue) {
             if (fact.path === null || rootEntry === null) continue;
             if (place.type.kind === "reference" && !isNullable(place.type)) {
@@ -40104,7 +40198,7 @@ var init_strict_resolver = __esm({
             const targetDefinition = target.kind === "named" ? this.project.typeById.get(target.typeId) : void 0;
             const naturalDefinition = natural.type.kind === "named" ? this.project.typeById.get(natural.type.typeId) : void 0;
             let narrowed = { ...target, nullable: false };
-            if (!fact.bindingName && natural.type.kind === "named" && (naturalDefinition?.kind === "class" || naturalDefinition?.kind === "interface") && target.kind === "named" && targetDefinition?.kind === "interface") {
+            if ((natural.type.kind === "typeParameter" || natural.type.kind === "named" && (naturalDefinition?.kind === "class" || naturalDefinition?.kind === "interface")) && target.kind === "named" && targetDefinition?.kind === "interface") {
               narrowed = { ...natural.type, nullable: false };
               if (!isNeoScriptTypeAssignable(narrowed, target, this.project)) {
                 narrowed = {
@@ -40116,6 +40210,22 @@ var init_strict_resolver = __esm({
                 };
               }
             }
+            if (target.kind === "named" && targetDefinition?.kind === "class") {
+              const lookup = neoScriptMemberLookupType(natural.type);
+              if (lookup.kind === "named" || lookup.kind === "typeParameter") {
+                const { narrowedInterfaces, ...declared } = lookup;
+                const proofs = declared.kind === "named" && this.project.typeById.get(declared.typeId)?.kind === "interface" ? {
+                  ...narrowedInterfaces,
+                  [declared.typeId]: declared
+                } : narrowedInterfaces;
+                if (proofs !== void 0)
+                  narrowed = {
+                    ...target,
+                    nullable: false,
+                    narrowedInterfaces: proofs
+                  };
+              }
+            }
             if (mode === "all" && fact.path !== null && rootEntry !== null && place.type.kind !== "reference") {
               targetScope.narrow(fact.path, rootEntry, narrowed);
             }
@@ -40125,7 +40235,7 @@ var init_strict_resolver = __esm({
               }
               targetScope.definePattern({
                 name: fact.bindingName,
-                type: narrowed,
+                type: { ...target, nullable: false },
                 variableId: fact.bindingTest ? this.patternBindingId(fact.bindingTest) : fact.bindingName,
                 writeRoot: this.expressionWriteRoot(natural, targetScope),
                 pointer: fact.bindingTest ? {
@@ -40405,7 +40515,7 @@ var init_strict_resolver = __esm({
         return wire;
       }
       resolveMember(receiverAst, name, scope, pos, optional2, receiverValue) {
-        const resolved = this.resolveMemberNatural(
+        let resolved = this.resolveMemberNatural(
           receiverAst,
           name,
           scope,
@@ -40414,21 +40524,25 @@ var init_strict_resolver = __esm({
           receiverValue
         );
         if (!optional2) {
-          const receiverPath = this.narrowingPath(
-            canonicalPath(receiverAst),
+          const receiverPath = canonicalPath(receiverAst);
+          const path = this.narrowingPath(
+            receiverPath === null ? null : `${receiverPath}.${name}`,
             scope
           );
-          if (receiverPath) {
-            const rootEntry = scope.lookup(pathRoot(receiverPath));
+          if (path) {
+            const rootEntry = scope.lookupFlowRoot(pathRoot(path));
             if (rootEntry) {
-              const narrowed = scope.lookupNarrowedType(
-                `${receiverPath}.${name}`,
-                rootEntry
-              );
-              if (narrowed) return { ...resolved, type: narrowed };
+              const narrowed = scope.lookupNarrowedType(path, rootEntry);
+              if (narrowed) resolved = { ...resolved, type: narrowed };
             }
           }
         }
+        this.options.onFlowScope?.({
+          name,
+          position: pos,
+          type: resolved.type,
+          bindings: scope.patternBindings
+        });
         return resolved;
       }
       resolveStaticMemberValue(staticType, member, pos) {
@@ -44421,7 +44535,7 @@ var init_strict_resolver = __esm({
           scope
         );
         if (path) {
-          const rootEntry = scope.lookup(pathRoot(path));
+          const rootEntry = scope.lookupFlowRoot(pathRoot(path));
           if (rootEntry) scope.invalidate(rootEntry);
         }
         const actionTypeInfo = receiver.wireType ?? toWireType(receiver.type, this.project);
@@ -44473,7 +44587,74 @@ var init_strict_resolver = __esm({
           pos
         );
       }
-      resolveConditionalExpression(expression, scope, expected) {
+      referenceAssignmentBranches(left, right, storageType, operator) {
+        let layer = storageType;
+        while (true) {
+          const expected = operator === "coalesce" ? { ...layer, nullable: true } : layer;
+          const resolvedLeft = this.readReferences(left, expected);
+          const resolvedRight = this.readReferences(right, expected);
+          if (isNeoScriptTypeAssignable(resolvedLeft.type, expected, this.project) && isNeoScriptTypeAssignable(resolvedRight.type, expected, this.project)) {
+            return { left: resolvedLeft, right: resolvedRight, type: expected };
+          }
+          if (layer.kind !== "reference") break;
+          layer = layer.target;
+        }
+        return { left, right, type: neoScriptReadType(storageType) };
+      }
+      resolveCoalesceExpression(expression, scope, expected, assignmentType) {
+        let left;
+        let right;
+        if (assignmentType) {
+          const branches = this.referenceAssignmentBranches(
+            this.resolveReferenceAssignmentValue(
+              expression.left,
+              scope,
+              assignmentType
+            ),
+            this.resolveReferenceAssignmentValue(
+              expression.right,
+              scope,
+              assignmentType
+            ),
+            assignmentType,
+            "coalesce"
+          );
+          left = branches.left;
+          right = branches.right;
+        } else {
+          left = this.resolveExpression(
+            expression.left,
+            scope,
+            expected?.kind === "reference" ? { ...expected, nullable: true } : void 0
+          );
+          right = this.resolveExpression(
+            expression.right,
+            scope,
+            isNull(left.type) ? expected : { ...left.type, nullable: true }
+          );
+        }
+        const leftOptional = { ...left.type, nullable: true };
+        const nullLeft = isNull(left.type);
+        if (!nullLeft && !isNeoScriptTypeAssignable(right.type, leftOptional, this.project)) {
+          throw new CompileError(
+            `\`??\` right operand ${this.describe(right.type)} is not assignable to ${this.describe(leftOptional)}`,
+            expression.pos
+          );
+        }
+        const resultType = nullLeft ? right.type : {
+          ...left.type,
+          nullable: isNullable(left.type) && isNullable(right.type)
+        };
+        return {
+          pointer: {
+            type: "coalesce" /* Coalesce */,
+            left: left.pointer,
+            right: right.pointer
+          },
+          type: resultType
+        };
+      }
+      resolveConditionalExpression(expression, scope, expected, assignmentType) {
         const condition = this.toBool(
           this.resolveExpression(expression.condition, scope),
           expression.condition.pos
@@ -44490,7 +44671,38 @@ var init_strict_resolver = __esm({
         );
         let whenTrue;
         let whenFalse;
-        if (expected) {
+        if (assignmentType) {
+          whenTrue = this.resolveReferenceAssignmentValue(
+            expression.whenTrue,
+            trueScope,
+            assignmentType
+          );
+          whenFalse = this.resolveReferenceAssignmentValue(
+            expression.whenFalse,
+            falseScope,
+            assignmentType
+          );
+          let common2 = commonNeoScriptAssignableType(
+            whenTrue.type,
+            whenFalse.type,
+            this.project
+          );
+          if (isNull(whenTrue.type)) common2 = { ...whenFalse.type, nullable: true };
+          if (isNull(whenFalse.type)) common2 = { ...whenTrue.type, nullable: true };
+          if (common2) {
+            expected = common2;
+          } else {
+            const branches = this.referenceAssignmentBranches(
+              whenTrue,
+              whenFalse,
+              assignmentType,
+              "conditional"
+            );
+            whenTrue = branches.left;
+            whenFalse = branches.right;
+            expected = branches.type;
+          }
+        } else if (expected) {
           whenTrue = this.resolveExpression(
             expression.whenTrue,
             trueScope,
@@ -44527,7 +44739,7 @@ var init_strict_resolver = __esm({
             expression.pos
           );
         }
-        if (expected) {
+        if (expected && !assignmentType) {
           this.requireAssignable(
             whenTrue.type,
             expected,
@@ -50839,6 +51051,27 @@ function validateStatements(statements, returnType, scope, environment, uri, ran
   }
 }
 function validateExpression(expression, expected, scope, environment, uri, range2, diagnostics, anchor) {
+  if (expression.kind === "new" && expression.typeArguments?.length) {
+    const { context } = initializerResolver(
+      environment,
+      scope.get("this")?.name ?? "",
+      environment.staticMember
+    );
+    for (const argument2 of expression.typeArguments) {
+      try {
+        resolveNeoScriptType(argument2, context, environment.projectIndex);
+      } catch (error) {
+        if (!(error instanceof CompileError)) throw error;
+        pushDiagnostic(
+          diagnostics,
+          uri,
+          anchor ? anchorSpan(anchor, error, 1) : range2,
+          "invalid-construction-type-argument",
+          error.message.replace(/^\d+:\d+: /, "")
+        );
+      }
+    }
+  }
   if (expected?.name === "NeoDelegate" && validateDelegateMethodGroup(
     expression,
     expected,
@@ -60967,7 +61200,7 @@ function parseSlotPathSpellingV4(expression, isStaticSymbol) {
     return steps[0]?.kind === "member" ? { spelling: "slotPath", head: "root", steps } : null;
   }
   const first = steps[0];
-  if (first?.kind !== "member" || steps.length < 2) return null;
+  if (first?.kind !== "member") return null;
   const head = `${current.name}.${first.name}`;
   return isStaticSymbol(head) ? { spelling: "slotPath", head, steps: steps.slice(1) } : null;
 }
@@ -77679,7 +77912,7 @@ function compileNSInitializer(code, ctx) {
       {
         ...compilerContext,
         thisClass: lexicalThisClass ?? null,
-        implicitMemberAccess: lexicalThisClass !== null,
+        implicitMemberAccess: lexicalThisClass != null || declaringClass2 != null,
         staticMember: false
       },
       {
@@ -78161,7 +78394,7 @@ function compileMemberInitializerBody(args) {
         returnTypeInfo,
         initializerName: args.member.name,
         lexicalThisClass: parseExpression(defaultValue.init.code).kind === "lambda" ? instanceClass : null,
-        declaringClass: instanceClass,
+        declaringClass: args.thisClass,
         argumentTypes: initializerArgumentTypes(
           instanceClass,
           args.constructors ?? []
@@ -78210,7 +78443,7 @@ function compileValueRowInitializerBody(args) {
         lexicalThisClass: args.lexicalThisClass ?? null,
         declaringClass: args.initializerOwnerClass,
         argumentTypes: initializerArgumentTypes(
-          args.initializerOwnerClass,
+          args.lexicalThisClass === null ? null : args.initializerOwnerClass,
           args.constructors ?? []
         ),
         ...args.storedConstructionReplay === true ? { storedConstructionReplay: true } : {}
@@ -79879,12 +80112,15 @@ function initializerOwnerContext(document, valueId, rootOwners, valuesById, reco
     currentId = sourceValueId;
     lexicalRoot = rootOwners.get(sourceValueId) ?? lexicalRoot;
   }
-  if (lexicalRoot === void 0 || isStaticMember(lexicalRoot)) {
-    return { ownerClass: null, lexicalThisClass: null };
+  if (lexicalRoot === void 0) {
+    return { declaringClass: null, lexicalThisClass: null };
   }
   const lexicalRootId = getField(lexicalRoot, "id");
   const ownerClass = typeof lexicalRootId === "string" ? findSchemaPlacement(lexicalRootId, document.classes)?.ownerClass ?? null : null;
-  return { ownerClass, lexicalThisClass: ownerClass };
+  return {
+    declaringClass: ownerClass,
+    lexicalThisClass: isStaticMember(lexicalRoot) ? null : ownerClass
+  };
 }
 function isClassRecordValue(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
@@ -97437,7 +97673,7 @@ function materializeMemberDefaultValue(args) {
       rootOwners,
       valuesById,
       (id2) => args.readTracking?.valueIds.add(id2)
-    ).ownerClass : typeof Reflect.get(member, "id") === "string" && !isStaticMember(member) ? findSchemaPlacement(
+    ).lexicalThisClass : typeof Reflect.get(member, "id") === "string" && !isStaticMember(member) ? findSchemaPlacement(
       String(Reflect.get(member, "id")),
       args.document.classes
     )?.ownerClass ?? null : null;
@@ -108559,15 +108795,19 @@ function deferredReferenceDefault(context, expression) {
   if (elements.length === 0) return null;
   const placeholders = [];
   for (const element of elements) {
-    const spelling = parseIndexPathSpellingV4(element) ?? parseSlotPathSpellingV4(
-      element,
-      (symbol) => context.staticValueIdsBySymbol.has(symbol)
-    );
-    if (spelling === null) return null;
-    placeholders.push(encodeMemberDefaultKeyReferenceV4(spelling));
+    const placeholder = deferredReferenceValue(context, element);
+    if (placeholder === null) return null;
+    placeholders.push(placeholder);
   }
   return placeholders;
 }
+function deferredReferenceValue(context, expression) {
+  const spelling = parseIndexPathSpellingV4(expression) ?? parseSlotPathSpellingV4(
+    expression,
+    (symbol) => context.staticValueIdsBySymbol.has(symbol) || context.classIdsByName.has(symbol.slice(0, symbol.indexOf(".")))
+  );
+  return spelling === null ? null : encodeMemberDefaultKeyReferenceV4(spelling);
+}
 function slotReferenceType(readType) {
   if (readType.name === "Reference") return readType;
   const element = readType.name === "Set" ? readType.arguments[0] : void 0;
@@ -108814,6 +109054,10 @@ function lowerExpressionValue(context, expression, declaredExpected, ownerClass,
       sourceText
     );
   }
+  if (expected.name === "Reference") {
+    const deferred = deferredReferenceValue(context, expression);
+    if (deferred !== null) return deferred;
+  }
   if (expected.name === "NeoAction") {
     return lowerActionDefault(context, expression, ownerClass, path);
   }
@@ -117851,7 +118095,7 @@ function valueInitializerCompilationSites(document) {
     sites.set(row.id, {
       row,
       member,
-      ownerClass: ownerContext.ownerClass,
+      ownerClass: ownerContext.declaringClass,
       lexicalThisClass: ownerContext.lexicalThisClass
     });
   }
@@ -130523,7 +130767,7 @@ function compileOwnedValueRowInitializer(args) {
     member,
     valueRow: row,
     valueId: row.id,
-    initializerOwnerClass: ownerContext.ownerClass,
+    initializerOwnerClass: ownerContext.declaringClass,
     lexicalThisClass: ownerContext.lexicalThisClass,
     // A value-row initializer is source for a persisted construction, never
     // an ad-hoc runtime `new`. The CLI replay compiler uses this same mode;
@@ -131834,7 +132078,11 @@ function resolveDeclarationListenerTemplate(args) {
           typeId: row.classId,
           nullable: type.nullable
         };
-        if (!isNeoScriptTypeAssignable(selectedType, type, projectIndex))
+        if (!isNeoScriptTypeAssignable(
+          selectedType,
+          { kind: "named", typeId: type.typeId, nullable: type.nullable },
+          projectIndex
+        ))
           throw new Error(
             `Listener template ${id2} selects a class that is not assignable to its declared type.`
           );
@@ -143962,6 +144210,33 @@ function lowerMemberDefaultSourcesV4(state, analysis, manifest, options = {}) {
     seeds
   };
 }
+function prepareValueReferencePathsV4(state, manifest, options) {
+  const paths = options.registry.referenceObligations.filter(
+    (obligation) => obligation.kind === "reference" && (obligation.target.spelling === "slotPath" || obligation.target.spelling === "indexPath")
+  );
+  if (paths.length === 0) return;
+  const context = buildValueLowerContext(state, manifest, {
+    analysis: options.analysis,
+    registry: options.registry,
+    valuePlacements: indexValuePlacements(state, {
+      pendingValues: options.registry.pendingValues
+    })
+  });
+  const deletedValueIds = /* @__PURE__ */ new Set();
+  for (const obligation of paths) {
+    const failure = settleReferenceObligation(
+      context,
+      obligation,
+      deletedValueIds,
+      options.resolveRootPath
+    );
+    if (failure !== null)
+      options.registry.loweringFailures.push({
+        message: failure,
+        site: obligation.site
+      });
+  }
+}
 function drainValueReferenceObligationsV4(state, manifest, options) {
   const deletedValueIds = options.deletedValueIds ?? /* @__PURE__ */ new Set();
   const survivingState = withoutDeletedValues(state, deletedValueIds);
@@ -144435,6 +144710,8 @@ function keyIndexSchemaKey(context, member, collection, spelling) {
 }
 function collectionEntryIds(context, collection, collectionValueId) {
   if (isUnorderedList(collection)) {
+    const authored = context.authoredListEntries.get(collectionValueId);
+    if (authored !== void 0) return authored;
     return [
       ...context.valuePlacements.valueIdsByContainerId.get(
         collectionValueId
@@ -145273,16 +145550,62 @@ function lowerRowBackedDefault(context, member, backed, baseData3, binding) {
   );
 }
 function foreignDelegateCopy(context, member, expression, binding) {
-  if (member.kind !== "delegate") return null;
-  const path = memberPath2(annotatedValue(expression).expression);
-  const parts = path?.split(".");
-  if (path === null || parts?.length !== 2) return null;
-  const owner = context.classesByName.get(parts[0]);
-  if (owner === void 0 || owner.id === binding.ownerClassId) return null;
-  const targetId = classSchemaMemberId(context, owner.id, parts[1]);
-  if (targetId === null) return null;
-  const target = context.members.get(targetId);
-  return target?.kind === "delegate" && target.modifier === "static" ? path : null;
+  let runtimeNames;
+  const declaringClass2 = binding.ownerClassId === void 0 ? void 0 : context.classes.get(binding.ownerClassId);
+  const visit = (source) => {
+    const value = annotatedValue(source).expression;
+    if (value.kind === "new") {
+      for (const argument2 of value.args) {
+        const copy = visit(argument2);
+        if (copy !== null) return copy;
+      }
+      for (const field of value.initializer ?? []) {
+        const copy = visit(field.value);
+        if (copy !== null) return copy;
+      }
+      return null;
+    }
+    if (value.kind === "litList") {
+      for (const entry of value.elements) {
+        const copy = visit(entry);
+        if (copy !== null) return copy;
+      }
+      return null;
+    }
+    if (value.kind === "litDict") {
+      for (const entry of value.entries) {
+        const copy = visit(entry.value);
+        if (copy !== null) return copy;
+      }
+      return null;
+    }
+    if (value.kind === "conditional")
+      return visit(value.whenTrue) ?? visit(value.whenFalse);
+    if (value.kind === "coalesce")
+      return visit(value.left) ?? visit(value.right);
+    if (value.kind === "force") return visit(value.operand);
+    const path = memberPath2(value);
+    if (path === null) return null;
+    const parts = path.split(".");
+    let ownerId;
+    let name;
+    if (parts.length === 1) {
+      if (member.modifier !== "static" && (runtimeNames ??= bindingRuntimeIdentifiers(context, binding)).has(path))
+        return null;
+      ownerId = binding.ownerClassId;
+      name = path;
+    } else if (parts.length === 2) {
+      ownerId = context.classesByName.get(parts[0])?.id;
+      name = parts[1];
+    } else return null;
+    if (ownerId === void 0) return null;
+    const targetId = classSchemaMemberId(context, ownerId, name);
+    if (targetId === null) return null;
+    if (declaringClass2?.schema[name] === targetId) return null;
+    const target = context.members.get(targetId);
+    return target?.kind === "delegate" && target.modifier === "static" ? { path, expression: value } : null;
+  };
+  return visit(expression);
 }
 function lowerStoredBinding(context, binding, memberValueIds, seeds) {
   const member = context.members.get(binding.memberId);
@@ -145310,8 +145633,8 @@ function lowerStoredBinding(context, binding, memberValueIds, seeds) {
   const foreign = foreignDelegateCopy(context, member, expression, binding);
   if (foreign !== null) {
     context.loweringFailures.push({
-      message: `Static delegate ${member.name} cannot copy ${foreign} from another Class; write () => ${foreign}() instead.`,
-      site: referenceSite(binding, expression)
+      message: `Initializer ${binding.label} cannot copy static delegate ${foreign.path} from another Class; write () => ${foreign.path}() instead.`,
+      site: referenceSite(binding, foreign.expression)
     });
     memberValueIds.set(
       binding.memberId,
@@ -153744,7 +154067,7 @@ function retainedLiteralCompiles(document, retained, owners, rootOwners, stored)
     );
     const key = JSON.stringify([
       getField(member, "id") ?? member,
-      ownerContext.ownerClass?.id ?? null,
+      ownerContext.declaringClass?.id ?? null,
       ownerContext.lexicalThisClass?.id ?? null,
       code
     ]);
@@ -153771,7 +154094,7 @@ function retainedLiteralFailure(args, records3, document, replayContext, compile
       valueId: compile.valueId,
       code: compile.code,
       member: compile.member,
-      initializerOwnerClass: compile.ownerContext.ownerClass,
+      initializerOwnerClass: compile.ownerContext.declaringClass,
       lexicalThisClass: compile.ownerContext.lexicalThisClass,
       evaluate: false,
       compilationProject
@@ -153986,6 +154309,12 @@ function materializeInitializersLocallyV4(args) {
     valuesById: batch.valuesById
   });
   for (const id2 of pendingRoots) {
+    const ownerContext = initializerOwnerContext(
+      authoredDocument,
+      id2,
+      walkedRootOwners,
+      batch.valuesById
+    );
     replayStoredConstructionV4({
       records: records3,
       document: authoredDocument,
@@ -153994,6 +154323,8 @@ function materializeInitializersLocallyV4(args) {
       compilationProject,
       replayContext: templateContext,
       member: rootOwners.get(id2),
+      initializerOwnerClass: ownerContext.declaringClass,
+      lexicalThisClass: ownerContext.lexicalThisClass,
       evaluate: false,
       onCompiledInitializer: (init) => compiledInitializers.set(id2, init)
     });
@@ -161173,6 +161504,11 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
     unavailableSlots: rootValues.unavailableSlots,
     registry: valueLowerRegistry
   });
+  prepareValueReferencePathsV4(rootPathResolutionState, manifest, {
+    registry: valueLowerRegistry,
+    analysis: projectAnalysisV4,
+    resolveRootPath
+  });
   if (collectionBindings !== void 0 && !(collectionBindings instanceof SchemaSourceError)) {
     const bindings = collectionBindings;
     const templateInitializer = (id2) => {
@@ -161185,10 +161521,19 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
     const rootRecordsById = new Map(
       rootRecords.filter((record7) => record7.recordKind === "value").map((record7) => [record7.recordId, record7])
     );
-    const rootMembers = /* @__PURE__ */ new Map();
+    const rootBindings = /* @__PURE__ */ new Map();
     for (const record7 of Object.values(rootPathResolutionState)) {
       if (record7.recordKind === "member" && isObjectRecord(record7.data) && typeof record7.data.valueId === "string")
-        rootMembers.set(record7.data.valueId, record7.recordId);
+        rootBindings.set(record7.data.valueId, {
+          memberId: record7.recordId,
+          rootId: record7.data.valueId
+        });
+    }
+    for (const [memberId, seed] of authoredValueSeeds) {
+      if (seed.valueId === void 0) continue;
+      const binding = { memberId, rootId: seed.valueId };
+      rootBindings.set(seed.valueId, binding);
+      for (const row of seed.values ?? []) rootBindings.set(row.id, binding);
     }
     for (const row of collectionBindings.rows.values()) {
       if (rootPathResolutionState[`value:${row.id}`] === void 0) continue;
@@ -161204,11 +161549,21 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
           fileFields: { ...row }
         });
     }
-    for (const [rootId, rowIds] of collectionBindings.pathRowsByRootId) {
-      const memberId = rootMembers.get(rootId);
+    const pathsByBinding = /* @__PURE__ */ new Map();
+    for (const [pathRootId, rowIds] of collectionBindings.pathRowsByRootId) {
+      const binding = rootBindings.get(pathRootId);
+      const rootId = binding?.rootId ?? pathRootId;
+      let paths = pathsByBinding.get(rootId);
+      if (paths === void 0) {
+        paths = { memberId: binding?.memberId, rowIds: /* @__PURE__ */ new Set() };
+        pathsByBinding.set(rootId, paths);
+      }
+      for (const id2 of rowIds) paths.rowIds.add(id2);
+    }
+    for (const [rootId, { memberId, rowIds }] of pathsByBinding) {
       const root = collectionBindings.rowForValue(rootId);
-      if (memberId === void 0 || root === void 0) continue;
-      const seed = authoredValueSeeds.get(memberId);
+      if (root === void 0) continue;
+      const seed = memberId === void 0 ? void 0 : bindingSeeds.get(memberId);
       const rows = new Map((seed?.values ?? []).map((row) => [row.id, row]));
       const copiedById = /* @__PURE__ */ new Map();
       const insideInitializerCopy = (id2) => {
@@ -161234,7 +161589,8 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
       for (const id2 of rowIds) {
         if (id2 === rootId) continue;
         const location3 = collectionBindings.locationForValue(id2);
-        if (location3 === void 0) continue;
+        const rowMemberId = location3?.memberId ?? rows.get(id2)?.memberId;
+        if (rowMemberId === void 0) continue;
         if (insideInitializerCopy(id2)) continue;
         const row = collectionBindings.rowForValue(id2);
         if (row === void 0)
@@ -161251,13 +161607,13 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
               containerId: row.containerId,
               genericBindings: row.genericBindings
             },
-            location3.memberId
+            rowMemberId
           );
           rows.set(id2, authored2);
           if (isNew) valueLowerRegistry.pendingValues.set(id2, authored2);
           continue;
         }
-        const classId = row.classId ?? (isClassTypedMember(location3.member) ? location3.member.classId : null);
+        const classId = row.classId ?? (location3 !== void 0 && isClassTypedMember(location3.member) ? location3.member.classId : null);
         const authored = staticValueSeedRow(
           {
             ...row,
@@ -161267,11 +161623,25 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
               instanceConstructorId: row.instanceConstructorId ?? null
             } : {}
           },
-          location3.memberId
+          rowMemberId
         );
         rows.set(id2, authored);
         if (isNew) valueLowerRegistry.pendingValues.set(id2, authored);
       }
+      if (memberId === void 0) {
+        for (const row of rows.values()) {
+          if (rootPathResolutionState[`value:${row.id}`] !== void 0)
+            continue;
+          rootRecords.push({
+            recordKind: "value",
+            recordId: row.id,
+            file: "Root.neo",
+            line: 1,
+            fileFields: { id: row.id, ...encodeStoredValueRowFields(row) }
+          });
+        }
+        continue;
+      }
       bindingSeeds.set(memberId, {
         ...seed,
         nodeType: "literal",
@@ -161999,8 +162369,9 @@ function replayAnimationDeclarationInitializersV4(records3, document, fallbackVa
       rootOwners,
       valuesById
     );
-    const initializerOwnerClass = ownerContext.ownerClass;
-    const requiredConstructor = initializerOwnerClass?.requiredConstructorId === void 0 || initializerOwnerClass.requiredConstructorId === null ? void 0 : constructorsById.get(initializerOwnerClass.requiredConstructorId);
+    const initializerOwnerClass = ownerContext.declaringClass;
+    const requiredConstructorId2 = ownerContext.lexicalThisClass?.requiredConstructorId;
+    const requiredConstructor = requiredConstructorId2 == null ? void 0 : constructorsById.get(requiredConstructorId2);
     const requiredArgumentNames = new Set(
       requiredConstructor?.argumentTypes.map((argument2) => argument2.name) ?? []
     );
@@ -168114,11 +168485,11 @@ function membersForType(snapshot, type) {
       (member) => member.id === cloneId ? cloneSymbol(named, type) : member
     );
   }
-  if (type.kind === "named") {
-    const named = snapshot.project.typeById.get(type.typeId);
-    if (!named) return [];
-    let members = named.members.filter((member) => member.static !== true);
-    if (type.typeArguments?.length)
+  if (type.kind === "named" || type.kind === "typeParameter") {
+    const named = type.kind === "named" ? snapshot.project.typeById.get(type.typeId) : void 0;
+    if (type.kind === "named" && !named) return [];
+    let members = named?.members.filter((member) => member.static !== true) ?? [];
+    if (type.kind === "named" && type.typeArguments?.length && named)
       members = members.map((member) => {
         return {
           ...member,
@@ -168165,7 +168536,7 @@ function membersForType(snapshot, type) {
         }
       }
     }
-    if (named.kind === "class") {
+    if (named?.kind === "class") {
       members = members.filter(
         (member) => member.name !== NEOSCRIPT_CLASS_ID_MEMBER
       );
@@ -168229,8 +168600,16 @@ function resolveMemberOf(snapshot, reference2, receiver) {
     const symbol = enumMemberNamed(receiver.type, reference2.name);
     return symbol ? { type: symbol.type, symbol } : null;
   }
-  const member = resolveMember3(snapshot, receiver.resolution, reference2.name);
-  const call = scriptFeatureIndex(snapshot).calls.get(reference2.start);
+  const index = scriptFeatureIndex(snapshot);
+  const tokenIndex = index.tokenIndexes.get(reference2.start);
+  const dotOffset = tokenIndex === void 0 ? void 0 : index.tokens[tokenIndex - 1]?.start;
+  const member = resolveMember3(
+    snapshot,
+    receiver.resolution,
+    reference2.name,
+    dotOffset
+  );
+  const call = index.calls.get(reference2.start);
   return specializeGenericCall(snapshot, member, call?.typeArgumentTokens);
 }
 function isKnownMemberReceiver(snapshot, receiver) {
@@ -168444,7 +168823,12 @@ function resolveChain(snapshot, tokens, offset, expectedType) {
     if (token.kind === "punctuation" && token.text === "." || token.kind === "operator" && token.text === "?.") {
       const member = tokens[cursor + 1];
       if (!member || member.kind !== "identifier") break;
-      const resolved = resolveMember3(snapshot, current, member.text);
+      const resolved = resolveMember3(
+        snapshot,
+        current,
+        member.text,
+        token.start
+      );
       if (!resolved) {
         const nextRoot = member.range.start.line > token.range.end.line ? resolveRoot(snapshot, member.text, member.start) : null;
         if (!nextRoot) return null;
@@ -168686,7 +169070,7 @@ function contextualTypeParameters(snapshot) {
   if (thisClass?.kind !== "named") return [];
   return snapshot.project.typeById.get(thisClass.typeId)?.typeParameters ?? [];
 }
-function resolveMember3(snapshot, receiver, name) {
+function resolveMember3(snapshot, receiver, name, flowOffset) {
   if (receiver.indexSurface) {
     const index = indexesFor(snapshot, receiver.indexSurface.memberId).find(
       (candidate) => candidate.name === name
@@ -168707,10 +169091,9 @@ function resolveMember3(snapshot, receiver, name) {
   ) : membersForType(snapshot, receiver.type)).find((candidate) => candidate.name === name);
   if (!member || receiver.symbol?.name === "base" && !isConcreteBaseMember(member))
     return null;
-  return {
-    type: member.returnType ?? member.type,
-    symbol: member
-  };
+  const flow = flowOffset === void 0 ? void 0 : flowProbe(snapshot).locals.get(flowOffset);
+  const type = flow?.name === name ? flow.type : member.returnType ?? member.type;
+  return { type, symbol: { ...member, type } };
 }
 function scopeAt(snapshot, offset, name) {
   const result = [];
@@ -186037,7 +186420,7 @@ function spellClassInterfaceConstructions(ctx, classId, env) {
       path
     );
     if (saved === null) continue;
-    const list = [interfaceConstruction2(ctx, interfaceId, name, saved, false)];
+    const list = [interfaceConstruction(ctx, interfaceId, name, saved, false)];
     const inherited = parentClassId === void 0 ? void 0 : index.construction(parentClassId, interfaceId);
     const readOnly = inherited === void 0 ? null : interfaceConstructionArguments(
       ctx,
@@ -186049,13 +186432,13 @@ function spellClassInterfaceConstructions(ctx, classId, env) {
       false
     );
     if (readOnly !== null && readOnly.join() !== saved.join()) {
-      list.push(interfaceConstruction2(ctx, interfaceId, name, readOnly, true));
+      list.push(interfaceConstruction(ctx, interfaceId, name, readOnly, true));
     }
     result.set(interfaceId, list);
   }
   return result;
 }
-function interfaceConstruction2(ctx, interfaceId, name, args, readOnlyView) {
+function interfaceConstruction(ctx, interfaceId, name, args, readOnlyView) {
   const params = ctx.exportData.interfaces[interfaceId]?.genericParams ?? [];
   const suffix = args.length === 0 ? "" : `<${args.join(", ")}>`;
   return {
@@ -216475,7 +216858,7 @@ var releaseWorkspaceLock = () => void 0;
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.84.4");
+    console.log("0.84.5");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {