@typespec/html-program-viewer 0.67.0-dev.3 → 0.67.0-dev.4

package/dist/emitter/index.js

@@ -5338,8 +5338,7 @@ const TypeConfig = {
     operations: "nested",
     unions: "nested",
     enums: "nested",
-    decoratorDeclarations: "nested",
-    functionDeclarations: "nested"
+    decoratorDeclarations: "nested"
   },
   Interface: {
     operations: "nested",
@@ -5424,10 +5423,7 @@ const TypeConfig = {
     default: "value"
   },
   // Don't want to expose those for now
-  Function: null,
-  Object: null,
-  Intrinsic: null,
-  Projection: null
+  Intrinsic: null
 };
 const CommonPropsConfig = {
   namespace: "parent"
@@ -5443,11 +5439,7 @@ const HiddenProps = [
   "templateMapper",
   "instantiationParameters",
   "decorators",
-  "projectionBase",
-  "projectionsByName",
-  "projectionSource",
   "projector",
-  "projections",
   "isFinished"
 ];
 new Set(HiddenProps);

package/dist/{manifest-IEQ_iGDm.js → manifest-DRAJnEGG.js}

@@ -1,6 +1,6 @@
 const manifest = {
   "version": "0.66.0",
-  "commit": "5d93e100c449f6bcf7fba1976364bd91dd032063"
+  "commit": "b4b7705c61f186590c6a6d086a131cd71ee4c48c"
 };
 
 export { manifest as default };

package/dist/react/index.js

@@ -18018,61 +18018,30 @@ var SyntaxKind;
     SyntaxKind[SyntaxKind["UnknownKeyword"] = 43] = "UnknownKeyword";
     SyntaxKind[SyntaxKind["ValueOfExpression"] = 44] = "ValueOfExpression";
     SyntaxKind[SyntaxKind["TypeReference"] = 45] = "TypeReference";
-    SyntaxKind[SyntaxKind["ProjectionReference"] = 46] = "ProjectionReference";
-    SyntaxKind[SyntaxKind["TemplateParameterDeclaration"] = 47] = "TemplateParameterDeclaration";
-    SyntaxKind[SyntaxKind["EmptyStatement"] = 48] = "EmptyStatement";
-    SyntaxKind[SyntaxKind["InvalidStatement"] = 49] = "InvalidStatement";
-    SyntaxKind[SyntaxKind["LineComment"] = 50] = "LineComment";
-    SyntaxKind[SyntaxKind["BlockComment"] = 51] = "BlockComment";
-    SyntaxKind[SyntaxKind["Doc"] = 52] = "Doc";
-    SyntaxKind[SyntaxKind["DocText"] = 53] = "DocText";
-    SyntaxKind[SyntaxKind["DocParamTag"] = 54] = "DocParamTag";
-    SyntaxKind[SyntaxKind["DocPropTag"] = 55] = "DocPropTag";
-    SyntaxKind[SyntaxKind["DocReturnsTag"] = 56] = "DocReturnsTag";
-    SyntaxKind[SyntaxKind["DocErrorsTag"] = 57] = "DocErrorsTag";
-    SyntaxKind[SyntaxKind["DocTemplateTag"] = 58] = "DocTemplateTag";
-    SyntaxKind[SyntaxKind["DocUnknownTag"] = 59] = "DocUnknownTag";
-    SyntaxKind[SyntaxKind["Projection"] = 60] = "Projection";
-    SyntaxKind[SyntaxKind["ProjectionParameterDeclaration"] = 61] = "ProjectionParameterDeclaration";
-    SyntaxKind[SyntaxKind["ProjectionModelSelector"] = 62] = "ProjectionModelSelector";
-    SyntaxKind[SyntaxKind["ProjectionModelPropertySelector"] = 63] = "ProjectionModelPropertySelector";
-    SyntaxKind[SyntaxKind["ProjectionScalarSelector"] = 64] = "ProjectionScalarSelector";
-    SyntaxKind[SyntaxKind["ProjectionOperationSelector"] = 65] = "ProjectionOperationSelector";
-    SyntaxKind[SyntaxKind["ProjectionUnionSelector"] = 66] = "ProjectionUnionSelector";
-    SyntaxKind[SyntaxKind["ProjectionUnionVariantSelector"] = 67] = "ProjectionUnionVariantSelector";
-    SyntaxKind[SyntaxKind["ProjectionInterfaceSelector"] = 68] = "ProjectionInterfaceSelector";
-    SyntaxKind[SyntaxKind["ProjectionEnumSelector"] = 69] = "ProjectionEnumSelector";
-    SyntaxKind[SyntaxKind["ProjectionEnumMemberSelector"] = 70] = "ProjectionEnumMemberSelector";
-    SyntaxKind[SyntaxKind["ProjectionExpressionStatement"] = 71] = "ProjectionExpressionStatement";
-    SyntaxKind[SyntaxKind["ProjectionIfExpression"] = 72] = "ProjectionIfExpression";
-    SyntaxKind[SyntaxKind["ProjectionBlockExpression"] = 73] = "ProjectionBlockExpression";
-    SyntaxKind[SyntaxKind["ProjectionMemberExpression"] = 74] = "ProjectionMemberExpression";
-    SyntaxKind[SyntaxKind["ProjectionLogicalExpression"] = 75] = "ProjectionLogicalExpression";
-    SyntaxKind[SyntaxKind["ProjectionEqualityExpression"] = 76] = "ProjectionEqualityExpression";
-    SyntaxKind[SyntaxKind["ProjectionUnaryExpression"] = 77] = "ProjectionUnaryExpression";
-    SyntaxKind[SyntaxKind["ProjectionRelationalExpression"] = 78] = "ProjectionRelationalExpression";
-    SyntaxKind[SyntaxKind["ProjectionArithmeticExpression"] = 79] = "ProjectionArithmeticExpression";
-    SyntaxKind[SyntaxKind["ProjectionCallExpression"] = 80] = "ProjectionCallExpression";
-    SyntaxKind[SyntaxKind["ProjectionLambdaExpression"] = 81] = "ProjectionLambdaExpression";
-    SyntaxKind[SyntaxKind["ProjectionLambdaParameterDeclaration"] = 82] = "ProjectionLambdaParameterDeclaration";
-    SyntaxKind[SyntaxKind["ProjectionModelExpression"] = 83] = "ProjectionModelExpression";
-    SyntaxKind[SyntaxKind["ProjectionModelProperty"] = 84] = "ProjectionModelProperty";
-    SyntaxKind[SyntaxKind["ProjectionModelSpreadProperty"] = 85] = "ProjectionModelSpreadProperty";
-    SyntaxKind[SyntaxKind["ProjectionSpreadProperty"] = 86] = "ProjectionSpreadProperty";
-    SyntaxKind[SyntaxKind["ProjectionTupleExpression"] = 87] = "ProjectionTupleExpression";
-    SyntaxKind[SyntaxKind["ProjectionStatement"] = 88] = "ProjectionStatement";
-    SyntaxKind[SyntaxKind["ProjectionDecoratorReferenceExpression"] = 89] = "ProjectionDecoratorReferenceExpression";
-    SyntaxKind[SyntaxKind["Return"] = 90] = "Return";
-    SyntaxKind[SyntaxKind["JsNamespaceDeclaration"] = 91] = "JsNamespaceDeclaration";
-    SyntaxKind[SyntaxKind["TemplateArgument"] = 92] = "TemplateArgument";
-    SyntaxKind[SyntaxKind["TypeOfExpression"] = 93] = "TypeOfExpression";
-    SyntaxKind[SyntaxKind["ObjectLiteral"] = 94] = "ObjectLiteral";
-    SyntaxKind[SyntaxKind["ObjectLiteralProperty"] = 95] = "ObjectLiteralProperty";
-    SyntaxKind[SyntaxKind["ObjectLiteralSpreadProperty"] = 96] = "ObjectLiteralSpreadProperty";
-    SyntaxKind[SyntaxKind["ArrayLiteral"] = 97] = "ArrayLiteral";
-    SyntaxKind[SyntaxKind["ConstStatement"] = 98] = "ConstStatement";
-    SyntaxKind[SyntaxKind["CallExpression"] = 99] = "CallExpression";
-    SyntaxKind[SyntaxKind["ScalarConstructor"] = 100] = "ScalarConstructor";
+    SyntaxKind[SyntaxKind["TemplateParameterDeclaration"] = 46] = "TemplateParameterDeclaration";
+    SyntaxKind[SyntaxKind["EmptyStatement"] = 47] = "EmptyStatement";
+    SyntaxKind[SyntaxKind["InvalidStatement"] = 48] = "InvalidStatement";
+    SyntaxKind[SyntaxKind["LineComment"] = 49] = "LineComment";
+    SyntaxKind[SyntaxKind["BlockComment"] = 50] = "BlockComment";
+    SyntaxKind[SyntaxKind["Doc"] = 51] = "Doc";
+    SyntaxKind[SyntaxKind["DocText"] = 52] = "DocText";
+    SyntaxKind[SyntaxKind["DocParamTag"] = 53] = "DocParamTag";
+    SyntaxKind[SyntaxKind["DocPropTag"] = 54] = "DocPropTag";
+    SyntaxKind[SyntaxKind["DocReturnsTag"] = 55] = "DocReturnsTag";
+    SyntaxKind[SyntaxKind["DocErrorsTag"] = 56] = "DocErrorsTag";
+    SyntaxKind[SyntaxKind["DocTemplateTag"] = 57] = "DocTemplateTag";
+    SyntaxKind[SyntaxKind["DocUnknownTag"] = 58] = "DocUnknownTag";
+    SyntaxKind[SyntaxKind["Return"] = 59] = "Return";
+    SyntaxKind[SyntaxKind["JsNamespaceDeclaration"] = 60] = "JsNamespaceDeclaration";
+    SyntaxKind[SyntaxKind["TemplateArgument"] = 61] = "TemplateArgument";
+    SyntaxKind[SyntaxKind["TypeOfExpression"] = 62] = "TypeOfExpression";
+    SyntaxKind[SyntaxKind["ObjectLiteral"] = 63] = "ObjectLiteral";
+    SyntaxKind[SyntaxKind["ObjectLiteralProperty"] = 64] = "ObjectLiteralProperty";
+    SyntaxKind[SyntaxKind["ObjectLiteralSpreadProperty"] = 65] = "ObjectLiteralSpreadProperty";
+    SyntaxKind[SyntaxKind["ArrayLiteral"] = 66] = "ArrayLiteral";
+    SyntaxKind[SyntaxKind["ConstStatement"] = 67] = "ConstStatement";
+    SyntaxKind[SyntaxKind["CallExpression"] = 68] = "CallExpression";
+    SyntaxKind[SyntaxKind["ScalarConstructor"] = 69] = "ScalarConstructor";
 })(SyntaxKind || (SyntaxKind = {}));
 var IdentifierKind;
 (function (IdentifierKind) {
@@ -18101,7 +18070,7 @@ let manifest;
 try {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    manifest = (await import('../manifest-IEQ_iGDm.js')).default;
+    manifest = (await import('../manifest-DRAJnEGG.js')).default;
 }
 catch {
     const name = "../dist/manifest.js";
@@ -18419,7 +18388,6 @@ const diagnostics = {
             unexpected: paramMessage `Unexpected token ${"token"}`,
             numericOrStringLiteral: "Expected numeric or string literal.",
             identifier: "Identifier expected.",
-            projectionDirection: "from or to expected.",
             expression: "Expression expected.",
             statement: "Statement expected.",
             property: "Property expected.",
@@ -18472,15 +18440,6 @@ const diagnostics = {
             default: paramMessage `Cannot decorate ${"nodeName"}.`,
         },
     },
-    "invalid-projection": {
-        severity: "error",
-        messages: {
-            default: "Invalid projection",
-            wrongType: "Non-projection can't be used to project",
-            noTo: "Projection missing to projection",
-            projectionError: paramMessage `An error occurred when projecting this type: ${"message"}`,
-        },
-    },
     "default-required": {
         severity: "error",
         messages: {
@@ -18820,6 +18779,12 @@ const diagnostics = {
             default: "A function declaration must be prefixed with the 'extern' modifier.",
         },
     },
+    "function-unsupported": {
+        severity: "error",
+        messages: {
+            default: "Function are currently not supported.",
+        },
+    },
     "missing-implementation": {
         severity: "error",
         messages: {
@@ -28284,7 +28249,7 @@ function getSourceLocation(target, options = {}) {
             return getSourceLocationOfNode(target.node, options);
         }
         // symbol
-        if (target.flags & 32768 /* SymbolFlags.Using */) {
+        if (target.flags & 8192 /* SymbolFlags.Using */) {
             target = target.symbolSource;
         }
         if (!target.declarations[0]) {
@@ -29230,9 +29195,7 @@ function getVisibilityForClass(program, property, visibilityClass) {
 // #endregion
 
 function isIntrinsicType(program, type, kind) {
-    return ignoreDiagnostics(program.checker.isTypeAssignableTo(
-    // eslint-disable-next-line @typescript-eslint/no-deprecated
-    type.projectionBase ?? type, program.checker.getStdType(kind), type));
+    return ignoreDiagnostics(program.checker.isTypeAssignableTo(type, program.checker.getStdType(kind), type));
 }
 
 const deprecatedKey = createStateSymbol("deprecated");
@@ -29361,69 +29324,234 @@ function getDiscriminator(program, entity) {
 const [getDiscriminatedOptions, setDiscriminatedOptions] = useStateMap(createStateSymbol("discriminated"));
 // #endregion
 
-const regex = /^(application|audio|font|example|image|message|model|multipart|text|video|x-(?:[0-9A-Za-z!#$%&'*+.^_`|~-]+))\/([0-9A-Za-z!#$%&'*+.^_`|~-]+)$/;
-function parseMimeType(mimeType) {
-    const match = mimeType.match(regex);
-    if (match == null) {
-        return undefined;
+function getDiscriminatedUnion(typeOrProgram, typeOrDiscriminator) {
+    if ("propertyName" in typeOrDiscriminator) {
+        const type = typeOrProgram;
+        switch (type.kind) {
+            case "Model":
+                return getDiscriminatedUnionFromInheritance(type, typeOrDiscriminator);
+            case "Union":
+                return getDiscriminatedUnionForUnionLegacy(type, typeOrDiscriminator);
+        }
     }
-    const type = {
-        type: match[1],
-        ...parseSubType(match[2]),
+    else {
+        return getDiscriminatedUnionForUnion(typeOrProgram, typeOrDiscriminator);
+    }
+}
+function getDiscriminatedUnionForUnion(program, type) {
+    const options = getDiscriminatedOptions(program, type);
+    const diagnostics = [];
+    if (options === undefined) {
+        return [undefined, []];
+    }
+    const variants = new Map();
+    let defaultVariant;
+    // If there is not envelope then every variant needs to be a model.
+    for (const variant of type.variants.values()) {
+        if (typeof variant.name !== "string") {
+            if (defaultVariant) {
+                diagnostics.push(createDiagnostic({
+                    code: "invalid-discriminated-union-variant",
+                    messageId: "duplicateDefaultVariant",
+                    target: variant,
+                }));
+            }
+            else {
+                defaultVariant = variant.type;
+            }
+            continue;
+        }
+        variants.set(variant.name, variant.type);
+        if (options.envelope === "none") {
+            if (variant.type.kind !== "Model") {
+                diagnostics.push(createDiagnostic({
+                    code: "invalid-discriminated-union-variant",
+                    messageId: "noEnvelopeModel",
+                    format: { name: variant.name.toString() },
+                    target: variant,
+                }));
+                continue;
+            }
+            const prop = variant.type.properties.get(options.discriminatorPropertyName);
+            if (prop !== undefined) {
+                const key = getStringValue(prop.type);
+                if (key !== variant.name) {
+                    diagnostics.push(createDiagnostic({
+                        code: "invalid-discriminated-union-variant",
+                        messageId: "discriminantMismatch",
+                        format: {
+                            name: variant.name.toString(),
+                            discriminant: options.discriminatorPropertyName,
+                            propertyValue: key,
+                            variantName: String(variant.name),
+                        },
+                        target: variant.type,
+                    }));
+                }
+            }
+        }
+    }
+    return [
+        {
+            type,
+            options,
+            variants,
+        },
+        diagnostics,
+    ];
+}
+function getDiscriminatedUnionForUnionLegacy(type, discriminator) {
+    const variants = new Map();
+    const diagnostics = [];
+    const duplicates = new DuplicateTracker();
+    for (const variant of type.variants.values()) {
+        if (variant.type.kind !== "Model") {
+            diagnostics.push(createDiagnostic({
+                code: "invalid-discriminated-union-variant",
+                format: { name: variant.name.toString() },
+                target: variant,
+            }));
+            continue;
+        }
+        const prop = getDiscriminatorProperty(variant.type, discriminator, diagnostics);
+        if (prop === undefined) {
+            diagnostics.push(createDiagnostic({
+                code: "invalid-discriminated-union-variant",
+                messageId: "noDiscriminant",
+                format: { name: variant.name.toString(), discriminant: discriminator.propertyName },
+                target: variant,
+            }));
+            continue;
+        }
+        const key = getStringValue(prop.type);
+        if (key) {
+            duplicates.track(key, variant.type);
+            variants.set(key, variant.type);
+        }
+        else {
+            diagnostics.push(createDiagnostic({
+                code: "invalid-discriminated-union-variant",
+                messageId: "wrongDiscriminantType",
+                format: { name: variant.name.toString(), discriminant: discriminator.propertyName },
+                target: variant.type,
+            }));
+        }
+    }
+    reportDuplicateDiscriminatorValues(duplicates, diagnostics);
+    const discriminatedUnion = {
+        kind: "legacy",
+        propertyName: discriminator.propertyName,
+        variants,
     };
-    return type;
+    return [discriminatedUnion, diagnostics];
 }
-function parseSubType(value) {
-    if (!value.includes("+"))
-        return { subtype: value };
-    const [subtype, suffix] = value.split("+", 2);
-    return { subtype, suffix };
+function getDiscriminatedUnionFromInheritance(type, discriminator) {
+    const variants = new Map();
+    const diagnostics = [];
+    const duplicates = new DuplicateTracker();
+    function checkForVariantsIn(current) {
+        for (const derivedModel of current.derivedModels) {
+            if (isTemplateDeclarationOrInstance(derivedModel)) {
+                continue; // Skip template instances as they should be used with `model is`
+            }
+            const keys = getDiscriminatorValues(derivedModel, discriminator, diagnostics);
+            if (keys === undefined) {
+                if (derivedModel.derivedModels.length === 0) {
+                    diagnostics.push(createDiagnostic({
+                        code: "missing-discriminator-property",
+                        format: { discriminator: discriminator.propertyName },
+                        target: derivedModel,
+                    }));
+                }
+                else {
+                    checkForVariantsIn(derivedModel);
+                }
+            }
+            else {
+                for (const key of keys) {
+                    duplicates.track(key, derivedModel);
+                    variants.set(key, derivedModel);
+                }
+            }
+        }
+    }
+    checkForVariantsIn(type);
+    reportDuplicateDiscriminatorValues(duplicates, diagnostics);
+    const discriminatedUnion = {
+        kind: "legacy",
+        propertyName: discriminator.propertyName,
+        variants,
+    };
+    return [discriminatedUnion, diagnostics];
 }
-
-const [getEncodedNamesMap, setEncodedNamesMap, getEncodedNamesStateMap] = useStateMap(createStateSymbol("encodedName"));
-function getEncodedName(program, target, mimeType) {
-    const mimeTypeObj = parseMimeType(mimeType);
-    if (mimeTypeObj === undefined) {
+function reportDuplicateDiscriminatorValues(duplicates, diagnostics) {
+    for (const [duplicateKey, models] of duplicates.entries()) {
+        for (const model of models) {
+            diagnostics.push(createDiagnostic({
+                code: "invalid-discriminator-value",
+                messageId: "duplicate",
+                format: { discriminator: duplicateKey },
+                target: model,
+            }));
+        }
+    }
+}
+function getDiscriminatorProperty(model, discriminator, diagnostics) {
+    const prop = model.properties.get(discriminator.propertyName);
+    if (prop && prop.optional) {
+        diagnostics.push(createDiagnostic({
+            code: "invalid-discriminator-value",
+            messageId: "required",
+            target: prop,
+        }));
+    }
+    return prop;
+}
+function getDiscriminatorValues(model, discriminator, diagnostics) {
+    const prop = getDiscriminatorProperty(model, discriminator, diagnostics);
+    if (!prop)
         return undefined;
+    const keys = getStringValues(prop.type);
+    if (keys.length === 0) {
+        diagnostics.push(createDiagnostic({
+            code: "invalid-discriminator-value",
+            format: { kind: prop.type.kind },
+            target: prop,
+        }));
+    }
+    return keys;
+}
+function getStringValues(type) {
+    switch (type.kind) {
+        case "String":
+            return [type.value];
+        case "Union":
+            return [...type.variants.values()].flatMap((x) => getStringValues(x.type)).filter(isDefined);
+        case "EnumMember":
+            return typeof type.value !== "number" ? [type.value ?? type.name] : [];
+        case "UnionVariant":
+            return getStringValues(type.type);
+        default:
+            return [];
+    }
+}
+function getStringValue(type) {
+    switch (type.kind) {
+        case "String":
+            return type.value;
+        case "EnumMember":
+            return typeof type.value !== "number" ? (type.value ?? type.name) : undefined;
+        default:
+            return undefined;
     }
-    const resolvedMimeType = mimeTypeObj?.suffix
-        ? `${mimeTypeObj.type}/${mimeTypeObj.suffix}`
-        : mimeType;
-    return getEncodedNamesMap(program, target)?.get(resolvedMimeType);
 }
+
+//
+// Generated by scripts/regen-nonascii-map.js
+// on node v18.16.0 with unicode 15.0.
+//
 /**
- * Resolve the encoded name for the given type when serialized to the given mime type.
- * If a specific value was provided by `@encodedName` decorator for that mime type it will return that otherwise it will return the name of the type.
- *
- * @example
- *
- * For the given
- * ```tsp
- * model Certificate {
- *   @encodedName("application/json", "exp")
- *   @encodedName("application/xml", "expiry")
- *   expireAt: utcDateTime;
- *
- * }
- * ```
- *
- * ```ts
- * resolveEncodedName(program, type, "application/json") // exp
- * resolveEncodedName(program, type, "application/merge-patch+json") // exp
- * resolveEncodedName(program, type, "application/xml") // expireAt
- * resolveEncodedName(program, type, "application/yaml") // expiry
- * ```
- */
-function resolveEncodedName(program, target, mimeType) {
-    return getEncodedName(program, target, mimeType) ?? target.name;
-}
-
-//
-// Generated by scripts/regen-nonascii-map.js
-// on node v18.16.0 with unicode 15.0.
-//
-/**
- * @internal
+ * @internal
  *
  * Map of non-ascii characters that are valid in an identifier. Each pair of
  * numbers represents an inclusive range of code points.
@@ -30685,6 +30813,71 @@ function getStringTemplateName(type) {
     return "string";
 }
 
+const regex = /^(application|audio|font|example|image|message|model|multipart|text|video|x-(?:[0-9A-Za-z!#$%&'*+.^_`|~-]+))\/([0-9A-Za-z!#$%&'*+.^_`|~-]+)$/;
+function parseMimeType(mimeType) {
+    const match = mimeType.match(regex);
+    if (match == null) {
+        return undefined;
+    }
+    const type = {
+        type: match[1],
+        ...parseSubType(match[2]),
+    };
+    return type;
+}
+function parseSubType(value) {
+    if (!value.includes("+"))
+        return { subtype: value };
+    const [subtype, suffix] = value.split("+", 2);
+    return { subtype, suffix };
+}
+
+const [getEncodedNamesMap, setEncodedNamesMap, getEncodedNamesStateMap] = useStateMap(createStateSymbol("encodedName"));
+function getEncodedName(program, target, mimeType) {
+    const mimeTypeObj = parseMimeType(mimeType);
+    if (mimeTypeObj === undefined) {
+        return undefined;
+    }
+    const resolvedMimeType = mimeTypeObj?.suffix
+        ? `${mimeTypeObj.type}/${mimeTypeObj.suffix}`
+        : mimeType;
+    return getEncodedNamesMap(program, target)?.get(resolvedMimeType);
+}
+/**
+ * Resolve the encoded name for the given type when serialized to the given mime type.
+ * If a specific value was provided by `@encodedName` decorator for that mime type it will return that otherwise it will return the name of the type.
+ *
+ * @example
+ *
+ * For the given
+ * ```tsp
+ * model Certificate {
+ *   @encodedName("application/json", "exp")
+ *   @encodedName("application/xml", "expiry")
+ *   expireAt: utcDateTime;
+ *
+ * }
+ * ```
+ *
+ * ```ts
+ * resolveEncodedName(program, type, "application/json") // exp
+ * resolveEncodedName(program, type, "application/merge-patch+json") // exp
+ * resolveEncodedName(program, type, "application/xml") // expireAt
+ * resolveEncodedName(program, type, "application/yaml") // expiry
+ * ```
+ */
+function resolveEncodedName(program, target, mimeType) {
+    return getEncodedName(program, target, mimeType) ?? target.name;
+}
+
+function getLocationContext(program, type) {
+    const sourceLocation = getSourceLocation(type);
+    if (sourceLocation.isSynthetic) {
+        return { type: "synthetic" };
+    }
+    return program.getSourceFileLocationContext(sourceLocation.file);
+}
+
 /**
  * Flow control for mutators.
  *
@@ -30984,228 +31177,6 @@ function extendsStdType(typeName) {
     };
 }
 
-function getDiscriminatedUnion(typeOrProgram, typeOrDiscriminator) {
-    if ("propertyName" in typeOrDiscriminator) {
-        const type = typeOrProgram;
-        switch (type.kind) {
-            case "Model":
-                return getDiscriminatedUnionFromInheritance(type, typeOrDiscriminator);
-            case "Union":
-                return getDiscriminatedUnionForUnionLegacy(type, typeOrDiscriminator);
-        }
-    }
-    else {
-        return getDiscriminatedUnionForUnion(typeOrProgram, typeOrDiscriminator);
-    }
-}
-function getDiscriminatedUnionForUnion(program, type) {
-    const options = getDiscriminatedOptions(program, type);
-    const diagnostics = [];
-    if (options === undefined) {
-        return [undefined, []];
-    }
-    const variants = new Map();
-    let defaultVariant;
-    // If there is not envelope then every variant needs to be a model.
-    for (const variant of type.variants.values()) {
-        if (typeof variant.name !== "string") {
-            if (defaultVariant) {
-                diagnostics.push(createDiagnostic({
-                    code: "invalid-discriminated-union-variant",
-                    messageId: "duplicateDefaultVariant",
-                    target: variant,
-                }));
-            }
-            else {
-                defaultVariant = variant.type;
-            }
-            continue;
-        }
-        variants.set(variant.name, variant.type);
-        if (options.envelope === "none") {
-            if (variant.type.kind !== "Model") {
-                diagnostics.push(createDiagnostic({
-                    code: "invalid-discriminated-union-variant",
-                    messageId: "noEnvelopeModel",
-                    format: { name: variant.name.toString() },
-                    target: variant,
-                }));
-                continue;
-            }
-            const prop = variant.type.properties.get(options.discriminatorPropertyName);
-            if (prop !== undefined) {
-                const key = getStringValue(prop.type);
-                if (key !== variant.name) {
-                    diagnostics.push(createDiagnostic({
-                        code: "invalid-discriminated-union-variant",
-                        messageId: "discriminantMismatch",
-                        format: {
-                            name: variant.name.toString(),
-                            discriminant: options.discriminatorPropertyName,
-                            propertyValue: key,
-                            variantName: String(variant.name),
-                        },
-                        target: variant.type,
-                    }));
-                }
-            }
-        }
-    }
-    return [
-        {
-            type,
-            options,
-            variants,
-        },
-        diagnostics,
-    ];
-}
-function getDiscriminatedUnionForUnionLegacy(type, discriminator) {
-    const variants = new Map();
-    const diagnostics = [];
-    const duplicates = new DuplicateTracker();
-    for (const variant of type.variants.values()) {
-        if (variant.type.kind !== "Model") {
-            diagnostics.push(createDiagnostic({
-                code: "invalid-discriminated-union-variant",
-                format: { name: variant.name.toString() },
-                target: variant,
-            }));
-            continue;
-        }
-        const prop = getDiscriminatorProperty(variant.type, discriminator, diagnostics);
-        if (prop === undefined) {
-            diagnostics.push(createDiagnostic({
-                code: "invalid-discriminated-union-variant",
-                messageId: "noDiscriminant",
-                format: { name: variant.name.toString(), discriminant: discriminator.propertyName },
-                target: variant,
-            }));
-            continue;
-        }
-        const key = getStringValue(prop.type);
-        if (key) {
-            duplicates.track(key, variant.type);
-            variants.set(key, variant.type);
-        }
-        else {
-            diagnostics.push(createDiagnostic({
-                code: "invalid-discriminated-union-variant",
-                messageId: "wrongDiscriminantType",
-                format: { name: variant.name.toString(), discriminant: discriminator.propertyName },
-                target: variant.type,
-            }));
-        }
-    }
-    reportDuplicateDiscriminatorValues(duplicates, diagnostics);
-    const discriminatedUnion = {
-        kind: "legacy",
-        propertyName: discriminator.propertyName,
-        variants,
-    };
-    return [discriminatedUnion, diagnostics];
-}
-function getDiscriminatedUnionFromInheritance(type, discriminator) {
-    const variants = new Map();
-    const diagnostics = [];
-    const duplicates = new DuplicateTracker();
-    function checkForVariantsIn(current) {
-        for (const derivedModel of current.derivedModels) {
-            if (isTemplateDeclarationOrInstance(derivedModel)) {
-                continue; // Skip template instances as they should be used with `model is`
-            }
-            const keys = getDiscriminatorValues(derivedModel, discriminator, diagnostics);
-            if (keys === undefined) {
-                if (derivedModel.derivedModels.length === 0) {
-                    diagnostics.push(createDiagnostic({
-                        code: "missing-discriminator-property",
-                        format: { discriminator: discriminator.propertyName },
-                        target: derivedModel,
-                    }));
-                }
-                else {
-                    checkForVariantsIn(derivedModel);
-                }
-            }
-            else {
-                for (const key of keys) {
-                    duplicates.track(key, derivedModel);
-                    variants.set(key, derivedModel);
-                }
-            }
-        }
-    }
-    checkForVariantsIn(type);
-    reportDuplicateDiscriminatorValues(duplicates, diagnostics);
-    const discriminatedUnion = {
-        kind: "legacy",
-        propertyName: discriminator.propertyName,
-        variants,
-    };
-    return [discriminatedUnion, diagnostics];
-}
-function reportDuplicateDiscriminatorValues(duplicates, diagnostics) {
-    for (const [duplicateKey, models] of duplicates.entries()) {
-        for (const model of models) {
-            diagnostics.push(createDiagnostic({
-                code: "invalid-discriminator-value",
-                messageId: "duplicate",
-                format: { discriminator: duplicateKey },
-                target: model,
-            }));
-        }
-    }
-}
-function getDiscriminatorProperty(model, discriminator, diagnostics) {
-    const prop = model.properties.get(discriminator.propertyName);
-    if (prop && prop.optional) {
-        diagnostics.push(createDiagnostic({
-            code: "invalid-discriminator-value",
-            messageId: "required",
-            target: prop,
-        }));
-    }
-    return prop;
-}
-function getDiscriminatorValues(model, discriminator, diagnostics) {
-    const prop = getDiscriminatorProperty(model, discriminator, diagnostics);
-    if (!prop)
-        return undefined;
-    const keys = getStringValues(prop.type);
-    if (keys.length === 0) {
-        diagnostics.push(createDiagnostic({
-            code: "invalid-discriminator-value",
-            format: { kind: prop.type.kind },
-            target: prop,
-        }));
-    }
-    return keys;
-}
-function getStringValues(type) {
-    switch (type.kind) {
-        case "String":
-            return [type.value];
-        case "Union":
-            return [...type.variants.values()].flatMap((x) => getStringValues(x.type)).filter(isDefined);
-        case "EnumMember":
-            return typeof type.value !== "number" ? [type.value ?? type.name] : [];
-        case "UnionVariant":
-            return getStringValues(type.type);
-        default:
-            return [];
-    }
-}
-function getStringValue(type) {
-    switch (type.kind) {
-        case "String":
-            return type.value;
-        case "EnumMember":
-            return typeof type.value !== "number" ? (type.value ?? type.name) : undefined;
-        default:
-            return undefined;
-    }
-}
-
 /**
  * Get a plausible name for the given type.
  * @experimental
@@ -31271,15 +31242,12 @@ defineKit({
                         instantiationParameters: type.instantiationParameters
                             ? [...type.instantiationParameters]
                             : undefined,
-                        // eslint-disable-next-line @typescript-eslint/no-deprecated
-                        projections: [...type.projections],
                         models: copyMap(type.models),
                         decoratorDeclarations: copyMap(type.decoratorDeclarations),
                         enums: copyMap(type.enums),
                         unions: copyMap(type.unions),
                         operations: copyMap(type.operations),
                         interfaces: copyMap(type.interfaces),
-                        functionDeclarations: copyMap(type.functionDeclarations),
                         namespaces: copyMap(type.namespaces),
                         scalars: copyMap(type.scalars),
                     });
@@ -31842,14 +31810,6 @@ class Realm {
 }
 _a = Realm;
 
-function getLocationContext(program, type) {
-    const sourceLocation = getSourceLocation(type);
-    if (sourceLocation.isSynthetic) {
-        return { type: "synthetic" };
-    }
-    return program.getSourceFileLocationContext(sourceLocation.file);
-}
-
 /**
  * The fixed set of options for each of the kinds of delimited lists in TypeSpec.
  */
@@ -31968,18 +31928,6 @@ var ListKind;
         close: Token.CloseParen,
         invalidAnnotationTarget: "expression",
     };
-    ListKind.ProjectionExpression = {
-        ...ExpresionsBase,
-        allowEmpty: true,
-        open: Token.OpenParen,
-        close: Token.CloseParen,
-    };
-    ListKind.ProjectionParameter = {
-        ...ExpresionsBase,
-        allowEmpty: true,
-        open: Token.OpenParen,
-        close: Token.CloseParen,
-    };
 })(ListKind || (ListKind = {}));
 
 /**
@@ -32011,7 +31959,6 @@ var ListKind;
     ],
 });
 
-/* eslint-disable @typescript-eslint/no-deprecated */
 var Related;
 (function (Related) {
     Related[Related["false"] = 0] = "false";
@@ -32020,7 +31967,6 @@ var Related;
 })(Related || (Related = {}));
 // #endregion
 
-/* eslint-disable @typescript-eslint/no-deprecated */
 /**
  * Find all named models that could have been the source of the given
  * property. This includes the named parents of all property sources in a
@@ -33521,11 +33467,6 @@ var CommentCheckFlags;
     CommentCheckFlags[CommentCheckFlags["Last"] = 256] = "Last";
 })(CommentCheckFlags || (CommentCheckFlags = {}));
 
-const globalLibraryUrlsLoadedSym = Symbol.for("TYPESPEC_LIBRARY_URLS_LOADED");
-if (globalThis[globalLibraryUrlsLoadedSym] === undefined) {
-    globalThis[globalLibraryUrlsLoadedSym] = new Set();
-}
-
 // prettier-ignore
 var UsageFlags;
 (function (UsageFlags) {
@@ -33534,6 +33475,11 @@ var UsageFlags;
     UsageFlags[UsageFlags["Output"] = 4] = "Output";
 })(UsageFlags || (UsageFlags = {}));
 
+const globalLibraryUrlsLoadedSym = Symbol.for("TYPESPEC_LIBRARY_URLS_LOADED");
+if (globalThis[globalLibraryUrlsLoadedSym] === undefined) {
+    globalThis[globalLibraryUrlsLoadedSym] = new Set();
+}
+
 const CompilerPackageRoot = undefined;
 
 var main$4 = {};
@@ -44671,8 +44617,7 @@ const TypeConfig = {
     operations: "nested",
     unions: "nested",
     enums: "nested",
-    decoratorDeclarations: "nested",
-    functionDeclarations: "nested"
+    decoratorDeclarations: "nested"
   },
   Interface: {
     operations: "nested",
@@ -44757,10 +44702,7 @@ const TypeConfig = {
     default: "value"
   },
   // Don't want to expose those for now
-  Function: null,
-  Object: null,
-  Intrinsic: null,
-  Projection: null
+  Intrinsic: null
 };
 const CommonPropsConfig = {
   namespace: "parent"
@@ -44776,11 +44718,7 @@ const HiddenProps = [
   "templateMapper",
   "instantiationParameters",
   "decorators",
-  "projectionBase",
-  "projectionsByName",
-  "projectionSource",
   "projector",
-  "projections",
   "isFinished"
 ];
 new Set(HiddenProps);

package/dist/react/type-config.d.ts

@@ -11,9 +11,9 @@ type TypeGraphConfig = {
 export declare const CommonPropsConfig: {
     namespace: string;
 };
-declare const HiddenProps: readonly ["entityKind", "kind", "name", "node", "symbol", "templateNode", "templateArguments", "templateMapper", "instantiationParameters", "decorators", "projectionBase", "projectionsByName", "projectionSource", "projector", "projections", "isFinished"];
+declare const HiddenProps: readonly ["entityKind", "kind", "name", "node", "symbol", "templateNode", "templateArguments", "templateMapper", "instantiationParameters", "decorators", "projector", "isFinished"];
 type HiddenPropsType = (typeof HiddenProps)[number];
-export declare const HiddenPropsSet: Set<"symbol" | "kind" | "entityKind" | "name" | "node" | "templateNode" | "templateArguments" | "templateMapper" | "instantiationParameters" | "decorators" | "projectionBase" | "projectionsByName" | "projectionSource" | "projector" | "projections" | "isFinished">;
+export declare const HiddenPropsSet: Set<"symbol" | "kind" | "entityKind" | "name" | "node" | "templateNode" | "templateArguments" | "templateMapper" | "instantiationParameters" | "decorators" | "projector" | "isFinished">;
 export declare function getPropertyRendering<T extends Type, K extends keyof T>(type: T, key: K): EntityPropertyConfig;
 export {};
 //# sourceMappingURL=type-config.d.ts.map

package/dist/react/type-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type-config.d.ts","sourceRoot":"","sources":["../../src/react/type-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE/C,MAAM,MAAM,oBAAoB,GAAG,QAAQ,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,CAAC;AAElF,eAAO,MAAM,UAAU,EAAE,eAoGxB,CAAC;AAEF,KAAK,aAAa,CAAC,CAAC,SAAS,IAAI,IAAI,OAAO,CAC1C,MAAM,CAAC,EACP,eAAe,GAAG,MAAM,OAAO,iBAAiB,CACjD,CAAC;AACF,KAAK,UAAU,CAAC,CAAC,SAAS,IAAI,IAAI,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,GAAG,IAAI,CAAC;AACxF,KAAK,eAAe,GAAG;KACpB,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,CAAC,CAAA;KAAE,CAAC,CAAC;CAC5D,CAAC;AAEF,eAAO,MAAM,iBAAiB;;CAE7B,CAAC;AAEF,QAAA,MAAM,WAAW,gQAiBP,CAAC;AACX,KAAK,eAAe,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEpD,eAAO,MAAM,cAAc,yQAAuB,CAAC;AAEnD,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,SAAS,MAAM,CAAC,EACpE,IAAI,EAAE,CAAC,EACP,GAAG,EAAE,CAAC,GACL,oBAAoB,CAItB"}
+{"version":3,"file":"type-config.d.ts","sourceRoot":"","sources":["../../src/react/type-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE/C,MAAM,MAAM,oBAAoB,GAAG,QAAQ,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,CAAC;AAElF,eAAO,MAAM,UAAU,EAAE,eAgGxB,CAAC;AAEF,KAAK,aAAa,CAAC,CAAC,SAAS,IAAI,IAAI,OAAO,CAC1C,MAAM,CAAC,EACP,eAAe,GAAG,MAAM,OAAO,iBAAiB,CACjD,CAAC;AACF,KAAK,UAAU,CAAC,CAAC,SAAS,IAAI,IAAI,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,GAAG,IAAI,CAAC;AACxF,KAAK,eAAe,GAAG;KACpB,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,CAAC,CAAA;KAAE,CAAC,CAAC;CAC5D,CAAC;AAEF,eAAO,MAAM,iBAAiB;;CAE7B,CAAC;AAEF,QAAA,MAAM,WAAW,sLAaP,CAAC;AACX,KAAK,eAAe,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEpD,eAAO,MAAM,cAAc,2LAAuB,CAAC;AAEnD,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,SAAS,MAAM,CAAC,EACpE,IAAI,EAAE,CAAC,EACP,GAAG,EAAE,CAAC,GACL,oBAAoB,CAItB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/html-program-viewer",
-  "version": "0.67.0-dev.3",
+  "version": "0.67.0-dev.4",
   "author": "Microsoft Corporation",
   "description": "TypeSpec library for emitting an html view of the program.",
   "homepage": "https://typespec.io",