@azure-tools/typespec-ts 0.27.0 → 0.28.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "An experimental TypeSpec emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
@@ -8,7 +8,7 @@
   "license": "MIT",
   "devDependencies": {
     "@types/chai": "^4.3.1",
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.6",
     "@types/node": "^18.0.0",
     "@types/fs-extra": "^9.0.13",
     "@typescript-eslint/eslint-plugin": "^6.8.0",
@@ -16,7 +16,7 @@
     "chai": "^4.3.6",
     "mkdirp": "^3.0.1",
     "eslint": "^8.9.0",
-    "mocha": "^9.2.2",
+    "mocha": "^10.4.0",
     "rimraf": "^5.0.0",
     "ts-node": "~10.9.1",
     "typescript": "~5.4.5",
@@ -25,7 +25,7 @@
     "@azure-tools/cadl-ranch-expect": "^0.13.3",
     "@azure-tools/cadl-ranch": "^0.12.7",
     "chalk": "^4.0.0",
-    "@azure-rest/core-client": "^1.4.0",
+    "@azure-rest/core-client": "^2.0.0",
     "@azure/core-auth": "^1.6.0",
     "cross-env": "^7.0.3",
     "@azure/core-paging": "^1.5.0",
@@ -36,15 +36,16 @@
     "eslint-plugin-require-extensions": "0.1.3",
     "@typespec/ts-http-runtime": "1.0.0-alpha.20240314.2",
     "@azure-tools/typespec-azure-core": ">=0.41.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": "0.42.0-dev.6",
+    "@azure-tools/typespec-client-generator-core": ">=0.41.5 <1.0.0",
     "@typespec/compiler": ">=0.55.0 <1.0.0",
     "@typespec/http": ">=0.55.0 <1.0.0",
     "@typespec/rest": ">=0.55.0 <1.0.0",
-    "@typespec/versioning": ">=0.55.0 <1.0.0"
+    "@typespec/versioning": ">=0.55.0 <1.0.0",
+    "npm-run-all": "~4.1.5"
   },
   "peerDependencies": {
     "@azure-tools/typespec-azure-core": ">=0.41.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": "0.42.0-dev.6",
+    "@azure-tools/typespec-client-generator-core": ">=0.41.5 <1.0.0",
     "@typespec/compiler": ">=0.55.0 <1.0.0",
     "@typespec/http": ">=0.55.0 <1.0.0",
     "@typespec/rest": ">=0.55.0 <1.0.0",
@@ -53,7 +54,7 @@
   "dependencies": {
     "prettier": "^3.1.0",
     "tslib": "^2.3.1",
-    "@azure-tools/rlc-common": "^0.27.0",
+    "@azure-tools/rlc-common": "^0.28.0",
     "ts-morph": "^15.1.0",
     "fs-extra": "^11.1.0"
   },
@@ -82,27 +83,30 @@
     "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/**/*.ts\"",
     "check:tree": "node --loader ts-node/esm ./test/commands/check-clean-tree.ts",
-    "integration-test-ci": "npm run integration-test-ci:rlc && npm run integration-test-ci:modular && npm run integration-test-ci:non-branded-rlc && npm run integration-test-ci:non-branded-modular",
-    "integration-test-ci:rlc": "npm run start-test-server:rlc & npm run copy:typespec && npm run generate-and-run:rlc && npm run stop-test-server",
-    "integration-test-ci:modular": "npm run start-test-server:modular & npm run copy:typespec && npm run generate-and-run:modular && npm run stop-test-server",
-    "integration-test-ci:non-branded-rlc": "npm run start-test-server:non-branded-rlc & npm run copy:typespec && npm run generate-tsp-only:non-branded-rlc && npm run integration-test:alone:non-branded-rlc && npm run stop-test-server",
-    "integration-test-ci:non-branded-modular": "npm run start-test-server:non-branded-modular & npm run copy:typespec && npm run generate-tsp-only:non-branded-modular && npm run integration-test:alone:non-branded-modular && npm run stop-test-server",
+    "integration-test-ci": "npm-run-all copy:typespec integration-test-ci:rlc integration-test-ci:modular integration-test-ci:non-branded-rlc integration-test-ci:non-branded-modular",
+    "integration-test-ci:sequential": "npm-run-all --serial copy:typespec integration-test-ci:modular && npm run integration-test-ci:modular",
+    "integration-test-ci:rlc": "npm-run-all --silent -p start-test-server:rlc --race generate-and-run:rlc",
+    "integration-test-ci:modular": "npm-run-all --silent -p start-test-server:modular --race generate-and-run:modular",
+    "integration-test-ci:non-branded-rlc": "npm-run-all --silent -p start-test-server:non-branded-rlc --race generate-and-run:non-branded-rlc",
+    "integration-test-ci:non-branded-modular": "npm-run-all --silent -p start-test-server:non-branded-modular --race generate-and-run:non-branded-modular",
     "start-test-server": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http  --coverageFile ./coverage/cadl-ranch-coverage-typescript.json",
-    "start-test-server:rlc": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http  --coverageFile ./coverage/cadl-ranch-coverage-typescript-rlc-azure.json",
-    "start-test-server:modular": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http  --coverageFile ./coverage/cadl-ranch-coverage-typescript-modular-azure.json",
-    "start-test-server:non-branded-rlc": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http  --coverageFile ./coverage/cadl-ranch-coverage-typescript-rlc-standard.json",
-    "start-test-server:non-branded-modular": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http  --coverageFile ./coverage/cadl-ranch-coverage-typescript-modular-standard.json",
+    "start-test-server:rlc": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http --coverageFile ./coverage/cadl-ranch-coverage-typescript-rlc-azure.json",
+    "start-test-server:modular": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http --port 3002  --coverageFile ./coverage/cadl-ranch-coverage-typescript-modular-azure.json",
+    "start-test-server:non-branded-rlc": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http --port 3003  --coverageFile ./coverage/cadl-ranch-coverage-typescript-rlc-standard.json",
+    "start-test-server:non-branded-modular": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http --port 3004  --coverageFile ./coverage/cadl-ranch-coverage-typescript-modular-standard.json",
     "copy:typespec": "rm -rf temp && mkdirp -p temp && cp -r ./node_modules/@azure-tools/cadl-ranch-specs/* ./temp && cp -r ./test/integration/typespec/* ./temp/http",
-    "generate-and-run:rlc": "npm run generate-tsp-only:rlc && npm run integration-test:alone:rlc && npm run stop-test-server",
-    "generate-and-run:modular": "npm run generate-tsp-only:modular && npm run integration-test:alone:modular && npm run stop-test-server",
+    "generate-and-run:rlc": "npm run generate-tsp-only:rlc && npm run integration-test:alone:rlc && npm run stop-test-server -- -p 3000",
+    "generate-and-run:modular": "npm run generate-tsp-only:modular && npm run integration-test:alone:modular && npm run stop-test-server -- -p 3002",
+    "generate-and-run:non-branded-rlc": "npm run generate-tsp-only:non-branded-rlc && npm run integration-test:alone:non-branded-rlc && npm run stop-test-server -- -p 3003",
+    "generate-and-run:non-branded-modular": "npm run generate-tsp-only:non-branded-modular && npm run integration-test:alone:non-branded-modular && npm run stop-test-server -- -p 3004",
     "generate-tsp-only": "npm run generate-tsp-only:rlc && npm run generate-tsp-only:modular && npm run generate-tsp-only:non-branded-rlc && npm run generate-tsp-only:non-branded-modular",
-    "generate-tsp-only:rlc": "node --loader ts-node/esm ./test/commands/gen-cadl-ranch.ts --tag=rlc",
-    "generate-tsp-only:modular": "node --loader ts-node/esm ./test/commands/gen-cadl-ranch.ts --tag=modular",
+    "generate-tsp-only:rlc": "node ./test/commands/gen-cadl-ranch.js --tag=rlc",
+    "generate-tsp-only:modular": "node ./test/commands/gen-cadl-ranch.js --tag=modular",
     "generate-tsp-only:non-branded": "npm run generate-tsp-only:non-branded-rlc && npm run generate-tsp-only:non-branded-modular",
-    "generate-tsp-only:non-branded-rlc": "node --loader ts-node/esm ./test/commands/gen-cadl-ranch.ts --tag=non-branded-rlc",
-    "generate-tsp-only:non-branded-modular": "node --loader ts-node/esm ./test/commands/gen-cadl-ranch.ts --tag=non-branded-modular",
+    "generate-tsp-only:non-branded-rlc": "node ./test/commands/gen-cadl-ranch.js --tag=non-branded-rlc",
+    "generate-tsp-only:non-branded-modular": "node ./test/commands/gen-cadl-ranch.js --tag=non-branded-modular",
     "regen-test-baselines": "npm run generate-tsp-only && npm run generate-tsp-only:non-branded",
     "integration-test:alone": "npm run integration-test:alone:rlc && npm run integration-test:alone:modular",
     "integration-test:alone:rlc": "cross-env TS_NODE_PROJECT=tsconfig.integration.json mocha -r ts-node/register --experimental-specifier-resolution=node --timeout 36000 ./test/integration/*.spec.ts",
@@ -110,7 +114,7 @@
     "integration-test:alone:non-branded-rlc": "cross-env TS_NODE_PROJECT=tsconfig.integration.json mocha -r ts-node/register --experimental-specifier-resolution=node --timeout 36000 ./test/nonBrandedIntegration/rlc/*.spec.ts",
     "integration-test:alone:non-branded-modular": "cross-env TS_NODE_PROJECT=tsconfig.integration.json mocha -r ts-node/register --experimental-specifier-resolution=node --timeout 36000 ./test/nonBrandedIntegration/modular/*.spec.ts",
     "stop-test-server": "npx cadl-ranch server stop",
-    "unit-test": "npm run unit-test:rlc && npm run unit-test:modular",
+    "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'"
   }

package/src/index.ts

@@ -37,7 +37,7 @@ import {
 import { transformRLCModel } from "./transform/transform.js";
 import { emitContentByBuilder, emitModels } from "./utils/emitUtil.js";
 import { createSdkContext } from "@azure-tools/typespec-client-generator-core";
-import { Project, SyntaxKind } from "ts-morph";
+import { Project } from "ts-morph";
 import { buildClientContext } from "./modular/buildClientContext.js";
 import { emitCodeModel } from "./modular/buildCodeModel.js";
 import {
@@ -211,48 +211,44 @@ export async function $onEmit(context: EmitContext) {
 
       const isMultiClients = modularCodeModel.clients.length > 1;
       for (const subClient of modularCodeModel.clients) {
-        buildModels(modularCodeModel, subClient);
-        buildModelsOptions(modularCodeModel, subClient);
+        buildModels(subClient, modularCodeModel);
+        buildModelsOptions(subClient, modularCodeModel);
         const hasClientUnexpectedHelper =
           needUnexpectedHelper.get(subClient.rlcClientName) ?? false;
         buildSerializeUtils(modularCodeModel);
-        buildPagingTypes(modularCodeModel, subClient);
+        buildPagingTypes(subClient, modularCodeModel);
         buildModularPagingHelpers(
-          modularCodeModel,
           subClient,
+          modularCodeModel,
           hasClientUnexpectedHelper,
           isMultiClients
         );
         buildOperationFiles(
+          subClient,
           dpgContext,
           modularCodeModel,
-          subClient,
           hasClientUnexpectedHelper
         );
-        buildClientContext(dpgContext, modularCodeModel, subClient);
-        buildSubpathIndexFile(modularCodeModel, subClient, "models");
+        buildClientContext(subClient, dpgContext, modularCodeModel);
+        buildSubpathIndexFile(subClient, modularCodeModel, "models");
         if (dpgContext.rlcOptions?.hierarchyClient) {
-          buildSubpathIndexFile(modularCodeModel, subClient, "api");
+          buildSubpathIndexFile(subClient, modularCodeModel, "api");
         } else {
-          buildSubpathIndexFile(modularCodeModel, subClient, "api", {
+          buildSubpathIndexFile(subClient, modularCodeModel, "api", {
             exportIndex: true
           });
         }
 
-        buildClassicalClient(dpgContext, modularCodeModel, subClient);
+        buildClassicalClient(subClient, dpgContext, modularCodeModel);
         buildClassicOperationFiles(modularCodeModel, subClient);
-        buildSubpathIndexFile(modularCodeModel, subClient, "classic", {
+        buildSubpathIndexFile(subClient, modularCodeModel, "classic", {
           exportIndex: true,
           interfaceOnly: true
         });
         if (isMultiClients) {
-          buildSubClientIndexFile(modularCodeModel, subClient);
+          buildSubClientIndexFile(subClient, modularCodeModel);
         }
-        buildRootIndex(modularCodeModel, subClient, rootIndexFile);
-      }
-
-      if (!emitterOptions.generateOrphanModels) {
-        removeUnusedInterfaces(project);
+        buildRootIndex(subClient, modularCodeModel, rootIndexFile);
       }
 
       for (const file of project.getSourceFiles()) {
@@ -337,87 +333,3 @@ export async function $onEmit(context: EmitContext) {
     }
   }
 }
-
-/**
- * Removing this for now, as it has some problem when we have two models with the same name and only one of them is unused, this function will end up removing the other used models.
- */
-export function removeUnusedInterfaces(project: Project) {
-  const allInterfaces = project.getSourceFiles().flatMap((file) =>
-    file.getInterfaces().map((interfaceDeclaration) => {
-      return { interfaceDeclaration, filepath: file.getFilePath() };
-    })
-  );
-
-  const unusedInterfaces = allInterfaces.filter((interfaceDeclaration) => {
-    const references = interfaceDeclaration.interfaceDeclaration
-      .findReferencesAsNodes()
-      .filter((node) => {
-        const kind = node.getParent()?.getKind();
-        return (
-          kind !== SyntaxKind.ExportSpecifier &&
-          kind !== SyntaxKind.InterfaceDeclaration
-        );
-      });
-    return references.length === 0;
-  });
-
-  unusedInterfaces.forEach((interfaceDeclaration) => {
-    const references = interfaceDeclaration.interfaceDeclaration
-      .findReferencesAsNodes()
-      .filter((node) => {
-        const kind = node.getParent()?.getKind();
-        return kind === SyntaxKind.ExportSpecifier;
-      });
-    const map = new Map<string, string>();
-    references.forEach((node) => {
-      const exportPath = node.getSourceFile().getFilePath();
-      map.set(exportPath, node.getText());
-    });
-
-    // Get the index.ts file
-    const indexFiles = project.getSourceFiles().filter((file) => {
-      return file.getFilePath().endsWith("index.ts");
-    }); // Adjust the path to your index.ts file
-    // to make sure the top level index file is in the last
-    const sortedIndexFiles = indexFiles.sort((idx1, idx2) => {
-      return (
-        idx2.getFilePath().split("/").length -
-        idx1.getFilePath().split("/").length
-      );
-    });
-
-    const matchAliasNodes: string[] = [];
-    for (const indexFile of sortedIndexFiles) {
-      const filepath = indexFile.getFilePath();
-      if (map.has(filepath)) {
-        // Get all export declarations
-        const exportDeclarations = indexFile.getExportDeclarations();
-
-        // Iterate over each export declaration
-        exportDeclarations.forEach((exportDeclaration) => {
-          // Find named exports that match the unused interface
-          const matchingExports = exportDeclaration
-            .getNamedExports()
-            .filter((ne) => {
-              const aliasNode = ne.getAliasNode();
-              if (
-                aliasNode &&
-                aliasNode.getText() !== map.get(filepath) &&
-                ne.getName() === map.get(filepath)
-              ) {
-                matchAliasNodes.push(aliasNode.getText());
-              }
-              return (
-                matchAliasNodes.indexOf(ne.getName()) > -1 ||
-                ne.getName() === map.get(filepath) ||
-                ne.getAliasNode()?.getText() === map.get(filepath)
-              );
-            });
-          // Remove the matching exports
-          matchingExports.forEach((me) => me.remove());
-        });
-      }
-    }
-    interfaceDeclaration.interfaceDeclaration.remove();
-  });
-}

package/src/lib.ts

@@ -11,7 +11,6 @@ import { Options } from "prettier";
 
 export interface EmitterOptions extends RLCOptions {
   branded?: boolean;
-  generateOrphanModels?: boolean;
 }
 
 export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
@@ -84,7 +83,6 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
     hierarchyClient: { type: "boolean", nullable: true },
     branded: { type: "boolean", nullable: true },
     flavor: { type: "string", nullable: true },
-    generateOrphanModels: { type: "boolean", nullable: true },
     moduleKind: {
       type: "string",
       nullable: true,

package/src/modular/buildClassicalClient.ts

@@ -23,9 +23,9 @@ import { getOperationFunction } from "./helpers/operationHelpers.js";
 import { getImportSpecifier } from "@azure-tools/rlc-common";
 
 export function buildClassicalClient(
+  client: Client,
   dpgContext: SdkContext,
-  codeModel: ModularCodeModel,
-  client: Client
+  codeModel: ModularCodeModel
 ) {
   const { description } = client;
   const modularClientName = getClientName(client);

package/src/modular/buildClientContext.ts

@@ -20,9 +20,9 @@ import { getType } from "./helpers/typeHelpers.js";
  * This function creates the file containing the modular client context
  */
 export function buildClientContext(
+  client: Client,
   dpgContext: SdkContext,
-  codeModel: ModularCodeModel,
-  client: Client
+  codeModel: ModularCodeModel
 ): SourceFile {
   const { description, subfolder } = client;
   const name = getClientName(client);

package/src/modular/buildCodeModel.ts

@@ -314,6 +314,7 @@ function processModelProperties(
     // because it's impossible to have a anonymous model as the polymorphic base in typespec
     // the only possibility is the anonymous model is an alias for an union type which has already been taken care of in the combined types.
     if (newValue.name) {
+      newValue.name = normalizeName(newValue.name, NameType.Interface);
       discriminatorInfo?.aliases.push(`${newValue.name}`);
       newValue.alias = `${newValue.name}`;
       newValue.name = `${newValue.name}Union`;
@@ -529,7 +530,7 @@ function emitParameter(
       clientDefaultValue = defaultApiVersion.value;
     }
     if (!clientDefaultValue) {
-      clientDefaultValue = getDefaultApiVersionString(context.program, context);
+      clientDefaultValue = getDefaultApiVersionString(context);
     }
     if (clientDefaultValue !== undefined) {
       paramMap.optional = true;
@@ -1108,9 +1109,10 @@ function emitEnum(context: SdkContext, type: Enum): Record<string, any> {
 
   return {
     type: "enum",
-    name: getLibraryName(context, type)
-      ? getLibraryName(context, type)
-      : type.name,
+    name: normalizeName(
+      getLibraryName(context, type) ? getLibraryName(context, type) : type.name,
+      NameType.Interface
+    ),
     description: getDocStr(program, type),
     valueType: { type: enumMemberType(type.members.values().next().value) },
     values: enumValues,
@@ -1399,10 +1401,13 @@ function emitUnion(
       }
       return valueType;
     });
+    const unionTypeName = unionName
+      ? normalizeName(unionName, NameType.Interface)
+      : undefined;
     return {
       nullable: sdkType.nullable,
-      name: unionName,
-      description: `Type of ${unionName}`,
+      name: unionTypeName,
+      description: `Type of ${unionTypeName}`,
       internal: true,
       type: "combined",
       types: variantTypes,
@@ -1417,11 +1422,14 @@ function emitUnion(
           : variantTypes.map((x) => getTypeName(x).name).join(" | ")
     };
   } else if (sdkType.kind === "enum") {
-    const typeName = getLibraryName(context, type)
+    let typeName = getLibraryName(context, type)
       ? getLibraryName(context, type)
       : sdkType.isGeneratedName
         ? type.name
         : sdkType.name;
+    typeName = typeName
+      ? normalizeName(typeName, NameType.Interface)
+      : undefined;
     return {
       name: typeName,
       nullable: sdkType.nullable,

package/src/modular/buildOperations.ts

@@ -23,9 +23,9 @@ import {
  * file called operations.ts where all operations are generated.
  */
 export function buildOperationFiles(
+  client: Client,
   dpgContext: SdkContext,
   codeModel: ModularCodeModel,
-  client: Client,
   needUnexpectedHelper: boolean = true
 ) {
   const operationFiles = [];

package/src/modular/buildPagingFiles.ts

@@ -5,7 +5,7 @@ import {
   isPagingOperation
 } from "./helpers/operationHelpers.js";
 
-export function buildPagingTypes(codeModel: ModularCodeModel, client: Client) {
+export function buildPagingTypes(client: Client, codeModel: ModularCodeModel) {
   if (!hasPagingOperation(client)) {
     return;
   }
@@ -112,8 +112,8 @@ export function buildPagingTypes(codeModel: ModularCodeModel, client: Client) {
 }
 
 export function buildPagingHelpers(
-  codeModel: ModularCodeModel,
   client: Client,
+  codeModel: ModularCodeModel,
   needUnexpectedHelper: boolean = true,
   isMultiClients: boolean = false
 ) {

package/src/modular/buildProjectFiles.ts

@@ -331,11 +331,12 @@ function emitBrandedPackage(codeModel: ModularCodeModel) {
       });
     }
     packageInfo.scripts["build"] =
-      "npm run clean && tsc -p . && dev-tool run bundle && mkdirp ./review && api-extractor run --local";
+      "npm run clean && tsc -p . && dev-tool run bundle && mkdirp ./review && dev-tool run extract-api";
     packageInfo.scripts["build:debug"] =
-      "tsc -p . && dev-tool run bundle && api-extractor run --local";
+      "tsc -p . && dev-tool run bundle && dev-tool run extract-api";
     packageInfo.scripts["build:browser"] = "tsc -p . && dev-tool run bundle";
     packageInfo.scripts["build:node"] = "tsc -p . && dev-tool run bundle";
+    packageInfo.scripts["extract-api"] = "dev-tool run extract-api";
     packageInfo.devDependencies["@azure/dev-tool"] = "^1.0.0";
     packageInfo.devDependencies["@azure/eslint-plugin-azure-sdk"] = "^3.0.0";
     // azsdkjs repo use dev-tool to run vendored prettier
@@ -380,7 +381,7 @@ function emitBrandedPackage(codeModel: ModularCodeModel) {
     packageInfo.devDependencies["karma-source-map-support"] = "~1.4.0";
     packageInfo.devDependencies["karma-sourcemap-loader"] = "^0.4.0";
     packageInfo.devDependencies["karma"] = "^6.2.0";
-    packageInfo.devDependencies["c8"] = "^8.0.0";
+    packageInfo.devDependencies["nyc"] = "^15.1.0";
     packageInfo.devDependencies["source-map-support"] = "^0.5.9";
     packageInfo.devDependencies["ts-node"] = "^10.0.0";
     packageInfo.scripts["test"] =

package/src/modular/buildRootIndex.ts

@@ -4,8 +4,8 @@ import { Client, ModularCodeModel } from "./modularCodeModel.js";
 import { normalizeName, NameType } from "@azure-tools/rlc-common";
 
 export function buildRootIndex(
-  codeModel: ModularCodeModel,
   client: Client,
+  codeModel: ModularCodeModel,
   rootIndexFile: SourceFile
 ) {
   const { project } = codeModel;
@@ -101,8 +101,8 @@ function exportModules(
 }
 
 export function buildSubClientIndexFile(
-  codeModel: ModularCodeModel,
-  client: Client
+  client: Client,
+  codeModel: ModularCodeModel
 ) {
   const subfolder = client.subfolder ?? "";
   const srcPath = codeModel.modularOptions.sourceRoot;

package/src/modular/buildSubpathIndex.ts

@@ -7,8 +7,8 @@ export interface buildSubpathIndexFileOptions {
 }
 
 export function buildSubpathIndexFile(
-  codeModel: ModularCodeModel,
   client: Client,
+  codeModel: ModularCodeModel,
   subpath: string,
   options: buildSubpathIndexFileOptions = {}
 ) {

package/src/modular/emitModels.ts

@@ -137,8 +137,8 @@ export function buildModelInterface(
  * This function creates the file containing all the models defined in TypeSpec
  */
 export function buildModels(
-  codeModel: ModularCodeModel,
-  subClient: Client
+  subClient: Client,
+  codeModel: ModularCodeModel
 ): SourceFile | undefined {
   // We are generating both models and enums here
   const coreClientTypes = new Set<string>();
@@ -201,8 +201,8 @@ export function buildModelTypeAlias(model: Type) {
 }
 
 export function buildModelsOptions(
-  codeModel: ModularCodeModel,
-  client: Client
+  client: Client,
+  codeModel: ModularCodeModel
 ) {
   const modelOptionsFile = codeModel.project.createSourceFile(
     path.join(

package/src/modular/helpers/classicalOperationHelpers.ts

@@ -22,13 +22,19 @@ export function getClassicalOperation(
     .filter((i) => {
       return (
         i.getModuleSpecifierValue() ===
-        `${"../".repeat(layer + 2)}api/${normalizeName(modularClientName, NameType.File)}.js`
+        `${"../".repeat(layer + 2)}api/${normalizeName(
+          modularClientName,
+          NameType.File
+        )}.js`
       );
     });
   if (!hasClientContextImport || hasClientContextImport.length === 0) {
     classicFile.addImportDeclaration({
       namedImports: [client.rlcClientName],
-      moduleSpecifier: `${"../".repeat(layer + 2)}api/${normalizeName(modularClientName, NameType.File)}.js`
+      moduleSpecifier: `${"../".repeat(layer + 2)}api/${normalizeName(
+        modularClientName,
+        NameType.File
+      )}.js`
     });
   }
 

package/src/modular/helpers/operationHelpers.ts

@@ -502,12 +502,12 @@ function buildBodyParameter(
     return bodyParameter.optional
       ? `body: typeof ${bodyParameter.clientName} === 'string'
     ? uint8ArrayToString(${bodyParameter.clientName}, "${getEncodingFormat(
-      bodyParameter.type
+      bodyParameter
     )}")
     : ${bodyParameter.clientName}`
       : `body: uint8ArrayToString(${
           bodyParameter.clientName
-        }, "${getEncodingFormat(bodyParameter.type)}")`;
+        }, "${getEncodingFormat(bodyParameter)}")`;
   } else if (bodyParameter.isBinaryPayload) {
     return `\nbody: ${bodyParameter.clientName},`;
   }

package/src/modular/modularCodeModel.ts

@@ -40,6 +40,7 @@ export interface BodyParameter {
   restApiName: string;
   location: "body";
   optional: boolean;
+  format?: string;
   description: string;
   clientName: string;
   inOverload: boolean;

package/src/transform/transform.ts

@@ -63,17 +63,17 @@ export async function transformRLCModel(
   );
   const importSet = initInternalImports();
   const urlInfo = transformUrlInfo(client, dpgContext, importSet);
-  const paths: Paths = transformPaths(program, client, dpgContext);
-  const schemas: Schema[] = transformSchemas(program, client, dpgContext);
+  const paths: Paths = transformPaths(client, dpgContext, importSet);
+  const schemas: Schema[] = transformSchemas(client, dpgContext);
   const responses: OperationResponse[] = transformToResponseTypes(
-    importSet,
     client,
-    dpgContext
+    dpgContext,
+    importSet
   );
   const parameters: OperationParameter[] = transformToParameterTypes(
-    importSet,
     client,
     dpgContext,
+    importSet,
     urlInfo?.apiVersionInfo
   );
   const helperDetails = transformHelperFunctionDetails(
@@ -84,7 +84,7 @@ export async function transformRLCModel(
   // Enrich client-level annotation detail
   helperDetails.clientLroOverload = getClientLroOverload(paths);
 
-  const telemetryOptions = transformTelemetryInfo(dpgContext, client);
+  const telemetryOptions = transformTelemetryInfo(client, dpgContext);
   const model: RLCModel = {
     srcPath,
     libraryName,

package/src/transform/transformApiVersionInfo.ts

@@ -26,14 +26,13 @@ export function transformApiVersionInfo(
   dpgContext: SdkContext,
   urlInfo?: UrlInfo
 ): ApiVersionInfo | undefined {
-  const program = dpgContext.program;
   const queryVersionDetail = getOperationApiVersion(client, dpgContext);
   const pathVersionDetail = extractPathApiVersion(urlInfo);
   const isCrossedVersion =
     pathVersionDetail?.isCrossedVersion || queryVersionDetail?.isCrossedVersion;
   const defaultValue =
     (pathVersionDetail || queryVersionDetail) && !isCrossedVersion
-      ? getDefaultApiVersionString(program, dpgContext) ??
+      ? getDefaultApiVersionString(dpgContext) ??
         pathVersionDetail?.defaultValue ??
         queryVersionDetail?.defaultValue
       : undefined;

package/src/transform/transformHelperFunctionDetails.ts

@@ -22,11 +22,7 @@ export function transformHelperFunctionDetails(
   flavor?: PackageFlavor
 ): HelperFunctionDetails {
   const program = dpgContext.program;
-  const serializeInfo = extractSpecialSerializeInfo(
-    program,
-    client,
-    dpgContext
-  );
+  const serializeInfo = extractSpecialSerializeInfo(client, dpgContext);
   // Disbale paging and long running for non-Azure clients.
   if (flavor !== "azure") {
     return {
@@ -38,9 +34,9 @@ export function transformHelperFunctionDetails(
 
   // Extract paged metadata from Azure.Core.Page
   const annotationDetails = {
-    hasLongRunning: hasPollingOperations(program, client, dpgContext)
+    hasLongRunning: hasPollingOperations(client, dpgContext)
   };
-  const details = extractPageDetailFromCore(program, client, dpgContext);
+  const details = extractPageDetailFromCore(client, dpgContext);
   if (details) {
     return {
       ...details,
@@ -110,12 +106,9 @@ export function getPageable(
   return program.stateMap(pageableOperationsKey).get(entity);
 }
 
-function extractPageDetailFromCore(
-  program: Program,
-  client: SdkClient,
-  dpgContext: SdkContext
-) {
-  if (!hasPagingOperations(program, client, dpgContext)) {
+function extractPageDetailFromCore(client: SdkClient, dpgContext: SdkContext) {
+  const program = dpgContext.program;
+  if (!hasPagingOperations(client, dpgContext)) {
     return;
   }
   const nextLinks = new Set<string>();
@@ -179,10 +172,10 @@ function extractPageDetailFromCore(
 }
 
 function extractSpecialSerializeInfo(
-  program: Program,
   client: SdkClient,
   dpgContext: SdkContext
 ) {
+  const program = dpgContext.program;
   let hasMultiCollection = false;
   let hasPipeCollection = false;
   let hasTsvCollection = false;