@azure-tools/typespec-ts 0.38.3 → 0.38.4-alpha.20250307.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.38.3",
+  "version": "0.38.4-alpha.20250307.2",
   "description": "An experimental TypeSpec emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
@@ -18,14 +18,14 @@
   "license": "MIT",
   "devDependencies": {
     "@azure-rest/core-client": "^2.3.1",
-    "@typespec/http-specs": "0.1.0-alpha.9",
-    "@typespec/spector": "0.1.0-alpha.7",
-    "@typespec/spec-api": "0.1.0-alpha.0",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.6",
-    "@azure-tools/typespec-autorest": ">=0.51.0 <1.0.0",
-    "@azure-tools/typespec-azure-core": ">=0.51.0 <1.0.0",
-    "@azure-tools/typespec-azure-resource-manager": ">=0.51.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.51.3 <1.0.0",
+    "@typespec/http-specs": "0.1.0-alpha.11",
+    "@typespec/spector": "0.1.0-alpha.8",
+    "@typespec/spec-api": "0.1.0-alpha.1",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.7",
+    "@azure-tools/typespec-autorest": ">=0.52.0 <1.0.0",
+    "@azure-tools/typespec-azure-core": ">=0.52.0 <1.0.0",
+    "@azure-tools/typespec-azure-resource-manager": ">=0.52.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.52.0 <1.0.0",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-lro": "^3.1.0",
@@ -40,12 +40,12 @@
     "@types/node": "^18.0.0",
     "@typescript-eslint/eslint-plugin": "^6.8.0",
     "@typescript-eslint/parser": "^6.8.0",
-    "@typespec/compiler": ">=0.65.2 <1.0.0",
-    "@typespec/http": ">=0.65.0 <1.0.0",
-    "@typespec/openapi": ">=0.65.0, <1.0.0",
-    "@typespec/rest": ">=0.65.0 <1.0.0",
+    "@typespec/compiler": ">=0.66.0 <1.0.0",
+    "@typespec/http": ">=0.66.0 <1.0.0",
+    "@typespec/openapi": ">=0.66.0, <1.0.0",
+    "@typespec/rest": ">=0.66.0 <1.0.0",
     "@typespec/ts-http-runtime": "0.1.0",
-    "@typespec/versioning": ">=0.65.0 <1.0.0",
+    "@typespec/versioning": ">=0.66.0 <1.0.0",
     "chai": "^4.3.6",
     "chalk": "^4.0.0",
     "cross-env": "^7.0.3",
@@ -67,15 +67,15 @@
     "js-yaml": "^4.1.0"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": ">=0.51.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.51.3 <1.0.0",
-    "@typespec/compiler": ">=0.65.2 <1.0.0",
-    "@typespec/http": ">=0.65.0 <1.0.0",
-    "@typespec/rest": ">=0.65.0 <1.0.0",
-    "@typespec/versioning": ">=0.65.0 <1.0.0"
+    "@azure-tools/typespec-azure-core": ">=0.52.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.52.0 <1.0.0",
+    "@typespec/compiler": ">=0.66.0 <1.0.0",
+    "@typespec/http": ">=0.66.0 <1.0.0",
+    "@typespec/rest": ">=0.66.0 <1.0.0",
+    "@typespec/versioning": ">=0.66.0 <1.0.0"
   },
   "dependencies": {
-    "@azure-tools/rlc-common": "^0.38.3",
+    "@azure-tools/rlc-common": "0.38.4-alpha.20250307.2",
     "fs-extra": "^11.1.0",
     "lodash": "^4.17.21",
     "prettier": "^3.3.3",
@@ -112,7 +112,7 @@
     "lint:fix": "eslint src --fix --ext .ts",
     "format": "npm run -s prettier -- --write",
     "check-format": "npm run prettier -- --check",
-    "prettier": "prettier --config ./.prettierrc \"src/**/*.ts\"",
+    "prettier": "prettier --config ./.prettierrc \"(src|static|test)/**/*.!(d).ts\"",
     "check:tree": "node --loader ts-node/esm ./test/commands/check-clean-tree.ts",
     "integration-test-ci": "npm-run-all copy:typespec integration-test-ci:rlc integration-test-ci:azure-rlc integration-test-ci:modular integration-test-ci:azure-modular",
     "integration-test-ci:sequential": "npm-run-all --serial copy:typespec integration-test-ci:modular && npm run integration-test-ci:modular",
@@ -144,6 +144,6 @@
     "stop-test-server": "npx tsp-spector server stop",
     "unit-test": "npm-run-all --parallel unit-test:rlc unit-test:modular",
     "unit-test:rlc": "cross-env TS_NODE_PROJECT=tsconfig.json mocha -r ts-node/register --experimental-specifier-resolution=node --experimental-modules=true  --timeout 36000 './test/unit/**/*.spec.ts'",
-    "unit-test:modular": "cross-env TS_NODE_PROJECT=tsconfig.json mocha -r ts-node/register --experimental-specifier-resolution=node --experimental-modules=true  --no-timeout './test/modularUnit/**/*.spec.ts'"
+    "unit-test:modular": "cross-env TS_NODE_PROJECT=tsconfig.test.json mocha -r ts-node/register --experimental-specifier-resolution=node --experimental-modules=true  --no-timeout './test/modularUnit/**/*.spec.ts'"
   }
 }

package/src/index.ts

@@ -14,7 +14,8 @@ import {
   MultipartHelpers,
   PagingHelpers,
   PollingHelpers,
-  SerializationHelpers
+  SerializationHelpers,
+  UrlTemplateHelpers
 } from "./modular/static-helpers-metadata.js";
 import {
   RLCModel,
@@ -121,6 +122,7 @@ export async function $onEmit(context: EmitContext) {
       ...SerializationHelpers,
       ...PagingHelpers,
       ...PollingHelpers,
+      ...UrlTemplateHelpers,
       ...MultipartHelpers
     },
     {
@@ -323,7 +325,7 @@ export async function $onEmit(context: EmitContext) {
       );
     }
     // Enable modular sample generation when explicitly set to true or MPG
-    if (emitterOptions?.generateSample === true) {
+    if (emitterOptions.generateSample === true) {
       const samples = emitSamples(dpgContext);
       // Refine the rlc sample generation logic
       // TODO: remember to remove this out when RLC is splitted from Modular
@@ -498,9 +500,11 @@ export async function createContextWithDefaultOptions(
   context: EmitContext<Record<string, any>>
 ): Promise<SdkContext> {
   const flattenUnionAsEnum =
+    context.options["experimental-extensible-enums"] === undefined &&
     context.options["experimentalExtensibleEnums"] === undefined
       ? isArm(context)
-      : context.options["experimentalExtensibleEnums"];
+      : (context.options["experimental-extensible-enums"] ??
+        context.options["experimentalExtensibleEnums"]);
   const tcgcSettings = {
     "generate-protocol-methods": true,
     "generate-convenience-methods": true,
@@ -525,7 +529,10 @@ export async function createContextWithDefaultOptions(
 
 // TODO: should be removed once tcgc issue is resolved https://github.com/Azure/typespec-azure/issues/1794
 function isArm(context: EmitContext<Record<string, any>>) {
-  const packageName = (context?.options["packageDetails"] ?? {})["name"] ?? "";
+  const packageName =
+    (context?.options["package-details"] ??
+      context?.options["packageDetails"] ??
+      {})["name"] ?? "";
   return packageName?.startsWith("@azure/arm-");
 }
 

package/src/lib.ts

@@ -1,7 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { RLCOptions } from "@azure-tools/rlc-common";
+import {
+  PackageDetails,
+  DependencyInfo,
+  ServiceInfo,
+  PackageFlavor,
+  RLCOptions
+} from "@azure-tools/rlc-common";
 import {
   createTypeSpecLibrary,
   JSONSchemaType,
@@ -10,10 +16,61 @@ import {
 import { Options } from "prettier";
 
 export interface EmitterOptions extends RLCOptions {
+  "include-shortcuts"?: boolean;
+  "multi-client"?: boolean;
+  batch?: any[];
+  "package-details"?: PackageDetails;
+  "add-credentials"?: boolean;
+  /** Three possiblie values:
+   * - undefined, no credentialScopes and relevant settings would be generated
+   * - [], which means we would generate TokenCredential but no credentialScopes and relevant settings
+   * - ["..."], which means we would generate credentialScopes and relevant settings with the given values
+   */
+  "credential-scopes"?: string[];
+  "credential-key-header-name"?: string;
+  "custom-http-auth-header-name"?: string;
+  "custom-http-auth-shared-key-prefix"?: string;
+  /**
+   * Three possible values:
+   * - undefined, the default behavior which means we would generate metadata if the package.json file is absent
+   * - true, which means we would always generate new files or override existing files
+   * - false, which means we would not generate any files no matter there exists or not
+   */
+  "generate-metadata"?: boolean;
+  /**
+   * Three possible values:
+   * - undefined, the default behavior which means we would generate test if there is no `test` folder
+   * - true, which means we would always generate new files or override existing files
+   * - false, which means we would not generate any files no matter there exists or not
+   */
+  "generate-test"?: boolean;
+  "generate-sample"?: boolean;
+  "azure-sdk-for-js"?: boolean;
+  "azure-output-directory"?: string;
+  "is-typespec-test"?: boolean;
+  title?: string;
+  "dependency-info"?: DependencyInfo;
+  "product-doc-link"?: string;
+  "service-info"?: ServiceInfo;
+  "azure-arm"?: boolean;
+  "source-from"?: "TypeSpec" | "Swagger";
+  "is-modular-library"?: boolean;
+  "module-kind"?: "esm" | "cjs";
+  "enable-operation-group"?: boolean;
+  flavor?: PackageFlavor;
+  "enable-model-namespace"?: boolean;
+  "hierarchy-client"?: boolean;
+  "compatibility-mode"?: boolean;
+  "experimental-extensible-enums"?: boolean;
+  "clear-output-folder"?: boolean;
+  "ignore-property-name-normalize"?: boolean;
+  "compatibility-query-multi-format"?: boolean;
   branded?: boolean;
+  "typespec-title-map"?: Record<string, string>;
+  "ignore-enum-member-name-normalize"?: boolean;
 }
 
-export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
+const _RLCOptionsSchema: JSONSchemaType<RLCOptions> = {
   type: "object",
   additionalProperties: true,
   properties: {
@@ -93,6 +150,7 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
     experimentalExtensibleEnums: { type: "boolean", nullable: true },
     clearOutputFolder: { type: "boolean", nullable: true },
     ignorePropertyNameNormalize: { type: "boolean", nullable: true },
+    ignoreEnumMemberNameNormalize: { type: "boolean", nullable: true },
     compatibilityQueryMultiFormat: { type: "boolean", nullable: true },
     typespecTitleMap: {
       type: "object",
@@ -106,6 +164,101 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
   required: []
 };
 
+export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
+  type: "object",
+  additionalProperties: true,
+  properties: {
+    ..._RLCOptionsSchema.properties,
+    "include-shortcuts": { type: "boolean", nullable: true },
+    "multi-client": { type: "boolean", nullable: true },
+    batch: {
+      type: "array",
+      nullable: true,
+      items: {
+        type: "string"
+      }
+    },
+    "package-details": {
+      type: "object",
+      additionalProperties: true,
+      properties: {
+        name: { type: "string", nullable: false },
+        scopeName: { type: "string", nullable: true },
+        nameWithoutScope: { type: "string", nullable: true },
+        description: { type: "string", nullable: true },
+        version: { type: "string", nullable: true }
+      },
+      required: ["name"],
+      nullable: true
+    },
+    "add-credentials": { type: "boolean", nullable: true },
+    "credential-scopes": {
+      type: "array",
+      nullable: true,
+      items: { type: "string" }
+    },
+    "credential-key-header-name": { type: "string", nullable: true },
+    "custom-http-auth-header-name": { type: "string", nullable: true },
+    "custom-http-auth-shared-key-prefix": { type: "string", nullable: true },
+    "generate-metadata": { type: "boolean", nullable: true },
+    "generate-test": { type: "boolean", nullable: true },
+    "generate-sample": { type: "boolean", nullable: true },
+    "azure-sdk-for-js": { type: "boolean", nullable: true },
+    "azure-output-directory": { type: "string", nullable: true },
+    "is-typespec-test": { type: "boolean", nullable: true },
+    title: { type: "string", nullable: true },
+    "dependency-info": {
+      type: "object",
+      additionalProperties: true,
+      properties: {
+        link: { type: "string", nullable: false },
+        description: { type: "string", nullable: false }
+      },
+      required: [],
+      nullable: true
+    },
+    "product-doc-link": { type: "string", nullable: true },
+    "service-info": {
+      type: "object",
+      additionalProperties: true,
+      properties: {
+        title: { type: "string", nullable: true },
+        description: { type: "string", nullable: true }
+      },
+      nullable: true
+    },
+    "azure-arm": { type: "boolean", nullable: true },
+    "source-from": { type: "string", nullable: true },
+    "is-modular-library": { type: "boolean", nullable: true, default: false },
+    "enable-operation-group": { type: "boolean", nullable: true },
+    "enable-model-namespace": { type: "boolean", nullable: true },
+    "hierarchy-client": { type: "boolean", nullable: true },
+    branded: { type: "boolean", nullable: true },
+    flavor: { type: "string", nullable: true },
+    "module-kind": {
+      type: "string",
+      nullable: true,
+      enum: ["esm", "cjs"],
+      default: "esm"
+    },
+    "compatibility-mode": { type: "boolean", nullable: true },
+    "experimental-extensible-enums": { type: "boolean", nullable: true },
+    "clear-output-folder": { type: "boolean", nullable: true },
+    "ignore-property-name-normalize": { type: "boolean", nullable: true },
+    "ignore-enum-member-name-normalize": { type: "boolean", nullable: true },
+    "compatibility-query-multi-format": { type: "boolean", nullable: true },
+    "typespec-title-map": {
+      type: "object",
+      additionalProperties: {
+        type: "string"
+      },
+      required: [],
+      nullable: true
+    }
+  },
+  required: []
+};
+
 const libDef = {
   name: "@azure-tools/typespec-ts",
   diagnostics: {
@@ -229,6 +382,12 @@ const libDef = {
         default: paramMessage`Please note the decimal type will be converted to number. If you strongly care about precision you can use @encode to encode it as a string for the property - ${"propertyName"}.`
       }
     },
+    "use-kebab-case-option": {
+      severity: "warning",
+      messages: {
+        default: paramMessage`The option - ${"camelCaseOption"} is deprecated and please use this kebab-case one - ${"kebabCaseOption"}.`
+      }
+    },
     "unable-serialized-type": {
       severity: "warning",
       messages: {
@@ -288,6 +447,12 @@ const libDef = {
       messages: {
         default: paramMessage`Parameter '${"paramName"}' with type '${"paramType"}' is not supported and we would ignore this parameter.`
       }
+    },
+    "prefix-adding-in-enum-member": {
+      severity: "warning",
+      messages: {
+        default: paramMessage`Enum member name ${"memberName"} is normalized to ${"normalizedName"} with "_" prefix.`
+      }
     }
   },
   emitter: {

package/src/modular/buildClientContext.ts

@@ -266,7 +266,11 @@ function getDocsWithKnownVersion(
   }
   const apiVersionEnum = getApiVersionEnum(dpgContext);
   if (apiVersionEnum) {
-    const [_, knownValuesEnum] = buildEnumTypes(dpgContext, apiVersionEnum);
+    const [_, knownValuesEnum] = buildEnumTypes(
+      dpgContext,
+      apiVersionEnum,
+      true
+    );
     docs.push(
       `Known values of {@link ${knownValuesEnum.name}} that the service accepts.`
     );

package/src/modular/emitModels.ts

@@ -8,7 +8,11 @@ import {
   StructureKind,
   TypeAliasDeclarationStructure
 } from "ts-morph";
-import { NameType, normalizeName } from "@azure-tools/rlc-common";
+import {
+  fixLeadingNumber,
+  NameType,
+  normalizeName
+} from "@azure-tools/rlc-common";
 import {
   SdkArrayType,
   SdkBodyModelPropertyType,
@@ -38,10 +42,6 @@ import { SdkContext } from "../utils/interfaces.js";
 import { addDeclaration } from "../framework/declaration.js";
 import { buildModelDeserializer } from "./serialization/buildDeserializerFunction.js";
 import { buildModelSerializer } from "./serialization/buildSerializerFunction.js";
-import {
-  getTypeExpression,
-  normalizeModelPropertyName
-} from "./type-expressions/get-type-expression.js";
 import path from "path";
 import { refkey } from "../framework/refkey.js";
 import { useContext } from "../contextManager.js";
@@ -54,6 +54,10 @@ import { isExtensibleEnum } from "./type-expressions/get-enum-expression.js";
 import { isDiscriminatedUnion } from "./serialization/serializeUtils.js";
 import { reportDiagnostic } from "../lib.js";
 import { NoTarget } from "@typespec/compiler";
+import {
+  getTypeExpression,
+  normalizeModelPropertyName
+} from "./type-expressions/get-type-expression.js";
 import { emitQueue } from "../framework/hooks/sdkTypes.js";
 import { resolveReference } from "../framework/reference.js";
 import { MultipartHelpers } from "./static-helpers-metadata.js";
@@ -187,7 +191,11 @@ function emitType(context: SdkContext, type: SdkType, sourceFile: SourceFile) {
     if (!(inputUsage || outputUsage || apiVersionEnumOnly || exceptionUsage)) {
       return;
     }
-    const [enumType, knownValuesEnum] = buildEnumTypes(context, type);
+    const [enumType, knownValuesEnum] = buildEnumTypes(
+      context,
+      type,
+      isExtensibleEnum(context, type)
+    );
     if (enumType.name.startsWith("_")) {
       // skip enum generation for internal enums
       return;
@@ -355,13 +363,16 @@ function buildNullableType(context: SdkContext, type: SdkNullableType) {
 
 export function buildEnumTypes(
   context: SdkContext,
-  type: SdkEnumType
+  type: SdkEnumType,
+  reportMemberNameDiagnostic = false // if reportMemberNameDiagnostic is true, it will report diagnostic for enum member name
 ): [TypeAliasDeclarationStructure, EnumDeclarationStructure] {
   const enumDeclaration: EnumDeclarationStructure = {
     kind: StructureKind.Enum,
     name: `Known${normalizeModelName(context, type)}`,
     isExported: true,
-    members: type.values.map(emitEnumMember)
+    members: type.values.map((value) =>
+      emitEnumMember(context, value, reportMemberNameDiagnostic)
+    )
   };
 
   const enumAsUnion: TypeAliasDeclarationStructure = {
@@ -405,10 +416,31 @@ function getExtensibleEnumDescription(model: SdkEnumType): string | undefined {
   ].join(" \n");
 }
 
-function emitEnumMember(member: SdkEnumValueType): EnumMemberStructure {
+function emitEnumMember(
+  context: SdkContext,
+  member: SdkEnumValueType,
+  reportMemberNameDiagnostic = false // if reportMemberNameDiagnostic is true, it will report diagnostic for enum member name
+): EnumMemberStructure {
+  const normalizedMemberName = context.rlcOptions?.ignoreEnumMemberNameNormalize
+    ? fixLeadingNumber(member.name, NameType.EnumMemberName) // need to fix the leading number also for enum member
+    : normalizeName(member.name, NameType.EnumMemberName, true);
+  if (
+    reportMemberNameDiagnostic &&
+    normalizedMemberName.toLowerCase().startsWith("_") &&
+    !member.name.toLowerCase().startsWith("_")
+  ) {
+    reportDiagnostic(context.program, {
+      code: "prefix-adding-in-enum-member",
+      format: {
+        memberName: member.name,
+        normalizedName: normalizedMemberName
+      },
+      target: NoTarget
+    });
+  }
   const memberStructure: EnumMemberStructure = {
     kind: StructureKind.EnumMember,
-    name: member.name,
+    name: normalizedMemberName,
     value: member.value
   };
 

package/src/modular/emitSamples.ts

@@ -192,7 +192,7 @@ function emitMethodSamples(
     if (isPaging) {
       exampleFunctionBody.push(`const resArray = new Array();`);
       exampleFunctionBody.push(
-        `for await (let item of ${methodCall}) { resArray.push(item); }`
+        `for await (const item of ${methodCall}) { resArray.push(item); }`
       );
       exampleFunctionBody.push(`console.log(resArray);`);
     } else if (method.response.type === undefined) {

package/src/modular/helpers/classicalOperationHelpers.ts

@@ -263,11 +263,12 @@ export function getClassicalOperation(
       propertyName?: string;
     }
   ) {
-    return (
+    return normalizeName(
       operationMap.get(declaration) ??
-      declaration.propertyName ??
-      declaration.name ??
-      "FIXME"
+        declaration.propertyName ??
+        declaration.name ??
+        "FIXME",
+      NameType.Method
     );
   }
 }

package/src/modular/helpers/operationHelpers.ts

@@ -4,7 +4,11 @@ import {
   ParameterDeclarationStructure
 } from "ts-morph";
 import { NoTarget, Program } from "@typespec/compiler";
-import { PagingHelpers, PollingHelpers } from "../static-helpers-metadata.js";
+import {
+  PagingHelpers,
+  PollingHelpers,
+  UrlTemplateHelpers
+} from "../static-helpers-metadata.js";
 import {
   getNullableValidType,
   isSpreadBodyParameter,
@@ -55,6 +59,7 @@ import {
   SdkModelPropertyType,
   SdkModelType,
   SdkPagingServiceMethod,
+  SdkPathParameter,
   SdkServiceParameter,
   SdkType
 } from "@azure-tools/typespec-client-generator-core";
@@ -93,6 +98,19 @@ export function getSendPrivateFunction(
     (p) => p.isApiVersionParam && p.onClient && p.kind === "method"
   );
   const statements: string[] = [];
+  let pathStr = `"${operationPath}"`;
+  const urlTemplateParams = [
+    ...getPathParameters(dpgContext, operation),
+    ...getQueryParameters(dpgContext, operation)
+  ];
+  if (urlTemplateParams.length > 0) {
+    statements.push(`const path = ${resolveReference(UrlTemplateHelpers.parseTemplate)}("${operation.operation.uriTemplate}", {
+        ${urlTemplateParams.join(",\n")}
+        },{
+      allowReserved: ${optionalParamName}?.requestOptions?.skipUrlEncoding
+    });`);
+    pathStr = "path";
+  }
   if (hasClientApiVersion && !hasQueryApiVersion) {
     statements.push(
       `context.pipeline.removePolicy({ name: "ClientApiVersionPolicy"});`
@@ -100,11 +118,7 @@ export function getSendPrivateFunction(
   }
 
   statements.push(
-    `return context.path("${operationPath}", ${getPathParameters(
-      dpgContext,
-      operation,
-      optionalParamName
-    )}).${operationMethod}({...${resolveReference(dependencies.operationOptionsToRequestParameters)}(${optionalParamName}), ${getRequestParameters(
+    `return context.path(${pathStr}).${operationMethod}({...${resolveReference(dependencies.operationOptionsToRequestParameters)}(${optionalParamName}), ${getHeaderAndBodyParameters(
       dpgContext,
       operation,
       optionalParamName
@@ -634,7 +648,7 @@ export function getOperationOptionsName(
  * RLC internally. This will translate High Level parameters into the RLC ones.
  * Figuring out what goes in headers, body, path and qsp.
  */
-function getRequestParameters(
+function getHeaderAndBodyParameters(
   dpgContext: SdkContext,
   operation: ServiceOperation,
   optionalParamName: string = "options"
@@ -650,16 +664,15 @@ function getRequestParameters(
     operation.operation.parameters.find(isContentType);
 
   const parametersImplementation: Record<
-    "header" | "query" | "body",
+    "header" | "body",
     { paramMap: string; param: SdkServiceParameter }[]
   > = {
     header: [],
-    query: [],
     body: []
   };
 
   for (const param of operationParameters) {
-    if (param.kind === "header" || param.kind === "query") {
+    if (param.kind === "header") {
       // skip tcgc generated contentType and accept non constant type header parameter
       if (
         param.isGeneratedName &&
@@ -693,12 +706,6 @@ function getRequestParameters(
       )
       .join(",\n")}, ...${optionalParamName}.requestOptions?.headers },`;
   }
-
-  if (parametersImplementation.query.length) {
-    paramStr = `${paramStr}\nqueryParameters: {${parametersImplementation.query
-      .map((i) => i.paramMap)
-      .join(",\n")}},`;
-  }
   if (
     operation.operation.bodyParam === undefined &&
     parametersImplementation.body.length
@@ -977,10 +984,10 @@ function getPathParameters(
   optionalParamName: string = "options"
 ) {
   if (!operation.operation.parameters) {
-    return "";
+    return [];
   }
 
-  let pathParams = "";
+  const pathParams: string[] = [];
   for (const param of operation.operation.parameters) {
     if (param.kind === "path") {
       // Path parameters cannot be optional
@@ -989,21 +996,55 @@ function getPathParameters(
           code: "optional-path-param",
           target: NoTarget,
           format: {
-            paramName: param
+            paramName: (param as SdkPathParameter).name
           }
         });
       }
-      pathParams += `${pathParams !== "" ? "," : ""} ${getPathParamExpr(
-        param,
-        getDefaultValue(param) as string,
-        optionalParamName
-      )}`;
+      pathParams.push(
+        `${param.serializedName}: ${getPathParamExpr(param, getDefaultValue(param) as string, optionalParamName)}`
+      );
     }
   }
 
   return pathParams;
 }
 
+/**
+ * Extract the query parameters
+ */
+function getQueryParameters(
+  dpgContext: SdkContext,
+  operation: ServiceOperation
+): string[] {
+  if (!operation.parameters) {
+    return [];
+  }
+  const operationParameters = operation.operation.parameters.filter(
+    (p) => (!p.onClient || p.isApiVersionParam) && !isContentType(p)
+  );
+  const parametersImplementation: Record<
+    "query",
+    { paramMap: string; param: SdkServiceParameter }[]
+  > = {
+    query: []
+  };
+
+  for (const param of operationParameters) {
+    if (param.kind === "query") {
+      parametersImplementation[param.kind].push({
+        paramMap: getParameterMap(dpgContext, param),
+        param
+      });
+    }
+  }
+
+  const paramStr: string[] = parametersImplementation.query.map(
+    (i) => i.paramMap
+  );
+
+  return paramStr;
+}
+
 function getPathParamExpr(
   param: SdkServiceParameter,
   defaultValue?: string,
@@ -1017,16 +1058,11 @@ function getPathParamExpr(
     : param.optional
       ? `${optionalParamName}["${param.name}"]`
       : param.name;
-  const value = defaultValue
+  return defaultValue
     ? typeof defaultValue === "string"
       ? `${paramName} ?? "${defaultValue}"`
       : `${paramName} ?? ${defaultValue}`
     : paramName;
-  // TODO allowReserved is not supported in Query and Header parameter yet.
-  if (param.kind === "path" && param.allowReserved === true) {
-    return `{value: ${value}, allowReserved: true}`;
-  }
-  return value;
 }
 
 function getNullableCheck(name: string, type: SdkType) {