Remove branded and flavor emitter options from typespec-ts (#4668)

## Summary

Removes the `branded` and `flavor` emitter options from
`@azure-tools/typespec-ts`. This package now only generates
Azure-branded packages — unbranded emit moves to
`@typespec/http-client-js`.

This is a **breaking change** to the emitter's public options.

## Changes

**Public surface**
- `lib.ts`: removed `flavor` and `branded` from `EmitterOptions` + the
options JSON schema; reworded the `azure-sdk-for-js` description.
- `interfaces.ts`: deleted the `PackageFlavor` type and `flavor?` from
`RLCOptions`.

**Internal cleanup**
- Removed the `PackageFlavor` plumbing and the `isAzurePackage()`
helper, collapsing every `flavor === "azure"` / `isAzurePackage(...)`
branch to its Azure behavior and deleting all unbranded (`flavor !==
"azure"`) code paths across ~26 source files.
- Deleted the now-dead `build-flavorless-package.ts` and the orphaned
`commonPackageDependencies`.
- `isAzureMonorepoPackage` = `azureSdkForJs`, `isAzureStandalonePackage`
= `!azureSdkForJs` (mutually exclusive, covering all cases).

**Tests**
- Updated 6 unit test files: dropped `flavor`/`branded`/`PackageFlavor`,
removed the non-Azure / "Flavorless lib" cases, and changed
`buildRuntimeImports()` to take no args.
- Deleted the obsolete `apiKeyCredentialClient.md` scenario sample —
key-credential sample generation was an unbranded-only behavior that no
longer exists.

**Test suite dedup**
The integration suite previously covered `{modular, rlc} × {branded,
unbranded}` combinations. With unbranded emit gone, the non-Azure
(standard) integration folders were redundant subsets of their Azure
variants, so they've been removed:
- Deleted `test/modular-integration/` entirely and the non-Azure tests +
generated baselines under `test/integration/` (kept the shared
`test/integration/typespec/` specs that `copy:typespec` feeds into Azure
generation).
- Removed the `integration-rlc` / `integration-modular` vitest projects
and all non-Azure integration scripts from `package.json`.
- Removed the `rlcTsps` / `modularTsps` lists from `spector-list.js` and
their cases in `gen-spector.js`; collapsed the `run.ts` output-path
mapping to Azure-only.
- Regenerated the Azure `encode/duration` baselines (new upstream-spec
"Lossy" duration ops) so the e2e `check:tree` stays clean.

**Docs**
- Regenerated the emitter reference (`reference/emitter.md` + package
`README.md`) so the documented options match.

## Verification
- `tsc -p .` builds clean
- `test-next` suite: **267/267 pass**
- Unit tests: `unit-test:rlc` (316 pass) + `unit-test:modular` (652
pass)
- Azure integration (spector) tests: `azure-modular` (934 pass) +
`azure-rlc` (783 pass)
- `eslint` clean (`--max-warnings=0`)
- `chronus verify` passes (breaking changeset added for
`@azure-tools/typespec-ts`)
- Code-review pass over the diff surfaced no issues

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: xirzec

.chronus/changes/remove-branded-flavor-options-2026-6-17-0-0-0.md

@@ -0,0 +1,8 @@
+---
+# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
+changeKind: breaking
+packages:
+  - "@azure-tools/typespec-ts"
+---
+
+Remove the `branded` and `flavor` emitter options. `@azure-tools/typespec-ts` now only generates Azure-branded packages; use `@typespec/http-client-js` for unbranded emit.

packages/typespec-ts/README.md

@@ -149,7 +149,7 @@ Whether to generate sample files, for basic samples of your generated sdks. Defa
 
 **Type:** `boolean`
 
-This is used to indicate your project is generated in [azure-sdk-for-js](https://github.com/Azure/azure-sdk-for-js) repo or not. If your package is located in that repo we'll leverage `dev-tool` to accelerate our building and testing, however if not we'll remove the dependency for that tool. Defaults to `undefined`. Services with Flavor equal to 'Azure' default to 'true'.
+This is used to indicate your project is generated in [azure-sdk-for-js](https://github.com/Azure/azure-sdk-for-js) repo or not. If your package is located in that repo we'll leverage `dev-tool` to accelerate our building and testing, however if not we'll remove the dependency for that tool. Defaults to `undefined`.
 
 ### `azure-output-directory`
 
@@ -239,18 +239,6 @@ Provides an option to add the model namespace to model names in case of conflict
 
 An option to organize the client in a hierarchical way as defined by `@clientInitialization`. This is true by default.
 
-### `branded`
-
-**Type:** `boolean`
-
-A section of flavor
-
-### `flavor`
-
-**Type:** `string`
-
-The flavor of the SDK.
-
 ### `module-kind`
 
 **Type:** `"esm"`

packages/typespec-ts/package.json

@@ -21,37 +21,26 @@
     "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:standard": "npm run test-next && npm run copy:typespec && npm run unit-test&& npm run integration-test-ci:rlc && npm run integration-test-ci: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:rlc integration-test-ci:azure-rlc integration-test-ci:modular integration-test-ci:azure-modular",
-    "integration-test-ci:sequential": "npm-run-all --serial copy:typespec integration-test-ci:modular && npm run integration-test-ci:modular",
-    "integration-test-ci:rlc": "npm-run-all --silent -p start-test-server:rlc --race generate-and-run:rlc",
+    "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",
-    "integration-test-ci:modular": "npm-run-all --silent -p start-test-server:modular --race generate-and-run: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:rlc": "mkdirp -p coverage && npx tsp-spector serve ./node_modules/@typespec/http-specs/specs --coverageFile ./coverage/spector-coverage-typescript-rlc-standard.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:modular": "mkdirp -p coverage && npx tsp-spector serve ./node_modules/@typespec/http-specs/specs --port 3002  --coverageFile ./coverage/spector-coverage-typescript-modular-standard.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:rlc": "npm run generate-tsp-only:rlc && npm run integration-test:alone:rlc && npm run stop-test-server -- -p 3000",
     "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: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-spector.js --tag=rlc",
+    "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: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",
+    "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:modular": "vitest run --project integration-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",

packages/typespec-ts/src/framework/load-static-helpers.ts

@@ -10,7 +10,6 @@ import {
 } from "ts-morph";
 import { reportDiagnostic } from "../lib.js";
 import { ModularEmitterOptions } from "../modular/interfaces.js";
-import { isAzurePackage } from "../rlc-common/index.js";
 import { resolveProjectRoot } from "../utils/resolve-project-root.js";
 import { refkey } from "./refkey.js";
 export const SourceFileSymbol = Symbol("SourceFile");
@@ -73,10 +72,7 @@ export async function loadStaticHelpers(
   );
   await loadFiles(filesInSources, options.sourcesDir ?? "");
   // Load static helpers used in testing code (only when loadTestHelpers is enabled)
-  if (
-    options.loadTestHelpers ??
-    (options.options?.generateTest && isAzurePackage({ options: options.options }))
-  ) {
+  if (options.loadTestHelpers ?? options.options?.generateTest) {
     const defaultTestingHelpersPath = joinPaths(packageRoot, DEFAULT_SOURCES_TESTING_HELPERS_PATH);
     const filesInTestings = await traverseDirectory(
       defaultTestingHelpersPath,
@@ -99,14 +95,6 @@ export async function loadStaticHelpers(
         overwrite: true,
       });
       addedFile.getImportDeclarations().map((i) => {
-        if (!isAzurePackage({ options: options.options })) {
-          if (i.getModuleSpecifier().getFullText().includes("@azure/core-rest-pipeline")) {
-            i.setModuleSpecifier("@typespec/ts-http-runtime");
-          }
-          if (i.getModuleSpecifier().getFullText().includes("@azure-rest/core-client")) {
-            i.setModuleSpecifier("@typespec/ts-http-runtime");
-          }
-        }
         // Rewrite relative platform-types imports to #platform/ specifiers
         // so that browser/react-native variants are resolved via subpath imports.
         // Only rewrite imports to the default variant (not -browser/-react-native variants

packages/typespec-ts/src/index.ts

@@ -17,7 +17,6 @@ import {
   AzureIdentityDependencies,
   AzurePollingDependencies,
   AzureTestDependencies,
-  DefaultCoreDependencies,
 } from "./modular/external-dependencies.js";
 import {
   CloudSettingHelpers,
@@ -73,7 +72,6 @@ import {
   getClientName,
   hasClientNameChanged,
   hasUnexpectedHelper,
-  isAzurePackage,
   updatePackageFile,
   updateReadmeFile,
 } from "./rlc-common/index.js";
@@ -178,14 +176,12 @@ export async function $onEmit(context: EmitContext) {
       packageRoot: emitterPackageRoot,
     },
   );
-  const extraDependencies = isAzurePackage({ options: rlcOptions })
-    ? {
-        ...AzurePollingDependencies,
-        ...AzureCoreDependencies,
-        ...AzureIdentityDependencies,
-        ...AzureTestDependencies,
-      }
-    : { ...DefaultCoreDependencies };
+  const extraDependencies = {
+    ...AzurePollingDependencies,
+    ...AzureCoreDependencies,
+    ...AzureIdentityDependencies,
+    ...AzureTestDependencies,
+  };
   const binder = provideBinder(outputProject, {
     staticHelpers,
     dependencies: {
@@ -241,8 +237,7 @@ export async function $onEmit(context: EmitContext) {
     options.generateTest =
       options.generateTest === true ||
       (options.generateTest === undefined &&
-        (!hasTestFolder || (options.azureSdkForJs && options.azureArm)) &&
-        isAzurePackage({ options: options }));
+        (!hasTestFolder || (options.azureSdkForJs && options.azureArm)));
     dpgContext.rlcOptions = options;
   }
 
@@ -471,7 +466,6 @@ export async function $onEmit(context: EmitContext) {
     // warp.config.yml, and snippets.spec.ts. metadata.json is still updated.
     const sourcesDir = dpgContext.generationPathDetail?.modularSourcesDir ?? "";
     const hasManualConvenienceLayer = getBaseFileName(sourcesDir) === "generated";
-    const isAzureFlavor = isAzurePackage({ options: option });
     // Generate metadata
     const existingPackageFilePath = joinPaths(
       dpgContext.generationPathDetail?.metadataDir ?? "",
@@ -523,9 +517,7 @@ export async function $onEmit(context: EmitContext) {
         commonBuilders.push((model) => buildTestBrowserTsConfig(model));
         commonBuilders.push((model) => buildTestNodeTsConfig(model));
       }
-      if (isAzureFlavor) {
-        commonBuilders.push(buildEsLintConfig);
-      }
+      commonBuilders.push(buildEsLintConfig);
       if (!hasChangelogFile) {
         commonBuilders.push(buildChangelogFile);
       }
@@ -543,25 +535,16 @@ export async function $onEmit(context: EmitContext) {
         };
         // Build dependencies
         const dependencies: Record<string, string> = {};
-        if (isAzureFlavor) {
-          dependencies["@azure/core-util"] = "^1.9.2";
-        }
+        dependencies["@azure/core-util"] = "^1.9.2";
         // Add fast-xml-parser if XML serialization is used
         if (packageUsesXmlSerialization(dpgContext.sdkPackage)) {
           dependencies["fast-xml-parser"] = "^4.5.0";
         }
-        if (isAzureFlavor) {
-          modularPackageInfo = {
-            ...modularPackageInfo,
-            dependencies,
-            clientContextPaths: getRelativeContextPaths(context, modularEmitterOptions),
-          };
-        } else if (Object.keys(dependencies).length > 0) {
-          modularPackageInfo = {
-            ...modularPackageInfo,
-            dependencies,
-          };
-        }
+        modularPackageInfo = {
+          ...modularPackageInfo,
+          dependencies,
+          clientContextPaths: getRelativeContextPaths(context, modularEmitterOptions),
+        };
       }
       commonBuilders.push((model) => buildPackageFile(model, modularPackageInfo));
       // Generate warp.config.yml for Azure monorepo ESM packages
@@ -579,9 +562,7 @@ export async function $onEmit(context: EmitContext) {
         if (option.generateSample) {
           commonBuilders.push(buildTsSampleConfig);
         }
-        if (isAzureFlavor) {
-          commonBuilders.push(buildTsLintConfig);
-        }
+        commonBuilders.push(buildTsLintConfig);
       }
 
       // TODO: need support snippets generation for multi-client cases. https://github.com/Azure/autorest.typescript/issues/3048
@@ -683,14 +664,12 @@ export async function $onEmit(context: EmitContext) {
         dpgContext.generationPathDetail?.metadataDir,
       );
     }
-    if (isAzureFlavor) {
-      await emitContentByBuilder(
-        program,
-        buildMetadataJson,
-        rlcClient,
-        dpgContext.generationPathDetail?.metadataDir,
-      );
-    }
+    await emitContentByBuilder(
+      program,
+      buildMetadataJson,
+      rlcClient,
+      dpgContext.generationPathDetail?.metadataDir,
+    );
 
     // Generate test relevant files
     if (option.generateTest && !hasTestFolder) {

packages/typespec-ts/src/lib.ts

@@ -3,7 +3,7 @@
 
 import { createTypeSpecLibrary, JSONSchemaType, paramMessage } from "@typespec/compiler";
 import { Options } from "prettier";
-import { DependencyInfo, PackageDetails, PackageFlavor, ServiceInfo } from "./rlc-common/index.js";
+import { DependencyInfo, PackageDetails, ServiceInfo } from "./rlc-common/index.js";
 
 export interface EmitterOptions {
   /**
@@ -54,7 +54,6 @@ export interface EmitterOptions {
   "is-modular-library"?: boolean;
   "module-kind"?: "esm";
   "enable-operation-group"?: boolean;
-  flavor?: PackageFlavor;
   "enable-model-namespace"?: boolean;
   "hierarchy-client"?: boolean;
   "compatibility-mode"?: boolean;
@@ -63,7 +62,6 @@ export interface EmitterOptions {
   "clear-output-folder"?: boolean;
   "ignore-property-name-normalize"?: boolean;
   "compatibility-query-multi-format"?: boolean;
-  branded?: boolean;
   "typespec-title-map"?: Record<string, string>;
   "ignore-enum-member-name-normalize"?: boolean;
   "default-value-object"?: boolean;
@@ -210,7 +208,7 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       type: "boolean",
       nullable: true,
       description:
-        "This is used to indicate your project is generated in [azure-sdk-for-js](https://github.com/Azure/azure-sdk-for-js) repo or not. If your package is located in that repo we'll leverage `dev-tool` to accelerate our building and testing, however if not we'll remove the dependency for that tool. Defaults to `undefined`. Services with Flavor equal to 'Azure' default to 'true'. ",
+        "This is used to indicate your project is generated in [azure-sdk-for-js](https://github.com/Azure/azure-sdk-for-js) repo or not. If your package is located in that repo we'll leverage `dev-tool` to accelerate our building and testing, however if not we'll remove the dependency for that tool. Defaults to `undefined`. ",
     },
     "azure-output-directory": {
       type: "string",
@@ -288,16 +286,6 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       description:
         "An option to organize the client in a hierarchical way as defined by `@clientInitialization`. This is true by default.",
     },
-    branded: {
-      type: "boolean",
-      nullable: true,
-      description: "A section of flavor",
-    },
-    flavor: {
-      type: "string",
-      nullable: true,
-      description: "The flavor of the SDK.",
-    },
     "module-kind": {
       type: "string",
       nullable: true,

packages/typespec-ts/src/modular/build-client-context.ts

@@ -1,4 +1,4 @@
-import { NameType, isAzurePackage, normalizeName } from "../rlc-common/index.js";
+import { NameType, normalizeName } from "../rlc-common/index.js";
 import {
   buildGetClientCredentialParam,
   buildGetClientEndpointParam,
@@ -164,13 +164,10 @@ export function buildClientContext(
   });
 
   // TODO use binder here
-  // (for now) now logger for unbranded pkgs
-  if (isAzurePackage(emitterOptions)) {
-    clientContextFile.addImportDeclaration({
-      moduleSpecifier: "../".repeat(hierarchy.length + 1) + "logger.js",
-      namedImports: ["logger"],
-    });
-  }
+  clientContextFile.addImportDeclaration({
+    moduleSpecifier: "../".repeat(hierarchy.length + 1) + "logger.js",
+    namedImports: ["logger"],
+  });
 
   const factoryFunction = clientContextFile.addFunction({
     docs: getDocsFromDescription(client.doc),
@@ -241,15 +238,10 @@ export function buildClientContext(
     if (!apiVersionInEndpoint && apiVersionParam.clientDefaultValue) {
       apiVersionStatement += `const ${apiVersionParamName} = options.${apiVersionParamName};`;
     }
-  } else if (isAzurePackage(emitterOptions)) {
-    apiVersionStatement += `
-        if (options.apiVersion) {
-          logger.warning("This client does not support client api-version, please change it at the operation level");
-        }`;
   } else {
     apiVersionStatement += `
         if (options.apiVersion) {
-          console.warn("This client does not support client api-version, please change it at the operation level");
+          logger.warning("This client does not support client api-version, please change it at the operation level");
         }`;
   }
   factoryFunction.addStatements(apiVersionStatement);

packages/typespec-ts/src/modular/build-root-index.ts

@@ -4,7 +4,7 @@ import { Project, SourceFile } from "ts-morph";
 import { useContext } from "../context-manager.js";
 import { resolveReference } from "../framework/reference.js";
 import { reportDiagnostic } from "../lib.js";
-import { isAzurePackage, NameType, normalizeName } from "../rlc-common/index.js";
+import { NameType, normalizeName } from "../rlc-common/index.js";
 import { getModularClientOptions } from "../utils/client-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
 import { getMethodHierarchiesMap } from "../utils/operation-util.js";
@@ -28,7 +28,7 @@ export function buildRootIndex(
   if (!clientMap) {
     // we still need to export the models if no client is provided
     exportModels(emitterOptions, rootIndexFile);
-    exportRestErrorTypes(context, rootIndexFile);
+    exportRestErrorTypes(rootIndexFile);
     return;
   }
   const project = useContext("outputProject");
@@ -71,7 +71,7 @@ export function buildRootIndex(
   exportPagingTypes(context, rootIndexFile);
   exportFileContentsType(context, rootIndexFile);
   exportAzureCloudTypes(context, rootIndexFile);
-  exportRestErrorTypes(context, rootIndexFile);
+  exportRestErrorTypes(rootIndexFile);
 }
 
 function exportModels(
@@ -105,10 +105,7 @@ function exportAzureCloudTypes(context: SdkContext, rootIndexFile: SourceFile) {
   }
 }
 
-function exportRestErrorTypes(context: SdkContext, rootIndexFile: SourceFile) {
-  if (!isAzurePackage({ options: context.rlcOptions })) {
-    return;
-  }
+function exportRestErrorTypes(rootIndexFile: SourceFile) {
   const existingExports = getExistingExports(rootIndexFile);
   const namedExports = ["RestError", "isRestError"].filter((name) => !existingExports.has(name));
   if (namedExports.length > 0) {

packages/typespec-ts/src/modular/emit-logger-file.ts

@@ -3,9 +3,6 @@ import { ModularEmitterOptions } from "./interfaces.js";
 
 export function emitLoggerFile(emitterOptions: ModularEmitterOptions, srcPath: string = "src") {
   const project = useContext("outputProject");
-  if (emitterOptions.options.flavor !== "azure") {
-    return;
-  }
 
   const sourceFile = project.createSourceFile(`${srcPath}/logger.ts`, "", {
     overwrite: true,