@azure-tools/typespec-ts 0.54.2 → 0.55.0-dev.10

package/src/rlc-common/metadata/package-json/azure-package-common.ts

@@ -1,152 +1,20 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PackageCommonInfoConfig, getCommonPackageDevDependencies } from "./package-common.js";
+import { PackageCommonInfoConfig } from "./package-common.js";
 
 export interface AzurePackageInfoConfig extends PackageCommonInfoConfig {
   hasLro: boolean;
-  specSource: "Swagger" | "TypeSpec";
 }
 
 /**
  * Build the common package.json config for an Azure package.
  */
-export function getAzureCommonPackageInfo(config: AzurePackageInfoConfig) {
+export function getAzureCommonPackageInfo(_config: AzurePackageInfoConfig) {
   return {
     keywords: ["node", "azure", "cloud", "typescript", "browser", "isomorphic"],
     author: "Microsoft Corporation",
     license: "MIT",
-    ...getAzureCjsCommonInfo(config),
-    ...getAzureEsmCommonInfo(config),
-  };
-}
-
-/**
- * Builds the common dependencies for an Azure package.
- */
-export function getAzurePackageDependencies({
-  hasLro,
-  specSource,
-  dependencies,
-}: AzurePackageInfoConfig) {
-  let azureDependencies: Record<string, string> = {
-    ...dependencies,
-    "@azure-rest/core-client": specSource === "Swagger" ? "^1.4.0" : "^2.3.1",
-    "@azure/core-auth": "^1.6.0",
-    "@azure/core-rest-pipeline": "^1.5.0",
-    "@azure/logger": "^1.0.0",
-    tslib: "^2.6.2",
-  };
-
-  if (hasLro) {
-    azureDependencies = {
-      ...azureDependencies,
-      "@azure/core-lro": "^3.1.0",
-      "@azure/abort-controller": "^2.1.2",
-    };
-  }
-
-  return azureDependencies;
-}
-
-function getAzureCjsCommonInfo({
-  withTests,
-  withSamples,
-  name,
-  nameWithoutScope,
-  moduleKind,
-}: AzurePackageInfoConfig) {
-  if (moduleKind !== "cjs") {
-    return {};
-  }
-
-  return {
-    files: [
-      "dist/",
-      "!dist/**/*.d.*ts.map",
-      withTests || withSamples ? "dist-esm/src/" : "dist-esm/",
-      `types/${nameWithoutScope ?? name}.d.ts`,
-      "README.md",
-      "LICENSE",
-    ],
-  };
-}
-
-function getAzureEsmCommonInfo({ moduleKind }: AzurePackageInfoConfig) {
-  if (moduleKind !== "esm") {
-    return {};
-  }
-  return {
     files: ["dist/", "!dist/**/*.d.*ts.map", "README.md", "LICENSE"],
   };
 }
-
-function getAzurePackageCjsDevDependencies({ moduleKind, withTests }: AzurePackageInfoConfig) {
-  if (moduleKind !== "cjs") {
-    return {};
-  }
-  const testDevDependencies = {
-    "@azure-tools/test-credential": "^1.1.0",
-    "@azure-tools/test-recorder": "^3.0.0",
-    nyc: "^15.1.0",
-    mocha: "^11.0.2",
-    "@types/mocha": "^10.0.0",
-    "@types/chai": "^4.2.8",
-    chai: "^4.2.0",
-    "karma-chrome-launcher": "^3.0.0",
-    "karma-coverage": "^2.0.0",
-    "karma-env-preprocessor": "^0.1.1",
-    "karma-firefox-launcher": "^2.1.3",
-    "karma-junit-reporter": "^2.0.1",
-    "karma-mocha-reporter": "^2.2.5",
-    "karma-mocha": "^2.0.1",
-    "karma-source-map-support": "~1.4.0",
-    "karma-sourcemap-loader": "^0.4.0",
-    karma: "^6.2.0",
-  };
-
-  return {
-    ...(withTests && testDevDependencies),
-    "source-map-support": "^0.5.9",
-  };
-}
-
-function getAzurePackageEsmDevDependencies({ moduleKind, withTests }: AzurePackageInfoConfig) {
-  if (moduleKind !== "esm") {
-    return {};
-  }
-
-  let devDependencies: Record<string, string> = {};
-
-  if (withTests) {
-    devDependencies = {
-      ...devDependencies,
-      "@vitest/browser-playwright": "^4.0.6",
-      "@vitest/coverage-istanbul": "^4.0.6",
-      playwright: "^1.41.2",
-      vitest: "^4.0.6",
-      "@azure-tools/test-credential": "^2.0.0",
-      "@azure-tools/test-recorder": "^4.0.0",
-    };
-  }
-
-  return devDependencies;
-}
-
-export function getAzurePackageDevDependencies(config: AzurePackageInfoConfig) {
-  const esmDevDependencies = getAzurePackageEsmDevDependencies(config);
-  const cjsDevDependencies = getAzurePackageCjsDevDependencies(config);
-
-  const testDevDependencies = {
-    "@azure/identity": "^4.2.1",
-  };
-
-  return {
-    dotenv: "^16.0.0",
-    ...getCommonPackageDevDependencies(config),
-    ...(config.withTests && testDevDependencies),
-    ...(config.specSource === "Swagger" && { autorest: "latest" }),
-    ...esmDevDependencies,
-    ...cjsDevDependencies,
-  };
-}

package/src/rlc-common/metadata/package-json/build-azure-monorepo-package.ts

@@ -6,7 +6,6 @@ import { getCommonPackageScripts, getPackageCommonInfo } from "./package-common.
 
 export interface AzureMonorepoInfoConfig extends AzurePackageInfoConfig {
   monorepoPackageDirectory?: string;
-  clientFilePaths: string[];
   clientContextPaths?: string[];
 }
 
@@ -74,9 +73,6 @@ export function getAzureMonorepoDependencies(config: AzureMonorepoInfoConfig) {
       eslint: "catalog:",
       prettier: "catalog:",
       rimraf: "catalog:",
-      ...(config.specSource === "Swagger" && {
-        autorest: "catalog:",
-      }),
       ...testDeps,
     },
   };
@@ -129,20 +125,9 @@ function getSampleMetadata({ name, version, withSamples }: AzureMonorepoInfoConf
   };
 }
 
-function addSwaggerMetadata(metadata: Record<string, any>, specSource: "Swagger" | "TypeSpec") {
-  if (specSource !== "Swagger") {
-    return;
-  }
-
-  metadata["constantPaths"].push({
-    path: "swagger/README.md",
-    prefix: "package-version",
-  });
-}
-
 function getAzureMonorepoScripts(config: AzureMonorepoInfoConfig) {
-  const esmScripts = getEsmScripts(config);
-  const skipLinting = config.azureArm && config.isModularLibrary;
+  const esmScripts = getEsmScripts();
+  const skipLinting = config.azureArm;
   const buildSampleScripts = config.azureArm
     ? "tsc -p config/tsconfig.samples.json && dev-tool samples publish -f"
     : "tsc -p config/tsconfig.samples.json";
@@ -170,11 +155,7 @@ function getAzureMonorepoScripts(config: AzureMonorepoInfoConfig) {
   };
 }
 
-function getEsmScripts({ moduleKind }: AzureMonorepoInfoConfig) {
-  if (moduleKind !== "esm") {
-    return {};
-  }
-
+function getEsmScripts() {
   return {
     build: "npm run clean && dev-tool run build-package && dev-tool run extract-api",
     "test:node": "dev-tool run test:vitest",
@@ -186,8 +167,7 @@ function getMetadataInfo(config: AzureMonorepoInfoConfig) {
   const metadata: Record<string, any> = {
     constantPaths: [],
   };
-  const paths = config.isModularLibrary ? config.clientContextPaths : config.clientFilePaths;
-  addSwaggerMetadata(metadata, config.specSource);
+  const paths = config.clientContextPaths;
   for (const path of paths ?? []) {
     metadata["constantPaths"].push({
       path: path,

package/src/rlc-common/metadata/package-json/package-common.ts

@@ -6,17 +6,14 @@ export interface PackageCommonInfoConfig {
   nameWithoutScope?: string;
   version: string;
   description: string;
-  moduleKind: "esm" | "cjs";
   withTests: boolean;
   withSamples: boolean;
   exports?: Record<string, any>;
   dependencies?: Record<string, string>;
   azureArm?: boolean;
-  isModularLibrary?: boolean;
-  azureSdkForJs?: boolean;
   /**
    * When true, generates React Native build targets (dist/react-native, exports condition).
-   * Defaults to false. Only applicable when azureSdkForJs is true.
+   * Defaults to false.
    */
   generateReactNativeTarget?: boolean;
 }
@@ -32,7 +29,7 @@ export function getPackageCommonInfo(config: PackageCommonInfoConfig) {
     version,
     description,
     engines: {
-      node: ">=20.0.0",
+      node: ">=22.0.0",
     },
     sideEffects: false,
     autoPublish: false,
@@ -40,110 +37,34 @@ export function getPackageCommonInfo(config: PackageCommonInfoConfig) {
   };
 }
 
-export const commonPackageDependencies = {
-  tslib: "^2.6.2",
-};
-
-export function getCommonPackageDevDependencies(config: PackageCommonInfoConfig) {
-  return {
-    "@types/node": "^20.0.0",
-    eslint: "^9.9.0",
-    typescript: "~5.8.2",
-    ...getEsmDevDependencies(config),
-  };
-}
-
-function getEsmDevDependencies({ moduleKind, azureSdkForJs }: PackageCommonInfoConfig) {
-  if (moduleKind !== "esm") {
-    return {};
-  }
-  // Azure monorepo packages use warp (invoked via dev-tool), no tshy needed
-  if (azureSdkForJs) {
-    return {};
-  }
-  return {
-    tshy: "^2.0.0",
-  };
-}
-
 function getEntryPointInformation(config: PackageCommonInfoConfig) {
-  return {
-    ...getCjsEntrypointInformation(config),
-    ...getEsmEntrypointInformation(config),
-  };
-}
-
-function getCjsEntrypointInformation({
-  name,
-  nameWithoutScope,
-  moduleKind,
-  withTests,
-  withSamples,
-}: PackageCommonInfoConfig) {
-  if (moduleKind !== "cjs") {
-    return;
-  }
-
-  const types =
-    withTests || withSamples
-      ? `./types/src/${nameWithoutScope ?? name}.d.ts`
-      : `./types/${nameWithoutScope ?? name}.d.ts`;
-  const main = withTests || withSamples ? "dist/src/index.js" : "dist/index.js";
-  return {
-    main,
-    module: withTests || withSamples ? "./dist-esm/src/index.js" : "./dist-esm/index.js",
-    types,
-  };
-}
-
-function getEsmEntrypointInformation(config: PackageCommonInfoConfig) {
-  if (config.moduleKind !== "esm") {
-    return;
-  }
-
-  // Azure monorepo packages use warp instead of tshy
-  if (config.azureSdkForJs) {
-    const result: Record<string, any> = {
-      type: "module",
-      main: "./dist/commonjs/index.js",
-      module: "./dist/esm/index.js",
-      types: "./dist/commonjs/index.d.ts",
-      browser: "./dist/browser/index.js",
-      imports: {
-        "#platform/*": {
-          browser: "./src/*-browser.mts",
-          default: "./src/*.ts",
-        } as Record<string, string>,
-      },
-      exports: resolveWarpExports(config.exports, config.generateReactNativeTarget),
-    };
-
-    if (config.generateReactNativeTarget) {
-      result["react-native"] = "./dist/react-native/index.js";
-      (result["imports"]["#platform/*"] as Record<string, string>)["react-native"] =
-        "./src/*-react-native.mts";
-      // Reorder so react-native comes before default
-      const importsEntry = result["imports"]["#platform/*"] as Record<string, string>;
-      result["imports"]["#platform/*"] = {
-        browser: importsEntry["browser"],
-        "react-native": importsEntry["react-native"],
-        default: importsEntry["default"],
-      };
-    }
-
-    return result;
-  }
-
-  // Non-monorepo packages use tshy which manages polyfill resolution
-  // via esmDialects — do NOT add imports here.
+  // Azure monorepo packages use warp.
   const result: Record<string, any> = {
-    tshy: getTshyConfig(config),
     type: "module",
+    main: "./dist/commonjs/index.js",
+    module: "./dist/esm/index.js",
+    types: "./dist/commonjs/index.d.ts",
     browser: "./dist/browser/index.js",
+    imports: {
+      "#platform/*": {
+        browser: "./src/*-browser.mts",
+        default: "./src/*.ts",
+      } as Record<string, string>,
+    },
+    exports: resolveWarpExports(config.exports, config.generateReactNativeTarget),
   };
 
   if (config.generateReactNativeTarget) {
     result["react-native"] = "./dist/react-native/index.js";
+    (result["imports"]["#platform/*"] as Record<string, string>)["react-native"] =
+      "./src/*-react-native.mts";
+    // Reorder so react-native comes before default
+    const importsEntry = result["imports"]["#platform/*"] as Record<string, string>;
+    result["imports"]["#platform/*"] = {
+      browser: importsEntry["browser"],
+      "react-native": importsEntry["react-native"],
+      default: importsEntry["default"],
+    };
   }
 
   return result;
@@ -205,25 +126,6 @@ export function resolveWarpExports(
   return exports;
 }
 
-export function getTshyConfig(config: PackageCommonInfoConfig) {
-  const { exports = {} } = config;
-  const esmDialects = config.generateReactNativeTarget ? ["browser", "react-native"] : ["browser"];
-  const tshyConfig: Record<string, any> = {
-    exports: {
-      "./package.json": "./package.json",
-      ".": "./src/index.ts",
-      ...exports,
-    },
-    dialects: ["esm", "commonjs"],
-    esmDialects,
-    selfLink: false,
-  };
-  if (config.azureSdkForJs) {
-    tshyConfig["project"] = "../../../tsconfig.src.build.json";
-  }
-  return tshyConfig;
-}
-
 export function getCommonPackageScripts() {
   return {
     clean: "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log",

package/src/rlc-common/static/polling-content.ts

@@ -17,7 +17,7 @@ import type {
   {{#each importedResponses}}
   {{this}},
   {{/each}}
-} from "./responses{{#if isEsm}}.js{{/if}}";
+} from "./responses.js";
 {{/if}}
 
 /**

package/src/rlc-common/test/build-recorded-client.ts

@@ -4,15 +4,12 @@ import hbs from "handlebars";
 import { RLCModel } from "../interfaces.js";
 import { recordedClientContent } from "./template.js";
 
-export function buildRecordedClientFile(model: RLCModel) {
+export function buildRecordedClientFile(_model: RLCModel) {
   const recordedClientFileContents = hbs.compile(recordedClientContent, {
     noEscape: true,
   });
   return {
     path: "test/public/utils/recordedClient.ts",
-    content: recordedClientFileContents({
-      isEsm: model.options?.moduleKind === "esm",
-      isCjs: model.options?.moduleKind === "cjs",
-    }),
+    content: recordedClientFileContents({}),
   };
 }

package/src/rlc-common/test/build-sample-test.ts

@@ -4,12 +4,9 @@ import hbs from "handlebars";
 import { RLCModel } from "../interfaces.js";
 import { sampleTestContent } from "./template.js";
 
-export function buildSampleTest(model: RLCModel) {
+export function buildSampleTest(_model: RLCModel) {
   return {
     path: "test/public/sampleTest.spec.ts",
-    content: hbs.compile(sampleTestContent, { noEscape: true })({
-      isEsm: model.options?.moduleKind === "esm",
-      isCjs: model.options?.moduleKind === "cjs",
-    }),
+    content: hbs.compile(sampleTestContent, { noEscape: true })({}),
   };
 }

package/src/rlc-common/test/build-snippets.ts

@@ -5,22 +5,18 @@ import { getClientName } from "../helpers/name-constructors.js";
 import { RLCModel } from "../interfaces.js";
 import { snippetsContent } from "./template.js";
 
-export function buildSnippets(model: RLCModel, clientName?: string, azureSdkForJs?: boolean) {
-  const azureSdkForJsInfo = azureSdkForJs ? azureSdkForJs : model.options?.azureSdkForJs;
+export function buildSnippets(model: RLCModel, clientName?: string) {
   // to keep the same config for azure scope in buildReadmeFile.ts
   if (
     (model?.options?.packageDetails?.scopeName === "azure" ||
       model?.options?.packageDetails?.scopeName === "azure-rest") &&
-    model.options.addCredentials &&
-    azureSdkForJsInfo
+    model.options.addCredentials
   ) {
     return {
       path: "test/snippets.spec.ts",
       content: hbs.compile(snippetsContent, { noEscape: true })({
         clientClassName: clientName ? clientName : getClientName(model),
         azureArm: model.options?.azureArm,
-        azureSdkForJs: azureSdkForJsInfo,
-        isModularLibrary: model.options.isModularLibrary,
         hasSubscriptionId: model.options.hasSubscriptionId,
       }),
     };

package/src/rlc-common/test/template.ts

@@ -128,18 +128,11 @@ module.exports = function (config) {
 
 export const recordedClientContent = `
 
-{{#if isEsm}}
 import {
   Recorder,
   RecorderStartOptions,
   VitestTestContext,
 } from "@azure-tools/test-recorder";
-{{/if}}
-
-{{#if isCjs}}
-import { Context } from "mocha";
-import { Recorder, RecorderStartOptions } from "@azure-tools/test-recorder";
-{{/if}}
 
 const replaceableVariables: Record<string, string> = {
   SUBSCRIPTION_ID: "azure_subscription_id"
@@ -154,25 +147,14 @@ const recorderEnvSetup: RecorderStartOptions = {
  * Should be called first in the test suite to make sure environment variables are
  * read before they are being used.
  */
-{{#if isEsm}}
 export async function createRecorder(context: VitestTestContext): Promise<Recorder> {
   const recorder = new Recorder(context);
   await recorder.start(recorderEnvSetup);
   return recorder;
 }
-{{/if}}
-
-{{#if isCjs}}
-export async function createRecorder(context: Context): Promise<Recorder> {
-  const recorder = new Recorder(context.currentTest);
-  await recorder.start(recorderEnvSetup);
-  return recorder;
-}
-{{/if}}
 `;
 
 export const sampleTestContent = `
-{{#if isEsm}}
 // import { Recorder } from "@azure-tools/test-recorder";
 // import { createRecorder } from "./utils/recordedClient.js";
 import { assert, 
@@ -181,24 +163,12 @@ import { assert,
          it,
          describe
 } from "vitest";
-{{/if}}
-
-{{#if isCjs}}
-// import { Recorder } from "@azure-tools/test-recorder";
-import { assert } from "chai";
-// import { createRecorder } from "./utils/recordedClient{{#if isModularLibrary}}.js{{/if}}";
-// import { Context } from "mocha";
-{{/if}}
 
 describe("My test", () => {
   // let recorder: Recorder;
 
-  // beforeEach(async function({{#if isCjs}}this: Context{{else}}ctx{{/if}}) {
-    {{#if isEsm}}
+  // beforeEach(async function(ctx) {
     // recorder = await createRecorder(ctx);
-    {{else}}
-    // recorder = await createRecorder(this);
-    {{/if}}
   // });
 
   // afterEach(async function() {
@@ -212,15 +182,12 @@ describe("My test", () => {
 `;
 
 export const snippetsContent = `
-{{#if isModularLibrary}}
 import { {{ clientClassName }} } from "../src/index.js";
 import { DefaultAzureCredential, InteractiveBrowserCredential } from "@azure/identity";
-{{/if}}
 import { setLogLevel } from "@azure/logger";
 import { describe, it } from "vitest";
 
 describe("snippets", () => {
-{{#if isModularLibrary}}
   it("ReadmeSampleCreateClient_Node", async () => {
     {{#if azureArm}}
     {{#if hasSubscriptionId}}
@@ -254,7 +221,6 @@ describe("snippets", () => {
     const client = new {{ clientClassName }}("<endpoint>", credential);
     {{/if}}
   });
-  {{/if}}
 
   it("SetLogLevel", async () => {
     setLogLevel("info");

package/src/transform/transform-helper-function-details.ts

@@ -1,5 +1,5 @@
 import { getHttpOperationWithCache, SdkClient } from "@azure-tools/typespec-client-generator-core";
-import { HelperFunctionDetails, PackageFlavor } from "../rlc-common/index.js";
+import { HelperFunctionDetails } from "../rlc-common/index.js";
 import { listOperationsUnderRLCClient } from "../utils/client-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
 import { getCollectionFormat } from "../utils/model-utils.js";
@@ -13,17 +13,8 @@ import {
 export function transformHelperFunctionDetails(
   client: SdkClient,
   dpgContext: SdkContext,
-  flavor?: PackageFlavor,
 ): HelperFunctionDetails {
   const serializeInfo = extractSpecialSerializeInfo(client, dpgContext);
-  // Disable paging and long running for non-Azure clients.
-  if (flavor !== "azure") {
-    return {
-      hasLongRunning: false,
-      hasPaging: false,
-      ...serializeInfo,
-    };
-  }
 
   const annotationDetails = {
     hasLongRunning: hasPollingOperations(client, dpgContext),

package/src/transform/transform-schemas.ts

@@ -78,7 +78,7 @@ export function transformSchemas(client: SdkClient, dpgContext: SdkContext) {
     }
   }
   function transformHostParameters() {
-    const serviceNs = getDefaultService(program, dpgContext.rlcOptions?.isModularLibrary)?.type;
+    const serviceNs = getDefaultService(program)?.type;
     if (serviceNs) {
       const host = getServers(program, serviceNs);
       if (host && host?.[0] && host?.[0]?.parameters) {

package/src/transform/transform.ts

@@ -2,9 +2,8 @@
 // Licensed under the MIT License.
 
 import { SdkClient } from "@azure-tools/typespec-client-generator-core";
-import { getDoc } from "@typespec/compiler";
+import { getDoc, joinPaths } from "@typespec/compiler";
 import { getServers } from "@typespec/http";
-import * as path from "path";
 import {
   buildRuntimeImports,
   Imports,
@@ -19,7 +18,6 @@ import {
   RLCOptions,
   Schema,
   SchemaContext,
-  transformSampleGroups,
   UrlInfo,
 } from "../rlc-common/index.js";
 import { SdkContext } from "../utils/interfaces.js";
@@ -47,19 +45,14 @@ export async function transformRLCModel(
   const program = dpgContext.program;
   const options: RLCOptions = dpgContext.rlcOptions!;
   const rlcSourceDir = dpgContext.generationPathDetail?.rlcSourcesDir;
-  const srcPath = path.join(
+  const srcPath = joinPaths(
     dpgContext.generationPathDetail?.rlcSourcesDir ?? "",
     options.batch && options.batch.length > 1
       ? normalizeName(client.name.replace("Client", ""), NameType.File)
       : "",
   );
   const libraryName = normalizeName(
-    options.batch && (options.isModularLibrary || options.batch.length > 1)
-      ? client.name
-      : (options?.title ??
-          client.name ??
-          getDefaultService(program, options.isModularLibrary)?.title ??
-          ""),
+    options.batch ? client.name : (client.name ?? getDefaultService(program)?.title ?? ""),
     NameType.Class,
   );
   const importSet = initInternalImports();
@@ -73,7 +66,7 @@ export async function transformRLCModel(
     importSet,
     urlInfo?.apiVersionInfo,
   );
-  const helperDetails = transformHelperFunctionDetails(client, dpgContext, options.flavor);
+  const helperDetails = transformHelperFunctionDetails(client, dpgContext);
   // Enrich client-level annotation detail
   helperDetails.clientLroOverload = getClientLroOverload(paths);
 
@@ -92,17 +85,13 @@ export async function transformRLCModel(
     telemetryOptions,
     importInfo: {
       internalImports: importSet,
-      runtimeImports: buildRuntimeImports(options.flavor),
+      runtimeImports: buildRuntimeImports(),
     },
     rlcSourceDir,
   };
-  model.sampleGroups = transformSampleGroups(
-    model,
-    options?.generateSample === true /* Enable mock sample content if generateSample === true */,
-  );
-  options.generateSample =
-    (options.generateSample === true || options.generateSample === undefined) &&
-    (model.sampleGroups ?? []).length > 0;
+  // RLC sample generation has been removed; modular samples are emitted separately,
+  // so the RLC model never carries sample groups.
+  options.generateSample = false;
   return model;
 }