@typespec/compiler 0.44.0-dev.9 → 0.45.0-dev.1

package/dist/core/checker.d.ts

@@ -1,6 +1,7 @@
 import { TypeNameOptions } from "./helpers/index.js";
 import { Program, ProjectedProgram } from "./program.js";
-import { BooleanLiteral, BooleanLiteralNode, Diagnostic, DiagnosticTarget, ErrorType, FunctionType, IdentifierNode, IntrinsicScalarName, JsSourceFileNode, LiteralNode, LiteralType, Model, ModelProperty, Namespace, NamespaceStatementNode, NeverType, Node, NumericLiteral, NumericLiteralNode, ProjectionNode, ProjectionStatementNode, Scalar, StringLiteral, StringLiteralNode, Sym, Type, TypeMapper, TypeReferenceNode, TypeSpecScriptNode, UnknownType, VoidType } from "./types.js";
+import { BooleanLiteral, BooleanLiteralNode, Diagnostic, DiagnosticTarget, ErrorType, FunctionType, IdentifierNode, IntrinsicScalarName, JsSourceFileNode, LiteralNode, LiteralType, Model, ModelProperty, Namespace, NamespaceStatementNode, NeverType, Node, NumericLiteral, NumericLiteralNode, ProjectionNode, ProjectionStatementNode, Scalar, StdTypeName, StdTypes, StringLiteral, StringLiteralNode, Sym, Type, TypeReferenceNode, TypeSpecScriptNode, UnknownType, VoidType } from "./types.js";
+export type CreateTypeProps = Omit<Type, "isFinished" | keyof TypePrototype>;
 export interface Checker {
     typePrototype: TypePrototype;
     getTypeForNode(node: Node): Type;
@@ -30,8 +31,10 @@ export interface Checker {
     project(target: Type, projection: ProjectionNode, args?: (Type | string | number | boolean)[]): Type;
     resolveIdentifier(node: IdentifierNode): Sym | undefined;
     resolveCompletions(node: IdentifierNode): Map<string, TypeSpecCompletionItem>;
-    createType<T>(typeDef: T): T & TypePrototype;
-    createAndFinishType<U extends Type extends any ? Omit<Type, keyof TypePrototype> : never>(typeDef: U): U & TypePrototype;
+    createType<T extends Type extends any ? CreateTypeProps : never>(typeDef: T): T & TypePrototype & {
+        isFinished: boolean;
+    };
+    createAndFinishType<T extends Type extends any ? CreateTypeProps : never>(typeDef: T): T & TypePrototype;
     finishType<T extends Type>(typeDef: T): T;
     createFunctionType(fn: (...args: Type[]) => Type): FunctionType;
     createLiteralType(value: string, node?: StringLiteralNode): StringLiteral;
@@ -87,11 +90,6 @@ export interface TypeSpecCompletionItem {
      */
     label?: string;
 }
-type StdTypeName = IntrinsicScalarName | "Array" | "Record" | "object";
-type StdTypes = {
-    Array: Model;
-    Record: Model;
-} & Record<IntrinsicScalarName, Scalar>;
 export declare function createChecker(program: Program): Checker;
 /**
  * If the input is anonymous (or the provided filter removes properties)
@@ -133,6 +131,6 @@ export declare function getOverriddenProperty(property: ModelProperty): ModelPro
  * Properties that are overridden are not enumerated.
  */
 export declare function walkPropertiesInherited(model: Model): Generator<ModelProperty, void, unknown>;
-export declare function finishTypeForProgram<T extends Type>(program: Program, typeDef: T, mapper?: TypeMapper): T;
+export declare function finishTypeForProgram<T extends Type>(program: Program, typeDef: T): T;
 export {};
 //# sourceMappingURL=checker.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"checker.d.ts","sourceRoot":"","sources":["../../core/checker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAqC,MAAM,oBAAoB,CAAC;AAGxF,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AASzD,OAAO,EAIL,cAAc,EACd,kBAAkB,EAQlB,UAAU,EACV,gBAAgB,EAKhB,SAAS,EAKT,YAAY,EAEZ,cAAc,EAId,mBAAmB,EACnB,gBAAgB,EAChB,WAAW,EACX,WAAW,EAOX,KAAK,EAGL,aAAa,EAKb,SAAS,EACT,sBAAsB,EACtB,SAAS,EACT,IAAI,EAEJ,cAAc,EACd,kBAAkB,EAiBlB,cAAc,EAGd,uBAAuB,EAIvB,MAAM,EAEN,aAAa,EACb,iBAAiB,EACjB,GAAG,EAYH,IAAI,EAEJ,UAAU,EAEV,iBAAiB,EACjB,kBAAkB,EAMlB,WAAW,EACX,QAAQ,EACT,MAAM,YAAY,CAAC;AAGpB,MAAM,WAAW,OAAO;IACtB,aAAa,EAAE,aAAa,CAAC;IAE7B,cAAc,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IACjC,gBAAgB,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACjD,YAAY,IAAI,IAAI,CAAC;IACrB,eAAe,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAChD,sBAAsB,IAAI,SAAS,CAAC;IACpC,sBAAsB,IAAI,sBAAsB,CAAC;IACjD,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,SAAS,GAAG,GAAG,GAAG,SAAS,CAAC;IACvD,eAAe,CAAC,IAAI,EAAE,kBAAkB,GAAG,gBAAgB,GAAG,IAAI,CAAC;IACnE,cAAc,CAAC,IAAI,EAAE,iBAAiB,GAAG,aAAa,CAAC;IACvD,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,cAAc,CAAC;IACzD,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,cAAc,CAAC;IACzD,cAAc,CAAC,IAAI,EAAE,WAAW,GAAG,WAAW,CAAC;IAE/C;;OAEG;IACH,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,MAAM,CAAC;IAE3D;;OAEG;IACH,kBAAkB,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,MAAM,CAAC;IACnF,SAAS,CAAC,CAAC,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,eAAe,CAAC,EAAE;SAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAAE,GAAG,CAAC,CAAC;IACnF,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACvE,OAAO,CACL,MAAM,EAAE,IAAI,EACZ,UAAU,EAAE,cAAc,EAC1B,IAAI,CAAC,EAAE,CAAC,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,EAAE,GAC1C,IAAI,CAAC;IACR,iBAAiB,CAAC,IAAI,EAAE,cAAc,GAAG,GAAG,GAAG,SAAS,CAAC;IACzD,kBAAkB,CAAC,IAAI,EAAE,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IAC9E,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC;IAC7C,mBAAmB,CAAC,CAAC,SAAS,IAAI,SAAS,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,aAAa,CAAC,GAAG,KAAK,EACtF,OAAO,EAAE,CAAC,GACT,CAAC,GAAG,aAAa,CAAC;IACrB,UAAU,CAAC,CAAC,SAAS,IAAI,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;IAC1C,kBAAkB,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,IAAI,EAAE,KAAK,IAAI,GAAG,YAAY,CAAC;IAChE,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,iBAAiB,GAAG,aAAa,CAAC;IAC1E,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,kBAAkB,GAAG,cAAc,CAAC;IAC5E,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB,GAAG,cAAc,CAAC;IAC7E,iBAAiB,CACf,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAChC,IAAI,CAAC,EAAE,iBAAiB,GAAG,kBAAkB,GAAG,kBAAkB,GACjE,aAAa,GAAG,cAAc,GAAG,cAAc,CAAC;IACnD,iBAAiB,CACf,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAChC,IAAI,CAAC,EAAE,iBAAiB,GAAG,kBAAkB,GAAG,kBAAkB,GACjE,aAAa,GAAG,cAAc,GAAG,cAAc,CAAC;IAEnD;;;;;;OAMG;IACH,kBAAkB,CAChB,MAAM,EAAE,IAAI,EACZ,MAAM,EAAE,IAAI,EACZ,gBAAgB,EAAE,gBAAgB,GACjC,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;IAE3B;;;;OAIG;IACH,SAAS,CACP,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,mBAAmB,GAC5B,IAAI,IAAI,MAAM,GAAG;QAAE,IAAI,EAAE,mBAAmB,CAAA;KAAE,CAAC;IAClD,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,IAAI,IAAI,IAAI,GAAG;QAAE,IAAI,EAAE,WAAW,CAAA;KAAE,CAAC;IAEnF;;;OAGG;IACH,UAAU,CAAC,CAAC,SAAS,MAAM,QAAQ,EAAE,IAAI,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAE3D;;;;OAIG;IACH,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,GAAG,CAAC,IAAI,GAAG,SAAS,EAAE,SAAS,UAAU,EAAE,CAAC,CAAC;IAEzF,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,WAAW,CAAC;CACtB;AAED,UAAU,aAAa;IACrB,WAAW,EAAE,uBAAuB,EAAE,CAAC;IACvC,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,uBAAuB,EAAE,CAAC;CAC5D;AAED,6CAA6C;AAC7C,MAAM,MAAM,kBAAkB,GAAG,sBAAsB,CAAC;AAExD,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,GAAG,CAAC;IAET;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AASD,KAAK,WAAW,GAAG,mBAAmB,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;AACvE,KAAK,QAAQ,GAAG;IAEd,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,KAAK,CAAC;CACf,GAAG,MAAM,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;AAKxC,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAumJvD;AAqFD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,KAAK,OAAO,GAC5C,KAAK,CAyEP;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,GAAG,gBAAgB,EACnC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,CAAC,QAAQ,EAAE,aAAa,KAAK,OAAO,GAC3C,KAAK,CAmCP;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,GAAG,SAAS,CAcxF;AAED;;;;;;;GAOG;AACH,wBAAiB,uBAAuB,CAAC,KAAK,EAAE,KAAK,2CAapD;AAYD,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,IAAI,EACjD,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,CAAC,EACV,MAAM,CAAC,EAAE,UAAU,GAClB,CAAC,CAEH"}
+{"version":3,"file":"checker.d.ts","sourceRoot":"","sources":["../../core/checker.ts"],"names":[],"mappings":"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"}

package/dist/core/checker.js

@@ -733,12 +733,13 @@ export function createChecker(program) {
                 compilerAssert(false, `Unexpected checker error. symbolLinks.instantiations was not defined for ${SyntaxKind[templateNode.kind]}`);
             }
         }
-        const cached = (_a = symbolLinks.instantiations) === null || _a === void 0 ? void 0 : _a.get(args);
+        const mapper = createTypeMapper(params, args, parentMapper);
+        const cached = (_a = symbolLinks.instantiations) === null || _a === void 0 ? void 0 : _a.get(mapper.args);
         if (cached) {
             return cached;
         }
         if (instantiateTempalates) {
-            return instantiateTemplate(symbolLinks.instantiations, templateNode, params, args, parentMapper);
+            return instantiateTemplate(symbolLinks.instantiations, templateNode, params, mapper);
         }
         else {
             return errorType;
@@ -753,11 +754,10 @@ export function createChecker(program) {
      * twice at the same time, or if template parameters from more than one template
      * are ever in scope at once.
      */
-    function instantiateTemplate(instantiations, templateNode, params, args, parentMapper) {
-        const mapper = createTypeMapper(params, args, parentMapper);
+    function instantiateTemplate(instantiations, templateNode, params, mapper) {
         const type = getTypeForNode(templateNode, mapper);
-        if (!instantiations.get(args)) {
-            instantiations.set(args, type);
+        if (!instantiations.get(mapper.args)) {
+            instantiations.set(mapper.args, type);
         }
         if (type.kind === "Model") {
             type.templateNode = templateNode;
@@ -948,7 +948,8 @@ export function createChecker(program) {
                 properties.set(prop.name, newPropType);
             }
         }
-        return finishType(intersection, mapper);
+        linkMapper(intersection, mapper);
+        return finishType(intersection);
     }
     function checkArrayExpression(node, mapper) {
         const elementType = getTypeForNode(node.elementType, mapper);
@@ -1077,13 +1078,14 @@ export function createChecker(program) {
         const name = node.id.sv;
         let decorators = [];
         // Is this a definition or reference?
-        let parameters, returnType;
+        let parameters, returnType, sourceOperation;
         if (node.signature.kind === SyntaxKind.OperationSignatureReference) {
             // Attempt to resolve the operation
             const baseOperation = checkOperationIs(node, node.signature.baseOperation, mapper);
             if (!baseOperation) {
                 return errorType;
             }
+            sourceOperation = baseOperation;
             // Reference the same return type and create the parameters type
             parameters = cloneType(baseOperation.parameters);
             returnType = baseOperation.returnType;
@@ -1102,22 +1104,26 @@ export function createChecker(program) {
             parameters,
             returnType,
             decorators,
+            sourceOperation,
             interface: parentInterface,
         });
         decorators.push(...checkDecorators(operationType, node, mapper));
         operationType.parameters.namespace = namespace;
         const parent = node.parent;
+        linkMapper(operationType, mapper);
         if (parent.kind === SyntaxKind.InterfaceStatement) {
             if (shouldCreateTypeForTemplate(parent, mapper) &&
                 shouldCreateTypeForTemplate(node, mapper)) {
-                finishType(operationType, mapper);
+                finishType(operationType);
             }
         }
         else {
             if (shouldCreateTypeForTemplate(node, mapper)) {
-                finishType(operationType, mapper);
+                finishType(operationType);
+            }
+            if (mapper === undefined) {
+                namespace === null || namespace === void 0 ? void 0 : namespace.operations.set(name, operationType);
             }
-            namespace === null || namespace === void 0 ? void 0 : namespace.operations.set(name, operationType);
         }
         if (links) {
             linkType(links, operationType, mapper);
@@ -1684,6 +1690,7 @@ export function createChecker(program) {
         linkType(links, type, mapper);
         const isBase = checkModelIs(node, node.is, mapper);
         if (isBase) {
+            type.sourceModel = isBase;
             checkDeprecated(isBase, node.is);
             // copy decorators
             decorators.push(...isBase.decorators);
@@ -1728,8 +1735,9 @@ export function createChecker(program) {
                 mutate(sym).type = prop;
             }
         }
+        linkMapper(type, mapper);
         if (shouldCreateTypeForTemplate(node, mapper)) {
-            finishType(type, mapper);
+            finishType(type);
         }
         const indexer = getIndexer(program, type);
         if (type.name === "Array" && isInTypeSpecNamespace(type)) {
@@ -2192,8 +2200,9 @@ export function createChecker(program) {
         }
         type.decorators = checkDecorators(type, prop, mapper);
         const parentTemplate = getParentTemplateNode(prop);
+        linkMapper(type, mapper);
         if (!parentTemplate || shouldCreateTypeForTemplate(parentTemplate, mapper)) {
-            finishType(type, mapper);
+            finishType(type);
         }
         return type;
     }
@@ -2395,8 +2404,9 @@ export function createChecker(program) {
         if (mapper === undefined) {
             (_a = type.namespace) === null || _a === void 0 ? void 0 : _a.scalars.set(type.name, type);
         }
+        linkMapper(type, mapper);
         if (shouldCreateTypeForTemplate(node, mapper)) {
-            finishType(type, mapper);
+            finishType(type);
         }
         if (isInTypeSpecNamespace(type)) {
             stdTypes[type.name] = type;
@@ -2493,7 +2503,8 @@ export function createChecker(program) {
             enumType.namespace = namespace;
             (_a = enumType.namespace) === null || _a === void 0 ? void 0 : _a.enums.set(enumType.name, enumType);
             enumType.decorators = checkDecorators(enumType, node, mapper);
-            finishType(enumType, mapper);
+            linkMapper(enumType, mapper);
+            finishType(enumType);
         }
         return links.type;
     }
@@ -2542,8 +2553,9 @@ export function createChecker(program) {
         for (const [key, value] of ownMembers) {
             interfaceType.operations.set(key, value);
         }
+        linkMapper(interfaceType, mapper);
         if (shouldCreateTypeForTemplate(node, mapper)) {
-            finishType(interfaceType, mapper);
+            finishType(interfaceType);
         }
         if (mapper === undefined) {
             (_a = interfaceType.namespace) === null || _a === void 0 ? void 0 : _a.interfaces.set(interfaceType.name, interfaceType);
@@ -2590,8 +2602,9 @@ export function createChecker(program) {
         });
         unionType.decorators = checkDecorators(unionType, node, mapper);
         checkUnionVariants(unionType, node, variants, mapper);
+        linkMapper(unionType, mapper);
         if (shouldCreateTypeForTemplate(node, mapper)) {
-            finishType(unionType, mapper);
+            finishType(unionType);
         }
         linkType(links, unionType, mapper);
         if (mapper === undefined) {
@@ -2631,8 +2644,9 @@ export function createChecker(program) {
             union: undefined,
         });
         variantType.decorators = checkDecorators(variantType, variantNode, mapper);
+        linkMapper(variantType, mapper);
         if (shouldCreateTypeForTemplate(variantNode.parent, mapper)) {
-            finishType(variantType, mapper);
+            finishType(variantType);
         }
         if (links) {
             linkType(links, variantType, mapper);
@@ -2719,10 +2733,11 @@ export function createChecker(program) {
      */
     function createType(typeDef) {
         Object.setPrototypeOf(typeDef, typePrototype);
+        typeDef.isFinished = false;
         return typeDef;
     }
-    function finishType(typeDef, mapper) {
-        return finishTypeForProgramAndChecker(program, typePrototype, typeDef, mapper);
+    function finishType(typeDef) {
+        return finishTypeForProgramAndChecker(program, typePrototype, typeDef);
     }
     function getLiteralType(node) {
         return createLiteralType(node.value, node);
@@ -3889,14 +3904,14 @@ function addDerivedModels(models, possiblyDerivedModels) {
     }
 }
 function createTypeMapper(parameters, args, parentMapper) {
-    var _a;
+    var _a, _b;
     const map = new Map((_a = parentMapper === null || parentMapper === void 0 ? void 0 : parentMapper.map) !== null && _a !== void 0 ? _a : []);
     for (const [index, param] of parameters.entries()) {
         map.set(param, args[index]);
     }
     return {
         partial: false,
-        args,
+        args: [...((_b = parentMapper === null || parentMapper === void 0 ? void 0 : parentMapper.args) !== null && _b !== void 0 ? _b : []), ...args],
         getMappedType: (type) => {
             var _a;
             return (_a = map.get(type)) !== null && _a !== void 0 ? _a : type;
@@ -4069,21 +4084,24 @@ function countPropertiesInherited(model, filter) {
     }
     return count;
 }
-export function finishTypeForProgram(program, typeDef, mapper) {
-    return finishTypeForProgramAndChecker(program, program.checker.typePrototype, typeDef, mapper);
+export function finishTypeForProgram(program, typeDef) {
+    return finishTypeForProgramAndChecker(program, program.checker.typePrototype, typeDef);
 }
-function finishTypeForProgramAndChecker(program, typePrototype, typeDef, mapper) {
+function linkMapper(typeDef, mapper) {
     if (mapper) {
         compilerAssert(!typeDef.templateArguments, "Mapper provided but template arguments already set.");
         typeDef.templateMapper = mapper;
         typeDef.templateArguments = mapper.args;
     }
+}
+function finishTypeForProgramAndChecker(program, typePrototype, typeDef) {
     if ("decorators" in typeDef) {
         for (const decApp of typeDef.decorators) {
             applyDecoratorToType(program, decApp, typeDef);
         }
     }
     Object.setPrototypeOf(typeDef, typePrototype);
+    typeDef.isFinished = true;
     return typeDef;
 }
 function applyDecoratorToType(program, decApp, target) {