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

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog - @typespec/emitter-framework
 
+## 0.10.0
+
+### Bump dependencies
+
+- [#8050](https://github.com/microsoft/typespec/pull/8050) Upgrade alloy 0.19
+- [#7978](https://github.com/microsoft/typespec/pull/7978) Upgrade dependencies
+
+
 ## 0.9.0
 
 ### Features

package/dist/src/core/write-output.js

@@ -6,13 +6,17 @@ export async function writeOutput(program, rootComponent, emitterOutputDir) {
 }
 async function writeOutputDirectory(program, dir, emitterOutputDir) {
   for (const sub of dir.contents) {
-    if (Array.isArray(sub.contents)) {
-      await writeOutputDirectory(program, sub, emitterOutputDir);
+    if ("contents" in sub) {
+      if (Array.isArray(sub.contents)) {
+        await writeOutputDirectory(program, sub, emitterOutputDir);
+      } else {
+        await emitFile(program, {
+          content: sub.contents,
+          path: joinPaths(emitterOutputDir, sub.path)
+        });
+      }
     } else {
-      await emitFile(program, {
-        content: sub.contents,
-        path: joinPaths(emitterOutputDir, sub.path)
-      });
+      // TODO: support copy file
     }
   }
 }

package/dist/src/csharp/components/class/declaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../../src/csharp/components/class/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAO,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAO3D,MAAM,WAAW,qBAAsB,SAAQ,IAAI,CAAC,EAAE,CAAC,qBAAqB,EAAE,MAAM,CAAC;IACnF,iFAAiF;IACjF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,wCAAwC;IACxC,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;IACxB,8FAA8F;IAC9F,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAYD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,QAAQ,CAuBvE"}
+{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../../src/csharp/components/class/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAO,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEvC,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAO3D,MAAM,WAAW,qBAAsB,SAAQ,IAAI,CAAC,EAAE,CAAC,qBAAqB,EAAE,MAAM,CAAC;IACnF,iFAAiF;IACjF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,wCAAwC;IACxC,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;IACxB,8FAA8F;IAC9F,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAYD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,QAAQ,CAuBvE"}

package/dist/src/csharp/components/class/declaration.js

@@ -1,6 +1,7 @@
 import { memo as _$memo, mergeProps as _$mergeProps, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
 import { For } from "@alloy-js/core";
 import * as cs from "@alloy-js/csharp";
+import { Method } from "@alloy-js/csharp";
 import { useTsp } from "../../../core/index.js";
 import { Property } from "../property/property.js";
 import { TypeExpression } from "../type-expression.js";
@@ -57,7 +58,7 @@ function ClassMethods(props) {
   const namePolicy = cs.useCSharpNamePolicy();
   const abstractMethods = [];
   for (const [name, method] of props.type.operations) {
-    abstractMethods.push(_$createComponent(cs.ClassMethod, {
+    abstractMethods.push(_$createComponent(Method, {
       get name() {
         return namePolicy.getName(name, "class-method");
       },

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,EAAS,KAAK,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AACpE,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,KAAK,EAIX,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,YAmCpE;AAQD,MAAM,WAAW,wBAAyB,SAAQ,EAAE,CAAC,wBAAwB;IAC3E,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;CACzB;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,YAMlE"}
+{"version":3,"file":"interface-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/interface-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,KAAK,EAIX,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,YAmCpE;AAQD,MAAM,WAAW,wBAAyB,SAAQ,EAAE,CAAC,wBAAwB;IAC3E,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;CACzB;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,YAMlE"}

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

@@ -1,5 +1,5 @@
 import { createComponent as _$createComponent, mergeProps as _$mergeProps, memo as _$memo } from "@alloy-js/core/jsx-runtime";
-import { Block, For, mapJoin } from "@alloy-js/core";
+import { For, mapJoin } from "@alloy-js/core";
 import * as ts from "@alloy-js/typescript";
 import { isNeverType } from "@typespec/compiler";
 import { createRekeyableMap } from "@typespec/compiler/utils";
@@ -50,7 +50,7 @@ function isTypedInterfaceDeclarationProps(props) {
   return "type" in props;
 }
 export function InterfaceExpression(props) {
-  return _$createComponent(Block, {
+  return _$createComponent(ts.InterfaceExpression, {
     get children() {
       return _$createComponent(InterfaceBody, props);
     }

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

@@ -1,6 +1,6 @@
 import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
-import { Output } from "#core/index.js";
 import { Tester } from "#test/test-host.js";
+import { TestFile } from "#test/typescript/utils.js";
 import { t } from "@typespec/compiler/testing";
 import { expect, it } from "vitest";
 import { UnionExpression } from "./expression.js";
@@ -14,7 +14,7 @@ it("renders a union expression", async () => {
       two: "two"
     }
   `);
-  expect(_$createComponent(Output, {
+  expect(_$createComponent(TestFile, {
     program: program,
     get children() {
       return _$createComponent(UnionExpression, {
@@ -33,7 +33,7 @@ it("renders a union expression without conflicting names", async () => {
       {common: "one", two: "two"}
     }
   `);
-  expect(_$createComponent(Output, {
+  expect(_$createComponent(TestFile, {
     program: program,
     get children() {
       return _$createComponent(UnionExpression, {

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

@@ -1,9 +1,8 @@
 import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
-import { render } from "@alloy-js/core";
+import { code } from "@alloy-js/core";
 import { d } from "@alloy-js/core/testing";
 import { SourceFile } from "@alloy-js/typescript";
-import { format } from "prettier";
-import { assert, describe, expect, it } from "vitest";
+import { describe, expect, it } from "vitest";
 import { Output } from "../../../src/core/components/output.js";
 import { FunctionDeclaration } from "../../../src/typescript/components/function-declaration.js";
 import { getProgram } from "../test-host.js";
@@ -17,7 +16,7 @@ describe("Typescript Function Declaration", () => {
         `);
         const [namespace] = program.resolveTypeReference("DemoService");
         const operation = Array.from(namespace.operations.values())[0];
-        const res = render(_$createComponent(Output, {
+        expect(_$createComponent(Output, {
           program: program,
           get children() {
             return _$createComponent(SourceFile, {
@@ -29,16 +28,7 @@ describe("Typescript Function Declaration", () => {
               }
             });
           }
-        }));
-        const testFile = res.contents.find(file => file.path === "test.ts");
-        assert(testFile, "test.ts file not rendered");
-        const actualContent = await format(testFile.contents, {
-          parser: "typescript"
-        });
-        const expectedContent = await format(`function getName(id: string): string{}`, {
-          parser: "typescript"
-        });
-        expect(actualContent).toBe(expectedContent);
+        })).toRenderTo(`function getName(id: string): string {}`);
       });
       it("creates a function with JSDoc", async () => {
         const program = await getProgram(`
@@ -52,7 +42,7 @@ describe("Typescript Function Declaration", () => {
         `);
         const [namespace] = program.resolveTypeReference("DemoService");
         const operation = Array.from(namespace.operations.values())[0];
-        const res = render(_$createComponent(Output, {
+        expect(_$createComponent(Output, {
           program: program,
           get children() {
             return _$createComponent(SourceFile, {
@@ -64,23 +54,14 @@ describe("Typescript Function Declaration", () => {
               }
             });
           }
-        }));
-        const testFile = res.contents.find(file => file.path === "test.ts");
-        assert(testFile, "test.ts file not rendered");
-        const actualContent = await format(testFile.contents, {
-          parser: "typescript"
-        });
-        const expectedContent = await format(`
+        })).toRenderTo(`
           /**
            * This is a test function
-           * 
+           *
            * @param {string} id - This is the id
            * @param {string} name
            */
-          function getName(id: string, name: string): string{}`, {
-          parser: "typescript"
-        });
-        expect(actualContent).toBe(expectedContent);
+          function getName(id: string, name: string): string {}`);
       });
       it("creates a function with overridden JSDoc", async () => {
         const program = await getProgram(`
@@ -91,7 +72,7 @@ describe("Typescript Function Declaration", () => {
         op getName(id: string): string;`);
         const [namespace] = program.resolveTypeReference("DemoService");
         const operation = Array.from(namespace.operations.values())[0];
-        const res = render(_$createComponent(Output, {
+        expect(_$createComponent(Output, {
           program: program,
           get children() {
             return _$createComponent(SourceFile, {
@@ -104,22 +85,13 @@ describe("Typescript Function Declaration", () => {
               }
             });
           }
-        }));
-        const testFile = res.contents.find(file => file.path === "test.ts");
-        assert(testFile, "test.ts file not rendered");
-        const actualContent = await format(testFile.contents, {
-          parser: "typescript"
-        });
-        const expectedContent = await format(`
+        })).toRenderTo(`
           /**
            * This is a custom description
            *
            * @param {string} id
            */
-          function getName(id: string): string{}`, {
-          parser: "typescript"
-        });
-        expect(actualContent).toBe(expectedContent);
+          function getName(id: string): string {}`);
       });
       it("creates an async function", async () => {
         const program = await getProgram(`
@@ -128,7 +100,7 @@ describe("Typescript Function Declaration", () => {
         `);
         const [namespace] = program.resolveTypeReference("DemoService");
         const operation = Array.from(namespace.operations.values())[0];
-        const res = render(_$createComponent(Output, {
+        expect(_$createComponent(Output, {
           program: program,
           get children() {
             return _$createComponent(SourceFile, {
@@ -141,19 +113,7 @@ describe("Typescript Function Declaration", () => {
               }
             });
           }
-        }));
-        const testFile = res.contents.find(file => file.path === "test.ts");
-        assert(testFile, "test.ts file not rendered");
-        const actualContent = await format(testFile.contents, {
-          parser: "typescript"
-        });
-        const expectedContent = await format(d`async function getName(id: string): Promise<string> {
-          
-          
-          }`, {
-          parser: "typescript"
-        });
-        expect(actualContent).toBe(expectedContent);
+        })).toRenderTo(d`async function getName(id: string): Promise<string> {}`);
       });
       it("exports a function", async () => {
         const program = await getProgram(`
@@ -162,7 +122,7 @@ describe("Typescript Function Declaration", () => {
         `);
         const [namespace] = program.resolveTypeReference("DemoService");
         const operation = Array.from(namespace.operations.values())[0];
-        const res = render(_$createComponent(Output, {
+        expect(_$createComponent(Output, {
           program: program,
           get children() {
             return _$createComponent(SourceFile, {
@@ -175,16 +135,7 @@ describe("Typescript Function Declaration", () => {
               }
             });
           }
-        }));
-        const testFile = res.contents.find(file => file.path === "test.ts");
-        assert(testFile, "test.ts file not rendered");
-        const actualContent = await format(testFile.contents, {
-          parser: "typescript"
-        });
-        const expectedContent = await format(`export function getName(id: string): string{}`, {
-          parser: "typescript"
-        });
-        expect(actualContent).toBe(expectedContent);
+        })).toRenderTo(`export function getName(id: string): string {}`);
       });
       it("can override name", async () => {
         const program = await getProgram(`
@@ -193,7 +144,7 @@ describe("Typescript Function Declaration", () => {
         `);
         const [namespace] = program.resolveTypeReference("DemoService");
         const operation = Array.from(namespace.operations.values())[0];
-        const res = render(_$createComponent(Output, {
+        expect(_$createComponent(Output, {
           program: program,
           get children() {
             return _$createComponent(SourceFile, {
@@ -206,16 +157,7 @@ describe("Typescript Function Declaration", () => {
               }
             });
           }
-        }));
-        const testFile = res.contents.find(file => file.path === "test.ts");
-        assert(testFile, "test.ts file not rendered");
-        const actualContent = await format(testFile.contents, {
-          parser: "typescript"
-        });
-        const expectedContent = await format(`function newName(id: string): string{}`, {
-          parser: "typescript"
-        });
-        expect(actualContent).toBe(expectedContent);
+        })).toRenderTo(`function newName(id: string): string {}`);
       });
       it("can append extra parameters with raw params provided", async () => {
         const program = await getProgram(`
@@ -224,7 +166,7 @@ describe("Typescript Function Declaration", () => {
         `);
         const [namespace] = program.resolveTypeReference("DemoService");
         const operation = Array.from(namespace.operations.values())[0];
-        const res = render(_$createComponent(Output, {
+        expect(_$createComponent(Output, {
           program: program,
           get children() {
             return _$createComponent(SourceFile, {
@@ -243,16 +185,7 @@ describe("Typescript Function Declaration", () => {
               }
             });
           }
-        }));
-        const testFile = res.contents.find(file => file.path === "test.ts");
-        assert(testFile, "test.ts file not rendered");
-        const actualContent = await format(testFile.contents, {
-          parser: "typescript"
-        });
-        const expectedContent = await format(`function createPerson(name: string, age: number, id: string): string{}`, {
-          parser: "typescript"
-        });
-        expect(actualContent).toBe(expectedContent);
+        })).toRenderTo(`function createPerson(name: string, age: number, id: string): string {}`);
       });
       it.skip("can override parameters with an array of ModelProperties", async () => {
         const program = await getProgram(`
@@ -267,7 +200,7 @@ describe("Typescript Function Declaration", () => {
         const [namespace] = program.resolveTypeReference("DemoService");
         const operation = Array.from(namespace.operations.values())[0];
         const model = Array.from(namespace.models.values())[0];
-        const res = render(_$createComponent(Output, {
+        expect(_$createComponent(Output, {
           program: program,
           get children() {
             return _$createComponent(SourceFile, {
@@ -284,16 +217,7 @@ describe("Typescript Function Declaration", () => {
               }
             });
           }
-        }));
-        const testFile = res.contents.find(file => file.path === "test.ts");
-        assert(testFile, "test.ts file not rendered");
-        const actualContent = await format(testFile.contents, {
-          parser: "typescript"
-        });
-        const expectedContent = await format(`function createPerson(name: string, age: number): string{}`, {
-          parser: "typescript"
-        });
-        expect(actualContent).toBe(expectedContent);
+        })).toRenderTo(`function createPerson(name: string, age: number): string {}`);
       });
       it("can render function body", async () => {
         const program = await getProgram(`
@@ -302,7 +226,7 @@ describe("Typescript Function Declaration", () => {
         `);
         const [namespace] = program.resolveTypeReference("DemoService");
         const operation = Array.from(namespace.operations.values())[0];
-        const res = render(_$createComponent(Output, {
+        expect(_$createComponent(Output, {
           program: program,
           get children() {
             return _$createComponent(SourceFile, {
@@ -311,24 +235,19 @@ describe("Typescript Function Declaration", () => {
                 return _$createComponent(FunctionDeclaration, {
                   "export": true,
                   type: operation,
-                  children: "const message = \"Hello World!\"; console.log(message);"
+                  children: code`
+                  const message = "Hello World!";
+                  console.log(message);
+                `
                 });
               }
             });
           }
-        }));
-        const testFile = res.contents.find(file => file.path === "test.ts");
-        assert(testFile, "test.ts file not rendered");
-        const actualContent = await format(testFile.contents, {
-          parser: "typescript"
-        });
-        const expectedContent = await format(`export function createPerson(id: string): string {
-               const message = "Hello World!";
-               console.log(message);
-           }`, {
-          parser: "typescript"
-        });
-        expect(actualContent).toBe(expectedContent);
+        })).toRenderTo(`
+          export function createPerson(id: string): string {
+            const message = "Hello World!";
+            console.log(message);
+          }`);
       });
     });
   });