@azure-tools/typespec-ts 0.38.3 → 0.38.4-alpha.20250307.2

package/src/modular/static-helpers-metadata.ts

@@ -72,6 +72,13 @@ export const PollingHelpers = {
   }
 } as const;
 
+export const UrlTemplateHelpers = {
+  parseTemplate: {
+    kind: "function",
+    name: "expandUrlTemplate",
+    location: "urlTemplate.ts"
+  }
+} as const;
 export const MultipartHelpers = {
   FileContents: {
     kind: "typeAlias",

package/src/transform/transform.ts

@@ -150,6 +150,10 @@ export function transformUrlInfo(
           importedModels.add,
           importedModels
         );
+        const normName = normalizeName(key, NameType.Parameter, true);
+        if (normName !== key && endpoint) {
+          endpoint = endpoint.replace(`{${key}}`, `{${normName}}`);
+        }
         urlParameters.push({
           oriName: key,
           name: normalizeName(key, NameType.Parameter, true),

package/src/transform/transfromRLCOptions.ts

@@ -22,6 +22,7 @@ import { getDefaultService } from "../utils/modelUtils.js";
 import { detectModelConflicts } from "../utils/namespaceUtils.js";
 import { getOperationName } from "../utils/operationUtil.js";
 import { getSupportedHttpAuth } from "../utils/credentialUtils.js";
+import _ from "lodash";
 
 export function transformRLCOptions(
   emitterOptions: EmitterOptions,
@@ -35,40 +36,215 @@ export function transformRLCOptions(
   );
   if (
     !isAzurePackage({ options }) &&
+    emitterOptions["is-modular-library"] !== false &&
     emitterOptions.isModularLibrary !== false
   ) {
     options.isModularLibrary = true;
   }
-  if (dpgContext.arm && emitterOptions.isModularLibrary !== 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);
   const moduleKind = getModuleKind(emitterOptions);
   const serviceInfo = getServiceInfo(program);
   const azureSdkForJs = getAzureSdkForJs(emitterOptions);
-  const generateMetadata: undefined | boolean =
-    getGenerateMetadata(emitterOptions);
-  const generateTest: undefined | boolean = getGenerateTest(
-    emitterOptions,
-    flavor
-  );
-  const generateSample: undefined | boolean = getGenerateSample(
-    dpgContext,
-    emitterOptions
-  );
+  const generateMetadata = getGenerateMetadata(emitterOptions);
+  const generateTest = getGenerateTest(emitterOptions, flavor);
+  const generateSample = getGenerateSample(dpgContext, emitterOptions);
   const credentialInfo = getCredentialInfo(program, emitterOptions);
   const azureOutputDirectory = getAzureOutputDirectory(generationRootDir);
   const enableOperationGroup = getEnableOperationGroup(
@@ -81,8 +257,35 @@ function extractRLCOptions(
   );
   const hierarchyClient = getHierarchyClient(emitterOptions);
   const clearOutputFolder = getClearOutputFolder(emitterOptions);
+  const multiClient =
+    emitterOptions["multi-client"] ?? emitterOptions.multiClient;
+  const isTypeSpecTest =
+    emitterOptions["is-typespec-test"] ?? emitterOptions.isTypeSpecTest;
+  const title = emitterOptions.title;
+  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.experimentalExtensibleEnums;
+  const ignorePropertyNameNormalize =
+    emitterOptions["ignore-property-name-normalize"] ??
+    emitterOptions.ignorePropertyNameNormalize;
+  const ignoreEnumMemberNameNormalize =
+    emitterOptions["ignore-enum-member-name-normalize"] ??
+    emitterOptions.ignoreEnumMemberNameNormalize;
+  const compatibilityQueryMultiFormat =
+    emitterOptions["compatibility-query-multi-format"] ??
+    emitterOptions.compatibilityQueryMultiFormat;
+  const typespecTitleMap =
+    emitterOptions["typespec-title-map"] ?? emitterOptions.typespecTitleMap;
+
   return {
-    ...emitterOptions,
     ...credentialInfo,
     flavor,
     moduleKind,
@@ -99,7 +302,19 @@ function extractRLCOptions(
     enableModelNamespace,
     hierarchyClient,
     azureArm: dpgContext.arm,
-    clearOutputFolder
+    clearOutputFolder,
+    multiClient,
+    isTypeSpecTest,
+    title,
+    dependencyInfo,
+    productDocLink,
+    isModularLibrary,
+    compatibilityMode,
+    experimentalExtensibleEnums,
+    ignorePropertyNameNormalize,
+    compatibilityQueryMultiFormat,
+    typespecTitleMap,
+    ignoreEnumMemberNameNormalize
   };
 }
 
@@ -174,6 +389,12 @@ function getEnableOperationGroup(
   dpgContext: SdkContext,
   emitterOptions: EmitterOptions
 ) {
+  if (
+    emitterOptions["enable-operation-group"] === true ||
+    emitterOptions["enable-operation-group"] === false
+  ) {
+    return emitterOptions["enable-operation-group"];
+  }
   if (
     emitterOptions.enableOperationGroup === true ||
     emitterOptions.enableOperationGroup === false
@@ -188,6 +409,12 @@ function getEnableModelNamespace(
   dpgContext: SdkContext,
   emitterOptions: EmitterOptions
 ) {
+  if (
+    emitterOptions["enable-model-namespace"] === true ||
+    emitterOptions["enable-model-namespace"] === false
+  ) {
+    return emitterOptions["enable-model-namespace"];
+  }
   if (
     emitterOptions.enableModelNamespace === true ||
     emitterOptions.enableModelNamespace === false
@@ -199,6 +426,12 @@ function getEnableModelNamespace(
 }
 
 function getHierarchyClient(emitterOptions: EmitterOptions) {
+  if (
+    emitterOptions["hierarchy-client"] === true ||
+    emitterOptions["hierarchy-client"] === false
+  ) {
+    return emitterOptions["hierarchy-client"];
+  }
   if (
     emitterOptions.hierarchyClient === true ||
     emitterOptions.hierarchyClient === false
@@ -210,7 +443,10 @@ function getHierarchyClient(emitterOptions: EmitterOptions) {
 }
 
 function getClearOutputFolder(emitterOptions: EmitterOptions) {
-  if (emitterOptions.clearOutputFolder === true) {
+  if (
+    emitterOptions["clear-output-folder"] === true ||
+    emitterOptions.clearOutputFolder === true
+  ) {
     return true;
   }
   return false;
@@ -254,11 +490,14 @@ function detectIfNameConflicts(dpgContext: SdkContext) {
 }
 
 function getIncludeShortcuts(emitterOptions: EmitterOptions) {
-  return Boolean(emitterOptions.includeShortcuts);
+  return (
+    Boolean(emitterOptions["include-shortcuts"]) ||
+    Boolean(emitterOptions.includeShortcuts)
+  );
 }
 
 function getModuleKind(emitterOptions: EmitterOptions) {
-  return emitterOptions.moduleKind ?? "esm";
+  return emitterOptions["module-kind"] ?? emitterOptions.moduleKind ?? "esm";
 }
 
 function getFlavor(
@@ -290,11 +529,43 @@ function getFlavor(
     return undefined;
   }
 }
-
-function getPackageDetails(
+function buildPackageDetails(
+  program: Program,
+  emitterOptions: EmitterOptions
+): PackageDetails {
+  const defaultDetail = {
+    name: "@msinternal/unamedpackage",
+    nameWithoutScope: "unamedpackage",
+    version: "1.0.0-beta.1"
+  };
+  const packageDetails: PackageDetails = {
+    ...emitterOptions["package-details"],
+    name:
+      emitterOptions["package-details"]?.name ??
+      normalizeName(
+        emitterOptions?.title ?? getDefaultService(program)?.title ?? "",
+        NameType.Class
+      ),
+    version: emitterOptions["package-details"]?.version ?? "1.0.0-beta.1"
+  };
+  if (emitterOptions["package-details"]?.name) {
+    const nameParts = emitterOptions["package-details"]?.name.split("/");
+    if (nameParts.length === 2) {
+      packageDetails.nameWithoutScope = nameParts[1];
+      packageDetails.scopeName = nameParts[0]?.replace("@", "");
+    }
+  }
+  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:
@@ -312,13 +583,16 @@ function getPackageDetails(
       packageDetails.scopeName = nameParts[0]?.replace("@", "");
     }
   }
-  return (
-    packageDetails ?? {
-      name: "@msinternal/unamedpackage",
-      nameWithoutScope: "unamedpackage",
-      version: "1.0.0-beta.1"
-    }
-  );
+  return packageDetails ?? defaultDetail;
+}
+function getPackageDetails(
+  program: Program,
+  emitterOptions: EmitterOptions
+): PackageDetails {
+  if (emitterOptions["package-details"] !== undefined) {
+    return buildPackageDetails(program, emitterOptions);
+  }
+  return _buildPackageDetails(program, emitterOptions);
 }
 
 function getServiceInfo(program: Program): ServiceInfo {
@@ -332,20 +606,28 @@ function getServiceInfo(program: Program): ServiceInfo {
 function getAzureSdkForJs(emitterOptions: EmitterOptions) {
   return emitterOptions.flavor !== "azure"
     ? false
-    : emitterOptions.azureSdkForJs === undefined ||
-        emitterOptions.azureSdkForJs === null
+    : (emitterOptions["azure-sdk-for-js"] === undefined ||
+          emitterOptions["azure-sdk-for-js"] === null) &&
+        (emitterOptions.azureSdkForJs === undefined ||
+          emitterOptions.azureSdkForJs === null)
       ? true
-      : Boolean(emitterOptions.azureSdkForJs);
+      : Boolean(emitterOptions["azure-sdk-for-js"]) ||
+        Boolean(emitterOptions.azureSdkForJs);
 }
 
 function getGenerateMetadata(emitterOptions: EmitterOptions) {
   if (
-    emitterOptions.generateMetadata === undefined ||
-    emitterOptions.generateMetadata === null
+    (emitterOptions["generate-metadata"] === undefined ||
+      emitterOptions["generate-metadata"] === null) &&
+    (emitterOptions.generateMetadata === undefined ||
+      emitterOptions.generateMetadata === null)
   ) {
     return undefined;
   }
-  return Boolean(emitterOptions.generateMetadata);
+  return (
+    Boolean(emitterOptions["generate-metadata"]) ||
+    Boolean(emitterOptions.generateMetadata)
+  );
 }
 
 /**
@@ -356,18 +638,25 @@ function getGenerateMetadata(emitterOptions: EmitterOptions) {
 function getGenerateTest(emitterOptions: EmitterOptions, flavor?: "azure") {
   if (
     flavor !== "azure" &&
+    (emitterOptions["generate-test"] === undefined ||
+      emitterOptions["generate-test"] === null) &&
     (emitterOptions.generateTest === undefined ||
       emitterOptions.generateTest === null)
   ) {
     return undefined;
   } else if (
     flavor === "azure" &&
+    (emitterOptions["generate-test"] === undefined ||
+      emitterOptions["generate-test"] === null) &&
     (emitterOptions.generateTest === undefined ||
       emitterOptions.generateTest === null)
   ) {
     return true;
   }
-  return Boolean(emitterOptions.generateTest);
+  return (
+    Boolean(emitterOptions["generate-test"]) ||
+    Boolean(emitterOptions.generateTest)
+  );
 }
 
 /**
@@ -383,12 +672,17 @@ function getGenerateSample(
     return true;
   }
   if (
-    emitterOptions.generateSample === undefined ||
-    emitterOptions.generateSample === null
+    (emitterOptions["generate-sample"] === undefined ||
+      emitterOptions["generate-sample"] === null) &&
+    (emitterOptions.generateSample === undefined ||
+      emitterOptions.generateSample === null)
   ) {
     return undefined;
   }
-  return Boolean(emitterOptions.generateSample);
+  return (
+    Boolean(emitterOptions["generate-sample"]) ||
+    Boolean(emitterOptions.generateSample)
+  );
 }
 
 export function getCredentialInfo(
@@ -397,27 +691,32 @@ export function getCredentialInfo(
 ) {
   const securityInfo = processAuth(program);
   const addCredentials =
+    emitterOptions["add-credentials"] === false ||
     emitterOptions.addCredentials === false
       ? false
       : securityInfo
         ? securityInfo.addCredentials
-        : emitterOptions.addCredentials;
+        : (emitterOptions["add-credentials"] ?? emitterOptions.addCredentials);
   const credentialScopes =
     securityInfo && securityInfo.credentialScopes
       ? securityInfo.credentialScopes
-      : emitterOptions.credentialScopes;
+      : (emitterOptions["credential-scopes"] ??
+        emitterOptions.credentialScopes);
   const credentialKeyHeaderName =
     securityInfo && securityInfo.credentialKeyHeaderName
       ? securityInfo.credentialKeyHeaderName
-      : emitterOptions.credentialKeyHeaderName;
+      : (emitterOptions["credential-key-header-name"] ??
+        emitterOptions.credentialKeyHeaderName);
   const customHttpAuthHeaderName =
     securityInfo && securityInfo.customHttpAuthHeaderName
       ? securityInfo.customHttpAuthHeaderName
-      : emitterOptions.customHttpAuthHeaderName;
+      : (emitterOptions["custom-http-auth-header-name"] ??
+        emitterOptions.customHttpAuthHeaderName);
   const customHttpAuthSharedKeyPrefix =
     securityInfo && securityInfo.customHttpAuthSharedKeyPrefix
       ? securityInfo.customHttpAuthSharedKeyPrefix
-      : emitterOptions.customHttpAuthSharedKeyPrefix;
+      : (emitterOptions["custom-http-auth-shared-key-prefix"] ??
+        emitterOptions.customHttpAuthSharedKeyPrefix);
   return {
     addCredentials,
     credentialScopes,

package/src/utils/operationUtil.ts

@@ -421,7 +421,7 @@ export function hasCollectionFormatInfo(
   paramFormat: string
 ) {
   return (
-    getHasMultiCollection(paramType, paramFormat) ||
+    getHasMultiCollection(paramType, paramFormat, false) ||
     getHasSsvCollection(paramType, paramFormat) ||
     getHasTsvCollection(paramType, paramFormat) ||
     getHasCsvCollection(paramType, paramFormat) ||
@@ -490,9 +490,7 @@ export function getCollectionFormatHelper(
   paramType: string,
   paramFormat: string
 ) {
-  // const detail = getSpecialSerializeInfo(paramType, paramFormat);
-  // return detail.descriptions.length > 0 ? detail.descriptions[0] : undefined;
-  if (getHasMultiCollection(paramType, paramFormat)) {
+  if (getHasMultiCollection(paramType, paramFormat, false)) {
     return resolveReference(SerializationHelpers.buildMultiCollection);
   }