@typespec/compiler 0.47.0-dev.13 → 0.47.0-dev.16

package/dist/manifest.js

@@ -1,4 +1,4 @@
 export default {
-  "version": "0.47.0-dev.13",
-  "commit": "74a977a55ddd99a7ae4c6c2a3660442a6db6aa93"
+  "version": "0.47.0-dev.16",
+  "commit": "4e685d2cd8141099d7337ec60b48a4fe6bb84454"
 };

package/dist/src/core/checker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checker.d.ts","sourceRoot":"","sources":["../../../src/core/checker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"checker.d.ts","sourceRoot":"","sources":["../../../src/core/checker.ts"],"names":[],"mappings":"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"}

package/dist/src/core/checker.js

@@ -1082,7 +1082,8 @@ export function createChecker(program) {
     function checkOperation(node, mapper, parentInterface) {
         var _a;
         const inInterface = ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.kind) === SyntaxKind.InterfaceStatement;
-        const links = inInterface ? getSymbolLinksForMember(node) : getSymbolLinks(node.symbol);
+        const symbol = inInterface ? getSymbolForMember(node) : node.symbol;
+        const links = symbol && getSymbolLinks(symbol);
         if (links) {
             if (links.declaredType && mapper === undefined) {
                 // we're not instantiating this operation and we've already checked it
@@ -1109,8 +1110,19 @@ export function createChecker(program) {
                 return errorType;
             }
             sourceOperation = baseOperation;
+            const parameterModelSym = getOrCreateAugmentedSymbolTable(symbol.metatypeMembers).get("parameters");
             // Reference the same return type and create the parameters type
-            parameters = cloneType(baseOperation.parameters);
+            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];
@@ -1774,13 +1786,6 @@ export function createChecker(program) {
         }
         // Evaluate the properties after
         checkModelProperties(node, type.properties, type, mapper);
-        for (const prop of walkPropertiesInherited(type)) {
-            const table = getOrCreateAugmentedSymbolTable(node.symbol.members);
-            const sym = table.get(prop.name);
-            if (sym) {
-                mutate(sym).type = prop;
-            }
-        }
         linkMapper(type, mapper);
         if (shouldCreateTypeForTemplate(node, mapper)) {
             finishType(type);
@@ -1844,7 +1849,7 @@ export function createChecker(program) {
             }
             else {
                 // spread property
-                const newProperties = checkSpreadProperty(prop.target, parentModel, mapper);
+                const newProperties = checkSpreadProperty(node.symbol, prop.target, parentModel, mapper);
                 for (const newProp of newProperties) {
                     linkIndirectMember(node, newProp, mapper);
                     checkPropertyCompatibleWithIndexer(parentModel, newProp, prop);
@@ -1989,40 +1994,68 @@ export function createChecker(program) {
             }
         }
     }
-    function bindMetaTypes(node) {
+    function copyMembersToContainer(targetContainerSym, table) {
         var _a;
-        switch (node.kind) {
-            case SyntaxKind.ModelProperty: {
-                const sym = getSymbolForMember(node);
-                if (sym) {
-                    const table = getOrCreateAugmentedSymbolTable(sym.metatypeMembers);
-                    table.set("type", node.value.kind === SyntaxKind.TypeReference
-                        ? createSymbol(node.value, "", 2048 /* SymbolFlags.Alias */)
-                        : node.value.symbol);
-                }
-                break;
+        const members = (_a = augmentedSymbolTables.get(table)) !== null && _a !== void 0 ? _a : table;
+        compilerAssert(targetContainerSym.members, "containerSym.members is undefined");
+        const containerMembers = getOrCreateAugmentedSymbolTable(targetContainerSym.members);
+        for (const member of members.values()) {
+            bindMemberToContainer(targetContainerSym, containerMembers, member.name, member.declarations[0], member.flags);
+        }
+    }
+    function bindMemberToContainer(containerSym, containerMembers, name, node, kind) {
+        const sym = createSymbol(node, name, kind, containerSym);
+        compilerAssert(containerSym.members, "containerSym.members is undefined");
+        containerMembers.set(name, sym);
+    }
+    function bindMetaTypes(node) {
+        const visited = new Set();
+        function visit(node, symbol) {
+            var _a;
+            if (visited.has(node)) {
+                return;
             }
-            case SyntaxKind.OperationStatement: {
-                const sym = (_a = node.symbol) !== null && _a !== void 0 ? _a : getSymbolForMember(node);
-                const table = getOrCreateAugmentedSymbolTable(sym.metatypeMembers);
-                if (node.signature.kind === SyntaxKind.OperationSignatureDeclaration) {
-                    table.set("parameters", node.signature.parameters.symbol);
-                    table.set("returnType", node.signature.returnType.symbol);
+            visited.add(node);
+            switch (node.kind) {
+                case SyntaxKind.ModelProperty: {
+                    const sym = getSymbolForMember(node);
+                    if (sym) {
+                        const table = getOrCreateAugmentedSymbolTable(sym.metatypeMembers);
+                        table.set("type", node.value.kind === SyntaxKind.TypeReference
+                            ? createSymbol(node.value, "", 2048 /* SymbolFlags.Alias */)
+                            : node.value.symbol);
+                    }
+                    break;
                 }
-                else {
-                    const sig = resolveTypeReferenceSym(node.signature.baseOperation, undefined);
-                    if (sig) {
-                        const sigTable = getOrCreateAugmentedSymbolTable(sig.metatypeMembers);
-                        table.set("parameters", sigTable.get("parameters"));
-                        table.set("returnType", sigTable.get("returnType"));
+                case SyntaxKind.OperationStatement: {
+                    const sym = (_a = symbol !== null && symbol !== void 0 ? symbol : node.symbol) !== null && _a !== void 0 ? _a : getSymbolForMember(node);
+                    const table = getOrCreateAugmentedSymbolTable(sym.metatypeMembers);
+                    if (node.signature.kind === SyntaxKind.OperationSignatureDeclaration) {
+                        table.set("parameters", node.signature.parameters.symbol);
+                        table.set("returnType", node.signature.returnType.symbol);
                     }
+                    else {
+                        const sig = resolveTypeReferenceSym(node.signature.baseOperation, undefined);
+                        if (sig) {
+                            visit(sig.declarations[0], sig);
+                            const sigTable = getOrCreateAugmentedSymbolTable(sig.metatypeMembers);
+                            const sigParameterSym = sigTable.get("parameters");
+                            if (sigParameterSym !== undefined) {
+                                const parametersSym = createSymbol(sigParameterSym.declarations[0], "parameters", 2 /* SymbolFlags.Model */ & 674 /* SymbolFlags.MemberContainer */);
+                                copyMembersToContainer(parametersSym, sigParameterSym.members);
+                                table.set("parameters", parametersSym);
+                                table.set("returnType", sigTable.get("returnType"));
+                            }
+                        }
+                    }
+                    break;
                 }
-                break;
             }
+            visitChildren(node, (child) => {
+                bindMetaTypes(child);
+            });
         }
-        visitChildren(node, (child) => {
-            bindMetaTypes(child);
-        });
+        visit(node);
     }
     /**
      * Initializes a late bound symbol for the type. This is generally necessary when attempting to
@@ -2184,7 +2217,7 @@ export function createChecker(program) {
         }
         return isType;
     }
-    function checkSpreadProperty(targetNode, parentModel, mapper) {
+    function checkSpreadProperty(parentModelSym, targetNode, parentModel, mapper) {
         const targetType = getTypeForNode(targetNode, mapper);
         if (targetType.kind === "TemplateParameter" || isErrorType(targetType)) {
             return [];
@@ -2196,7 +2229,8 @@ export function createChecker(program) {
         const props = [];
         // copy each property
         for (const prop of walkPropertiesInherited(targetType)) {
-            props.push(cloneType(prop, {
+            const memberSym = getMemberSymbol(parentModelSym, prop.name);
+            props.push(cloneTypeForSymbol(memberSym, prop, {
                 sourceProperty: prop,
                 model: parentModel,
             }));
@@ -2429,6 +2463,18 @@ 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 decorators = [];
+        for (const decNode of augmentDecoratorNodes) {
+            const decorator = checkDecorator(targetType, decNode, mapper);
+            if (decorator) {
+                decorators.unshift(decorator);
+            }
+        }
+        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;
@@ -2449,7 +2495,7 @@ export function createChecker(program) {
         if (docComment) {
             decorators.unshift({
                 decorator: $docFromComment,
-                args: [{ value: program.checker.createLiteralType(docComment), jsValue: docComment }],
+                args: [{ value: createLiteralType(docComment), jsValue: docComment }],
             });
         }
         return decorators;
@@ -2582,7 +2628,7 @@ export function createChecker(program) {
                     enumType.members.set(memberType.name, memberType);
                 }
                 else {
-                    const members = checkEnumSpreadMember(enumType, member.target, mapper, memberNames);
+                    const members = checkEnumSpreadMember(node.symbol, enumType, member.target, mapper, memberNames);
                     for (const memberType of members) {
                         linkIndirectMember(node, memberType, mapper);
                         enumType.members.set(memberType.name, memberType);
@@ -2632,7 +2678,9 @@ export function createChecker(program) {
                         target: extendsNode,
                     }));
                 }
-                const newMember = cloneType(member, { interface: interfaceType });
+                const newMember = cloneTypeForSymbol(getMemberSymbol(node.symbol, member.name), member, {
+                    interface: interfaceType,
+                });
                 // Don't link it it is overritten
                 if (!ownMembers.has(member.name)) {
                     linkIndirectMember(node, newMember, mapper);
@@ -2753,6 +2801,9 @@ export function createChecker(program) {
             node.kind === SyntaxKind.OperationStatement ||
             node.kind === SyntaxKind.UnionVariant);
     }
+    function getMemberSymbol(parentSym, name) {
+        return parentSym ? getOrCreateAugmentedSymbolTable(parentSym.members).get(name) : undefined;
+    }
     function getSymbolForMember(node) {
         var _a;
         const name = node.id.sv;
@@ -2785,7 +2836,7 @@ export function createChecker(program) {
         member.decorators = checkDecorators(member, node, mapper);
         return finishType(member);
     }
-    function checkEnumSpreadMember(parentEnum, targetNode, mapper, existingMemberNames) {
+    function checkEnumSpreadMember(parentEnumSym, parentEnum, targetNode, mapper, existingMemberNames) {
         const members = [];
         const targetType = getTypeForNode(targetNode, mapper);
         if (!isErrorType(targetType)) {
@@ -2803,7 +2854,8 @@ export function createChecker(program) {
                 }
                 else {
                     existingMemberNames.add(member.name);
-                    const clonedMember = cloneType(member, {
+                    const memberSym = getMemberSymbol(parentEnumSym, member.name);
+                    const clonedMember = cloneTypeForSymbol(memberSym, member, {
                         enum: parentEnum,
                         sourceMember: member,
                     });
@@ -2992,23 +3044,7 @@ export function createChecker(program) {
         getSymbolLinks(globalNamespaceNode.symbol).type = type;
         return type;
     }
-    /**
-     * Clone a type, resulting in an identical type with all the same decorators
-     * applied. Decorators are re-run on the clone to achieve this.
-     *
-     * Care is taken to clone nested data structures that are part of the type.
-     * Any type with e.g. a map or an array property must recreate the map or array
-     * so that clones don't share the same object.
-     *
-     * For types which have sub-types that are part of it, e.g. enums with members,
-     * unions with variants, or models with properties, the sub-types are cloned
-     * as well.
-     *
-     * If the entire type graph needs to be cloned, then cloneType must be called
-     * recursively by the caller.
-     */
-    function cloneType(type, additionalProps = {}) {
-        // TODO: this needs to handle other types
+    function initializeClone(type, additionalProps) {
         let clone;
         switch (type.kind) {
             case "Model":
@@ -3024,7 +3060,7 @@ export function createChecker(program) {
                         cloneType(prop, { model: newModel }),
                     ]));
                 }
-                clone = finishType(newModel);
+                clone = newModel;
                 break;
             case "Union":
                 const newUnion = createType({
@@ -3042,7 +3078,7 @@ export function createChecker(program) {
                         cloneType(prop, { union: newUnion }),
                     ]));
                 }
-                clone = finishType(newUnion);
+                clone = newUnion;
                 break;
             case "Interface":
                 const newInterface = createType({
@@ -3057,7 +3093,7 @@ export function createChecker(program) {
                         cloneType(prop, { interface: newInterface }),
                     ]));
                 }
-                clone = finishType(newInterface);
+                clone = newInterface;
                 break;
             case "Enum":
                 const newEnum = createType({
@@ -3072,16 +3108,35 @@ export function createChecker(program) {
                         cloneType(prop, { enum: newEnum }),
                     ]));
                 }
-                clone = finishType(newEnum);
+                clone = newEnum;
                 break;
             default:
-                clone = createAndFinishType({
+                clone = createType({
                     ...type,
                     ...("decorators" in type ? { decorators: [...type.decorators] } : {}),
                     ...additionalProps,
                 });
                 break;
         }
+        return clone;
+    }
+    /**
+     * Clone a type, resulting in an identical type with all the same decorators
+     * applied. Decorators are re-run on the clone to achieve this.
+     *
+     * Care is taken to clone nested data structures that are part of the type.
+     * Any type with e.g. a map or an array property must recreate the map or array
+     * so that clones don't share the same object.
+     *
+     * For types which have sub-types that are part of it, e.g. enums with members,
+     * unions with variants, or models with properties, the sub-types are cloned
+     * as well.
+     *
+     * If the entire type graph needs to be cloned, then cloneType must be called
+     * recursively by the caller.
+     */
+    function cloneType(type, additionalProps = {}) {
+        const clone = finishType(initializeClone(type, additionalProps));
         const projection = projectionsByType.get(type);
         if (projection) {
             projectionsByType.set(clone, projection);
@@ -3089,6 +3144,24 @@ export function createChecker(program) {
         compilerAssert(clone.kind === type.kind, "cloneType must not change type kind");
         return clone;
     }
+    /**
+     * Clone a type linking to the given symbol.
+     * @param sym Symbol which to associate the clone
+     * @param type Type to clone
+     * @param additionalProps Additional properties to set/override on the clone
+     * @returns cloned type
+     */
+    function cloneTypeForSymbol(sym, type, additionalProps = {}) {
+        let clone = initializeClone(type, additionalProps);
+        if ("decorators" in clone) {
+            for (const dec of checkAugmentDecorators(sym, clone, undefined)) {
+                clone.decorators.push(dec);
+            }
+        }
+        clone = finishType(clone);
+        compilerAssert(clone.kind === type.kind, "cloneType must not change type kind");
+        return clone;
+    }
     function checkProjectionDeclaration(node) {
         // todo: check for duplicate projection decls on individual types
         // right now you can declare the same projection on a specific type