Support @access and @usage

eng/testProjects.json

@@ -18,7 +18,9 @@
         "authentication/union",
         "azure/core/basic",
         "azure/core/traits",
+        "azure/client-generator-core/access",
         "azure/client-generator-core/internal",
+        "azure/client-generator-core/usage",
         "encode/bytes",
         "encode/datetime",
         "encode/duration",

src/AutoRest.CSharp/Common/AutoRest/Plugins/GeneratedCodeWorkspace.cs

@@ -265,7 +265,7 @@ public async Task PostProcess(Func<Project, Task<Project>> processor)
         /// <returns></returns>
         public async Task PostProcessAsync(PostProcessor? postProcessor = null)
         {
-            postProcessor ??= new PostProcessor();
+            postProcessor ??= new PostProcessor(ImmutableHashSet<string>.Empty);
             switch (Configuration.UnreferencedTypesHandling)
             {
                 case Configuration.UnreferencedTypesHandlingOption.KeepAll:

src/AutoRest.CSharp/Common/Output/Models/Types/EnumType.cs

@@ -38,6 +38,7 @@ public EnumType(InputEnumType input, string defaultNamespace, string defaultAcce
 
             DefaultName = input.Name.ToCleanName();
             DefaultAccessibility = input.Accessibility ?? defaultAccessibility;
+            IsAccessibilityOverride = input.Accessibility != null;
 
             var isExtensible = input.IsExtensible;
             if (ExistingType != null)
@@ -73,6 +74,7 @@ public EnumType(InputEnumType input, string defaultNamespace, string defaultAcce
         protected override string DefaultName { get; }
         protected override string DefaultAccessibility { get; }
         protected override TypeKind TypeKind => IsExtensible ? TypeKind.Struct : TypeKind.Enum;
+        public bool IsAccessibilityOverride { get; }
 
         public IList<EnumTypeValue> Values => _values ??= BuildValues();
 

src/AutoRest.CSharp/Common/Output/Models/Types/ModelTypeProvider.cs

@@ -44,6 +44,7 @@ internal sealed class ModelTypeProvider : SerializableObjectType
 
         protected override string DefaultName { get; }
         protected override string DefaultAccessibility { get; }
+        public bool IsAccessibilityOverride { get; }
         public override bool IncludeConverter => false;
         protected override bool IsAbstract => !Configuration.SuppressAbstractBaseClasses.Contains(DefaultName) && _inputModel.DiscriminatorPropertyName is not null;
 
@@ -63,6 +64,7 @@ public ModelTypeProvider(InputModelType inputModel, string defaultNamespace, Sou
             _sourceInputModel = sourceInputModel;
             DefaultName = GetValidIdentifier(inputModel.Name); // TODO -- this is only a workaround only to solve the anonymous model names, in other cases, the name is unchanged.
             DefaultAccessibility = inputModel.Accessibility ?? "public";
+            IsAccessibilityOverride = inputModel.Accessibility != null;
             _deprecated = inputModel.Deprecated;
             _derivedTypes = derivedTypes;
             _defaultDerivedType = defaultDerivedType ?? (inputModel.IsUnknownDiscriminatorModel ? this : null);

src/AutoRest.CSharp/Common/Output/PostProcessing/PostProcessor.cs

@@ -23,9 +23,11 @@ internal class PostProcessor
     private const string AspDotNetExtensionNamespace = "Microsoft.Extensions.Azure";
     private readonly string? _modelFactoryFullName;
     private readonly string? _aspExtensionClassName;
+    private readonly ImmutableHashSet<string> _modelsToKeep;
 
-    public PostProcessor(string? modelFactoryFullName = null, string? aspExtensionClassName = null)
+    public PostProcessor(ImmutableHashSet<string> modelsToKeep, string? modelFactoryFullName = null, string? aspExtensionClassName = null)
     {
+        _modelsToKeep = modelsToKeep;
         _modelFactoryFullName = modelFactoryFullName;
         _aspExtensionClassName = aspExtensionClassName;
     }
@@ -352,10 +354,24 @@ protected HashSet<INamedTypeSymbol> GetRootSymbols(Project project, TypeSymbols
 
     protected virtual bool IsRootDocument(Document document)
     {
+        var root = document.GetSyntaxRootAsync().GetAwaiter().GetResult();
         // a document is a root document, when
         // 1. it is a custom document (not generated or shared)
         // 2. it is a client
-        return GeneratedCodeWorkspace.IsCustomDocument(document) || IsClientDocument(document);
+        // 3. user exceptions
+        return GeneratedCodeWorkspace.IsCustomDocument(document) || IsClientDocument(document) || ShouldKeepModel(root, _modelsToKeep);
+    }
+
+    private static bool ShouldKeepModel(SyntaxNode? root, ImmutableHashSet<string> modelsToKeep)
+    {
+        if (root is null)
+            return false;
+
+        // use `BaseTypeDeclarationSyntax` to also include enums because `EnumDeclarationSyntax` extends `BaseTypeDeclarationSyntax`
+        // `ClassDeclarationSyntax` and `StructDeclarationSyntax` both inherit `TypeDeclarationSyntax`
+        var typeNodes = root.DescendantNodes().OfType<BaseTypeDeclarationSyntax>();
+        // there is possibility that we have multiple types defined in the same document (for instance, custom code)
+        return typeNodes.Any(t => modelsToKeep.Contains(t.Identifier.Text));
     }
 
     private static bool IsClientDocument(Document document)

src/AutoRest.CSharp/LowLevel/AutoRest/DpgOutputLibrary.cs

@@ -23,10 +23,25 @@ internal class DpgOutputLibrary : OutputLibrary
 
         public TypeFactory TypeFactory { get; }
         public IEnumerable<EnumType> Enums => _enums.Values;
-        public IEnumerable<ModelTypeProvider> Models => _models.Values;
+        public IEnumerable<ModelTypeProvider> Models
+        {
+            get
+            {
+                foreach (var key in _models.Keys)
+                {
+                    if (key is { Namespace: "Azure.Core.Foundations", Name: "Error" })
+                    {
+                        continue;
+                    }
+                    yield return _models[key];
+                }
+            }
+        }
         public IReadOnlyList<LowLevelClient> RestClients { get; }
         public ClientOptionsTypeProvider ClientOptions { get; }
-        public IEnumerable<TypeProvider> AllModels => new List<TypeProvider>(_enums.Values).Concat(_models.Values);
+        public IEnumerable<TypeProvider> AllModels => new List<TypeProvider>(_enums.Values).Concat(Models);
+        public IEnumerable<string> AccessOverrideModels => Enums.Where(e => e.IsAccessibilityOverride).Select(e => e.Declaration.Name)
+            .Concat(Models.Where(m => m.IsAccessibilityOverride).Select(m => m.Declaration.Name));
 
         public DpgOutputLibrary(string libraryName, IReadOnlyDictionary<InputEnumType, EnumType> enums, IReadOnlyDictionary<InputModelType, ModelTypeProvider> models, IReadOnlyList<LowLevelClient> restClients, ClientOptionsTypeProvider clientOptions, bool isTspInput, SourceInputModel? sourceInputModel)
         {

src/AutoRest.CSharp/LowLevel/AutoRest/LowLevelTarget.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
+using System.Collections.Immutable;
 using System.Threading.Tasks;
 using AutoRest.CSharp.Common.Generation.Writers;
 using AutoRest.CSharp.Common.Input;
@@ -64,6 +65,7 @@ public static async Task ExecuteAsync(GeneratedCodeWorkspace project, InputNames
             }
 
             await project.PostProcessAsync(new PostProcessor(
+                modelsToKeep: library.AccessOverrideModels.ToImmutableHashSet(),
                 modelFactoryFullName: modelFactoryProvider?.FullName,
                 aspExtensionClassName: library.AspDotNetExtension.FullName));
         }

src/AutoRest.CSharp/Mgmt/AutoRest/PostProcess/MgmtPostProcessor.cs

@@ -14,12 +14,7 @@ namespace AutoRest.CSharp.Mgmt.AutoRest.PostProcess
 {
     internal sealed class MgmtPostProcessor : PostProcessor
     {
-        private readonly ImmutableHashSet<string> _modelsToKeep;
-
-        public MgmtPostProcessor(ImmutableHashSet<string> modelsToKeep, string? modelFactoryFullName) : base(modelFactoryFullName)
-        {
-            _modelsToKeep = modelsToKeep;
-        }
+        public MgmtPostProcessor(ImmutableHashSet<string> modelsToKeep, string? modelFactoryFullName) : base(modelsToKeep, modelFactoryFullName) { }
 
         protected override bool IsRootDocument(Document document)
         {
@@ -28,7 +23,7 @@ protected override bool IsRootDocument(Document document)
             // 1. the file is under `Generated` or `Generated/Extensions` which is handled by `IsMgmtRootDocument`
             // 2. the declaration has a ReferenceType or similar attribute on it which is handled by `IsReferenceType`
             // 3. the file is custom code (not generated and not shared) which is handled by `IsCustomDocument`
-            return IsMgmtRootDocument(document) || IsReferenceType(root) || GeneratedCodeWorkspace.IsCustomDocument(document) || ShouldKeepModel(root, _modelsToKeep);
+            return IsMgmtRootDocument(document) || IsReferenceType(root) || base.IsRootDocument(document);
         }
 
         private static bool IsMgmtRootDocument(Document document) => GeneratedCodeWorkspace.IsGeneratedDocument(document) && Path.GetDirectoryName(document.Name) is "Extensions" or "";
@@ -60,18 +55,6 @@ private static bool IsReferenceType(SyntaxNode? root)
             return false;
         }
 
-        private static bool ShouldKeepModel(SyntaxNode? root, ImmutableHashSet<string> modelsToKeep)
-        {
-            if (root is null)
-                return false;
-
-            // use `BaseTypeDeclarationSyntax` to also include enums because `EnumDeclarationSyntax` extends `BaseTypeDeclarationSyntax`
-            // `ClassDeclarationSyntax` and `StructDeclarationSyntax` both inherit `TypeDeclarationSyntax`
-            var typeNodes = root.DescendantNodes().OfType<BaseTypeDeclarationSyntax>();
-            // there is possibility that we have multiple types defined in the same document (for instance, custom code)
-            return typeNodes.Any(t => modelsToKeep.Contains(t.Identifier.Text));
-        }
-
         private static SyntaxList<AttributeListSyntax>? GetAttributeLists(SyntaxNode node)
         {
             if (node is StructDeclarationSyntax structDeclaration)

src/AutoRest.CSharp/Properties/launchSettings.json

@@ -624,10 +624,18 @@
       "commandName": "Project",
       "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\authentication\\union\\src\\Generated -n"
     },
+    "typespec-azure/client-generator-core/access": {
+      "commandName": "Project",
+      "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\azure\\client-generator-core\\access\\src\\Generated -n"
+    },
     "typespec-azure/client-generator-core/internal": {
       "commandName": "Project",
       "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\azure\\client-generator-core\\internal\\src\\Generated -n"
     },
+    "typespec-azure/client-generator-core/usage": {
+      "commandName": "Project",
+      "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\azure\\client-generator-core\\usage\\src\\Generated -n"
+    },
     "typespec-azure/core/basic": {
       "commandName": "Project",
       "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\azure\\core\\basic\\src\\Generated -n"

src/TypeSpec.Extension/Emitter.Csharp/package.json

@@ -51,7 +51,7 @@
     "dependencies": {
         "@autorest/csharp": "3.0.0-beta.20230309.1",
         "@azure-tools/typespec-azure-core": "0.33.1",
-        "@azure-tools/typespec-client-generator-core": "0.33.0",
+        "@azure-tools/typespec-client-generator-core": "0.34.0-dev.6",
         "@typespec/compiler": "0.47.1",
         "@typespec/eslint-config-typespec": "0.47.0",
         "@typespec/eslint-plugin": "0.47.0",

src/TypeSpec.Extension/Emitter.Csharp/src/lib/clientModelBuilder.ts

@@ -302,6 +302,7 @@ function setUsage(
     models: Map<string, InputModelType | InputEnumType>
 ) {
     for (const [name, m] of models) {
+        if (m.Usage !== undefined && m.Usage !== Usage.None) continue;
         if (usages.inputs.includes(name)) {
             m.Usage = Usage.Input;
         } else if (usages.outputs.includes(name)) {

src/TypeSpec.Extension/Emitter.Csharp/src/lib/model.ts

@@ -59,18 +59,20 @@ import {
     InputIntrinsicType,
     InputUnknownType,
     isInputEnumType,
-    isInputLiteralType
+    isInputLiteralType,
+    isInputModelType
 } from "../type/inputType.js";
 import { InputTypeKind } from "../type/inputTypeKind.js";
 import { Usage } from "../type/usage.js";
 import { logger } from "./logger.js";
 import {
     SdkContext,
-    getLibraryName,
-    getSdkSimpleType,
+    getAccess,
+    getClientType,
+    getUsageOverride,
     isInternal
 } from "@azure-tools/typespec-client-generator-core";
-import { capitalize, getModelName, getNameForTemplate } from "./utils.js";
+import { capitalize, getModelName } from "./utils.js";
 import { FormattedType } from "../type/formattedType.js";
 import { LiteralTypeContext } from "../type/literalTypeContext.js";
 /**
@@ -142,6 +144,13 @@ function getCSharpInputTypeKindByIntrinsicModelName(
             return InputTypeKind.Float32;
         case "float64":
             return InputTypeKind.Float64;
+        case "uri":
+        case "url":
+            return InputTypeKind.Uri;
+        case "uuid":
+            return InputTypeKind.Guid;
+        case "etag":
+            return InputTypeKind.String;
         case "string":
             switch (format?.toLowerCase()) {
                 case "date":
@@ -307,12 +316,12 @@ export function getInputType(
             // In such cases, we don't want to emit a ref and instead just
             // emit the base type directly.
             default:
-                const sdkType = getSdkSimpleType(context, type);
+                const sdkType = getClientType(context, type);
                 return {
                     Name: type.name,
                     Kind: getCSharpInputTypeKindByIntrinsicModelName(
                         sdkType.kind,
-                        sdkType.format ?? formattedType.format,
+                        formattedType.format,
                         formattedType.encode
                     ),
                     IsNullable: false
@@ -464,14 +473,15 @@ export function getInputType(
             enumType = {
                 Name: e.name,
                 Namespace: getFullNamespaceString(e.namespace),
-                Accessibility: undefined, //TODO: need to add accessibility
+                Accessibility: getAccess(context, e),
                 Deprecated: getDeprecated(program, e),
                 Description: getDoc(program, e) ?? "",
                 EnumValueType: enumValueType,
                 AllowedValues: allowValues,
                 IsExtensible: !isFixed(program, e),
                 IsNullable: false
             } as InputEnumType;
+            setUsage(context, e, enumType);
             if (addToCollection) enums.set(e.name, enumType);
         }
         return enumType;
@@ -528,7 +538,9 @@ export function getInputType(
             model = {
                 Name: name,
                 Namespace: getFullNamespaceString(m.namespace),
-                Accessibility: isInternal(context, m) ? "internal" : undefined,
+                Accessibility: isInternal(context, m)
+                    ? "internal"
+                    : getAccess(context, m),
                 Deprecated: getDeprecated(program, m),
                 Description: getDoc(program, m),
                 IsNullable: false,
@@ -538,7 +550,7 @@ export function getInputType(
                 Usage: Usage.None,
                 Properties: properties // DerivedModels should be the last assigned to model, if no derived models, properties should be the last
             } as InputModelType;
-
+            setUsage(context, m, model);
             models.set(name, model);
 
             // Resolve properties after model is added to the map to resolve possible circular dependencies
@@ -625,6 +637,13 @@ export function getInputType(
                     enums,
                     literalTypeContext
                 );
+                if (
+                    model.Namespace === "Azure.Core.Foundations" &&
+                    model.Name === "Error" &&
+                    isInputModelType(inputType)
+                ) {
+                    inputType.Accessibility = undefined;
+                }
                 const inputProp = {
                     Name: name,
                     SerializedName: serializedName,
@@ -754,6 +773,21 @@ export function getInputType(
     }
 }
 
+function setUsage(
+    context: SdkContext,
+    source: Model | Enum,
+    target: InputModelType | InputEnumType
+) {
+    const sourceUsage = getUsageOverride(context, source);
+    if (sourceUsage === UsageFlags.Input) {
+        target.Usage = Usage.Input;
+    } else if (sourceUsage === UsageFlags.Output) {
+        target.Usage = Usage.Output;
+    } else if (sourceUsage === (UsageFlags.Input | UsageFlags.Output)) {
+        target.Usage = Usage.RoundTrip;
+    }
+}
+
 export function getUsages(
     context: SdkContext,
     ops?: HttpOperation[],

src/TypeSpec.Extension/Emitter.Csharp/src/lib/operation.ts

@@ -8,7 +8,8 @@ import {
     isInternal,
     shouldGenerateConvenient,
     shouldGenerateProtocol,
-    SdkContext
+    SdkContext,
+    getAccess
 } from "@azure-tools/typespec-client-generator-core";
 import {
     EmitContext,
@@ -199,7 +200,9 @@ export function loadOperation(
         Summary: summary,
         Deprecated: getDeprecated(program, op),
         Description: desc,
-        Accessibility: isInternal(sdkContext, op) ? "internal" : undefined,
+        Accessibility: isInternal(sdkContext, op)
+            ? "internal"
+            : getAccess(sdkContext, op),
         Parameters: parameters,
         Responses: responses,
         HttpMethod: requestMethod,

test/AutoRest.TestServer.Tests/Common/PostProcessing/PostProcessorTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Threading.Tasks;
 using AutoRest.CSharp.Common.Output.PostProcessing;
 using Microsoft.CodeAnalysis;
@@ -13,6 +14,10 @@ internal class PostProcessorTests
 {
     internal class TestPostProcessor : PostProcessor
     {
+        public TestPostProcessor(ImmutableHashSet<string> modelsToKeep) : base(modelsToKeep)
+        {
+        }
+
         protected override bool IsRootDocument(Document document)
         {
             return document.Name.EndsWith("Client.cs");
@@ -42,7 +47,7 @@ public void Setup()
     [TestCase("TestSDK.PageableItem", true, false)]
     public async Task ValidateTypeAccessibility(string typeFullName, bool exist, bool? isInternal)
     {
-        var postProcessor = new TestPostProcessor();
+        var postProcessor = new TestPostProcessor(ImmutableHashSet<string>.Empty);
 
         _project = await postProcessor.InternalizeAsync(_project);
 

test/CadlRanchMockApis/package.json

@@ -32,6 +32,6 @@
         "dist/**"
     ],
     "peerDependencies": {
-        "@azure-tools/cadl-ranch-specs": "0.19.0"
+        "@azure-tools/cadl-ranch-specs": "0.20.0"
     }
 }