@azure-tools/typespec-ts 0.56.0-dev.8 → 0.56.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.56.0-dev.8",
+  "version": "0.56.0",
   "description": "A TypeSpec emitter for TypeScript",
   "main": "dist/src/index.js",
   "type": "module",
@@ -17,50 +17,53 @@
   "author": "Jose Heredia <joheredi@microsoft.com>",
   "license": "MIT",
   "devDependencies": {
-    "@azure-rest/core-client": "^2.3.1",
-    "@typespec/http-specs": "^0.1.0-alpha.38 || >=0.1.0-alpha.39-dev <0.1.0-alpha.39",
-    "@typespec/spector": "^0.1.0-alpha.25 || >=0.1.0-alpha.26-dev <0.1.0-alpha.26",
-    "@typespec/spec-api": "^0.1.0-alpha.14 || >=0.1.0-alpha.15-dev <0.1.0-alpha.15",
-    "@typespec/tspd": "^0.75.0 || >=0.76.0-dev <0.76.0",
-    "@azure-tools/azure-http-specs": "^0.1.0-alpha.42 || >=0.1.0-alpha.43-dev <0.1.0-alpha.43",
-    "@azure-tools/typespec-autorest": "^0.69.1 || >=0.70.0-dev <0.70.0",
-    "@azure-tools/typespec-azure-core": "^0.69.0 || >=0.70.0-dev <0.70.0",
-    "@azure-tools/typespec-azure-resource-manager": "^0.69.1 || >=0.70.0-dev <0.70.0",
-    "@azure-tools/typespec-client-generator-core": "^0.69.1 || >=0.70.0-dev <0.70.0",
+    "@azure-rest/core-client": "^2.7.0",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-lro": "^3.1.0",
     "@azure/core-paging": "^1.5.0",
-    "@azure/core-rest-pipeline": "^1.14.0",
+    "@azure/core-rest-pipeline": "^1.24.0",
     "@azure/core-util": "^1.4.0",
     "@azure/logger": "^1.0.4",
-    "@typespec/compiler": "^1.13.0",
-    "@typespec/http": "^1.13.0",
-    "@typespec/openapi": "^1.13.0",
-    "@typespec/rest": "^0.83.0 || >=0.84.0-dev <0.84.0",
-    "@typespec/versioning": "^0.83.0 || >=0.84.0-dev <0.84.0",
-    "@typespec/xml": "^0.83.0 || >=0.84.0-dev <0.84.0",
-    "@typespec/ts-http-runtime": "0.3.6",
+    "@typespec/ts-http-runtime": "0.3.7",
     "cross-env": "^10.1.0",
-    "concurrently": "^10.0.0",
+    "concurrently": "^10.0.4",
     "vitest": "^4.1.3",
-    "vite": "^8.0.8",
+    "vite": "^8.1.2",
     "@vitest/coverage-v8": "^4.1.3",
     "@microsoft/api-extractor": "^7.58.1",
-    "yaml": "^2.8.3"
+    "@types/pluralize": "^0.0.33",
+    "yaml": "^2.8.3",
+    "@azure-tools/spector-runner": "^0.1.0",
+    "@typespec/spector": "^0.1.0-alpha.28",
+    "@typespec/http-specs": "^0.1.0-alpha.41",
+    "@typespec/spec-api": "^0.1.0-alpha.16",
+    "@azure-tools/azure-http-specs": "^0.1.0-alpha.44",
+    "@typespec/tspd": "^0.77.0",
+    "@azure-tools/typespec-azure-core": "^0.71.0",
+    "@azure-tools/typespec-client-generator-core": "^0.71.0",
+    "@azure-tools/typespec-autorest": "^0.71.0",
+    "@typespec/compiler": "^1.15.0",
+    "@typespec/http": "^1.15.0",
+    "@typespec/openapi": "^1.15.0",
+    "@azure-tools/typespec-azure-resource-manager": "^0.71.0",
+    "@typespec/versioning": "^0.85.0",
+    "@typespec/xml": "^0.85.0",
+    "@typespec/rest": "^0.85.0"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": "^0.69.0 || >=0.70.0-dev <0.70.0",
-    "@azure-tools/typespec-client-generator-core": "^0.69.1 || >=0.70.0-dev <0.70.0",
-    "@typespec/compiler": "^1.13.0",
-    "@typespec/http": "^1.13.0",
-    "@typespec/rest": "^0.83.0 || >=0.84.0-dev <0.84.0",
-    "@typespec/versioning": "^0.83.0 || >=0.84.0-dev <0.84.0",
-    "@typespec/xml": "^0.83.0 || >=0.84.0-dev <0.84.0"
+    "@azure-tools/typespec-azure-core": "^0.71.0",
+    "@typespec/compiler": "^1.15.0",
+    "@typespec/http": "^1.15.0",
+    "@azure-tools/typespec-client-generator-core": "^0.71.0",
+    "@typespec/rest": "^0.85.0",
+    "@typespec/versioning": "^0.85.0",
+    "@typespec/xml": "^0.85.0"
   },
   "dependencies": {
-    "fast-xml-parser": "^5.7.0",
-    "prettier": "^3.8.1",
+    "fast-xml-parser": "^5.10.1",
+    "pluralize": "^8.0.0",
+    "prettier": "^3.9.5",
     "ts-morph": "^23.0.0",
     "tslib": "^2.3.1"
   },
@@ -85,23 +88,23 @@
     "test-next:coverage": "vitest run --project test-next --coverage",
     "clean": "rimraf ./dist ./typespec-output",
     "build": "tsc -p .",
-    "test": "npm run test-next && npm run unit-test && npm run integration-test-ci",
-    "lint": "eslint . --ext .ts --max-warnings=0",
-    "lint:fix": "eslint . --fix --ext .ts",
+    "test": "pnpm test-next && pnpm unit-test && pnpm integration-test-ci",
+    "lint": "oxlint . --deny-warnings",
+    "lint:fix": "oxlint . --fix",
     "check:tree": "node ./test/commands/check-clean-tree.ts",
-    "integration-test-ci": "npm run copy:typespec && npm run spector-test",
-    "spector-test": "concurrently --kill-others --success first \"npm:start-test-server\" \"npm:generate-and-run\"",
+    "integration-test-ci": "pnpm copy:typespec && pnpm spector-test",
+    "spector-test": "concurrently --kill-others --success first \"pnpm start-test-server\" \"pnpm generate-and-run\"",
     "start-test-server": "node ./test/commands/start-test-server.js",
     "copy:typespec": "node ./test/commands/copy-typespec.ts",
-    "generate-and-run": "npm run generate-tsp-only:client && concurrently --kill-others-on-fail \"npm:integration-test:alone\" \"npm:generate-tsp-only:declarations\" && npm run stop-test-server -- -p 3002",
+    "generate-and-run": "pnpm generate-tsp-only:client && concurrently --kill-others-on-fail \"pnpm integration-test:alone\" \"pnpm generate-tsp-only:declarations\" && pnpm stop-test-server",
     "generate-tsp-only": "node ./test/commands/gen-spector.js",
     "generate-tsp-only:client": "node ./test/commands/gen-spector.js --phase=client",
     "generate-tsp-only:declarations": "node ./test/commands/gen-spector.js --phase=declarations",
-    "regen-test-baselines": "npm run generate-tsp-only",
+    "regen-test-baselines": "pnpm generate-tsp-only",
     "integration-test:alone": "vitest run --project integration-azure-modular",
-    "stop-test-server": "npx tsp-spector server stop",
+    "stop-test-server": "pnpm exec tsp-spector server stop -p 3002",
     "unit-test": "cross-env NODE_OPTIONS=--max-old-space-size=1024 vitest run --project unit-modular",
     "gen:scenario-suites": "node ./test/commands/gen-scenario-suites.ts",
-    "regen-docs": "npm run build && tspd doc . --enable-experimental --output-dir ../../website/src/content/docs/docs/emitters/clients/typespec-ts/reference --skip-js"
+    "regen-docs": "pnpm build && tspd doc . --enable-experimental --output-dir ../../website/src/content/docs/docs/emitters/clients/typespec-ts/reference --skip-js"
   }
 }

package/src/context-manager.ts

@@ -1,10 +1,10 @@
-import { SdkContext } from "@azure-tools/typespec-client-generator-core";
-import { EmitContext } from "@typespec/compiler";
+import type { SdkContext } from "@azure-tools/typespec-client-generator-core";
+import type { EmitContext } from "@typespec/compiler";
 import { Project, SourceFile } from "ts-morph";
-import { ExternalDependencies } from "./framework/dependency.js";
-import { Binder } from "./framework/hooks/binder.js";
-import { SdkTypeContext } from "./framework/hooks/sdk-types.js";
-import { ClientTypeMetaTree } from "./meta-tree.js";
+import type { ExternalDependencies } from "./framework/dependency.js";
+import type { Binder } from "./framework/hooks/binder.js";
+import type { SdkTypeContext } from "./framework/hooks/sdk-types.js";
+import type { ClientTypeMetaTree } from "./meta-tree.js";
 
 /**
  * Contexts Object Guidelines
@@ -72,6 +72,19 @@ class ContextManager {
   public getContext<K extends ContextKey>(key: K): Contexts[K] | undefined {
     return this.contexts.get(key) as Contexts[K] | undefined;
   }
+
+  /**
+   * Clears all stored contexts.
+   *
+   * The manager is a process-wide singleton, so the values provided during an
+   * emit (the `EmitContext`/`Program`, the TCGC `SdkContext`, the ts-morph
+   * `Project`, etc.) stay reachable from this map until the next emit overwrites
+   * them. Clearing at the end of an emit lets the whole previous program graph
+   * be collected instead of being retained until the following emit.
+   */
+  public clearContexts(): void {
+    this.contexts.clear();
+  }
 }
 
 // Expose the singleton instance of the context manager.
@@ -99,3 +112,13 @@ export function useContext<K extends ContextKey>(key: K): Contexts[K] {
 export function provideContext<K extends ContextKey>(key: K, value: Contexts[K]): void {
   contextManager.setContext(key, value);
 }
+
+/**
+ * Clears all contexts held by the singleton context manager. Call this once an
+ * emit has finished writing its output so the retained program graph (compiler
+ * `EmitContext`/`Program`, TCGC `SdkContext`, ts-morph `Project`, binder, …) can
+ * be garbage collected instead of lingering until the next emit overwrites it.
+ */
+export function clearContexts(): void {
+  contextManager.clearContexts();
+}

package/src/framework/declaration.ts

@@ -1,17 +1,17 @@
 import {
   ClassDeclaration,
-  ClassDeclarationStructure,
+  type ClassDeclarationStructure,
   EnumDeclaration,
-  EnumDeclarationStructure,
+  type EnumDeclarationStructure,
   FunctionDeclaration,
-  FunctionDeclarationStructure,
+  type FunctionDeclarationStructure,
   InterfaceDeclaration,
-  InterfaceDeclarationStructure,
+  type InterfaceDeclarationStructure,
   SourceFile,
-  StatementStructures,
+  type StatementStructures,
   StructureKind,
   TypeAliasDeclaration,
-  TypeAliasDeclarationStructure,
+  type TypeAliasDeclarationStructure,
 } from "ts-morph";
 import { useBinder } from "./hooks/binder.js";
 import { refkey as getRefKey } from "./refkey.js";
@@ -81,6 +81,7 @@ export function addDeclaration(
 
   // Update the declaration name to be unique
   const trackedDeclaration = { ...declaration, name: trackedDeclarationName };
+  trackedDeclaration.leadingTrivia ??= "\n";
 
   // Skip empty type aliases (they have no body to emit). Done before
   // dispatching so behaviour is identical whether batching or not.

package/src/framework/hooks/binder.ts

@@ -1,15 +1,15 @@
 import { joinPaths, normalizePath } from "@typespec/compiler";
 import {
-  ImportDeclarationStructure,
-  ImportSpecifierStructure,
+  type ImportDeclarationStructure,
+  type ImportSpecifierStructure,
   Project,
   SourceFile,
   StructureKind,
 } from "ts-morph";
 import { provideContext, useContext } from "../../context-manager.js";
 import { generateLocallyUniqueName } from "../../modular/helpers/naming-helpers.js";
-import { ReferenceableSymbol } from "../dependency.js";
-import { SourceFileSymbol, StaticHelperMetadata } from "../load-static-helpers.js";
+import type { ReferenceableSymbol } from "../dependency.js";
+import { SourceFileSymbol, type StaticHelperMetadata } from "../load-static-helpers.js";
 import { refkey } from "../refkey.js";
 import { provideDependencies, useDependencies } from "./use-dependencies.js";
 
@@ -22,9 +22,6 @@ export interface DeclarationInfo {
 export interface BinderOptions {
   staticHelpers?: Map<string, StaticHelperMetadata>;
   dependencies?: Record<string, ReferenceableSymbol>;
-  /** When true, use #platform/ subpath imports for static helpers with platform variants.
-   *  Should be true for warp packages; false for tshy packages. */
-  useSubpathImports?: boolean;
 }
 
 export interface Binder {
@@ -50,7 +47,6 @@ class BinderImp implements Binder {
   private project: Project;
   private dependencies: Record<string, ReferenceableSymbol>;
   private staticHelpers: Map<string, StaticHelperMetadata>;
-  private useSubpathImports: boolean;
 
   constructor(project: Project, options: BinderOptions = {}) {
     this.project = project;
@@ -58,7 +54,6 @@ class BinderImp implements Binder {
     provideDependencies(options.dependencies);
     this.staticHelpers = options.staticHelpers ?? new Map();
     this.dependencies = useDependencies();
-    this.useSubpathImports = options.useSubpathImports ?? false;
   }
 
   trackDeclaration(refkey: unknown, name: string, sourceFile: SourceFile): string {
@@ -185,27 +180,6 @@ class BinderImp implements Binder {
     return importSpecifier;
   }
 
-  /**
-   * Returns the #platform/ subpath import specifier for a static helper file
-   * that has a polyfill variant (-browser.mts or -react-native.mts sibling),
-   * or undefined if subpath imports are disabled or no variant exists.
-   * e.g. "src/static-helpers/serialization/get-binary-response.ts"
-   *   -> "#platform/static-helpers/serialization/get-binary-response"
-   */
-  private getPlatformImportSpecifier(declarationSourceFile: SourceFile): string | undefined {
-    if (!this.useSubpathImports) return undefined;
-    const filePath = declarationSourceFile.getFilePath();
-    const srcIndex = filePath.indexOf("/src/");
-    if (srcIndex === -1) return undefined;
-    // Check if a -browser.mts or -react-native.mts sibling exists
-    const basePath = filePath.replace(/\.ts$/, "");
-    const hasBrowserVariant = this.project.getSourceFile(basePath + "-browser.mts");
-    const hasReactNativeVariant = this.project.getSourceFile(basePath + "-react-native.mts");
-    if (!hasBrowserVariant && !hasReactNativeVariant) return undefined;
-    const relativePath = filePath.substring(srcIndex + "/src/".length);
-    return "#platform/" + relativePath.replace(/\.ts$/, "");
-  }
-
   /**
    * Applies all tracked imports to their respective source files.
    */
@@ -316,9 +290,7 @@ class BinderImp implements Binder {
 
       if (file !== declarationSourceFile) {
         this.trackReference(declarationKey, file);
-        // Use #platform/ subpath import specifier for static helpers in warp packages
-        const platformSpecifier = this.getPlatformImportSpecifier(declarationSourceFile);
-        const importTarget = platformSpecifier ?? declarationSourceFile;
+        const importTarget = declarationSourceFile;
         const importDec = this.addImport(file, importTarget, name);
         name = importDec.alias ?? name;
       }

package/src/framework/hooks/sdk-types.ts

@@ -1,20 +1,20 @@
 import {
-  SdkClientType,
-  SdkHttpOperation,
-  SdkModelPropertyType,
-  SdkModelType,
-  SdkServiceMethod,
-  SdkType,
+  type SdkClientType,
+  type SdkHttpOperation,
+  type SdkModelPropertyType,
+  type SdkModelType,
+  type SdkServiceMethod,
+  type SdkType,
   getClientType,
 } from "@azure-tools/typespec-client-generator-core";
-import { Operation, Type, getNamespaceFullName } from "@typespec/compiler";
+import { type Operation, type Type, getNamespaceFullName } from "@typespec/compiler";
 import { provideContext, useContext } from "../../context-manager.js";
 
 import { reportDiagnostic } from "../../lib.js";
 import { visitPackageTypes } from "../../modular/emit-models.js";
 import { getAllAncestors, getAllProperties } from "../../modular/helpers/operation-helpers.js";
 import { normalizeModelPropertyName } from "../../modular/type-expressions/get-type-expression.js";
-import { SdkContext } from "../../utils/interfaces.js";
+import type { SdkContext } from "../../utils/interfaces.js";
 import { NameType, normalizeName } from "../../utils/name-utils.js";
 
 export const emitQueue: Set<SdkType> = new Set<SdkType>();
@@ -29,6 +29,20 @@ export const flattenPropertyModelMap: Map<SdkModelPropertyType, SdkModelType> =
  */
 export const pagedModelsKeptPublic = new Set<SdkType>();
 
+/**
+ * Releases the module-level state that accumulates while visiting a package's
+ * types. These collections are cleared at the start of every
+ * {@link visitPackageTypes} call, but because they live at module scope they
+ * otherwise keep the most recently emitted program's SDK types reachable until
+ * the next emit runs. Call this once an emit has fully finished so that state
+ * can be garbage collected.
+ */
+export function resetSdkTypesState(): void {
+  emitQueue.clear();
+  flattenPropertyModelMap.clear();
+  pagedModelsKeptPublic.clear();
+}
+
 export interface SdkTypeContext {
   operations: Map<Type, SdkServiceMethod<SdkHttpOperation>>;
   types: Map<Type, SdkType>;

package/src/framework/hooks/use-dependencies.ts

@@ -1,6 +1,6 @@
 import { provideContext, useContext } from "../../context-manager.js";
 import { DefaultCoreDependencies } from "../../modular/external-dependencies.js";
-import { ExternalDependencies } from "../dependency.js";
+import type { ExternalDependencies } from "../dependency.js";
 
 export function provideDependencies(customDependencies: Partial<ExternalDependencies> = {}) {
   const dependencies = {

package/src/framework/load-static-helpers.ts

@@ -1,4 +1,4 @@
-import { type CompilerHost, joinPaths, NoTarget, Program } from "@typespec/compiler";
+import { type CompilerHost, joinPaths, NoTarget, type Program } from "@typespec/compiler";
 import {
   ClassDeclaration,
   EnumDeclaration,
@@ -9,10 +9,11 @@ import {
   TypeAliasDeclaration,
 } from "ts-morph";
 import { reportDiagnostic } from "../lib.js";
-import { ModularEmitterOptions } from "../modular/interfaces.js";
+import type { ModularEmitterOptions } from "../modular/interfaces.js";
 import { resolveProjectRoot } from "../utils/resolve-project-root.js";
 import { refkey } from "./refkey.js";
 export const SourceFileSymbol = Symbol("SourceFile");
+
 export interface StaticHelperMetadata {
   name: string;
   kind: "function" | "interface" | "typeAlias" | "class" | "enum";
@@ -94,22 +95,6 @@ export async function loadStaticHelpers(
       const addedFile = project.createSourceFile(targetPath, contents, {
         overwrite: true,
       });
-      addedFile.getImportDeclarations().map((i) => {
-        // Rewrite relative platform-types imports to #platform/ specifiers
-        // so that browser/react-native variants are resolved via subpath imports.
-        // Only rewrite imports to the default variant (not -browser/-react-native variants
-        // which are already platform-specific direct imports).
-        const specifier = i.getModuleSpecifierValue();
-        if (
-          specifier.startsWith(".") &&
-          specifier.includes("platform-types") &&
-          !specifier.includes("-browser") &&
-          !specifier.includes("-react-native")
-        ) {
-          i.setModuleSpecifier("#platform/static-helpers/platform-types");
-        }
-      });
-
       for (const entry of Object.values(helpers)) {
         if (!addedFile.getFilePath().endsWith(entry.location)) {
           continue;

package/src/framework/reference.ts

@@ -1,6 +1,6 @@
-import { ReferenceableSymbol } from "./dependency.js";
+import type { ReferenceableSymbol } from "./dependency.js";
 import { useBinder } from "./hooks/binder.js";
-import { SourceFileSymbol, StaticHelperMetadata } from "./load-static-helpers.js";
+import { SourceFileSymbol, type StaticHelperMetadata } from "./load-static-helpers.js";
 import { refkey as getRefkey } from "./refkey.js";
 
 export function resolveReference(refkey: unknown): string {

package/src/framework/sample.ts

@@ -1,6 +1,6 @@
 import {
-  FunctionDeclarationStructure,
-  InterfaceDeclarationStructure,
+  type FunctionDeclarationStructure,
+  type InterfaceDeclarationStructure,
   Project,
   StructureKind,
 } from "ts-morph";

package/src/framework/source-file-batch.ts

@@ -1,7 +1,7 @@
 import {
-  ExportDeclarationStructure,
+  type ExportDeclarationStructure,
   SourceFile,
-  StatementStructures,
+  type StatementStructures,
   StructureKind,
 } from "ts-morph";
 

package/src/index.ts

@@ -2,15 +2,15 @@
 // Licensed under the MIT License.
 
 import {
-  EmitContext,
-  Program,
+  type CompilerHost,
+  type EmitContext,
+  type Program,
   getBaseFileName,
   getDirectoryPath,
   joinPaths,
   resolvePath,
-  type CompilerHost,
 } from "@typespec/compiler";
-import { provideContext, useContext } from "./context-manager.js";
+import { clearContexts, provideContext, useContext } from "./context-manager.js";
 import { buildRootIndex, buildSubClientIndexFile } from "./modular/build-root-index.js";
 import {
   AzureCoreDependencies,
@@ -23,7 +23,6 @@ import {
   CreateRecorderHelpers,
   MultipartHelpers,
   PagingHelpers,
-  PlatformTypeHelpers,
   PollingHelpers,
   SerializationHelpers,
   SimplePollerHelpers,
@@ -33,20 +32,20 @@ import {
 } from "./modular/static-helpers-metadata.js";
 import { emitContentByBuilder } from "./utils/emit-util.js";
 import { clearDirectory, emptyDir, pathExists } from "./utils/file-system-utils.js";
-import { GenerationDirDetail, SdkContext } from "./utils/interfaces.js";
+import type { GenerationDirDetail, SdkContext } from "./utils/interfaces.js";
 
 import {
-  SdkClientType,
-  SdkServiceOperation,
+  type SdkClientType,
+  type SdkServiceOperation,
   createSdkContext,
   listAllServiceNamespaces,
 } from "@azure-tools/typespec-client-generator-core";
 import { Project } from "ts-morph";
 import { provideBinder } from "./framework/hooks/binder.js";
-import { provideSdkTypes } from "./framework/hooks/sdk-types.js";
+import { provideSdkTypes, resetSdkTypesState } from "./framework/hooks/sdk-types.js";
 import { loadStaticHelpers } from "./framework/load-static-helpers.js";
-import { ClientModel, ClientOptions } from "./interfaces.js";
-import { EmitterOptions } from "./lib.js";
+import type { ClientModel, ClientOptions } from "./interfaces.js";
+import type { EmitterOptions } from "./lib.js";
 import { buildApiExtractorConfig } from "./metadata/build-api-extractor-config.js";
 import { buildChangelogFile } from "./metadata/build-changelog-file.js";
 import { buildEsLintConfig } from "./metadata/build-es-lint-config.js";
@@ -76,7 +75,7 @@ import { buildSampleTest } from "./metadata/test/build-sample-test.js";
 import { buildSnippets } from "./metadata/test/build-snippets.js";
 import { buildClassicalClient } from "./modular/build-classical-client.js";
 import { buildClassicOperationFiles } from "./modular/build-classical-operation-groups.js";
-import { buildClientContext, getClientContextPath } from "./modular/build-client-context.js";
+import { buildClientContext } from "./modular/build-client-context.js";
 import { transformModularEmitterOptions } from "./modular/build-modular-options.js";
 import { buildOperationFiles } from "./modular/build-operations.js";
 import { getModuleExports } from "./modular/build-project-files.js";
@@ -88,7 +87,7 @@ import { emitNonModelResponseTypes, emitTypes } from "./modular/emit-models.js";
 import { emitSamples } from "./modular/emit-samples.js";
 import { emitTests } from "./modular/emit-tests.js";
 import { getClassicalClientName } from "./modular/helpers/naming-helpers.js";
-import { ModularEmitterOptions } from "./modular/interfaces.js";
+import type { ModularEmitterOptions } from "./modular/interfaces.js";
 import { packageUsesXmlSerialization } from "./modular/serialization/build-xml-serializer-function.js";
 import { transformClientOptions } from "./transform/transform-client-options.js";
 import { transformClientModel } from "./transform/transform.js";
@@ -139,7 +138,6 @@ export async function $onEmit(context: EmitContext) {
       ...SimplePollerHelpers,
       ...UrlTemplateHelpers,
       ...MultipartHelpers,
-      ...PlatformTypeHelpers,
       ...CloudSettingHelpers,
       ...XmlHelpers,
       ...(resolvedEmitterOptions.generateTest ? CreateRecorderHelpers : {}),
@@ -165,7 +163,6 @@ export async function $onEmit(context: EmitContext) {
     dependencies: {
       ...extraDependencies,
     },
-    useSubpathImports: true,
   });
   provideSdkTypes(dpgContext);
 
@@ -188,6 +185,15 @@ export async function $onEmit(context: EmitContext) {
 
   await generateMetadataAndTest(dpgContext);
 
+  // Release the emitter's process-wide singleton state now that this emit has
+  // finished writing output. Without this, the context manager keeps the whole
+  // previous program graph (compiler `EmitContext`/`Program`, TCGC `SdkContext`,
+  // ts-morph `Project`, binder, …) reachable until the next emit overwrites it.
+  // Clearing here lets it be collected between emits, which matters for hosts
+  // that run many emits in one process (test suites, benchmarks, watch mode).
+  clearContexts();
+  resetSdkTypesState();
+
   async function enrichDpgContext() {
     const generationPathDetail: GenerationDirDetail = await calculateGenerationDir();
     dpgContext.generationPathDetail = generationPathDetail;
@@ -446,19 +452,18 @@ export async function $onEmit(context: EmitContext) {
         modularPackageInfo = {
           ...modularPackageInfo,
           dependencies,
-          clientContextPaths: getRelativeContextPaths(context, modularEmitterOptions),
         };
       }
       commonBuilders.push((model) => buildPackageFile(model, modularPackageInfo));
       // Generate warp.config.yml for Azure monorepo ESM packages
       commonBuilders.push((model) => buildWarpConfig(model, modularPackageInfo));
       commonBuilders.push(buildTsConfig);
-      commonBuilders.push(buildTsSrcEsmConfig);
-      commonBuilders.push(buildTsSrcBrowserConfig);
+      commonBuilders.push(() => buildTsSrcEsmConfig(modularPackageInfo["exports"]));
+      commonBuilders.push(() => buildTsSrcBrowserConfig(modularPackageInfo["exports"]));
       if (option.generateReactNativeTarget) {
-        commonBuilders.push(buildTsSrcReactNativeConfig);
+        commonBuilders.push(() => buildTsSrcReactNativeConfig(modularPackageInfo["exports"]));
       }
-      commonBuilders.push(buildTsSrcCjsConfig);
+      commonBuilders.push(() => buildTsSrcCjsConfig(modularPackageInfo["exports"]));
       if (option.generateSample) {
         commonBuilders.push(buildTsSampleConfig);
       }
@@ -499,14 +504,13 @@ export async function $onEmit(context: EmitContext) {
       }
       const modularPackageInfo = {
         exports: getModuleExports(context, modularEmitterOptions),
-        clientContextPaths: getRelativeContextPaths(context, modularEmitterOptions),
         ...(Object.keys(additionalDependencies).length > 0 && {
           dependencies: additionalDependencies,
         }),
       };
 
       // Always update package.json (adds #platform/* imports) along with
-      // exports, clientContextPaths and LRO deps.
+      // exports and LRO deps.
       {
         // Read package.json content via host and pass parsed object
         const pkgSourceFile = await host.readFile(existingPackageFilePath);
@@ -524,6 +528,14 @@ export async function $onEmit(context: EmitContext) {
       // Update warp.config.yml for Azure monorepo packages
       updateBuilders.push((model: ClientModel) => buildWarpConfig(model, modularPackageInfo));
 
+      // Re-sync tsconfig.src.*.json `include` with the warp exports
+      updateBuilders.push(() => buildTsSrcEsmConfig(modularPackageInfo["exports"]));
+      updateBuilders.push(() => buildTsSrcBrowserConfig(modularPackageInfo["exports"]));
+      if (option.generateReactNativeTarget) {
+        updateBuilders.push(() => buildTsSrcReactNativeConfig(modularPackageInfo["exports"]));
+      }
+      updateBuilders.push(() => buildTsSrcCjsConfig(modularPackageInfo["exports"]));
+
       // If the client name changed, regenerate the README and snippets completely;
       // otherwise update only the API reference link in-place.
       if (hasReadmeFile) {
@@ -571,13 +583,6 @@ export async function $onEmit(context: EmitContext) {
       );
     }
   }
-
-  function getRelativeContextPaths(context: SdkContext, options: ModularEmitterOptions) {
-    const clientMap = getClientHierarchyMap(context);
-    return Array.from(clientMap)
-      .map((subClient) => getClientContextPath(subClient, options))
-      .map((path) => path.substring(path.indexOf("src")));
-  }
 }
 
 export async function createContextWithDefaultOptions(

package/src/interfaces.ts

@@ -334,7 +334,6 @@ export interface PackageDetails {
   nameWithoutScope?: string;
   description?: string;
   version?: string;
-  isVersionUserProvided?: boolean;
 }
 export interface OperationParameter {
   operationGroup: string;