@typespec/emitter-framework 0.8.0-dev.2 → 0.8.0-dev.4

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog - @typespec/emitter-framework
 
+## 0.7.1
+
+### Bump dependencies
+
+- [#7363](https://github.com/microsoft/typespec/pull/7363) Upgrade alloy 16
+
+### Bug Fixes
+
+- [#7321](https://github.com/microsoft/typespec/pull/7321) Use wasm version of tree sitter for snippet extractor
+
+
 ## 0.7.0
 
 ### Bump dependencies

package/dist/src/typescript/components/enum-declaration.d.ts

@@ -8,6 +8,7 @@ export interface EnumDeclarationProps extends Omit<ts.TypeDeclarationProps, "nam
 export declare function EnumDeclaration(props: EnumDeclarationProps): ay.Children;
 export interface EnumMemberProps {
     type: TspEnumMember;
+    doc?: ay.Children;
     refkey?: ay.Refkey;
 }
 export declare function EnumMember(props: EnumMemberProps): ay.Children;

package/dist/src/typescript/components/enum-declaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enum-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/enum-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,UAAU,IAAI,aAAa,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAK9E,MAAM,WAAW,oBAAqB,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACjF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC;CACpB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,eAmC1D;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC;CACpB;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,eAQhD"}
+{"version":3,"file":"enum-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/enum-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,UAAU,IAAI,aAAa,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAK9E,MAAM,WAAW,oBAAqB,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACjF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC;CACpB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,eA4C1D;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,aAAa,CAAC;IACpB,GAAG,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC;IAClB,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC;CACpB;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,eAShD"}

package/dist/src/typescript/components/enum-declaration.js

@@ -26,7 +26,9 @@ export function EnumDeclaration(props) {
   const refkeys = declarationRefkeys(props.refkey, props.type);
   const name = props.name ?? ts.useTSNamePolicy().getName(props.type.name, "enum");
   const members = Array.from(type.members.entries());
+  const doc = props.doc ?? $.type.getDoc(type);
   return _$createComponent(ts.EnumDeclaration, {
+    doc: doc,
     name: name,
     refkey: refkeys,
     get ["default"]() {
@@ -40,7 +42,9 @@ export function EnumDeclaration(props) {
         each: members,
         joiner: ",\n",
         children: ([key, value]) => {
+          const memberDoc = $.type.getDoc(value);
           return _$createComponent(EnumMember, {
+            doc: memberDoc,
             type: value,
             get refkey() {
               return _$memo(() => !!$.union.is(props.type))() ? efRefkey(props.type.variants.get(key)) : efRefkey(value);
@@ -53,6 +57,9 @@ export function EnumDeclaration(props) {
 }
 export function EnumMember(props) {
   return _$createComponent(ts.EnumMember, {
+    get doc() {
+      return props.doc;
+    },
     get name() {
       return props.type.name;
     },

package/dist/src/typescript/components/function-declaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"function-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/function-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAKtD,MAAM,WAAW,gCACf,SAAQ,IAAI,CAAC,EAAE,CAAC,wBAAwB,EAAE,MAAM,CAAC;IACjD,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AAED,MAAM,MAAM,wBAAwB,GAChC,gCAAgC,GAChC,EAAE,CAAC,wBAAwB,CAAC;AAEhC;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,qCAkClE;yBAlCe,mBAAmB;4BA2CyB,uBAAuB;;AAPnF,MAAM,WAAW,4BAA6B,SAAQ,IAAI,CAAC,EAAE,CAAC,wBAAwB,EAAE,MAAM,CAAC;IAC7F,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,uBAAuB,GAAG,4BAA4B,GAAG,EAAE,CAAC,uBAAuB,CAAC"}
+{"version":3,"file":"function-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/function-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAMtD,MAAM,WAAW,gCACf,SAAQ,IAAI,CAAC,EAAE,CAAC,wBAAwB,EAAE,MAAM,CAAC;IACjD,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AAED,MAAM,MAAM,wBAAwB,GAChC,gCAAgC,GAChC,EAAE,CAAC,wBAAwB,CAAC;AAEhC;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,qCAsClE;yBAtCe,mBAAmB;4BA+CyB,uBAAuB;;AAPnF,MAAM,WAAW,4BAA6B,SAAQ,IAAI,CAAC,EAAE,CAAC,wBAAwB,EAAE,MAAM,CAAC;IAC7F,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,uBAAuB,GAAG,4BAA4B,GAAG,EAAE,CAAC,uBAAuB,CAAC"}

package/dist/src/typescript/components/function-declaration.js

@@ -1,5 +1,6 @@
 import { createComponent as _$createComponent, memo as _$memo } from "@alloy-js/core/jsx-runtime";
 import * as ts from "@alloy-js/typescript";
+import { useTsp } from "../../core/index.js";
 import { buildParameterDescriptors, getReturnType } from "../utils/operation.js";
 import { declarationRefkeys } from "../utils/refkey.js";
 import { TypeExpression } from "./type-expression.js";
@@ -9,6 +10,9 @@ import { TypeExpression } from "./type-expression.js";
  * provided will take precedence.
  */
 export function FunctionDeclaration(props) {
+  const {
+    $
+  } = useTsp();
   if (!isTypedFunctionDeclarationProps(props)) {
     return _$createComponent(ts.FunctionDeclaration, props);
   }
@@ -29,7 +33,9 @@ export function FunctionDeclaration(props) {
     params: props.parameters,
     mode: props.parametersMode
   });
+  const doc = props.doc ?? $.type.getDoc(props.type);
   return _$createComponent(ts.FunctionDeclaration, {
+    doc: doc,
     refkey: refkeys,
     name: name,
     get async() {
@@ -45,10 +51,9 @@ export function FunctionDeclaration(props) {
       return props.kind;
     },
     returnType: returnType,
+    parameters: allParameters,
     get children() {
-      return [_$createComponent(ts.FunctionDeclaration.Parameters, {
-        parameters: allParameters
-      }), _$memo(() => props.children)];
+      return props.children;
     }
   });
 }

package/dist/src/typescript/components/interface-declaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/interface-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAErC,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EACL,SAAS,EAET,KAAK,EAIN,MAAM,oBAAoB,CAAC;AAQ5B,MAAM,WAAW,8BAA+B,SAAQ,IAAI,CAAC,EAAE,CAAC,yBAAyB,EAAE,MAAM,CAAC;IAChG,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,yBAAyB,GACjC,8BAA8B,GAC9B,EAAE,CAAC,yBAAyB,CAAC;AAEjC,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,eAiCpE;AAQD,MAAM,WAAW,wBAAyB,SAAQ,EAAE,CAAC,wBAAwB;IAC3E,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;CACzB;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,eAMlE"}
+{"version":3,"file":"interface-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/interface-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAErC,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EACL,SAAS,EAET,KAAK,EAIN,MAAM,oBAAoB,CAAC;AAQ5B,MAAM,WAAW,8BAA+B,SAAQ,IAAI,CAAC,EAAE,CAAC,yBAAyB,EAAE,MAAM,CAAC;IAChG,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,yBAAyB,GACjC,8BAA8B,GAC9B,EAAE,CAAC,yBAAyB,CAAC;AAEjC,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,eAmCpE;AAQD,MAAM,WAAW,wBAAyB,SAAQ,EAAE,CAAC,wBAAwB;IAC3E,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;CACzB;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,eAMlE"}

package/dist/src/typescript/components/interface-declaration.js

@@ -27,7 +27,9 @@ export function InterfaceDeclaration(props) {
   name = namePolicy.getName(name, "interface");
   const refkeys = declarationRefkeys(props.refkey, props.type);
   const extendsType = props.extends ?? getExtendsType($, props.type);
+  const doc = props.doc ?? $.type.getDoc(props.type);
   return _$createComponent(ts.InterfaceDeclaration, {
+    doc: doc,
     get ["default"]() {
       return props.default;
     },
@@ -130,6 +132,7 @@ function InterfaceBody(props) {
   } : {};
   return [_$createComponent(ay.For, _$mergeProps({
     each: validTypeMembers,
+    semicolon: true,
     line: true
   }, enderProp, {
     children: typeMember => {

package/dist/src/typescript/components/interface-member.d.ts

@@ -1,7 +1,9 @@
+import { Children } from "@alloy-js/core";
 import { ModelProperty, Operation } from "@typespec/compiler";
 export interface InterfaceMemberProps {
     type: ModelProperty | Operation;
+    doc?: Children;
     optional?: boolean;
 }
-export declare function InterfaceMember(props: InterfaceMemberProps): import("@alloy-js/core").Children;
+export declare function InterfaceMember(props: InterfaceMemberProps): Children;
 //# sourceMappingURL=interface-member.d.ts.map

package/dist/src/typescript/components/interface-member.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface-member.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/interface-member.tsx"],"names":[],"mappings":"AACA,OAAO,EAAe,aAAa,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAM3E,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,qCA4B1D"}
+{"version":3,"file":"interface-member.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/interface-member.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAe,aAAa,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAM3E,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;IAChC,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,YA8B1D"}

package/dist/src/typescript/components/interface-member.js

@@ -11,6 +11,7 @@ export function InterfaceMember(props) {
   } = useTsp();
   const namer = ts.useTSNamePolicy();
   const name = namer.getName(props.type.name, "object-member-getter");
+  const doc = props.doc ?? $.type.getDoc(props.type);
   if ($.modelProperty.is(props.type)) {
     if (isNeverType(props.type.type)) {
       return null;
@@ -21,6 +22,7 @@ export function InterfaceMember(props) {
       unpackedType = part.type;
     }
     return _$createComponent(ts.InterfaceMember, {
+      doc: doc,
       name: name,
       get optional() {
         return props.optional ?? props.type.optional;

package/dist/src/typescript/components/interface-method.d.ts

@@ -1,8 +1,10 @@
+import { Children } from "@alloy-js/core";
 import * as ts from "@alloy-js/typescript";
 import { Operation } from "@typespec/compiler";
 export interface InterfaceMethodPropsWithType extends Omit<ts.InterfaceMethodProps, "name"> {
     type: Operation;
     name?: string;
+    doc?: Children;
     parametersMode?: "prepend" | "append" | "replace";
 }
 export type InterfaceMethodProps = InterfaceMethodPropsWithType | ts.InterfaceMethodProps;
@@ -11,5 +13,5 @@ export type InterfaceMethodProps = InterfaceMethodPropsWithType | ts.InterfaceMe
  * method by converting from a TypeSpec Operation. Any other props
  * provided will take precedence.
  */
-export declare function InterfaceMethod(props: Readonly<InterfaceMethodProps>): import("@alloy-js/core/jsx-runtime").Children;
+export declare function InterfaceMethod(props: Readonly<InterfaceMethodProps>): Children;
 //# sourceMappingURL=interface-method.d.ts.map

package/dist/src/typescript/components/interface-method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface-method.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/interface-method.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI/C,MAAM,WAAW,4BAA6B,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACzF,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AAED,MAAM,MAAM,oBAAoB,GAAG,4BAA4B,GAAG,EAAE,CAAC,oBAAoB,CAAC;AAE1F;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,oBAAoB,CAAC,iDA4BpE"}
+{"version":3,"file":"interface-method.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/interface-method.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAc,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAK/C,MAAM,WAAW,4BAA6B,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACzF,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AAED,MAAM,MAAM,oBAAoB,GAAG,4BAA4B,GAAG,EAAE,CAAC,oBAAoB,CAAC;AAE1F;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,oBAAoB,CAAC,YAgCpE"}

package/dist/src/typescript/components/interface-method.js

@@ -1,5 +1,7 @@
-import { splitProps, createComponent as _$createComponent, mergeProps as _$mergeProps } from "@alloy-js/core/jsx-runtime";
+import { createComponent as _$createComponent, mergeProps as _$mergeProps } from "@alloy-js/core/jsx-runtime";
+import { splitProps } from "@alloy-js/core";
 import * as ts from "@alloy-js/typescript";
+import { useTsp } from "../../core/index.js";
 import { buildParameterDescriptors, getReturnType } from "../utils/operation.js";
 import { TypeExpression } from "./type-expression.js";
 /**
@@ -8,6 +10,9 @@ import { TypeExpression } from "./type-expression.js";
  * provided will take precedence.
  */
 export function InterfaceMethod(props) {
+  const {
+    $
+  } = useTsp();
   const isTypeSpecTyped = "type" in props;
   if (!isTypeSpecTyped) {
     return _$createComponent(ts.InterfaceMethod, props);
@@ -23,9 +28,11 @@ export function InterfaceMethod(props) {
     params: props.parameters,
     mode: props.parametersMode
   });
+  const doc = props.doc ?? $.type.getDoc(props.type);
   return _$createComponent(ts.InterfaceMethod, _$mergeProps(forwardProps, updateProps, {
     name: name,
     returnType: returnType,
-    parameters: allParameters
+    parameters: allParameters,
+    doc: doc
   }));
 }

package/dist/src/typescript/components/type-alias-declaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type-alias-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/type-alias-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAM1C,MAAM,WAAW,0BAA2B,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACvF,IAAI,EAAE,IAAI,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,yBAAyB,GAAG,0BAA0B,GAAG,EAAE,CAAC,oBAAoB,CAAC;AAE7F;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,qCAuBpE"}
+{"version":3,"file":"type-alias-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/type-alias-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAM1C,MAAM,WAAW,0BAA2B,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACvF,IAAI,EAAE,IAAI,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,yBAAyB,GAAG,0BAA0B,GAAG,EAAE,CAAC,oBAAoB,CAAC;AAE7F;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,qCAwBpE"}

package/dist/src/typescript/components/type-alias-declaration.js

@@ -26,9 +26,12 @@ export function TypeAliasDeclaration(props) {
       target: props.type
     });
   }
-  const refkeys = declarationRefkeys(props.refkey, props.name);
+  const doc = props.doc ?? $.type.getDoc(props.type);
+  const refkeys = declarationRefkeys(props.refkey, props.type);
   const name = ts.useTSNamePolicy().getName(originalName, "type");
-  return _$createComponent(ts.TypeDeclaration, _$mergeProps(props, {
+  return _$createComponent(ts.TypeDeclaration, _$mergeProps({
+    doc: doc
+  }, props, {
     name: name,
     refkey: refkeys,
     get children() {

package/dist/src/typescript/components/type-declaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/type-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAO1C,MAAM,WAAW,oBAAqB,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACjF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,IAAI,CAAC;CACb;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG;KAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAE1E,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,qCAyB1D"}
+{"version":3,"file":"type-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/type-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAQ1C,MAAM,WAAW,oBAAqB,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACjF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,IAAI,CAAC;CACb;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG;KAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAE1E,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,qCA0B1D"}

package/dist/src/typescript/components/type-declaration.js

@@ -1,13 +1,17 @@
 import { mergeProps as _$mergeProps, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
 import * as ts from "@alloy-js/typescript";
+import { useTsp } from "../../core/index.js";
 import { declarationRefkeys } from "../utils/refkey.js";
 import { EnumDeclaration } from "./enum-declaration.js";
 import { InterfaceDeclaration } from "./interface-declaration.js";
 import { TypeAliasDeclaration } from "./type-alias-declaration.js";
 import { UnionDeclaration } from "./union-declaration.js";
 export function TypeDeclaration(props) {
+  const {
+    $
+  } = useTsp();
   if (!props.type) {
-    const refkeys = declarationRefkeys(props.refkey, props.name);
+    const refkeys = declarationRefkeys(props.refkey, props.type);
     return _$createComponent(ts.TypeDeclaration, _$mergeProps(props, {
       refkey: refkeys
     }));
@@ -16,25 +20,31 @@ export function TypeDeclaration(props) {
     type,
     ...restProps
   } = props;
+  const doc = props.doc ?? $.type.getDoc(type);
   switch (type.kind) {
     case "Model":
       return _$createComponent(InterfaceDeclaration, _$mergeProps({
+        doc: doc,
         type: type
       }, restProps));
     case "Union":
       return _$createComponent(UnionDeclaration, _$mergeProps({
+        doc: doc,
         type: type
       }, restProps));
     case "Enum":
       return _$createComponent(EnumDeclaration, _$mergeProps({
+        doc: doc,
         type: type
       }, restProps));
     case "Scalar":
       return _$createComponent(TypeAliasDeclaration, _$mergeProps({
+        doc: doc,
         type: type
       }, restProps));
     case "Operation":
       return _$createComponent(TypeAliasDeclaration, _$mergeProps({
+        doc: doc,
         type: type
       }, restProps));
   }

package/dist/src/typescript/components/union-declaration.d.ts

@@ -1,9 +1,11 @@
+import { Children } from "@alloy-js/core";
 import * as ts from "@alloy-js/typescript";
 import { Enum, Union } from "@typespec/compiler";
 export interface TypedUnionDeclarationProps extends Omit<ts.TypeDeclarationProps, "name"> {
     type: Union | Enum;
+    doc?: Children;
     name?: string;
 }
 export type UnionDeclarationProps = TypedUnionDeclarationProps | ts.TypeDeclarationProps;
-export declare function UnionDeclaration(props: UnionDeclarationProps): import("@alloy-js/core").Children;
+export declare function UnionDeclaration(props: UnionDeclarationProps): Children;
 //# sourceMappingURL=union-declaration.d.ts.map

package/dist/src/typescript/components/union-declaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"union-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/union-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAMjD,MAAM,WAAW,0BAA2B,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACvF,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,qBAAqB,GAAG,0BAA0B,GAAG,EAAE,CAAC,oBAAoB,CAAC;AAEzF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,qCAsB5D"}
+{"version":3,"file":"union-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/union-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAMjD,MAAM,WAAW,0BAA2B,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACvF,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC;IACnB,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,qBAAqB,GAAG,0BAA0B,GAAG,EAAE,CAAC,oBAAoB,CAAC;AAEzF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,YAuB5D"}

package/dist/src/typescript/components/union-declaration.js

@@ -28,7 +28,10 @@ export function UnionDeclaration(props) {
     });
   }
   const name = ts.useTSNamePolicy().getName(originalName, "type");
-  return _$createComponent(ts.TypeDeclaration, _$mergeProps(props, {
+  const doc = props.doc ?? $.type.getDoc(type);
+  return _$createComponent(ts.TypeDeclaration, _$mergeProps({
+    doc: doc
+  }, props, {
     name: name,
     refkey: refkeys,
     get children() {

package/dist/src/typescript/components/union-expression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"union-expression.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/union-expression.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,IAAI,EAAc,KAAK,EAAgB,MAAM,oBAAoB,CAAC;AAI3E,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC;IACnB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,wBAAgB,eAAe,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,oBAAoB,eA4BvE"}
+{"version":3,"file":"union-expression.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/union-expression.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAkB,IAAI,EAAc,KAAK,EAAgB,MAAM,oBAAoB,CAAC;AAK3F,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC;IACnB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,wBAAgB,eAAe,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,oBAAoB,eA+CvE"}

package/dist/src/typescript/components/union-expression.js

@@ -1,7 +1,9 @@
 import { createComponent as _$createComponent, memo as _$memo } from "@alloy-js/core/jsx-runtime";
 import * as ay from "@alloy-js/core";
 import * as ts from "@alloy-js/typescript";
+import { compilerAssert } from "@typespec/compiler";
 import { useTsp } from "../../core/context/tsp-context.js";
+import { efRefkey } from "../utils/refkey.js";
 import { TypeExpression } from "./type-expression.js";
 export function UnionExpression({
   type,
@@ -14,24 +16,115 @@ export function UnionExpression({
   const variants = _$createComponent(ay.For, {
     joiner: " | ",
     each: items,
-    children: (_, value) => {
-      if ($.enumMember.is(value)) {
+    children: (_, type) => {
+      if ($.enumMember.is(type)) {
         return _$createComponent(ts.ValueExpression, {
           get jsValue() {
-            return value.value ?? value.name;
-          }
-        });
-      } else {
-        return _$createComponent(TypeExpression, {
-          get type() {
-            return value.type;
+            return type.value ?? type.name;
           }
         });
       }
+      const discriminatedUnion = $.union.getDiscriminatedUnion(type.union);
+      switch (discriminatedUnion?.options.envelope) {
+        case "object":
+          return _$createComponent(ObjectEnvelope, {
+            get discriminatorPropertyName() {
+              return discriminatedUnion.options.discriminatorPropertyName;
+            },
+            get envelopePropertyName() {
+              return discriminatedUnion.options.envelopePropertyName;
+            },
+            type: type
+          });
+        case "none":
+          return _$createComponent(NoneEnvelope, {
+            get discriminatorPropertyName() {
+              return discriminatedUnion.options.discriminatorPropertyName;
+            },
+            type: type
+          });
+        default:
+          return _$createComponent(TypeExpression, {
+            get type() {
+              return type.type;
+            }
+          });
+      }
     }
   });
   if (children || Array.isArray(children) && children.length) {
-    return [variants, " ", ` | ${children}`];
+    return [variants, " ", `| ${children}`];
   }
   return variants;
+}
+/**
+ * Renders a discriminated union with "object" envelope style
+ * where model properties are nested inside an envelope
+ */
+function ObjectEnvelope(props) {
+  const {
+    $
+  } = useTsp();
+  const envelope = $.model.create({
+    properties: {
+      [props.discriminatorPropertyName]: $.modelProperty.create({
+        name: props.discriminatorPropertyName,
+        type: $.literal.createString(props.type.name)
+      }),
+      [props.envelopePropertyName]: $.modelProperty.create({
+        name: props.envelopePropertyName,
+        type: props.type.type
+      })
+    }
+  });
+  return _$createComponent(TypeExpression, {
+    type: envelope
+  });
+}
+/**
+ * Renders a discriminated union with "none" envelope style
+ * where discriminator property sits alongside model properties
+ */
+function NoneEnvelope(props) {
+  const {
+    $
+  } = useTsp();
+  compilerAssert($.model.is(props.type.type), "Expected all union variants to be models when using a discriminated union with no envelope");
+
+  // Render anonymous models as a set of properties + the discriminator
+  if ($.model.isExpresion(props.type.type)) {
+    const model = $.model.create({
+      properties: {
+        [props.discriminatorPropertyName]: $.modelProperty.create({
+          name: props.discriminatorPropertyName,
+          type: $.literal.createString(props.type.name)
+        }),
+        ...Object.fromEntries(props.type.type.properties)
+      }
+    });
+    return _$createComponent(TypeExpression, {
+      type: model
+    });
+  }
+  return _$createComponent(ay.List, {
+    joiner: " & ",
+    get children() {
+      return [_$createComponent(ts.ObjectExpression, {
+        get children() {
+          return _$createComponent(ts.ObjectProperty, {
+            get name() {
+              return props.discriminatorPropertyName;
+            },
+            get value() {
+              return _$createComponent(ts.ValueExpression, {
+                get jsValue() {
+                  return props.type.name;
+                }
+              });
+            }
+          });
+        }
+      }), [_$memo(() => efRefkey(props.type.type))]];
+    }
+  });
 }

package/dist/src/typescript/utils/operation.d.ts

@@ -1,3 +1,4 @@
+import { Refkey } from "@alloy-js/core";
 import * as ts from "@alloy-js/typescript";
 import { Model, ModelProperty, Operation, Type } from "@typespec/compiler";
 export declare function getReturnType(type: Operation, options?: {
@@ -6,7 +7,8 @@ export declare function getReturnType(type: Operation, options?: {
 export interface BuildParameterDescriptorsOptions {
     params?: ts.ParameterDescriptor[] | string[] | undefined;
     mode?: "prepend" | "append" | "replace";
+    suffixRefkey?: Refkey;
 }
 export declare function buildParameterDescriptors(type: Model, options?: BuildParameterDescriptorsOptions): ts.ParameterDescriptor[] | undefined;
-export declare function buildParameterDescriptor(modelProperty: ModelProperty): ts.ParameterDescriptor;
+export declare function buildParameterDescriptor(modelProperty: ModelProperty, suffixRefkey: Refkey): ts.ParameterDescriptor;
 //# sourceMappingURL=operation.d.ts.map

package/dist/src/typescript/utils/operation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operation.d.ts","sourceRoot":"","sources":["../../../../src/typescript/utils/operation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAK3E,wBAAgB,aAAa,CAC3B,IAAI,EAAE,SAAS,EACf,OAAO,GAAE;IAAE,kBAAkB,EAAE,OAAO,CAAA;CAAkC,GACvE,IAAI,CASN;AAED,MAAM,WAAW,gCAAgC;IAC/C,MAAM,CAAC,EAAE,EAAE,CAAC,mBAAmB,EAAE,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC;IACzD,IAAI,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACzC;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,KAAK,EACX,OAAO,GAAE,gCAAqC,GAC7C,EAAE,CAAC,mBAAmB,EAAE,GAAG,SAAS,CAkBtC;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,aAAa,GAAG,EAAE,CAAC,mBAAmB,CAU7F"}
+{"version":3,"file":"operation.d.ts","sourceRoot":"","sources":["../../../../src/typescript/utils/operation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAK3E,wBAAgB,aAAa,CAC3B,IAAI,EAAE,SAAS,EACf,OAAO,GAAE;IAAE,kBAAkB,EAAE,OAAO,CAAA;CAAkC,GACvE,IAAI,CASN;AAED,MAAM,WAAW,gCAAgC;IAC/C,MAAM,CAAC,EAAE,EAAE,CAAC,mBAAmB,EAAE,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC;IACzD,IAAI,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,KAAK,EACX,OAAO,GAAE,gCAAqC,GAC7C,EAAE,CAAC,mBAAmB,EAAE,GAAG,SAAS,CAqBtC;AAED,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,MAAM,GACnB,EAAE,CAAC,mBAAmB,CAaxB"}

package/dist/src/typescript/utils/operation.js

@@ -1,3 +1,4 @@
+import { refkey } from "@alloy-js/core";
 import * as ts from "@alloy-js/typescript";
 import { useTsp } from "../../core/index.js";
 import { TypeExpression } from "../components/type-expression.js";
@@ -18,24 +19,30 @@ export function buildParameterDescriptors(type, options = {}) {
   const {
     $
   } = useTsp();
+  const suffixRefkey = options.suffixRefkey ?? refkey();
   const optionsParams = normalizeParameters(options.params);
   if (options.mode === "replace") {
     return optionsParams;
   }
   const modelProperties = $.model.getProperties(type);
-  const operationParams = [...modelProperties.values()].map(buildParameterDescriptor);
+  const operationParams = [...modelProperties.values()].map(m => buildParameterDescriptor(m, suffixRefkey));
 
   // Merge parameters based on location
   const allParams = options.mode === "append" ? operationParams.concat(optionsParams) : optionsParams.concat(operationParams);
   return allParams;
 }
-export function buildParameterDescriptor(modelProperty) {
+export function buildParameterDescriptor(modelProperty, suffixRefkey) {
+  const {
+    $
+  } = useTsp();
   const namePolicy = ts.useTSNamePolicy();
   const paramName = namePolicy.getName(modelProperty.name, "parameter");
   const isOptional = modelProperty.optional || modelProperty.defaultValue !== undefined;
+  const doc = $.type.getDoc(modelProperty);
   return {
+    doc,
     name: paramName,
-    refkey: efRefkey(modelProperty),
+    refkey: efRefkey(modelProperty, suffixRefkey),
     optional: isOptional,
     type: TypeExpression({
       type: modelProperty.type

package/dist/test/typescript/components/enum-declaration.test.js

@@ -36,6 +36,85 @@ describe("Typescript Enum Declaration", () => {
       }
     `);
   });
+  it("adds JSDoc from TypeSpec", async () => {
+    const code = `
+      /**
+       * This is a test enum
+       */
+      enum Foo {
+        @doc("This is one")
+        one: 1,
+        two: 2,
+        three: 3
+      }
+    `;
+    const output = await getEmitOutput(code, program => {
+      const Foo = program.resolveTypeReference("Foo")[0];
+      return _$createComponent(TspContext.Provider, {
+        value: {
+          program
+        },
+        get children() {
+          return _$createComponent(EnumDeclaration, {
+            type: Foo
+          });
+        }
+      });
+    });
+    expect(output).toBe(d`
+      /**
+       * This is a test enum
+       */
+      enum Foo {
+        /**
+         * This is one
+         */
+        one = 1,
+        two = 2,
+        three = 3
+      }
+    `);
+  });
+  it("explicit doc take precedence", async () => {
+    const code = `
+      /**
+       * This is a test enum
+       */
+      enum Foo {
+        @doc("This is one")
+        one: 1,
+        two: 2,
+        three: 3
+      }
+    `;
+    const output = await getEmitOutput(code, program => {
+      const Foo = program.resolveTypeReference("Foo")[0];
+      return _$createComponent(TspContext.Provider, {
+        value: {
+          program
+        },
+        get children() {
+          return _$createComponent(EnumDeclaration, {
+            type: Foo,
+            doc: ["This is an explicit doc"]
+          });
+        }
+      });
+    });
+    expect(output).toBe(d`
+      /**
+       * This is an explicit doc
+       */
+      enum Foo {
+        /**
+         * This is one
+         */
+        one = 1,
+        two = 2,
+        three = 3
+      }
+    `);
+  });
   it("takes a union type parameter", async () => {
     const code = `
       union Foo {