Update to latest MTG to adopt service methods (Azure#49457)

Author: live1206

eng/Packages.Data.props

@@ -206,7 +206,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
-    <PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250407.1" />
+    <PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250418.3" />
     <PackageReference Update="System.ClientModel" Version="1.3.0" />
   </ItemGroup>
 

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Mgmt/src/InputTransformation/InputClientTransformer.cs

@@ -11,40 +11,35 @@ internal static class InputClientTransformer
     {
         public static InputClient? TransformInputClient(InputClient client)
         {
-            var operationsToKeep = new List<InputOperation>();
-            foreach (var operation in client.Operations)
+            var methodsToKeep = new List<InputServiceMethod>();
+            foreach (var method in client.Methods)
             {
+                var operation = method.Operation;
                 // operations_list has been covered in Azure.ResourceManager already, we don't need to generate it in the client
                 if (operation.CrossLanguageDefinitionId != "Azure.ResourceManager.Operations.list")
                 {
-                    var transformedOperation = new InputOperation(operation.Name, operation.ResourceName, operation.Summary, operation.Doc, operation.Deprecated, operation.Accessibility, TransformInputOperationParameters(operation), operation.Responses, operation.HttpMethod, operation.Uri, operation.Path, operation.ExternalDocsUrl, operation.RequestMediaTypes, operation.BufferResponse, operation.LongRunning, operation.Paging, operation.GenerateProtocolMethod, operation.GenerateConvenienceMethod, operation.CrossLanguageDefinitionId);
-                    operationsToKeep.Add(transformedOperation);
+                    SetSubscriptionIdToMethodParameter(operation);
+                    methodsToKeep.Add(method);
                 }
             }
 
             // We removed the list operation above, we should skip the empty client afterwards
             // There is no need to check sub-clients or custom code since it is specific to handle the above removing
-            if (operationsToKeep.Count == 0) return null;
+            if (methodsToKeep.Count == 0) return null;
 
-            return new InputClient(client.Name, client.Namespace, client.CrossLanguageDefinitionId, client.Summary, client.Doc, operationsToKeep, client.Parameters, client.Parent, client.Children);
+            return new InputClient(client.Name, client.Namespace, client.CrossLanguageDefinitionId, client.Summary, client.Doc, methodsToKeep, client.Parameters, client.Parent, client.Children);
         }
 
-        private static IReadOnlyList<InputParameter> TransformInputOperationParameters(InputOperation operation)
+        private static void SetSubscriptionIdToMethodParameter(InputOperation operation)
         {
-            var parameters = new List<InputParameter>();
             foreach (var parameter in operation.Parameters)
             {
                 if (parameter.NameInRequest.Equals("subscriptionId", StringComparison.OrdinalIgnoreCase))
                 {
                     // Always set subscriptionId to method parameter
-                    parameters.Add(new InputParameter(parameter.Name, parameter.NameInRequest, parameter.Summary, parameter.Doc, parameter.Type, parameter.Location, parameter.DefaultValue, InputOperationParameterKind.Method, parameter.IsRequired, parameter.IsApiVersion, parameter.IsContentType, parameter.IsEndpoint, parameter.SkipUrlEncoding, parameter.Explode, parameter.ArraySerializationDelimiter, parameter.HeaderCollectionPrefix));
-                }
-                else
-                {
-                    parameters.Add(parameter);
+                    parameter.Update(InputParameterKind.Method);
                 }
             }
-            return parameters;
         }
     }
 }

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Mgmt/src/Providers/ResourceClientProvider.cs

@@ -31,7 +31,7 @@ namespace Azure.Generator.Management.Providers
     /// </summary>
     internal class ResourceClientProvider : TypeProvider
     {
-        private IReadOnlyCollection<InputOperation> _resourceOperations;
+        private IReadOnlyCollection<InputServiceMethod> _resourceServiceMethods;
         private readonly IReadOnlyList<string> _contextualParameters;
         private bool _isSingleton;
 
@@ -52,8 +52,8 @@ public ResourceClientProvider(InputClient inputClient)
             SpecName = resourceModel.Name;
 
             // We should be able to assume that all operations in the resource client are for the same resource
-            var requestPath = new RequestPath(inputClient.Operations.First().Path);
-            _resourceOperations = inputClient.Operations;
+            var requestPath = new RequestPath(inputClient.Methods.First().Operation.Path);
+            _resourceServiceMethods = inputClient.Methods;
             ResourceData = ManagementClientGenerator.Instance.TypeFactory.CreateModel(resourceModel)!;
             _clientProvider = ManagementClientGenerator.Instance.TypeFactory.CreateClient(inputClient)!;
 
@@ -203,36 +203,36 @@ protected MethodProvider BuildValidateResourceIdMethod()
         protected override MethodProvider[] BuildMethods()
         {
             var operationMethods = new List<MethodProvider>();
-            foreach (var operation in _resourceOperations)
+            foreach (var method in _resourceServiceMethods)
             {
-                var convenienceMethod = GetCorrespondingConvenienceMethod(operation, false);
+                var convenienceMethod = GetCorrespondingConvenienceMethod(method.Operation, false);
                 // exclude the List operations for resource, they will be in ResourceCollection
                 var returnType = convenienceMethod.Signature.ReturnType!;
-                if ((returnType.IsFrameworkType && returnType.IsList) || operation.Paging?.ItemPropertySegments.Any() == true)
+                if ((returnType.IsFrameworkType && returnType.IsList) || (method is InputPagingServiceMethod pagingMethod && pagingMethod.PagingMetadata.ItemPropertySegments.Any() == true))
                 {
                     continue;
                 }
 
                 // only update for non-singleton resource
-                var isUpdateOnly = operation.HttpMethod == HttpMethod.Put.ToString() && !_isSingleton;
-                operationMethods.Add(BuildOperationMethod(operation, convenienceMethod, false, isUpdateOnly));
-                var asyncConvenienceMethod = GetCorrespondingConvenienceMethod(operation, true);
-                operationMethods.Add(BuildOperationMethod(operation, asyncConvenienceMethod, true, isUpdateOnly));
+                var isUpdateOnly = method.Operation.HttpMethod == HttpMethod.Put.ToString() && !_isSingleton;
+                operationMethods.Add(BuildOperationMethod(method, convenienceMethod, false, isUpdateOnly));
+                var asyncConvenienceMethod = GetCorrespondingConvenienceMethod(method.Operation, true);
+                operationMethods.Add(BuildOperationMethod(method, asyncConvenienceMethod, true, isUpdateOnly));
             }
 
             return [BuildValidateResourceIdMethod(), .. operationMethods];
         }
 
-        private MethodProvider BuildOperationMethod(InputOperation operation, MethodProvider convenienceMethod, bool isAsync, bool isUpdateOnly = false)
+        private MethodProvider BuildOperationMethod(InputServiceMethod method, MethodProvider convenienceMethod, bool isAsync, bool isUpdateOnly = false)
         {
-            var isLongRunning = operation.LongRunning != null;
+            var operation = method.Operation;
             var signature = new MethodSignature(
                 isUpdateOnly ? (isAsync ? "UpdateAsync" : "Update") : convenienceMethod.Signature.Name,
                 isUpdateOnly ? $"Update a {SpecName}" : convenienceMethod.Signature.Description,
                 convenienceMethod.Signature.Modifiers,
-                GetOperationMethodReturnType(isAsync, isLongRunning, operation.Responses, out var isGeneric),
+                GetOperationMethodReturnType(isAsync, method is InputLongRunningServiceMethod || method is InputLongRunningPagingServiceMethod, operation.Responses, out var isGeneric),
                 convenienceMethod.Signature.ReturnDescription,
-                GetOperationMethodParameters(convenienceMethod, isLongRunning),
+                GetOperationMethodParameters(convenienceMethod, method is InputLongRunningServiceMethod),
                 convenienceMethod.Signature.Attributes,
                 convenienceMethod.Signature.GenericArguments,
                 convenienceMethod.Signature.GenericParameterConstraints,
@@ -244,7 +244,7 @@ private MethodProvider BuildOperationMethod(InputOperation operation, MethodProv
                     UsingDeclare("scope", typeof(DiagnosticScope), _clientDiagonosticsField.Invoke(nameof(ClientDiagnostics.CreateScope), [Literal($"{Type.Namespace}.{operation.Name}")]), out var scopeVariable),
                     scopeVariable.Invoke(nameof(DiagnosticScope.Start)).Terminate(),
                     new TryCatchFinallyStatement
-                    (BuildOperationMethodTryStatement(convenienceMethod, isAsync, isLongRunning, operation, isGeneric), Catch(Declare<Exception>("e", out var exceptionVarialble), [scopeVariable.Invoke(nameof(DiagnosticScope.Failed), exceptionVarialble).Terminate(), Throw()]))
+                    (BuildOperationMethodTryStatement(convenienceMethod, isAsync, method, isGeneric), Catch(Declare<Exception>("e", out var exceptionVarialble), [scopeVariable.Invoke(nameof(DiagnosticScope.Failed), exceptionVarialble).Terminate(), Throw()]))
                 };
 
             return new MethodProvider(signature, bodyStatements, this);
@@ -287,8 +287,9 @@ protected CSharpType GetOperationMethodReturnType(bool isAsync, bool isLongRunni
             return isAsync ? new CSharpType(typeof(Task<>), new CSharpType(typeof(Response<>), Type)) : new CSharpType(typeof(Response<>), Type);
         }
 
-        private TryStatement BuildOperationMethodTryStatement(MethodProvider convenienceMethod, bool isAsync, bool isLongRunning, InputOperation operation, bool isGeneric)
+        private TryStatement BuildOperationMethodTryStatement(MethodProvider convenienceMethod, bool isAsync, InputServiceMethod method, bool isGeneric)
         {
+            var operation = method.Operation;
             var cancellationToken = convenienceMethod.Signature.Parameters.Single(p => p.Type.Equals(typeof(CancellationToken)));
             var tryStatement = new TryStatement();
             var contextDeclaration = Declare("context", typeof(RequestContext), New.Instance(typeof(RequestContext), new Dictionary<ValueExpression, ValueExpression> { { Identifier(nameof(RequestContext.CancellationToken)), cancellationToken } }), out var contextVariable);
@@ -311,10 +312,20 @@ private TryStatement BuildOperationMethodTryStatement(MethodProvider convenience
                 tryStatement.Add(responseDeclaration);
             }
 
-            if (isLongRunning)
+            if (method is InputLongRunningServiceMethod || method is InputLongRunningPagingServiceMethod)
             {
+                OperationFinalStateVia finalStateVia = OperationFinalStateVia.Location;
+                if (method is InputLongRunningServiceMethod lroMethod)
+                {
+                    finalStateVia = (OperationFinalStateVia)lroMethod.LongRunningServiceMetadata.FinalStateVia;
+                }
+                else if (method is InputLongRunningPagingServiceMethod lroPagingMethod)
+                {
+                    finalStateVia = (OperationFinalStateVia)lroPagingMethod.LongRunningServiceMetadata.FinalStateVia;
+                }
+
                 var armOperationType = !isGeneric ? ManagementClientGenerator.Instance.OutputLibrary.ArmOperation.Type : ManagementClientGenerator.Instance.OutputLibrary.GenericArmOperation.Type.MakeGenericType([Type]);
-                ValueExpression[] armOperationArguments = [_clientDiagonosticsField, This.Property("Pipeline"), messageVariable.Property("Request"), isGeneric ? responseVariable.Invoke("GetRawResponse") : responseVariable, Static(typeof(OperationFinalStateVia)).Property(((OperationFinalStateVia)operation.LongRunning!.FinalStateVia).ToString())];
+                ValueExpression[] armOperationArguments = [_clientDiagonosticsField, This.Property("Pipeline"), messageVariable.Property("Request"), isGeneric ? responseVariable.Invoke("GetRawResponse") : responseVariable, Static(typeof(OperationFinalStateVia)).Property(finalStateVia.ToString())];
                 var operationDeclaration = Declare("operation", armOperationType, New.Instance(armOperationType, isGeneric ? [New.Instance(Source.Type, This.Property("Client")), .. armOperationArguments] : armOperationArguments), out var operationVariable);
 
                 tryStatement.Add(operationDeclaration);

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Mgmt/src/Providers/ResourceCollectionClientProvider.cs

@@ -20,21 +20,22 @@ namespace Azure.Generator.Management.Providers
     internal class ResourceCollectionClientProvider : ResourceClientProvider
     {
         private ResourceClientProvider _resource;
-        private InputOperation? _getAll;
+        private InputServiceMethod? _getAll;
         private InputOperation? _create;
         private InputOperation? _get;
 
         public ResourceCollectionClientProvider(InputClient inputClient, ResourceClientProvider resource) : base(inputClient)
         {
             _resource = resource;
 
-            foreach (var operation in inputClient.Operations)
+            foreach (var method in inputClient.Methods)
             {
+                var operation = method.Operation;
                 if (operation.HttpMethod == HttpMethod.Get.ToString())
                 {
                     if (operation.Name == "list")
                     {
-                        _getAll = operation;
+                        _getAll = method;
                     }
                     else if (operation.Name == "get")
                     {
@@ -104,8 +105,8 @@ private MethodProvider[] BuildEnumeratorMethods()
 
         private MethodProvider BuildGetAllMethod(bool isAsync)
         {
-            var convenienceMethod = GetCorrespondingConvenienceMethod(_getAll!, isAsync);
-            var isLongRunning = _getAll?.LongRunning != null;
+            var convenienceMethod = GetCorrespondingConvenienceMethod(_getAll!.Operation, isAsync);
+            var isLongRunning = _getAll is InputLongRunningPagingServiceMethod;
             var signature = new MethodSignature(
                 isAsync ? "GetAllAsync" : "GetAll",
                 convenienceMethod.Signature.Description,

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Mgmt/test/Azure.Generator.Mgmt.Tests/Common/InputResourceData.cs

@@ -30,7 +30,7 @@ public static (InputClient InputClient, IReadOnlyList<InputModelType> InputModel
                 { KnownDecorators.ResourceModel, BinaryData.FromString($"\"{ResourceModelName}\"") },
                 { KnownDecorators.ResourceType, BinaryData.FromString("\"a/test\"") }
             };
-            var client = InputFactory.Client(TestClientName, operations: [operation], decorators: [new InputDecoratorInfo(KnownDecorators.ResourceMetadata, resourceMetadataArguments), new InputDecoratorInfo(KnownDecorators.ArmProviderNamespace, null)]);
+            var client = InputFactory.Client(TestClientName, methods: [InputFactory.BasicServiceMethod("Get", operation)], decorators: [new InputDecoratorInfo(KnownDecorators.ResourceMetadata, resourceMetadataArguments), new InputDecoratorInfo(KnownDecorators.ArmProviderNamespace, null)]);
             return (client, [responseModel]);
         }
     }

eng/packages/http-client-csharp/generator/Azure.Generator/src/Azure.Generator.csproj

@@ -13,7 +13,7 @@
 
 	<Target Name="CheckEmitterBuild" BeforeTargets="Build">
 		<!-- Check if the folder does not exist -->
-		<Error Condition="!Exists('..\..\..\node_modules\@typespec\http-client-csharp')" Text="Emitter has not been built please run `pnpm i` from repo root folder, and followed by `pnpm run build` from ./eng/packages/http-client-csharp folder." />
+		<Error Condition="!Exists('..\..\..\node_modules\@typespec\http-client-csharp')" Text="Emitter has not been built please run `npm ci` from repo root folder, and followed by `npm run build` from ./eng/packages/http-client-csharp folder." />
 	</Target>
 
 	<!-- Copy output to package dist path for local execution -->

eng/packages/http-client-csharp/generator/Azure.Generator/src/InputTransformation/InputClientTransformer.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using Microsoft.TypeSpec.Generator;
+using Microsoft.TypeSpec.Generator.Input;
 using Microsoft.TypeSpec.Generator.Primitives;
 using System;
 using System.Collections.Generic;
@@ -86,10 +87,10 @@ private static void TraverseInput(out bool hasOperation, out bool hasLongRunning
             hasLongRunningOperation = false;
             foreach (var inputClient in AzureClientGenerator.Instance.InputLibrary.InputNamespace.Clients)
             {
-                foreach (var operation in inputClient.Operations)
+                foreach (var method in inputClient.Methods)
                 {
                     hasOperation = true;
-                    if (operation.LongRunning != null)
+                    if (method is InputLongRunningServiceMethod || method is InputLongRunningPagingServiceMethod)
                     {
                         hasLongRunningOperation = true;
                         return;