Merge branch 'tsconfig/node16' of https://github.com/Azure/autorest.t…

…ypescript into tsconfig/node16
Azure · Oct 10, 2023 · faa7df9 · faa7df9
2 parents b8ced70 + 6cb0416
commit faa7df9
Show file tree

Hide file tree

Showing 16 changed files with 85 additions and 84 deletions.
diff --git a/packages/typespec-ts/src/utils/clientUtils.ts b/packages/typespec-ts/src/utils/clientUtils.ts
@@ -11,6 +11,7 @@ export function getRLCClients(dpgContext: SdkContext): SdkClient[] {
       name: service.type.name + "Client",
       service: service.type,
       type: service.type,
+      crossLanguageDefinitionId: service.type.name,
       arm: isArm(service.type)
     };
   });

diff --git a/packages/typespec-ts/test/integration/generated/azure/core/src/clientDefinitions.ts b/packages/typespec-ts/test/integration/generated/azure/core/src/clientDefinitions.ts
@@ -12,11 +12,11 @@ import {
   ExportParameters,
 } from "./parameters";
 import {
-  CreateOrUpdate200Response,
   CreateOrUpdate201Response,
+  CreateOrUpdate200Response,
   CreateOrUpdateDefaultResponse,
-  CreateOrReplace200Response,
   CreateOrReplace201Response,
+  CreateOrReplace200Response,
   CreateOrReplaceDefaultResponse,
   Get200Response,
   GetDefaultResponse,
@@ -38,16 +38,16 @@ export interface CreateOrUpdate {
   patch(
     options: CreateOrUpdateParameters
   ): StreamableMethod<
-    | CreateOrUpdate200Response
     | CreateOrUpdate201Response
+    | CreateOrUpdate200Response
     | CreateOrUpdateDefaultResponse
   >;
   /** Creates or replaces a User */
   put(
     options: CreateOrReplaceParameters
   ): StreamableMethod<
-    | CreateOrReplace200Response
     | CreateOrReplace201Response
+    | CreateOrReplace200Response
     | CreateOrReplaceDefaultResponse
   >;
   /** Gets a User */

diff --git a/packages/typespec-ts/test/integration/generated/azure/core/src/isUnexpected.ts b/packages/typespec-ts/test/integration/generated/azure/core/src/isUnexpected.ts
@@ -2,11 +2,11 @@
 // Licensed under the MIT license.
 
 import {
-  CreateOrUpdate200Response,
   CreateOrUpdate201Response,
+  CreateOrUpdate200Response,
   CreateOrUpdateDefaultResponse,
-  CreateOrReplace200Response,
   CreateOrReplace201Response,
+  CreateOrReplace200Response,
   CreateOrReplaceDefaultResponse,
   Get200Response,
   GetDefaultResponse,
@@ -23,8 +23,8 @@ import {
 } from "./responses";
 
 const responseMap: Record<string, string[]> = {
-  "PATCH /azure/core/basic/users/{id}": ["200", "201"],
-  "PUT /azure/core/basic/users/{id}": ["200", "201"],
+  "PATCH /azure/core/basic/users/{id}": ["201", "200"],
+  "PUT /azure/core/basic/users/{id}": ["201", "200"],
   "GET /azure/core/basic/users/{id}": ["200"],
   "DELETE /azure/core/basic/users/{id}": ["204"],
   "GET /azure/core/basic/users": ["200"],
@@ -35,14 +35,14 @@ const responseMap: Record<string, string[]> = {
 
 export function isUnexpected(
   response:
-    | CreateOrUpdate200Response
     | CreateOrUpdate201Response
+    | CreateOrUpdate200Response
     | CreateOrUpdateDefaultResponse
 ): response is CreateOrUpdateDefaultResponse;
 export function isUnexpected(
   response:
-    | CreateOrReplace200Response
     | CreateOrReplace201Response
+    | CreateOrReplace200Response
     | CreateOrReplaceDefaultResponse
 ): response is CreateOrReplaceDefaultResponse;
 export function isUnexpected(
@@ -67,11 +67,11 @@ export function isUnexpected(
 ): response is ExportOperationDefaultResponse;
 export function isUnexpected(
   response:
-    | CreateOrUpdate200Response
     | CreateOrUpdate201Response
+    | CreateOrUpdate200Response
     | CreateOrUpdateDefaultResponse
-    | CreateOrReplace200Response
     | CreateOrReplace201Response
+    | CreateOrReplace200Response
     | CreateOrReplaceDefaultResponse
     | Get200Response
     | GetDefaultResponse

diff --git a/packages/typespec-ts/test/integration/generated/azure/core/src/responses.ts b/packages/typespec-ts/test/integration/generated/azure/core/src/responses.ts
@@ -9,18 +9,18 @@ import {
   UserListResultsOutput,
 } from "./outputModels";
 
-/** The request has succeeded. */
-export interface CreateOrUpdate200Response extends HttpResponse {
-  status: "200";
-  body: UserOutput;
-}
-
 /** The request has succeeded and a new resource has been created as a result. */
 export interface CreateOrUpdate201Response extends HttpResponse {
   status: "201";
   body: UserOutput;
 }
 
+/** The request has succeeded. */
+export interface CreateOrUpdate200Response extends HttpResponse {
+  status: "200";
+  body: UserOutput;
+}
+
 export interface CreateOrUpdateDefaultHeaders {
   /** String error code indicating what went wrong. */
   "x-ms-error-code"?: string;
@@ -32,18 +32,18 @@ export interface CreateOrUpdateDefaultResponse extends HttpResponse {
   headers: RawHttpHeaders & CreateOrUpdateDefaultHeaders;
 }
 
-/** The request has succeeded. */
-export interface CreateOrReplace200Response extends HttpResponse {
-  status: "200";
-  body: UserOutput;
-}
-
 /** The request has succeeded and a new resource has been created as a result. */
 export interface CreateOrReplace201Response extends HttpResponse {
   status: "201";
   body: UserOutput;
 }
 
+/** The request has succeeded. */
+export interface CreateOrReplace200Response extends HttpResponse {
+  status: "200";
+  body: UserOutput;
+}
+
 export interface CreateOrReplaceDefaultHeaders {
   /** String error code indicating what went wrong. */
   "x-ms-error-code"?: string;

diff --git a/packages/typespec-ts/test/integration/generated/lro/lroCore/src/clientDefinitions.ts b/packages/typespec-ts/test/integration/generated/lro/lroCore/src/clientDefinitions.ts
@@ -7,8 +7,8 @@ import {
   ExportParameters,
 } from "./parameters";
 import {
-  CreateOrReplace200Response,
   CreateOrReplace201Response,
+  CreateOrReplace200Response,
   CreateOrReplaceDefaultResponse,
   DeleteOperation202Response,
   DeleteOperationDefaultResponse,
@@ -22,8 +22,8 @@ export interface CreateOrReplace {
   put(
     options: CreateOrReplaceParameters
   ): StreamableMethod<
-    | CreateOrReplace200Response
     | CreateOrReplace201Response
+    | CreateOrReplace200Response
     | CreateOrReplaceDefaultResponse
   >;
   /** Deletes a User */

diff --git a/packages/typespec-ts/test/integration/generated/lro/lroCore/src/isUnexpected.ts b/packages/typespec-ts/test/integration/generated/lro/lroCore/src/isUnexpected.ts
@@ -2,8 +2,8 @@
 // Licensed under the MIT license.
 
 import {
-  CreateOrReplace200Response,
   CreateOrReplace201Response,
+  CreateOrReplace200Response,
   CreateOrReplaceLogicalResponse,
   CreateOrReplaceDefaultResponse,
   DeleteOperation202Response,
@@ -15,7 +15,7 @@ import {
 } from "./responses";
 
 const responseMap: Record<string, string[]> = {
-  "PUT /azure/core/lro/standard/users/{name}": ["200", "201"],
+  "PUT /azure/core/lro/standard/users/{name}": ["201", "200"],
   "GET /azure/core/lro/standard/users/{name}": ["200", "202"],
   "DELETE /azure/core/lro/standard/users/{name}": ["202"],
   "POST /azure/core/lro/standard/users/{name}:export": ["202"],
@@ -24,8 +24,8 @@ const responseMap: Record<string, string[]> = {
 
 export function isUnexpected(
   response:
-    | CreateOrReplace200Response
     | CreateOrReplace201Response
+    | CreateOrReplace200Response
     | CreateOrReplaceLogicalResponse
     | CreateOrReplaceDefaultResponse
 ): response is CreateOrReplaceDefaultResponse;
@@ -43,8 +43,8 @@ export function isUnexpected(
 ): response is ExportOperationDefaultResponse;
 export function isUnexpected(
   response:
-    | CreateOrReplace200Response
     | CreateOrReplace201Response
+    | CreateOrReplace200Response
     | CreateOrReplaceLogicalResponse
     | CreateOrReplaceDefaultResponse
     | DeleteOperation202Response

diff --git a/packages/typespec-ts/test/integration/generated/lro/lroCore/src/pollingHelper.ts b/packages/typespec-ts/test/integration/generated/lro/lroCore/src/pollingHelper.ts
@@ -11,8 +11,8 @@ import {
   createHttpPoller,
 } from "@azure/core-lro";
 import {
-  CreateOrReplace200Response,
   CreateOrReplace201Response,
+  CreateOrReplace200Response,
   CreateOrReplaceDefaultResponse,
   CreateOrReplaceLogicalResponse,
   DeleteOperation202Response,
@@ -43,8 +43,8 @@ export async function getLongRunningPoller<
 >(
   client: Client,
   initialResponse:
-    | CreateOrReplace200Response
     | CreateOrReplace201Response
+    | CreateOrReplace200Response
     | CreateOrReplaceDefaultResponse,
   options?: CreateHttpPollerOptions<TResult, OperationState<TResult>>
 ): Promise<SimplePollerLike<OperationState<TResult>, TResult>>;

diff --git a/packages/typespec-ts/test/integration/generated/lro/lroCore/src/responses.ts b/packages/typespec-ts/test/integration/generated/lro/lroCore/src/responses.ts
@@ -9,28 +9,28 @@ import {
   ResourceOperationStatusOutput,
 } from "./outputModels";
 
-export interface CreateOrReplace200Headers {
+export interface CreateOrReplace201Headers {
   /** The location for monitoring the operation state. */
   "operation-location": string;
 }
 
-/** The request has succeeded. */
-export interface CreateOrReplace200Response extends HttpResponse {
-  status: "200";
+/** The request has succeeded and a new resource has been created as a result. */
+export interface CreateOrReplace201Response extends HttpResponse {
+  status: "201";
   body: UserOutput;
-  headers: RawHttpHeaders & CreateOrReplace200Headers;
+  headers: RawHttpHeaders & CreateOrReplace201Headers;
 }
 
-export interface CreateOrReplace201Headers {
+export interface CreateOrReplace200Headers {
   /** The location for monitoring the operation state. */
   "operation-location": string;
 }
 
-/** The request has succeeded and a new resource has been created as a result. */
-export interface CreateOrReplace201Response extends HttpResponse {
-  status: "201";
+/** The request has succeeded. */
+export interface CreateOrReplace200Response extends HttpResponse {
+  status: "200";
   body: UserOutput;
-  headers: RawHttpHeaders & CreateOrReplace201Headers;
+  headers: RawHttpHeaders & CreateOrReplace200Headers;
 }
 
 export interface CreateOrReplaceDefaultHeaders {

diff --git a/packages/typespec-ts/test/integration/generated/lro/lroRPC/src/clientDefinitions.ts b/packages/typespec-ts/test/integration/generated/lro/lroRPC/src/clientDefinitions.ts
@@ -3,8 +3,8 @@
 
 import { CreateJobParameters } from "./parameters";
 import {
-  CreateJob200Response,
   CreateJob202Response,
+  CreateJob200Response,
   CreateJobDefaultResponse,
 } from "./responses";
 import { Client, StreamableMethod } from "@azure-rest/core-client";
@@ -14,7 +14,7 @@ export interface CreateJob {
   post(
     options?: CreateJobParameters
   ): StreamableMethod<
-    CreateJob200Response | CreateJob202Response | CreateJobDefaultResponse
+    CreateJob202Response | CreateJob200Response | CreateJobDefaultResponse
   >;
 }
 

diff --git a/packages/typespec-ts/test/integration/generated/lro/lroRPC/src/isUnexpected.ts b/packages/typespec-ts/test/integration/generated/lro/lroRPC/src/isUnexpected.ts
@@ -2,30 +2,30 @@
 // Licensed under the MIT license.
 
 import {
-  CreateJob200Response,
   CreateJob202Response,
+  CreateJob200Response,
   CreateJobLogicalResponse,
   CreateJobDefaultResponse,
 } from "./responses";
 
 const responseMap: Record<string, string[]> = {
   "POST /azure/core/lro/rpc/legacy/create-resource-poll-via-operation-location/jobs":
-    ["200", "202"],
+    ["202", "200"],
   "GET /azure/core/lro/rpc/legacy/create-resource-poll-via-operation-location/jobs":
     ["200", "202"],
 };
 
 export function isUnexpected(
   response:
-    | CreateJob200Response
     | CreateJob202Response
+    | CreateJob200Response
     | CreateJobLogicalResponse
     | CreateJobDefaultResponse
 ): response is CreateJobDefaultResponse;
 export function isUnexpected(
   response:
-    | CreateJob200Response
     | CreateJob202Response
+    | CreateJob200Response
     | CreateJobLogicalResponse
     | CreateJobDefaultResponse
 ): response is CreateJobDefaultResponse {

diff --git a/packages/typespec-ts/test/integration/generated/lro/lroRPC/src/pollingHelper.ts b/packages/typespec-ts/test/integration/generated/lro/lroRPC/src/pollingHelper.ts
@@ -11,8 +11,8 @@ import {
   createHttpPoller,
 } from "@azure/core-lro";
 import {
-  CreateJob200Response,
   CreateJob202Response,
+  CreateJob200Response,
   CreateJobDefaultResponse,
   CreateJobLogicalResponse,
 } from "./responses";
@@ -28,8 +28,8 @@ export async function getLongRunningPoller<
 >(
   client: Client,
   initialResponse:
-    | CreateJob200Response
     | CreateJob202Response
+    | CreateJob200Response
     | CreateJobDefaultResponse,
   options?: CreateHttpPollerOptions<TResult, OperationState<TResult>>
 ): Promise<SimplePollerLike<OperationState<TResult>, TResult>>;

diff --git a/packages/typespec-ts/test/integration/generated/lro/lroRPC/src/responses.ts b/packages/typespec-ts/test/integration/generated/lro/lroRPC/src/responses.ts
@@ -5,12 +5,6 @@ import { RawHttpHeaders } from "@azure/core-rest-pipeline";
 import { HttpResponse, ErrorResponse } from "@azure-rest/core-client";
 import { JobResultOutput } from "./outputModels";
 
-/** The request has succeeded. */
-export interface CreateJob200Response extends HttpResponse {
-  status: "200";
-  body: JobResultOutput;
-}
-
 export interface CreateJob202Headers {
   /** The location for monitoring the operation state. */
   "operation-location": string;
@@ -24,6 +18,12 @@ export interface CreateJob202Response extends HttpResponse {
   headers: RawHttpHeaders & CreateJob202Headers;
 }
 
+/** The request has succeeded. */
+export interface CreateJob200Response extends HttpResponse {
+  status: "200";
+  body: JobResultOutput;
+}
+
 export interface CreateJobDefaultHeaders {
   /** String error code indicating what went wrong. */
   "x-ms-error-code"?: string;