@azure-tools/typespec-ts 0.48.1 → 0.49.0-alpha.20260202.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.48.1",
+  "version": "0.49.0-alpha.20260202.1",
   "description": "An experimental TypeSpec emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
@@ -18,15 +18,15 @@
   "license": "MIT",
   "devDependencies": {
     "@azure-rest/core-client": "^2.3.1",
-    "@typespec/http-specs": "0.1.0-alpha.31-dev.1",
-    "@typespec/spector": "0.1.0-alpha.23-dev.0",
+    "@typespec/http-specs": "0.1.0-alpha.32-dev.1",
+    "@typespec/spector": "0.1.0-alpha.23-dev.1",
     "@typespec/spec-api": "0.1.0-alpha.13-dev.0",
     "@typespec/tspd": "0.73.3",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.37-dev.0",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.37-dev.1",
     "@azure-tools/typespec-autorest": "^0.64.0",
     "@azure-tools/typespec-azure-core": "^0.64.0",
     "@azure-tools/typespec-azure-resource-manager": "^0.64.0",
-    "@azure-tools/typespec-client-generator-core": "^0.64.1",
+    "@azure-tools/typespec-client-generator-core": "^0.64.4",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-lro": "^3.1.0",
@@ -65,7 +65,7 @@
   },
   "peerDependencies": {
     "@azure-tools/typespec-azure-core": "^0.64.0",
-    "@azure-tools/typespec-client-generator-core": "^0.64.1",
+    "@azure-tools/typespec-client-generator-core": "^0.64.4",
     "@typespec/compiler": "^1.8.0",
     "@typespec/http": "^1.8.0",
     "@typespec/rest": "^0.78.0",
@@ -73,7 +73,7 @@
     "@typespec/xml": "^0.78.0"
   },
   "dependencies": {
-    "@azure-tools/rlc-common": "^0.48.1",
+    "@azure-tools/rlc-common": "0.49.0-alpha.20260202.1",
     "fast-xml-parser": "^4.5.0",
     "fs-extra": "^11.1.0",
     "lodash": "^4.17.21",

package/src/modular/buildClientContext.ts

@@ -81,8 +81,7 @@ export function buildClientContext(
   // Get all client parameters (both required and optional) for the interface
   const requiredInterfaceProperties = getClientParameters(client, dpgContext, {
     onClientOnly: false,
-    requiredOnly: true,
-    apiVersionAsRequired: true
+    requiredOnly: true
   })
     .filter((p) => {
       const clientParamName = getClientParameterName(p);
@@ -239,7 +238,7 @@ export function buildClientContext(
       `);
   }
 
-  let apiVersionPolicyStatement = `clientContext.pipeline.removePolicy({ name: "ApiVersionPolicy" });`;
+  let apiVersionStatement = ``;
   const endpointParameter = getClientParameters(client, dpgContext, {
     onClientOnly: false,
     requiredOnly: true,
@@ -255,39 +254,20 @@ export function buildClientContext(
     const apiVersionInEndpoint =
       templateArguments && templateArguments.find((p) => p.isApiVersionParam);
     if (!apiVersionInEndpoint && apiVersionParam.clientDefaultValue) {
-      apiVersionPolicyStatement += `const ${apiVersionParamName} = options.${apiVersionParamName} ?? "${apiVersionParam.clientDefaultValue}";`;
-    }
-
-    if (apiVersionParam.kind === "method") {
-      apiVersionPolicyStatement += `
-      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=\${${getClientParameterName(apiVersionParam)}}\`;
-          }
-    
-          return next(req);
-        },
-      });`;
+      apiVersionStatement += `const ${apiVersionParamName} = options.${apiVersionParamName};`;
     }
   } else if (isAzurePackage(emitterOptions)) {
-    apiVersionPolicyStatement += `
+    apiVersionStatement += `
         if (options.apiVersion) {
           logger.warning("This client does not support client api-version, please change it at the operation level");
         }`;
   } else {
-    apiVersionPolicyStatement += `
+    apiVersionStatement += `
         if (options.apiVersion) {
           console.warn("This client does not support client api-version, please change it at the operation level");
         }`;
   }
-  factoryFunction.addStatements(apiVersionPolicyStatement);
+  factoryFunction.addStatements(apiVersionStatement);
 
   const contextRequiredParam = requiredParams.filter(
     (p) =>

package/src/modular/buildOperations.ts

@@ -84,7 +84,6 @@ export function buildOperationFiles(
       );
       const sendOperationDeclaration = getSendPrivateFunction(
         dpgContext,
-        client,
         [prefixes, op],
         clientType
       );

package/src/modular/buildRestorePoller.ts

@@ -111,6 +111,7 @@ export function buildRestorePoller(
           \`Please ensure the operation is in this client! We can't find its deserializeHelper for \${sourceOperation?.name}.\`
         );
       }
+      const apiVersion = getApiVersionFromUrl(initialRequestUrl);
       return ${resolveReference(PollingHelpers.GetLongRunningPoller)}(
         (client as any)["_client"] ?? client,
         deserializeHelper as (result: TResponse) => Promise<TResult>,
@@ -120,7 +121,8 @@ export function buildRestorePoller(
           abortSignal: options?.abortSignal,
           resourceLocationConfig,
           restoreFrom: serializedState,
-          initialRequestUrl
+          initialRequestUrl,
+          apiVersion,
         }
       );
     }
@@ -209,7 +211,12 @@ export function buildRestorePoller(
     function getPathFromMapKey(mapKey: string): string {
       const pathStart = mapKey.indexOf("/");
       return mapKey.slice(pathStart);
-    }      
+    }
+    
+    function getApiVersionFromUrl(urlStr: string): string | undefined {
+      const url = new URL(urlStr);
+      return url.searchParams.get("api-version") ?? undefined;
+    }
   `;
   restorePollerFile.addStatements(restorePollerHelperContent);
 }

package/src/modular/emitSamples.ts

@@ -38,7 +38,12 @@ import {
   ServiceOperation
 } from "../utils/operationUtil.js";
 import { getSubscriptionId } from "../transform/transfromRLCOptions.js";
-import { getClientParametersDeclaration } from "./helpers/clientHelpers.js";
+import {
+  getClientParametersDeclaration,
+  getClientParameters,
+  hasDefaultValue,
+  getClientParameterName
+} from "./helpers/clientHelpers.js";
 import { getOperationFunction } from "./helpers/operationHelpers.js";
 import { ModelOverrideOptions } from "./serialization/serializeUtils.js";
 
@@ -298,6 +303,12 @@ function prepareExampleParameters(
   // TODO: blocked by TCGC issue: https://github.com/Azure/typespec-azure/issues/1419
   // refine this to support generic client-level parameters once resolved
   const result: ExampleValue[] = [];
+
+  // Get the raw SDK parameters to check for default values
+  const rawClientParams = getClientParameters(topLevelClient, dpgContext, {
+    onClientOnly: true
+  });
+
   const clientParams = getClientParametersDeclaration(
     topLevelClient,
     dpgContext,
@@ -306,11 +317,27 @@ function prepareExampleParameters(
     }
   );
 
+  // Helper to check if a parameter has a default value
+  const hasParamDefaultValue = (paramName: string) => {
+    const rawParam = rawClientParams.find((p) => {
+      return getClientParameterName(p) === paramName;
+    });
+
+    if (!rawParam) return false;
+
+    return hasDefaultValue(rawParam);
+  };
+
   for (const param of clientParams) {
     if (param.name === "options" || param.name === "credential") {
       continue;
     }
 
+    // Skip parameters that have default values - they are truly optional
+    if (hasParamDefaultValue(param.name)) {
+      continue;
+    }
+
     const exampleValue: ExampleValue = {
       name: param.name === "endpointParam" ? "endpoint" : param.name,
       value: getEnvironmentVariableName(
@@ -517,6 +544,7 @@ function getParameterValue(
   switch (value.kind) {
     case "string": {
       switch (value.type.kind) {
+        case "plainDate":
         case "utcDateTime":
           retValue = `new Date("${value.value}")`;
           break;

package/src/modular/helpers/clientHelpers.ts

@@ -40,6 +40,28 @@ type SdkParameter =
   | SdkCredentialParameter
   | SdkHttpParameter;
 
+export function hasDefaultValue(p: SdkParameter) {
+  if (
+    p.clientDefaultValue ||
+    p.__raw?.defaultValue ||
+    p.type.kind === "constant"
+  ) {
+    return true;
+  }
+
+  // Special case for endpoint parameters with template arguments that have default values
+  if (p.type.kind === "endpoint" && p.type.templateArguments[0]) {
+    const templateArg = p.type.templateArguments[0];
+    return !!(
+      templateArg.clientDefaultValue ||
+      templateArg.__raw?.defaultValue ||
+      templateArg.type?.kind === "constant"
+    );
+  }
+
+  return false;
+}
+
 export function getClientParameters(
   client: SdkClientType<SdkServiceOperation>,
   dpgContext: SdkContext,
@@ -70,19 +92,15 @@ export function getClientParameters(
     }
   }
 
-  const hasDefaultValue = (p: SdkParameter) =>
-    p.clientDefaultValue || p.__raw?.defaultValue || p.type.kind === "constant";
   const isRequired = (p: SdkParameter) =>
     // Special case: when apiVersionAsRequired is true, apiVersion should always be considered required
     (options.apiVersionAsRequired && p.isApiVersionParam) ||
-    (!p.optional &&
-      !hasDefaultValue(p) &&
-      !(
-        p.type.kind === "endpoint" &&
-        p.type.templateArguments[0] &&
-        hasDefaultValue(p.type.templateArguments[0])
-      ));
-  const isOptional = (p: SdkParameter) => p.optional || hasDefaultValue(p);
+    (!p.optional && !hasDefaultValue(p));
+  const isOptional = (p: SdkParameter) =>
+    p.optional ||
+    p.clientDefaultValue ||
+    p.__raw?.defaultValue ||
+    p.type.kind === "constant";
   const skipCredentials = (p: SdkParameter) => p.kind !== "credential";
   const skipMethodParam = (p: SdkParameter) => p.kind !== "method";
   const armSpecific = (p: SdkParameter) =>

package/src/modular/helpers/operationHelpers.ts

@@ -70,7 +70,6 @@ import {
   isHttpMetadata,
   isReadOnly,
   SdkBodyParameter,
-  SdkClientType,
   SdkConstantType,
   SdkEnumType,
   SdkHttpOperation,
@@ -90,7 +89,6 @@ import { isExtensibleEnum } from "../type-expressions/get-enum-expression.js";
 
 export function getSendPrivateFunction(
   dpgContext: SdkContext,
-  client: SdkClientType<SdkHttpOperation>,
   method: [string[], ServiceOperation],
   clientType: string
 ): OptionalKind<FunctionDeclarationStructure> {
@@ -114,12 +112,6 @@ export function getSendPrivateFunction(
   const operationPath = operation.operation.path;
   const operationMethod = operation.operation.verb.toLowerCase();
   const optionalParamName = getOptionalParamsName(parameters);
-  const hasQueryApiVersion = operation.operation.parameters.some(
-    (p) => p.onClient && p.kind === "query" && p.isApiVersionParam
-  );
-  const hasClientApiVersion = client.clientInitialization.parameters.some(
-    (p) => p.isApiVersionParam && p.onClient && p.kind === "method"
-  );
   const statements: string[] = [];
   let pathStr = `"${operationPath}"`;
   const urlTemplateParams = [
@@ -134,11 +126,6 @@ export function getSendPrivateFunction(
     });`);
     pathStr = "path";
   }
-  if (hasClientApiVersion && !hasQueryApiVersion) {
-    statements.push(
-      `context.pipeline.removePolicy({ name: "ClientApiVersionPolicy"});`
-    );
-  }
 
   statements.push(
     `return context.path(${pathStr}).${operationMethod}({...${resolveReference(dependencies.operationOptionsToRequestParameters)}(${optionalParamName}), ${getHeaderAndBodyParameters(
@@ -684,9 +671,11 @@ function getLroOnlyOperationFunction(
   const resourceLocationConfig =
     lroMetadata?.finalStateVia &&
     allowedFinalLocation.includes(lroMetadata?.finalStateVia)
-      ? `resourceLocationConfig: "${lroMetadata?.finalStateVia}"`
+      ? `resourceLocationConfig: "${lroMetadata?.finalStateVia}",`
       : "";
+  const apiVersion = getApiVersionExpression(operation);
   const statements: string[] = [];
+
   statements.push(`
 
   return ${getLongRunningPollerReference}(context, _${name}Deserialize, ${getExpectedStatuses(
@@ -698,6 +687,7 @@ function getLroOnlyOperationFunction(
       .map((p) => p.name)
       .join(", ")}),
     ${resourceLocationConfig}
+    ${apiVersion ? `apiVersion: ${apiVersion}` : ""}
   }) as ${pollerLikeReference}<${operationStateReference}<${
     returnType.type
   }>, ${returnType.type}>;
@@ -725,6 +715,9 @@ function getLroAndPagingOperationFunction(
 
   const returnType = buildLroPagingReturnType(context, operation);
 
+  // Get apiVersion expression for both LRO poller and paging options
+  const apiVersion = getApiVersionExpression(operation);
+
   // Build paging options from metadata
   const pagingOptions = [
     operation.response.resultSegments &&
@@ -732,7 +725,8 @@ function getLroAndPagingOperationFunction(
     operation.pagingMetadata.nextLinkSegments &&
       `nextLinkName: "${operation.pagingMetadata.nextLinkSegments.map((p) => p.name).join(".")}"`,
     operation.pagingMetadata.nextLinkVerb !== "GET" &&
-      `nextLinkMethod: "${operation.pagingMetadata.nextLinkVerb}"`
+      `nextLinkMethod: "${operation.pagingMetadata.nextLinkVerb}"`,
+    apiVersion && `apiVersion: ${apiVersion}`
   ].filter(Boolean);
 
   // Build LRO resource location config
@@ -745,7 +739,7 @@ function getLroAndPagingOperationFunction(
   const resourceLocationConfig =
     operation.lroMetadata?.finalStateVia &&
     allowedLocations.includes(operation.lroMetadata.finalStateVia)
-      ? `resourceLocationConfig: "${operation.lroMetadata.finalStateVia}"`
+      ? `resourceLocationConfig: "${operation.lroMetadata.finalStateVia}",`
       : "";
 
   // Resolve references
@@ -784,6 +778,7 @@ function getLroAndPagingOperationFunction(
     abortSignal: ${optionalParamName}?.abortSignal,
     getInitialResponse: () => _${name}Send(${paramList}),
     ${resourceLocationConfig}
+    ${apiVersion ? `apiVersion: ${apiVersion}` : ""}
   }) as ${refs.pollerLike}<${refs.operationState}<${refs.pathResponse}>, ${refs.pathResponse}>;
   
   return ${refs.buildPaging}(
@@ -887,6 +882,8 @@ function getPagingOnlyOperationFunction(
   // Check for nextLinkVerb from TCGC pagingMetadata (supports @Legacy.nextLinkVerb decorator)
   const nextLinkMethod = operation.pagingMetadata.nextLinkVerb;
 
+  const apiVersion = getApiVersionExpression(operation);
+
   if (itemName) {
     options.push(`itemName: "${itemName}"`);
   }
@@ -896,6 +893,9 @@ function getPagingOnlyOperationFunction(
   if (nextLinkMethod && nextLinkMethod !== "GET") {
     options.push(`nextLinkMethod: "${nextLinkMethod}"`);
   }
+  if (apiVersion) {
+    options.push(`apiVersion: ${apiVersion}`);
+  }
   statements.push(
     `return ${buildPagedAsyncIteratorReference}(
       context, 
@@ -1151,6 +1151,11 @@ export function getParameterMap(
     return `"${serializedName}": ${getConstantValue(param.type)}`;
   }
 
+  // Special case for api-version parameters with default values
+  if (param.isApiVersionParam && param.clientDefaultValue) {
+    return `"${serializedName}": ${param.onClient ? "context." : ""}${param.name} ?? "${param.clientDefaultValue}"`;
+  }
+
   if (hasCollectionFormatInfo(param.kind, (param as any).collectionFormat)) {
     return getCollectionFormatForParam(
       context,
@@ -1722,6 +1727,9 @@ export function serializeRequestValue(
       ? `!${clientValue}? ${clientValue}: `
       : "";
   switch (type.kind) {
+    case "plainDate":
+      // plainDate always uses ISO8601 format (YYYY-MM-DD)
+      return `${nullOrUndefinedPrefix}${clientValue}.toISOString().split('T')[0]`;
     case "utcDateTime":
       switch (type.encode ?? format) {
         case "rfc7231":
@@ -1849,6 +1857,9 @@ export function deserializeResponseValue(
       ? `!${restValue}? ${restValue}: `
       : "";
   switch (type.kind) {
+    case "plainDate":
+      // plainDate deserializes from YYYY-MM-DD string to Date
+      return `${nullOrUndefinedPrefix} new Date(${restValue})`;
     case "utcDateTime":
       return `${nullOrUndefinedPrefix} new Date(${type.encode === "unixTimestamp" ? `${restValue} * 1000` : restValue})`;
     case "array": {
@@ -2088,3 +2099,24 @@ export function getExpectedStatuses(operation: ServiceOperation): string {
 
   return `[${statusCodes.map((x) => `"${x}"`).join(", ")}]`;
 }
+
+/**
+ * Gets the apiVersion expression with default value fallback for query parameters.
+ * @param operation - The operation to get the apiVersion parameter from
+ * @returns The apiVersion expression string, or undefined if no apiVersion query param exists
+ */
+function getApiVersionExpression(
+  operation: ServiceOperation
+): string | undefined {
+  const queryApiVersionParam = operation.operation.parameters.find(
+    (p) => p.kind === "query" && p.isApiVersionParam
+  );
+  if (!queryApiVersionParam) {
+    return undefined;
+  }
+  const paramAccess = `${queryApiVersionParam.onClient ? "context." : ""}${queryApiVersionParam.name}`;
+  const defaultValueSuffix = queryApiVersionParam.clientDefaultValue
+    ? ` ?? "${queryApiVersionParam.clientDefaultValue}"`
+    : "";
+  return `${paramAccess}${defaultValueSuffix}`;
+}

package/src/modular/helpers/typeHelpers.ts

@@ -78,7 +78,7 @@ const NumericTypeKinds = [
   "decimal128"
 ];
 
-const DateTimeTypeKinds = ["plainDate", "plainTime"];
+const DateTimeTypeKinds = ["plainTime"];
 
 // This may be a good candidate to move to TCGC
 export function isNumericTypeKind(kind: string): boolean {

package/src/modular/serialization/buildDeserializerFunction.ts

@@ -178,7 +178,11 @@ function buildPolymorphicDeserializer(
 
   const subTypes = type.discriminatedSubtypes;
   if (!subTypes) {
-    return;
+    // No subtypes - treat as a regular model and generate simple deserializer
+    return buildModelTypeDeserializer(context, type, {
+      nameOnly,
+      skipDiscriminatedUnionSuffix: false
+    });
   }
 
   const cases: string[] = [];

package/src/modular/serialization/buildSerializerFunction.ts

@@ -184,7 +184,11 @@ function buildPolymorphicSerializer(
 
   const subTypes = type.discriminatedSubtypes;
   if (!subTypes) {
-    return;
+    // No subtypes - treat as a regular model and generate simple serializer
+    return buildModelTypeSerializer(context, type, {
+      nameOnly,
+      skipDiscriminatedUnionSuffix: false
+    });
   }
 
   const cases: string[] = [];

package/src/modular/serialization/serializeUtils.ts

@@ -81,6 +81,7 @@ export function isSpecialUnionVariant(
 
   if (
     t.kind === "utcDateTime" ||
+    t.kind === "plainDate" ||
     t.kind === "bytes" ||
     (t.kind === "model" &&
       t.properties

package/src/modular/type-expressions/get-type-expression.ts

@@ -62,7 +62,6 @@ export function getTypeExpression(
       }
       return "number";
     case "endpoint":
-    case "plainDate":
     case "plainTime":
     case "string":
     case "url":
@@ -103,6 +102,7 @@ export function getTypeExpression(
     case "union":
       return getUnionExpression(context, type, options);
     case "utcDateTime":
+    case "plainDate":
       return "Date";
 
     default:

package/src/transform/transformPaths.ts

@@ -96,7 +96,7 @@ function transformOperation(
         responseTypes,
         operationGroupName
       ),
-      isPaging: isPagingOperation(program, route)
+      isPaging: isPagingOperation(dpgContext, route)
     }
   };
   if (

package/src/utils/modelUtils.ts

@@ -1187,7 +1187,7 @@ function getSchemaForArrayModel(
               .join(" | ");
           }
         }
-      } else if (schema.items.type.includes("|")) {
+      } else if (schema.items?.type?.includes("|")) {
         schema.typeName = `(${schema.items.type})[]`;
       } else {
         schema.typeName = `${schema.items.type}[]`;
@@ -1326,6 +1326,10 @@ function getSchemaForStdScalar(
         type: "number",
         format: "safeint"
       });
+    case "numeric":
+      return applyIntrinsicDecorators(program, type, {
+        type: "number"
+      });
     case "uint8":
       return applyIntrinsicDecorators(program, type, {
         type: "number",

package/src/utils/operationUtil.ts

@@ -15,6 +15,7 @@ import {
 } from "@azure-tools/rlc-common";
 import { getLroMetadata } from "@azure-tools/typespec-azure-core";
 import {
+  getDisablePageable,
   getHttpOperationWithCache,
   getWireName,
   InitializedByFlags,
@@ -424,7 +425,15 @@ export function extractPageDetails(
   return undefined;
 }
 
-export function isPagingOperation(program: Program, operation: HttpOperation) {
+export function isPagingOperation(
+  dpgContext: SdkContext,
+  operation: HttpOperation
+) {
+  const { program } = dpgContext;
+  if (getDisablePageable(dpgContext, operation.operation)) {
+    return false;
+  }
+
   return extractPageDetails(program, operation) !== undefined;
 }
 
@@ -471,14 +480,13 @@ function findRootSourceProperty(property: ModelProperty): ModelProperty {
 }
 
 export function hasPagingOperations(client: SdkClient, dpgContext: SdkContext) {
-  const program = dpgContext.program;
   for (const op of listOperationsUnderRLCClient(client)) {
     const route = getHttpOperationWithCache(dpgContext, op);
     // ignore overload base operation
     if (route.overloads && route.overloads?.length > 0) {
       continue;
     }
-    if (isPagingOperation(program, route)) {
+    if (isPagingOperation(dpgContext, route)) {
       return true;
     }
   }

package/static/static-helpers/pagingHelpers.ts

@@ -91,6 +91,7 @@ export interface BuildPagedAsyncIteratorOptions {
   itemName?: string;
   nextLinkName?: string;
   nextLinkMethod?: "GET" | "POST";
+  apiVersion?: string;
 }
 
 /**
@@ -111,14 +112,21 @@ export function buildPagedAsyncIterator<
   const itemName = options.itemName ?? "value";
   const nextLinkName = options.nextLinkName ?? "nextLink";
   const nextLinkMethod = options.nextLinkMethod ?? "GET";
+  const apiVersion = options.apiVersion;
   const pagedResult: PagedResult<TElement, TPage, TPageSettings> = {
     getPage: async (pageLink?: string) => {
-      const result =
-        pageLink === undefined
-          ? await getInitialResponse()
-          : nextLinkMethod === "POST"
-            ? await client.pathUnchecked(pageLink).post()
-            : await client.pathUnchecked(pageLink).get();
+      let result;
+      if (pageLink === undefined) {
+        result = await getInitialResponse();
+      } else {
+        const resolvedPageLink = apiVersion
+          ? addApiVersionToUrl(pageLink, apiVersion)
+          : pageLink;
+        result =
+          nextLinkMethod === "POST"
+            ? await client.pathUnchecked(resolvedPageLink).post()
+            : await client.pathUnchecked(resolvedPageLink).get();
+      }
       checkPagingRequest(result, expectedStatuses);
       const results = await processResponseBody(result as TResponse);
       const nextLink = getNextLink(results, nextLinkName);
@@ -273,3 +281,21 @@ function checkPagingRequest(
     );
   }
 }
+
+/**
+ * Adds the api-version query parameter on a URL if it's not present.
+ * @param url - the URL to modify
+ * @param apiVersion - the API version to set
+ * @returns - the URL with the api-version query parameter set
+ */
+function addApiVersionToUrl(url: string, apiVersion: string): string {
+  // The base URL is only used for parsing and won't appear in the returned URL
+  const urlObj = new URL(url, "https://microsoft.com");
+  if (!urlObj.searchParams.get("api-version")) {
+    // Append one if there is no apiVersion
+    return `${url}${
+      Array.from(urlObj.searchParams.keys()).length > 0 ? "&" : "?"
+    }api-version=${apiVersion}`;
+  }
+  return url;
+}