@azure-tools/typespec-ts 0.18.0 → 0.19.0

package/src/modular/buildCodeModel.ts

@@ -50,7 +50,8 @@ import {
   HttpServer,
   isStatusCode,
   HttpOperation,
-  getHttpOperation
+  getHttpOperation,
+  isSharedRoute
 } from "@typespec/http";
 import { getAddedOnVersions } from "@typespec/versioning";
 import {
@@ -99,6 +100,11 @@ import {
 } from "../utils/operationUtil.js";
 import { SdkContext } from "../utils/interfaces.js";
 import { Project } from "ts-morph";
+import { buildRuntimeImports } from "@azure-tools/rlc-common";
+import {
+  getModelNamespaceName,
+  getOperationNamespaceInterfaceName
+} from "../utils/namespaceUtils.js";
 
 interface HttpServerParameter {
   type: "endpointPath";
@@ -769,6 +775,20 @@ function emitBasicOperation(
     );
   });
 
+  const namespaceHierarchies =
+    context.rlcOptions?.hierarchyClient === true
+      ? getOperationNamespaceInterfaceName(context, operation)
+      : [];
+
+  if (
+    namespaceHierarchies.length === 0 &&
+    context.rlcOptions?.hierarchyClient === false &&
+    operationGroupName !== "" &&
+    namespaceHierarchies[0] !== operationGroupName
+  ) {
+    namespaceHierarchies.push(operationGroupName);
+  }
+
   for (const param of httpOperation.parameters.parameters) {
     if (isIgnoredHeaderParam(param)) {
       continue;
@@ -783,7 +803,7 @@ function emitBasicOperation(
   // Set up responses for operation
   const responses: Response[] = [];
   const exceptions: Response[] = [];
-  const isOverload: boolean = false;
+  const isOverload = isSharedRoute(context.program, operation);
   for (const response of httpOperation.responses) {
     for (const innerResponse of response.responses) {
       const emittedResponse: Response = emitResponse(
@@ -834,6 +854,7 @@ function emitBasicOperation(
       }
     }
   }
+
   const name = applyCasing(operation.name, { casing: CASING });
 
   /** handle name collision between operation name and parameter signature */
@@ -851,7 +872,7 @@ function emitBasicOperation(
       param.clientName = param.clientName + "Parameter";
     });
   return {
-    name: name,
+    name: normalizeName(name, NameType.Operation, true),
     description: getDocStr(context.program, operation),
     summary: getSummary(context.program, operation) ?? "",
     url: httpOperation.path,
@@ -863,10 +884,11 @@ function emitBasicOperation(
     groupName: operationGroupName,
     addedOn: getAddedOnVersion(context.program, operation),
     discriminator: "basic",
-    isOverload: false,
+    isOverload,
     overloads: [],
     apiVersions: [getAddedOnVersion(context.program, operation)],
-    rlcResponse: rlcResponses?.[0]
+    rlcResponse: rlcResponses?.[0],
+    namespaceHierarchies
   };
 }
 
@@ -958,9 +980,20 @@ function emitModel(context: SdkContext, type: Model): Record<string, any> {
     getProjectedName(context.program, type, "javascript") ??
     getProjectedName(context.program, type, "client") ??
     getFriendlyName(context.program, type);
+  const fullNamespaceName =
+    getModelNamespaceName(context, type.namespace!)
+      .map((nsName) => {
+        return normalizeName(nsName, NameType.Interface);
+      })
+      .join("") +
+    (effectiveName ? effectiveName : getName(context.program, type));
   let modelName =
     overridedModelName ??
-    (effectiveName ? effectiveName : getName(context.program, type));
+    (context.rlcOptions?.enableModelNamespace
+      ? fullNamespaceName
+      : effectiveName
+      ? effectiveName
+      : getName(context.program, type));
   if (
     !overridedModelName &&
     type.templateMapper &&
@@ -1419,6 +1452,10 @@ function emitOperationGroups(
   rlcModels: RLCModel
 ): OperationGroup[] {
   const operationGroups: OperationGroup[] = [];
+  const groupMapping: Map<string, OperationGroup> = new Map<
+    string,
+    OperationGroup
+  >();
   for (const operationGroup of listOperationGroups(context, client)) {
     const operations: HrlcOperation[] = [];
     const name = operationGroup.type.name;
@@ -1428,27 +1465,53 @@ function emitOperationGroups(
     )) {
       operations.push(emitOperation(context, operation, name, rlcModels));
     }
-    operationGroups.push({
-      className: name,
-      propertyName: name,
-      operations: operations
-    });
+    if (operations.length > 0) {
+      addHierarchyOperationGroup(operations, groupMapping);
+    }
   }
   const clientOperations: HrlcOperation[] = [];
   for (const operation of listOperationsInOperationGroup(context, client)) {
     clientOperations.push(emitOperation(context, operation, "", rlcModels));
   }
   if (clientOperations.length > 0) {
-    operationGroups.push({
-      className: "",
-      propertyName: "",
-      operations: clientOperations
-    });
+    addHierarchyOperationGroup(clientOperations, groupMapping);
+  }
+
+  groupMapping.forEach((value) => {
+    operationGroups.push(value);
+  });
+  if (
+    context.rlcOptions?.hierarchyClient === false &&
+    context.rlcOptions?.enableOperationGroup
+  ) {
+    resolveConflictIfExist(operationGroups);
   }
-  resolveConflictIfExist(operationGroups);
   return operationGroups;
 }
 
+function addHierarchyOperationGroup(
+  operations: HrlcOperation[],
+  groupMapping: Map<string, OperationGroup>
+): OperationGroup[] {
+  if (operations.length > 0) {
+    operations.forEach((op) => {
+      const groupName = op.namespaceHierarchies.join("") ?? "";
+      if (!groupMapping.has(groupName)) {
+        groupMapping.set(groupName, {
+          className: groupName,
+          propertyName: groupName,
+          operations: [op],
+          namespaceHierarchies: op.namespaceHierarchies
+        });
+      } else {
+        groupMapping.get(groupName)!.operations.push(op);
+      }
+    });
+    return [...groupMapping.values()];
+  }
+  return [];
+}
+
 function resolveConflictIfExist(operationGroups: OperationGroup[]) {
   if (operationGroups.length < 2) {
     return;
@@ -1705,7 +1768,8 @@ export function emitCodeModel(
     subnamespaceToClients: {},
     clients: [],
     types: [],
-    project
+    project,
+    runtimeImports: buildRuntimeImports(dpgContext.rlcOptions?.branded ?? true)
   };
 
   typesMap.clear();

package/src/modular/buildOperations.ts

@@ -11,6 +11,7 @@ import { Client, ModularCodeModel, Operation } from "./modularCodeModel.js";
 import { isRLCMultiEndpoint } from "../utils/clientUtils.js";
 import { getDocsFromDescription } from "./helpers/docsHelpers.js";
 import { SdkContext } from "../utils/interfaces.js";
+import { getImportSpecifier } from "@azure-tools/rlc-common";
 
 /**
  * This function creates a file under /api for each operation group.
@@ -26,23 +27,34 @@ export function buildOperationFiles(
   const operationFiles = [];
   for (const operationGroup of client.operationGroups) {
     const importSet: Map<string, Set<string>> = new Map<string, Set<string>>();
-    const fileName = operationGroup.className
-      ? `${normalizeName(operationGroup.className, NameType.File)}`
-      : // When the program has no operation groups defined all operations are put
-        // into a nameless operation group. We'll call this operations.
-        "operations";
+    const operationFileName =
+      operationGroup.className && operationGroup.namespaceHierarchies.length > 0
+        ? `${operationGroup.namespaceHierarchies
+            .map((hierarchy) => {
+              return normalizeName(hierarchy, NameType.File);
+            })
+            .join("/")}/index`
+        : // When the program has no operation groups defined all operations are put
+          // into a nameless operation group. We'll call this operations.
+          "operations";
 
     const subfolder = client.subfolder;
     const srcPath = codeModel.modularOptions.sourceRoot;
     const operationGroupFile = codeModel.project.createSourceFile(
       `${srcPath}/${
         subfolder && subfolder !== "" ? subfolder + "/" : ""
-      }api/${fileName}.ts`
+      }api/${operationFileName}.ts`
     );
 
     // Import models used from ./models.ts
     // We SHOULD keep this because otherwise ts-morph will "helpfully" try to import models from the rest layer when we call fixMissingImports().
-    importModels(srcPath, operationGroupFile, codeModel.project, subfolder);
+    importModels(
+      srcPath,
+      operationGroupFile,
+      codeModel.project,
+      subfolder,
+      operationGroup.namespaceHierarchies.length
+    );
 
     const namedImports: string[] = [];
     let clientType = "Client";
@@ -54,7 +66,9 @@ export function buildOperationFiles(
       }
       operationGroupFile.addImportDeclarations([
         {
-          moduleSpecifier: `../../rest/${subfolder}/index.js`,
+          moduleSpecifier: `../${"../".repeat(
+            operationGroup.namespaceHierarchies.length
+          )}rest/${subfolder}/index.js`,
           namedImports
         }
       ]);
@@ -68,7 +82,9 @@ export function buildOperationFiles(
         {
           moduleSpecifier: `${
             subfolder && subfolder !== "" ? "../" : ""
-          }../rest/index.js`,
+          }${"../".repeat(
+            operationGroup.namespaceHierarchies.length + 1
+          )}rest/index.js`,
           namedImports
         }
       ]);
@@ -79,13 +95,15 @@ export function buildOperationFiles(
         dpgContext,
         o,
         clientType,
-        importSet
+        importSet,
+        codeModel.runtimeImports
       );
       const deserializeOperationDeclaration = getDeserializePrivateFunction(
         o,
         isRLCMultiEndpoint(dpgContext),
         needUnexpectedHelper,
-        importSet
+        importSet,
+        codeModel.runtimeImports
       );
       operationGroupFile.addFunctions([
         sendOperationDeclaration,
@@ -96,7 +114,10 @@ export function buildOperationFiles(
 
     operationGroupFile.addImportDeclarations([
       {
-        moduleSpecifier: "@azure-rest/core-client",
+        moduleSpecifier: getImportSpecifier(
+          "restClient",
+          codeModel?.runtimeImports
+        ),
         namedImports: [
           "StreamableMethod",
           "operationOptionsToRequestParameters"
@@ -125,8 +146,12 @@ export function importModels(
   srcPath: string,
   sourceFile: SourceFile,
   project: Project,
-  subfolder: string = ""
+  subfolder: string = "",
+  importLayer: number = 0
 ) {
+  const hasModelsImport = sourceFile.getImportDeclarations().some((i) => {
+    return i.getModuleSpecifierValue().endsWith(`models/models.js`);
+  });
   const modelsFile = project.getSourceFile(
     `${srcPath}/${
       subfolder && subfolder !== "" ? subfolder + "/" : ""
@@ -138,9 +163,9 @@ export function importModels(
     models.push(entry[0]);
   }
 
-  if (models.length > 0) {
+  if (models.length > 0 && !hasModelsImport) {
     sourceFile.addImportDeclaration({
-      moduleSpecifier: "../models/models.js",
+      moduleSpecifier: `${"../".repeat(importLayer + 1)}models/models.js`,
       namedImports: models
     });
   }
@@ -162,7 +187,7 @@ export function buildOperationOptions(
     .filter((p) => p.optional || p.clientDefaultValue);
   const options = [...optionalParameters];
 
-  const name = getOperationOptionsName(operation);
+  const name = getOperationOptionsName(operation, true);
 
   sourceFile.addInterface({
     name,