@azure-tools/typespec-ts 0.55.0-dev.4 → 0.55.0-dev.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.55.0-dev.4",
+  "version": "0.55.0-dev.5",
   "description": "An experimental TypeSpec emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
@@ -23,9 +23,9 @@
     "@typespec/spec-api": "^0.1.0-alpha.14 || >=0.1.0-alpha.15-dev <0.1.0-alpha.15",
     "@typespec/tspd": "^0.75.0 || >=0.76.0-dev <0.76.0",
     "@azure-tools/azure-http-specs": "^0.1.0-alpha.42 || >=0.1.0-alpha.43-dev <0.1.0-alpha.43",
-    "@azure-tools/typespec-autorest": "^0.69.0 || >=0.70.0-dev <0.70.0",
+    "@azure-tools/typespec-autorest": "^0.69.1 || >=0.70.0-dev <0.70.0",
     "@azure-tools/typespec-azure-core": "^0.69.0 || >=0.70.0-dev <0.70.0",
-    "@azure-tools/typespec-azure-resource-manager": "^0.69.0 || >=0.70.0-dev <0.70.0",
+    "@azure-tools/typespec-azure-resource-manager": "^0.69.1 || >=0.70.0-dev <0.70.0",
     "@azure-tools/typespec-client-generator-core": "^0.69.0 || >=0.70.0-dev <0.70.0",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
@@ -91,37 +91,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",

package/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

package/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) {

package/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,

package/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);

package/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) {

package/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,

package/src/modular/emit-samples.ts

@@ -14,7 +14,7 @@ import { useContext } from "../context-manager.js";
 import { resolveReference } from "../framework/reference.js";
 import { reportDiagnostic } from "../index.js";
 import { AzureIdentityDependencies } from "../modular/external-dependencies.js";
-import { isAzurePackage, NameType, normalizeName } from "../rlc-common/index.js";
+import { NameType, normalizeName } from "../rlc-common/index.js";
 import { getSubscriptionId } from "../transform/transfrom-rlc-options.js";
 import { hasKeyCredential, hasTokenCredential } from "../utils/credential-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
@@ -464,7 +464,7 @@ function prepareExampleParameters(
 }
 
 function getCredentialExampleValue(
-  dpgContext: SdkContext,
+  _dpgContext: SdkContext,
   initialization: SdkClientInitializationType,
 ): ExampleValue | undefined {
   const keyCredential = hasKeyCredential(initialization),
@@ -475,26 +475,11 @@ function getCredentialExampleValue(
     name: "credential",
   };
   if (keyCredential || tokenCredential) {
-    if (isAzurePackage({ options: dpgContext.rlcOptions })) {
-      // Support DefaultAzureCredential for Azure packages
-      return {
-        ...defaultSetting,
-        value: `new ${resolveReference(AzureIdentityDependencies.DefaultAzureCredential)}()`,
-      };
-    } else if (keyCredential) {
-      // Support ApiKeyCredential for non-Azure packages
-      return {
-        ...defaultSetting,
-        value: `{ key: "INPUT_YOUR_KEY_HERE" }`,
-      };
-    } else if (tokenCredential) {
-      // Support TokenCredential for non-Azure packages
-      return {
-        ...defaultSetting,
-        value: `{ getToken: async () => {
-          return { token: "INPUT_YOUR_TOKEN_HERE", expiresOnTimestamp: now() }; } }`,
-      };
-    }
+    // Support DefaultAzureCredential for Azure packages
+    return {
+      ...defaultSetting,
+      value: `new ${resolveReference(AzureIdentityDependencies.DefaultAzureCredential)}()`,
+    };
   }
   return undefined;
 }

package/src/modular/helpers/client-helpers.ts

@@ -10,7 +10,7 @@ import { OptionalKind, ParameterDeclarationStructure, StatementedNode } from "ts
 import { ModularEmitterOptions } from "../interfaces.js";
 
 import { resolveReference } from "../../framework/reference.js";
-import { NameType, normalizeName, PackageFlavor } from "../../rlc-common/index.js";
+import { NameType, normalizeName } from "../../rlc-common/index.js";
 import { SdkContext } from "../../utils/interfaces.js";
 import { CloudSettingHelpers } from "../static-helpers-metadata.js";
 import { getTypeExpression } from "../type-expressions/get-type-expression.js";
@@ -169,16 +169,10 @@ export function buildGetClientEndpointParam(
   client: SdkClientType<SdkServiceOperation>,
 ): { endpointParamName: string; assignedOptionalParams?: Set<string> } {
   const assignedOptionalParams = new Set<string>();
-  let coreEndpointParam: string;
-  if (dpgContext.rlcOptions?.flavor === "azure") {
-    const cloudSettingSuffix = dpgContext.arm
-      ? ` ?? ${resolveReference(CloudSettingHelpers.getArmEndpoint)}(options.cloudSetting)`
-      : "";
-    coreEndpointParam = `options.endpoint${cloudSettingSuffix}`;
-  } else {
-    // unbranded does not have the deprecated baseUrl parameter
-    coreEndpointParam = `options.endpoint`;
-  }
+  const cloudSettingSuffix = dpgContext.arm
+    ? ` ?? ${resolveReference(CloudSettingHelpers.getArmEndpoint)}(options.cloudSetting)`
+    : "";
+  const coreEndpointParam = `options.endpoint${cloudSettingSuffix}`;
   // Special case: endpoint URL not defined
   const endpointParam = getClientParameters(client, dpgContext, {
     onClientOnly: true,
@@ -248,7 +242,7 @@ export function buildGetClientOptionsParam(
   apiVersionParamName?: string,
 ): string {
   const userAgentOptions = buildUserAgentOptions(context, emitterOptions, "azsdk-js-api");
-  const loggingOptions = buildLoggingOptions(emitterOptions.options.flavor);
+  const loggingOptions = buildLoggingOptions();
   const credentials = buildCredentials(emitterOptions, endpointParam);
 
   // Use the actual api version parameter name for destructuring, defaulting to "apiVersion"
@@ -315,11 +309,7 @@ function buildCredentials(
   return `{ ${scopes}${apiKeyHeaderName} }`;
 }
 
-function buildLoggingOptions(flavor?: PackageFlavor): string | undefined {
-  if (flavor !== "azure") {
-    return undefined;
-  }
-
+function buildLoggingOptions(): string | undefined {
   return `{ logger: options.loggingOptions?.logger ?? logger.info }`;
 }
 

package/src/modular/helpers/example-value-helpers.ts

@@ -12,7 +12,7 @@ import { joinPaths } from "@typespec/compiler";
 import { SourceFile } from "ts-morph";
 import { useContext } from "../../context-manager.js";
 import { resolveReference } from "../../framework/reference.js";
-import { isAzurePackage, NameType, normalizeName } from "../../rlc-common/index.js";
+import { NameType, normalizeName } from "../../rlc-common/index.js";
 import { getSubscriptionId } from "../../transform/transfrom-rlc-options.js";
 import { hasKeyCredential, hasTokenCredential } from "../../utils/credential-utils.js";
 import { SdkContext } from "../../utils/interfaces.js";
@@ -73,7 +73,7 @@ export function prepareCommonValue(
  * Get credential value for samples
  */
 export function getCredentialSampleValue(
-  dpgContext: SdkContext,
+  _dpgContext: SdkContext,
   initialization: SdkClientInitializationType,
 ): CommonValue | undefined {
   const keyCredential = hasKeyCredential(initialization),
@@ -84,26 +84,11 @@ export function getCredentialSampleValue(
     name: "credential",
   };
   if (keyCredential || tokenCredential) {
-    if (isAzurePackage({ options: dpgContext.rlcOptions })) {
-      // Support DefaultAzureCredential for Azure packages
-      return {
-        ...defaultSetting,
-        value: `new ${resolveReference(AzureIdentityDependencies.DefaultAzureCredential)}()`,
-      };
-    } else if (keyCredential) {
-      // Support ApiKeyCredential for non-Azure packages
-      return {
-        ...defaultSetting,
-        value: `{ key: "INPUT_YOUR_KEY_HERE" }`,
-      };
-    } else if (tokenCredential) {
-      // Support TokenCredential for non-Azure packages
-      return {
-        ...defaultSetting,
-        value: `{ getToken: async () => {
-          return { token: "INPUT_YOUR_TOKEN_HERE", expiresOnTimestamp: Date.now() }; } }`,
-      };
-    }
+    // Support DefaultAzureCredential for Azure packages
+    return {
+      ...defaultSetting,
+      value: `new ${resolveReference(AzureIdentityDependencies.DefaultAzureCredential)}()`,
+    };
   }
   return undefined;
 }

package/src/modular/helpers/operation-helpers.ts

@@ -2060,7 +2060,7 @@ function getSerializationExpressionForFlatten(
   );
   const optionalPrefix = property.optional
     ? `${resolveReference(SerializationHelpers.areAllPropsUndefined)}(${propertyPath}, [${validProps
-        .map((p) => `"${p.name}"`)
+        .map((p) => normalizeModelPropertyName(context, p))
         .join(", ")}]) ? undefined : `
     : "";
   return `${optionalPrefix}${serializeFunctionName}(${propertyPath})`;

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

@@ -16,7 +16,6 @@ import { buildMethodShortcutImplementation } from "./build-method-shortcuts.js";
 import { getImportSpecifier } from "./helpers/imports-util.js";
 import { getClientName, getImportModuleName } from "./helpers/name-constructors.js";
 import { NameType, normalizeName } from "./helpers/name-utils.js";
-import { isAzurePackage } from "./helpers/package-util.js";
 import { File, PathParameter, RLCModel } from "./interfaces.js";
 
 function getClientOptionsInterface(
@@ -192,20 +191,18 @@ export function buildClient(model: RLCModel): File | undefined {
       moduleSpecifier: getImportSpecifier("restClient", model.importInfo.runtimeImports),
     },
   ]);
-  if (isAzurePackage(model)) {
-    clientFile.addImportDeclarations([
-      {
-        namedImports: ["logger"],
-        moduleSpecifier: getImportModuleName(
-          {
-            cjsName: loggerPath,
-            esModulesName: `${loggerPath}.js`,
-          },
-          model,
-        ),
-      },
-    ]);
-  }
+  clientFile.addImportDeclarations([
+    {
+      namedImports: ["logger"],
+      moduleSpecifier: getImportModuleName(
+        {
+          cjsName: loggerPath,
+          esModulesName: `${loggerPath}.js`,
+        },
+        model,
+      ),
+    },
+  ]);
 
   const includeKeyCredentialHelper =
     customHttpAuthHeaderName &&
@@ -349,12 +346,10 @@ export function getClientFactoryBody(
   const apiKeyHeaderName = credentialKeyHeaderName
     ? `apiKeyHeaderName: options.credentials?.apiKeyHeaderName ?? "${credentialKeyHeaderName}",`
     : "";
-  const loggerOptions = isAzurePackage(model)
-    ? `,
+  const loggerOptions = `,
   loggingOptions: {
     logger: options.loggingOptions?.logger ?? logger.info
-  }`
-    : "";
+  }`;
 
   const credentialsOptions =
     (scopes || apiKeyHeaderName) && addCredentials
@@ -400,16 +395,12 @@ export function getClientFactoryBody(
   }
 
   let apiVersionPolicyStatement = `client.pipeline.removePolicy({ name: "ApiVersionPolicy" });`;
-  if (isAzurePackage(model) && model.apiVersionInfo?.isCrossedVersion !== false) {
+  if (model.apiVersionInfo?.isCrossedVersion !== false) {
     apiVersionPolicyStatement += `
       if (options.apiVersion) {
         logger.warning("This client does not support client api-version, please change it at the operation level");
       }`;
-  } else if (
-    isAzurePackage(model) &&
-    !model.apiVersionInfo?.defaultValue &&
-    model.apiVersionInfo?.required
-  ) {
+  } else if (!model.apiVersionInfo?.defaultValue && model.apiVersionInfo?.required) {
     apiVersionPolicyStatement += `
       if (options.apiVersion) {
         logger.warning("This client does not support to set api-version in options, please change it at positional argument");

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

@@ -17,7 +17,6 @@ import {
   hasTsvCollection,
   hasUnexpectedHelper,
 } from "./helpers/operation-helpers.js";
-import { isAzurePackage } from "./helpers/package-util.js";
 import { RLCModel } from "./interfaces.js";
 
 export function buildIndexFile(model: RLCModel) {
@@ -328,14 +327,12 @@ function generateRLCIndex(file: SourceFile, model: RLCModel) {
     ]);
   }
 
-  if (isAzurePackage(model)) {
-    file.addExportDeclarations([
-      {
-        moduleSpecifier: "@azure/core-rest-pipeline",
-        namedExports: ["RestError", "isRestError"],
-      },
-    ]);
-  }
+  file.addExportDeclarations([
+    {
+      moduleSpecifier: "@azure/core-rest-pipeline",
+      namedExports: ["RestError", "isRestError"],
+    },
+  ]);
 
   file.addExportAssignment({
     expression: createClientFuncName,

package/src/rlc-common/build-logger.ts

@@ -9,10 +9,6 @@ export function buildLogger(model: RLCModel) {
   if (!model.options) {
     return undefined;
   }
-  // Disable logger for non-Azure packages
-  if (model.options.flavor !== "azure") {
-    return undefined;
-  }
   const project = new Project({ useInMemoryFileSystem: true });
   const { srcPath, rlcSourceDir } = model;
   const { packageDetails } = model.options;