Add support to non-resource operations (Azure#51626)

Co-authored-by: Copilot <[email protected]>

Author: ArcturusZhang

eng/packages/http-client-csharp-mgmt/emitter/src/resource-detection.ts

@@ -9,7 +9,9 @@ import {
 } from "@typespec/http-client-csharp";
 import {
   calculateResourceTypeFromPath,
+  convertMethodMetadataToArguments,
   convertResourceMetadataToArguments,
+  NonResourceMethod,
   ResourceMetadata,
   ResourceOperationKind,
   ResourceScope
@@ -32,6 +34,7 @@ import {
   armResourceListName,
   armResourceReadName,
   armResourceUpdateName,
+  nonResourceMethodMetadata,
   parentResourceName,
   resourceGroupResource,
   resourceMetadata,
@@ -72,6 +75,7 @@ export async function updateClients(
       } as ResourceMetadata
     ])
   );
+  const nonResourceMethods: Map<string, NonResourceMethod> = new Map();
 
   // first we flatten all possible clients in the code model
   const clients = getAllClients(codeModel);
@@ -100,25 +104,44 @@ export async function updateClients(
         if (entry && !entry.resourceIdPattern && isCRUDKind(kind)) {
           entry.resourceIdPattern = method.operation.path;
         }
+      } else {
+        // we add a methodMetadata decorator to this method
+        nonResourceMethods.set(method.crossLanguageDefinitionId, {
+          methodId: method.crossLanguageDefinitionId,
+          operationPath: method.operation.path,
+          operationScope: getOperationScope(method.operation.path)
+        });
       }
     }
   }
 
   // after the resourceIdPattern has been populated, we can set the parentResourceId
   for (const [modelId, metadata] of resourceModelToMetadataMap) {
-    const parentResourceModelId = getParentResourceModelId(sdkContext, models.get(modelId));
+    const parentResourceModelId = getParentResourceModelId(
+      sdkContext,
+      models.get(modelId)
+    );
     if (parentResourceModelId) {
-      metadata.parentResourceId = resourceModelToMetadataMap.get(parentResourceModelId)?.resourceIdPattern;
+      metadata.parentResourceId = resourceModelToMetadataMap.get(
+        parentResourceModelId
+      )?.resourceIdPattern;
     }
   }
 
   // the last step, add the decorator to the resource model
   for (const model of resourceModels) {
-    const metadata = resourceModelToMetadataMap.get(model.crossLanguageDefinitionId);
+    const metadata = resourceModelToMetadataMap.get(
+      model.crossLanguageDefinitionId
+    );
     if (metadata) {
       addResourceMetadata(sdkContext, model, metadata);
     }
   }
+  // and add the methodMetadata decorator to the non-resource methods
+  addNonResourceMethodDecorators(
+    codeModel,
+    Array.from(nonResourceMethods.values())
+  );
 }
 
 function isCRUDKind(kind: ResourceOperationKind): boolean {
@@ -211,35 +234,26 @@ export function getAllSdkClients(
 ): SdkClientType<SdkServiceOperation>[] {
   const clients: SdkClientType<SdkServiceOperation>[] = [];
   for (const client of sdkContext.sdkPackage.clients) {
-    traverseClient(client);
+    traverseClient(client, clients);
   }
 
   return clients;
-
-  function traverseClient(client: SdkClientType<SdkServiceOperation>) {
-    clients.push(client);
-    if (client.children) {
-      for (const child of client.children) {
-        traverseClient(child);
-      }
-    }
-  }
 }
 
 export function getAllClients(codeModel: CodeModel): InputClient[] {
   const clients: InputClient[] = [];
   for (const client of codeModel.clients) {
-    traverseClient(client);
+    traverseClient(client, clients);
   }
 
   return clients;
+}
 
-  function traverseClient(client: InputClient) {
-    clients.push(client);
-    if (client.children) {
-      for (const child of client.children) {
-        traverseClient(child);
-      }
+function traverseClient<T extends { children?: T[] }>(client: T, clients: T[]) {
+  clients.push(client);
+  if (client.children) {
+    for (const child of client.children) {
+      traverseClient(child, clients);
     }
   }
 }
@@ -277,6 +291,31 @@ function getResourceScope(model: InputModelType): ResourceScope {
   return ResourceScope.ResourceGroup; // all the templates work as if there is a resource group decorator when there is no such decorator
 }
 
+// TODO -- this logic needs to be refined in the near future.
+function getOperationScope(path: string): ResourceScope {
+  if (
+    path.startsWith(
+      "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/"
+    )
+  ) {
+    return ResourceScope.ResourceGroup;
+  } else if (path.startsWith("/subscriptions/{subscriptionId}/")) {
+    return ResourceScope.Subscription;
+  }
+  return ResourceScope.Tenant; // all the templates work as if there is a tenant decorator when there is no such decorator
+}
+
+function addNonResourceMethodDecorators(
+  codeModel: CodeModel,
+  metadata: NonResourceMethod[]
+) {
+  codeModel.clients[0].decorators ??= [];
+  codeModel.clients[0].decorators.push({
+    name: nonResourceMethodMetadata,
+    arguments: convertMethodMetadataToArguments(metadata)
+  });
+}
+
 function addResourceMetadata(
   sdkContext: CSharpEmitterContext,
   model: InputModelType,

eng/packages/http-client-csharp-mgmt/emitter/src/resource-metadata.ts

@@ -60,6 +60,24 @@ export function convertResourceMetadataToArguments(
   };
 }
 
+export interface NonResourceMethod {
+  methodId: string;
+  operationPath: string;
+  operationScope: ResourceScope;
+}
+
+export function convertMethodMetadataToArguments(
+  metadata: NonResourceMethod[]
+): Record<string, any> {
+  return {
+    nonResourceMethods: metadata.map((m) => ({
+      methodId: m.methodId,
+      operationPath: m.operationPath,
+      operationScope: m.operationScope
+    }))
+  };
+}
+
 export interface ResourceMethod {
   id: string;
   kind: ResourceOperationKind;

eng/packages/http-client-csharp-mgmt/emitter/src/sdk-context-options.ts

@@ -80,13 +80,18 @@ const resourceGroupResourceRegex =
 export const resourceMetadata = "Azure.ClientGenerator.Core.@resourceSchema";
 const resourceMetadataRegex =
   "Azure\\.ClientGenerator\\.Core\\.@resourceSchema";
+export const nonResourceMethodMetadata =
+  "Azure.ClientGenerator.Core.@nonResourceMethodSchema";
+const nonResourceMethodMetadataRegex =
+  "Azure\\.ClientGenerator\\.Core\\.@nonResourceMethodSchema";
 
 export const azureSDKContextOptions: CreateSdkContextOptions = {
   versioning: {
     previewStringRegex: /-preview$/
   },
   additionalDecorators: [
     resourceMetadataRegex,
+    nonResourceMethodMetadataRegex,
     armProviderNamespaceRegex,
     armResourceActionRegex,
     armResourceCreateOrUpdateRegex,