Upgrade typespec dep version to v0.56 in May

.vscode/launch.json

@@ -112,7 +112,7 @@
     {
       "name": "[TypeSpec] Smoke Test Debug",
       "request": "launch",
-      "cwd": "${workspaceFolder}/packages/typespec-test/test/customWrapper",
+      "cwd": "${workspaceFolder}/packages/typespec-test/test/contoso",
       "runtimeArgs": ["tsp", "compile", "./spec"],
       "runtimeExecutable": "npx",
       "skipFiles": ["<node_internals>/**"],

packages/typespec-test/package.json

@@ -4,15 +4,15 @@
   "type": "module",
   "dependencies": {
     "@azure-tools/typespec-ts": "workspace:^0.28.0",
-    "@typespec/openapi": ">=0.55.0 <1.0.0",
-    "@azure-tools/typespec-autorest": ">=0.41.0 <1.0.0",
-    "@typespec/openapi3": ">=0.55.0 <1.0.0",
-    "@azure-tools/typespec-azure-core": ">=0.41.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.41.5 <1.0.0",
-    "@typespec/compiler": ">=0.55.0 <1.0.0",
-    "@typespec/http": ">=0.55.0 <1.0.0",
-    "@typespec/rest": ">=0.55.0 <1.0.0",
-    "@typespec/versioning": ">=0.55.0 <1.0.0",
+    "@typespec/openapi": ">=0.56.0 <1.0.0",
+    "@azure-tools/typespec-autorest": ">=0.42.0 <1.0.0",
+    "@typespec/openapi3": ">=0.56.0 <1.0.0",
+    "@azure-tools/typespec-azure-core": ">=0.42.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.42 <1.0.0",
+    "@typespec/compiler": ">=0.56.0 <1.0.0",
+    "@typespec/http": ">=0.56.0 <1.0.0",
+    "@typespec/rest": ">=0.56.0 <1.0.0",
+    "@typespec/versioning": ">=0.56.0 <1.0.0",
     "prettier": "^3.1.0"
   },
   "devDependencies": {

packages/typespec-test/test/contoso/generated/typespec-ts/src/outputModels.ts

@@ -34,16 +34,6 @@ export interface ResourceOperationStatusOutput {
   result?: WidgetOutput;
 }
 
-/** Provides status details for long running operations. */
-export interface OperationStatusOutput {
-  /** The unique ID of the operation. */
-  id: string;
-  /** The status of the operation */
-  status: OperationStateOutput;
-  /** Error object that describes the error when status is "Failed". */
-  error?: ErrorModel;
-}
-
 /** Enum describing allowed operation states. */
 export type OperationStateOutput =
   | "NotStarted"

packages/typespec-ts/package.json

@@ -79,21 +79,21 @@
     "@azure/core-util": "^1.4.0",
     "eslint-plugin-require-extensions": "0.1.3",
     "@typespec/ts-http-runtime": "1.0.0-alpha.20240314.2",
-    "@azure-tools/typespec-azure-core": ">=0.41.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.41.5 <1.0.0",
-    "@typespec/compiler": ">=0.55.0 <1.0.0",
-    "@typespec/http": ">=0.55.0 <1.0.0",
-    "@typespec/rest": ">=0.55.0 <1.0.0",
-    "@typespec/versioning": ">=0.55.0 <1.0.0",
+    "@azure-tools/typespec-azure-core": ">=0.42.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.42.2 <1.0.0",
+    "@typespec/compiler": ">=0.56.0 <1.0.0",
+    "@typespec/http": ">=0.56.0 <1.0.0",
+    "@typespec/rest": ">=0.56.0 <1.0.0",
+    "@typespec/versioning": ">=0.56.0 <1.0.0",
     "npm-run-all": "~4.1.5"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": ">=0.41.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.41.5 <1.0.0",
-    "@typespec/compiler": ">=0.55.0 <1.0.0",
-    "@typespec/http": ">=0.55.0 <1.0.0",
-    "@typespec/rest": ">=0.55.0 <1.0.0",
-    "@typespec/versioning": ">=0.55.0 <1.0.0"
+    "@azure-tools/typespec-azure-core": ">=0.42.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.42.2 <1.0.0",
+    "@typespec/compiler": ">=0.56.0 <1.0.0",
+    "@typespec/http": ">=0.56.0 <1.0.0",
+    "@typespec/rest": ">=0.56.0 <1.0.0",
+    "@typespec/versioning": ">=0.56.0 <1.0.0"
   },
   "dependencies": {
     "prettier": "^3.1.0",

packages/typespec-ts/src/index.ts

@@ -128,28 +128,6 @@ export async function $onEmit(context: EmitContext) {
     };
   }
 
-  function createContextWithDefaultOptions(
-    context: EmitContext<Record<string, any>>
-  ): SdkContext {
-    const tcgcSettings = {
-      "generate-protocol-methods": true,
-      "generate-convenience-methods": true,
-      "flatten-union-as-enum": false,
-      emitters: [
-        {
-          main: "@azure-tools/typespec-ts",
-          metadata: { name: "@azure-tools/typespec-ts" }
-        }
-      ]
-    };
-    context.options = {
-      ...context.options,
-      ...tcgcSettings
-    };
-
-    return createSdkContext(context) as SdkContext;
-  }
-
   async function clearSrcFolder() {
     await fsextra.emptyDir(
       dpgContext.generationPathDetail?.modularSourcesDir ??
@@ -347,3 +325,25 @@ export async function $onEmit(context: EmitContext) {
     }
   }
 }
+
+export function createContextWithDefaultOptions(
+  context: EmitContext<Record<string, any>>
+): SdkContext {
+  const tcgcSettings = {
+    "generate-protocol-methods": true,
+    "generate-convenience-methods": true,
+    "flatten-union-as-enum": false,
+    emitters: [
+      {
+        main: "@azure-tools/typespec-ts",
+        metadata: { name: "@azure-tools/typespec-ts" }
+      }
+    ]
+  };
+  context.options = {
+    ...context.options,
+    ...tcgcSettings
+  };
+
+  return createSdkContext(context) as SdkContext;
+}

packages/typespec-ts/test/modularUnit/anonymousModel.spec.ts

@@ -622,7 +622,7 @@ describe("anonymous model", () => {
             foo?: string;
           };
         }
-        op read(@body body: Test): void;
+        op read(@bodyRoot body: Test): void;
         `;
         const modelFile = await emitModularModelsFromTypeSpec(tspContent);
         assert.ok(modelFile);
@@ -723,7 +723,7 @@ describe("anonymous model", () => {
       }
       it("should map empty anonymous model({}) => Record<string, any>", async () => {
         const tspContent = `
-        op read(): {};
+        op read(): { @body _: {}; };
         `;
         // No models.ts file generated
         assert.isUndefined(await emitModularModelsFromTypeSpec(tspContent));
@@ -741,7 +741,7 @@ describe("anonymous model", () => {
         const tspContent = `
         model PublishResult {
         }
-        op read(): PublishResult;
+        op read(): {@body _: PublishResult};
         `;
         const modelFile = await emitModularModelsFromTypeSpec(tspContent);
         await assertEqualContent(

packages/typespec-ts/test/modularUnit/enumUnion.spec.ts

@@ -130,7 +130,7 @@ describe("header parameters", () => {
         op get(
           @header("test-header") testHeader: SchemaContentTypeValues,
           @body body: string,
-        ): { @header("test-header") testHeader: SchemaContentTypeValues };
+        ): { @header("test-header") testHeader: SchemaContentTypeValues; @statusCode _: 204; };
         `;
         const schemaOutput = await emitModularModelsFromTypeSpec(
           tspDefinition,
@@ -307,7 +307,7 @@ describe("header parameters", () => {
         op get(
           @header("test-header") testHeader: "A" | "B",
           @body body: string,
-        ): { @header("test-header") testHeader: "A" | "B" };
+        ): { @header("test-header") testHeader: "A" | "B"; @statusCode _: 204; };
         `;
         const schemaOutput = await emitModularModelsFromTypeSpec(
           tspDefinition,
@@ -386,7 +386,7 @@ describe("header parameters", () => {
         op get(
           @header("test-header") testHeader: "A" | "B" | string,
           @body body: string,
-        ): { @header("test-header") testHeader: "A" | "B" | string };
+        ): { @header("test-header") testHeader: "A" | "B" | string; @statusCode _: 204; };
         `;
         const schemaOutput = await emitModularModelsFromTypeSpec(
           tspDefinition,

packages/typespec-ts/test/modularUnit/modelsGenerator.spec.ts

@@ -1619,7 +1619,7 @@ describe("inheritance & polymorphism", () => {
       op get(
         @header("test-header") testHeader: SchemaContentTypeValues,
         @body body: string,
-      ): { @header("test-header") testHeader: SchemaContentTypeValues };
+      ): { @header("test-header") testHeader: SchemaContentTypeValues; @statusCode _: 204; };
       `;
       const schemaOutput = await emitModularModelsFromTypeSpec(
         tspDefinition,
@@ -1657,7 +1657,7 @@ describe("inheritance & polymorphism", () => {
       op get(
         @header("test-header") testHeader: "A" | "B",
         @body body: string,
-      ): { @header("test-header") testHeader: "A" | "B" };
+      ): { @header("test-header") testHeader: "A" | "B"; @statusCode _: 204; };
       `;
       const schemaOutput = await emitModularModelsFromTypeSpec(
         tspDefinition,
@@ -1732,7 +1732,7 @@ describe("`is`", () => {
       @query
       name: string;
     };
-      op read(@body body: A): void;
+      op read(@bodyRoot body: A): void;
       `);
     assert.ok(modelFile);
     await assertEqualContent(
@@ -1757,7 +1757,7 @@ describe("`extends`", () => {
         @query
         name: string;
       };
-      op read(@body body: A): void;
+      op read(@bodyRoot body: A): void;
       `);
     assert.ok(modelFile);
     await assertEqualContent(
@@ -1829,7 +1829,7 @@ describe("spread record", () => {
       true
     );
     assert.ok(modelFile);
-    assert.strictEqual(modelFile?.getFilePath(), "/models/models.ts");
+    assert.isTrue(modelFile?.getFilePath()?.endsWith("/models/models.ts"));
     await assertEqualContent(
       modelFile!.getFullText()!,
       `
@@ -1883,7 +1883,7 @@ describe("spread record", () => {
       true
     );
     assert.ok(modelFile);
-    assert.strictEqual(modelFile?.getFilePath(), "/models/models.ts");
+    assert.isTrue(modelFile?.getFilePath()?.endsWith("/models/models.ts"));
     await assertEqualContent(
       modelFile!.getFullText()!,
       `

packages/typespec-ts/test/unit/modelsGenerator.spec.ts

@@ -56,7 +56,7 @@ describe("Input/output model type", () => {
     #suppress "@azure-tools/typespec-azure-core/documentation-required" "for test"
     @route("/models")
     @get
-    op getModel(@body input: InputOutputModel): InputOutputModel;`,
+    op getModel(@bodyRoot input: InputOutputModel): InputOutputModel;`,
       needAzureCore,
       needTCGC
     );
@@ -1658,7 +1658,7 @@ describe("Input/output model type", () => {
       assert.ok(schemaOutput);
       const { inputModelFile } = schemaOutput!;
       assert.ok(inputModelFile);
-      assert.strictEqual(inputModelFile?.path, "models.ts");
+      assert.isTrue(inputModelFile?.path?.endsWith("models.ts"));
       await assertEqualContent(
         inputModelFile?.content!,
         `
@@ -3524,7 +3524,7 @@ describe("Input/output model type", () => {
       op get(
         @header("test-header") testHeader: SchemaContentTypeValues,
         @body body: string,
-      ): { @header("test-header") testHeader: SchemaContentTypeValues };
+      ): { @header("test-header") testHeader: SchemaContentTypeValues; @statusCode _: 204; };
       `;
       const schemaOutput = await emitModelsFromTypeSpec(
         tspDefinition,
@@ -3634,7 +3634,7 @@ describe("Input/output model type", () => {
       op get(
         @header("test-header") testHeader: "A" | "B",
         @body body: string,
-      ): { @header("test-header") testHeader: "A" | "B" };
+      ): { @header("test-header") testHeader: "A" | "B"; @statusCode _: 204; };
       `;
       const schemaOutput = await emitModelsFromTypeSpec(
         tspDefinition,

packages/typespec-ts/test/unit/responsesGenerator.spec.ts

@@ -7,11 +7,12 @@ import { assertEqualContent } from "../util/testUtil.js";
 
 describe("Responses.ts", () => {
   describe("property name generation", () => {
-    it("should generate property name with custome name", async () => {
+    it("should generate property name with custom name", async () => {
       const responses = await emitResponsesFromTypeSpec(`
         model SimpleModel {}
         @doc("Metadata for long running operation status monitor locations")
         model LongRunningStatusLocation {
+            @statusCode _: 204;
             @doc("The location for monitoring the operation state.")
             @header("Operation-Location")
             operationLocation: ResourceLocation<SimpleModel>;
@@ -38,11 +39,12 @@ describe("Responses.ts", () => {
       );
     });
 
-    it("should generate property name without custome name", async () => {
+    it("should generate property name without custom name", async () => {
       const responses = await emitResponsesFromTypeSpec(`
         model SimpleModel {}
         @doc("Metadata for long running operation status monitor locations")
         model LongRunningStatusLocation {
+            @statusCode _: 204;
             @doc("The location for monitoring the operation state.")
             @header
             operationLocation: ResourceLocation<SimpleModel>;
@@ -71,7 +73,7 @@ describe("Responses.ts", () => {
   });
 
   describe("statusCode generation", () => {
-    it("should generate property name with custome name", async () => {
+    it("should generate property name with custom name", async () => {
       const responses = await emitResponsesFromTypeSpec(`
       @doc("Error")
       @error

packages/typespec-ts/test/util/testUtil.ts

@@ -1,4 +1,4 @@
-import { Program } from "@typespec/compiler";
+import { EmitContext, Program } from "@typespec/compiler";
 import { createTestHost } from "@typespec/compiler/testing";
 import { TestHost } from "@typespec/compiler/testing";
 import { RestTestLibrary } from "@typespec/rest/testing";
@@ -10,6 +10,7 @@ import { SdkContext } from "../../src/utils/interfaces.js";
 import { assert } from "chai";
 import { format } from "prettier";
 import { prettierTypeScriptOptions } from "../../src/lib.js";
+import { createContextWithDefaultOptions } from "../../src/index.js";
 
 export async function createRLCEmitterTestHost() {
   return createTestHost({
@@ -75,23 +76,13 @@ export function createDpgContextTestHelper(
   program: Program,
   enableModelNamespace = false
 ): SdkContext {
-  const defaultOptions = {
-    generateProtocolMethods: true,
-    generateConvenienceMethods: true,
-    flattenUnionAsEnum: false,
-    emitters: [
-      {
-        main: "@azure-tools/typespec-ts",
-        metadata: { name: "@azure-tools/typespec-ts" }
-      }
-    ]
-  };
-  const resolvedOptions = { ...defaultOptions };
-  program.emitters = resolvedOptions.emitters as any;
+  const context = createContextWithDefaultOptions({
+    program
+  } as EmitContext);
+
   return {
-    program: program,
-    generateProtocolMethods: resolvedOptions.generateProtocolMethods,
-    generateConvenienceMethods: resolvedOptions.generateConvenienceMethods,
+    ...context,
+    program,
     rlcOptions: { flavor: "azure", enableModelNamespace },
     generationPathDetail: {},
     emitterName: "@azure-tools/typespec-ts",