@azure-tools/typespec-ts 0.56.0-dev.5 → 0.56.0-dev.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.56.0-dev.5",
+  "version": "0.56.0-dev.6",
   "description": "A TypeSpec emitter for TypeScript",
   "main": "dist/src/index.js",
   "type": "module",

package/src/framework/declaration.ts

@@ -8,12 +8,14 @@ import {
   InterfaceDeclaration,
   InterfaceDeclarationStructure,
   SourceFile,
+  StatementStructures,
   StructureKind,
   TypeAliasDeclaration,
   TypeAliasDeclarationStructure,
 } from "ts-morph";
 import { useBinder } from "./hooks/binder.js";
 import { refkey as getRefKey } from "./refkey.js";
+import { enqueueStatement } from "./source-file-batch.js";
 export type DeclarationStructures =
   | ClassDeclarationStructure
   | EnumDeclarationStructure
@@ -80,25 +82,11 @@ export function addDeclaration(
   // Update the declaration name to be unique
   const trackedDeclaration = { ...declaration, name: trackedDeclarationName };
 
-  switch (trackedDeclaration.kind) {
-    case StructureKind.Class:
-      sourceFile.addClass(trackedDeclaration);
-      break;
-    case StructureKind.Enum:
-      sourceFile.addEnum(trackedDeclaration);
-      break;
-    case StructureKind.Function:
-      sourceFile.addFunction(trackedDeclaration);
-      break;
-    case StructureKind.Interface:
-      sourceFile.addInterface(trackedDeclaration);
-      break;
-    case StructureKind.TypeAlias:
-      if (trackedDeclaration.type) {
-        sourceFile.addTypeAlias(trackedDeclaration);
-      }
-      break;
-    default:
-      throw new Error(`Unsupported declaration kind ${(trackedDeclaration as any).kind}`);
+  // Skip empty type aliases (they have no body to emit). Done before
+  // dispatching so behaviour is identical whether batching or not.
+  if (trackedDeclaration.kind === StructureKind.TypeAlias && !trackedDeclaration.type) {
+    return;
   }
+
+  enqueueStatement(sourceFile, trackedDeclaration as StatementStructures);
 }

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

@@ -0,0 +1,140 @@
+import {
+  ExportDeclarationStructure,
+  SourceFile,
+  StatementStructures,
+  StructureKind,
+} from "ts-morph";
+
+/**
+ * Generic per-source-file batch for ts-morph `add*` mutations.
+ *
+ * Each individual `sourceFile.addInterface/addFunction/addExportDeclaration/...`
+ * call re-parses the entire source file in ts-morph. Calling them in a loop
+ * therefore grows as O(N × file_size). This module collects structures while
+ * a batch is open and, on flush, issues a single `addStatements` call per file,
+ * collapsing N re-parses into 1.
+ *
+ * The batch is reference-counted so nested begin/flush pairs compose safely.
+ * Statements flush in insertion order and produce byte-identical output.
+ */
+
+let batchDepth = 0;
+const pendingByFile = new Map<SourceFile, StatementStructures[]>();
+
+/**
+ * Opens a batching scope. Subsequent `enqueueStatement` calls queue rather
+ * than mutate the AST until the matching `flushSourceFileBatch` is called.
+ */
+export function beginSourceFileBatch(): void {
+  batchDepth++;
+}
+
+/**
+ * Closes the most recent batching scope. When the outermost scope closes,
+ * all pending structures are written to their source files in bulk.
+ */
+export function flushSourceFileBatch(): void {
+  if (batchDepth === 0) {
+    return;
+  }
+  batchDepth--;
+  if (batchDepth > 0) {
+    return;
+  }
+  try {
+    for (const [sourceFile, statements] of pendingByFile) {
+      if (statements.length === 0) {
+        continue;
+      }
+      sourceFile.addStatements(statements);
+    }
+  } finally {
+    pendingByFile.clear();
+  }
+}
+
+/**
+ * Queues a statement structure for bulk-add on flush, or writes it
+ * immediately when no batch is open.
+ * @param sourceFile - Target source file.
+ * @param structure - The statement structure to add.
+ */
+export function enqueueStatement(sourceFile: SourceFile, structure: StatementStructures): void {
+  if (batchDepth > 0) {
+    let pending = pendingByFile.get(sourceFile);
+    if (!pending) {
+      pending = [];
+      pendingByFile.set(sourceFile, pending);
+    }
+    pending.push(structure);
+    return;
+  }
+  sourceFile.addStatements([structure]);
+}
+
+/**
+ * Returns the set of names exported from `sourceFile` considering both the
+ * declarations already present in its AST and any export declarations queued
+ * by the current batch. Use this in place of reading `getExportDeclarations`
+ * directly when callers dedup against existing exports inside a batch.
+ * @param sourceFile - The file to inspect.
+ */
+export function getEffectiveExportedNames(sourceFile: SourceFile): Set<string> {
+  const names = new Set<string>();
+  for (const decl of sourceFile.getExportDeclarations()) {
+    for (const named of decl.getNamedExports()) {
+      names.add(named.getAliasNode()?.getText() ?? named.getName());
+    }
+  }
+  const pending = pendingByFile.get(sourceFile);
+  if (pending) {
+    for (const structure of pending) {
+      if (structure.kind !== StructureKind.ExportDeclaration) {
+        continue;
+      }
+      collectNamedExportNames(structure.namedExports, names);
+    }
+  }
+  return names;
+}
+
+/**
+ * Returns the set of named exports queued in the current batch for
+ * `sourceFile`. Use this to union with any AST-based view of exports
+ * (e.g. `getExportedDeclarations`) when deduplicating against still-pending
+ * writes inside a batch.
+ * @param sourceFile - The file to inspect.
+ */
+export function getQueuedExportNames(sourceFile: SourceFile): Set<string> {
+  const names = new Set<string>();
+  const pending = pendingByFile.get(sourceFile);
+  if (!pending) {
+    return names;
+  }
+  for (const structure of pending) {
+    if (structure.kind !== StructureKind.ExportDeclaration) {
+      continue;
+    }
+    collectNamedExportNames(structure.namedExports, names);
+  }
+  return names;
+}
+
+function collectNamedExportNames(
+  named: ExportDeclarationStructure["namedExports"],
+  into: Set<string>,
+): void {
+  if (!named || typeof named === "function") {
+    // WriterFunction form is opaque to us; callers can't dedup by name.
+    return;
+  }
+  for (const item of named) {
+    if (typeof item === "string") {
+      into.add(item);
+    } else if (typeof item === "function") {
+      continue;
+    } else if (item) {
+      into.add(item.alias ?? item.name);
+    }
+  }
+}

package/src/modular/build-root-index.ts

@@ -1,8 +1,15 @@
 import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
 import { joinPaths, NoTarget } from "@typespec/compiler";
-import { Project, SourceFile } from "ts-morph";
+import { Project, SourceFile, StructureKind } from "ts-morph";
 import { useContext } from "../context-manager.js";
 import { resolveReference } from "../framework/reference.js";
+import {
+  beginSourceFileBatch,
+  enqueueStatement,
+  flushSourceFileBatch,
+  getEffectiveExportedNames,
+  getQueuedExportNames,
+} from "../framework/source-file-batch.js";
 import { reportDiagnostic } from "../lib.js";
 import { getClientModuleInfo } from "../utils/client-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
@@ -24,6 +31,20 @@ export function buildRootIndex(
   emitterOptions: ModularEmitterOptions,
   rootIndexFile: SourceFile,
   clientMap?: [string[], SdkClientType<SdkServiceOperation>],
+) {
+  beginSourceFileBatch();
+  try {
+    buildRootIndexImpl(context, emitterOptions, rootIndexFile, clientMap);
+  } finally {
+    flushSourceFileBatch();
+  }
+}
+
+function buildRootIndexImpl(
+  context: SdkContext,
+  emitterOptions: ModularEmitterOptions,
+  rootIndexFile: SourceFile,
+  clientMap?: [string[], SdkClientType<SdkServiceOperation>],
 ) {
   if (!clientMap) {
     // we still need to export the models if no client is provided
@@ -109,7 +130,8 @@ function exportRestErrorTypes(rootIndexFile: SourceFile) {
   const existingExports = getExistingExports(rootIndexFile);
   const namedExports = ["RestError", "isRestError"].filter((name) => !existingExports.has(name));
   if (namedExports.length > 0) {
-    rootIndexFile.addExportDeclaration({
+    enqueueStatement(rootIndexFile, {
+      kind: StructureKind.ExportDeclaration,
       moduleSpecifier: "@azure/core-rest-pipeline",
       namedExports,
     });
@@ -165,13 +187,7 @@ function exportFileContentsType(context: SdkContext, rootIndexFile: SourceFile)
 }
 
 function getExistingExports(rootIndexFile: SourceFile): Set<string> {
-  return new Set(
-    rootIndexFile
-      .getExportDeclarations()
-      .flatMap((exportDecl) =>
-        exportDecl.getNamedExports().map((namedExport) => namedExport.getName()),
-      ),
-  );
+  return getEffectiveExportedNames(rootIndexFile);
 }
 
 function getNewNamedExports(namedExports: string[], existingExports: Set<string>): string[] {
@@ -186,7 +202,8 @@ function addExportsToRootIndexFile(
   const existingExports = getExistingExports(rootIndexFile);
   const newNamedExports = getNewNamedExports(namedExports, existingExports);
   if (newNamedExports.length > 0) {
-    rootIndexFile.addExportDeclaration({
+    enqueueStatement(rootIndexFile, {
+      kind: StructureKind.ExportDeclaration,
       isTypeOnly,
       namedExports: newNamedExports,
     });
@@ -222,7 +239,8 @@ function exportSimplePollerLike(
   const moduleSpecifier = `./${
     isTopLevel && subfolder && subfolder !== "" ? subfolder + "/" : ""
   }static-helpers/simplePollerHelpers.js`;
-  indexFile.addExportDeclaration({
+  enqueueStatement(indexFile, {
+    kind: StructureKind.ExportDeclaration,
     isTypeOnly: true,
     moduleSpecifier,
     namedExports: ["SimplePollerLike"],
@@ -243,7 +261,10 @@ function exportRestoreHelpers(
   if (!helperFile) {
     return;
   }
-  const exported = new Set(indexFile.getExportedDeclarations().keys());
+  const exported = new Set([
+    ...indexFile.getExportedDeclarations().keys(),
+    ...getQueuedExportNames(indexFile),
+  ]);
   const allEntries = [...helperFile.getExportedDeclarations().entries()];
   const moduleSpecifier = `./${
     isTopLevel && subfolder && subfolder !== "" ? subfolder + "/" : ""
@@ -259,7 +280,8 @@ function exportClassicalClient(
   isSubClient: boolean = false,
 ) {
   const clientName = client.name;
-  indexFile.addExportDeclaration({
+  enqueueStatement(indexFile, {
+    kind: StructureKind.ExportDeclaration,
     namedExports: [clientName],
     moduleSpecifier: `./${
       subfolder && subfolder !== "" && !isSubClient ? subfolder + "/" : ""
@@ -321,7 +343,10 @@ function exportModules(
       continue;
     }
 
-    const exported = new Set(indexFile.getExportedDeclarations().keys());
+    const exported = new Set([
+      ...indexFile.getExportedDeclarations().keys(),
+      ...getQueuedExportNames(indexFile),
+    ]);
     const serializerOrDeserializerRegex = /.*(Serializer|Deserializer)(_\d+)?$/;
     const filteredEntries = [...modelsFile.getExportedDeclarations().entries()].filter(
       (exDeclaration) => {
@@ -362,6 +387,19 @@ export function buildSubClientIndexFile(
   context: SdkContext,
   clientMap: [string[], SdkClientType<SdkServiceOperation>],
   emitterOptions: ModularEmitterOptions,
+) {
+  beginSourceFileBatch();
+  try {
+    buildSubClientIndexFileImpl(context, clientMap, emitterOptions);
+  } finally {
+    flushSourceFileBatch();
+  }
+}
+
+function buildSubClientIndexFileImpl(
+  context: SdkContext,
+  clientMap: [string[], SdkClientType<SdkServiceOperation>],
+  emitterOptions: ModularEmitterOptions,
 ) {
   const project = useContext("outputProject");
   const [_, client] = clientMap;

package/src/modular/build-subpath-index.ts

@@ -2,8 +2,13 @@ import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client
 import { joinPaths } from "@typespec/compiler";
 import { ModularEmitterOptions } from "./interfaces.js";
 
-import { Node, SourceFile } from "ts-morph";
+import { Node, SourceFile, StructureKind } from "ts-morph";
 import { useContext } from "../context-manager.js";
+import {
+  beginSourceFileBatch,
+  enqueueStatement,
+  flushSourceFileBatch,
+} from "../framework/source-file-batch.js";
 import { getClientModuleInfo } from "../utils/client-utils.js";
 
 export interface buildSubpathIndexFileOptions {
@@ -17,6 +22,20 @@ export function buildSubpathIndexFile(
   subpath: string,
   clientMap?: [string[], SdkClientType<SdkServiceOperation>],
   options: buildSubpathIndexFileOptions = {},
+) {
+  beginSourceFileBatch();
+  try {
+    buildSubpathIndexFileImpl(emitterOptions, subpath, clientMap, options);
+  } finally {
+    flushSourceFileBatch();
+  }
+}
+
+function buildSubpathIndexFileImpl(
+  emitterOptions: ModularEmitterOptions,
+  subpath: string,
+  clientMap?: [string[], SdkClientType<SdkServiceOperation>],
+  options: buildSubpathIndexFileOptions = {},
 ) {
   const project = useContext("outputProject");
   const subfolder = clientMap ? (getClientModuleInfo(clientMap).subfolder ?? "") : "";
@@ -137,14 +156,16 @@ export function partitionAndEmitExports(
     }
   }
   if (typeOnlyExports.length > 0) {
-    indexFile.addExportDeclaration({
+    enqueueStatement(indexFile, {
+      kind: StructureKind.ExportDeclaration,
       isTypeOnly: true,
       moduleSpecifier,
       namedExports: typeOnlyExports,
     });
   }
   if (valueExports.length > 0) {
-    indexFile.addExportDeclaration({
+    enqueueStatement(indexFile, {
+      kind: StructureKind.ExportDeclaration,
       moduleSpecifier,
       namedExports: valueExports,
     });

package/src/modular/emit-models.ts

@@ -46,6 +46,7 @@ import {
   pagedModelsKeptPublic,
 } from "../framework/hooks/sdk-types.js";
 import { refkey } from "../framework/refkey.js";
+import { beginSourceFileBatch, flushSourceFileBatch } from "../framework/source-file-batch.js";
 import { reportDiagnostic } from "../lib.js";
 import { getClientHierarchyMap } from "../utils/client-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
@@ -117,32 +118,37 @@ export function emitTypes(context: SdkContext, { sourceRoot }: { sourceRoot: str
 
   let sourceFile;
 
-  for (const type of emitQueue) {
-    if (!isGenerableType(type)) {
-      continue;
-    }
+  beginSourceFileBatch();
+  try {
+    for (const type of emitQueue) {
+      if (!isGenerableType(type)) {
+        continue;
+      }
 
-    const namespaces = getModelNamespaces(context, type);
-    const filepath = getModelsPath(sourceRoot, namespaces);
-    sourceFile = outputProject.getSourceFile(filepath);
-    if (!sourceFile) {
-      sourceFile = outputProject.createSourceFile(filepath);
-      sourceFile.addStatements(`/**
+      const namespaces = getModelNamespaces(context, type);
+      const filepath = getModelsPath(sourceRoot, namespaces);
+      sourceFile = outputProject.getSourceFile(filepath);
+      if (!sourceFile) {
+        sourceFile = outputProject.createSourceFile(filepath);
+        sourceFile.addStatements(`/*
 * This file contains only generated model types and their (de)serializers.
 * Disable the following rules for internal models with '_' prefix and deserializers which require 'any' for raw JSON input.
 */
 /* eslint-disable @typescript-eslint/naming-convention */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */`);
+      }
+      emitType(context, type, sourceFile);
     }
-    emitType(context, type, sourceFile);
-  }
 
-  // Emit serialization/deserialization functions for flattened properties
-  for (const [property, _] of flattenPropertyModelMap) {
-    const namespaces = getModelNamespaces(context, property.type);
-    const filepath = getModelsPath(sourceRoot, namespaces);
-    sourceFile = outputProject.getSourceFile(filepath);
-    addSerializationFunctions(context, property, sourceFile!);
+    // Emit serialization/deserialization functions for flattened properties
+    for (const [property, _] of flattenPropertyModelMap) {
+      const namespaces = getModelNamespaces(context, property.type);
+      const filepath = getModelsPath(sourceRoot, namespaces);
+      sourceFile = outputProject.getSourceFile(filepath);
+      addSerializationFunctions(context, property, sourceFile!);
+    }
+  } finally {
+    flushSourceFileBatch();
   }
 
   const modelFiles = outputProject.getSourceFiles(sourceRoot + "/models/**/*.ts");