-
Notifications
You must be signed in to change notification settings - Fork 5k
Add NameVisitor #50869
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
live1206
wants to merge
1
commit into
Azure:main
Choose a base branch
from
live1206:url-uri
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+102
−0
Open
Add NameVisitor #50869
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/NameVisitor.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
// Copyright (c) Microsoft Corporation. All rights reserved. | ||
// Licensed under the MIT License. | ||
|
||
using Microsoft.TypeSpec.Generator.ClientModel; | ||
using Microsoft.TypeSpec.Generator.Input; | ||
using Microsoft.TypeSpec.Generator.Providers; | ||
using System; | ||
using System.Diagnostics.CodeAnalysis; | ||
|
||
namespace Azure.Generator.Management | ||
{ | ||
internal class NameVisitor : ScmLibraryVisitor | ||
{ | ||
protected override ModelProvider? PreVisitModel(InputModelType model, ModelProvider? type) | ||
{ | ||
if (type is not null && TryTransformUrlToUri(model.Name, out var newName)) | ||
{ | ||
type.Update(name: newName); | ||
} | ||
|
||
foreach (var property in model.Properties) | ||
{ | ||
if (TryTransformUrlToUri(property.Name, out var newPropertyName)) | ||
{ | ||
// property.Update(name: newPropertyName); | ||
} | ||
} | ||
return base.PreVisitModel(model, type); | ||
} | ||
|
||
private bool TryTransformUrlToUri(string name, [MaybeNullWhen(false)] out string newName) | ||
{ | ||
const char i = 'i'; | ||
const string UrlSuffix = "Url"; | ||
newName = null; | ||
if (name.Length < UrlSuffix.Length) | ||
{ | ||
return false; | ||
} | ||
|
||
var span = name.AsSpan(); | ||
// check if this ends with `Url` | ||
if (span.EndsWith(UrlSuffix.AsSpan(), StringComparison.Ordinal)) | ||
{ | ||
Span<char> newSpan = span.ToArray(); | ||
newSpan[^1] = i; | ||
|
||
newName = new string(newSpan); | ||
return true; | ||
} | ||
|
||
return false; | ||
} | ||
} | ||
} |
46 changes: 46 additions & 0 deletions
46
...ges/http-client-csharp-mgmt/generator/Azure.Generator.Management/test/NameVisitorTests.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
// Copyright (c) Microsoft Corporation. All rights reserved. | ||
// Licensed under the MIT License. | ||
|
||
using Azure.Generator.Management; | ||
using Azure.Generator.Management.Tests.TestHelpers; | ||
using Azure.Generator.Tests.Common; | ||
using Microsoft.TypeSpec.Generator.Input; | ||
using Microsoft.TypeSpec.Generator.Providers; | ||
using NUnit.Framework; | ||
|
||
namespace Azure.Generator.Mgmt.Tests | ||
{ | ||
internal class NameVisitorTests | ||
{ | ||
private const string TestClientName = "TestClient"; | ||
|
||
[Test] | ||
public void TestTransformUrlToUri() | ||
{ | ||
var model = InputFactory.Model("TestModelUrl"); | ||
var responseType = InputFactory.OperationResponse(statusCodes: [200], bodytype: model); | ||
var testNameParameter = InputFactory.Parameter("testName", InputPrimitiveType.String, location: InputRequestLocation.Path); | ||
var operation = InputFactory.Operation(name: "get", responses: [responseType], parameters: [testNameParameter], path: "/providers/a/test/{testName}", decorators: []); | ||
|
||
var client = InputFactory.Client( | ||
TestClientName, | ||
methods: [InputFactory.BasicServiceMethod("Get", operation, parameters: [testNameParameter])], | ||
crossLanguageDefinitionId: $"Test.{TestClientName}", | ||
decorators: []); | ||
|
||
var plugin = ManagementMockHelpers.LoadMockPlugin(inputModels: () => [model], clients: () => [client]); | ||
var visitor = new TestVisitor(); | ||
var type = plugin.Object.TypeFactory.CreateModel(model); | ||
var transformedModel = visitor.InvokeVisit(model, type); | ||
Assert.That(transformedModel?.Name, Is.EqualTo("TestModelUri")); | ||
} | ||
|
||
private class TestVisitor : NameVisitor | ||
{ | ||
public ModelProvider? InvokeVisit(InputModelType model, ModelProvider? type) | ||
{ | ||
return base.PreVisitModel(model, type); | ||
} | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The property rename logic is commented out. If renaming model properties is intended, uncomment and implement this line; otherwise, remove the loop to avoid confusion.
Copilot uses AI. Check for mistakes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pending on microsoft/typespec#7738