@azure-tools/typespec-ts 0.40.0-alpha.20250512.1 → 0.40.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.40.0-alpha.20250512.1",
+  "version": "0.40.0",
   "description": "An experimental TypeSpec emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
@@ -25,7 +25,7 @@
     "@azure-tools/typespec-autorest": "0.56.0",
     "@azure-tools/typespec-azure-core": "0.56.0",
     "@azure-tools/typespec-azure-resource-manager": "0.56.0",
-    "@azure-tools/typespec-client-generator-core": "0.56.1",
+    "@azure-tools/typespec-client-generator-core": "0.56.0",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-lro": "^3.1.0",
@@ -68,7 +68,7 @@
   },
   "peerDependencies": {
     "@azure-tools/typespec-azure-core": "0.56.0",
-    "@azure-tools/typespec-client-generator-core": "0.56.1",
+    "@azure-tools/typespec-client-generator-core": "0.56.0",
     "@typespec/compiler": "1.0.0",
     "@typespec/http": "1.0.0",
     "@typespec/rest": "0.70.0",
@@ -76,7 +76,7 @@
     "@typespec/xml": "0.70.0"
   },
   "dependencies": {
-    "@azure-tools/rlc-common": "0.39.0-alpha.20250512.1",
+    "@azure-tools/rlc-common": "^0.39.0",
     "fs-extra": "^11.1.0",
     "lodash": "^4.17.21",
     "prettier": "^3.3.3",

package/src/index.ts

@@ -166,7 +166,7 @@ export async function $onEmit(context: EmitContext) {
   console.timeEnd("onEmit: build RLC code models");
 
   // 4. Generate sources
-  if (emitterOptions["is-modular-library"]) {
+  if (emitterOptions.isModularLibrary) {
     await generateModularSources();
   } else {
     await generateRLCSources();
@@ -180,8 +180,8 @@ export async function $onEmit(context: EmitContext) {
       await calculateGenerationDir();
     dpgContext.generationPathDetail = generationPathDetail;
     const options: RLCOptions = transformRLCOptions(emitterOptions, dpgContext);
-    emitterOptions["is-modular-library"] = options.isModularLibrary;
-    emitterOptions["generate-sample"] = options.generateSample;
+    emitterOptions.isModularLibrary = options.isModularLibrary;
+    emitterOptions.generateSample = options.generateSample;
     // clear output folder if needed
     if (options.clearOutputFolder) {
       await fsextra.emptyDir(context.emitterOutputDir);
@@ -345,7 +345,7 @@ export async function $onEmit(context: EmitContext) {
     }
     console.timeEnd("onEmit: emit source files");
     // Enable modular sample generation when explicitly set to true or MPG
-    if (emitterOptions["generate-sample"] === true) {
+    if (emitterOptions.generateSample === true) {
       console.time("onEmit: emit samples");
       const samples = emitSamples(dpgContext);
       console.timeEnd("onEmit: emit samples");

package/src/lib.ts

@@ -5,7 +5,8 @@ import {
   PackageDetails,
   DependencyInfo,
   ServiceInfo,
-  PackageFlavor
+  PackageFlavor,
+  RLCOptions
 } from "@azure-tools/rlc-common";
 import {
   createTypeSpecLibrary,
@@ -14,7 +15,7 @@ import {
 } from "@typespec/compiler";
 import { Options } from "prettier";
 
-export interface EmitterOptions {
+export interface EmitterOptions extends RLCOptions {
   "include-shortcuts"?: boolean;
   "multi-client"?: boolean;
   batch?: any[];
@@ -70,10 +71,105 @@ export interface EmitterOptions {
   "default-value-object"?: boolean;
 }
 
+const _RLCOptionsSchema: JSONSchemaType<RLCOptions> = {
+  type: "object",
+  additionalProperties: true,
+  properties: {
+    includeShortcuts: { type: "boolean", nullable: true },
+    multiClient: { type: "boolean", nullable: true },
+    batch: {
+      type: "array",
+      nullable: true,
+      items: {
+        type: "string"
+      }
+    },
+    packageDetails: {
+      type: "object",
+      additionalProperties: true,
+      properties: {
+        name: { type: "string", nullable: false },
+        scopeName: { type: "string", nullable: true },
+        nameWithoutScope: { type: "string", nullable: true },
+        description: { type: "string", nullable: true },
+        version: { type: "string", nullable: true }
+      },
+      required: ["name"],
+      nullable: true
+    },
+    addCredentials: { type: "boolean", nullable: true },
+    credentialScopes: {
+      type: "array",
+      nullable: true,
+      items: { type: "string" }
+    },
+    credentialKeyHeaderName: { type: "string", nullable: true },
+    customHttpAuthHeaderName: { type: "string", nullable: true },
+    customHttpAuthSharedKeyPrefix: { type: "string", nullable: true },
+    generateMetadata: { type: "boolean", nullable: true },
+    generateTest: { type: "boolean", nullable: true },
+    generateSample: { type: "boolean", nullable: true },
+    azureSdkForJs: { type: "boolean", nullable: true },
+    azureOutputDirectory: { type: "string", nullable: true },
+    isTypeSpecTest: { type: "boolean", nullable: true },
+    title: { type: "string", nullable: true },
+    dependencyInfo: {
+      type: "object",
+      additionalProperties: true,
+      properties: {
+        link: { type: "string", nullable: false },
+        description: { type: "string", nullable: false }
+      },
+      required: [],
+      nullable: true
+    },
+    productDocLink: { type: "string", nullable: true },
+    serviceInfo: {
+      type: "object",
+      additionalProperties: true,
+      properties: {
+        title: { type: "string", nullable: true },
+        description: { type: "string", nullable: true }
+      },
+      nullable: true
+    },
+    azureArm: { type: "boolean", nullable: true },
+    sourceFrom: { type: "string", nullable: true },
+    isModularLibrary: { type: "boolean", nullable: true, default: false },
+    enableOperationGroup: { type: "boolean", nullable: true },
+    enableModelNamespace: { type: "boolean", nullable: true },
+    hierarchyClient: { type: "boolean", nullable: true },
+    branded: { type: "boolean", nullable: true },
+    flavor: { type: "string", nullable: true },
+    moduleKind: {
+      type: "string",
+      nullable: true,
+      enum: ["esm", "cjs"],
+      default: "esm"
+    },
+    compatibilityMode: { type: "boolean", nullable: true },
+    experimentalExtensibleEnums: { type: "boolean", nullable: true },
+    clearOutputFolder: { type: "boolean", nullable: true },
+    ignorePropertyNameNormalize: { type: "boolean", nullable: true },
+    ignoreEnumMemberNameNormalize: { type: "boolean", nullable: true },
+    compatibilityQueryMultiFormat: { type: "boolean", nullable: true },
+    typespecTitleMap: {
+      type: "object",
+      additionalProperties: {
+        type: "string"
+      },
+      required: [],
+      nullable: true
+    }
+  },
+  required: []
+};
+
 export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
   type: "object",
   additionalProperties: true,
   properties: {
+    ..._RLCOptionsSchema.properties,
     "include-shortcuts": { type: "boolean", nullable: true },
     "multi-client": { type: "boolean", nullable: true },
     batch: {
@@ -288,6 +384,12 @@ const libDef = {
         default: paramMessage`Please note the decimal type will be converted to number. If you strongly care about precision you can use @encode to encode it as a string for the property - ${"propertyName"}.`
       }
     },
+    "use-kebab-case-option": {
+      severity: "warning",
+      messages: {
+        default: paramMessage`The option - ${"camelCaseOption"} is deprecated and please use this kebab-case one - ${"kebabCaseOption"}.`
+      }
+    },
     "unable-serialized-type": {
       severity: "warning",
       messages: {

package/src/transform/transfromRLCOptions.ts

@@ -36,23 +36,206 @@ export function transformRLCOptions(
   );
   if (
     !isAzurePackage({ options }) &&
-    emitterOptions["is-modular-library"] !== false
+    emitterOptions["is-modular-library"] !== false &&
+    emitterOptions.isModularLibrary !== false
   ) {
     options.isModularLibrary = true;
   }
-  if (dpgContext.arm && emitterOptions["is-modular-library"] !== false) {
+  if (
+    dpgContext.arm &&
+    emitterOptions["is-modular-library"] !== false &&
+    emitterOptions.isModularLibrary !== false
+  ) {
     options.isModularLibrary = true;
   }
   const batch = getRLCClients(dpgContext);
   options.batch = batch;
   return options;
 }
+function reportAllCamelOptionDiagnostics(
+  program: Program,
+  emitterOptions: EmitterOptions
+) {
+  if (emitterOptions.includeShortcuts !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "include-shortcuts",
+      camelCaseOption: "includeShortcuts"
+    });
+  }
+  if (emitterOptions.packageDetails !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "package-details",
+      camelCaseOption: "packageDetails"
+    });
+  }
+  if (emitterOptions.moduleKind !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "module-kind",
+      camelCaseOption: "moduleKind"
+    });
+  }
+  if (emitterOptions.azureSdkForJs !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "azure-sdk-for-js",
+      camelCaseOption: "azureSdkForJs"
+    });
+  }
+  if (emitterOptions.generateMetadata !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "generate-metadata",
+      camelCaseOption: "generateMetadata"
+    });
+  }
+  if (emitterOptions.generateTest !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "generate-test",
+      camelCaseOption: "generateTest"
+    });
+  }
+  if (emitterOptions.generateSample !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "generate-sample",
+      camelCaseOption: "generateSample"
+    });
+  }
+  if (emitterOptions.addCredentials !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "add-credentials",
+      camelCaseOption: "addCredentials"
+    });
+  }
+  if (emitterOptions.credentialScopes !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "credential-scopes",
+      camelCaseOption: "credentialScopes"
+    });
+  }
+  if (emitterOptions.credentialKeyHeaderName !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "credential-key-header-name",
+      camelCaseOption: "credentialKeyHeaderName"
+    });
+  }
+  if (emitterOptions.customHttpAuthHeaderName !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "custom-http-auth-header-name",
+      camelCaseOption: "customHttpAuthHeaderName"
+    });
+  }
+  if (emitterOptions.customHttpAuthSharedKeyPrefix !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "custom-http-auth-shared-key-prefix",
+      camelCaseOption: "customHttpAuthSharedKeyPrefix"
+    });
+  }
+  if (emitterOptions.enableOperationGroup !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "enable-operation-group",
+      camelCaseOption: "enableOperationGroup"
+    });
+  }
+  if (emitterOptions.enableModelNamespace !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "enable-model-namespace",
+      camelCaseOption: "enableModelNamespace"
+    });
+  }
+  if (emitterOptions.hierarchyClient !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "hierarchy-client",
+      camelCaseOption: "hierarchyClient"
+    });
+  }
+  if (emitterOptions.clearOutputFolder !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "clear-output-folder",
+      camelCaseOption: "clearOutputFolder"
+    });
+  }
+  if (emitterOptions.multiClient !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "multi-client",
+      camelCaseOption: "multiClient"
+    });
+  }
+  if (emitterOptions.isTypeSpecTest !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "is-typespec-test",
+      camelCaseOption: "isTypeSpecTest"
+    });
+  }
+  if (emitterOptions.dependencyInfo !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "dependency-info",
+      camelCaseOption: "dependencyInfo"
+    });
+  }
+  if (emitterOptions.productDocLink !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "product-doc-link",
+      camelCaseOption: "productDocLink"
+    });
+  }
+  if (emitterOptions.isModularLibrary !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "is-modular-library",
+      camelCaseOption: "isModularLibrary"
+    });
+  }
+  if (emitterOptions.compatibilityMode !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "compatibility-mode",
+      camelCaseOption: "compatibilityMode"
+    });
+  }
+  if (emitterOptions.experimentalExtensibleEnums !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "experimental-extensible-enums",
+      camelCaseOption: "experimentalExtensibleEnums"
+    });
+  }
+  if (emitterOptions.ignorePropertyNameNormalize !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "ignore-property-name-normalize",
+      camelCaseOption: "ignorePropertyNameNormalize"
+    });
+  }
+  if (emitterOptions.compatibilityQueryMultiFormat !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "compatibility-query-multi-format",
+      camelCaseOption: "compatibilityQueryMultiFormat"
+    });
+  }
+  if (emitterOptions.typespecTitleMap !== undefined) {
+    reportCamelOptionDiagnostic(program, {
+      kebabCaseOption: "typespec-title-map",
+      camelCaseOption: "typespecTitleMap"
+    });
+  }
+}
+export function reportCamelOptionDiagnostic(
+  program: Program,
+  caseOption: {
+    kebabCaseOption: string;
+    camelCaseOption: string;
+  }
+) {
+  reportDiagnostic(program, {
+    code: "use-kebab-case-option",
+    format: {
+      kebabCaseOption: caseOption.kebabCaseOption,
+      camelCaseOption: caseOption.camelCaseOption
+    },
+    target: NoTarget
+  });
+}
 function extractRLCOptions(
   dpgContext: SdkContext,
   emitterOptions: EmitterOptions,
   generationRootDir: string
 ): RLCOptions {
   const program = dpgContext.program;
+  reportAllCamelOptionDiagnostics(program, emitterOptions);
   const includeShortcuts = getIncludeShortcuts(emitterOptions);
   const packageDetails = getPackageDetails(program, emitterOptions);
   const flavor = getFlavor(emitterOptions, packageDetails);
@@ -74,22 +257,33 @@ function extractRLCOptions(
   );
   const hierarchyClient = getHierarchyClient(emitterOptions);
   const clearOutputFolder = getClearOutputFolder(emitterOptions);
-  const multiClient = emitterOptions["multi-client"];
-  const isTypeSpecTest = emitterOptions["is-typespec-test"];
+  const multiClient =
+    emitterOptions["multi-client"] ?? emitterOptions.multiClient;
+  const isTypeSpecTest =
+    emitterOptions["is-typespec-test"] ?? emitterOptions.isTypeSpecTest;
   const title = emitterOptions.title;
-  const dependencyInfo = emitterOptions["dependency-info"];
-  const productDocLink = emitterOptions["product-doc-link"];
-  const isModularLibrary = emitterOptions["is-modular-library"];
-  const compatibilityMode = emitterOptions["compatibility-mode"];
+  const dependencyInfo =
+    emitterOptions["dependency-info"] ?? emitterOptions.dependencyInfo;
+  const productDocLink =
+    emitterOptions["product-doc-link"] ?? emitterOptions.productDocLink;
+  const isModularLibrary =
+    emitterOptions["is-modular-library"] ?? emitterOptions.isModularLibrary;
+  const compatibilityMode =
+    emitterOptions["compatibility-mode"] ?? emitterOptions.compatibilityMode;
   const experimentalExtensibleEnums =
-    emitterOptions["experimental-extensible-enums"];
+    emitterOptions["experimental-extensible-enums"] ??
+    emitterOptions.experimentalExtensibleEnums;
   const ignorePropertyNameNormalize =
-    emitterOptions["ignore-property-name-normalize"];
+    emitterOptions["ignore-property-name-normalize"] ??
+    emitterOptions.ignorePropertyNameNormalize;
   const ignoreEnumMemberNameNormalize =
-    emitterOptions["ignore-enum-member-name-normalize"];
+    emitterOptions["ignore-enum-member-name-normalize"] ??
+    emitterOptions.ignoreEnumMemberNameNormalize;
   const compatibilityQueryMultiFormat =
-    emitterOptions["compatibility-query-multi-format"];
-  const typespecTitleMap = emitterOptions["typespec-title-map"];
+    emitterOptions["compatibility-query-multi-format"] ??
+    emitterOptions.compatibilityQueryMultiFormat;
+  const typespecTitleMap =
+    emitterOptions["typespec-title-map"] ?? emitterOptions.typespecTitleMap;
 
   return {
     ...credentialInfo,
@@ -201,6 +395,12 @@ function getEnableOperationGroup(
   ) {
     return emitterOptions["enable-operation-group"];
   }
+  if (
+    emitterOptions.enableOperationGroup === true ||
+    emitterOptions.enableOperationGroup === false
+  ) {
+    return emitterOptions.enableOperationGroup;
+  }
   // Only detect if existing name conflicts if customers don't set hierarchyClient to true
   return detectIfNameConflicts(dpgContext);
 }
@@ -215,6 +415,12 @@ function getEnableModelNamespace(
   ) {
     return emitterOptions["enable-model-namespace"];
   }
+  if (
+    emitterOptions.enableModelNamespace === true ||
+    emitterOptions.enableModelNamespace === false
+  ) {
+    return emitterOptions.enableModelNamespace;
+  }
   // Detect if existing name conflicts if customers didn't set the option explicitly
   return detectModelConflicts(dpgContext);
 }
@@ -226,12 +432,24 @@ function getHierarchyClient(emitterOptions: EmitterOptions) {
   ) {
     return emitterOptions["hierarchy-client"];
   }
+  if (
+    emitterOptions.hierarchyClient === true ||
+    emitterOptions.hierarchyClient === false
+  ) {
+    return emitterOptions.hierarchyClient;
+  }
   // enable hierarchy client by default if customers didn't set the option explicitly
   return true;
 }
 
 function getClearOutputFolder(emitterOptions: EmitterOptions) {
-  return emitterOptions["clear-output-folder"] ? true : false;
+  if (
+    emitterOptions["clear-output-folder"] === true ||
+    emitterOptions.clearOutputFolder === true
+  ) {
+    return true;
+  }
+  return false;
 }
 
 function detectIfNameConflicts(dpgContext: SdkContext) {
@@ -272,11 +490,14 @@ function detectIfNameConflicts(dpgContext: SdkContext) {
 }
 
 function getIncludeShortcuts(emitterOptions: EmitterOptions) {
-  return Boolean(emitterOptions["include-shortcuts"]);
+  return (
+    Boolean(emitterOptions["include-shortcuts"]) ||
+    Boolean(emitterOptions.includeShortcuts)
+  );
 }
 
 function getModuleKind(emitterOptions: EmitterOptions) {
-  return emitterOptions["module-kind"] ?? "esm";
+  return emitterOptions["module-kind"] ?? emitterOptions.moduleKind ?? "esm";
 }
 
 function getFlavor(
@@ -336,12 +557,42 @@ function buildPackageDetails(
   }
   return packageDetails ?? defaultDetail;
 }
-
+function _buildPackageDetails(
+  program: Program,
+  emitterOptions: EmitterOptions
+): PackageDetails {
+  const defaultDetail = {
+    name: "@msinternal/unamedpackage",
+    nameWithoutScope: "unamedpackage",
+    version: "1.0.0-beta.1"
+  };
+  const packageDetails: PackageDetails = {
+    ...emitterOptions.packageDetails,
+    name:
+      emitterOptions.packageDetails?.name ??
+      normalizeName(
+        emitterOptions?.title ?? getDefaultService(program)?.title ?? "",
+        NameType.Class
+      ),
+    version: emitterOptions.packageDetails?.version ?? "1.0.0-beta.1"
+  };
+  if (emitterOptions.packageDetails?.name) {
+    const nameParts = emitterOptions.packageDetails?.name.split("/");
+    if (nameParts.length === 2) {
+      packageDetails.nameWithoutScope = nameParts[1];
+      packageDetails.scopeName = nameParts[0]?.replace("@", "");
+    }
+  }
+  return packageDetails ?? defaultDetail;
+}
 function getPackageDetails(
   program: Program,
   emitterOptions: EmitterOptions
 ): PackageDetails {
-  return buildPackageDetails(program, emitterOptions);
+  if (emitterOptions["package-details"] !== undefined) {
+    return buildPackageDetails(program, emitterOptions);
+  }
+  return _buildPackageDetails(program, emitterOptions);
 }
 
 function getServiceInfo(program: Program): ServiceInfo {
@@ -358,20 +609,28 @@ function getAzureSdkForJs(
 ) {
   return flavor !== "azure"
     ? false
-    : emitterOptions["azure-sdk-for-js"] === undefined ||
-        emitterOptions["azure-sdk-for-js"] === null
+    : (emitterOptions["azure-sdk-for-js"] === undefined ||
+          emitterOptions["azure-sdk-for-js"] === null) &&
+        (emitterOptions.azureSdkForJs === undefined ||
+          emitterOptions.azureSdkForJs === null)
       ? true
-      : Boolean(emitterOptions["azure-sdk-for-js"]);
+      : Boolean(emitterOptions["azure-sdk-for-js"]) ||
+        Boolean(emitterOptions.azureSdkForJs);
 }
 
 function getGenerateMetadata(emitterOptions: EmitterOptions) {
   if (
-    emitterOptions["generate-metadata"] === undefined ||
-    emitterOptions["generate-metadata"] === null
+    (emitterOptions["generate-metadata"] === undefined ||
+      emitterOptions["generate-metadata"] === null) &&
+    (emitterOptions.generateMetadata === undefined ||
+      emitterOptions.generateMetadata === null)
   ) {
     return undefined;
   }
-  return Boolean(emitterOptions["generate-metadata"]);
+  return (
+    Boolean(emitterOptions["generate-metadata"]) ||
+    Boolean(emitterOptions.generateMetadata)
+  );
 }
 
 /**
@@ -387,7 +646,7 @@ function getGenerateTest(
   if (!getAzureSdkForJs(emitterOptions, flavor)) {
     return false;
   }
-  return emitterOptions["generate-test"];
+  return emitterOptions["generate-test"] ?? emitterOptions.generateTest;
 }
 
 /**
@@ -399,16 +658,21 @@ function getGenerateSample(
   dpgContext: SdkContext,
   emitterOptions: EmitterOptions
 ) {
-  if (dpgContext.arm && emitterOptions["generate-sample"] === undefined) {
+  if (dpgContext.arm && emitterOptions.generateSample === undefined) {
     return true;
   }
   if (
-    emitterOptions["generate-sample"] === undefined ||
-    emitterOptions["generate-sample"] === null
+    (emitterOptions["generate-sample"] === undefined ||
+      emitterOptions["generate-sample"] === null) &&
+    (emitterOptions.generateSample === undefined ||
+      emitterOptions.generateSample === null)
   ) {
     return undefined;
   }
-  return Boolean(emitterOptions["generate-sample"]);
+  return (
+    Boolean(emitterOptions["generate-sample"]) ||
+    Boolean(emitterOptions.generateSample)
+  );
 }
 
 export function getCredentialInfo(
@@ -417,27 +681,32 @@ export function getCredentialInfo(
 ) {
   const securityInfo = processAuth(program);
   const addCredentials =
-    emitterOptions["add-credentials"] === false
+    emitterOptions["add-credentials"] === false ||
+    emitterOptions.addCredentials === false
       ? false
       : securityInfo
         ? securityInfo.addCredentials
-        : emitterOptions["add-credentials"];
+        : (emitterOptions["add-credentials"] ?? emitterOptions.addCredentials);
   const credentialScopes =
     securityInfo && securityInfo.credentialScopes
       ? securityInfo.credentialScopes
-      : emitterOptions["credential-scopes"];
+      : (emitterOptions["credential-scopes"] ??
+        emitterOptions.credentialScopes);
   const credentialKeyHeaderName =
     securityInfo && securityInfo.credentialKeyHeaderName
       ? securityInfo.credentialKeyHeaderName
-      : emitterOptions["credential-key-header-name"];
+      : (emitterOptions["credential-key-header-name"] ??
+        emitterOptions.credentialKeyHeaderName);
   const customHttpAuthHeaderName =
     securityInfo && securityInfo.customHttpAuthHeaderName
       ? securityInfo.customHttpAuthHeaderName
-      : emitterOptions["custom-http-auth-header-name"];
+      : (emitterOptions["custom-http-auth-header-name"] ??
+        emitterOptions.customHttpAuthHeaderName);
   const customHttpAuthSharedKeyPrefix =
     securityInfo && securityInfo.customHttpAuthSharedKeyPrefix
       ? securityInfo.customHttpAuthSharedKeyPrefix
-      : emitterOptions["custom-http-auth-shared-key-prefix"];
+      : (emitterOptions["custom-http-auth-shared-key-prefix"] ??
+        emitterOptions.customHttpAuthSharedKeyPrefix);
   return {
     addCredentials,
     credentialScopes,