Upgrade TCGC to latest dev version 0.61.0-dev.7 and fix breaking API changes

Co-authored-by: v-jiaodi <[email protected]>

Author: Copilot

common/config/rush/pnpm-lock.yaml

@@ -8,7 +8,7 @@
     "@azure-tools/typespec-autorest": "^0.60.0",
     "@typespec/openapi3": "^1.4.0",
     "@azure-tools/typespec-azure-core": "^0.60.0",
-    "@azure-tools/typespec-client-generator-core": "0.61.0-dev.5",
+    "@azure-tools/typespec-client-generator-core": "0.61.0-dev.7",
     "@azure-tools/typespec-azure-resource-manager": "^0.60.0",
     "@azure-tools/typespec-azure-rulesets": "^0.60.0",
     "@typespec/compiler": "^1.4.0",

packages/typespec-test/package.json

@@ -21,12 +21,12 @@ export interface ConfidentialLedgerListCollectionsOptionalParams extends Operati
 
 // @public
 export interface ConfidentialLedgerOperations {
-    listCollections: (options?: ConfidentialLedgerListCollectionsOptionalParams) => Promise<Collection[]>;
+    listCollections: (apiVersion: string, options?: ConfidentialLedgerListCollectionsOptionalParams) => Promise<Collection[]>;
 }
 
 // @public (undocumented)
 export class ParametrizedHostClient {
-    constructor(credential: TokenCredential, apiVersion: string, options?: ParametrizedHostClientOptionalParams);
+    constructor(credential: TokenCredential, options?: ParametrizedHostClientOptionalParams);
     readonly confidentialLedger: ConfidentialLedgerOperations;
     readonly pipeline: Pipeline;
 }

packages/typespec-test/test/parametrizedHost/generated/typespec-ts/review/parametrized-host.api.md

@@ -17,14 +17,15 @@ import {
 
 export function _listCollectionsSend(
   context: Client,
+  apiVersion: string,
   options: ConfidentialLedgerListCollectionsOptionalParams = {
     requestOptions: {},
   },
 ): StreamableMethod {
   const path = expandUrlTemplate(
     "/app/collections{?api%2Dversion}",
     {
-      "api%2Dversion": context.apiVersion,
+      "api%2Dversion": apiVersion,
     },
     {
       allowReserved: options?.requestOptions?.skipUrlEncoding,
@@ -55,10 +56,11 @@ export async function _listCollectionsDeserialize(
 /** Collection ids are user-created collections of ledger entries */
 export async function listCollections(
   context: Client,
+  apiVersion: string,
   options: ConfidentialLedgerListCollectionsOptionalParams = {
     requestOptions: {},
   },
 ): Promise<Collection[]> {
-  const result = await _listCollectionsSend(context, options);
+  const result = await _listCollectionsSend(context, apiVersion, options);
   return _listCollectionsDeserialize(result);
 }

packages/typespec-test/test/parametrizedHost/generated/typespec-ts/src/api/confidentialLedger/operations.ts

@@ -5,10 +5,7 @@ import { logger } from "../logger.js";
 import { Client, ClientOptions, getClient } from "@azure-rest/core-client";
 import { TokenCredential } from "@azure/core-auth";
 
-export interface ParametrizedHostContext extends Client {
-  /** The API version to use for this operation. */
-  apiVersion: string;
-}
+export interface ParametrizedHostContext extends Client {}
 
 /** Optional parameters for the client. */
 export interface ParametrizedHostClientOptionalParams extends ClientOptions {
@@ -19,7 +16,6 @@ export interface ParametrizedHostClientOptionalParams extends ClientOptions {
 
 export function createParametrizedHost(
   credential: TokenCredential,
-  apiVersion: string,
   options: ParametrizedHostClientOptionalParams = {},
 ): ParametrizedHostContext {
   const host = options.host ?? "one";
@@ -43,20 +39,10 @@ export function createParametrizedHost(
   };
   const clientContext = getClient(endpointUrl, credential, updatedOptions);
   clientContext.pipeline.removePolicy({ name: "ApiVersionPolicy" });
-  clientContext.pipeline.addPolicy({
-    name: "ClientApiVersionPolicy",
-    sendRequest: (req, next) => {
-      // Use the apiVersion defined in request url directly
-      // Append one if there is no apiVersion and we have one at client options
-      const url = new URL(req.url);
-      if (!url.searchParams.get("api-version")) {
-        req.url = `${req.url}${
-          Array.from(url.searchParams.keys()).length > 0 ? "&" : "?"
-        }api-version=${apiVersion}`;
-      }
-
-      return next(req);
-    },
-  });
-  return { ...clientContext, apiVersion } as ParametrizedHostContext;
+  if (options.apiVersion) {
+    logger.warning(
+      "This client does not support client api-version, please change it at the operation level",
+    );
+  }
+  return clientContext;
 }

packages/typespec-test/test/parametrizedHost/generated/typespec-ts/src/api/parametrizedHostContext.ts

@@ -10,15 +10,17 @@ import { Collection } from "../../models/models.js";
 export interface ConfidentialLedgerOperations {
   /** Collection ids are user-created collections of ledger entries */
   listCollections: (
+    apiVersion: string,
     options?: ConfidentialLedgerListCollectionsOptionalParams,
   ) => Promise<Collection[]>;
 }
 
 function _getConfidentialLedger(context: ParametrizedHostContext) {
   return {
     listCollections: (
+      apiVersion: string,
       options?: ConfidentialLedgerListCollectionsOptionalParams,
-    ) => listCollections(context, options),
+    ) => listCollections(context, apiVersion, options),
   };
 }
 

packages/typespec-test/test/parametrizedHost/generated/typespec-ts/src/classic/confidentialLedger/index.ts

@@ -22,14 +22,13 @@ export class ParametrizedHostClient {
 
   constructor(
     credential: TokenCredential,
-    apiVersion: string,
     options: ParametrizedHostClientOptionalParams = {},
   ) {
     const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
     const userAgentPrefix = prefixFromOptions
       ? `${prefixFromOptions} azsdk-js-client`
       : `azsdk-js-client`;
-    this._client = createParametrizedHost(credential, apiVersion, {
+    this._client = createParametrizedHost(credential, {
       ...options,
       userAgentOptions: { userAgentPrefix },
     });

packages/typespec-test/test/parametrizedHost/generated/typespec-ts/src/parametrizedHostClient.ts

@@ -73,7 +73,7 @@
     "@azure-tools/typespec-autorest": "^0.60.0",
     "@azure-tools/typespec-azure-core": "^0.60.0",
     "@azure-tools/typespec-azure-resource-manager": "^0.60.0",
-    "@azure-tools/typespec-client-generator-core": "0.61.0-dev.5",
+    "@azure-tools/typespec-client-generator-core": "0.61.0-dev.7",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-lro": "^3.1.0",
@@ -116,7 +116,7 @@
   },
   "peerDependencies": {
     "@azure-tools/typespec-azure-core": "^0.60.0",
-    "@azure-tools/typespec-client-generator-core": "0.61.0-dev.5",
+    "@azure-tools/typespec-client-generator-core": "0.61.0-dev.7",
     "@typespec/compiler": "^1.4.0",
     "@typespec/http": "^1.4.0",
     "@typespec/rest": "^0.74.0",

packages/typespec-ts/package.json

@@ -75,7 +75,7 @@ export function getOperationApiVersion(
     }
     const params = route.parameters.parameters.filter(
       (p) =>
-        (p.type === "query" || p.type === "path") && isApiVersion(dpgContext, p)
+        (p.type === "query" || p.type === "path") && isApiVersion(dpgContext, p.param)
     );
     params.map((p) => {
       const type = getSchemaForType(dpgContext, p.param.type, {

packages/typespec-ts/src/transform/transformApiVersionInfo.ts

@@ -225,7 +225,7 @@ function transformQueryParameters(
     (p) =>
       p.type === "query" &&
       !(
-        isApiVersion(dpgContext, p) &&
+        isApiVersion(dpgContext, p.param) &&
         options.apiVersionInfo?.definedPosition === "query"
       )
   );