Fix some issues with API version handling in new getClient

packages/typespec-test/test/NetworkAnalytics.Management/generated/typespec-ts/src/api/networkAnalyticsContext.ts

@@ -24,7 +24,7 @@ export function createNetworkAnalytics(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/api/anomalyDetectorContext.ts

@@ -46,7 +46,7 @@ export function createAnomalyDetector(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-test/test/batch_modular/generated/typespec-ts/src/api/batchContext.ts

@@ -22,7 +22,7 @@ export function createBatch(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-test/test/chatApi_modular/generated/typespec-ts/src/api/chatProtocolContext.ts

@@ -22,7 +22,7 @@ export function createChatProtocol(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-test/test/contentsafety_modular/generated/typespec-ts/src/api/contentSafetyContext.ts

@@ -26,7 +26,7 @@ export function createContentSafety(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-test/test/eventgrid_modular/generated/typespec-ts/src/api/eventGridContext.ts

@@ -25,7 +25,7 @@ export function createEventGrid(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-test/test/hierarchy_generic/generated/typespec-ts/src/api/fooContext.ts

@@ -17,7 +17,7 @@ export function createFoo(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-test/test/loadtesting_modular/generated/typespec-ts/src/administrationOperations/api/administrationOperationsContext.ts

@@ -26,7 +26,7 @@ export function createAdministrationOperations(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-test/test/loadtesting_modular/generated/typespec-ts/src/testProfileAdministrationOperations/api/testProfileAdministrationOperationsContext.ts

@@ -26,7 +26,7 @@ export function createTestProfileAdministrationOperations(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-test/test/loadtesting_modular/generated/typespec-ts/src/testProfileRunOperations/api/testProfileRunOperationsContext.ts

@@ -26,7 +26,7 @@ export function createTestProfileRunOperations(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-test/test/loadtesting_modular/generated/typespec-ts/src/testRunOperations/api/testRunOperationsContext.ts

@@ -25,7 +25,7 @@ export function createTestRunOperations(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-test/test/openai_generic/generated/typespec-ts/src/api/openAIContext.ts

@@ -23,7 +23,7 @@ export function createOpenAI(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-test/test/openai_modular/generated/typespec-ts/src/api/openAIContext.ts

@@ -25,7 +25,7 @@ export function createOpenAI(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-test/test/openai_non_branded/generated/typespec-ts/src/api/openAIContext.ts

@@ -21,7 +21,10 @@ export function createOpenAI(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = { ...options, userAgentOptions: { userAgentPrefix } };
+  const { apiVersion: _, ...updatedOptions } = {
+    ...options,
+    userAgentOptions: { userAgentPrefix },
+  };
   const clientContext = getClient(endpointUrl, undefined, updatedOptions);
 
   if (isKeyCredential(credential)) {

packages/typespec-test/test/overloads_modular/generated/typespec-ts/src/api/widgetManagerContext.ts

@@ -25,7 +25,7 @@ export function createWidgetManager(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

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

@@ -22,7 +22,7 @@ export function createParametrizedHost(
   const host = options.host ?? "one";
   const subdomain = options.subdomain ?? "two";
   const sufix = options.sufix ?? "three";
-  const apiVersion = options.apiVersion;
+  const apiVersion = options.apiVersion ?? "v1";
   const endpointUrl =
     options.endpoint ??
     options.baseUrl ??
@@ -32,7 +32,7 @@ export function createParametrizedHost(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-test/test/schemaRegistry/generated/typespec-ts/src/api/schemaRegistryContext.ts

@@ -26,7 +26,7 @@ export function createSchemaRegistry(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-test/test/spread/generated/typespec-ts/src/api/demoServiceContext.ts

@@ -17,7 +17,7 @@ export function createDemoService(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-test/test/widget_dpg/generated/typespec-ts/src/api/widgetServiceContext.ts

@@ -17,7 +17,7 @@ export function createWidgetService(
   const userAgentPrefix = prefixFromOptions
     ? `${prefixFromOptions} azsdk-js-api`
     : "azsdk-js-api";
-  const updatedOptions = {
+  const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },
     loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },

packages/typespec-ts/src/modular/buildCodeModel.ts

@@ -535,7 +535,10 @@ function emitParameter(
     if (clientDefaultValue !== undefined) {
       (paramMap as any).optional = true;
     }
-  } else if (
+  }
+
+  if (
+    clientDefaultValue === undefined &&
     paramMap.location === "endpointPath" &&
     parameter.param.defaultValue?.valueKind === "StringValue"
   ) {

packages/typespec-ts/src/modular/helpers/clientHelpers.ts

@@ -122,7 +122,9 @@ export function buildGetClientOptionsParam(
   const loggingOptions = buildLoggingOptions(codeModel.options.flavor);
   const credentials = buildCredentials(codeModel, endpointParam);
 
-  let expr = `const updatedOptions = { ...options,`;
+  let expr = "const { apiVersion: _, ...updatedOptions } = {";
+
+  expr += "...options,";
 
   if (userAgentOptions) {
     expr += `userAgentOptions: ${userAgentOptions},`;

packages/typespec-ts/test/modularIntegration/generated/authentication/api-key/src/api/apiKeyContext.ts

@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import { KeyCredential } from "@azure/core-auth";
+import { ClientOptions, Client, getClient } from "@azure-rest/core-client";
+import { logger } from "../logger.js";
+
+export interface ApiKeyContext extends Client {}
+
+/** Optional parameters for the client. */
+export interface ApiKeyClientOptionalParams extends ClientOptions {}
+
+/** Illustrates clients generated with ApiKey authentication. */
+export function createApiKey(
+  credential: KeyCredential,
+  options: ApiKeyClientOptionalParams = {},
+): ApiKeyContext {
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
+
+  const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
+  const userAgentPrefix = prefixFromOptions
+    ? `${prefixFromOptions} azsdk-js-api`
+    : "azsdk-js-api";
+  const { apiVersion: _, ...updatedOptions } = {
+    ...options,
+    userAgentOptions: { userAgentPrefix },
+    loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },
+    credentials: {
+      apiKeyHeaderName: options.credentials?.apiKeyHeaderName ?? "x-ms-api-key",
+    },
+  };
+  const clientContext = getClient(endpointUrl, credential, updatedOptions);
+  clientContext.pipeline.removePolicy({ name: "ApiVersionPolicy" });
+  if (options.apiVersion) {
+    logger.warning(
+      "This client does not support client api-version, please change it at the operation level",
+    );
+  }
+  return clientContext;
+}

packages/typespec-ts/test/modularIntegration/generated/authentication/http/custom/src/api/customContext.ts

@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import { KeyCredential } from "@azure/core-auth";
+import { ClientOptions, Client, getClient } from "@azure-rest/core-client";
+import { logger } from "../logger.js";
+import { isKeyCredential } from "@azure/core-auth";
+
+export interface CustomContext extends Client {}
+
+/** Optional parameters for the client. */
+export interface CustomClientOptionalParams extends ClientOptions {}
+
+/** Illustrates clients generated with generic HTTP auth. */
+export function createCustom(
+  credential: KeyCredential,
+  options: CustomClientOptionalParams = {},
+): CustomContext {
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
+
+  const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
+  const userAgentPrefix = prefixFromOptions
+    ? `${prefixFromOptions} azsdk-js-api`
+    : "azsdk-js-api";
+  const { apiVersion: _, ...updatedOptions } = {
+    ...options,
+    userAgentOptions: { userAgentPrefix },
+    loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },
+  };
+  const clientContext = getClient(endpointUrl, undefined, updatedOptions);
+
+  if (isKeyCredential(credential)) {
+    clientContext.pipeline.addPolicy({
+      name: "customKeyCredentialPolicy",
+      sendRequest(request, next) {
+        request.headers.set(
+          "Authorization",
+          "SharedAccessKey " + credential.key,
+        );
+        return next(request);
+      },
+    });
+  }
+  clientContext.pipeline.removePolicy({ name: "ApiVersionPolicy" });
+  if (options.apiVersion) {
+    logger.warning(
+      "This client does not support client api-version, please change it at the operation level",
+    );
+  }
+  return clientContext;
+}

packages/typespec-ts/test/modularIntegration/generated/authentication/oauth2/src/api/oAuth2Context.ts

@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import { TokenCredential } from "@azure/core-auth";
+import { ClientOptions, Client, getClient } from "@azure-rest/core-client";
+import { logger } from "../logger.js";
+
+export interface OAuth2Context extends Client {}
+
+/** Optional parameters for the client. */
+export interface OAuth2ClientOptionalParams extends ClientOptions {}
+
+/** Illustrates clients generated with OAuth2 authentication. */
+export function createOAuth2(
+  credential: TokenCredential,
+  options: OAuth2ClientOptionalParams = {},
+): OAuth2Context {
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
+
+  const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
+  const userAgentPrefix = prefixFromOptions
+    ? `${prefixFromOptions} azsdk-js-api`
+    : "azsdk-js-api";
+  const { apiVersion: _, ...updatedOptions } = {
+    ...options,
+    userAgentOptions: { userAgentPrefix },
+    loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },
+    credentials: {
+      scopes: options.credentials?.scopes ?? [
+        "https://security.microsoft.com/.default",
+      ],
+    },
+  };
+  const clientContext = getClient(endpointUrl, credential, updatedOptions);
+  clientContext.pipeline.removePolicy({ name: "ApiVersionPolicy" });
+  if (options.apiVersion) {
+    logger.warning(
+      "This client does not support client api-version, please change it at the operation level",
+    );
+  }
+  return clientContext;
+}

packages/typespec-ts/test/modularIntegration/generated/authentication/union/src/api/unionContext.ts

@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import { TokenCredential, KeyCredential } from "@azure/core-auth";
+import { ClientOptions, Client, getClient } from "@azure-rest/core-client";
+import { logger } from "../logger.js";
+
+export interface UnionContext extends Client {}
+
+/** Optional parameters for the client. */
+export interface UnionClientOptionalParams extends ClientOptions {}
+
+/** Illustrates clients generated with ApiKey and OAuth2 authentication. */
+export function createUnion(
+  credential: KeyCredential | TokenCredential,
+  options: UnionClientOptionalParams = {},
+): UnionContext {
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
+
+  const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
+  const userAgentPrefix = prefixFromOptions
+    ? `${prefixFromOptions} azsdk-js-api`
+    : "azsdk-js-api";
+  const { apiVersion: _, ...updatedOptions } = {
+    ...options,
+    userAgentOptions: { userAgentPrefix },
+    loggingOptions: { logger: options.loggingOptions?.logger ?? logger.info },
+    credentials: {
+      scopes: options.credentials?.scopes ?? [
+        "https://security.microsoft.com/.default",
+      ],
+      apiKeyHeaderName: options.credentials?.apiKeyHeaderName ?? "x-ms-api-key",
+    },
+  };
+  const clientContext = getClient(endpointUrl, credential, updatedOptions);
+  clientContext.pipeline.removePolicy({ name: "ApiVersionPolicy" });
+  if (options.apiVersion) {
+    logger.warning(
+      "This client does not support client api-version, please change it at the operation level",
+    );
+  }
+  return clientContext;
+}