@azure-tools/typespec-ts 0.55.0-dev.8 → 0.55.0-dev.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.55.0-dev.8",
-  "description": "An experimental TypeSpec emitter for TypeScript RLC",
+  "version": "0.55.0-dev.9",
+  "description": "An experimental TypeSpec emitter for TypeScript",
   "main": "dist/src/index.js",
   "type": "module",
   "exports": {
@@ -90,31 +90,25 @@
     "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-rlc && npm run integration-test-ci:azure-modular",
+    "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",
     "check:tree": "tsx ./test/commands/check-clean-tree.ts",
-    "test:ts:e2e": "npm run copy:typespec && npm run integration-test-ci:azure-rlc && npm run integration-test-ci:azure-modular",
-    "integration-test-ci": "npm-run-all copy:typespec integration-test-ci:azure-rlc integration-test-ci:azure-modular",
-    "integration-test-ci:sequential": "npm-run-all --serial copy:typespec integration-test-ci:azure-modular && npm run integration-test-ci:azure-modular",
-    "integration-test-ci:azure-rlc": "npm-run-all --silent -p start-test-server:azure-rlc --race generate-and-run:azure-rlc",
+    "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-rlc": "mkdirp -p coverage && npx tsp-spector serve ./node_modules/@azure-tools/azure-http-specs/specs ./node_modules/@typespec/http-specs/specs --coverageFile ./coverage/spector-coverage-typescript-rlc-azure.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",
     "copy:typespec": "rm -rf temp && mkdirp -p temp/specs && mkdirp -p temp/assets && cp -r ./node_modules/@typespec/http-specs/specs/* ./temp/specs && cp -r ./node_modules/@azure-tools/azure-http-specs/specs/* ./temp/specs && cp -r ./test/integration/typespec/* ./temp/specs && cp -r ./node_modules/@typespec/http-specs/assets/* ./temp/assets",
-    "generate-and-run:azure-rlc": "npm run generate-tsp-only:azure-rlc && npm run integration-test:alone:azure-rlc && npm run stop-test-server -- -p 3000",
     "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:azure-modular",
-    "generate-tsp-only:azure-rlc": "npx tsx ./test/commands/gen-spector.js --tag=azure-rlc",
+    "generate-tsp-only": "npm run generate-tsp-only:azure-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:azure-rlc && npm run integration-test:alone:azure-modular",
-    "integration-test:alone:azure-rlc": "vitest run --project integration-azure-rlc",
+    "integration-test:alone": "npm run integration-test:alone:azure-modular",
     "integration-test:alone:azure-modular": "vitest run --project integration-azure-modular",
     "stop-test-server": "npx tsp-spector server stop",
-    "unit-test": "npm-run-all --parallel unit-test:rlc unit-test:modular",
-    "unit-test:rlc": "vitest run --project unit-rlc",
+    "unit-test": "npm run unit-test:modular",
     "unit-test:modular": "cross-env NODE_OPTIONS=--max-old-space-size=8192 vitest run --project unit-modular",
     "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/index.ts

@@ -36,28 +36,16 @@ import {
   RLCOptions,
   buildApiExtractorConfig,
   buildChangelogFile,
-  buildClient,
-  buildClientDefinitions,
   buildEsLintConfig,
-  buildIndexFile,
-  buildIsUnexpectedHelper,
   buildLicenseFile,
-  buildLogger,
   buildPackageFile,
-  buildParameterTypes,
-  buildPollingHelper,
-  buildPaginateHelper as buildRLCPaginateHelper,
   buildReadmeFile,
   buildRecordedClientFile,
-  buildResponseTypes,
   buildSampleEnvFile,
   buildSampleTest,
-  buildSamples,
-  buildSerializeHelper,
   buildSnippets,
   buildTestBrowserTsConfig,
   buildTestNodeTsConfig,
-  buildTopLevelIndex,
   buildTsConfig,
   buildTsLintConfig,
   buildTsSampleConfig,
@@ -74,7 +62,7 @@ import {
   updatePackageFile,
   updateReadmeFile,
 } from "./rlc-common/index.js";
-import { emitContentByBuilder, emitModels } from "./utils/emit-util.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";
 
@@ -201,11 +189,7 @@ export async function $onEmit(context: EmitContext) {
   await clearSamplesDevFolder();
 
   // 4. Generate sources
-  if (emitterOptions["is-modular-library"]) {
-    await generateModularSources();
-  } else {
-    await generateRLCSources();
-  }
+  await generateModularSources();
 
   // 5. Generate metadata and test files
   function getTypespecTsVersion(context: EmitContext): string | undefined {
@@ -222,7 +206,6 @@ export async function $onEmit(context: EmitContext) {
     dpgContext.generationPathDetail = generationPathDetail;
     dpgContext.allServiceNamespaces = listAllServiceNamespaces(dpgContext);
     const options: RLCOptions = transformRLCOptions(emitterOptions, dpgContext);
-    emitterOptions["is-modular-library"] = options.isModularLibrary;
     emitterOptions["generate-sample"] = options.generateSample;
     // clear output folder if needed
     if (options.clearOutputFolder) {
@@ -290,57 +273,6 @@ export async function $onEmit(context: EmitContext) {
     }
   }
 
-  async function generateRLCSources() {
-    for (const rlcModels of rlcCodeModels) {
-      await emitModels(rlcModels, program);
-      await emitContentByBuilder(program, buildClientDefinitions, rlcModels);
-      await emitContentByBuilder(program, buildResponseTypes, rlcModels);
-      await emitContentByBuilder(program, buildClient, rlcModels);
-      await emitContentByBuilder(program, buildParameterTypes, rlcModels);
-      await emitContentByBuilder(program, buildIsUnexpectedHelper, rlcModels);
-      await emitContentByBuilder(program, buildIndexFile, rlcModels);
-      await emitContentByBuilder(program, buildLogger, rlcModels);
-      await emitContentByBuilder(program, buildTopLevelIndex, rlcModels);
-      await emitContentByBuilder(program, buildRLCPaginateHelper, rlcModels);
-      await emitContentByBuilder(program, buildPollingHelper, rlcModels);
-      await emitContentByBuilder(program, buildSerializeHelper, rlcModels);
-      await emitContentByBuilder(
-        program,
-        buildSamples,
-        rlcModels,
-        dpgContext.generationPathDetail?.metadataDir,
-      );
-    }
-    // The binder is only resolved in the modular path, so static helper files
-    // loaded into the outputProject are never written to disk in the RLC path.
-    // The RLC builders reference the platform-types helper (NodeReadableStream),
-    // so emit those files here.
-    await emitRLCStaticHelpers();
-  }
-
-  async function emitRLCStaticHelpers() {
-    if (program.compilerOptions.noEmit || program.hasError() || !rlcCodeModels[0]) {
-      return;
-    }
-    const project = useContext("outputProject");
-    for (const helperFile of project.getSourceFiles()) {
-      const filePath = helperFile.getFilePath();
-      // RLC builders (buildParameterTypes / buildSchemaType) only reference
-      // platform-types (and its browser/react-native variants); emit those
-      // files directly under src/ (strip the static-helpers/ segment) to match
-      // the RLC design where all generated output lives in src/.
-      if (!getBaseFileName(filePath).startsWith("platform-types")) {
-        continue;
-      }
-      const outputPath = filePath.replace(/\/static-helpers\//g, "/");
-      await emitContentByBuilder(
-        program,
-        () => ({ content: helperFile.getFullText(), path: outputPath }),
-        rlcCodeModels[0],
-      );
-    }
-  }
-
   async function generateModularSources() {
     const modularSourcesRoot = dpgContext.generationPathDetail?.modularSourcesDir ?? "src";
     const project = useContext("outputProject");
@@ -441,9 +373,7 @@ export async function $onEmit(context: EmitContext) {
     if (emitterVersion !== undefined) {
       content.emitterVersion = emitterVersion;
     }
-    if (dpgContext.rlcOptions?.isModularLibrary) {
-      content.crossLanguageDefinitions = generateCrossLanguageDefinitionFile(dpgContext);
-    }
+    content.crossLanguageDefinitions = generateCrossLanguageDefinitionFile(dpgContext);
     return {
       path: "metadata.json",
       content: JSON.stringify(content, null, 2),
@@ -495,10 +425,8 @@ export async function $onEmit(context: EmitContext) {
     }
 
     //TODO Need consider multi-client cases
-    if (option.isModularLibrary) {
-      for (const subClient of dpgContext.sdkPackage.clients) {
-        rlcClient.libraryName = subClient.name;
-      }
+    for (const subClient of dpgContext.sdkPackage.clients) {
+      rlcClient.libraryName = subClient.name;
     }
 
     if (shouldGenerateMetadata) {
@@ -524,11 +452,10 @@ export async function $onEmit(context: EmitContext) {
       ) {
         await emitTests(dpgContext, host);
       }
-      let modularPackageInfo = {};
-      if (option.isModularLibrary) {
-        modularPackageInfo = {
-          exports: getModuleExports(context, modularEmitterOptions),
-        };
+      let modularPackageInfo: Record<string, any> = {
+        exports: getModuleExports(context, modularEmitterOptions),
+      };
+      {
         // Build dependencies
         const dependencies: Record<string, string> = {};
         dependencies["@azure/core-util"] = "^1.9.2";
@@ -573,35 +500,30 @@ export async function $onEmit(context: EmitContext) {
         dpgContext.generationPathDetail?.metadataDir,
       );
 
-      if (option.isModularLibrary) {
-        for (const file of project.getSourceFiles()) {
-          await emitContentByBuilder(
-            program,
-            () => ({ content: file.getFullText(), path: file.getFilePath() }),
-            modularEmitterOptions as any,
-          );
-        }
+      for (const file of project.getSourceFiles()) {
+        await emitContentByBuilder(
+          program,
+          () => ({ content: file.getFullText(), path: file.getFilePath() }),
+          modularEmitterOptions as any,
+        );
       }
     } else if (hasPackageFile && !hasManualConvenienceLayer) {
       const updateBuilders = [];
-      let modularPackageInfo = {};
 
       // update existing package.json file with correct dependencies
-      if (option.isModularLibrary) {
-        // Additional format-specific dependencies to merge when migrating
-        // (e.g. fast-xml-parser when XML serialization is used)
-        const additionalDependencies: Record<string, string> = {};
-        if (packageUsesXmlSerialization(dpgContext.sdkPackage)) {
-          additionalDependencies["fast-xml-parser"] = "^4.5.0";
-        }
-        modularPackageInfo = {
-          exports: getModuleExports(context, modularEmitterOptions),
-          clientContextPaths: getRelativeContextPaths(context, modularEmitterOptions),
-          ...(Object.keys(additionalDependencies).length > 0 && {
-            dependencies: additionalDependencies,
-          }),
-        };
+      // Additional format-specific dependencies to merge when migrating
+      // (e.g. fast-xml-parser when XML serialization is used)
+      const additionalDependencies: Record<string, string> = {};
+      if (packageUsesXmlSerialization(dpgContext.sdkPackage)) {
+        additionalDependencies["fast-xml-parser"] = "^4.5.0";
       }
+      const modularPackageInfo = {
+        exports: getModuleExports(context, modularEmitterOptions),
+        clientContextPaths: getRelativeContextPaths(context, modularEmitterOptions),
+        ...(Object.keys(additionalDependencies).length > 0 && {
+          dependencies: additionalDependencies,
+        }),
+      };
 
       // Always update package.json (adds #platform/* imports) and, for modular
       // packages, exports, clientContextPaths and LRO deps.

package/src/lib.ts

@@ -3,7 +3,7 @@
 
 import { createTypeSpecLibrary, JSONSchemaType, paramMessage } from "@typespec/compiler";
 import { Options } from "prettier";
-import { DependencyInfo, PackageDetails, ServiceInfo } from "./rlc-common/index.js";
+import { PackageDetails } from "./rlc-common/index.js";
 
 export interface EmitterOptions {
   /**
@@ -13,9 +13,6 @@ export interface EmitterOptions {
    * currently affected by this option.
    */
   "include-headers-in-response"?: boolean;
-  "include-shortcuts"?: boolean;
-  "multi-client"?: boolean;
-  batch?: any[];
   "package-details"?: PackageDetails;
   "add-credentials"?: boolean;
   /** Three possible values:
@@ -42,14 +39,8 @@ export interface EmitterOptions {
    */
   "generate-test"?: boolean;
   "generate-sample"?: boolean;
-  "azure-output-directory"?: string;
   "is-typespec-test"?: boolean;
-  title?: string;
-  "dependency-info"?: DependencyInfo;
-  "product-doc-link"?: string;
-  "service-info"?: ServiceInfo;
   "azure-arm"?: boolean;
-  "is-modular-library"?: boolean;
   "enable-operation-group"?: boolean;
   "enable-model-namespace"?: boolean;
   "hierarchy-client"?: boolean;
@@ -61,7 +52,6 @@ export interface EmitterOptions {
   "compatibility-query-multi-format"?: boolean;
   "typespec-title-map"?: Record<string, string>;
   "ignore-enum-member-name-normalize"?: boolean;
-  "default-value-object"?: boolean;
   //TODO should remove this after finish the release tool test
   "should-use-pnpm-dep"?: boolean;
   "ignore-nullable-on-optional"?: boolean;
@@ -102,24 +92,6 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       description:
         "This option is used to indicate whether to include response headers in the generated response type. When set to true, the generated response type will include response headers as properties.",
     },
-    "include-shortcuts": {
-      type: "boolean",
-      nullable: true,
-      description: "Deprecated option for RLC legacy generation.",
-    },
-    "multi-client": {
-      type: "boolean",
-      nullable: true,
-      description: "Deprecated option for RLC legacy generation.",
-    },
-    batch: {
-      type: "array",
-      nullable: true,
-      items: {
-        type: "string",
-      },
-      description: "Deprecated option for RLC legacy generation.",
-    },
     "package-details": {
       type: "object",
       additionalProperties: true,
@@ -199,59 +171,16 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       description:
         "Whether to generate sample files, for basic samples of your generated sdks. Defaults to `undefined`. Management packages' default to `true`.",
     },
-    "azure-output-directory": {
-      type: "string",
-      nullable: true,
-      description: "Deprecated option for RLC legacy generation",
-    },
     "is-typespec-test": {
       type: "boolean",
       nullable: true,
       description: "Internal option for test",
     },
-    title: {
-      type: "string",
-      nullable: true,
-      description: "Deprecated option for RLC legacy generation.",
-    },
-    "dependency-info": {
-      type: "object",
-      additionalProperties: true,
-      properties: {
-        link: { type: "string", nullable: false },
-        description: { type: "string", nullable: false },
-      },
-      required: [],
-      nullable: true,
-      description: "Deprecated option for RLC legacy generation.",
-    },
-    "product-doc-link": {
-      type: "string",
-      nullable: true,
-      description: "Deprecated option for RLC legacy generation.",
-    },
-    "service-info": {
-      type: "object",
-      additionalProperties: true,
-      properties: {
-        title: { type: "string", nullable: true },
-        description: { type: "string", nullable: true },
-      },
-      nullable: true,
-      description: "Deprecated option for RLC legacy generation.",
-    },
     "azure-arm": {
       type: "boolean",
       nullable: true,
       description: "Whether the package is an arm package.",
     },
-    "is-modular-library": {
-      type: "boolean",
-      nullable: true,
-      default: false,
-      description:
-        "Whether to generate a Modular library. Defaults to `false`. Arm packages default to `true`.",
-    },
     "enable-operation-group": {
       type: "boolean",
       nullable: true,
@@ -311,11 +240,6 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       description:
         "Whether to generate the backward-compatible code for query parameter serialization for array types in RLC. Defaults to `false`",
     },
-    "default-value-object": {
-      type: "boolean",
-      nullable: true,
-      description: "Deprecated option for RLC legacy generation.",
-    },
     "typespec-title-map": {
       type: "object",
       additionalProperties: {

package/src/rlc-common/helpers/name-constructors.ts

@@ -77,14 +77,7 @@ export function getParameterTypeName(baseNameOrOperationGroup: string, operation
 }
 
 export function getClientName(model: RLCModel) {
-  const clientName = model.libraryName;
-  const clientInterfaceName = model.options?.isModularLibrary
-    ? model.libraryName
-    : clientName.endsWith("Client")
-      ? `${clientName}`
-      : `${clientName}Client`;
-
-  return clientInterfaceName;
+  return model.libraryName;
 }
 
 export function getMultipartPartTypeName(schemaName: string, partName: string) {

package/src/rlc-common/index.ts

@@ -1,27 +1,12 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-export * from "./build-client-definitions.js";
-export * from "./build-client.js";
-export * from "./build-index-file.js";
-export * from "./build-is-unexpected-helper.js";
-export * from "./build-logger.js";
-export * from "./build-paginate-helper.js";
-export * from "./build-parameter-types.js";
-export * from "./build-polling-helper.js";
-export * from "./build-response-types.js";
-export * from "./build-samples.js";
-export * from "./build-schema-type.js";
-export * from "./build-serialize-helper.js";
-export * from "./build-top-level-index-file.js";
 export * from "./helpers/api-version-util.js";
 export * from "./helpers/imports-util.js";
 export * from "./helpers/name-constructors.js";
 export * from "./helpers/name-utils.js";
 export * from "./helpers/operation-helpers.js";
 export * from "./helpers/schema-helpers.js";
-export * from "./helpers/shortcut-methods.js";
-export * from "./helpers/value-generation-util.js";
 export * from "./interfaces.js";
 export * from "./metadata/build-api-extractor-config.js";
 export * from "./metadata/build-changelog-file.js";
@@ -38,4 +23,3 @@ export * from "./test/build-karma-config.js";
 export * from "./test/build-recorded-client.js";
 export * from "./test/build-sample-test.js";
 export * from "./test/build-snippets.js";
-export * from "./transform-sample-groups.js";

package/src/rlc-common/interfaces.ts

@@ -195,8 +195,6 @@ export interface RLCOptions {
    * Whether to include response headers in the generated response types. If true, the generated response types will include headers as properties.
    */
   includeHeadersInResponse?: boolean;
-  includeShortcuts?: boolean;
-  multiClient?: boolean;
   batch?: any[];
   packageDetails?: PackageDetails;
   addCredentials?: boolean;
@@ -226,12 +224,8 @@ export interface RLCOptions {
   generateSample?: boolean;
   azureOutputDirectory?: string;
   isTypeSpecTest?: boolean;
-  title?: string;
-  dependencyInfo?: DependencyInfo;
-  productDocLink?: string;
   serviceInfo?: ServiceInfo;
   azureArm?: boolean;
-  isModularLibrary?: boolean;
   enableOperationGroup?: boolean;
   enableModelNamespace?: boolean;
   hierarchyClient?: boolean;
@@ -275,11 +269,6 @@ export interface ServiceInfo {
   description?: string;
 }
 
-export interface DependencyInfo {
-  link: string;
-  description: string;
-}
-
 export interface File {
   path: string;
   content: string;

package/src/rlc-common/metadata/build-package-file.ts

@@ -2,9 +2,7 @@
 // Licensed under the MIT License.
 
 import { Project, SourceFile } from "ts-morph";
-import { NameType, normalizeName } from "../helpers/name-utils.js";
 import { hasPollingOperations } from "../helpers/operation-helpers.js";
-import { getRelativePartFromSrcPath } from "../helpers/path-utils.js";
 import { RLCModel } from "../interfaces.js";
 import { buildAzureMonorepoPackage } from "./package-json/build-azure-monorepo-package.js";
 import { PackageCommonInfoConfig, resolveWarpExports } from "./package-json/package-common.js";
@@ -29,13 +27,11 @@ export function buildPackageFile(
     nameWithoutScope: model.options?.packageDetails?.nameWithoutScope,
     exports,
     azureArm: model.options?.azureArm,
-    isModularLibrary: model.options?.isModularLibrary ?? false,
     generateReactNativeTarget: model.options?.generateReactNativeTarget,
   };
 
   const extendedConfig = {
     ...config,
-    clientFilePaths: [getClientFilePath(model)],
     hasLro: hasPollingOperations(model),
     monorepoPackageDirectory: model.options?.azureOutputDirectory,
     dependencies,
@@ -182,12 +178,3 @@ function getDescription(model: RLCModel): string {
   }
   return description;
 }
-
-function getClientFilePath(model: RLCModel) {
-  const { srcPath } = model;
-  const sdkReletivePart = getRelativePartFromSrcPath(srcPath);
-  const clientFilename = normalizeName(model.libraryName, NameType.File);
-  return sdkReletivePart
-    ? `src/${sdkReletivePart}/${clientFilename}.ts`
-    : `src/${clientFilename}.ts`;
-}

package/src/rlc-common/metadata/build-readme-file.ts

@@ -8,80 +8,6 @@ import { getClientName } from "../helpers/name-constructors.js";
 import { NameType, normalizeName } from "../helpers/name-utils.js";
 import { RLCModel } from "../interfaces.js";
 
-const azureReadmeRLCTemplate = `# {{ clientDescriptiveName }} library for JavaScript
-
-{{ description }}
-
-{{#if azureArm}}
-**If you are not familiar with our REST client, please spend 5 minutes to take a look at {{#if serviceDocURL}}[the service's documentation]({{ serviceDocURL }}) and {{/if}}our [REST client docs](https://github.com/Azure/azure-sdk-for-js/blob/main/documentation/rest-clients.md) to use this library, the REST client provides a light-weighted & developer friendly way to call azure rest api
-{{else}}
-**Please rely heavily on {{#if serviceDocURL}}[the service's documentation]({{ serviceDocURL }}) and {{/if}}our [REST client docs](https://github.com/Azure/azure-sdk-for-js/blob/main/documentation/rest-clients.md) to use this library**
-{{/if}}
-
-Key links:
-
-{{#if packageSourceURL}}
-- [Source code]({{ packageSourceURL }})
-{{/if}}
-{{#if packageNPMURL}}
-- [Package (NPM)]({{ packageNPMURL }})
-{{/if}}
-{{#if apiRefURL}}
-- [API reference documentation]({{ apiRefURL }})
-{{/if}}
-{{#if serviceDocURL}}
-- [Product documentation]({{ serviceDocURL }})
-{{/if}}
-{{#if samplesURL}}
-- [Samples]({{ samplesURL }})
-{{/if}}
-
-## Getting started
-
-### Currently supported environments
-
-- LTS versions of Node.js
-
-### Prerequisites
-
-- You must have an [Azure subscription](https://azure.microsoft.com/free/){{#if dependencyLink}} and follow [these]({{ dependencyLink }}) instructions{{/if}} to use this package.
-
-### Install the \`{{ clientPackageName }}\` package
-
-Install the {{ clientDescriptiveName }} REST client library for JavaScript with \`npm\`:
-
-\`\`\`bash
-npm install {{ clientPackageName }}
-\`\`\`
-
-### Create and authenticate a \`{{ clientClassName }}\`
-
-To use a [Microsoft Entra token credential](https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/identity/identity/samples/AzureIdentityExamples.md#authenticating-with-a-pre-fetched-access-token),
-provide an instance of the desired credential type obtained from the
-[@azure/identity](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/identity/identity#credentials) library.
-
-To authenticate with Microsoft Entra ID, you must first \`npm\` install [\`@azure/identity\`](https://www.npmjs.com/package/@azure/identity) {{#if dependencyLink}}and
-[{{dependencyDescription }}]({{ dependencyLink }}){{/if}}
-
-After setup, you can choose which type of [credential](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/identity/identity#credentials) from \`@azure/identity\` to use.
-As an example, [DefaultAzureCredential](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/identity/identity#defaultazurecredential)
-can be used to authenticate the client.
-
-## Troubleshooting
-
-### Logging
-
-Enabling logging may help uncover useful information about failures. In order to see a log of HTTP requests and responses, set the \`AZURE_LOG_LEVEL\` environment variable to \`info\`. Alternatively, logging can be enabled at runtime by calling \`setLogLevel\` in the \`@azure/logger\`:
-
-\`\`\`ts {{#if generateTest}}snippet:SetLogLevel{{/if}}
-import { setLogLevel } from "@azure/logger";
-
-setLogLevel("info");
-\`\`\`
-
-For more detailed instructions on how to enable logs, you can look at the [@azure/logger package docs](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/core/logger).
-`;
-
 const azureReadmeModularTemplate = `# {{ clientDescriptiveName }} library for JavaScript
 
 This package contains an isomorphic SDK (runs both in Node.js and in browsers) for {{ clientDescriptiveName }}.
@@ -346,11 +272,7 @@ interface Metadata {
 export function buildReadmeFile(model: RLCModel) {
   const metadata = createMetadata(model) ?? {};
   const readmeFileContents = hbs.compile(
-    model.options
-      ? model.options.isModularLibrary
-        ? azureReadmeModularTemplate
-        : azureReadmeRLCTemplate
-      : nonBrandedReadmeTemplate,
+    model.options ? azureReadmeModularTemplate : nonBrandedReadmeTemplate,
     { noEscape: true },
   );
   return {
@@ -407,16 +329,7 @@ function createMetadata(model: RLCModel): Metadata | undefined {
     return;
   }
   // const packageDetails = model.options.packageDetails;
-  const {
-    packageDetails,
-    azureOutputDirectory,
-    productDocLink,
-    dependencyInfo,
-    multiClient,
-    batch,
-    serviceInfo,
-    isTypeSpecTest,
-  } = model.options;
+  const { packageDetails, azureOutputDirectory, serviceInfo, isTypeSpecTest } = model.options;
 
   const azureHuh =
     packageDetails?.scopeName === "azure" || packageDetails?.scopeName === "azure-rest";
@@ -444,11 +357,8 @@ function createMetadata(model: RLCModel): Metadata | undefined {
     serviceName,
     clientClassName,
     clientPackageName: clientPackageName,
-    clientDescriptiveName: model.options.isModularLibrary
-      ? `${serviceName} client`
-      : `${serviceName} REST client`,
+    clientDescriptiveName: `${serviceName} client`,
     description: serviceInfo?.description ?? packageDetails.description,
-    serviceDocURL: productDocLink,
     packageSourceURL: packageSourceURL,
     packageNPMURL: `https://www.npmjs.com/package/${clientPackageName}`,
     samplesURL:
@@ -456,9 +366,6 @@ function createMetadata(model: RLCModel): Metadata | undefined {
     apiRefURL: azureHuh
       ? `https://learn.microsoft.com/javascript/api/${clientPackageName}${apiRefUrlQueryParameter}`
       : undefined,
-    dependencyDescription: dependencyInfo?.description,
-    dependencyLink: dependencyInfo?.link,
-    hasMultiClients: multiClient && batch && batch.length > 1,
     azureArm: Boolean(model.options.azureArm),
     azure: azureHuh,
     isReleasablePackage: !isTypeSpecTest,
@@ -477,9 +384,7 @@ function getServiceName(model: RLCModel) {
     model?.options?.packageDetails?.scopeName === "azure" ||
     model?.options?.packageDetails?.scopeName === "azure-rest";
   const libraryName = model.libraryName;
-  const serviceTitle = model.options?.isModularLibrary
-    ? model.libraryName
-    : (model.options?.serviceInfo?.title ?? model.libraryName);
+  const serviceTitle = model.libraryName;
   const batch = model?.options?.batch,
     packageDetails = model?.options?.packageDetails;
   let simpleServiceName =