@azure-tools/typespec-ts 0.56.0-dev.1 → 0.56.0-dev.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.56.0-dev.1",
-  "description": "An experimental TypeSpec emitter for TypeScript",
+  "version": "0.56.0-dev.11",
+  "description": "A TypeSpec emitter for TypeScript",
   "main": "dist/src/index.js",
   "type": "module",
   "exports": {
@@ -42,9 +42,7 @@
     "@typespec/xml": "^0.83.0 || >=0.84.0-dev <0.84.0",
     "@typespec/ts-http-runtime": "0.3.6",
     "cross-env": "^10.1.0",
-    "mkdirp": "^3.0.1",
-    "npm-run-all": "~4.1.5",
-    "prettier": "^3.8.1",
+    "concurrently": "^10.0.0",
     "vitest": "^4.1.3",
     "vite": "^8.0.8",
     "@vitest/coverage-v8": "^4.1.3",
@@ -62,7 +60,6 @@
   },
   "dependencies": {
     "fast-xml-parser": "^5.7.0",
-    "handlebars": "^4.7.7",
     "prettier": "^3.8.1",
     "ts-morph": "^23.0.0",
     "tslib": "^2.3.1"
@@ -89,28 +86,21 @@
     "clean": "rimraf ./dist ./typespec-output",
     "build": "tsc -p .",
     "test": "npm run test-next && npm run unit-test && npm run integration-test-ci",
-    "test:azure": "npm run test-next && npm run copy:typespec && npm run integration-test-ci:azure-modular",
-    "lint": "eslint . --ext .ts --max-warnings=0",
-    "lint:fix": "eslint . --fix --ext .ts",
+    "lint": "oxlint . --deny-warnings",
+    "lint:fix": "oxlint . --fix",
     "check:tree": "node ./test/commands/check-clean-tree.ts",
-    "test:ts:e2e": "npm run copy:typespec && npm run integration-test-ci:azure-modular",
-    "integration-test-ci": "npm-run-all copy:typespec integration-test-ci:azure-modular",
-    "integration-test-ci:sequential": "npm-run-all --serial copy:typespec integration-test-ci:azure-modular",
-    "integration-test-ci:azure-modular": "npm-run-all --silent -p start-test-server:azure-modular --race generate-and-run:azure-modular",
-    "start-test-server": "mkdirp -p coverage && npx tsp-spector serve ./node_modules/@typespec/http-specs/specs  --coverageFile ./coverage/spector-coverage-typescript.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",
+    "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\"",
+    "start-test-server": "node ./test/commands/start-test-server.js",
     "copy:typespec": "node ./test/commands/copy-typespec.ts",
-    "generate-and-run:azure-modular": "npm run generate-tsp-only:azure-modular:client && npm-run-all -p integration-test:alone:azure-modular generate-tsp-only:azure-modular:declarations && npm run stop-test-server -- -p 3002",
-    "generate-tsp-only": "npm run generate-tsp-only:azure-modular",
-    "generate-tsp-only:azure-modular": "node ./test/commands/gen-spector.js",
-    "generate-tsp-only:azure-modular:client": "node ./test/commands/gen-spector.js --phase=client",
-    "generate-tsp-only:azure-modular:declarations": "node ./test/commands/gen-spector.js --phase=declarations",
+    "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-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",
-    "integration-test:alone": "npm run integration-test:alone:azure-modular",
-    "integration-test:alone:azure-modular": "vitest run --project integration-azure-modular",
+    "integration-test:alone": "vitest run --project integration-azure-modular",
     "stop-test-server": "npx tsp-spector server stop",
-    "unit-test": "npm run unit-test:modular",
-    "unit-test:modular": "cross-env NODE_OPTIONS=--max-old-space-size=1024 vitest run --project unit-modular",
+    "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"
   }

package/src/context-manager.ts

@@ -4,7 +4,7 @@ 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 { RlcMetaTree } from "./meta-tree.js";
+import { ClientTypeMetaTree } from "./meta-tree.js";
 
 /**
  * Contexts Object Guidelines
@@ -20,7 +20,7 @@ import { RlcMetaTree } from "./meta-tree.js";
  * Remember, adding too many contexts can lead to complex dependencies and harder-to-maintain code. Always evaluate if the context is truly necessary or if there are better alternatives such as localized state management or passing props for simpler scenarios.
  */
 type Contexts = {
-  rlcMetaTree: RlcMetaTree; // Context for RLC types metadata.
+  clientTypeMetaTree: ClientTypeMetaTree; // Context for client type metadata.
   outputProject: Project; // The TS-Morph root project context for code generation.
   symbolMap: Map<string, SourceFile>; // Mapping of symbols to their corresponding source files.
   sdkTypes: SdkTypeContext;
@@ -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

@@ -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/hooks/sdk-types.ts

@@ -14,8 +14,8 @@ 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 { NameType, normalizeName } from "../../rlc-common/index.js";
 import { SdkContext } from "../../utils/interfaces.js";
+import { NameType, normalizeName } from "../../utils/name-utils.js";
 
 export const emitQueue: Set<SdkType> = new Set<SdkType>();
 export const flattenPropertyModelMap: Map<SdkModelPropertyType, SdkModelType> = new Map<
@@ -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/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);
+    }
+  }
+}