@typespec/compiler 0.56.0-dev.2 → 0.56.0-dev.20

package/dist/src/core/checker.js

@@ -1,10 +1,5 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _PendingResolutions_data;
-import { $docFromComment, getIndexer, isArrayModelType } from "../lib/decorators.js";
+import { $docFromComment, isArrayModelType } from "../lib/decorators.js";
+import { getIndexer } from "../lib/intrinsic-decorators.js";
 import { MultiKeyMap, createRekeyableMap, isArray, mutate } from "../utils/misc.js";
 import { createSymbol, createSymbolTable } from "./binder.js";
 import { createChangeIdentifierCodeFix } from "./compiler-code-fixes/change-identifier.codefix.js";
@@ -82,9 +77,6 @@ export function createChecker(program) {
     }
     const typespecNamespaceBinding = globalNamespaceNode.symbol.exports.get("TypeSpec");
     if (typespecNamespaceBinding) {
-        // the TypeSpec namespace binding will be absent if we've passed
-        // the no-std-lib option.
-        // the first declaration here is the JS file for the TypeSpec script.
         initializeTypeSpecIntrinsics();
         for (const file of program.sourceFiles.values()) {
             addUsingSymbols(typespecNamespaceBinding.exports, file.locals);
@@ -151,12 +143,11 @@ export function createChecker(program) {
         getSymbolLinks(nullSym).type = nullType;
     }
     function getStdType(name) {
-        var _a;
         const type = stdTypes[name];
         if (type !== undefined) {
             return type;
         }
-        const sym = (_a = typespecNamespaceBinding === null || typespecNamespaceBinding === void 0 ? void 0 : typespecNamespaceBinding.exports) === null || _a === void 0 ? void 0 : _a.get(name);
+        const sym = typespecNamespaceBinding?.exports?.get(name);
         if (sym && sym.flags & 2 /* SymbolFlags.Model */) {
             checkModelStatement(sym.declarations[0], undefined);
         }
@@ -295,10 +286,9 @@ export function createChecker(program) {
      * @returns Checked type for the given member symbol.
      */
     function checkMemberSym(sym, mapper) {
-        var _a;
         const symbolLinks = getSymbolLinks(sym);
         const memberContainer = getTypeForNode(sym.parent.declarations[0], mapper);
-        const type = (_a = symbolLinks.declaredType) !== null && _a !== void 0 ? _a : symbolLinks.type;
+        const type = symbolLinks.declaredType ?? symbolLinks.type;
         if (type) {
             return type;
         }
@@ -397,22 +387,20 @@ export function createChecker(program) {
      * Return a fully qualified id of node
      */
     function getNodeSymId(node) {
-        var _a;
         const symbol = node.kind === SyntaxKind.OperationStatement &&
-            ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.kind) === SyntaxKind.InterfaceStatement
+            node.parent?.kind === SyntaxKind.InterfaceStatement
             ? getSymbolForMember(node)
             : node.symbol;
         // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
-        return symbol === null || symbol === void 0 ? void 0 : symbol.id;
+        return symbol?.id;
     }
     /**
      * Check if the given namespace is the standard library `TypeSpec` namespace.
      */
     function isTypeSpecNamespace(namespace) {
-        var _a;
         return (namespace.name === "TypeSpec" &&
             (namespace.namespace === globalNamespaceType ||
-                ((_a = namespace.namespace) === null || _a === void 0 ? void 0 : _a.projectionBase) === globalNamespaceType));
+                namespace.namespace?.projectionBase === globalNamespaceType));
     }
     /**
      * Check if the given type is defined right in the TypeSpec namespace.
@@ -421,7 +409,6 @@ export function createChecker(program) {
         return Boolean(type.namespace && isTypeSpecNamespace(type.namespace));
     }
     function checkTemplateParameterDeclaration(node, mapper) {
-        var _a;
         const parentNode = node.parent;
         const grandParentNode = parentNode.parent;
         const links = getSymbolLinks(node.symbol);
@@ -438,7 +425,7 @@ export function createChecker(program) {
         let type = links.declaredType;
         if (type === undefined) {
             if (grandParentNode) {
-                if ((_a = grandParentNode.locals) === null || _a === void 0 ? void 0 : _a.has(node.id.sv)) {
+                if (grandParentNode.locals?.has(node.id.sv)) {
                     reportCheckerDiagnostic(createDiagnostic({
                         code: "shadow",
                         format: { name: node.id.sv },
@@ -472,7 +459,6 @@ export function createChecker(program) {
         return getTypeForNode(node.default, mapper);
     }
     function checkTemplateParameterDefault(nodeDefault, templateParameters, index, constraint) {
-        var _a;
         function visit(node) {
             const type = getTypeForNode(node);
             let hasError = false;
@@ -493,7 +479,7 @@ export function createChecker(program) {
             });
             return hasError ? undefined : type;
         }
-        const type = (_a = visit(nodeDefault)) !== null && _a !== void 0 ? _a : errorType;
+        const type = visit(nodeDefault) ?? errorType;
         if (!isErrorType(type) && constraint) {
             checkTypeAssignable(type, constraint, nodeDefault);
         }
@@ -546,13 +532,12 @@ export function createChecker(program) {
     }
     function isTypeReferenceContextDeprecated(node) {
         function checkDeprecatedNode(node) {
-            var _a;
             // Perform a simple check if the parent node is deprecated.  We do this
             // out of band because `checkDirectives` usually gets called on the parent
             // type after child types have already been checked (including their
             // deprecations).
             if (!nodeDeprecationMap.has(node)) {
-                nodeDeprecationMap.set(node, ((_a = node.directives) !== null && _a !== void 0 ? _a : []).findIndex((d) => d.target.sv === "deprecated") >= 0);
+                nodeDeprecationMap.set(node, (node.directives ?? []).findIndex((d) => d.target.sv === "deprecated") >= 0);
             }
             return nodeDeprecationMap.get(node);
         }
@@ -580,8 +565,6 @@ export function createChecker(program) {
         }
     }
     function checkTemplateInstantiationArgs(node, args, decls, mapper) {
-        var _a, _b, _c, _d;
-        var _e;
         const params = new Map();
         const positional = [];
         const initMap = new Map(decls.map(function (decl) {
@@ -646,7 +629,7 @@ export function createChecker(program) {
                     continue;
                 }
                 const param = positional[idx];
-                (_a = (_e = initMap.get(param)).checkArgument) !== null && _a !== void 0 ? _a : (_e.checkArgument = deferredCheck);
+                initMap.get(param).checkArgument ??= deferredCheck;
             }
         }
         const finalMap = initMap;
@@ -674,7 +657,7 @@ export function createChecker(program) {
                         target: node,
                     }));
                     // TODO-TIM check if we expose this below
-                    commit(param, ((_b = param.constraint) === null || _b === void 0 ? void 0 : _b.kind) === "Value" ? unknownType : (_c = param.constraint) !== null && _c !== void 0 ? _c : unknownType);
+                    commit(param, param.constraint?.kind === "Value" ? unknownType : param.constraint ?? unknownType);
                 }
                 continue;
             }
@@ -685,7 +668,7 @@ export function createChecker(program) {
                     : param.constraint;
                 if (!checkTypeAssignable(type, constraint, argNode)) {
                     // TODO-TIM check if we expose this below
-                    const effectiveType = ((_d = param.constraint) === null || _d === void 0 ? void 0 : _d.kind) === "Value" ? unknownType : param.constraint;
+                    const effectiveType = param.constraint?.kind === "Value" ? unknownType : param.constraint;
                     commit(param, effectiveType);
                     continue;
                 }
@@ -794,7 +777,7 @@ export function createChecker(program) {
         // Check for deprecations here, first on symbol, then on type.  However,
         // don't raise deprecation when the usage site is also a deprecated
         // declaration.
-        const declarationNode = sym === null || sym === void 0 ? void 0 : sym.declarations[0];
+        const declarationNode = sym?.declarations[0];
         if (declarationNode && mapper === undefined) {
             if (!isTypeReferenceContextDeprecated(node.parent)) {
                 checkDeprecated(baseType, declarationNode, node);
@@ -846,7 +829,6 @@ export function createChecker(program) {
                             : checkUnion(node, mapper);
     }
     function getOrInstantiateTemplate(templateNode, params, args, parentMapper, instantiateTempalates = true) {
-        var _a;
         const symbolLinks = templateNode.kind === SyntaxKind.OperationStatement &&
             templateNode.parent.kind === SyntaxKind.InterfaceStatement
             ? getSymbolLinksForMember(templateNode)
@@ -862,7 +844,7 @@ export function createChecker(program) {
             }
         }
         const mapper = createTypeMapper(params, args, parentMapper);
-        const cached = (_a = symbolLinks.instantiations) === null || _a === void 0 ? void 0 : _a.get(mapper.args);
+        const cached = symbolLinks.instantiations?.get(mapper.args);
         if (cached) {
             return cached;
         }
@@ -968,7 +950,7 @@ export function createChecker(program) {
             node,
             target: checkFunctionParameter(node.target, mapper),
             parameters: node.parameters.map((x) => checkFunctionParameter(x, mapper)),
-            implementation: implementation !== null && implementation !== void 0 ? implementation : (() => { }),
+            implementation: implementation ?? (() => { }),
         });
         namespace.decoratorDeclarations.set(name, decoratorType);
         linkType(links, decoratorType, mapper);
@@ -998,7 +980,7 @@ export function createChecker(program) {
             node,
             parameters: node.parameters.map((x) => checkFunctionParameter(x, mapper)),
             returnType: node.returnType ? getTypeForNode(node.returnType, mapper) : unknownType,
-            implementation: implementation !== null && implementation !== void 0 ? implementation : (() => { }),
+            implementation: implementation ?? (() => { }),
         });
         namespace.functionDeclarations.set(name, functionType);
         linkType(links, functionType, mapper);
@@ -1045,6 +1027,7 @@ export function createChecker(program) {
             properties: properties,
             decorators: [],
             derivedModels: [],
+            sourceModels: [],
         });
         const indexers = [];
         const modelOptions = options.filter((entry) => {
@@ -1073,6 +1056,7 @@ export function createChecker(program) {
             }
         }
         for (const [_, option] of modelOptions) {
+            intersection.sourceModels.push({ usage: "intersection", model: option });
             const allProps = walkPropertiesInherited(option);
             for (const prop of allProps) {
                 if (properties.has(prop.name)) {
@@ -1161,7 +1145,7 @@ export function createChecker(program) {
                 type.decorators = type.decorators.concat(checkDecorators(type, sourceNode, undefined));
             }
             finishType(type);
-            namespace === null || namespace === void 0 ? void 0 : namespace.namespaces.set(name, type);
+            namespace?.namespaces.set(name, type);
         }
         return symbolLinks.type;
     }
@@ -1214,8 +1198,7 @@ export function createChecker(program) {
         return symbolLinks.type;
     }
     function checkOperation(node, mapper, parentInterface) {
-        var _a;
-        const inInterface = ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.kind) === SyntaxKind.InterfaceStatement;
+        const inInterface = node.parent?.kind === SyntaxKind.InterfaceStatement;
         const symbol = inInterface ? getSymbolForMember(node) : node.symbol;
         const links = symbol && getSymbolLinks(symbol);
         if (links) {
@@ -1225,7 +1208,7 @@ export function createChecker(program) {
             }
         }
         if (mapper === undefined && inInterface) {
-            compilerAssert(parentInterface, "Operation in interface should already have been checked.");
+            compilerAssert(parentInterface, "Operation in interface should already have been checked.", node.parent);
         }
         checkTemplateDeclaration(node, mapper);
         // If we are instantating operation inside of interface
@@ -1240,26 +1223,37 @@ export function createChecker(program) {
         if (node.signature.kind === SyntaxKind.OperationSignatureReference) {
             // Attempt to resolve the operation
             const baseOperation = checkOperationIs(node, node.signature.baseOperation, mapper);
-            if (!baseOperation) {
-                return errorType;
+            if (baseOperation) {
+                sourceOperation = baseOperation;
+                const parameterModelSym = getOrCreateAugmentedSymbolTable(symbol.metatypeMembers).get("parameters");
+                // Reference the same return type and create the parameters type
+                const clone = initializeClone(baseOperation.parameters, {
+                    properties: createRekeyableMap(),
+                });
+                clone.properties = createRekeyableMap(Array.from(baseOperation.parameters.properties.entries()).map(([key, prop]) => [
+                    key,
+                    cloneTypeForSymbol(getMemberSymbol(parameterModelSym, prop.name), prop, {
+                        model: clone,
+                        sourceProperty: prop,
+                    }),
+                ]));
+                parameters = finishType(clone);
+                returnType = baseOperation.returnType;
+                // Copy decorators from the base operation, inserting the base decorators first
+                decorators = [...baseOperation.decorators];
+            }
+            else {
+                // If we can't resolve the signature we return an empty model.
+                parameters = createAndFinishType({
+                    kind: "Model",
+                    name: "",
+                    decorators: [],
+                    properties: createRekeyableMap(),
+                    derivedModels: [],
+                    sourceModels: [],
+                });
+                returnType = voidType;
             }
-            sourceOperation = baseOperation;
-            const parameterModelSym = getOrCreateAugmentedSymbolTable(symbol.metatypeMembers).get("parameters");
-            // Reference the same return type and create the parameters type
-            const clone = initializeClone(baseOperation.parameters, {
-                properties: createRekeyableMap(),
-            });
-            clone.properties = createRekeyableMap(Array.from(baseOperation.parameters.properties.entries()).map(([key, prop]) => [
-                key,
-                cloneTypeForSymbol(getMemberSymbol(parameterModelSym, prop.name), prop, {
-                    model: clone,
-                    sourceProperty: prop,
-                }),
-            ]));
-            parameters = finishType(clone);
-            returnType = baseOperation.returnType;
-            // Copy decorators from the base operation, inserting the base decorators first
-            decorators = [...baseOperation.decorators];
         }
         else {
             parameters = getTypeForNode(node.signature.parameters, mapper);
@@ -1294,7 +1288,7 @@ export function createChecker(program) {
                 finishType(operationType);
             }
             if (mapper === undefined) {
-                namespace === null || namespace === void 0 ? void 0 : namespace.operations.set(name, operationType);
+                namespace?.operations.set(name, operationType);
             }
         }
         return operationType;
@@ -1366,11 +1360,10 @@ export function createChecker(program) {
         return s.id;
     }
     function resolveIdentifierInTable(node, table, options) {
-        var _a, _b;
         if (!table) {
             return undefined;
         }
-        table = (_a = augmentedSymbolTables.get(table)) !== null && _a !== void 0 ? _a : table;
+        table = augmentedSymbolTables.get(table) ?? table;
         let sym;
         if (options.resolveDecorators) {
             sym = table.get("@" + node.sv);
@@ -1381,7 +1374,7 @@ export function createChecker(program) {
         if (!sym)
             return sym;
         if (sym.flags & 1048576 /* SymbolFlags.DuplicateUsing */) {
-            reportAmbiguousIdentifier(node, [...((_b = table.duplicates.get(sym)) !== null && _b !== void 0 ? _b : [])]);
+            reportAmbiguousIdentifier(node, [...(table.duplicates.get(sym) ?? [])]);
             return sym;
         }
         return getMergedSymbol(sym);
@@ -1395,7 +1388,6 @@ export function createChecker(program) {
         }));
     }
     function resolveIdentifier(id, mapper) {
-        var _a, _b, _c;
         let sym;
         const { node, kind } = getIdentifierContext(id);
         switch (kind) {
@@ -1418,7 +1410,7 @@ export function createChecker(program) {
                     return undefined;
                 }
                 lateBindMembers(containerType, container);
-                sym = resolveIdentifierInTable(id, (_a = container.exports) !== null && _a !== void 0 ? _a : container.members, defaultSymbolResolutionOptions);
+                sym = resolveIdentifierInTable(id, container.exports ?? container.members, defaultSymbolResolutionOptions);
                 break;
             case IdentifierKind.Other:
                 return undefined;
@@ -1428,7 +1420,7 @@ export function createChecker(program) {
             case IdentifierKind.TypeReference:
                 let ref = id;
                 let resolveDecorator = kind === IdentifierKind.Decorator;
-                if (((_b = id.parent) === null || _b === void 0 ? void 0 : _b.kind) === SyntaxKind.MemberExpression) {
+                if (id.parent?.kind === SyntaxKind.MemberExpression) {
                     if (id.parent.id === id) {
                         // If the identifier is Y in X.Y, then resolve (X.Y).
                         ref = id.parent;
@@ -1454,15 +1446,13 @@ export function createChecker(program) {
                 const _assertNever = kind;
                 compilerAssert(false, "Unreachable");
         }
-        return (_c = sym === null || sym === void 0 ? void 0 : sym.symbolSource) !== null && _c !== void 0 ? _c : sym;
+        return sym?.symbolSource ?? sym;
     }
     function getTemplateDeclarationsForArgument(node, mapper) {
-        var _a;
         const resolved = resolveTypeReferenceSym(node.parent, mapper, false);
-        return ((_a = resolved === null || resolved === void 0 ? void 0 : resolved.declarations.filter((n) => isTemplatedNode(n))) !== null && _a !== void 0 ? _a : []);
+        return (resolved?.declarations.filter((n) => isTemplatedNode(n)) ?? []);
     }
     function resolveCompletions(identifier) {
-        var _a, _b, _c;
         const completions = new Map();
         const { kind, node: ancestor } = getIdentifierContext(identifier);
         switch (kind) {
@@ -1496,13 +1486,13 @@ export function createChecker(program) {
                 }
                 if (base) {
                     if (isTemplatedNode(base.declarations[0])) {
-                        const type = (_a = base.type) !== null && _a !== void 0 ? _a : getTypeForNode(base.declarations[0], undefined);
+                        const type = base.type ?? getTypeForNode(base.declarations[0], undefined);
                         if (isTemplateInstance(type)) {
                             lateBindMemberContainer(type);
                             lateBindMembers(type, base);
                         }
                     }
-                    addCompletions((_b = base.exports) !== null && _b !== void 0 ? _b : base.members);
+                    addCompletions(base.exports ?? base.members);
                 }
             }
         }
@@ -1511,7 +1501,7 @@ export function createChecker(program) {
             // to avoid completing the name of the argument again.
             if (kind === IdentifierKind.TypeReference &&
                 exprIsBareIdentifier(ancestor) &&
-                ((_c = ancestor.parent) === null || _c === void 0 ? void 0 : _c.kind) === SyntaxKind.TemplateArgument &&
+                ancestor.parent?.kind === SyntaxKind.TemplateArgument &&
                 ancestor.parent.name === undefined) {
                 const templates = getTemplateDeclarationsForArgument(ancestor.parent, undefined);
                 for (const template of templates) {
@@ -1545,11 +1535,10 @@ export function createChecker(program) {
         }
         return completions;
         function addCompletions(table) {
-            var _a;
             if (!table) {
                 return;
             }
-            table = (_a = augmentedSymbolTables.get(table)) !== null && _a !== void 0 ? _a : table;
+            table = augmentedSymbolTables.get(table) ?? table;
             for (const [key, sym] of table) {
                 if (sym.flags & 1048576 /* SymbolFlags.DuplicateUsing */) {
                     const duplicates = table.duplicates.get(sym);
@@ -1598,8 +1587,7 @@ export function createChecker(program) {
         }
     }
     function resolveIdentifierInScope(node, mapper, options) {
-        var _a;
-        compilerAssert(((_a = node.parent) === null || _a === void 0 ? void 0 : _a.kind) !== SyntaxKind.MemberExpression || node.parent.id !== node, "This function should not be used to resolve Y in member expression X.Y. Use resolveIdentifier() to resolve an arbitrary identifier.");
+        compilerAssert(node.parent?.kind !== SyntaxKind.MemberExpression || node.parent.id !== node, "This function should not be used to resolve Y in member expression X.Y. Use resolveIdentifier() to resolve an arbitrary identifier.");
         if (hasParseError(node)) {
             // Don't report synthetic identifiers used for parser error recovery.
             // The parse error is the root cause and will already have been logged.
@@ -1665,7 +1653,7 @@ export function createChecker(program) {
     function resolveTypeReferenceSym(node, mapper, options) {
         const resolvedOptions = typeof options === "boolean"
             ? { ...defaultSymbolResolutionOptions, resolveDecorators: options }
-            : { ...defaultSymbolResolutionOptions, ...(options !== null && options !== void 0 ? options : {}) };
+            : { ...defaultSymbolResolutionOptions, ...(options ?? {}) };
         if (mapper === undefined && resolvedOptions.checkTemplateTypes && referenceSymCache.has(node)) {
             return referenceSymCache.get(node);
         }
@@ -1691,10 +1679,22 @@ export function createChecker(program) {
             }
             // when resolving a type reference based on an alias, unwrap the alias.
             if (base.flags & 2048 /* SymbolFlags.Alias */) {
-                base = getAliasedSymbol(base, mapper, options);
-                if (!base) {
+                const aliasedSym = getAliasedSymbol(base, mapper, options);
+                if (!aliasedSym) {
+                    reportCheckerDiagnostic(createDiagnostic({
+                        code: "invalid-ref",
+                        messageId: "node",
+                        format: {
+                            id: node.id.sv,
+                            nodeName: base.declarations[0]
+                                ? SyntaxKind[base.declarations[0].kind]
+                                : "Unknown node",
+                        },
+                        target: node,
+                    }));
                     return undefined;
                 }
+                base = aliasedSym;
             }
             if (node.selector === ".") {
                 return resolveMemberInContainer(node, base, mapper, options);
@@ -1819,16 +1819,22 @@ export function createChecker(program) {
      * instantiation) we late bind the container which creates the symbol that will hold its members.
      */
     function getAliasedSymbol(aliasSymbol, mapper, options) {
-        var _a;
         let current = aliasSymbol;
         while (current.flags & 2048 /* SymbolFlags.Alias */) {
             const node = current.declarations[0];
             const targetNode = node.kind === SyntaxKind.AliasStatement ? node.value : node;
-            const sym = resolveTypeReferenceSymInternal(targetNode, mapper, options);
-            if (sym === undefined) {
+            if (targetNode.kind === SyntaxKind.TypeReference ||
+                targetNode.kind === SyntaxKind.MemberExpression ||
+                targetNode.kind === SyntaxKind.Identifier) {
+                const sym = resolveTypeReferenceSymInternal(targetNode, mapper, options);
+                if (sym === undefined) {
+                    return undefined;
+                }
+                current = sym;
+            }
+            else {
                 return undefined;
             }
-            current = sym;
         }
         const sym = current;
         const node = aliasSymbol.declarations[0];
@@ -1853,7 +1859,7 @@ export function createChecker(program) {
             default:
                 // get the symbol from the node aliased type's node, or just return the base
                 // if it doesn't have a symbol (which will likely result in an error later on)
-                return (_a = getMergedSymbol(aliasType.node.symbol)) !== null && _a !== void 0 ? _a : aliasSymbol;
+                return getMergedSymbol(aliasType.node.symbol) ?? aliasSymbol;
         }
     }
     function checkStringTemplateExpresion(node, mapper) {
@@ -1895,7 +1901,6 @@ export function createChecker(program) {
         return getLiteralType(bool);
     }
     function checkProgram() {
-        var _a, _b;
         program.reportDuplicateSymbols(globalNamespaceNode.symbol.exports);
         for (const file of program.sourceFiles.values()) {
             bindAllMembers(file);
@@ -1905,7 +1910,7 @@ export function createChecker(program) {
         }
         for (const file of program.sourceFiles.values()) {
             for (const ns of file.namespaces) {
-                const exports = (_b = (_a = mergedSymbols.get(ns.symbol)) === null || _a === void 0 ? void 0 : _a.exports) !== null && _b !== void 0 ? _b : ns.symbol.exports;
+                const exports = mergedSymbols.get(ns.symbol)?.exports ?? ns.symbol.exports;
                 program.reportDuplicateSymbols(exports);
                 initializeTypeForNamespace(ns);
             }
@@ -1967,7 +1972,6 @@ export function createChecker(program) {
         }
     }
     function checkModelStatement(node, mapper) {
-        var _a;
         const links = getSymbolLinks(node.symbol);
         if (links.declaredType && mapper === undefined) {
             // we're not instantiating this model and we've already checked it
@@ -1982,12 +1986,14 @@ export function createChecker(program) {
             properties: createRekeyableMap(),
             namespace: getParentNamespaceType(node),
             decorators,
+            sourceModels: [],
             derivedModels: [],
         });
         linkType(links, type, mapper);
         const isBase = checkModelIs(node, node.is, mapper);
         if (isBase) {
             type.sourceModel = isBase;
+            type.sourceModels.push({ usage: "is", model: isBase });
             // copy decorators
             decorators.push(...isBase.decorators);
             if (isBase.indexer) {
@@ -2020,7 +2026,7 @@ export function createChecker(program) {
         // Hold on to the model type that's being defined so that it
         // can be referenced
         if (mapper === undefined) {
-            (_a = type.namespace) === null || _a === void 0 ? void 0 : _a.models.set(type.name, type);
+            type.namespace?.models.set(type.name, type);
         }
         // Evaluate the properties after
         checkModelProperties(node, type.properties, type, mapper);
@@ -2063,6 +2069,7 @@ export function createChecker(program) {
             namespace: getParentNamespaceType(node),
             decorators: [],
             derivedModels: [],
+            sourceModels: [],
         });
         checkModelProperties(node, properties, type, mapper);
         return finishType(type);
@@ -2170,7 +2177,7 @@ export function createChecker(program) {
             reportCheckerDiagnostic(createDiagnostic({
                 code: "duplicate-property",
                 format: { propName: newProp.name },
-                target: diagnosticTarget !== null && diagnosticTarget !== void 0 ? diagnosticTarget : newProp,
+                target: diagnosticTarget ?? newProp,
             }));
             return;
         }
@@ -2183,7 +2190,7 @@ export function createChecker(program) {
                 reportCheckerDiagnostic(createDiagnostic({
                     code: "override-property-mismatch",
                     format: { propName: newProp.name, propType: newPropType, parentType: parentType },
-                    target: diagnosticTarget !== null && diagnosticTarget !== void 0 ? diagnosticTarget : newProp,
+                    target: diagnosticTarget ?? newProp,
                 }));
                 return;
             }
@@ -2289,8 +2296,7 @@ export function createChecker(program) {
                 }
             }
             function copyMembers(table) {
-                var _a;
-                const members = (_a = augmentedSymbolTables.get(table)) !== null && _a !== void 0 ? _a : table;
+                const members = augmentedSymbolTables.get(table) ?? table;
                 for (const member of members.values()) {
                     bindMember(member.name, member.declarations[0], member.flags);
                 }
@@ -2298,14 +2304,13 @@ export function createChecker(program) {
             function bindMember(name, node, kind) {
                 const sym = createSymbol(node, name, kind, containerSym);
                 compilerAssert(containerSym.members, "containerSym.members is undefined");
-                containerMembers !== null && containerMembers !== void 0 ? containerMembers : (containerMembers = getOrCreateAugmentedSymbolTable(containerSym.members));
+                containerMembers ??= getOrCreateAugmentedSymbolTable(containerSym.members);
                 containerMembers.set(name, sym);
             }
         }
     }
     function copyMembersToContainer(targetContainerSym, table) {
-        var _a;
-        const members = (_a = augmentedSymbolTables.get(table)) !== null && _a !== void 0 ? _a : table;
+        const members = augmentedSymbolTables.get(table) ?? table;
         compilerAssert(targetContainerSym.members, "containerSym.members is undefined");
         const containerMembers = getOrCreateAugmentedSymbolTable(targetContainerSym.members);
         for (const member of members.values()) {
@@ -2320,7 +2325,6 @@ export function createChecker(program) {
     function bindMetaTypes(node) {
         const visited = new Set();
         function visit(node, symbol) {
-            var _a;
             if (visited.has(node)) {
                 return;
             }
@@ -2337,7 +2341,7 @@ export function createChecker(program) {
                     break;
                 }
                 case SyntaxKind.OperationStatement: {
-                    const sym = (_a = symbol !== null && symbol !== void 0 ? symbol : node.symbol) !== null && _a !== void 0 ? _a : getSymbolForMember(node);
+                    const sym = symbol ?? node.symbol ?? getSymbolForMember(node);
                     const table = getOrCreateAugmentedSymbolTable(sym.metatypeMembers);
                     if (node.signature.kind === SyntaxKind.OperationSignatureDeclaration) {
                         table.set("parameters", node.signature.parameters.symbol);
@@ -2424,7 +2428,7 @@ export function createChecker(program) {
             const sym = createSymbol(member.node, member.name, kind | 16777216 /* SymbolFlags.LateBound */, containerSym);
             mutate(sym).type = member;
             compilerAssert(containerSym.members, "containerSym.members is undefined");
-            containerMembers !== null && containerMembers !== void 0 ? containerMembers : (containerMembers = getOrCreateAugmentedSymbolTable(containerSym.members));
+            containerMembers ??= getOrCreateAugmentedSymbolTable(containerSym.members);
             containerMembers.set(member.name, sym);
         }
     }
@@ -2548,6 +2552,7 @@ export function createChecker(program) {
                 target: targetNode,
             }));
         }
+        parentModel.sourceModels.push({ usage: "spread", model: targetType });
         const props = [];
         // copy each property
         for (const prop of walkPropertiesInherited(targetType)) {
@@ -2581,7 +2586,6 @@ export function createChecker(program) {
         }
     }
     function checkModelProperty(prop, mapper) {
-        var _a, _b, _c;
         const symId = getSymbolId(getSymbolForMember(prop));
         const links = getSymbolLinksForMember(prop);
         if (links && links.declaredType && mapper === undefined) {
@@ -2616,8 +2620,8 @@ export function createChecker(program) {
         const parentTemplate = getParentTemplateNode(prop);
         linkMapper(type, mapper);
         if (!parentTemplate || shouldCreateTypeForTemplate(parentTemplate, mapper)) {
-            if (((_b = (_a = prop.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.kind) === SyntaxKind.OperationSignatureDeclaration &&
-                ((_c = prop.parent.parent.parent) === null || _c === void 0 ? void 0 : _c.kind) === SyntaxKind.OperationStatement) {
+            if (prop.parent?.parent?.kind === SyntaxKind.OperationSignatureDeclaration &&
+                prop.parent.parent.parent?.kind === SyntaxKind.OperationStatement) {
                 const doc = extractParamDoc(prop.parent.parent.parent, type.name);
                 if (doc) {
                     type.decorators.unshift(createDocFromCommentDecorator("self", doc));
@@ -2674,7 +2678,6 @@ export function createChecker(program) {
         }
     }
     function checkDecorator(targetType, decNode, mapper) {
-        var _a;
         const sym = resolveTypeReferenceSym(decNode.target, undefined, true);
         if (!sym) {
             reportCheckerDiagnostic(createDiagnostic({
@@ -2697,7 +2700,7 @@ export function createChecker(program) {
         if (symbolLinks.declaredType === undefined) {
             const decoratorDeclNode = sym.declarations.find((x) => x.kind === SyntaxKind.DecoratorDeclarationStatement);
             if (decoratorDeclNode) {
-                checkDecoratorDeclaration(decoratorDeclNode, mapper);
+                checkDecoratorDeclaration(decoratorDeclNode, undefined);
             }
         }
         if (symbolLinks.declaredType) {
@@ -2710,13 +2713,12 @@ export function createChecker(program) {
         }
         return {
             definition: symbolLinks.declaredType,
-            decorator: (_a = sym.value) !== null && _a !== void 0 ? _a : ((...args) => { }),
+            decorator: sym.value ?? ((...args) => { }),
             node: decNode,
             args,
         };
     }
     function checkDecoratorUsage(targetType, declaration, args, decoratorNode) {
-        var _a;
         let hasError = false;
         const [targetValid] = isTypeAssignableTo(targetType, declaration.target.type, decoratorNode);
         if (!targetValid) {
@@ -2733,7 +2735,7 @@ export function createChecker(program) {
             }));
         }
         const minArgs = declaration.parameters.filter((x) => !x.optional && !x.rest).length;
-        const maxArgs = ((_a = declaration.parameters[declaration.parameters.length - 1]) === null || _a === void 0 ? void 0 : _a.rest)
+        const maxArgs = declaration.parameters[declaration.parameters.length - 1]?.rest
             ? undefined
             : declaration.parameters.length;
         if (args.length < minArgs || (maxArgs !== undefined && args.length > maxArgs)) {
@@ -2793,8 +2795,7 @@ export function createChecker(program) {
         return [hasError, resolvedArgs];
     }
     function getIndexType(type) {
-        var _a;
-        return type.kind === "Model" ? (_a = type.indexer) === null || _a === void 0 ? void 0 : _a.value : undefined;
+        return type.kind === "Model" ? type.indexer?.value : undefined;
     }
     function resolveDecoratorArgJsValue(value, valueOf) {
         if (valueOf) {
@@ -2822,8 +2823,7 @@ export function createChecker(program) {
         return valid;
     }
     function checkAugmentDecorators(sym, targetType, mapper) {
-        var _a;
-        const augmentDecoratorNodes = (_a = augmentDecoratorsForSym.get(sym)) !== null && _a !== void 0 ? _a : [];
+        const augmentDecoratorNodes = augmentDecoratorsForSym.get(sym) ?? [];
         const decorators = [];
         for (const decNode of augmentDecoratorNodes) {
             const decorator = checkDecorator(targetType, decNode, mapper);
@@ -2834,10 +2834,9 @@ export function createChecker(program) {
         return decorators;
     }
     function checkDecorators(targetType, node, mapper) {
-        var _a, _b;
-        const sym = isMemberNode(node) ? (_a = getSymbolForMember(node)) !== null && _a !== void 0 ? _a : node.symbol : node.symbol;
+        const sym = isMemberNode(node) ? getSymbolForMember(node) ?? node.symbol : node.symbol;
         const decorators = [];
-        const augmentDecoratorNodes = (_b = augmentDecoratorsForSym.get(sym)) !== null && _b !== void 0 ? _b : [];
+        const augmentDecoratorNodes = augmentDecoratorsForSym.get(sym) ?? [];
         const decoratorNodes = [
             ...augmentDecoratorNodes, // the first decorator will be executed at last, so augmented decorator should be placed at first.
             ...node.decorators,
@@ -2875,7 +2874,6 @@ export function createChecker(program) {
         });
     }
     function checkScalar(node, mapper) {
-        var _a;
         const links = getSymbolLinks(node.symbol);
         if (links.declaredType && mapper === undefined) {
             // we're not instantiating this model and we've already checked it
@@ -2901,7 +2899,7 @@ export function createChecker(program) {
         }
         decorators.push(...checkDecorators(type, node, mapper));
         if (mapper === undefined) {
-            (_a = type.namespace) === null || _a === void 0 ? void 0 : _a.scalars.set(type.name, type);
+            type.namespace?.scalars.set(type.name, type);
         }
         linkMapper(type, mapper);
         if (shouldCreateTypeForTemplate(node, mapper)) {
@@ -2966,7 +2964,6 @@ export function createChecker(program) {
         return type;
     }
     function checkEnum(node, mapper) {
-        var _a;
         const links = getSymbolLinks(node.symbol);
         if (!links.type) {
             const enumType = (links.type = createType({
@@ -3001,7 +2998,7 @@ export function createChecker(program) {
             }
             const namespace = getParentNamespaceType(node);
             enumType.namespace = namespace;
-            (_a = enumType.namespace) === null || _a === void 0 ? void 0 : _a.enums.set(enumType.name, enumType);
+            enumType.namespace?.enums.set(enumType.name, enumType);
             enumType.decorators = checkDecorators(enumType, node, mapper);
             linkMapper(enumType, mapper);
             finishType(enumType);
@@ -3009,7 +3006,6 @@ export function createChecker(program) {
         return links.type;
     }
     function checkInterface(node, mapper) {
-        var _a;
         const links = getSymbolLinks(node.symbol);
         if (links.declaredType && mapper === undefined) {
             // we're not instantiating this interface and we've already checked it
@@ -3063,7 +3059,7 @@ export function createChecker(program) {
             finishType(interfaceType);
         }
         if (mapper === undefined) {
-            (_a = interfaceType.namespace) === null || _a === void 0 ? void 0 : _a.interfaces.set(interfaceType.name, interfaceType);
+            interfaceType.namespace?.interfaces.set(interfaceType.name, interfaceType);
         }
         return interfaceType;
     }
@@ -3071,22 +3067,19 @@ export function createChecker(program) {
         const ownMembers = new Map();
         for (const opNode of node.operations) {
             const opType = checkOperation(opNode, mapper, interfaceType);
-            if (opType.kind === "Operation") {
-                if (ownMembers.has(opType.name)) {
-                    reportCheckerDiagnostic(createDiagnostic({
-                        code: "interface-duplicate",
-                        format: { name: opType.name },
-                        target: opNode,
-                    }));
-                    continue;
-                }
-                ownMembers.set(opType.name, opType);
+            if (ownMembers.has(opType.name)) {
+                reportCheckerDiagnostic(createDiagnostic({
+                    code: "interface-duplicate",
+                    format: { name: opType.name },
+                    target: opNode,
+                }));
+                continue;
             }
+            ownMembers.set(opType.name, opType);
         }
         return ownMembers;
     }
     function checkUnion(node, mapper) {
-        var _a;
         const links = getSymbolLinks(node.symbol);
         if (links.declaredType && mapper === undefined) {
             // we're not instantiating this union and we've already checked it
@@ -3114,7 +3107,7 @@ export function createChecker(program) {
             finishType(unionType);
         }
         if (mapper === undefined) {
-            (_a = unionType.namespace) === null || _a === void 0 ? void 0 : _a.unions.set(unionType.name, unionType);
+            unionType.namespace?.unions.set(unionType.name, unionType);
         }
         return unionType;
     }
@@ -3169,12 +3162,11 @@ export function createChecker(program) {
         return parentSym ? getOrCreateAugmentedSymbolTable(parentSym.members).get(name) : undefined;
     }
     function getSymbolForMember(node) {
-        var _a;
         if (!node.id) {
             return undefined;
         }
         const name = node.id.sv;
-        const parentSym = (_a = node.parent) === null || _a === void 0 ? void 0 : _a.symbol;
+        const parentSym = node.parent?.symbol;
         return parentSym ? getOrCreateAugmentedSymbolTable(parentSym.members).get(name) : undefined;
     }
     function getSymbolLinksForMember(node) {
@@ -3184,7 +3176,7 @@ export function createChecker(program) {
     function checkEnumMember(node, mapper, parentEnum) {
         const name = node.id.sv;
         const links = getSymbolLinksForMember(node);
-        if (links === null || links === void 0 ? void 0 : links.type) {
+        if (links?.type) {
             return links.type;
         }
         compilerAssert(parentEnum, "Enum member should already have been checked.");
@@ -3235,9 +3227,8 @@ export function createChecker(program) {
         return members;
     }
     function checkDirectives(node, type) {
-        var _a;
         let hasDeprecation = false;
-        for (const directive of (_a = node.directives) !== null && _a !== void 0 ? _a : []) {
+        for (const directive of node.directives ?? []) {
             if (directive.target.sv === "deprecated") {
                 const message = directive.arguments[0];
                 if (message === undefined) {
@@ -3681,6 +3672,7 @@ export function createChecker(program) {
             decorators: [],
             properties: createRekeyableMap(),
             derivedModels: [],
+            sourceModels: [],
         });
         for (const propNode of node.properties) {
             if (propNode.kind === SyntaxKind.ProjectionModelProperty) {
@@ -4174,7 +4166,6 @@ export function createChecker(program) {
         return [result, diagnostics];
     }
     function isTypeAssignableToWorker(source, target, diagnosticTarget, relationCache) {
-        var _a;
         // BACKCOMPAT: Added May 2023 sprint, to be removed by June 2023 sprint
         if (source.kind === "TemplateParameter" && source.constraint && target.kind === "Value") {
             const [assignable] = isTypeAssignableToInternal(source.constraint, target.target, diagnosticTarget, relationCache);
@@ -4185,7 +4176,7 @@ export function createChecker(program) {
             }
         }
         while (source.kind === "TemplateParameter" && source.constraint !== source) {
-            source = (_a = source.constraint) !== null && _a !== void 0 ? _a : unknownType;
+            source = source.constraint ?? unknownType;
         }
         if (source === target)
             return [Related.true, []];
@@ -4231,8 +4222,10 @@ export function createChecker(program) {
                 ],
             ];
         }
-        else if (target.kind === "Model" && target.indexer !== undefined && source.kind === "Model") {
-            return isIndexerValid(source, target, diagnosticTarget, relationCache);
+        else if (target.kind === "Model" &&
+            isArrayModelType(program, target) &&
+            source.kind === "Model") {
+            return hasIndexAndIsAssignableTo(source, target, diagnosticTarget, relationCache);
         }
         else if (target.kind === "Model" && source.kind === "Model") {
             return isModelRelatedTo(source, target, diagnosticTarget, relationCache);
@@ -4271,10 +4264,9 @@ export function createChecker(program) {
         return [Related.true, []];
     }
     function isReflectionType(type) {
-        var _a, _b, _c;
         return (type.kind === "Model" &&
-            ((_a = type.namespace) === null || _a === void 0 ? void 0 : _a.name) === "Reflection" &&
-            ((_c = (_b = type.namespace) === null || _b === void 0 ? void 0 : _b.namespace) === null || _c === void 0 ? void 0 : _c.name) === "TypeSpec");
+            type.namespace?.name === "Reflection" &&
+            type.namespace?.namespace?.name === "TypeSpec");
     }
     function isRelatedToScalar(source, target) {
         switch (source.kind) {
@@ -4357,6 +4349,7 @@ export function createChecker(program) {
     function isModelRelatedTo(source, target, diagnosticTarget, relationCache) {
         relationCache.set([source, target], Related.maybe);
         const diagnostics = [];
+        const remainingProperties = new Map(source.properties);
         for (const prop of walkPropertiesInherited(target)) {
             const sourceProperty = getProperty(source, prop.name);
             if (sourceProperty === undefined) {
@@ -4373,62 +4366,58 @@ export function createChecker(program) {
                 }
             }
             else {
+                remainingProperties.delete(prop.name);
                 const [related, propDiagnostics] = isTypeAssignableToInternal(sourceProperty.type, prop.type, diagnosticTarget, relationCache);
                 if (!related) {
                     diagnostics.push(...propDiagnostics);
                 }
             }
         }
+        if (target.indexer) {
+            const [_, indexerDiagnostics] = arePropertiesAssignableToIndexer(remainingProperties, target.indexer.value, diagnosticTarget, relationCache);
+            diagnostics.push(...indexerDiagnostics);
+            // For anonymous models we don't need an indexer
+            if (source.name !== "" && target.indexer.key.name !== "integer") {
+                const [related, indexDiagnostics] = hasIndexAndIsAssignableTo(source, target, diagnosticTarget, relationCache);
+                if (!related) {
+                    diagnostics.push(...indexDiagnostics);
+                }
+            }
+        }
         return [diagnostics.length === 0 ? Related.true : Related.false, diagnostics];
     }
     function getProperty(model, name) {
-        var _a;
-        return ((_a = model.properties.get(name)) !== null && _a !== void 0 ? _a : (model.baseModel !== undefined ? getProperty(model.baseModel, name) : undefined));
+        return (model.properties.get(name) ??
+            (model.baseModel !== undefined ? getProperty(model.baseModel, name) : undefined));
     }
-    function isIndexerValid(source, target, diagnosticTarget, relationCache) {
-        // Model expressions should be able to be assigned.
-        if (source.name === "" && target.indexer.key.name !== "integer") {
-            return isIndexConstraintValid(target.indexer.value, source, diagnosticTarget, relationCache);
-        }
-        else {
-            if (source.indexer === undefined || source.indexer.key !== target.indexer.key) {
-                return [
-                    Related.false,
-                    [
-                        createDiagnostic({
-                            code: "missing-index",
-                            format: {
-                                indexType: getTypeName(target.indexer.key),
-                                sourceType: getTypeName(source),
-                            },
-                            target: diagnosticTarget,
-                        }),
-                    ],
-                ];
-            }
-            return isTypeAssignableToInternal(source.indexer.value, target.indexer.value, diagnosticTarget, relationCache);
-        }
-    }
-    /**
-     * @param constraintType Type of the constraints(All properties must have this type).
-     * @param type Type of the model that should be respecting the constraint.
-     * @param diagnosticTarget Diagnostic target unless something better can be inferred.
-     */
-    function isIndexConstraintValid(constraintType, type, diagnosticTarget, relationCache) {
-        for (const prop of type.properties.values()) {
-            const [related, diagnostics] = isTypeAssignableTo(prop.type, constraintType, diagnosticTarget);
-            if (!related) {
-                return [Related.false, diagnostics];
-            }
-        }
-        if (type.baseModel) {
-            const [related, diagnostics] = isIndexConstraintValid(constraintType, type.baseModel, diagnosticTarget, relationCache);
+    function arePropertiesAssignableToIndexer(properties, indexerConstaint, diagnosticTarget, relationCache) {
+        for (const prop of properties.values()) {
+            const [related, diagnostics] = isTypeAssignableToInternal(prop.type, indexerConstaint, diagnosticTarget, relationCache);
             if (!related) {
                 return [Related.false, diagnostics];
             }
         }
         return [Related.true, []];
     }
+    /** Check that the source model has an index, the index key match and the value of the source index is assignable to the target index. */
+    function hasIndexAndIsAssignableTo(source, target, diagnosticTarget, relationCache) {
+        if (source.indexer === undefined || source.indexer.key !== target.indexer.key) {
+            return [
+                Related.false,
+                [
+                    createDiagnostic({
+                        code: "missing-index",
+                        format: {
+                            indexType: getTypeName(target.indexer.key),
+                            sourceType: getTypeName(source),
+                        },
+                        target: diagnosticTarget,
+                    }),
+                ],
+            ];
+        }
+        return isTypeAssignableToInternal(source.indexer.value, target.indexer.value, diagnosticTarget, relationCache);
+    }
     function isTupleAssignableToTuple(source, target, diagnosticTarget, relationCache) {
         if (source.values.length !== target.values.length) {
             return [
@@ -4496,8 +4485,7 @@ export function createChecker(program) {
         });
     }
     function isStdType(type, stdType) {
-        var _a;
-        type = (_a = type.projectionBase) !== null && _a !== void 0 ? _a : type;
+        type = type.projectionBase ?? type;
         if ((type.kind !== "Model" && type.kind !== "Scalar") ||
             type.namespace === undefined ||
             !isTypeSpecNamespace(type.namespace))
@@ -4538,13 +4526,12 @@ const numericRanges = {
  * chain.
  */
 function getNamedSourceModels(property) {
-    var _a;
     if (!property.sourceProperty) {
         return undefined;
     }
     const set = new Set();
     for (let p = property; p; p = p.sourceProperty) {
-        if ((_a = p.model) === null || _a === void 0 ? void 0 : _a.name) {
+        if (p.model?.name) {
             set.add(p.model);
         }
     }
@@ -4567,17 +4554,15 @@ function addDerivedModels(models, possiblyDerivedModels) {
     }
 }
 function createTypeMapper(parameters, args, parentMapper) {
-    var _a, _b;
-    const map = new Map((_a = parentMapper === null || parentMapper === void 0 ? void 0 : parentMapper.map) !== null && _a !== void 0 ? _a : []);
+    const map = new Map(parentMapper?.map ?? []);
     for (const [index, param] of parameters.entries()) {
         map.set(param, args[index]);
     }
     return {
         partial: false,
-        args: [...((_b = parentMapper === null || parentMapper === void 0 ? void 0 : parentMapper.args) !== null && _b !== void 0 ? _b : []), ...args],
+        args: [...(parentMapper?.args ?? []), ...args],
         getMappedType: (type) => {
-            var _a;
-            return (_a = map.get(type)) !== null && _a !== void 0 ? _a : type;
+            return map.get(type) ?? type;
         },
         map,
     };
@@ -4651,7 +4636,7 @@ export function getEffectiveModelType(program, model, filter) {
     // ignoring filtering as a better match than one that requires filtering
     // to meet this test.
     let match;
-    for (const candidate of candidates !== null && candidates !== void 0 ? candidates : []) {
+    for (const candidate of candidates ?? []) {
         if (model.properties.size === countPropertiesInherited(candidate)) {
             match = candidate;
             break; // exact match
@@ -4661,7 +4646,7 @@ export function getEffectiveModelType(program, model, filter) {
             continue; // match with filter: keep searching for exact match
         }
     }
-    return match !== null && match !== void 0 ? match : model;
+    return match ?? model;
 }
 /**
  * Applies a filter to the properties of a given type. If no properties
@@ -4691,6 +4676,7 @@ export function filterModelProperties(program, model, filter) {
         properties,
         decorators: [],
         derivedModels: [],
+        sourceModels: [{ usage: "spread", model }],
     });
     for (const property of walkPropertiesInherited(model)) {
         if (filter(property)) {
@@ -4758,8 +4744,7 @@ function linkMapper(typeDef, mapper) {
     }
 }
 function extractMainDoc(type) {
-    var _a;
-    if (((_a = type.node) === null || _a === void 0 ? void 0 : _a.docs) === undefined) {
+    if (type.node?.docs === undefined) {
         return undefined;
     }
     let mainDoc = "";
@@ -4770,12 +4755,11 @@ function extractMainDoc(type) {
     return trimmed === "" ? undefined : trimmed;
 }
 function extractReturnsDocs(type) {
-    var _a;
     const result = {
         returns: undefined,
         errors: undefined,
     };
-    if (((_a = type.node) === null || _a === void 0 ? void 0 : _a.docs) === undefined) {
+    if (type.node?.docs === undefined) {
         return result;
     }
     for (const doc of type.node.docs) {
@@ -4833,7 +4817,6 @@ function reportDeprecation(program, target, message, reportFunc) {
     }
 }
 function applyDecoratorToType(program, decApp, target) {
-    var _a, _b;
     compilerAssert("decorators" in target, "Cannot apply decorator to non-decoratable type", target);
     for (const arg of decApp.args) {
         if (isErrorType(arg.value)) {
@@ -4845,7 +4828,7 @@ function applyDecoratorToType(program, decApp, target) {
     if (decApp.definition) {
         const deprecation = getDeprecationDetails(program, decApp.definition);
         if (deprecation !== undefined) {
-            reportDeprecation(program, (_a = decApp.node) !== null && _a !== void 0 ? _a : target, deprecation.message, program.reportDiagnostic);
+            reportDeprecation(program, decApp.node ?? target, deprecation.message, program.reportDiagnostic);
         }
     }
     // peel `fn` off to avoid setting `this`.
@@ -4861,7 +4844,7 @@ function applyDecoratorToType(program, decApp, target) {
             program.reportDiagnostic(createDiagnostic({
                 code: "decorator-fail",
                 format: { decoratorName: decApp.decorator.name, error: error.stack },
-                target: (_b = decApp.node) !== null && _b !== void 0 ? _b : target,
+                target: decApp.node ?? target,
             }));
         }
         else {
@@ -4884,8 +4867,7 @@ function createDecoratorContext(program, decApp) {
         program,
         decoratorTarget: decApp.node,
         getArgumentTarget: (index) => {
-            var _a;
-            return (_a = decApp.args[index]) === null || _a === void 0 ? void 0 : _a.node;
+            return decApp.args[index]?.node;
         },
         call: (decorator, target, ...args) => {
             return decorator(createPassThruContext(program, decApp), target, ...args);
@@ -4937,33 +4919,29 @@ var ResolutionKind;
     ResolutionKind[ResolutionKind["Constraint"] = 2] = "Constraint";
 })(ResolutionKind || (ResolutionKind = {}));
 class PendingResolutions {
-    constructor() {
-        _PendingResolutions_data.set(this, new Map());
-    }
+    #data = new Map();
     start(symId, kind) {
-        let existing = __classPrivateFieldGet(this, _PendingResolutions_data, "f").get(symId);
+        let existing = this.#data.get(symId);
         if (existing === undefined) {
             existing = new Set();
-            __classPrivateFieldGet(this, _PendingResolutions_data, "f").set(symId, existing);
+            this.#data.set(symId, existing);
         }
         existing.add(kind);
     }
     has(symId, kind) {
-        var _a, _b;
-        return (_b = (_a = __classPrivateFieldGet(this, _PendingResolutions_data, "f").get(symId)) === null || _a === void 0 ? void 0 : _a.has(kind)) !== null && _b !== void 0 ? _b : false;
+        return this.#data.get(symId)?.has(kind) ?? false;
     }
     finish(symId, kind) {
-        const existing = __classPrivateFieldGet(this, _PendingResolutions_data, "f").get(symId);
+        const existing = this.#data.get(symId);
         if (existing === undefined) {
             return;
         }
-        existing === null || existing === void 0 ? void 0 : existing.delete(kind);
+        existing?.delete(kind);
         if (existing.size === 0) {
-            __classPrivateFieldGet(this, _PendingResolutions_data, "f").delete(symId);
+            this.#data.delete(symId);
         }
     }
 }
-_PendingResolutions_data = new WeakMap();
 var Related;
 (function (Related) {
     Related[Related["false"] = 0] = "false";