@azure-tools/typespec-ts 0.38.4 → 0.38.5

package/src/modular/emitModelsOptions.ts

@@ -10,6 +10,8 @@ import {
 } from "@azure-tools/typespec-client-generator-core";
 import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
 import { getModularClientOptions } from "../utils/clientUtils.js";
+import { NameType, normalizeName } from "@azure-tools/rlc-common";
+import { useContext } from "../contextManager.js";
 
 // ====== UTILITIES ======
 
@@ -18,37 +20,42 @@ export function buildApiOptions(
   client: SdkClientType<SdkServiceOperation>,
   emitterOptions: ModularEmitterOptions
 ) {
+  const project = useContext("outputProject");
+  const modelOptionsFiles = [];
   const { subfolder } = getModularClientOptions(context, client);
-  const modelOptionsFile = emitterOptions.project.createSourceFile(
-    path.join(
-      emitterOptions.modularOptions.sourceRoot,
-      subfolder ?? "",
-      `api/options.ts`
-    ),
-    undefined,
-    {
-      overwrite: true
-    }
-  );
   const methodMap = getMethodHierarchiesMap(context, client);
   for (const [prefixKey, operations] of methodMap) {
     const prefixes = prefixKey.split("/");
+    const modelOptionsFile = project.createSourceFile(
+      path.join(
+        emitterOptions.modularOptions.sourceRoot,
+        subfolder ?? "",
+        `api`,
+        ...prefixes.map((p) => normalizeName(p, NameType.File)),
+        "options.ts"
+      ),
+      undefined,
+      {
+        overwrite: true
+      }
+    );
     operations.forEach((o) => {
       buildOperationOptions(context, [prefixes, o], modelOptionsFile);
     });
+    modelOptionsFile
+      .getImportDeclarations()
+      .filter((id) => {
+        return (
+          id.isModuleSpecifierRelative() &&
+          !id.getModuleSpecifierValue().endsWith(".js")
+        );
+      })
+      .map((id) => {
+        id.setModuleSpecifier(id.getModuleSpecifierValue() + ".js");
+        return id;
+      });
+    modelOptionsFiles.push(modelOptionsFile);
   }
 
-  modelOptionsFile
-    .getImportDeclarations()
-    .filter((id) => {
-      return (
-        id.isModuleSpecifierRelative() &&
-        !id.getModuleSpecifierValue().endsWith(".js")
-      );
-    })
-    .map((id) => {
-      id.setModuleSpecifier(id.getModuleSpecifierValue() + ".js");
-      return id;
-    });
-  return modelOptionsFile;
+  return modelOptionsFiles;
 }

package/src/modular/emitSamples.ts

@@ -9,9 +9,9 @@ import {
   SdkClientType,
   SdkHttpOperationExample,
   SdkHttpParameterExampleValue,
-  SdkInitializationType,
   SdkServiceOperation,
-  SdkExampleValue
+  SdkExampleValue,
+  SdkClientInitializationType
 } from "@azure-tools/typespec-client-generator-core";
 import {
   isAzurePackage,
@@ -254,7 +254,7 @@ function prepareExampleParameters(
   const result: ExampleValue[] = [];
   const credentialExampleValue = getCredentialExampleValue(
     dpgContext,
-    topLevelClient.initialization
+    topLevelClient.clientInitialization
   );
   if (credentialExampleValue) {
     result.push(credentialExampleValue);
@@ -363,7 +363,7 @@ function prepareExampleParameters(
 
 function getCredentialExampleValue(
   dpgContext: SdkContext,
-  initialization: SdkInitializationType
+  initialization: SdkClientInitializationType
 ): ExampleValue | undefined {
   const keyCredential = hasKeyCredential(initialization),
     tokenCredential = hasTokenCredential(initialization);

package/src/modular/helpers/classicalOperationHelpers.ts

@@ -1,6 +1,7 @@
 import { NameType, normalizeName } from "@azure-tools/rlc-common";
 import {
   FunctionDeclarationStructure,
+  InterfaceDeclarationStructure,
   OptionalKind,
   PropertySignatureStructure,
   SourceFile,
@@ -15,6 +16,9 @@ import {
 } from "@azure-tools/typespec-client-generator-core";
 import { getModularClientOptions } from "../../utils/clientUtils.js";
 import { ServiceOperation } from "../../utils/operationUtil.js";
+import { refkey } from "../../framework/refkey.js";
+import { resolveReference } from "../../framework/reference.js";
+import { addDeclaration } from "../../framework/declaration.js";
 
 export function getClassicalOperation(
   dpgContext: SdkContext,
@@ -51,6 +55,10 @@ export function getClassicalOperation(
     OptionalKind<FunctionDeclarationStructure>,
     string | undefined
   >();
+  const operationKeyMap = new Map<
+    OptionalKind<FunctionDeclarationStructure>,
+    string | undefined
+  >();
   const operationDeclarations: OptionalKind<FunctionDeclarationStructure>[] =
     operations.map((operation) => {
       const declarations = getOperationFunction(
@@ -59,6 +67,10 @@ export function getClassicalOperation(
         rlcClientName
       );
       operationMap.set(declarations, operation.oriName);
+      operationKeyMap.set(
+        declarations,
+        resolveReference(refkey(operation, "api"))
+      );
       return declarations;
     });
 
@@ -69,6 +81,12 @@ export function getClassicalOperation(
     layer
   );
   const interfaceName = `${interfaceNamePrefix}Operations`;
+  const nextLayerInterfaceName = `${getClassicalLayerPrefix(
+    prefixes,
+    NameType.Interface,
+    "",
+    layer + 1
+  )}Operations`;
   const existInterface = classicFile
     .getInterfaces()
     .filter((i) => i.getName() === interfaceName)[0];
@@ -86,12 +104,9 @@ export function getClassicalOperation(
       properties.push({
         kind: StructureKind.PropertySignature,
         name,
-        type: `${getClassicalLayerPrefix(
-          prefixes,
-          NameType.Interface,
-          "",
-          layer + 1
-        )}Operations`
+        type: resolveReference(
+          refkey(nextLayerInterfaceName, layer + 1, "classicOperations")
+        )
       });
     }
   } else {
@@ -104,7 +119,7 @@ export function getClassicalOperation(
           .map(
             (p) =>
               p.name +
-              (p.type?.toString().endsWith("OptionalParams") ||
+              (p.type?.toString().endsWith("operationOptions__") ||
               p.hasQuestionToken
                 ? "?"
                 : "") +
@@ -119,22 +134,30 @@ export function getClassicalOperation(
   if (existInterface) {
     existInterface.addProperties([...properties]);
   } else {
-    classicFile.addInterface({
+    const interfaceDeclaration: InterfaceDeclarationStructure = {
+      kind: StructureKind.Interface,
       name: interfaceName,
       isExported: true,
       properties,
       docs: [`Interface representing a ${interfaceNamePrefix} operations.`]
-    });
+    };
+    addDeclaration(
+      classicFile,
+      interfaceDeclaration,
+      refkey(interfaceName, layer, "classicOperations")
+    );
   }
 
+  const functionName = `_get${getClassicalLayerPrefix(
+    prefixes,
+    NameType.Interface,
+    "",
+    layer
+  )}`;
   if (layer === prefixes.length - 1) {
-    classicFile.addFunction({
-      name: `_get${getClassicalLayerPrefix(
-        prefixes,
-        NameType.Interface,
-        "",
-        layer
-      )}`,
+    const functionDeclaration: FunctionDeclarationStructure = {
+      kind: StructureKind.Function,
+      name: functionName,
       isExported: false,
       parameters: [
         {
@@ -150,14 +173,14 @@ export function getClassicalOperation(
               .map(
                 (p) =>
                   p.name +
-                  (p.type?.toString().endsWith("OptionalParams") ||
+                  (p.type?.toString().endsWith("operationOptions__") ||
                   p.hasQuestionToken
                     ? "?"
                     : "") +
                   ": " +
                   p.type
               )
-              .join(",")}) => ${d.name}(${[
+              .join(",")}) => ${operationKeyMap.get(d)}(${[
               "context",
               ...[
                 d.parameters?.map((p) => p.name).filter((p) => p !== "context")
@@ -166,7 +189,12 @@ export function getClassicalOperation(
           })
           .join(",")}
       }`
-    });
+    };
+    addDeclaration(
+      classicFile,
+      functionDeclaration,
+      refkey(functionName, layer, "getClassicOperation")
+    );
   }
 
   const operationFunctionName = `_get${getClassicalLayerPrefix(
@@ -175,6 +203,12 @@ export function getClassicalOperation(
     "",
     layer
   )}Operations`;
+  const nextLayerOperationFunctionName = `_get${getClassicalLayerPrefix(
+    prefixes,
+    NameType.Interface,
+    "",
+    layer + 1
+  )}Operations`;
   const existFunction = classicFile
     .getFunctions()
     .filter((f) => f.getName() === operationFunctionName)[0];
@@ -195,21 +229,11 @@ export function getClassicalOperation(
           ${normalizeName(
             prefixes[layer + 1] ?? "FIXME",
             NameType.Property
-          )}: _get${getClassicalLayerPrefix(
-            prefixes,
-            NameType.Interface,
-            "",
-            layer + 1
-          )}Operations(context)}`;
+          )}: ${resolveReference(refkey(nextLayerOperationFunctionName, layer + 1, "getClassicOperations"))}(context)}`;
         }
       } else {
         statement = `,
-      ..._get${getClassicalLayerPrefix(
-        prefixes,
-        NameType.Interface,
-        "",
-        layer + 1
-      )}Operations(context)}`;
+      ...${resolveReference(refkey(nextLayerOperationFunctionName, layer + 1, "getClassicOperations"))}(context)}`;
       }
 
       if (statement) {
@@ -218,7 +242,8 @@ export function getClassicalOperation(
       }
     }
   } else {
-    const functions = {
+    const functions: FunctionDeclarationStructure = {
+      kind: StructureKind.Function,
       name: operationFunctionName,
       isExported: true,
       parameters: [
@@ -227,35 +252,26 @@ export function getClassicalOperation(
           type: rlcClientName
         }
       ],
-      returnType: `${getClassicalLayerPrefix(
-        prefixes,
-        NameType.Interface,
-        "",
-        layer
-      )}Operations`,
+      returnType: resolveReference(
+        refkey(interfaceName, layer, "classicOperations")
+      ),
       statements:
         layer !== prefixes.length - 1
           ? `return {
             ${normalizeName(
               prefixes[layer + 1] ?? "FIXME",
               NameType.Property
-            )}: _get${getClassicalLayerPrefix(
-              prefixes,
-              NameType.Interface,
-              "",
-              layer + 1
-            )}Operations(context)   
+            )}: ${resolveReference(refkey(nextLayerOperationFunctionName, layer + 1, "getClassicOperations"))}(context)   
       }`
           : `return {
-        ..._get${getClassicalLayerPrefix(
-          prefixes,
-          NameType.Interface,
-          "",
-          layer
-        )}(context)
+        ...${resolveReference(refkey(functionName, layer, "getClassicOperation"))}(context)
       }`
     };
-    classicFile.addFunction(functions);
+    addDeclaration(
+      classicFile,
+      functions,
+      refkey(operationFunctionName, layer, "getClassicOperations")
+    );
   }
 
   function getClassicalMethodName(

package/src/modular/helpers/clientHelpers.ts

@@ -43,7 +43,7 @@ export function getClientParameters(
   }
 ) {
   const clientParams: (SdkParameter | SdkHttpParameter)[] = [];
-  for (const property of client.initialization.properties) {
+  for (const property of client.clientInitialization.parameters) {
     if (
       property.type.kind === "union" &&
       property.type.variantTypes[0]?.kind === "endpoint"
@@ -283,8 +283,8 @@ export function buildGetClientCredentialParam(
       emitterOptions.options.credentialKeyHeaderName)
   ) {
     return (
-      client.initialization.properties.find((x) => isCredentialType(x))?.name ??
-      "undefined"
+      client.clientInitialization.parameters.find((x) => isCredentialType(x))
+        ?.name ?? "undefined"
     );
   } else {
     return "undefined";

package/src/modular/helpers/namingHelpers.ts

@@ -8,7 +8,6 @@ import {
   SdkServiceOperation
 } from "@azure-tools/typespec-client-generator-core";
 import { ServiceOperation } from "../../utils/operationUtil.js";
-import { toCamelCase, toPascalCase } from "../../utils/casingUtils.js";
 
 export function getClientName(
   client: SdkClientType<SdkServiceOperation>
@@ -27,11 +26,7 @@ export interface GuardedName {
   fixme?: string[];
 }
 
-export function getOperationName(
-  operation: ServiceOperation,
-  options: { casing: "camel" | "pascal" } = { casing: "camel" }
-): GuardedName {
-  const casingFn = options.casing === "camel" ? toCamelCase : toPascalCase;
+export function getOperationName(operation: ServiceOperation): GuardedName {
   if (isReservedName(operation.name, NameType.Operation)) {
     return {
       name: `$${operation.name}`,
@@ -44,7 +39,7 @@ export function getOperationName(
   }
 
   return {
-    name: normalizeName(casingFn(operation.name), NameType.Operation, true)
+    name: normalizeName(operation.name, NameType.Operation, true)
   };
 }
 

package/src/modular/helpers/operationHelpers.ts

@@ -1,7 +1,8 @@
 import {
   FunctionDeclarationStructure,
   OptionalKind,
-  ParameterDeclarationStructure
+  ParameterDeclarationStructure,
+  StructureKind
 } from "ts-morph";
 import { NoTarget, Program } from "@typespec/compiler";
 import {
@@ -29,8 +30,6 @@ import {
   getDocsFromDescription,
   getFixmeForMultilineDocs
 } from "./docsHelpers.js";
-import { toPascalCase } from "../../utils/casingUtils.js";
-
 import { AzurePollingDependencies } from "../external-dependencies.js";
 import { NameType, normalizeName } from "@azure-tools/rlc-common";
 import { buildModelDeserializer } from "../serialization/buildDeserializerFunction.js";
@@ -92,9 +91,9 @@ export function getSendPrivateFunction(
   const operationMethod = operation.operation.verb.toLowerCase();
   const optionalParamName = getOptionalParamsName(parameters);
   const hasQueryApiVersion = operation.operation.parameters.some(
-    (p) => p.isApiVersionParam && p.onClient && p.kind === "query"
+    (p) => p.onClient && p.kind === "query" && p.isApiVersionParam
   );
-  const hasClientApiVersion = client.initialization.properties.some(
+  const hasClientApiVersion = client.clientInitialization.parameters.some(
     (p) => p.isApiVersionParam && p.onClient && p.kind === "method"
   );
   const statements: string[] = [];
@@ -344,8 +343,9 @@ function getOptionalParamsName(
   parameters: OptionalKind<ParameterDeclarationStructure>[]
 ) {
   return (
-    parameters.filter((p) => p.type?.toString().endsWith("OptionalParams"))[0]
-      ?.name ?? "options"
+    parameters.filter((p) =>
+      p.type?.toString().endsWith("operationOptions__")
+    )[0]?.name ?? "options"
   );
 }
 
@@ -355,7 +355,7 @@ function getOperationSignatureParameters(
   clientType: string
 ): OptionalKind<ParameterDeclarationStructure>[] {
   const operation = method[1];
-  const optionsType = getOperationOptionsName(method, true);
+  const optionsType = resolveReference(refkey(method[1], "operationOptions"));
   const parameters: Map<
     string,
     OptionalKind<ParameterDeclarationStructure>
@@ -411,7 +411,7 @@ export function getOperationFunction(
   context: SdkContext,
   method: [string[], ServiceOperation],
   clientType: string
-): OptionalKind<FunctionDeclarationStructure> & { propertyName?: string } {
+): FunctionDeclarationStructure & { propertyName?: string } {
   const operation = method[1];
   // Extract required parameters
   const parameters: OptionalKind<ParameterDeclarationStructure>[] =
@@ -449,6 +449,7 @@ export function getOperationFunction(
   }
   const { name, fixme = [] } = getOperationName(operation);
   const functionStatement = {
+    kind: StructureKind.Function,
     docs: [
       ...getDocsFromDescription(operation.doc),
       ...getFixmeForMultilineDocs(fixme)
@@ -472,7 +473,7 @@ export function getOperationFunction(
   return {
     ...functionStatement,
     statements
-  };
+  } as FunctionDeclarationStructure & { propertyName?: string };
 }
 
 function getLroOnlyOperationFunction(
@@ -480,7 +481,7 @@ function getLroOnlyOperationFunction(
   method: [string[], SdkLroServiceMethod<SdkHttpOperation>],
   clientType: string,
   optionalParamName: string = "options"
-) {
+): FunctionDeclarationStructure & { propertyName?: string } {
   const operation = method[1];
   // Extract required parameters
   const parameters: OptionalKind<ParameterDeclarationStructure>[] =
@@ -494,6 +495,7 @@ function getLroOnlyOperationFunction(
     AzurePollingDependencies.OperationState
   );
   const functionStatement = {
+    kind: StructureKind.Function,
     docs: [
       ...getDocsFromDescription(operation.doc),
       ...getFixmeForMultilineDocs(fixme)
@@ -544,7 +546,7 @@ function getLroOnlyOperationFunction(
   return {
     ...functionStatement,
     statements
-  };
+  } as FunctionDeclarationStructure & { propertyName?: string };
 }
 
 function buildLroReturnType(
@@ -566,7 +568,7 @@ function getPagingOnlyOperationFunction(
   context: SdkContext,
   method: [string[], SdkPagingServiceMethod<SdkHttpOperation>],
   clientType: string
-) {
+): FunctionDeclarationStructure & { propertyName?: string } {
   const operation = method[1];
   // Extract required parameters
   const parameters: OptionalKind<ParameterDeclarationStructure>[] =
@@ -590,6 +592,7 @@ function getPagingOnlyOperationFunction(
     PagingHelpers.BuildPagedAsyncIterator
   );
   const functionStatement = {
+    kind: StructureKind.Function,
     docs: [
       ...getDocsFromDescription(operation.doc),
       ...getFixmeForMultilineDocs(fixme)
@@ -626,7 +629,7 @@ function getPagingOnlyOperationFunction(
   return {
     ...functionStatement,
     statements
-  };
+  } as FunctionDeclarationStructure & { propertyName?: string };
 }
 
 export function getOperationOptionsName(
@@ -639,7 +642,7 @@ export function getOperationOptionsName(
     includeGroupName && operation.name.indexOf("_") === -1
       ? getClassicalLayerPrefix(prefixes, NameType.Interface)
       : "";
-  const optionName = `${prefix}${toPascalCase(operation.name)}OptionalParams`;
+  const optionName = `${prefix}${normalizeName(operation.name, NameType.Interface)}OptionalParams`;
   return optionName;
 }
 

package/src/modular/interfaces.ts

@@ -1,5 +1,4 @@
 import { RLCOptions } from "@azure-tools/rlc-common";
-import { Project } from "ts-morph";
 
 export interface ModularOptions {
   sourceRoot: string;
@@ -9,7 +8,6 @@ export interface ModularOptions {
 export interface ModularEmitterOptions {
   options: RLCOptions;
   modularOptions: ModularOptions;
-  project: Project;
 }
 
 export interface ModularClientOptions {

package/src/modular/serialization/buildDeserializerFunction.ts

@@ -7,18 +7,18 @@ import {
   SdkUnionType,
   UsageFlags
 } from "@azure-tools/typespec-client-generator-core";
-import { toCamelCase, toPascalCase } from "../../utils/casingUtils.js";
-
 import { SdkContext } from "../../utils/interfaces.js";
 import { getResponseMapping } from "../helpers/operationHelpers.js";
 import { normalizeModelName } from "../emitModels.js";
-import { NameType } from "@azure-tools/rlc-common";
+import { NameType, normalizeName } from "@azure-tools/rlc-common";
 import { isAzureCoreErrorType } from "../../utils/modelUtils.js";
 import {
   isDiscriminatedUnion,
   isSupportedSerializeType,
   ModelSerializeOptions
 } from "./serializeUtils.js";
+import { refkey } from "../../framework/refkey.js";
+import { resolveReference } from "../../framework/reference.js";
 
 export function buildModelDeserializer(
   context: SdkContext,
@@ -123,7 +123,7 @@ function buildPolymorphicDeserializer(
     NameType.Operation
   )}Deserializer`;
   if (nameOnly) {
-    return deserializeFunctionName;
+    return resolveReference(refkey(type, "deserializer"));
   }
   const deserializerFunction: FunctionDeclarationStructure = {
     kind: StructureKind.Function,
@@ -158,12 +158,18 @@ function buildPolymorphicDeserializer(
     ) {
       return;
     }
-    const union = subType?.discriminatedSubtypes ? "Union" : "";
+    const union = subType?.discriminatedSubtypes ? "_Union" : "";
     if (!subType || subType?.name) {
       throw new Error(`NYI Serialization of anonymous types`);
     }
-    const subTypeName = `${toPascalCase(subType.name)}${union}`;
-    const subtypeDeserializerName = toCamelCase(`${subTypeName}Deserializer`);
+
+    const rawSubTypeName = `${subType.name}${union}`;
+    const subTypeName = `${normalizeName(rawSubTypeName, NameType.Interface, true)}`;
+    const subtypeDeserializerName = normalizeName(
+      `${subTypeName}Deserializer`,
+      NameType.Operation,
+      true
+    );
 
     cases.push(`
         case "${discriminatedValue}":
@@ -207,7 +213,7 @@ function buildDiscriminatedUnionDeserializer(
     NameType.Operation
   )}Deserializer`;
   if (nameOnly) {
-    return deserializeFunctionName;
+    return resolveReference(refkey(type, "deserializer"));
   }
   const baseDeserializerName = `${normalizeModelName(
     context,
@@ -226,8 +232,12 @@ function buildDiscriminatedUnionDeserializer(
     }
     const discriminatedValue = subType.discriminatorValue!;
     const union = subType.discriminatedSubtypes ? "Union" : "";
-    const subTypeName = `${toPascalCase(subType.name)}${union}`;
-    const subtypeDeserializerName = toCamelCase(`${subTypeName}Deserializer`);
+    const subTypeName = `${normalizeName(subType.name, NameType.Interface, true)}${union}`;
+    const subtypeDeserializerName = normalizeName(
+      `${subTypeName}Deserializer`,
+      NameType.Operation,
+      true
+    );
 
     cases.push(`
       case "${discriminatedValue}":
@@ -281,7 +291,7 @@ function buildUnionDeserializer(
     NameType.Operation
   )}Deserializer`;
   if (nameOnly) {
-    return deserializerFunctionName;
+    return resolveReference(refkey(type, "deserializer"));
   }
   const deserializerFunction: FunctionDeclarationStructure = {
     kind: StructureKind.Function,
@@ -317,7 +327,7 @@ function buildModelTypeDeserializer(
     options.skipDiscriminatedUnionSuffix
   )}Deserializer`;
   if (options.nameOnly) {
-    return deserializerFunctionName;
+    return resolveReference(refkey(type, "deserializer"));
   }
   const deserializerFunction: FunctionDeclarationStructure = {
     kind: StructureKind.Function,
@@ -397,16 +407,14 @@ function buildDictTypeDeserializer(
   if (typeof valueDeserializer !== "string") {
     return undefined;
   }
-  const valueTypeName = toCamelCase(
-    valueDeserializer ? valueDeserializer.replace("Deserializer", "") : ""
-  );
-  const deserializerFunctionName = `${valueTypeName}RecordDeserializer`;
+
+  const deserializerFunctionName = `${normalizeModelName(context, type, NameType.Operation, false, true)}Deserializer`;
   if (nameOnly) {
-    return deserializerFunctionName;
+    return resolveReference(refkey(type.valueType, "record", "deserializer"));
   }
   const deserializerFunction: FunctionDeclarationStructure = {
     kind: StructureKind.Function,
-    name: `${valueTypeName}RecordDeserializer`,
+    name: deserializerFunctionName,
     isExported: true,
     parameters: [
       {
@@ -458,12 +466,9 @@ function buildArrayTypeDeserializer(
   if (typeof valueDeserializer !== "string") {
     return undefined;
   }
-  const valueTypeName = toCamelCase(
-    valueDeserializer ? valueDeserializer.replace("Deserializer", "") : ""
-  );
-  const deserializerFunctionName = `${valueTypeName}ArrayDeserializer`;
+  const deserializerFunctionName = `${normalizeModelName(context, type, NameType.Operation, false, true)}Deserializer`;
   if (nameOnly) {
-    return deserializerFunctionName;
+    return resolveReference(refkey(type.valueType, "array", "deserializer"));
   }
   const serializerFunction: FunctionDeclarationStructure = {
     kind: StructureKind.Function,