@typespec/emitter-framework 0.7.0-dev.1 → 0.7.0-dev.3

package/dist/src/core/context/tsp-context.d.ts

@@ -1,6 +1,6 @@
 import { ComponentContext } from "@alloy-js/core";
 import { Program } from "@typespec/compiler";
-import { Typekit } from "@typespec/compiler/experimental/typekit";
+import { type Typekit } from "@typespec/compiler/typekit";
 export type TspContext = {
     program: Program;
     $: Typekit;

package/dist/src/core/context/tsp-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tsp-context.d.ts","sourceRoot":"","sources":["../../../../src/core/context/tsp-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAkC,MAAM,gBAAgB,CAAC;AAClF,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAElE,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,CAAC,EAAE,OAAO,CAAC;CACZ,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,gBAAgB,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,CAAC,CAAC,EAAE,OAAO,CAAA;CAAE,CAG3D,CAAC;AAEjB,wBAAgB,MAAM,IAaF,UAAU,CAC7B"}
+{"version":3,"file":"tsp-context.d.ts","sourceRoot":"","sources":["../../../../src/core/context/tsp-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAkC,MAAM,gBAAgB,CAAC;AAClF,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAK,KAAK,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAE7D,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,CAAC,EAAE,OAAO,CAAC;CACZ,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,gBAAgB,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,CAAC,CAAC,EAAE,OAAO,CAAA;CAAE,CAG3D,CAAC;AAEjB,wBAAgB,MAAM,IAaF,UAAU,CAC7B"}

package/dist/src/core/context/tsp-context.js

@@ -1,5 +1,5 @@
 import { createNamedContext, useContext } from "@alloy-js/core";
-import { unsafe_$ } from "@typespec/compiler/experimental";
+import { $ } from "@typespec/compiler/typekit";
 export const TspContext = createNamedContext("TspContext");
 export function useTsp() {
   const context = useContext(TspContext);
@@ -7,7 +7,7 @@ export function useTsp() {
     throw new Error("TspContext is not set. Make sure the component is wrapped in TspContext.Provider or the emitter framework Output component.");
   }
   if (!context.$) {
-    context.$ = unsafe_$(context.program);
+    context.$ = $(context.program);
   }
   return context;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"type-transform.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/type-transform.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAsB,MAAM,EAAU,MAAM,gBAAgB,CAAC;AAE9E,OAAO,EAEL,KAAK,EAIL,IAAI,EACJ,KAAK,EACN,MAAM,oBAAoB,CAAC;AAa5B,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,IAAI,CAAC;IACX,MAAM,EAAE,aAAa,GAAG,WAAW,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,KAAK,CAAC;IACZ,MAAM,EAAE,aAAa,GAAG,WAAW,CAAC;CACrC;AAwDD;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,kBAAkB,YAqEjE;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,GAAG,WAAW,UAEvF;AAED,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,KAAK,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,aAAa,GAAG,WAAW,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,6BAA6B,YAwE5E;AAyDD,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,IAAI,EAAE,IAAI,CAAC;IACX;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,MAAM,EAAE,aAAa,GAAG,WAAW,CAAC;IACpC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAMD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,QAAQ,CAuEzE"}
+{"version":3,"file":"type-transform.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/type-transform.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAsB,MAAM,EAAU,MAAM,gBAAgB,CAAC;AAE9E,OAAO,EAEL,KAAK,EAIL,IAAI,EACJ,KAAK,EACN,MAAM,oBAAoB,CAAC;AAa5B,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,IAAI,CAAC;IACX,MAAM,EAAE,aAAa,GAAG,WAAW,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,KAAK,CAAC;IACZ,MAAM,EAAE,aAAa,GAAG,WAAW,CAAC;CACrC;AA+DD;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,kBAAkB,YAqEjE;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,GAAG,WAAW,UAEvF;AAED,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,KAAK,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,aAAa,GAAG,WAAW,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,6BAA6B,YAwE5E;AAyDD,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,IAAI,EAAE,IAAI,CAAC;IACX;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,MAAM,EAAE,aAAa,GAAG,WAAW,CAAC;IACpC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAMD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,QAAQ,CAuEzE"}

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

@@ -10,8 +10,11 @@ function UnionTransformExpression(props) {
   const {
     $
   } = useTsp();
-  const discriminator = $.type.getDiscriminator(props.type);
-  if (!discriminator) {
+  const discriminator = $.union.getDiscriminatedUnion(props.type);
+  const discriminatorProperty = discriminator?.options.discriminatorPropertyName && {
+    propertyName: discriminator.options.discriminatorPropertyName
+  };
+  if (!discriminatorProperty) {
     // TODO: Handle non-discriminated unions
     reportTypescriptDiagnostic($.program, {
       code: "typescript-unsupported-nondiscriminated-union",
@@ -23,7 +26,7 @@ function UnionTransformExpression(props) {
     get type() {
       return props.type;
     },
-    discriminator: discriminator,
+    discriminator: discriminatorProperty,
     get target() {
       return props.target;
     }
@@ -97,7 +100,7 @@ export function TypeTransformDeclaration(props) {
   });
   let transformExpression;
   if ($.model.is(props.type)) {
-    const discriminator = $.type.getDiscriminator(props.type);
+    const discriminator = $.model.getDiscriminatedUnion(props.type);
     transformExpression = discriminator ? _$createComponent(DiscriminateExpression, {
       get type() {
         return props.type;

package/dist/test/typescript/components/value-expression.test.js

@@ -3,7 +3,7 @@ import { Output, render } from "@alloy-js/core";
 import { dedent } from "@alloy-js/core/testing";
 import { SourceFile } from "@alloy-js/typescript";
 import { Numeric } from "@typespec/compiler";
-import { $ } from "@typespec/compiler/experimental/typekit";
+import { $ } from "@typespec/compiler/typekit";
 import { assert, beforeAll, describe, expect, it } from "vitest";
 import { ValueExpression } from "../../../src/typescript/components/value-expression.js";
 import { getProgram } from "../test-host.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/emitter-framework",
-  "version": "0.7.0-dev.1",
+  "version": "0.7.0-dev.3",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -19,17 +19,17 @@
   "license": "MIT",
   "description": "",
   "peerDependencies": {
-    "@alloy-js/core": "^0.11.0",
-    "@alloy-js/typescript": "^0.11.0",
+    "@alloy-js/core": "^0.13.0",
+    "@alloy-js/typescript": "^0.13.0",
     "@typespec/compiler": "^1.0.0-rc.1",
     "@typespec/http": "^1.0.0-rc.1",
     "@typespec/rest": "^0.69.0 || >=0.70.0-dev <0.70.0"
   },
   "devDependencies": {
-    "@alloy-js/cli": "^0.11.0",
+    "@alloy-js/cli": "^0.13.0",
     "@alloy-js/rollup-plugin": "^0.1.0",
-    "@alloy-js/core": "^0.11.0",
-    "@alloy-js/typescript": "^0.11.0",
+    "@alloy-js/core": "^0.13.0",
+    "@alloy-js/typescript": "^0.13.0",
     "@types/minimist": "^1.2.5",
     "@typespec/compiler": "^1.0.0-rc.1",
     "@typespec/http": "^1.0.0-rc.1",

package/src/core/context/tsp-context.ts

@@ -1,7 +1,6 @@
 import { ComponentContext, createNamedContext, useContext } from "@alloy-js/core";
 import { Program } from "@typespec/compiler";
-import { unsafe_$ } from "@typespec/compiler/experimental";
-import { Typekit } from "@typespec/compiler/experimental/typekit";
+import { $, type Typekit } from "@typespec/compiler/typekit";
 
 export type TspContext = {
   program: Program;
@@ -23,7 +22,7 @@ export function useTsp() {
   }
 
   if (!context.$) {
-    context.$ = unsafe_$(context.program);
+    context.$ = $(context.program);
   }
 
   return context as TspContext;

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

@@ -9,7 +9,7 @@ import {
   Operation,
   RekeyableMap,
 } from "@typespec/compiler";
-import { Typekit } from "@typespec/compiler/experimental/typekit";
+import { Typekit } from "@typespec/compiler/typekit";
 import { createRekeyableMap } from "@typespec/compiler/utils";
 import { useTsp } from "../../core/context/tsp-context.js";
 import { reportDiagnostic } from "../../lib.js";

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

@@ -1,7 +1,7 @@
 import { For, refkey } from "@alloy-js/core";
 import { Reference, ValueExpression } from "@alloy-js/typescript";
 import { IntrinsicType, Model, Scalar, Type } from "@typespec/compiler";
-import { Typekit } from "@typespec/compiler/experimental/typekit";
+import { Typekit } from "@typespec/compiler/typekit";
 import "@typespec/http/experimental/typekit";
 import { useTsp } from "../../core/context/tsp-context.js";
 import { reportTypescriptDiagnostic } from "../../typescript/lib.js";

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

@@ -9,7 +9,7 @@ import {
   Type,
   Union,
 } from "@typespec/compiler";
-import { Typekit } from "@typespec/compiler/experimental/typekit";
+import { Typekit } from "@typespec/compiler/typekit";
 import { createRekeyableMap } from "@typespec/compiler/utils";
 import { useTsp } from "../../core/context/tsp-context.js";
 import { reportDiagnostic } from "../../lib.js";
@@ -35,9 +35,12 @@ export interface UnionTransformProps {
 }
 function UnionTransformExpression(props: UnionTransformProps) {
   const { $ } = useTsp();
-  const discriminator = $.type.getDiscriminator(props.type);
+  const discriminator = $.union.getDiscriminatedUnion(props.type);
+  const discriminatorProperty = discriminator?.options.discriminatorPropertyName && {
+    propertyName: discriminator.options.discriminatorPropertyName,
+  };
 
-  if (!discriminator) {
+  if (!discriminatorProperty) {
     // TODO: Handle non-discriminated unions
     reportTypescriptDiagnostic($.program, {
       code: "typescript-unsupported-nondiscriminated-union",
@@ -47,7 +50,11 @@ function UnionTransformExpression(props: UnionTransformProps) {
   }
 
   return (
-    <DiscriminateExpression type={props.type} discriminator={discriminator} target={props.target} />
+    <DiscriminateExpression
+      type={props.type}
+      discriminator={discriminatorProperty}
+      target={props.target}
+    />
   );
 }
 
@@ -122,7 +129,7 @@ export function TypeTransformDeclaration(props: TypeTransformProps) {
 
   let transformExpression: Children;
   if ($.model.is(props.type)) {
-    const discriminator = $.type.getDiscriminator(props.type);
+    const discriminator = $.model.getDiscriminatedUnion(props.type);
 
     transformExpression = discriminator ? (
       <DiscriminateExpression

package/test/typescript/components/value-expression.test.tsx

@@ -10,7 +10,7 @@ import {
   Program,
   Value,
 } from "@typespec/compiler";
-import { $ } from "@typespec/compiler/experimental/typekit";
+import { $ } from "@typespec/compiler/typekit";
 import { assert, beforeAll, describe, expect, it } from "vitest";
 import { ValueExpression } from "../../../src/typescript/components/value-expression.js";
 import { getProgram } from "../test-host.js";