@azure-tools/typespec-ts 0.38.4 → 0.38.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.38.4",
+  "version": "0.38.5",
   "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.11",
-    "@typespec/spector": "0.1.0-alpha.8",
+    "@typespec/http-specs": "0.1.0-alpha.15",
+    "@typespec/spector": "0.1.0-alpha.9",
     "@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-tools/azure-http-specs": "0.1.0-alpha.10",
+    "@azure-tools/typespec-autorest": ">=0.53.0 <1.0.0",
+    "@azure-tools/typespec-azure-core": ">=0.53.0 <1.0.0",
+    "@azure-tools/typespec-azure-resource-manager": ">=0.53.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.53.1 <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.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/compiler": ">=0.67.1 <1.0.0",
+    "@typespec/http": ">=0.67.1 <1.0.0",
+    "@typespec/openapi": ">=0.67.1 <1.0.0",
+    "@typespec/rest": ">=0.67.1 <1.0.0",
     "@typespec/ts-http-runtime": "0.1.0",
-    "@typespec/versioning": ">=0.66.0 <1.0.0",
+    "@typespec/versioning": ">=0.67.1 <1.0.0",
     "chai": "^4.3.6",
     "chalk": "^4.0.0",
     "cross-env": "^7.0.3",
@@ -57,7 +57,7 @@
     "prettier": "^3.3.3",
     "rimraf": "^5.0.0",
     "ts-node": "~10.9.1",
-    "typescript": "~5.6.2",
+    "typescript": "~5.7.2",
     "vitest": "~1.6.0",
     "@vitest/coverage-v8": "~1.6.0",
     "@vitest/coverage-istanbul": "~1.6.0",
@@ -67,15 +67,15 @@
     "js-yaml": "^4.1.0"
   },
   "peerDependencies": {
-    "@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"
+    "@azure-tools/typespec-azure-core": ">=0.53.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.53.1 <1.0.0",
+    "@typespec/compiler": ">=0.67.1 <1.0.0",
+    "@typespec/http": ">=0.67.1 <1.0.0",
+    "@typespec/rest": ">=0.67.1 <1.0.0",
+    "@typespec/versioning": ">=0.67.1 <1.0.0"
   },
   "dependencies": {
-    "@azure-tools/rlc-common": "^0.38.4",
+    "@azure-tools/rlc-common": "^0.38.5",
     "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,test,static}/**/*.ts\" \"!test/**/generated/**/*.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",
@@ -125,7 +125,7 @@
     "start-test-server:azure-rlc": "mkdirp -p coverage && npx tsp-spector serve ./node_modules/@azure-tools/azure-http-specs/specs ./node_modules/@typespec/http-specs/specs --coverageFile ./coverage/spector-coverage-typescript-rlc-azure.json",
     "start-test-server:modular": "mkdirp -p coverage && npx tsp-spector serve ./node_modules/@typespec/http-specs/specs --port 3002  --coverageFile ./coverage/spector-coverage-typescript-modular-standard.json",
     "start-test-server:azure-modular": "mkdirp -p coverage && npx tsp-spector serve ./node_modules/@azure-tools/azure-http-specs/specs ./node_modules/@typespec/http-specs/specs --port 3002  --coverageFile ./coverage/spector-coverage-typescript-modular-azure.json",
-    "copy:typespec": "rm -rf temp && mkdirp -p temp && cp -r ./node_modules/@typespec/http-specs/* ./temp && cp -r ./node_modules/@azure-tools/azure-http-specs/specs/* ./temp/specs && cp -r ./test/integration/typespec/* ./temp/specs",
+    "copy:typespec": "rm -rf temp && mkdirp -p temp/specs && mkdirp -p temp/assets && cp -r ./node_modules/@typespec/http-specs/specs/* ./temp/specs && cp -r ./node_modules/@azure-tools/azure-http-specs/specs/* ./temp/specs && cp -r ./test/integration/typespec/* ./temp/specs && cp -r ./node_modules/@typespec/http-specs/assets/* ./temp/assets",
     "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:azure-rlc": "npm run generate-tsp-only:azure-rlc && npm run integration-test:alone:azure-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",

package/src/framework/hooks/binder.ts

@@ -10,7 +10,6 @@ import { ReferenceableSymbol } from "../dependency.js";
 import { provideDependencies, useDependencies } from "./useDependencies.js";
 import { refkey } from "../refkey.js";
 import {
-  isStaticHelperMetadata,
   SourceFileSymbol,
   StaticHelperMetadata
 } from "../load-static-helpers.js";
@@ -182,10 +181,13 @@ class BinderImp implements Binder {
     if (typeof fileWhereImportPointsTo === "string") {
       moduleSpecifier = fileWhereImportPointsTo;
     } else {
+      const relative = fileWhereImportIsAdded
+        .getRelativePathTo(fileWhereImportPointsTo)
+        .replace(".ts", ".js");
       moduleSpecifier =
-        fileWhereImportIsAdded.getRelativePathAsModuleSpecifierTo(
-          fileWhereImportPointsTo
-        ) + ".js";
+        relative.startsWith(".") || relative.startsWith("/")
+          ? relative
+          : `./${relative}`;
     }
 
     const importStructures = this.imports.get(fileWhereImportIsAdded) || [];
@@ -265,10 +267,8 @@ class BinderImp implements Binder {
       ...this.staticHelpers
     ]) {
       const placeholderKey = this.serializePlaceholder(declarationKey);
-      if (
-        isStaticHelperMetadata(declaration) &&
-        !countPlaceholderOccurrences(file, placeholderKey)
-      ) {
+      const occurences = countPlaceholderOccurrences(file, placeholderKey);
+      if (!occurences) {
         continue;
       }
 

package/src/index.ts

@@ -48,7 +48,10 @@ import {
   isAzurePackage,
   updatePackageFile,
   buildSampleEnvFile,
-  buildSnippets
+  buildSnippets,
+  buildTsSrcConfig,
+  buildTsSampleConfig,
+  buildTsTestConfig
 } from "@azure-tools/rlc-common";
 import {
   buildRootIndex,
@@ -59,7 +62,7 @@ import { provideContext, useContext } from "./contextManager.js";
 
 import { EmitterOptions } from "./lib.js";
 import { ModularEmitterOptions } from "./modular/interfaces.js";
-import { Project, SourceFile } from "ts-morph";
+import { Project } from "ts-morph";
 import { buildClassicOperationFiles } from "./modular/buildClassicalOperationGroups.js";
 import { buildClassicalClient } from "./modular/buildClassicalClient.js";
 import {
@@ -92,6 +95,7 @@ import { emitSamples } from "./modular/emitSamples.js";
 export * from "./lib.js";
 
 export async function $onEmit(context: EmitContext) {
+  console.time("onEmit");
   if (context.program.compilerOptions.noEmit || context.program.hasError()) {
     return;
   }
@@ -99,7 +103,9 @@ export async function $onEmit(context: EmitContext) {
   const outputProject = new Project();
   const program: Program = context.program;
   const emitterOptions: EmitterOptions = context.options;
+  console.time("onEmit: create context");
   const dpgContext = await createContextWithDefaultOptions(context);
+  console.timeEnd("onEmit: create context");
   // Enrich the dpg context with path detail and common options
   await enrichDpgContext();
   const rlcOptions = dpgContext.rlcOptions ?? {};
@@ -116,6 +122,7 @@ export async function $onEmit(context: EmitContext) {
     compilerContext: context,
     tcgcContext: dpgContext
   });
+  console.time("onEmit: load static helpers");
   const staticHelpers = await loadStaticHelpers(
     outputProject,
     {
@@ -130,6 +137,7 @@ export async function $onEmit(context: EmitContext) {
       options: rlcOptions
     }
   );
+  console.timeEnd("onEmit: load static helpers");
   const extraDependencies = isAzurePackage({ options: rlcOptions })
     ? {
         ...AzurePollingDependencies,
@@ -137,6 +145,7 @@ export async function $onEmit(context: EmitContext) {
         ...AzureIdentityDependencies
       }
     : { ...DefaultCoreDependencies };
+  console.time("onEmit: provide binder");
   const binder = provideBinder(outputProject, {
     staticHelpers,
     dependencies: {
@@ -144,6 +153,7 @@ export async function $onEmit(context: EmitContext) {
     }
   });
   provideSdkTypes(dpgContext);
+  console.timeEnd("onEmit: provide binder");
 
   const rlcCodeModels: RLCModel[] = [];
   let modularEmitterOptions: ModularEmitterOptions;
@@ -151,7 +161,9 @@ export async function $onEmit(context: EmitContext) {
   await clearSrcFolder();
   // 2. Generate RLC code model
   // TODO: skip this step in modular once modular generator is sufficiently decoupled
+  console.time("onEmit: build RLC code models");
   await buildRLCCodeModels();
+  console.timeEnd("onEmit: build RLC code models");
 
   // 4. Generate sources
   if (emitterOptions.isModularLibrary) {
@@ -245,13 +257,13 @@ export async function $onEmit(context: EmitContext) {
   }
 
   async function generateModularSources() {
+    console.time("onEmit: generate modular sources");
     const modularSourcesRoot =
       dpgContext.generationPathDetail?.modularSourcesDir ?? "src";
     const project = useContext("outputProject");
     modularEmitterOptions = transformModularEmitterOptions(
       dpgContext,
       modularSourcesRoot,
-      project,
       {
         casing: "camel"
       }
@@ -268,8 +280,9 @@ export async function $onEmit(context: EmitContext) {
     );
 
     const isMultiClients = dpgContext.sdkPackage.clients.length > 1;
-
+    console.time("onEmit: emit models");
     emitTypes(dpgContext, { sourceRoot: modularSourcesRoot });
+    console.timeEnd("onEmit: emit models");
     buildSubpathIndexFile(
       dpgContext,
       modularEmitterOptions,
@@ -277,6 +290,7 @@ export async function $onEmit(context: EmitContext) {
       undefined,
       { recursive: true }
     );
+    console.time("onEmit: emit source files");
     for (const subClient of dpgContext.sdkPackage.clients) {
       await renameClientName(subClient, modularEmitterOptions);
       buildApiOptions(dpgContext, subClient, modularEmitterOptions);
@@ -288,7 +302,11 @@ export async function $onEmit(context: EmitContext) {
           dpgContext,
           modularEmitterOptions,
           "api",
-          subClient
+          subClient,
+          {
+            exportIndex: false,
+            recursive: true
+          }
         );
       } else {
         buildSubpathIndexFile(
@@ -297,6 +315,7 @@ export async function $onEmit(context: EmitContext) {
           "api",
           subClient,
           {
+            recursive: true,
             exportIndex: true
           }
         );
@@ -324,9 +343,12 @@ export async function $onEmit(context: EmitContext) {
         rootIndexFile
       );
     }
+    console.timeEnd("onEmit: emit source files");
     // Enable modular sample generation when explicitly set to true or MPG
     if (emitterOptions.generateSample === true) {
+      console.time("onEmit: emit samples");
       const samples = emitSamples(dpgContext);
+      console.timeEnd("onEmit: emit samples");
       // Refine the rlc sample generation logic
       // TODO: remember to remove this out when RLC is splitted from Modular
       if (samples.length > 0) {
@@ -334,26 +356,21 @@ export async function $onEmit(context: EmitContext) {
       }
     }
 
+    console.time("onEmit: resolve references");
     binder.resolveAllReferences(modularSourcesRoot);
+    console.timeEnd("onEmit: resolve references");
+
+    console.time("onEmit: generate files");
 
     for (const file of project.getSourceFiles()) {
-      file.fixMissingImports(
-        {},
-        {
-          importModuleSpecifierEnding: "js",
-          importModuleSpecifierPreference: "relative",
-          includePackageJsonAutoImports: "off",
-          excludeLibrarySymbolsInNavTo: true
-        }
-      );
-      await removeUnusedImports(file);
-      file.fixUnusedIdentifiers();
       await emitContentByBuilder(
         program,
         () => ({ content: file.getFullText(), path: file.getFilePath() }),
         modularEmitterOptions as any
       );
     }
+    console.timeEnd("onEmit: generate files");
+    console.timeEnd("onEmit: generate modular sources");
   }
 
   async function generateMetadataAndTest(context: SdkContext) {
@@ -373,6 +390,18 @@ export async function $onEmit(context: EmitContext) {
     const shouldGenerateMetadata =
       option.generateMetadata === true ||
       (option.generateMetadata === undefined && !hasPackageFile);
+    const existingTestFolderPath = join(
+      dpgContext.generationPathDetail?.metadataDir ?? "",
+      "test"
+    );
+    const hasTestFolder = await existsSync(existingTestFolderPath);
+    if (option.azureSdkForJs && option.generateTest === undefined) {
+      if (hasTestFolder) {
+        option.generateTest = false;
+      } else {
+        option.generateTest = true;
+      }
+    }
     if (shouldGenerateMetadata) {
       const commonBuilders = [
         buildRollupConfig,
@@ -381,8 +410,9 @@ export async function $onEmit(context: EmitContext) {
         buildLicenseFile,
         buildSampleEnvFile
       ];
-      if (option.moduleKind === "esm") {
+      if (option.generateTest) {
         commonBuilders.push((model) => buildVitestConfig(model, "node"));
+        commonBuilders.push((model) => buildVitestConfig(model, "esm"));
         commonBuilders.push((model) => buildVitestConfig(model, "browser"));
         commonBuilders.push((model) => buildTsTestBrowserConfig(model));
       }
@@ -411,6 +441,15 @@ export async function $onEmit(context: EmitContext) {
         buildPackageFile(model, modularPackageInfo)
       );
       commonBuilders.push(buildTsConfig);
+      if (option.azureSdkForJs) {
+        commonBuilders.push(buildTsSrcConfig);
+        if (option.generateSample) {
+          commonBuilders.push(buildTsSampleConfig);
+        }
+        if (option.generateTest) {
+          commonBuilders.push(buildTsTestConfig);
+        }
+      }
 
       // TODO: need support snippets generation for multi-client cases. https://github.com/Azure/autorest.typescript/issues/3048
       if (option.generateTest && isAzureFlavor) {
@@ -467,33 +506,7 @@ export async function $onEmit(context: EmitContext) {
       .map((subClient) => getClientContextPath(context, subClient, options))
       .map((path) => path.substring(path.indexOf("src")));
   }
-}
-
-export async function removeUnusedImports(file: SourceFile) {
-  file.getImportDeclarations().map((importDeclaration) => {
-    importDeclaration.getFullText();
-    importDeclaration.getNamedImports().map((namedImport) => {
-      namedImport.getFullText();
-      if (
-        namedImport
-          .getNameNode()
-          .findReferencesAsNodes()
-          .filter((n) => {
-            return n.getSourceFile().getFilePath() === file.getFilePath();
-          }).length === 1
-      ) {
-        namedImport.remove();
-      }
-    });
-    if (importDeclaration.getNamedImports().length === 0) {
-      importDeclaration.remove();
-    }
-  });
-  file.getExportDeclarations().map((exportDeclaration) => {
-    if (exportDeclaration.getNamedExports().length === 0) {
-      exportDeclaration.remove();
-    }
-  });
+  console.timeEnd("onEmit");
 }
 
 export async function createContextWithDefaultOptions(
@@ -508,7 +521,6 @@ export async function createContextWithDefaultOptions(
   const tcgcSettings = {
     "generate-protocol-methods": true,
     "generate-convenience-methods": true,
-    "flatten-union-as-enum": flattenUnionAsEnum,
     emitters: [
       {
         main: "@azure-tools/typespec-ts",
@@ -523,7 +535,10 @@ export async function createContextWithDefaultOptions(
 
   return (await createSdkContext(
     context,
-    context.program.emitters[0]?.metadata.name ?? "@azure-tools/typespec-ts"
+    context.program.emitters[0]?.metadata.name ?? "@azure-tools/typespec-ts",
+    {
+      flattenUnionAsEnum
+    }
   )) as SdkContext;
 }
 

package/src/lib.ts

@@ -68,6 +68,7 @@ export interface EmitterOptions extends RLCOptions {
   branded?: boolean;
   "typespec-title-map"?: Record<string, string>;
   "ignore-enum-member-name-normalize"?: boolean;
+  "default-value-object"?: boolean;
 }
 
 const _RLCOptionsSchema: JSONSchemaType<RLCOptions> = {
@@ -247,6 +248,7 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
     "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 },
+    "default-value-object": { type: "boolean", nullable: true },
     "typespec-title-map": {
       type: "object",
       additionalProperties: {
@@ -453,6 +455,12 @@ const libDef = {
       messages: {
         default: paramMessage`Enum member name ${"memberName"} is normalized to ${"normalizedName"} with "_" prefix.`
       }
+    },
+    "default-value-object": {
+      severity: "warning",
+      messages: {
+        default: paramMessage`Please note the default value is an object type.`
+      }
     }
   },
   emitter: {

package/src/modular/buildClassicalClient.ts

@@ -31,12 +31,15 @@ import {
   SdkServiceOperation
 } from "@azure-tools/typespec-client-generator-core";
 import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
+import { useContext } from "../contextManager.js";
+import { refkey } from "../framework/refkey.js";
 
 export function buildClassicalClient(
   dpgContext: SdkContext,
   client: SdkClientType<SdkServiceOperation>,
   emitterOptions: ModularEmitterOptions
 ) {
+  const project = useContext("outputProject");
   const dependencies = useDependencies();
   const modularClientName = getClientName(client);
   const classicalClientName = `${getClassicalClientName(client)}`;
@@ -53,7 +56,7 @@ export function buildClassicalClient(
     client
   );
 
-  const clientFile = emitterOptions.project.createSourceFile(
+  const clientFile = project.createSourceFile(
     `${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}${normalizeName(
       classicalClientName,
       NameType.File
@@ -121,7 +124,7 @@ export function buildClassicalClient(
   ]);
   constructor.addStatements(`this.pipeline = this._client.pipeline;`);
 
-  buildClientOperationGroups(clientFile, client, dpgContext, clientClass);
+  buildClientOperationGroups(client, dpgContext, clientClass);
   importAllApis(clientFile, srcPath, subfolder ?? "");
   clientFile.fixUnusedIdentifiers();
   return clientFile;
@@ -161,7 +164,7 @@ function generateMethod(
     kind: StructureKind.Method,
     returnType: declarations.returnType,
     parameters: declarations.parameters?.filter((p) => p.name !== "context"),
-    statements: `return ${declarations.name}(${[
+    statements: `return ${resolveReference(refkey(method[1], "api"))}(${[
       "this._client",
       ...[
         declarations.parameters
@@ -173,7 +176,6 @@ function generateMethod(
   return result;
 }
 function buildClientOperationGroups(
-  clientFile: SourceFile,
   client: SdkClientType<SdkServiceOperation>,
   dpgContext: SdkContext,
   clientClass: ClassDeclaration
@@ -186,35 +188,34 @@ function buildClientOperationGroups(
   const methodMap = getMethodHierarchiesMap(dpgContext, client);
   for (const [prefixKey, operations] of methodMap) {
     const prefixes = prefixKey.split("/");
+    const layer = 0;
     if (prefixKey === "") {
       operations.forEach((op) => {
         const method = generateMethod(dpgContext, clientType, [prefixes, op]);
         clientClass.addMethod(method);
       });
     } else {
-      const groupName = normalizeName(prefixes[0] ?? "", NameType.Property);
+      // The `rawGroupName` is used to any places where we need normalized name twice so we need to keep the raw as PascalCase.
+      const rawGroupName = normalizeName(prefixes[0] ?? "", NameType.Interface);
       const operationName = `_get${normalizeName(
-        groupName,
+        rawGroupName,
         NameType.OperationGroup
       )}Operations`;
       const propertyType = `${normalizeName(
-        groupName,
+        rawGroupName,
         NameType.OperationGroup
       )}Operations`;
+      // The `groupName` is used to any places where we don't need normalized name again
+      const groupName = normalizeName(rawGroupName, NameType.Property);
       const existProperty = clientClass.getProperties().filter((p) => {
-        return p.getName() === groupName;
+        return p.getName() === normalizeName(groupName, NameType.Property);
       });
       if (!existProperty || existProperty.length === 0) {
-        clientFile.addImportDeclaration({
-          namedImports: [operationName, propertyType],
-          moduleSpecifier: `./classic/${normalizeName(
-            groupName,
-            NameType.File
-          )}/index.js`
-        });
         clientClass.addProperty({
           name: groupName,
-          type: propertyType,
+          type: resolveReference(
+            refkey(propertyType, layer, "classicOperations")
+          ),
           scope: Scope.Public,
           isReadonly: true,
           docs: ["The operation groups for " + groupName]
@@ -222,10 +223,7 @@ function buildClientOperationGroups(
         clientClass
           .getConstructors()[0]
           ?.addStatements(
-            `this.${groupName} = _get${normalizeName(
-              groupName,
-              NameType.OperationGroup
-            )}Operations(this._client)`
+            `this.${groupName} = ${resolveReference(refkey(operationName, layer, "getClassicOperations"))}(this._client)`
           );
       }
     }

package/src/modular/buildClassicalOperationGroups.ts

@@ -10,6 +10,7 @@ import {
   SdkServiceOperation
 } from "@azure-tools/typespec-client-generator-core";
 import { getModularClientOptions } from "../utils/clientUtils.js";
+import { useContext } from "../contextManager.js";
 
 export function buildClassicOperationFiles(
   dpgContext: SdkContext,
@@ -17,6 +18,7 @@ export function buildClassicOperationFiles(
   emitterOptions: ModularEmitterOptions
 ) {
   // const sdkPackage = dpgContext.sdkPackage;
+  const project = useContext("outputProject");
   const { subfolder } = getModularClientOptions(dpgContext, client);
   const classicOperationFiles: Map<string, SourceFile> = new Map<
     string,
@@ -41,7 +43,7 @@ export function buildClassicOperationFiles(
       const srcPath = emitterOptions.modularOptions.sourceRoot;
       const classicFile =
         classicOperationFiles.get(classicOperationFileName) ??
-        emitterOptions.project.createSourceFile(
+        project.createSourceFile(
           `${srcPath}/${
             subfolder && subfolder !== "" ? subfolder + "/" : ""
           }classic/${classicOperationFileName}.ts`
@@ -50,9 +52,6 @@ export function buildClassicOperationFiles(
         prefixes,
         operations
       ]);
-
-      importApis(dpgContext, classicFile, client, emitterOptions, prefixes);
-      // We need to import the paging helpers and types explicitly because ts-morph may not be able to find them.
       classicOperationFiles.set(classicOperationFileName, classicFile);
     }
   }
@@ -74,7 +73,7 @@ export function buildClassicOperationFiles(
         const srcPath = emitterOptions.modularOptions.sourceRoot;
         const classicFile =
           classicOperationFiles.get(classicOperationFileName) ??
-          emitterOptions.project.createSourceFile(
+          project.createSourceFile(
             `${srcPath}/${
               subfolder && subfolder !== "" ? subfolder + "/" : ""
             }classic/${classicOperationFileName}.ts`
@@ -86,63 +85,9 @@ export function buildClassicOperationFiles(
           [prefixes, operations],
           layer
         );
-        importApis(
-          dpgContext,
-          classicFile,
-          client,
-          emitterOptions,
-          prefixes,
-          layer
-        );
         classicOperationFiles.set(classicOperationFileName, classicFile);
       }
     }
   }
   return classicOperationFiles;
 }
-
-function importApis(
-  context: SdkContext,
-  classicFile: SourceFile,
-  client: SdkClientType<SdkServiceOperation>,
-  emitterOptions: ModularEmitterOptions,
-  prefixes: string[],
-  layer: number = prefixes.length - 1
-) {
-  const { subfolder } = getModularClientOptions(context, client);
-  const classicOperationFileName =
-    prefixes.length > 0 && prefixes[0] !== ""
-      ? `${getClassicalLayerPrefix(prefixes, NameType.File, "/", layer)}/index`
-      : // When the program has no operation groups defined all operations are put
-        // into a nameless operation group. We'll call this operations.
-        "index";
-
-  const srcPath = emitterOptions.modularOptions.sourceRoot;
-  const apiFile = emitterOptions.project.getSourceFile(
-    `${srcPath}/${
-      subfolder && subfolder !== "" ? subfolder + "/" : ""
-    }api/${classicOperationFileName}.ts`
-  );
-
-  if (!apiFile) {
-    return;
-  }
-
-  const exported = [...apiFile.getExportedDeclarations().keys()].filter((e) => {
-    return !e.startsWith("_");
-  });
-
-  const existApiImport = classicFile.getImportDeclarations().filter((i) => {
-    return i
-      .getModuleSpecifierValue()
-      .includes(`../api/${classicOperationFileName}`);
-  })[0];
-  if (exported.length > 0 && !existApiImport) {
-    classicFile.addImportDeclaration({
-      moduleSpecifier: `${"../".repeat(
-        prefixes.length + 1
-      )}api/${classicOperationFileName}.js`,
-      namedImports: exported
-    });
-  }
-}