@typespec/emitter-framework 0.10.0-dev.0 → 0.10.0-dev.2

package/dist/src/typescript/components/index.d.ts

@@ -11,7 +11,7 @@ export * from "./static-serializers.js";
 export * from "./type-declaration.js";
 export * from "./type-expression.js";
 export * from "./type-transform.js";
-export * from "./union-declaration.js";
-export * from "./union-expression.js";
+export * from "./union/declaration.js";
+export * from "./union/expression.js";
 export * from "./value-expression.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/typescript/components/index.js

@@ -11,6 +11,6 @@ export * from "./static-serializers.js";
 export * from "./type-declaration.js";
 export * from "./type-expression.js";
 export * from "./type-transform.js";
-export * from "./union-declaration.js";
-export * from "./union-expression.js";
+export * from "./union/declaration.js";
+export * from "./union/expression.js";
 export * from "./value-expression.js";

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

@@ -5,7 +5,7 @@ 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";
+import { UnionDeclaration } from "./union/declaration.js";
 export function TypeDeclaration(props) {
   const {
     $

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

@@ -9,7 +9,7 @@ import { ArrayExpression } from "./array-expression.js";
 import { FunctionType } from "./function-type.js";
 import { InterfaceExpression } from "./interface-declaration.js";
 import { RecordExpression } from "./record-expression.js";
-import { UnionExpression } from "./union-expression.js";
+import { UnionExpression } from "./union/expression.js";
 export function TypeExpression(props) {
   const {
     $

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

@@ -8,4 +8,4 @@ export interface TypedUnionDeclarationProps extends Omit<ts.TypeDeclarationProps
 }
 export type UnionDeclarationProps = TypedUnionDeclarationProps | ts.TypeDeclarationProps;
 export declare function UnionDeclaration(props: UnionDeclarationProps): Children;
-//# sourceMappingURL=union-declaration.d.ts.map
+//# sourceMappingURL=declaration.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../../src/typescript/components/union/declaration.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAKtD,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 → union/declaration.js}

@@ -1,9 +1,9 @@
 import { mergeProps as _$mergeProps, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { declarationRefkeys } from "#typescript/utils/refkey.js";
 import * as ts from "@alloy-js/typescript";
-import { useTsp } from "../../core/context/tsp-context.js";
-import { reportDiagnostic } from "../../lib.js";
-import { declarationRefkeys } from "../utils/refkey.js";
-import { UnionExpression } from "./union-expression.js";
+import { useTsp } from "../../../core/context/tsp-context.js";
+import { reportDiagnostic } from "../../../lib.js";
+import { UnionExpression } from "./expression.js";
 export function UnionDeclaration(props) {
   const {
     $

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=declaration.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"declaration.test.d.ts","sourceRoot":"","sources":["../../../../../src/typescript/components/union/declaration.test.tsx"],"names":[],"mappings":""}

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

@@ -0,0 +1,308 @@
+import { createComponent as _$createComponent, createIntrinsic as _$createIntrinsic } from "@alloy-js/core/jsx-runtime";
+import { Output } from "#core/index.js";
+import { Tester } from "#test/test-host.js";
+import { SourceFile } from "@alloy-js/typescript";
+import { t } from "@typespec/compiler/testing";
+import { beforeEach, expect, it } from "vitest";
+import { InterfaceDeclaration } from "../../index.js";
+import { UnionDeclaration } from "./declaration.js";
+let tester;
+function Wrapper(props) {
+  return _$createComponent(Output, {
+    get program() {
+      return tester.program;
+    },
+    get children() {
+      return _$createComponent(SourceFile, {
+        path: "test.ts",
+        get children() {
+          return props.children;
+        }
+      });
+    }
+  });
+}
+beforeEach(async () => {
+  tester = await Tester.createInstance();
+});
+it("creates a union declaration (not bound to Typespec Types)", async () => {
+  await tester.compile("");
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(UnionDeclaration, {
+        name: "MyUnion",
+        children: "\"red\" | \"blue\""
+      });
+    }
+  })).toRenderTo(`type MyUnion = "red" | "blue";`);
+});
+it("creates a union declaration (bound to union)", async () => {
+  const {
+    TestUnion
+  } = await tester.compile(t.code`
+    namespace DemoService;
+    union ${t.union("TestUnion")} {
+      one: "one",
+      two: "two"
+    }
+  `);
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(UnionDeclaration, {
+        type: TestUnion
+      });
+    }
+  })).toRenderTo(`type TestUnion = "one" | "two";`);
+});
+it("creates a union declaration with JSDoc", async () => {
+  const {
+    TestUnion
+  } = await tester.compile(t.code`
+    namespace DemoService;
+    /**
+     * Test Union
+     */
+    union ${t.union("TestUnion")} {
+      one: "one",
+      two: "two"
+    }
+  `);
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(UnionDeclaration, {
+        type: TestUnion
+      });
+    }
+  })).toRenderTo(`/**
+ * Test Union
+ */
+type TestUnion = "one" | "two";`);
+});
+it("creates a union declaration with name override", async () => {
+  const {
+    TestUnion
+  } = await tester.compile(t.code`
+    namespace DemoService;
+    union ${t.union("TestUnion")} {
+      one: "one",
+      two: "two"
+    }
+  `);
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(UnionDeclaration, {
+        "export": true,
+        type: TestUnion,
+        name: "MyUnion"
+      });
+    }
+  })).toRenderTo(`export type MyUnion = "one" | "two";`);
+});
+it("creates a union declaration with extra children", async () => {
+  const {
+    TestUnion
+  } = await tester.compile(t.code`
+    namespace DemoService;
+    union ${t.union("TestUnion")} {
+      one: "one",
+      two: "two"
+    }
+  `);
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(UnionDeclaration, {
+        type: TestUnion,
+        children: "\"three\""
+      });
+    }
+  })).toRenderTo(`type TestUnion = "one" | "two" | "three";`);
+});
+it("renders a discriminated union", async () => {
+  const {
+    TestUnion
+  } = await tester.compile(t.code`
+    namespace DemoService;
+    @discriminated
+    union ${t.union("TestUnion")} {
+      one: { oneItem: true },
+      two: true
+    }
+  `);
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(UnionDeclaration, {
+        type: TestUnion
+      });
+    }
+  })).toRenderTo(`type TestUnion = {
+  kind: "one";
+  value: {
+    oneItem: true;
+  };
+} | {
+  kind: "two";
+  value: true;
+};`);
+});
+it("renders a discriminated union with custom properties", async () => {
+  const {
+    TestUnion
+  } = await tester.compile(t.code`
+    namespace DemoService;
+    @discriminated(#{ discriminatorPropertyName: "dataKind", envelopePropertyName: "data" })
+    union ${t.union("TestUnion")} {
+      one: { oneItem: true },
+      two: true
+    }
+  `);
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(UnionDeclaration, {
+        type: TestUnion
+      });
+    }
+  })).toRenderTo(`type TestUnion = {
+  dataKind: "one";
+  data: {
+    oneItem: true;
+  };
+} | {
+  dataKind: "two";
+  data: true;
+};`);
+});
+it("renders a discriminated union with named models", async () => {
+  const {
+    Pet,
+    Cat,
+    Dog
+  } = await tester.compile(t.code`
+    namespace DemoService;
+    model ${t.model("Cat")} {
+      name: string;
+      meow: boolean;
+    }
+    model ${t.model("Dog")} {
+      name: string;
+      bark: boolean;
+    }
+    @discriminated
+    union ${t.union("Pet")} {
+      cat: Cat,
+      dog: Dog,
+    }
+  `);
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return [_$createComponent(InterfaceDeclaration, {
+        type: Cat
+      }), _$createIntrinsic("hbr", {}), _$createComponent(InterfaceDeclaration, {
+        type: Dog
+      }), _$createIntrinsic("hbr", {}), _$createComponent(UnionDeclaration, {
+        type: Pet
+      })];
+    }
+  })).toRenderTo(`interface Cat {
+  name: string;
+  meow: boolean;
+}
+interface Dog {
+  name: string;
+  bark: boolean;
+}
+type Pet = {
+  kind: "cat";
+  value: Cat;
+} | {
+  kind: "dog";
+  value: Dog;
+};`);
+});
+it("renders named discriminated union (no envelope)", async () => {
+  const {
+    Pet,
+    Cat,
+    Dog
+  } = await tester.compile(t.code`
+    namespace DemoService;
+    model ${t.model("Cat")} {
+      name: string;
+      meow: boolean;
+    }
+    model ${t.model("Dog")} {
+      name: string;
+      bark: boolean;
+    }
+    @discriminated(#{ envelope: "none", discriminatorPropertyName: "dataKind" })
+    union ${t.union("Pet")} {
+      cat: Cat,
+      dog: Dog,
+    }
+  `);
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return [_$createComponent(InterfaceDeclaration, {
+        type: Cat
+      }), _$createIntrinsic("hbr", {}), _$createComponent(InterfaceDeclaration, {
+        type: Dog
+      }), _$createIntrinsic("hbr", {}), _$createComponent(UnionDeclaration, {
+        type: Pet
+      })];
+    }
+  })).toRenderTo(`interface Cat {
+  name: string;
+  meow: boolean;
+}
+interface Dog {
+  name: string;
+  bark: boolean;
+}
+type Pet = {
+  dataKind: "cat"
+} & Cat | {
+  dataKind: "dog"
+} & Dog;`);
+});
+it("renders anonymous discriminated union (no envelope)", async () => {
+  const {
+    TestUnion
+  } = await tester.compile(t.code`
+    namespace DemoService;
+    @discriminated(#{ envelope: "none", discriminatorPropertyName: "dataKind" })
+    union ${t.union("TestUnion")} {
+      one: { oneItem: true },
+      two: { secondItem: false }
+    }
+  `);
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(UnionDeclaration, {
+        type: TestUnion
+      });
+    }
+  })).toRenderTo(`type TestUnion = {
+  dataKind: "one";
+  oneItem: true;
+} | {
+  dataKind: "two";
+  secondItem: false;
+};`);
+});
+it("creates a union declaration (bound to enum)", async () => {
+  const {
+    TestEnum
+  } = await tester.compile(t.code`
+    namespace DemoService;
+    enum ${t.enum("TestEnum")} {
+      one: "one",
+      two: "two"
+    }
+  `);
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(UnionDeclaration, {
+        type: TestEnum
+      });
+    }
+  })).toRenderTo(`type TestEnum = "one" | "two";`);
+});

package/dist/src/typescript/components/{union-expression.d.ts → union/expression.d.ts}

@@ -5,4 +5,4 @@ export interface UnionExpressionProps {
     children?: Children;
 }
 export declare function UnionExpression({ type, children }: UnionExpressionProps): Children;
-//# sourceMappingURL=union-expression.d.ts.map
+//# sourceMappingURL=expression.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../../../../src/typescript/components/union/expression.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,gBAAgB,CAAC;AAE1D,OAAO,EAEL,KAAK,IAAI,EAET,KAAK,KAAK,EAEX,MAAM,oBAAoB,CAAC;AAK5B,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,YA+CvE"}

package/dist/src/typescript/components/{union-expression.js → union/expression.js}

@@ -2,9 +2,9 @@ import { createComponent as _$createComponent, memo as _$memo } from "@alloy-js/
 import { For, List } 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";
+import { useTsp } from "../../../core/context/tsp-context.js";
+import { efRefkey } from "../../utils/refkey.js";
+import { TypeExpression } from "../type-expression.js";
 export function UnionExpression({
   type,
   children

package/dist/src/typescript/components/union/expression.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=expression.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"expression.test.d.ts","sourceRoot":"","sources":["../../../../../src/typescript/components/union/expression.test.tsx"],"names":[],"mappings":""}

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

@@ -0,0 +1,51 @@
+import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { Output } from "#core/index.js";
+import { Tester } from "#test/test-host.js";
+import { t } from "@typespec/compiler/testing";
+import { expect, it } from "vitest";
+import { UnionExpression } from "./expression.js";
+it("renders a union expression", async () => {
+  const {
+    program,
+    TestUnion
+  } = await Tester.compile(t.code`
+    union ${t.union("TestUnion")} {
+      one: "one",
+      two: "two"
+    }
+  `);
+  expect(_$createComponent(Output, {
+    program: program,
+    get children() {
+      return _$createComponent(UnionExpression, {
+        type: TestUnion
+      });
+    }
+  })).toRenderTo(`"one" | "two"`);
+});
+it("renders a union expression without conflicting names", async () => {
+  const {
+    program,
+    TestUnion
+  } = await Tester.compile(t.code`
+    union ${t.union("TestUnion")} {
+      {common: "one"},
+      {common: "one", two: "two"}
+    }
+  `);
+  expect(_$createComponent(Output, {
+    program: program,
+    get children() {
+      return _$createComponent(UnionExpression, {
+        type: TestUnion
+      });
+    }
+  })).toRenderTo(`
+    {
+      common: "one";
+    } | {
+      common: "one";
+      two: "two";
+    }
+  `);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/emitter-framework",
-  "version": "0.10.0-dev.0",
+  "version": "0.10.0-dev.2",
   "type": "module",
   "main": "dist/index.js",
   "repository": {
@@ -42,31 +42,31 @@
   "description": "",
   "peerDependencies": {
     "@alloy-js/core": "^0.18.2",
-    "@alloy-js/typescript": "^0.18.0",
     "@alloy-js/csharp": "^0.18.0",
-    "@typespec/compiler": "^1.2.0",
-    "@typespec/http": "^1.2.0",
-    "@typespec/rest": "^0.72.0 || >=0.73.0-dev <0.73.0"
+    "@alloy-js/typescript": "^0.18.0",
+    "@typespec/compiler": "^1.2.1",
+    "@typespec/http": "^1.2.1",
+    "@typespec/rest": "^0.72.1 || >=0.73.0-dev <0.73.0"
   },
   "devDependencies": {
     "@alloy-js/cli": "^0.18.0",
-    "@alloy-js/rollup-plugin": "^0.1.0",
     "@alloy-js/core": "^0.18.2",
+    "@alloy-js/rollup-plugin": "^0.1.0",
     "@alloy-js/typescript": "^0.18.0",
-    "@typespec/compiler": "^1.2.0",
-    "@typespec/http": "^1.2.0",
-    "@typespec/rest": "^0.72.0 || >=0.73.0-dev <0.73.0",
+    "@typespec/compiler": "^1.2.1",
+    "@typespec/http": "^1.2.1",
+    "@typespec/rest": "^0.72.1 || >=0.73.0-dev <0.73.0",
     "concurrently": "^9.1.2",
     "pathe": "^2.0.3",
-    "prettier": "~3.5.3",
-    "web-tree-sitter": "^0.25.4",
+    "prettier": "~3.6.2",
     "tree-sitter-c-sharp": "^0.23.0",
     "tree-sitter-java": "^0.23.2",
     "tree-sitter-javascript": "^0.23.0",
     "tree-sitter-python": "^0.23.2",
     "tree-sitter-typescript": "^0.23.0",
     "typescript": "~5.8.2",
-    "vitest": "^3.1.2"
+    "vitest": "^3.1.2",
+    "web-tree-sitter": "^0.25.4"
   },
   "dependencies": {},
   "scripts": {

package/src/typescript/components/index.ts

@@ -11,6 +11,6 @@ export * from "./static-serializers.js";
 export * from "./type-declaration.js";
 export * from "./type-expression.js";
 export * from "./type-transform.js";
-export * from "./union-declaration.js";
-export * from "./union-expression.js";
+export * from "./union/declaration.js";
+export * from "./union/expression.js";
 export * from "./value-expression.js";

package/src/typescript/components/type-declaration.tsx

@@ -5,7 +5,7 @@ import { declarationRefkeys } from "../utils/refkey.js";
 import { EnumDeclaration } from "./enum-declaration.js";
 import { InterfaceDeclaration } from "./interface-declaration.jsx";
 import { TypeAliasDeclaration } from "./type-alias-declaration.jsx";
-import { UnionDeclaration } from "./union-declaration.jsx";
+import { UnionDeclaration } from "./union/declaration.jsx";
 
 export interface TypeDeclarationProps extends Omit<ts.TypeDeclarationProps, "name"> {
   name?: string;

package/src/typescript/components/type-expression.tsx

@@ -10,7 +10,7 @@ import { ArrayExpression } from "./array-expression.js";
 import { FunctionType } from "./function-type.js";
 import { InterfaceExpression } from "./interface-declaration.js";
 import { RecordExpression } from "./record-expression.js";
-import { UnionExpression } from "./union-expression.js";
+import { UnionExpression } from "./union/expression.js";
 
 export interface TypeExpressionProps {
   type: Type;