@typespec/compiler 1.16.0-dev.6 → 1.16.0-dev.8

package/dist/manifest.js

@@ -1,4 +1,4 @@
 export default {
-  "version": "1.16.0-dev.6",
-  "commit": "0bd0c174228cf559ec7d4c9edec904294b59b9bc"
+  "version": "1.16.0-dev.8",
+  "commit": "64f7850fb6e6069965ba8774643241b6a74f881c"
 };

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

@@ -1 +1 @@
-{"version":3,"file":"checker.d.ts","sourceRoot":"","sources":["../../../src/core/checker.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAQvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAY5C,OAAO,KAAK,EAMV,cAAc,EACd,kBAAkB,EAoClB,mBAAmB,EAanB,KAAK,EAGL,aAAa,EAMb,IAAI,EAGJ,cAAc,EACd,kBAAkB,EAQlB,MAAM,EAMN,WAAW,EACX,QAAQ,EACR,aAAa,EACb,iBAAiB,EAWjB,GAAG,EAYH,IAAI,EAcJ,KAAK,EAGN,MAAM,YAAY,CAAC;AASpB,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,GAAG,MAAM,aAAa,CAAC,CAAC;AA+I5F,MAAM,WAAW,OAAO;IAGtB;;;OAGG;IACH,cAAc,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAgBjC,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;IAKnF,UAAU,CAAC,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,GAAG,eAAe,GAAG,KAAK,CAAC,EAC/D,OAAO,EAAE,CAAC,GACT,CAAC,GAAG,aAAa,GAAG;QAAE,UAAU,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5E,mBAAmB,CAAC,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,GAAG,eAAe,GAAG,KAAK,CAAC,EACxE,OAAO,EAAE,CAAC,GACT,CAAC,GAAG,aAAa,CAAC;IACrB,UAAU,CAAC,CAAC,SAAS,IAAI,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;IAC1C,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,iBAAiB,GAAG,aAAa,CAAC;IAC1E,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB,GAAG,cAAc,CAAC;IACtF,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;IA8BnD;;;;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;;;;;;;;OAQG;IACH,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;CAuCnD;AAED,MAAM,WAAW,YAAY;IAC3B,8BAA8B;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,+BAA+B;IAC/B,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,aAAa;CAAG;AAE1B,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,GAAG,CAAC;IAET;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AASD,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAkuP/E;AAgED;;;;;;;;;;;;;;;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,EAChB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,CAAC,QAAQ,EAAE,aAAa,KAAK,OAAO,GAC3C,KAAK,CAqCP;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,GAAG,SAAS,CAcxF;AAED;;;;;;;GAOG;AACH,wBAAiB,uBAAuB,CAAC,KAAK,EAAE,KAAK,2CAapD"}
+{"version":3,"file":"checker.d.ts","sourceRoot":"","sources":["../../../src/core/checker.ts"],"names":[],"mappings":"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"}

package/dist/src/core/checker.js

@@ -834,6 +834,8 @@ export function createChecker(program, resolver) {
                         isTypeReferenceContextDeprecated(node.parent)));
             case SyntaxKind.InterfaceStatement:
                 return checkDeprecatedNode(node);
+            case SyntaxKind.UnionStatement:
+                return checkDeprecatedNode(node);
             case SyntaxKind.IntersectionExpression:
             case SyntaxKind.UnionExpression:
             case SyntaxKind.ModelProperty:
@@ -5771,6 +5773,12 @@ export function createChecker(program, resolver) {
         }
         if (ctx.mapper === undefined) {
             checkModifiers(program, node);
+            if (node.extends && !isCompilerFeatureEnabled(program, "union-extends", node)) {
+                reportCheckerDiagnostic(createDiagnostic({
+                    code: "union-extends-disabled",
+                    target: node.extends,
+                }));
+            }
         }
         checkTemplateDeclaration(ctx, node);
         const variants = createRekeyableMap();
@@ -5787,6 +5795,9 @@ export function createChecker(program, resolver) {
             expression: false,
         });
         linkType(ctx, links, unionType);
+        if (node.extends) {
+            unionType.baseType = checkUnionBaseType(ctx, node, unionType, node.extends);
+        }
         unionType.decorators = checkDecorators(ctx, unionType, node);
         checkUnionVariants(ctx, unionType, node, variants);
         linkMapper(unionType, ctx.mapper);
@@ -5812,8 +5823,114 @@ export function createChecker(program, resolver) {
                 continue;
             }
             variants.set(variantType.name, variantType);
+            checkUnionVariantAgainstBaseType(ctx, parentUnion, variantNode, variantType);
         }
     }
+    /**
+     * Validate that a union variant satisfies the constraint declared by the union `extends` clause.
+     * Skipped inside of an uninstantiated template declaration where variant types are still
+     * unresolved template parameters. Each instantiation is checked instead.
+     */
+    function checkUnionVariantAgainstBaseType(ctx, parentUnion, variantNode, variantType) {
+        const baseType = parentUnion.baseType;
+        if (baseType === undefined || ctx.hasFlags(CheckFlags.InTemplateDeclaration)) {
+            return;
+        }
+        if (isErrorType(variantType.type)) {
+            return;
+        }
+        checkTypeAssignable(variantType.type, baseType, variantNode.value);
+    }
+    /**
+     * Resolve the type referenced by a union `extends` clause.
+     *
+     * The resulting type is only a constraint on the union variants: it doesn't create any
+     * inheritance relationship, it doesn't add anything to the union and it doesn't make the
+     * union extensible.
+     */
+    function checkUnionBaseType(ctx, union, unionType, extendsRef) {
+        const unionSymId = getNodeSym(union);
+        pendingResolutions.start(unionSymId, ResolutionKind.BaseType);
+        try {
+            const target = resolver.getNodeLinks(extendsRef).resolvedSymbol;
+            if (target && pendingResolutions.has(target, ResolutionKind.BaseType)) {
+                if (ctx.mapper === undefined) {
+                    reportCheckerDiagnostic(createDiagnostic({
+                        code: "circular-base-type",
+                        format: { typeName: target.name },
+                        target: target,
+                    }));
+                }
+                return undefined;
+            }
+            const baseType = getTypeForNode(extendsRef, ctx);
+            if (isErrorType(baseType)) {
+                // Should already have reported an error when resolving the expression.
+                return undefined;
+            }
+            // `extends` accepts an arbitrary expression so, unlike `model`/`scalar`, the union can
+            // also reference itself through a union expression (e.g. `union a extends a | string` or
+            // `union a extends b` with `alias b = a | string`). Those don't go through a symbol that
+            // `pendingResolutions` can observe so they are detected on the resolved type instead.
+            if (unionExpressionReferences(baseType, unionType)) {
+                if (ctx.mapper === undefined) {
+                    reportCheckerDiagnostic(createDiagnostic({
+                        code: "circular-base-type",
+                        format: { typeName: union.id.sv },
+                        target: extendsRef,
+                    }));
+                }
+                return undefined;
+            }
+            if (ctx.hasFlags(CheckFlags.InTemplateDeclaration) &&
+                (baseType.kind === "TemplateParameter" || baseType.kind === "TemplateParameterAccess")) {
+                return undefined;
+            }
+            if (baseType.kind === "Model" && baseType.node?.kind === SyntaxKind.ModelExpression) {
+                reportCheckerDiagnostic(createDiagnostic({
+                    code: "extend-union",
+                    messageId: "modelExpression",
+                    target: extendsRef,
+                }));
+                return undefined;
+            }
+            if (!isUnionBaseType(baseType)) {
+                reportCheckerDiagnostic(createDiagnostic({ code: "extend-union", target: extendsRef }));
+                return undefined;
+            }
+            return baseType;
+        }
+        finally {
+            pendingResolutions.finish(unionSymId, ResolutionKind.BaseType);
+        }
+    }
+    function isUnionBaseType(type) {
+        return (type.kind === "Model" ||
+            type.kind === "Scalar" ||
+            type.kind === "Enum" ||
+            type.kind === "Union");
+    }
+    /**
+     * Check whether `target` is reachable from `type` through union expressions only.
+     *
+     * Traversal deliberately stops at anything else (named unions, models, arrays, ...): a union
+     * referencing itself from those positions builds a perfectly valid cyclic type graph, exactly
+     * like `model Foo { foo: Foo }` does, and must not be reported. Only union expressions are
+     * followed, which is a finite syntactic structure, so this always terminates.
+     */
+    function unionExpressionReferences(type, target) {
+        if (type === target) {
+            return true;
+        }
+        if (type.kind === "Union" && type.expression) {
+            for (const variant of type.variants.values()) {
+                if (unionExpressionReferences(variant.type, target)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
     function checkUnionVariant(ctx, variantNode) {
         const links = getSymbolLinksForMember(variantNode);
         if (links && links.declaredType && ctx.mapper === undefined) {