@azure-tools/typespec-ts 0.53.3 → 0.54.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.53.3",
+  "version": "0.54.0",
   "description": "An experimental TypeSpec emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
@@ -22,11 +22,11 @@
     "@typespec/spector": "0.1.0-dev.4",
     "@typespec/spec-api": "0.1.0-dev.3",
     "@typespec/tspd": "0.74.2",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.41-dev.1",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.41-dev.2",
     "@azure-tools/typespec-autorest": "^0.68.0",
     "@azure-tools/typespec-azure-core": "^0.68.0",
     "@azure-tools/typespec-azure-resource-manager": "^0.68.0",
-    "@azure-tools/typespec-client-generator-core": "^0.68.2",
+    "@azure-tools/typespec-client-generator-core": "^0.68.3",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-lro": "^3.1.0",
@@ -65,7 +65,7 @@
   },
   "peerDependencies": {
     "@azure-tools/typespec-azure-core": "^0.68.0",
-    "@azure-tools/typespec-client-generator-core": "^0.68.2",
+    "@azure-tools/typespec-client-generator-core": "^0.68.3",
     "@typespec/compiler": "^1.12.0",
     "@typespec/http": "^1.12.0",
     "@typespec/rest": "^0.82.0",
@@ -73,9 +73,9 @@
     "@typespec/xml": "^0.82.0"
   },
   "dependencies": {
-    "@azure-tools/rlc-common": "^0.53.3",
     "fast-xml-parser": "^4.5.0",
     "fs-extra": "^11.1.0",
+    "handlebars": "^4.7.7",
     "lodash": "^4.17.21",
     "prettier": "^3.3.3",
     "ts-morph": "^23.0.0",
@@ -124,10 +124,10 @@
     "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:azure-modular": "npm run generate-tsp-only:azure-modular && npm run integration-test:alone:azure-modular && npm run stop-test-server -- -p 3002",
     "generate-tsp-only": "npm run generate-tsp-only:azure-rlc && npm run generate-tsp-only:rlc &&npm run generate-tsp-only:azure-modular && npm run generate-tsp-only:modular",
-    "generate-tsp-only:rlc": "npx tsx ./test/commands/gen-cadl-ranch.js --tag=rlc",
-    "generate-tsp-only:azure-rlc": "npx tsx ./test/commands/gen-cadl-ranch.js --tag=azure-rlc",
-    "generate-tsp-only:modular": "npx tsx ./test/commands/gen-cadl-ranch.js --tag=modular",
-    "generate-tsp-only:azure-modular": "npx tsx ./test/commands/gen-cadl-ranch.js --tag=azure-modular",
+    "generate-tsp-only:rlc": "npx tsx ./test/commands/gen-spector.js --tag=rlc",
+    "generate-tsp-only:azure-rlc": "npx tsx ./test/commands/gen-spector.js --tag=azure-rlc",
+    "generate-tsp-only:modular": "npx tsx ./test/commands/gen-spector.js --tag=modular",
+    "generate-tsp-only:azure-modular": "npx tsx ./test/commands/gen-spector.js --tag=azure-modular",
     "regen-test-baselines": "npm run generate-tsp-only",
     "integration-test:alone": "npm run integration-test:alone:rlc && npm run integration-test:alone:azure-rlc && npm run integration-test:alone:modular && npm run integration-test:alone:azure-modular",
     "integration-test:alone:rlc": "vitest run --project integration-rlc",

package/src/framework/hooks/binder.ts

@@ -249,52 +249,115 @@ class BinderImp implements Binder {
    * Applies all tracked imports to their respective source files.
    */
   resolveAllReferences(sourceRoot: string, testRoot?: string): void {
+    // Pre-compute placeholder -> declaration/dependency maps
+    const declarationByPlaceholder = new Map<
+      string,
+      [unknown, DeclarationInfo | StaticHelperMetadata]
+    >();
+    for (const [key, value] of this.declarations) {
+      declarationByPlaceholder.set(this.serializePlaceholder(key), [
+        key,
+        value
+      ]);
+    }
+    for (const [key, value] of this.staticHelpers) {
+      declarationByPlaceholder.set(this.serializePlaceholder(key), [
+        key,
+        value
+      ]);
+    }
+    const dependencyByPlaceholder = new Map<string, ReferenceableSymbol>();
+    for (const dependency of Object.values(this.dependencies)) {
+      dependencyByPlaceholder.set(
+        this.serializePlaceholder(refkey(dependency)),
+        dependency
+      );
+    }
+
     this.project.getSourceFiles().map((file) => {
-      this.resolveDeclarationReferences(file);
-      this.resolveDependencyReferences(file);
+      // Scan each file's text once to find placeholders that are actually
+      // present, then build one placeholder -> replacement map per file and
+      // apply it in a single pass.
+      const presentPlaceholders = collectPlaceholders(file);
+      if (presentPlaceholders.size > 0) {
+        const replacementMap = new Map<string, string>();
+        this.resolveDeclarationReferences(
+          file,
+          declarationByPlaceholder,
+          presentPlaceholders,
+          replacementMap
+        );
+        this.resolveDependencyReferences(
+          file,
+          dependencyByPlaceholder,
+          presentPlaceholders,
+          replacementMap
+        );
+        if (replacementMap.size > 0) {
+          applyReplacements(file, replacementMap);
+        }
+      }
       const importStructures = this.imports.get(file);
-      if (importStructures) {
+      if (importStructures && importStructures.length > 0) {
         // Sort imports in place by module specifier to ensure consistent ordering
         importStructures.sort((a, b) =>
           a.moduleSpecifier < b.moduleSpecifier ? -1 : 1
         );
-        for (const importStructure of importStructures) {
-          file.addImportDeclaration(importStructure);
-        }
+        file.addImportDeclarations(importStructures);
       }
     });
 
     this.cleanUnreferencedHelpers(sourceRoot, testRoot);
   }
 
-  private resolveDependencyReferences(file: SourceFile) {
-    if (!hasAnyPlaceholders(file)) {
-      return;
-    }
-    for (const dependency of Object.values(this.dependencies)) {
-      const placeholder = this.serializePlaceholder(refkey(dependency));
-      const { name, module } = dependency;
-      const occurences = countPlaceholderOccurrences(file, placeholder);
-      if (occurences > 0) {
-        const importDec = this.addImport(file, module, name);
-        const uniqueName = importDec.alias ?? name;
-        replacePlaceholder(file, placeholder, uniqueName);
+  /**
+   * Resolves placeholders that refer to external dependencies by registering
+   * the matching imports and recording the local names in `replacementMap`.
+   * @param file - The source file currently being processed.
+   * @param dependencyByPlaceholder - Map from placeholder string to its dependency descriptor.
+   * @param presentPlaceholders - The set of placeholders actually present in the file's text.
+   * @param replacementMap - The per-file map that receives placeholder -> local-name entries.
+   */
+  private resolveDependencyReferences(
+    file: SourceFile,
+    dependencyByPlaceholder: Map<string, ReferenceableSymbol>,
+    presentPlaceholders: Set<string>,
+    replacementMap: Map<string, string>
+  ) {
+    for (const [placeholder, dependency] of dependencyByPlaceholder) {
+      if (!presentPlaceholders.has(placeholder)) {
+        continue;
       }
+      const { name, module } = dependency;
+      const importDec = this.addImport(file, module, name);
+      const uniqueName = importDec.alias ?? name;
+      replacementMap.set(placeholder, uniqueName);
     }
   }
 
-  private resolveDeclarationReferences(file: SourceFile) {
-    if (!hasAnyPlaceholders(file)) {
-      return;
-    }
-
-    for (const [declarationKey, declaration] of [
-      ...this.declarations,
-      ...this.staticHelpers
-    ]) {
-      const placeholderKey = this.serializePlaceholder(declarationKey);
-      const occurences = countPlaceholderOccurrences(file, placeholderKey);
-      if (!occurences) {
+  /**
+   * Resolves placeholders that refer to in-project declarations, registering
+   * cross-file imports as needed and recording the local names in
+   * `replacementMap`.
+   * @param file - The source file currently being processed.
+   * @param declarationByPlaceholder - Map from placeholder string to its declaration key and metadata.
+   * @param presentPlaceholders - The set of placeholders actually present in the file's text.
+   * @param replacementMap - The per-file map that receives placeholder -> local-name entries.
+   */
+  private resolveDeclarationReferences(
+    file: SourceFile,
+    declarationByPlaceholder: Map<
+      string,
+      [unknown, DeclarationInfo | StaticHelperMetadata]
+    >,
+    presentPlaceholders: Set<string>,
+    replacementMap: Map<string, string>
+  ) {
+    for (const [
+      placeholderKey,
+      [declarationKey, declaration]
+    ] of declarationByPlaceholder) {
+      if (!presentPlaceholders.has(placeholderKey)) {
         continue;
       }
 
@@ -317,7 +380,7 @@ class BinderImp implements Binder {
         const importDec = this.addImport(file, importTarget, name);
         name = importDec.alias ?? name;
       }
-      replacePlaceholder(file, placeholderKey, name);
+      replacementMap.set(placeholderKey, name);
     }
   }
 
@@ -410,27 +473,59 @@ export function useBinder(): Binder {
 }
 
 /**
- * Replaces all instances of a placeholder in a source file with a given value.
- * @param sourceFile - The source file where the replacement occurs.
- * @param placeholder - The placeholder string to replace.
- * @param value - The value to replace the placeholder with.
+ * Replaces every placeholder in a source file in one bulk text.replace
+ * followed by a single replaceWithText call.
+ * @param sourceFile - The source file to mutate.
+ * @param replacementMap - A map from each placeholder string to its replacement value.
  */
-function replacePlaceholder(
+function applyReplacements(
   sourceFile: SourceFile,
-  placeholder: string,
-  value: string
+  replacementMap: Map<string, string>
 ): void {
-  const fileText = sourceFile.getFullText();
-  const regex = new RegExp(escapeRegExp(placeholder), "g");
-  const updatedText = fileText.replace(regex, value);
-  sourceFile.replaceWithText(updatedText);
+  if (replacementMap.size === 0) {
+    return;
+  }
+  const text = sourceFile.getFullText();
+  const placeholderRegex = new RegExp(
+    `${escapeRegExp(PLACEHOLDER_PREFIX)}.+?__`,
+    "g"
+  );
+  let changed = false;
+  const updatedText = text.replace(placeholderRegex, (match) => {
+    const replacement = replacementMap.get(match);
+    if (replacement === undefined) {
+      return match;
+    }
+    changed = true;
+    return replacement;
+  });
+  if (changed) {
+    sourceFile.replaceWithText(updatedText);
+  }
 }
 
-function countPlaceholderOccurrences(
-  sourceFile: SourceFile,
-  placeholder: string
-): number {
-  return sourceFile.getFullText().split(placeholder).length - 1;
+/**
+ * Returns the set of distinct `__PLACEHOLDER_<refkey>__` strings present in
+ * the file, after a single text scan.
+ * @param sourceFile - The source file to scan.
+ * @returns The set of placeholder strings found in the file's text.
+ */
+function collectPlaceholders(sourceFile: SourceFile): Set<string> {
+  const result = new Set<string>();
+  const text = sourceFile.getFullText();
+  if (!text.includes(PLACEHOLDER_PREFIX)) {
+    return result;
+  }
+  // Refkeys are alphanumeric (see refkey.ts), so `.+?` safely stops at `__`.
+  const placeholderRegex = new RegExp(
+    `${escapeRegExp(PLACEHOLDER_PREFIX)}.+?__`,
+    "g"
+  );
+  let match: RegExpExecArray | null;
+  while ((match = placeholderRegex.exec(text)) !== null) {
+    result.add(match[0]);
+  }
+  return result;
 }
 
 /**
@@ -441,7 +536,3 @@ function countPlaceholderOccurrences(
 function escapeRegExp(string: string): string {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-
-function hasAnyPlaceholders(sourceFile: SourceFile): boolean {
-  return sourceFile.getFullText().includes(PLACEHOLDER_PREFIX);
-}

package/src/framework/hooks/sdkTypes.ts

@@ -18,7 +18,7 @@ import {
 } from "../../modular/helpers/operationHelpers.js";
 import { normalizeModelPropertyName } from "../../modular/type-expressions/get-type-expression.js";
 import { reportDiagnostic } from "../../lib.js";
-import { NameType, normalizeName } from "@azure-tools/rlc-common";
+import { NameType, normalizeName } from "../../rlc-common/index.js";
 
 export const emitQueue: Set<SdkType> = new Set<SdkType>();
 export const flattenPropertyModelMap: Map<SdkModelPropertyType, SdkModelType> =

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

@@ -11,7 +11,7 @@ import {
 } from "ts-morph";
 import { refkey } from "./refkey.js";
 import { resolveProjectRoot } from "../utils/resolve-project-root.js";
-import { isAzurePackage } from "@azure-tools/rlc-common";
+import { isAzurePackage } from "../rlc-common/index.js";
 import { ModularEmitterOptions } from "../modular/interfaces.js";
 import { NoTarget, Program } from "@typespec/compiler";
 import { reportDiagnostic } from "../lib.js";

package/src/index.ts

@@ -57,6 +57,7 @@ import {
   buildTsSrcBrowserConfig,
   buildTsSrcReactNativeConfig,
   buildTsSrcCjsConfig,
+  buildTsLintConfig,
   buildTestBrowserTsConfig,
   buildTestNodeTsConfig,
   buildVitestConfig,
@@ -68,7 +69,7 @@ import {
   buildSampleEnvFile,
   buildSnippets,
   buildTsSampleConfig
-} from "@azure-tools/rlc-common";
+} from "./rlc-common/index.js";
 import {
   buildRootIndex,
   buildSubClientIndexFile
@@ -579,6 +580,9 @@ export async function $onEmit(context: EmitContext) {
         if (option.generateSample) {
           commonBuilders.push(buildTsSampleConfig);
         }
+        if (isAzureFlavor) {
+          commonBuilders.push(buildTsLintConfig);
+        }
       }
 
       // TODO: need support snippets generation for multi-client cases. https://github.com/Azure/autorest.typescript/issues/3048

package/src/lib.ts

@@ -6,7 +6,7 @@ import {
   DependencyInfo,
   ServiceInfo,
   PackageFlavor
-} from "@azure-tools/rlc-common";
+} from "./rlc-common/index.js";
 import {
   createTypeSpecLibrary,
   JSONSchemaType,
@@ -86,15 +86,6 @@ export interface EmitterOptions {
    * Set to false to return the non-model types directly.
    */
   "wrap-non-model-return"?: boolean;
-  /**
-   * When set to true, HEAD operations with a void response body will return `{ body: boolean }`
-   * instead of `void`, where `body: true` indicates a 2xx success (resource exists) and
-   * `body: false` indicates a non-2xx response (e.g., 404 Not Found).
-   * This matches the HLC behavior for resource existence check operations.
-   * Only applies when `wrap-non-model-return` is also enabled.
-   * Defaults to `false`.
-   */
-  "head-as-boolean"?: boolean;
   /**
    * When enabled, every regular (non-LRO, non-paging) operation return type is augmented with a
    * `_response` property containing `rawResponse`, `parsedBody`, and `parsedHeaders`.
@@ -405,12 +396,6 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       description:
         "When set to true (default for Azure services), non-model return types (arrays, scalars, enums, bytes with binary content type) will be wrapped in an XxxResponse type for HLC backward compatibility during TypeSpec migration."
     },
-    "head-as-boolean": {
-      type: "boolean",
-      nullable: true,
-      description:
-        "When set to true, HEAD operations with void response return `{ body: boolean }` (true=2xx, false=non-2xx) instead of void. Requires wrap-non-model-return to also be enabled. Defaults to false."
-    },
     "enable-storage-compat": {
       type: "boolean",
       nullable: true,

package/src/metaTree.ts

@@ -1,4 +1,4 @@
-import { Schema as RlcType } from "@azure-tools/rlc-common";
+import { Schema as RlcType } from "./rlc-common/index.js";
 import { Type } from "@typespec/compiler";
 
 export interface RlcTypeMetadata {

package/src/modular/buildClassicalClient.ts

@@ -6,7 +6,7 @@ import {
   StructureKind
 } from "ts-morph";
 import { ModularEmitterOptions } from "./interfaces.js";
-import { NameType, normalizeName } from "@azure-tools/rlc-common";
+import { NameType, normalizeName } from "../rlc-common/index.js";
 import {
   buildUserAgentOptions,
   getClientParametersDeclaration

package/src/modular/buildClassicalOperationGroups.ts

@@ -1,4 +1,4 @@
-import { NameType } from "@azure-tools/rlc-common";
+import { NameType } from "../rlc-common/index.js";
 import { SourceFile } from "ts-morph";
 import { getClassicalOperation } from "./helpers/classicalOperationHelpers.js";
 import { getClassicalLayerPrefix } from "./helpers/namingHelpers.js";

package/src/modular/buildClientContext.ts

@@ -3,7 +3,7 @@ import {
   NameType,
   isAzurePackage,
   normalizeName
-} from "@azure-tools/rlc-common";
+} from "../rlc-common/index.js";
 import {
   buildGetClientCredentialParam,
   buildGetClientEndpointParam,

package/src/modular/buildOperations.ts

@@ -1,5 +1,5 @@
 import { ModularEmitterOptions } from "./interfaces.js";
-import { NameType, normalizeName } from "@azure-tools/rlc-common";
+import { NameType, normalizeName } from "../rlc-common/index.js";
 import {
   SourceFile,
   InterfaceDeclarationStructure,

package/src/modular/buildProjectFiles.ts

@@ -1,4 +1,4 @@
-import { NameType } from "@azure-tools/rlc-common";
+import { NameType } from "../rlc-common/index.js";
 
 import { ModularEmitterOptions } from "./interfaces.js";
 import { getClassicalLayerPrefix } from "./helpers/namingHelpers.js";

package/src/modular/buildRestorePoller.ts

@@ -4,7 +4,7 @@ import { ModularEmitterOptions } from "./interfaces.js";
 import path from "path";
 import { buildLroDeserDetailMap } from "./buildOperations.js";
 import { getClassicalClientName } from "./helpers/namingHelpers.js";
-import { NameType, normalizeName } from "@azure-tools/rlc-common";
+import { NameType, normalizeName } from "../rlc-common/index.js";
 import { resolveReference } from "../framework/reference.js";
 import { AzurePollingDependencies } from "./external-dependencies.js";
 import { PollingHelpers } from "./static-helpers-metadata.js";

package/src/modular/buildRootIndex.ts

@@ -2,7 +2,7 @@ import {
   NameType,
   normalizeName,
   isAzurePackage
-} from "@azure-tools/rlc-common";
+} from "../rlc-common/index.js";
 import { Project, SourceFile } from "ts-morph";
 import { getClassicalClientName } from "./helpers/namingHelpers.js";
 import { ModularEmitterOptions } from "./interfaces.js";

package/src/modular/emitModels.ts

@@ -12,7 +12,7 @@ import {
   fixLeadingNumber,
   NameType,
   normalizeName
-} from "@azure-tools/rlc-common";
+} from "../rlc-common/index.js";
 import {
   SdkArrayType,
   SdkModelPropertyType,

package/src/modular/emitModelsOptions.ts

@@ -10,7 +10,7 @@ import {
 } from "@azure-tools/typespec-client-generator-core";
 import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
 import { getModularClientOptions } from "../utils/clientUtils.js";
-import { NameType, normalizeName } from "@azure-tools/rlc-common";
+import { NameType, normalizeName } from "../rlc-common/index.js";
 import { useContext } from "../contextManager.js";
 
 // ====== UTILITIES ======

package/src/modular/emitSamples.ts

@@ -19,7 +19,7 @@ import {
   isAzurePackage,
   NameType,
   normalizeName
-} from "@azure-tools/rlc-common";
+} from "../rlc-common/index.js";
 import { useContext } from "../contextManager.js";
 import { join } from "path";
 import { AzureIdentityDependencies } from "../modular/external-dependencies.js";

package/src/modular/emitTests.ts

@@ -1,6 +1,6 @@
 import { SourceFile } from "ts-morph";
 import { SdkContext } from "../utils/interfaces.js";
-import { NameType, normalizeName } from "@azure-tools/rlc-common";
+import { NameType, normalizeName } from "../rlc-common/index.js";
 import { join } from "path";
 import { existsSync, rmSync } from "fs";
 import { getClassicalClientName } from "./helpers/namingHelpers.js";

package/src/modular/helpers/classicalOperationHelpers.ts

@@ -1,4 +1,4 @@
-import { NameType, normalizeName } from "@azure-tools/rlc-common";
+import { NameType, normalizeName } from "../../rlc-common/index.js";
 import {
   FunctionDeclarationStructure,
   InterfaceDeclarationStructure,

package/src/modular/helpers/clientHelpers.ts

@@ -17,7 +17,7 @@ import {
   NameType,
   normalizeName,
   PackageFlavor
-} from "@azure-tools/rlc-common";
+} from "../../rlc-common/index.js";
 import { SdkContext } from "../../utils/interfaces.js";
 import { getClassicalClientName } from "./namingHelpers.js";
 import { getTypeExpression } from "../type-expressions/get-type-expression.js";

package/src/modular/helpers/exampleValueHelpers.ts

@@ -12,7 +12,7 @@ import {
   isAzurePackage,
   NameType,
   normalizeName
-} from "@azure-tools/rlc-common";
+} from "../../rlc-common/index.js";
 import { resolveReference } from "../../framework/reference.js";
 import { SdkContext } from "../../utils/interfaces.js";
 import {

package/src/modular/helpers/namingHelpers.ts

@@ -2,7 +2,7 @@ import {
   NameType,
   normalizeName,
   ReservedModelNames
-} from "@azure-tools/rlc-common";
+} from "../../rlc-common/index.js";
 import {
   SdkClientType,
   SdkServiceOperation