diff --git a/samples/Blazor.ExampleConsumer/App.razor b/samples/Blazor.ExampleConsumer/App.razor index 623580d..6fd3ed1 100644 --- a/samples/Blazor.ExampleConsumer/App.razor +++ b/samples/Blazor.ExampleConsumer/App.razor @@ -1,12 +1,12 @@ - - - - - - - Not found - -

Sorry, there's nothing at this address.

- - - + + + + + + + Not found + +

Sorry, there's nothing at this address.

+ + + diff --git a/samples/Blazor.ExampleConsumer/Components/BingMap.razor b/samples/Blazor.ExampleConsumer/Components/BingMap.razor index 86c486a..6f6065e 100644 --- a/samples/Blazor.ExampleConsumer/Components/BingMap.razor +++ b/samples/Blazor.ExampleConsumer/Components/BingMap.razor @@ -1,19 +1,19 @@ -@inject IJSInProcessRuntime JavaScript - -
- -@code { +@inject IJSInProcessRuntime JavaScript + +
+ +@code { [Parameter, EditorRequired] - public GeolocationPosition Position { get; set; } = null!; - - protected override void OnParametersSet() - { - if (Position is null or { Coords: null }) - { - return; - } - - JavaScript.InvokeVoid( - "app.loadMap", "map", Position.Coords.Latitude, Position.Coords.Longitude); - } -} + public GeolocationPosition Position { get; set; } = null!; + + protected override void OnParametersSet() + { + if (Position is null or { Coords: null }) + { + return; + } + + JavaScript.InvokeVoid( + "app.loadMap", "map", Position.Coords.Latitude, Position.Coords.Longitude); + } +} diff --git a/samples/Blazor.ExampleConsumer/Components/Code.razor b/samples/Blazor.ExampleConsumer/Components/Code.razor index 2978cf8..94234c2 100644 --- a/samples/Blazor.ExampleConsumer/Components/Code.razor +++ b/samples/Blazor.ExampleConsumer/Components/Code.razor @@ -1,28 +1,28 @@ -@typeparam T where T : class - -@if (Value is not null) -{ - 
-        
-            @{
-                var opts = new JsonSerializerOptions()
-                {
-                    WriteIndented = true,
-                    PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-                };
-            }
-            @Value?.ToJson(opts)
-        
-
-} - -@code { - [Parameter, EditorRequired] - public T? Value { get; set; } = default!; - - [Parameter] - public bool IsError { get; set; } - - string _textClass => IsError ? "text-warning" : "text-info"; -} +@typeparam T where T : class + +@if (Value is not null) +{ + 
+        
+            @{
+                var opts = new JsonSerializerOptions()
+                {
+                    WriteIndented = true,
+                    PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+                    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+                };
+            }
+            @Value?.ToJson(opts)
+        
+
+} + +@code { + [Parameter, EditorRequired] + public T? Value { get; set; } = default!; + + [Parameter] + public bool IsError { get; set; } + + string _textClass => IsError ? "text-warning" : "text-info"; +} diff --git a/samples/Blazor.ExampleConsumer/Components/StorageCheckbox.razor b/samples/Blazor.ExampleConsumer/Components/StorageCheckbox.razor index 5d13e0d..9240807 100644 --- a/samples/Blazor.ExampleConsumer/Components/StorageCheckbox.razor +++ b/samples/Blazor.ExampleConsumer/Components/StorageCheckbox.razor @@ -1,41 +1,41 @@ -@inject ILocalStorageService LocalStorage - - -@if (EndContent is not null) -{ - @EndContent -} - -@code { +@inject ILocalStorageService LocalStorage + + +@if (EndContent is not null) +{ + @EndContent +} + +@code { [Parameter, EditorRequired] public TodoItem Item { get; set; } = null!; - [Parameter] + [Parameter] public RenderFragment EndContent { get; set; } = null!; [Parameter] public EventCallback ItemChanged { get; set; } - Task OnIsCompletedChanged(ChangeEventArgs args) - { - if (bool.TryParse(args?.Value?.ToString(), out var isCompleted)) - { - LocalStorage.SetItem( - Item.Id, - Item = Item with { IsCompleted = isCompleted }); - - if (ItemChanged.HasDelegate) - { - return ItemChanged.InvokeAsync(Item); - } - } - - return Task.CompletedTask; - } + Task OnIsCompletedChanged(ChangeEventArgs args) + { + if (bool.TryParse(args?.Value?.ToString(), out var isCompleted)) + { + LocalStorage.SetItem( + Item.Id, + Item = Item with { IsCompleted = isCompleted }); + + if (ItemChanged.HasDelegate) + { + return ItemChanged.InvokeAsync(Item); + } + } + + return Task.CompletedTask; + } } \ No newline at end of file diff --git a/samples/Blazor.ExampleConsumer/GlobalUsings.cs b/samples/Blazor.ExampleConsumer/GlobalUsings.cs index d945059..7799891 100644 --- a/samples/Blazor.ExampleConsumer/GlobalUsings.cs +++ b/samples/Blazor.ExampleConsumer/GlobalUsings.cs @@ -1,8 +1,8 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -global using System.Text.Json; -global using System.Text.Json.Serialization; -global using Microsoft.JSInterop; -global using Microsoft.AspNetCore.Components; -global using static System.Globalization.CultureInfo; +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +global using System.Text.Json; +global using System.Text.Json.Serialization; +global using Microsoft.JSInterop; +global using Microsoft.AspNetCore.Components; +global using static System.Globalization.CultureInfo; diff --git a/samples/Blazor.ExampleConsumer/Models/TodoItem.cs b/samples/Blazor.ExampleConsumer/Models/TodoItem.cs index 11728a9..d7cffdc 100644 --- a/samples/Blazor.ExampleConsumer/Models/TodoItem.cs +++ b/samples/Blazor.ExampleConsumer/Models/TodoItem.cs @@ -1,20 +1,20 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -using System.Text.RegularExpressions; - -namespace Blazor.ExampleConsumer.Models; - -public partial record class TodoItem( - string Task, - bool IsCompleted) -{ - internal const string IdPrefix = "todo"; - - [JsonIgnore] - public string Id => - $"{IdPrefix}{AlphabetOrDigitRegex().Replace(Task, "")}"; - - [GeneratedRegex("[^a-zA-Z0-9]")] - private static partial Regex AlphabetOrDigitRegex(); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using System.Text.RegularExpressions; + +namespace Blazor.ExampleConsumer.Models; + +public partial record class TodoItem( + string Task, + bool IsCompleted) +{ + internal const string IdPrefix = "todo"; + + [JsonIgnore] + public string Id => + $"{IdPrefix}{AlphabetOrDigitRegex().Replace(Task, "")}"; + + [GeneratedRegex("[^a-zA-Z0-9]")] + private static partial Regex AlphabetOrDigitRegex(); +} diff --git a/samples/Blazor.ExampleConsumer/Pages/ClientPosition.razor b/samples/Blazor.ExampleConsumer/Pages/ClientPosition.razor index 83f27a6..4d89d35 100644 --- a/samples/Blazor.ExampleConsumer/Pages/ClientPosition.razor +++ b/samples/Blazor.ExampleConsumer/Pages/ClientPosition.razor @@ -1,38 +1,38 @@ -@page "/geolocation" - -@inject IGeolocationService Geolocation - -Geolocation -

- Geolocation - @if (_isLoading) - { - - } - @if (_position is not null) - { - : - - @(_position.TimestampAsUtcDateTime.ToLocalTime().ToString()) - - - - - - } -

- -@if (_isLoading) -{ -

This page demonstrates the source generated Blazor.Geolocation.WebAssembly package.

-} - -@{ - - - - +@page "/geolocation" + +@inject IGeolocationService Geolocation + +Geolocation +

+ Geolocation + @if (_isLoading) + { + + } + @if (_position is not null) + { + : + + @(_position.TimestampAsUtcDateTime.ToLocalTime().ToString()) + + + + + + } +

+ +@if (_isLoading) +{ +

This page demonstrates the source generated Blazor.Geolocation.WebAssembly package.

+} + +@{ + + + + } \ No newline at end of file diff --git a/samples/Blazor.ExampleConsumer/Pages/ClientPosition.razor.cs b/samples/Blazor.ExampleConsumer/Pages/ClientPosition.razor.cs index 302bdf2..19733f2 100644 --- a/samples/Blazor.ExampleConsumer/Pages/ClientPosition.razor.cs +++ b/samples/Blazor.ExampleConsumer/Pages/ClientPosition.razor.cs @@ -1,47 +1,47 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.ExampleConsumer.Pages; - -public sealed partial class ClientPosition -{ - readonly JsonSerializerOptions _opts = new() - { - WriteIndented = true, - PropertyNamingPolicy = JsonNamingPolicy.CamelCase, - DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull - }; - readonly PositionOptions _options = new() - { - EnableHighAccuracy = true, - MaximumAge = null, - Timeout = 15_000 - }; - - GeolocationPosition? _position; - GeolocationPositionError? _positionError; - bool _isLoading = true; - - protected override void OnInitialized() => - Geolocation.GetCurrentPosition( - component: this, - onSuccessCallbackMethodName: nameof(OnPositionRecieved), - onErrorCallbackMethodName: nameof(OnPositionError), - options: _options); - - [JSInvokable] - public void OnPositionRecieved(GeolocationPosition position) - { - _isLoading = false; - _position = position; - StateHasChanged(); - } - - [JSInvokable] - public void OnPositionError(GeolocationPositionError positionError) - { - _isLoading = false; - _positionError = positionError; - StateHasChanged(); - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.ExampleConsumer.Pages; + +public sealed partial class ClientPosition +{ + readonly JsonSerializerOptions _opts = new() + { + WriteIndented = true, + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, + DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull + }; + readonly PositionOptions _options = new() + { + EnableHighAccuracy = true, + MaximumAge = null, + Timeout = 15_000 + }; + + GeolocationPosition? _position; + GeolocationPositionError? _positionError; + bool _isLoading = true; + + protected override void OnInitialized() => + Geolocation.GetCurrentPosition( + component: this, + onSuccessCallbackMethodName: nameof(OnPositionRecieved), + onErrorCallbackMethodName: nameof(OnPositionError), + options: _options); + + [JSInvokable] + public void OnPositionRecieved(GeolocationPosition position) + { + _isLoading = false; + _position = position; + StateHasChanged(); + } + + [JSInvokable] + public void OnPositionError(GeolocationPositionError positionError) + { + _isLoading = false; + _positionError = positionError; + StateHasChanged(); + } +} diff --git a/samples/Blazor.ExampleConsumer/Pages/Index.razor b/samples/Blazor.ExampleConsumer/Pages/Index.razor index e97347f..014471e 100644 --- a/samples/Blazor.ExampleConsumer/Pages/Index.razor +++ b/samples/Blazor.ExampleConsumer/Pages/Index.razor @@ -1,9 +1,9 @@ -@page "/" - -Index - -

Hi friends! 🤓

- -

This sample app shows how to consume the source-generated projects of #blazorators.

- - +@page "/" + +Index + +

Hi friends! 🤓

+ +

This sample app shows how to consume the source-generated projects of #blazorators.

+ + diff --git a/samples/Blazor.ExampleConsumer/Pages/ListenToMe.razor b/samples/Blazor.ExampleConsumer/Pages/ListenToMe.razor index 2f42d46..67761f3 100644 --- a/samples/Blazor.ExampleConsumer/Pages/ListenToMe.razor +++ b/samples/Blazor.ExampleConsumer/Pages/ListenToMe.razor @@ -1,29 +1,29 @@ -@page "/listen" - -Speech-to-text - -

This page demonstrates the source generated Blazor.SpeechRecongition.WebAssembly package.

- -
- - -
- - - \ No newline at end of file diff --git a/samples/Blazor.ExampleConsumer/Pages/ListenToMe.razor.cs b/samples/Blazor.ExampleConsumer/Pages/ListenToMe.razor.cs index 76cecda..4d22a12 100644 --- a/samples/Blazor.ExampleConsumer/Pages/ListenToMe.razor.cs +++ b/samples/Blazor.ExampleConsumer/Pages/ListenToMe.razor.cs @@ -1,91 +1,91 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.ExampleConsumer.Pages; - -public sealed partial class ListenToMe : IAsyncDisposable -{ - const string TranscriptKey = "listen-to-me-page-transcript"; - - IDisposable? _recognitionSubscription; - bool _isRecognizingSpeech = false; - SpeechRecognitionErrorEvent? _errorEvent; - string? _transcript; - - [Inject] - public ISpeechRecognitionService SpeechRecognition { get; set; } = null!; - - [Inject] - public ISessionStorageService SessionStorage { get; set; } = null!; - - protected override void OnInitialized() => - _transcript = SessionStorage.GetItem(TranscriptKey); - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - if (firstRender) - { - await SpeechRecognition.InitializeModuleAsync(); - } - } - - void OnRecognizeSpeechClick() - { - if (_isRecognizingSpeech) - { - SpeechRecognition.CancelSpeechRecognition(false); - } - else - { - var bcp47Tag = CurrentUICulture.Name; - - _recognitionSubscription?.Dispose(); - _recognitionSubscription = SpeechRecognition.RecognizeSpeech( - bcp47Tag, - OnRecognized, - OnError, - OnStarted, - OnEnded); - } - } - - void OnStarted() - { - _isRecognizingSpeech = true; - StateHasChanged(); - } - - void OnEnded() - { - _isRecognizingSpeech = false; - StateHasChanged(); - } - - void OnError(SpeechRecognitionErrorEvent errorEvent) - { - _errorEvent = errorEvent; - StateHasChanged(); - } - - void OnRecognized(string transcript) - { - _transcript = _transcript switch - { - null => transcript, - _ => $"{_transcript.Trim()} {transcript}".Trim() - }; - - SessionStorage.SetItem(TranscriptKey, _transcript); - StateHasChanged(); - } - - public async ValueTask DisposeAsync() - { - if (SpeechRecognition is not null) - { - await SpeechRecognition.DisposeAsync(); - } - - _recognitionSubscription?.Dispose(); - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.ExampleConsumer.Pages; + +public sealed partial class ListenToMe : IAsyncDisposable +{ + const string TranscriptKey = "listen-to-me-page-transcript"; + + IDisposable? _recognitionSubscription; + bool _isRecognizingSpeech = false; + SpeechRecognitionErrorEvent? _errorEvent; + string? _transcript; + + [Inject] + public ISpeechRecognitionService SpeechRecognition { get; set; } = null!; + + [Inject] + public ISessionStorageService SessionStorage { get; set; } = null!; + + protected override void OnInitialized() => + _transcript = SessionStorage.GetItem(TranscriptKey); + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + await SpeechRecognition.InitializeModuleAsync(); + } + } + + void OnRecognizeSpeechClick() + { + if (_isRecognizingSpeech) + { + SpeechRecognition.CancelSpeechRecognition(false); + } + else + { + var bcp47Tag = CurrentUICulture.Name; + + _recognitionSubscription?.Dispose(); + _recognitionSubscription = SpeechRecognition.RecognizeSpeech( + bcp47Tag, + OnRecognized, + OnError, + OnStarted, + OnEnded); + } + } + + void OnStarted() + { + _isRecognizingSpeech = true; + StateHasChanged(); + } + + void OnEnded() + { + _isRecognizingSpeech = false; + StateHasChanged(); + } + + void OnError(SpeechRecognitionErrorEvent errorEvent) + { + _errorEvent = errorEvent; + StateHasChanged(); + } + + void OnRecognized(string transcript) + { + _transcript = _transcript switch + { + null => transcript, + _ => $"{_transcript.Trim()} {transcript}".Trim() + }; + + SessionStorage.SetItem(TranscriptKey, _transcript); + StateHasChanged(); + } + + public async ValueTask DisposeAsync() + { + if (SpeechRecognition is not null) + { + await SpeechRecognition.DisposeAsync(); + } + + _recognitionSubscription?.Dispose(); + } +} diff --git a/samples/Blazor.ExampleConsumer/Pages/ReadToMe.razor b/samples/Blazor.ExampleConsumer/Pages/ReadToMe.razor index e1c5160..b96d0ae 100644 --- a/samples/Blazor.ExampleConsumer/Pages/ReadToMe.razor +++ b/samples/Blazor.ExampleConsumer/Pages/ReadToMe.razor @@ -1,58 +1,58 @@ -@page "/speak" - -Text-to-speech - -

This page demonstrates the source generated Blazor.SpeechSynthesis.WebAssembly package.

- -
- - -
- -
- - - - @foreach (var speed in _voiceSpeeds) - { - - } - -
- -
- - -
- -
- - - - +@page "/speak" + +Text-to-speech + +

This page demonstrates the source generated Blazor.SpeechSynthesis.WebAssembly package.

+ +
+ + +
+ +
+ + + + @foreach (var speed in _voiceSpeeds) + { + + } + +
+ +
+ + +
+ +
+ + + +
\ No newline at end of file diff --git a/samples/Blazor.ExampleConsumer/Pages/ReadToMe.razor.cs b/samples/Blazor.ExampleConsumer/Pages/ReadToMe.razor.cs index 2d55ae0..09de22b 100644 --- a/samples/Blazor.ExampleConsumer/Pages/ReadToMe.razor.cs +++ b/samples/Blazor.ExampleConsumer/Pages/ReadToMe.razor.cs @@ -1,99 +1,99 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -using Humanizer; - -namespace Blazor.ExampleConsumer.Pages; - -public sealed partial class ReadToMe : IDisposable -{ - const string PreferredVoiceKey = "preferred-voice"; - const string PreferredSpeedKey = "preferred-speed"; - const string TextKey = "read-to-me-text"; - - string? _text = "Blazorators is an open-source project that strives to simplify JavaScript interop in Blazor. JavaScript interoperability is possible by parsing TypeScript type declarations and using this metadata to output corresponding C# types."; - SpeechSynthesisVoice[] _voices = Array.Empty(); - readonly IList _voiceSpeeds = - Enumerable.Range(0, 12).Select(i => (i + 1) * .25).ToList(); - double _voiceSpeed = 1.5; - string? _selectedVoice; - string? _elapsedTimeMessage = null; - - SpeechSynthesisUtterance Utterance => new() - { - Text = _text ?? "You forgot to try uttering some text.", - Rate = _voiceSpeed, - Volume = 1, - Voice = _selectedVoice is { Length: > 0 } - ? _voices?.FirstOrDefault(voice => voice.Name == _selectedVoice) - : null - }; - - [Inject] - public ISpeechSynthesisService SpeechSynthesis { get; set; } = null!; - - [Inject] - public ILocalStorageService LocalStorage { get; set; } = null!; - - [Inject] - public ISessionStorageService SessionStorage { get; set; } = null!; - - [Inject] - public ILogger Logger { get; set; } = null!; - - protected override async Task OnInitializedAsync() - { - await GetVoicesAsync(); - SpeechSynthesis.OnVoicesChanged(() => GetVoicesAsync(true)); - - if (LocalStorage.GetItem(PreferredVoiceKey) - is { Length: > 0 } voice) - { - _selectedVoice = voice; - } - if (LocalStorage.GetItem(PreferredSpeedKey) - is double speed && speed > 0) - { - _voiceSpeed = speed; - } - if (SessionStorage.GetItem(TextKey) - is { Length: > 0 } text) - { - _text = text; - } - } - - async Task GetVoicesAsync(bool isFromCallback = false) - { - _voices = await SpeechSynthesis.GetVoicesAsync(); - if (_voices is { } && isFromCallback) - { - StateHasChanged(); - } - } - - void OnTextChanged(ChangeEventArgs args) => _text = args.Value?.ToString(); - - void OnVoiceSpeedChange(ChangeEventArgs args) => - _voiceSpeed = double.TryParse(args.Value?.ToString() ?? "1.5", out var speed) - ? speed : 1.5; - - void Speak() => SpeechSynthesis.Speak( - Utterance, - elapsedTime => - { - _elapsedTimeMessage = - $"Read aloud in {TimeSpan.FromMilliseconds(elapsedTime).Humanize()}."; - - StateHasChanged(); - }); - - void IDisposable.Dispose() - { - LocalStorage.SetItem(PreferredVoiceKey, _selectedVoice); - LocalStorage.SetItem(PreferredSpeedKey, _voiceSpeed); - SessionStorage.SetItem(TextKey, _text); - - SpeechSynthesis.UnsubscribeFromVoicesChanged(); - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using Humanizer; + +namespace Blazor.ExampleConsumer.Pages; + +public sealed partial class ReadToMe : IDisposable +{ + const string PreferredVoiceKey = "preferred-voice"; + const string PreferredSpeedKey = "preferred-speed"; + const string TextKey = "read-to-me-text"; + + string? _text = "Blazorators is an open-source project that strives to simplify JavaScript interop in Blazor. JavaScript interoperability is possible by parsing TypeScript type declarations and using this metadata to output corresponding C# types."; + SpeechSynthesisVoice[] _voices = Array.Empty(); + readonly IList _voiceSpeeds = + Enumerable.Range(0, 12).Select(i => (i + 1) * .25).ToList(); + double _voiceSpeed = 1.5; + string? _selectedVoice; + string? _elapsedTimeMessage = null; + + SpeechSynthesisUtterance Utterance => new() + { + Text = _text ?? "You forgot to try uttering some text.", + Rate = _voiceSpeed, + Volume = 1, + Voice = _selectedVoice is { Length: > 0 } + ? _voices?.FirstOrDefault(voice => voice.Name == _selectedVoice) + : null + }; + + [Inject] + public ISpeechSynthesisService SpeechSynthesis { get; set; } = null!; + + [Inject] + public ILocalStorageService LocalStorage { get; set; } = null!; + + [Inject] + public ISessionStorageService SessionStorage { get; set; } = null!; + + [Inject] + public ILogger Logger { get; set; } = null!; + + protected override async Task OnInitializedAsync() + { + await GetVoicesAsync(); + SpeechSynthesis.OnVoicesChanged(() => GetVoicesAsync(true)); + + if (LocalStorage.GetItem(PreferredVoiceKey) + is { Length: > 0 } voice) + { + _selectedVoice = voice; + } + if (LocalStorage.GetItem(PreferredSpeedKey) + is double speed && speed > 0) + { + _voiceSpeed = speed; + } + if (SessionStorage.GetItem(TextKey) + is { Length: > 0 } text) + { + _text = text; + } + } + + async Task GetVoicesAsync(bool isFromCallback = false) + { + _voices = await SpeechSynthesis.GetVoicesAsync(); + if (_voices is { } && isFromCallback) + { + StateHasChanged(); + } + } + + void OnTextChanged(ChangeEventArgs args) => _text = args.Value?.ToString(); + + void OnVoiceSpeedChange(ChangeEventArgs args) => + _voiceSpeed = double.TryParse(args.Value?.ToString() ?? "1.5", out var speed) + ? speed : 1.5; + + void Speak() => SpeechSynthesis.Speak( + Utterance, + elapsedTime => + { + _elapsedTimeMessage = + $"Read aloud in {TimeSpan.FromMilliseconds(elapsedTime).Humanize()}."; + + StateHasChanged(); + }); + + void IDisposable.Dispose() + { + LocalStorage.SetItem(PreferredVoiceKey, _selectedVoice); + LocalStorage.SetItem(PreferredSpeedKey, _voiceSpeed); + SessionStorage.SetItem(TextKey, _text); + + SpeechSynthesis.UnsubscribeFromVoicesChanged(); + } +} diff --git a/samples/Blazor.ExampleConsumer/Pages/Sandbox.razor b/samples/Blazor.ExampleConsumer/Pages/Sandbox.razor index 511b653..c1dd653 100644 --- a/samples/Blazor.ExampleConsumer/Pages/Sandbox.razor +++ b/samples/Blazor.ExampleConsumer/Pages/Sandbox.razor @@ -1,49 +1,49 @@ -@page "/sandbox" -@inject IGeolocationService GeolocationService - -

- 🎭 Sandbox - @if (_isLoading) - { - - } - @if (_position is not null) - { - : - - @(_position.TimestampAsUtcDateTime.ToLocalTime().ToString()) - - - - - - } -

- - - - - - -@code { - bool _isLoading => _position is null && _positionError is null; - +@page "/sandbox" +@inject IGeolocationService GeolocationService + +

+ 🎭 Sandbox + @if (_isLoading) + { + + } + @if (_position is not null) + { + : + + @(_position.TimestampAsUtcDateTime.ToLocalTime().ToString()) + + + + + + } +

+ + + + + + +@code { + bool _isLoading => _position is null && _positionError is null; + GeolocationPosition? _position; GeolocationPositionError? _positionError; - protected override void OnInitialized() => - GeolocationService.GetCurrentPosition( - position => - { - _position = position; - StateHasChanged(); - }, - positionError => - { - _positionError = positionError; - StateHasChanged(); - }); -} + protected override void OnInitialized() => + GeolocationService.GetCurrentPosition( + position => + { + _position = position; + StateHasChanged(); + }, + positionError => + { + _positionError = positionError; + StateHasChanged(); + }); +} diff --git a/samples/Blazor.ExampleConsumer/Pages/TodoList.razor b/samples/Blazor.ExampleConsumer/Pages/TodoList.razor index 8b09a90..ce7eb7c 100644 --- a/samples/Blazor.ExampleConsumer/Pages/TodoList.razor +++ b/samples/Blazor.ExampleConsumer/Pages/TodoList.razor @@ -1,83 +1,83 @@ -@page "/todos" - -Tasks - -

- Local Storage - - - -

-

This page demonstrates the source generated Blazor.LocalStorage.WebAssembly package.

- -
-
-
-
-
- - - -
-
-
- @if (_todos is { Count: > 0 }) - { -
    - @foreach (var todo in _todos) - { -
  • - - - - - -
    • - } -
- } -
-
-@if (_localStorageItems is { Count: > 0 }) -{ -
-
-
- Raw window.localStorage values - - - - - - - - - - @foreach (var (i, key, value) in _localStorageItems.Select((kvp, i) => (i, kvp.Key, kvp.Value))) - { - - - - - - } - -
#KeyValue
@i.ToString()@key.ToString()@value.ToString()
-
-
-
+@page "/todos" + +Tasks + +

+ Local Storage + + + +

+

This page demonstrates the source generated Blazor.LocalStorage.WebAssembly package.

+ +
+
+
+
+
+ + + +
+
+
+ @if (_todos is { Count: > 0 }) + { +
    + @foreach (var todo in _todos) + { +
  • + + + + + +
    • + } +
+ } +
+
+@if (_localStorageItems is { Count: > 0 }) +{ +
+
+
+ Raw window.localStorage values + + + + + + + + + + @foreach (var (i, key, value) in _localStorageItems.Select((kvp, i) => (i, kvp.Key, kvp.Value))) + { + + + + + + } + +
#KeyValue
@i.ToString()@key.ToString()@value.ToString()
+
+
+
} \ No newline at end of file diff --git a/samples/Blazor.ExampleConsumer/Pages/TodoList.razor.cs b/samples/Blazor.ExampleConsumer/Pages/TodoList.razor.cs index 588db28..8f65297 100644 --- a/samples/Blazor.ExampleConsumer/Pages/TodoList.razor.cs +++ b/samples/Blazor.ExampleConsumer/Pages/TodoList.razor.cs @@ -1,121 +1,121 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -using System.Diagnostics.CodeAnalysis; -using Blazor.ExampleConsumer.Models; -using Microsoft.AspNetCore.Components.Web; - -namespace Blazor.ExampleConsumer.Pages; - -public sealed partial class TodoList -{ - readonly Dictionary _localStorageItems = new(); - HashSet _todos = new(); - string? _todoValue; - - [Inject] - public ILocalStorageService LocalStorage { get; set; } = null!; - - protected override void OnInitialized() => UpdateTodoItems(); - - void UpdateTodoItems() - { - var todos = GetLocalStorageKeys() - .Where(key => key.StartsWith(TodoItem.IdPrefix)) - .Select(key => LocalStorage.GetItem(key)) - .Where(todo => todo is not null) - .ToHashSet() ?? new(); - - _todos = todos!; - - foreach (var key in GetLocalStorageKeys()) - { - if (TryGet(key, out TodoItem? todo)) - { - _localStorageItems[key] = todo.ToString(); - continue; - } - if (TryGet(key, out string? @string)) - { - _localStorageItems[key] = @string; - continue; - } - if (TryGet(key, out decimal num)) - { - _localStorageItems[key] = num.ToString(); - continue; - } - if (TryGet(key, out bool @bool)) - { - _localStorageItems[key] = @bool.ToString(); - continue; - } - } - - bool TryGet(string key, [NotNullWhen(true)] out T? value) - { - try - { - value = LocalStorage.GetItem(key); - return value is not null; - } - catch - { - value = default; - return false; - } - } - } - - IEnumerable GetLocalStorageKeys() - { - var length = LocalStorage.Length; - for (var i = 0; i < length; ++i) - { - if (LocalStorage.Key(i) is { Length: > 0 } key) - { - yield return key; - } - } - } - - void AddNewTodo() - { - if (_todoValue is not null) - { - var todo = new TodoItem(_todoValue, false); - LocalStorage.SetItem(todo.Id, todo); - UpdateTodoItems(); - _todoValue = null; - } - } - - void OnKeyUp(KeyboardEventArgs args) - { - if (args is { Key: "Enter" }) - { - AddNewTodo(); - } - } - - void Delete(TodoItem todo) - { - LocalStorage.RemoveItem(todo.Id); - _todos.RemoveWhere(t => t.Id == todo.Id); - _localStorageItems.Remove(todo.Id); - } - - void ClearAll() - { - LocalStorage.Clear(); - _todos.Clear(); - _localStorageItems.Clear(); - } - - async Task OnItemChanged(TodoItem _) - { - await Task.CompletedTask; - - UpdateTodoItems(); - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using System.Diagnostics.CodeAnalysis; +using Blazor.ExampleConsumer.Models; +using Microsoft.AspNetCore.Components.Web; + +namespace Blazor.ExampleConsumer.Pages; + +public sealed partial class TodoList +{ + readonly Dictionary _localStorageItems = new(); + HashSet _todos = new(); + string? _todoValue; + + [Inject] + public ILocalStorageService LocalStorage { get; set; } = null!; + + protected override void OnInitialized() => UpdateTodoItems(); + + void UpdateTodoItems() + { + var todos = GetLocalStorageKeys() + .Where(key => key.StartsWith(TodoItem.IdPrefix)) + .Select(key => LocalStorage.GetItem(key)) + .Where(todo => todo is not null) + .ToHashSet() ?? new(); + + _todos = todos!; + + foreach (var key in GetLocalStorageKeys()) + { + if (TryGet(key, out TodoItem? todo)) + { + _localStorageItems[key] = todo.ToString(); + continue; + } + if (TryGet(key, out string? @string)) + { + _localStorageItems[key] = @string; + continue; + } + if (TryGet(key, out decimal num)) + { + _localStorageItems[key] = num.ToString(); + continue; + } + if (TryGet(key, out bool @bool)) + { + _localStorageItems[key] = @bool.ToString(); + continue; + } + } + + bool TryGet(string key, [NotNullWhen(true)] out T? value) + { + try + { + value = LocalStorage.GetItem(key); + return value is not null; + } + catch + { + value = default; + return false; + } + } + } + + IEnumerable GetLocalStorageKeys() + { + var length = LocalStorage.Length; + for (var i = 0; i < length; ++i) + { + if (LocalStorage.Key(i) is { Length: > 0 } key) + { + yield return key; + } + } + } + + void AddNewTodo() + { + if (_todoValue is not null) + { + var todo = new TodoItem(_todoValue, false); + LocalStorage.SetItem(todo.Id, todo); + UpdateTodoItems(); + _todoValue = null; + } + } + + void OnKeyUp(KeyboardEventArgs args) + { + if (args is { Key: "Enter" }) + { + AddNewTodo(); + } + } + + void Delete(TodoItem todo) + { + LocalStorage.RemoveItem(todo.Id); + _todos.RemoveWhere(t => t.Id == todo.Id); + _localStorageItems.Remove(todo.Id); + } + + void ClearAll() + { + LocalStorage.Clear(); + _todos.Clear(); + _localStorageItems.Clear(); + } + + async Task OnItemChanged(TodoItem _) + { + await Task.CompletedTask; + + UpdateTodoItems(); + } +} diff --git a/samples/Blazor.ExampleConsumer/Program.cs b/samples/Blazor.ExampleConsumer/Program.cs index 47885fc..18822f0 100644 --- a/samples/Blazor.ExampleConsumer/Program.cs +++ b/samples/Blazor.ExampleConsumer/Program.cs @@ -1,23 +1,23 @@ -using Blazor.ExampleConsumer; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.WebAssembly.Hosting; - -var builder = WebAssemblyHostBuilder.CreateDefault(args); -builder.RootComponents.Add("#app"); -builder.RootComponents.Add("head::after"); - -builder.Services.AddScoped(_ => new HttpClient -{ - BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) -}); - -// Use source-generated DI bits... -builder.Services.AddLocalStorageServices(); -builder.Services.AddSessionStorageServices(); -builder.Services.AddGeolocationServices(); -builder.Services.AddSpeechSynthesisServices(); - -// Custom library bits... -builder.Services.AddSpeechRecognitionServices(); - -await builder.Build().RunAsync(); +using Blazor.ExampleConsumer; +using Microsoft.AspNetCore.Components.Web; +using Microsoft.AspNetCore.Components.WebAssembly.Hosting; + +var builder = WebAssemblyHostBuilder.CreateDefault(args); +builder.RootComponents.Add("#app"); +builder.RootComponents.Add("head::after"); + +builder.Services.AddScoped(_ => new HttpClient +{ + BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) +}); + +// Use source-generated DI bits... +builder.Services.AddLocalStorageServices(); +builder.Services.AddSessionStorageServices(); +builder.Services.AddGeolocationServices(); +builder.Services.AddSpeechSynthesisServices(); + +// Custom library bits... +builder.Services.AddSpeechRecognitionServices(); + +await builder.Build().RunAsync(); diff --git a/samples/Blazor.ExampleConsumer/Shared/MainLayout.razor b/samples/Blazor.ExampleConsumer/Shared/MainLayout.razor index be4d594..042aba3 100644 --- a/samples/Blazor.ExampleConsumer/Shared/MainLayout.razor +++ b/samples/Blazor.ExampleConsumer/Shared/MainLayout.razor @@ -1,14 +1,14 @@ -@inherits LayoutComponentBase - -
-
- -
- -
-
-
- @Body -
-
-
+@inherits LayoutComponentBase + +
+
+ +
+ +
+
+
+ @Body +
+
+
diff --git a/samples/Blazor.ExampleConsumer/Shared/NavMenu.razor b/samples/Blazor.ExampleConsumer/Shared/NavMenu.razor index c60ba28..3542a7e 100644 --- a/samples/Blazor.ExampleConsumer/Shared/NavMenu.razor +++ b/samples/Blazor.ExampleConsumer/Shared/NavMenu.razor @@ -1,63 +1,63 @@ -
-
- - - Blazorators - - -
-
- -
- -
- -@code { - bool _collapseNavMenu = true; - string? NavMenuCssClass => _collapseNavMenu ? "collapse" : null; - void ToggleNavMenu() => _collapseNavMenu = !_collapseNavMenu; -} +
+
+ + + Blazorators + + +
+
+ +
+ +
+ +@code { + bool _collapseNavMenu = true; + string? NavMenuCssClass => _collapseNavMenu ? "collapse" : null; + void ToggleNavMenu() => _collapseNavMenu = !_collapseNavMenu; +} diff --git a/samples/Blazor.ExampleConsumer/Shared/RepositoryPrompt.razor b/samples/Blazor.ExampleConsumer/Shared/RepositoryPrompt.razor index f21d5a6..8c99c4a 100644 --- a/samples/Blazor.ExampleConsumer/Shared/RepositoryPrompt.razor +++ b/samples/Blazor.ExampleConsumer/Shared/RepositoryPrompt.razor @@ -1,12 +1,12 @@ -
- - @Title - - Want to see the source code? Check it out - on GitHub. - -
- -@code { - [Parameter] public string? Title { get; set; } -} +
+ + @Title + + Want to see the source code? Check it out + on GitHub. + +
+ +@code { + [Parameter] public string? Title { get; set; } +} diff --git a/samples/Blazor.ExampleConsumer/_Imports.razor b/samples/Blazor.ExampleConsumer/_Imports.razor index dff9278..c2f28d7 100644 --- a/samples/Blazor.ExampleConsumer/_Imports.razor +++ b/samples/Blazor.ExampleConsumer/_Imports.razor @@ -1,15 +1,15 @@ -@using System.Net.Http -@using System.Net.Http.Json -@using Microsoft.AspNetCore.Components.Forms -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using Microsoft.AspNetCore.Components.Web.Virtualization -@using Microsoft.AspNetCore.Components.WebAssembly.Http -@using Microsoft.JSInterop -@using System.Text.Json -@using System.Text.Json.Serialization -@using Blazor.ExampleConsumer -@using Blazor.ExampleConsumer.Models -@using Blazor.ExampleConsumer.Shared -@using Blazor.ExampleConsumer.Components +@using System.Net.Http +@using System.Net.Http.Json +@using Microsoft.AspNetCore.Components.Forms +@using Microsoft.AspNetCore.Components.Routing +@using Microsoft.AspNetCore.Components.Web +@using Microsoft.AspNetCore.Components.Web.Virtualization +@using Microsoft.AspNetCore.Components.WebAssembly.Http +@using Microsoft.JSInterop +@using System.Text.Json +@using System.Text.Json.Serialization +@using Blazor.ExampleConsumer +@using Blazor.ExampleConsumer.Models +@using Blazor.ExampleConsumer.Shared +@using Blazor.ExampleConsumer.Components @using Blazor.Serialization.Extensions \ No newline at end of file diff --git a/samples/BlazorServer.ExampleConsumer/BlazorServer.ExampleConsumer.csproj b/samples/BlazorServer.ExampleConsumer/BlazorServer.ExampleConsumer.csproj index 890eb49..60ed375 100644 --- a/samples/BlazorServer.ExampleConsumer/BlazorServer.ExampleConsumer.csproj +++ b/samples/BlazorServer.ExampleConsumer/BlazorServer.ExampleConsumer.csproj @@ -6,7 +6,11 @@ enable - + + + + + diff --git a/samples/BlazorServer.ExampleConsumer/Components/BingMap.razor b/samples/BlazorServer.ExampleConsumer/Components/BingMap.razor new file mode 100644 index 0000000..3f1562b --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/Components/BingMap.razor @@ -0,0 +1,19 @@ +@inject IJSRuntime JavaScript + +
+ +@code { + [Parameter, EditorRequired] + public GeolocationPosition Position { get; set; } = null!; + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (Position is null or { Coords: null }) + { + return; + } + + await JavaScript.InvokeVoidAsync( + "app.loadMap", "map", Position.Coords.Latitude, Position.Coords.Longitude); + } +} diff --git a/samples/BlazorServer.ExampleConsumer/Components/Code.razor b/samples/BlazorServer.ExampleConsumer/Components/Code.razor new file mode 100644 index 0000000..94234c2 --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/Components/Code.razor @@ -0,0 +1,28 @@ +@typeparam T where T : class + +@if (Value is not null) +{ + 
+        
+            @{
+                var opts = new JsonSerializerOptions()
+                {
+                    WriteIndented = true,
+                    PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+                    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+                };
+            }
+            @Value?.ToJson(opts)
+        
+
+} + +@code { + [Parameter, EditorRequired] + public T? Value { get; set; } = default!; + + [Parameter] + public bool IsError { get; set; } + + string _textClass => IsError ? "text-warning" : "text-info"; +} diff --git a/samples/BlazorServer.ExampleConsumer/Components/StorageCheckbox.razor b/samples/BlazorServer.ExampleConsumer/Components/StorageCheckbox.razor new file mode 100644 index 0000000..2370e58 --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/Components/StorageCheckbox.razor @@ -0,0 +1,39 @@ +@inject ILocalStorageService LocalStorage + + +@if (EndContent is not null) +{ + @EndContent +} + +@code { + [Parameter, EditorRequired] + public TodoItem Item { get; set; } = null!; + + [Parameter] + public RenderFragment EndContent { get; set; } = null!; + + [Parameter] + public EventCallback ItemChanged { get; set; } + + async Task OnIsCompletedChanged(ChangeEventArgs args) + { + if (bool.TryParse(args?.Value?.ToString(), out var isCompleted)) + { + await LocalStorage.SetItemAsync( + Item.Id, + (Item = Item with { IsCompleted = isCompleted }).ToJson()); + + if (ItemChanged.HasDelegate) + { + await ItemChanged.InvokeAsync(Item); + } + } + } +} \ No newline at end of file diff --git a/samples/BlazorServer.ExampleConsumer/Data/WeatherForecast.cs b/samples/BlazorServer.ExampleConsumer/Data/WeatherForecast.cs deleted file mode 100644 index 7b3b0ba..0000000 --- a/samples/BlazorServer.ExampleConsumer/Data/WeatherForecast.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace BlazorServer.ExampleConsumer.Data; - -public class WeatherForecast -{ - public DateOnly Date { get; set; } - - public int TemperatureC { get; set; } - - public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - - public string? Summary { get; set; } -} diff --git a/samples/BlazorServer.ExampleConsumer/Data/WeatherForecastService.cs b/samples/BlazorServer.ExampleConsumer/Data/WeatherForecastService.cs deleted file mode 100644 index 497ad8a..0000000 --- a/samples/BlazorServer.ExampleConsumer/Data/WeatherForecastService.cs +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace BlazorServer.ExampleConsumer.Data; - -public class WeatherForecastService -{ - private static readonly string[] Summaries = new[] - { - "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" - }; - - public Task GetForecastAsync(DateOnly startDate) - { - return Task.FromResult(Enumerable.Range(1, 5).Select(index => new WeatherForecast - { - Date = startDate.AddDays(index), - TemperatureC = Random.Shared.Next(-20, 55), - Summary = Summaries[Random.Shared.Next(Summaries.Length)] - }).ToArray()); - } -} diff --git a/samples/BlazorServer.ExampleConsumer/GlobalUsings.cs b/samples/BlazorServer.ExampleConsumer/GlobalUsings.cs new file mode 100644 index 0000000..05bd19d --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/GlobalUsings.cs @@ -0,0 +1,13 @@ +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +global using System.Text.Json; +global using System.Text.Json.Serialization; +global using Microsoft.JSInterop; +global using Microsoft.AspNetCore.Components; +global using BlazorServer.ExampleConsumer; +global using BlazorServer.ExampleConsumer.Components; +global using BlazorServer.ExampleConsumer.Models; +global using BlazorServer.ExampleConsumer.Pages; +global using BlazorServer.ExampleConsumer.Shared; +global using static System.Globalization.CultureInfo; diff --git a/samples/BlazorServer.ExampleConsumer/Models/TodoItem.cs b/samples/BlazorServer.ExampleConsumer/Models/TodoItem.cs new file mode 100644 index 0000000..cb7f5c3 --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/Models/TodoItem.cs @@ -0,0 +1,20 @@ +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using System.Text.RegularExpressions; + +namespace BlazorServer.ExampleConsumer.Models; + +public partial record class TodoItem( + string Task, + bool IsCompleted) +{ + internal const string IdPrefix = "todo"; + + [JsonIgnore] + public string Id => + $"{IdPrefix}{AlphabetOrDigitRegex().Replace(Task, "")}"; + + [GeneratedRegex("[^a-zA-Z0-9]")] + private static partial Regex AlphabetOrDigitRegex(); +} diff --git a/samples/BlazorServer.ExampleConsumer/Pages/ClientPosition.razor b/samples/BlazorServer.ExampleConsumer/Pages/ClientPosition.razor new file mode 100644 index 0000000..25c9db7 --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/Pages/ClientPosition.razor @@ -0,0 +1,38 @@ +@page "/geolocation" + +@inject IGeolocationService Geolocation + +Geolocation +

+ Geolocation + @if (_isLoading) + { + + } + @if (_position is not null) + { + : + + @(_position.TimestampAsUtcDateTime.ToLocalTime().ToString()) + + + + + + } +

+ +@if (_isLoading) +{ +

This page demonstrates the source generated Blazor.Geolocation package.

+} + +@{ + + + + +} \ No newline at end of file diff --git a/samples/BlazorServer.ExampleConsumer/Pages/ClientPosition.razor.cs b/samples/BlazorServer.ExampleConsumer/Pages/ClientPosition.razor.cs new file mode 100644 index 0000000..f977521 --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/Pages/ClientPosition.razor.cs @@ -0,0 +1,54 @@ +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace BlazorServer.ExampleConsumer.Pages; + +public sealed partial class ClientPosition +{ + readonly JsonSerializerOptions _opts = new() + { + WriteIndented = true, + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, + DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull + }; + readonly PositionOptions _options = new() + { + EnableHighAccuracy = true, + MaximumAge = null, + Timeout = 15_000 + }; + + GeolocationPosition? _position; + GeolocationPositionError? _positionError; + bool _isLoading = true; + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender is false) + { + return; + } + + await Geolocation.GetCurrentPositionAsync( + component: this, + onSuccessCallbackMethodName: nameof(OnPositionRecieved), + onErrorCallbackMethodName: nameof(OnPositionError), + options: _options); + } + + [JSInvokable] + public void OnPositionRecieved(GeolocationPosition position) + { + _isLoading = false; + _position = position; + StateHasChanged(); + } + + [JSInvokable] + public void OnPositionError(GeolocationPositionError positionError) + { + _isLoading = false; + _positionError = positionError; + StateHasChanged(); + } +} diff --git a/samples/BlazorServer.ExampleConsumer/Pages/Counter.razor b/samples/BlazorServer.ExampleConsumer/Pages/Counter.razor deleted file mode 100644 index ef23cb3..0000000 --- a/samples/BlazorServer.ExampleConsumer/Pages/Counter.razor +++ /dev/null @@ -1,18 +0,0 @@ -@page "/counter" - -Counter - -

Counter

- -

Current count: @currentCount

- - - -@code { - private int currentCount = 0; - - private void IncrementCount() - { - currentCount++; - } -} diff --git a/samples/BlazorServer.ExampleConsumer/Pages/FetchData.razor b/samples/BlazorServer.ExampleConsumer/Pages/FetchData.razor deleted file mode 100644 index 7fb4641..0000000 --- a/samples/BlazorServer.ExampleConsumer/Pages/FetchData.razor +++ /dev/null @@ -1,47 +0,0 @@ -@page "/fetchdata" -@using BlazorServer.ExampleConsumer.Data -@inject WeatherForecastService ForecastService - -Weather forecast - -

Weather forecast

- -

This component demonstrates fetching data from a service.

- -@if (forecasts == null) -{ -

Loading...

-} -else -{ - - - - - - - - - - - @foreach (var forecast in forecasts) - { - - - - - - - } - -
DateTemp. (C)Temp. (F)Summary
@forecast.Date.ToShortDateString()@forecast.TemperatureC@forecast.TemperatureF@forecast.Summary
-} - -@code { - private WeatherForecast[]? forecasts; - - protected override async Task OnInitializedAsync() - { - forecasts = await ForecastService.GetForecastAsync(DateOnly.FromDateTime(DateTime.Now)); - } -} diff --git a/samples/BlazorServer.ExampleConsumer/Pages/Index.razor b/samples/BlazorServer.ExampleConsumer/Pages/Index.razor index 6085c4a..014471e 100644 --- a/samples/BlazorServer.ExampleConsumer/Pages/Index.razor +++ b/samples/BlazorServer.ExampleConsumer/Pages/Index.razor @@ -2,8 +2,8 @@ Index -

Hello, world!

+

Hi friends! 🤓

-Welcome to your new app. +

This sample app shows how to consume the source-generated projects of #blazorators.

- + diff --git a/samples/BlazorServer.ExampleConsumer/Pages/ListenToMe.razor b/samples/BlazorServer.ExampleConsumer/Pages/ListenToMe.razor new file mode 100644 index 0000000..002da94 --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/Pages/ListenToMe.razor @@ -0,0 +1,29 @@ +@page "/listen" + +Speech-to-text + +

This page demonstrates the source generated Blazor.SpeechRecongition package.

+ +
+ + +
+ + + \ No newline at end of file diff --git a/samples/BlazorServer.ExampleConsumer/Pages/ListenToMe.razor.cs b/samples/BlazorServer.ExampleConsumer/Pages/ListenToMe.razor.cs new file mode 100644 index 0000000..3ddce3c --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/Pages/ListenToMe.razor.cs @@ -0,0 +1,94 @@ +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace BlazorServer.ExampleConsumer.Pages; + +public sealed partial class ListenToMe : IAsyncDisposable +{ + const string TranscriptKey = "listen-to-me-page-transcript"; + + IDisposable? _recognitionSubscription; + bool _isRecognizingSpeech = false; + SpeechRecognitionErrorEvent? _errorEvent; + string? _transcript; + + [Inject] + public ISpeechRecognitionService SpeechRecognition { get; set; } = null!; + + [Inject] + public ISessionStorageService SessionStorage { get; set; } = null!; + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender is false) + { + return; + } + + _transcript = await SessionStorage.GetItemAsync(TranscriptKey); + } + + async Task OnRecognizeSpeechClick() + { + if (_isRecognizingSpeech) + { + await SpeechRecognition.CancelSpeechRecognitionAsync(false); + } + else + { + var bcp47Tag = CurrentUICulture.Name; + + _recognitionSubscription?.Dispose(); + _recognitionSubscription = await SpeechRecognition.RecognizeSpeechAsync( + bcp47Tag, + OnRecognized, + OnError, + OnStarted, + OnEnded); + } + } + + Task OnStarted() => + InvokeAsync(() => + { + _isRecognizingSpeech = true; + StateHasChanged(); + }); + + Task OnEnded() => + InvokeAsync(() => + { + _isRecognizingSpeech = false; + StateHasChanged(); + }); + + Task OnError(SpeechRecognitionErrorEvent errorEvent) => + InvokeAsync(() => + { + _errorEvent = errorEvent; + StateHasChanged(); + }); + + Task OnRecognized(string transcript) => + InvokeAsync(async () => + { + _transcript = _transcript switch + { + null => transcript, + _ => $"{_transcript.Trim()} {transcript}".Trim() + }; + + await SessionStorage.SetItemAsync(TranscriptKey, _transcript); + StateHasChanged(); + }); + + public async ValueTask DisposeAsync() + { + if (SpeechRecognition is not null) + { + await SpeechRecognition.DisposeAsync(); + } + + _recognitionSubscription?.Dispose(); + } +} diff --git a/samples/BlazorServer.ExampleConsumer/Pages/ReadToMe.razor b/samples/BlazorServer.ExampleConsumer/Pages/ReadToMe.razor new file mode 100644 index 0000000..be18f14 --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/Pages/ReadToMe.razor @@ -0,0 +1,49 @@ +@page "/speak" + +Text-to-speech + +

This page demonstrates the source generated Blazor.SpeechSynthesis package.

+ +
+ + +
+ +
+ + + + @foreach (var speed in _voiceSpeeds) + { + + } + +
+ +
+ + +
+ +
+ +
\ No newline at end of file diff --git a/samples/BlazorServer.ExampleConsumer/Pages/ReadToMe.razor.cs b/samples/BlazorServer.ExampleConsumer/Pages/ReadToMe.razor.cs new file mode 100644 index 0000000..579aa62 --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/Pages/ReadToMe.razor.cs @@ -0,0 +1,94 @@ +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using Humanizer; + +namespace BlazorServer.ExampleConsumer.Pages; + +public sealed partial class ReadToMe : IAsyncDisposable +{ + const string PreferredVoiceKey = "preferred-voice"; + const string PreferredSpeedKey = "preferred-speed"; + const string TextKey = "read-to-me-text"; + + string? _text = "Blazorators is an open-source project that strives to simplify JavaScript interop in Blazor. JavaScript interoperability is possible by parsing TypeScript type declarations and using this metadata to output corresponding C# types."; + SpeechSynthesisVoice[] _voices = Array.Empty(); + readonly IList _voiceSpeeds = + Enumerable.Range(0, 12).Select(i => (i + 1) * .25).ToList(); + double _voiceSpeed = 1.5; + string? _selectedVoice; + string? _elapsedTimeMessage = null; + + SpeechSynthesisUtterance Utterance => new() + { + Text = _text ?? "You forgot to try uttering some text.", + Rate = _voiceSpeed, + Volume = 1, + Voice = _selectedVoice is { Length: > 0 } + ? _voices?.FirstOrDefault(voice => voice.Name == _selectedVoice) + : null + }; + + [Inject] + public ISpeechSynthesisService SpeechSynthesis { get; set; } = null!; + + [Inject] + public ILocalStorageService LocalStorage { get; set; } = null!; + + [Inject] + public ISessionStorageService SessionStorage { get; set; } = null!; + + [Inject] + public ILogger Logger { get; set; } = null!; + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender is false) + { + return; + } + + await GetVoicesAsync(); + + if (await LocalStorage.GetItemAsync(PreferredVoiceKey) + is { Length: > 0 } voice) + { + _selectedVoice = voice; + } + if (await LocalStorage.GetItemAsync(PreferredSpeedKey) + is { Length: > 0 } s && + double.TryParse(s, out var speed) && speed > 0) + { + _voiceSpeed = speed; + } + if (await SessionStorage.GetItemAsync(TextKey) + is { Length: > 0 } text) + { + _text = text; + } + } + + async Task GetVoicesAsync(bool isFromCallback = false) + { + _voices = await SpeechSynthesis.GetVoicesAsync(); + if (_voices is { } && isFromCallback) + { + StateHasChanged(); + } + } + + void OnTextChanged(ChangeEventArgs args) => _text = args.Value?.ToString(); + + void OnVoiceSpeedChange(ChangeEventArgs args) => + _voiceSpeed = double.TryParse(args.Value?.ToString() ?? "1.5", out var speed) + ? speed : 1.5; + + ValueTask Speak() => SpeechSynthesis.SpeakAsync(Utterance); + + async ValueTask IAsyncDisposable.DisposeAsync() + { + await LocalStorage.SetItemAsync(PreferredVoiceKey, _selectedVoice!); + await LocalStorage.SetItemAsync(PreferredSpeedKey, _voiceSpeed.ToString()); + await SessionStorage.SetItemAsync(TextKey, _text!); + } +} diff --git a/samples/BlazorServer.ExampleConsumer/Pages/Sandbox.razor b/samples/BlazorServer.ExampleConsumer/Pages/Sandbox.razor new file mode 100644 index 0000000..3f547f5 --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/Pages/Sandbox.razor @@ -0,0 +1,49 @@ +@page "/sandbox" +@inject IGeolocationService GeolocationService + +

+ 🎭 Sandbox + @if (_isLoading) + { + + } + @if (_position is not null) + { + : + + @(_position.TimestampAsUtcDateTime.ToLocalTime().ToString()) + + + + + + } +

+ + + + + + +@code { + bool _isLoading => _position is null && _positionError is null; + + GeolocationPosition? _position; + GeolocationPositionError? _positionError; + + protected override async Task OnInitializedAsync() => + await GeolocationService.GetCurrentPositionAsync( + position => + { + _position = position; + StateHasChanged(); + }, + positionError => + { + _positionError = positionError; + StateHasChanged(); + }); +} diff --git a/samples/BlazorServer.ExampleConsumer/Pages/TodoList.razor b/samples/BlazorServer.ExampleConsumer/Pages/TodoList.razor new file mode 100644 index 0000000..2ec59d1 --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/Pages/TodoList.razor @@ -0,0 +1,83 @@ +@page "/todos" + +Tasks + +

+ Local Storage + + + +

+

This page demonstrates the source generated Blazor.LocalStorage package.

+ +
+
+
+
+
+ + + +
+
+
+ @if (_todos is { Count: > 0 }) + { +
    + @foreach (var todo in _todos) + { +
  • + + + + + +
    • + } +
+ } +
+
+@if (_localStorageItems is { Count: > 0 }) +{ +
+
+
+ Raw window.localStorage values + + + + + + + + + + @foreach (var (i, key, value) in _localStorageItems.Select((kvp, i) => (i, kvp.Key, kvp.Value))) + { + + + + + + } + +
#KeyValue
@i.ToString()@key.ToString()@value.ToString()
+
+
+
+} \ No newline at end of file diff --git a/samples/BlazorServer.ExampleConsumer/Pages/TodoList.razor.cs b/samples/BlazorServer.ExampleConsumer/Pages/TodoList.razor.cs new file mode 100644 index 0000000..bb32045 --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/Pages/TodoList.razor.cs @@ -0,0 +1,113 @@ +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.Diagnostics.CodeAnalysis; +using Blazor.Serialization.Extensions; +using BlazorServer.ExampleConsumer.Models; +using Microsoft.AspNetCore.Components.Web; + +namespace BlazorServer.ExampleConsumer.Pages; + +public sealed partial class TodoList +{ + readonly Dictionary _localStorageItems = new(); + HashSet _todos = new(); + string? _todoValue; + + [Inject] + public ILocalStorageService LocalStorage { get; set; } = null!; + + protected override Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender is false) + { + return Task.CompletedTask; + } + + return UpdateTodoItemsAsync(); + } + + async Task UpdateTodoItemsAsync() + { + HashSet todos = new(); + await foreach (var key in GetLocalStorageKeysAsync()) + { + if (key.StartsWith(TodoItem.IdPrefix)) + { + var rawValue = await LocalStorage.GetItemAsync(key); + if (rawValue.FromJson() is TodoItem todo) + { + todos.Add(todo); + _localStorageItems[key] = todo.ToString(); + continue; + } + if (rawValue is not null) + { + _localStorageItems[key] = rawValue; + continue; + } + if (bool.TryParse(rawValue, out var @bool)) + { + _localStorageItems[key] = @bool.ToString(); + continue; + } + if (decimal.TryParse(rawValue, out var num)) + { + _localStorageItems[key] = num.ToString(); + continue; + } + } + } + + _todos = todos!; + } + + async IAsyncEnumerable GetLocalStorageKeysAsync() + { + var length = await LocalStorage.Length; + for (var i = 0; i < length; ++i) + { + if (await LocalStorage.KeyAsync(i) is { Length: > 0 } key) + { + yield return key; + } + } + } + + async Task AddNewTodoAsync() + { + if (_todoValue is not null) + { + var todo = new TodoItem(_todoValue, false); + await LocalStorage.SetItemAsync(todo.Id, todo.ToJson()); + await UpdateTodoItemsAsync(); + _todoValue = null; + } + } + + Task OnKeyUp(KeyboardEventArgs args) => + args is { Key: "Enter" } + ? AddNewTodoAsync() + : Task.CompletedTask; + + async Task Delete(TodoItem todo) + { + await LocalStorage.RemoveItemAsync(todo.Id); + _todos.RemoveWhere(t => t.Id == todo.Id); + _localStorageItems.Remove(todo.Id); + } + + async Task ClearAll() + { + await LocalStorage.ClearAsync(); + _todos.Clear(); + _localStorageItems.Clear(); + } + + async Task OnItemChanged(TodoItem _) + { + await Task.CompletedTask; + await UpdateTodoItemsAsync(); + } +} diff --git a/samples/BlazorServer.ExampleConsumer/Pages/Track.razor b/samples/BlazorServer.ExampleConsumer/Pages/Track.razor new file mode 100644 index 0000000..920482d --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/Pages/Track.razor @@ -0,0 +1,38 @@ +@page "/track" + +@inject IGeolocationService Geolocation + +Track +

+ Geolocation + @if (_isLoading) + { + + } + @if (_position is not null) + { + : + + @(_position.TimestampAsUtcDateTime.ToLocalTime().ToString()) + + + + + + } +

+ +@if (_isLoading) +{ +

This page demonstrates the source generated Blazor.Geolocation package.

+} + +@{ + + + + +} \ No newline at end of file diff --git a/samples/BlazorServer.ExampleConsumer/Pages/Track.razor.cs b/samples/BlazorServer.ExampleConsumer/Pages/Track.razor.cs new file mode 100644 index 0000000..91f921e --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/Pages/Track.razor.cs @@ -0,0 +1,58 @@ +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace BlazorServer.ExampleConsumer.Pages; + +public sealed partial class Track : IAsyncDisposable +{ + readonly JsonSerializerOptions _opts = new() + { + WriteIndented = true, + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, + DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull + }; + readonly PositionOptions _options = new() + { + EnableHighAccuracy = true, + MaximumAge = null, + Timeout = 15_000 + }; + + GeolocationPosition? _position; + GeolocationPositionError? _positionError; + double _watchId; + bool _isLoading = true; + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender is false) + { + return; + } + + _watchId = await Geolocation.WatchPositionAsync( + component: this, + onSuccessCallbackMethodName: nameof(OnPositionRecieved), + onErrorCallbackMethodName: nameof(OnPositionError), + options: _options); + } + + [JSInvokable] + public void OnPositionRecieved(GeolocationPosition position) + { + _isLoading = false; + _position = position; + StateHasChanged(); + } + + [JSInvokable] + public void OnPositionError(GeolocationPositionError positionError) + { + _isLoading = false; + _positionError = positionError; + StateHasChanged(); + } + + public async ValueTask DisposeAsync() => + await Geolocation.ClearWatchAsync(_watchId); +} diff --git a/samples/BlazorServer.ExampleConsumer/Pages/_Host.cshtml b/samples/BlazorServer.ExampleConsumer/Pages/_Host.cshtml index fdc9dd9..d0b5896 100644 --- a/samples/BlazorServer.ExampleConsumer/Pages/_Host.cshtml +++ b/samples/BlazorServer.ExampleConsumer/Pages/_Host.cshtml @@ -16,6 +16,13 @@ + + Fork me on GitHub + +
@@ -30,5 +37,9 @@
+ + + + diff --git a/samples/BlazorServer.ExampleConsumer/Program.cs b/samples/BlazorServer.ExampleConsumer/Program.cs index 2eaf62a..f5f6ee7 100644 --- a/samples/BlazorServer.ExampleConsumer/Program.cs +++ b/samples/BlazorServer.ExampleConsumer/Program.cs @@ -1,14 +1,11 @@ // Copyright (c) David Pine. All rights reserved. // Licensed under the MIT License. -using BlazorServer.ExampleConsumer.Data; - var builder = WebApplication.CreateBuilder(args); // Add services to the container. builder.Services.AddRazorPages(); builder.Services.AddServerSideBlazor(); -builder.Services.AddSingleton(); // Use source-generated DI bits... builder.Services.AddLocalStorageServices(); diff --git a/samples/BlazorServer.ExampleConsumer/Shared/MainLayout.razor b/samples/BlazorServer.ExampleConsumer/Shared/MainLayout.razor index 65151ec..042aba3 100644 --- a/samples/BlazorServer.ExampleConsumer/Shared/MainLayout.razor +++ b/samples/BlazorServer.ExampleConsumer/Shared/MainLayout.razor @@ -1,18 +1,13 @@ @inherits LayoutComponentBase -BlazorServer.ExampleConsumer -
-
- About -
- -
+
+
@Body
diff --git a/samples/BlazorServer.ExampleConsumer/Shared/MainLayout.razor.css b/samples/BlazorServer.ExampleConsumer/Shared/MainLayout.razor.css index 551e4b2..c865427 100644 --- a/samples/BlazorServer.ExampleConsumer/Shared/MainLayout.razor.css +++ b/samples/BlazorServer.ExampleConsumer/Shared/MainLayout.razor.css @@ -21,12 +21,17 @@ main { align-items: center; } - .top-row ::deep a, .top-row .btn-link { + .top-row ::deep a, .top-row ::deep .btn-link { white-space: nowrap; margin-left: 1.5rem; + text-decoration: none; } - .top-row a:first-child { + .top-row ::deep a:hover, .top-row ::deep .btn-link:hover { + text-decoration: underline; + } + + .top-row ::deep a:first-child { overflow: hidden; text-overflow: ellipsis; } @@ -40,7 +45,7 @@ main { justify-content: space-between; } - .top-row a, .top-row .btn-link { + .top-row ::deep a, .top-row ::deep .btn-link { margin-left: 0; } } @@ -63,6 +68,12 @@ main { z-index: 1; } + .top-row.auth ::deep a:first-child { + flex: 1; + text-align: right; + width: 0; + } + .top-row, article { padding-left: 2rem !important; padding-right: 1.5rem !important; diff --git a/samples/BlazorServer.ExampleConsumer/Shared/NavMenu.razor b/samples/BlazorServer.ExampleConsumer/Shared/NavMenu.razor index 63b3f34..3542a7e 100644 --- a/samples/BlazorServer.ExampleConsumer/Shared/NavMenu.razor +++ b/samples/BlazorServer.ExampleConsumer/Shared/NavMenu.razor @@ -1,39 +1,63 @@ 
- BlazorServer.ExampleConsumer + + + Blazorators +
-
+
@code { - private bool collapseNavMenu = true; - - private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; - - private void ToggleNavMenu() - { - collapseNavMenu = !collapseNavMenu; - } + bool _collapseNavMenu = true; + string? NavMenuCssClass => _collapseNavMenu ? "collapse" : null; + void ToggleNavMenu() => _collapseNavMenu = !_collapseNavMenu; } diff --git a/samples/BlazorServer.ExampleConsumer/Shared/NavMenu.razor.css b/samples/BlazorServer.ExampleConsumer/Shared/NavMenu.razor.css index 604b7a1..acc5f9f 100644 --- a/samples/BlazorServer.ExampleConsumer/Shared/NavMenu.razor.css +++ b/samples/BlazorServer.ExampleConsumer/Shared/NavMenu.razor.css @@ -59,10 +59,4 @@ /* Never collapse the sidebar for wide screens */ display: block; } - - .nav-scrollable { - /* Allow sidebar to scroll for tall menus */ - height: calc(100vh - 3.5rem); - overflow-y: auto; - } } diff --git a/samples/BlazorServer.ExampleConsumer/Shared/RepositoryPrompt.razor b/samples/BlazorServer.ExampleConsumer/Shared/RepositoryPrompt.razor new file mode 100644 index 0000000..8c99c4a --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/Shared/RepositoryPrompt.razor @@ -0,0 +1,12 @@ +
+ + @Title + + Want to see the source code? Check it out + on GitHub. + +
+ +@code { + [Parameter] public string? Title { get; set; } +} diff --git a/samples/BlazorServer.ExampleConsumer/Shared/SurveyPrompt.razor b/samples/BlazorServer.ExampleConsumer/Shared/SurveyPrompt.razor deleted file mode 100644 index ec64baa..0000000 --- a/samples/BlazorServer.ExampleConsumer/Shared/SurveyPrompt.razor +++ /dev/null @@ -1,16 +0,0 @@ -
- - @Title - - - Please take our - brief survey - - and tell us what you think. -
- -@code { - // Demonstrates how a parent component can supply parameters - [Parameter] - public string? Title { get; set; } -} diff --git a/samples/BlazorServer.ExampleConsumer/_Imports.razor b/samples/BlazorServer.ExampleConsumer/_Imports.razor index ded6b4f..9364eb5 100644 --- a/samples/BlazorServer.ExampleConsumer/_Imports.razor +++ b/samples/BlazorServer.ExampleConsumer/_Imports.razor @@ -1,10 +1,14 @@ @using System.Net.Http -@using Microsoft.AspNetCore.Authorization -@using Microsoft.AspNetCore.Components.Authorization +@using System.Net.Http.Json @using Microsoft.AspNetCore.Components.Forms @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop +@using System.Text.Json +@using System.Text.Json.Serialization @using BlazorServer.ExampleConsumer +@using BlazorServer.ExampleConsumer.Models @using BlazorServer.ExampleConsumer.Shared +@using BlazorServer.ExampleConsumer.Components +@using Blazor.Serialization.Extensions diff --git a/samples/BlazorServer.ExampleConsumer/wwwroot/app.js b/samples/BlazorServer.ExampleConsumer/wwwroot/app.js new file mode 100644 index 0000000..deb4705 --- /dev/null +++ b/samples/BlazorServer.ExampleConsumer/wwwroot/app.js @@ -0,0 +1,37 @@ +let _map = null; + +const loadMap = (mapId, latitude, longitude) => { + const element = document.getElementById(mapId); + if (!!element) { + const navigationBarMode = Microsoft.Maps.NavigationBarMode; + const location = new Microsoft.Maps.Location(latitude, longitude); + _map = new Microsoft.Maps.Map(element, { + center: location, + navigationBarMode: navigationBarMode.compact, + supportedMapTypes: [ + Microsoft.Maps.MapTypeId.road, + Microsoft.Maps.MapTypeId.aerial, + Microsoft.Maps.MapTypeId.canvasLight, + Microsoft.Maps.MapTypeId.canvasDark, + Microsoft.Maps.MapTypeId.birdseye, + Microsoft.Maps.MapTypeId.streetside + ] + }); + _map.setView({ zoom: 18 }); + Microsoft.Maps.loadModule('Microsoft.Maps.Search', () => { + var searchManager = new Microsoft.Maps.Search.SearchManager(_map); + var reverseGeocodeRequestOptions = { + location: location, + callback: (answer, userData) => { + _map.setView({ bounds: answer.bestView }); + _map.entities.push(new Microsoft.Maps.Pushpin(reverseGeocodeRequestOptions.location)); + } + }; + searchManager.reverseGeocode(reverseGeocodeRequestOptions); + }); + } +}; + +window.app = Object.assign({}, window.app, { + loadMap +}); \ No newline at end of file diff --git a/samples/BlazorServer.ExampleConsumer/wwwroot/logo.png b/samples/BlazorServer.ExampleConsumer/wwwroot/logo.png new file mode 100644 index 0000000..3d11051 Binary files /dev/null and b/samples/BlazorServer.ExampleConsumer/wwwroot/logo.png differ diff --git a/src/Blazor.Geolocation.WebAssembly/IGeolocationService.cs b/src/Blazor.Geolocation.WebAssembly/IGeolocationService.cs index ac3203a..64f9acb 100644 --- a/src/Blazor.Geolocation.WebAssembly/IGeolocationService.cs +++ b/src/Blazor.Geolocation.WebAssembly/IGeolocationService.cs @@ -1,12 +1,12 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -[JSAutoInterop( - TypeName = "Geolocation", - Implementation = "window.navigator.geolocation", - Url = "https://developer.mozilla.org/docs/Web/API/Geolocation")] -public partial interface IGeolocationService -{ +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +[JSAutoInterop( + TypeName = "Geolocation", + Implementation = "window.navigator.geolocation", + Url = "https://developer.mozilla.org/docs/Web/API/Geolocation")] +public partial interface IGeolocationService +{ } \ No newline at end of file diff --git a/src/Blazor.Geolocation/IGeolocationService.cs b/src/Blazor.Geolocation/IGeolocationService.cs index 7d10a57..f2a20f5 100644 --- a/src/Blazor.Geolocation/IGeolocationService.cs +++ b/src/Blazor.Geolocation/IGeolocationService.cs @@ -1,13 +1,13 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -[JSAutoInterop( - TypeName = "Geolocation", - Implementation = "window.navigator.geolocation", - HostingModel = BlazorHostingModel.Server, - Url = "https://developer.mozilla.org/docs/Web/API/Geolocation")] -public partial interface IGeolocationService -{ +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +[JSAutoInterop( + TypeName = "Geolocation", + Implementation = "window.navigator.geolocation", + HostingModel = BlazorHostingModel.Server, + Url = "https://developer.mozilla.org/docs/Web/API/Geolocation")] +public partial interface IGeolocationService +{ } \ No newline at end of file diff --git a/src/Blazor.LocalStorage.WebAssembly/ILocalStorageService.cs b/src/Blazor.LocalStorage.WebAssembly/ILocalStorageService.cs index a1d6f43..aebd085 100644 --- a/src/Blazor.LocalStorage.WebAssembly/ILocalStorageService.cs +++ b/src/Blazor.LocalStorage.WebAssembly/ILocalStorageService.cs @@ -1,17 +1,17 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -[JSAutoGenericInterop( - TypeName = "Storage", - Implementation = "window.localStorage", - Url = "https://developer.mozilla.org/docs/Web/API/Window/localStorage", - GenericMethodDescriptors = new[] - { - "getItem", - "setItem:value" - })] -public partial interface ILocalStorageService -{ +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +[JSAutoGenericInterop( + TypeName = "Storage", + Implementation = "window.localStorage", + Url = "https://developer.mozilla.org/docs/Web/API/Window/localStorage", + GenericMethodDescriptors = new[] + { + "getItem", + "setItem:value" + })] +public partial interface ILocalStorageService +{ } \ No newline at end of file diff --git a/src/Blazor.LocalStorage/ILocalStorageService.cs b/src/Blazor.LocalStorage/ILocalStorageService.cs index 9eb7855..06c1d9f 100644 --- a/src/Blazor.LocalStorage/ILocalStorageService.cs +++ b/src/Blazor.LocalStorage/ILocalStorageService.cs @@ -1,18 +1,18 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -[JSAutoInterop( - TypeName = "Storage", - Implementation = "window.localStorage", - HostingModel = BlazorHostingModel.Server, - OnlyGeneratePureJS = true, - Url = "https://developer.mozilla.org/docs/Web/API/Window/localStorage", - TypeDeclarationSources = new[] - { - "https://raw.githubusercontent.com/microsoft/TypeScript/main/lib/lib.dom.d.ts" - })] -public partial interface ILocalStorageService -{ +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +[JSAutoInterop( + TypeName = "Storage", + Implementation = "window.localStorage", + HostingModel = BlazorHostingModel.Server, + OnlyGeneratePureJS = true, + Url = "https://developer.mozilla.org/docs/Web/API/Window/localStorage", + TypeDeclarationSources = new[] + { + "https://raw.githubusercontent.com/microsoft/TypeScript/main/lib/lib.dom.d.ts" + })] +public partial interface ILocalStorageService +{ } \ No newline at end of file diff --git a/src/Blazor.Permissions.WebAssembly/IPermissionsService.cs b/src/Blazor.Permissions.WebAssembly/IPermissionsService.cs index 58c7d73..7658215 100644 --- a/src/Blazor.Permissions.WebAssembly/IPermissionsService.cs +++ b/src/Blazor.Permissions.WebAssembly/IPermissionsService.cs @@ -1,10 +1,10 @@ -namespace Microsoft.JSInterop; - -/// -//[JSAutoInterop( -// TypeName = "Permissions", -// Implementation = "window.navigator.permissions", -// Url = "https://developer.mozilla.org/docs/Web/API/Navigator/permissions")] -public partial interface IPermissionsService -{ +namespace Microsoft.JSInterop; + +/// +//[JSAutoInterop( +// TypeName = "Permissions", +// Implementation = "window.navigator.permissions", +// Url = "https://developer.mozilla.org/docs/Web/API/Navigator/permissions")] +public partial interface IPermissionsService +{ } \ No newline at end of file diff --git a/src/Blazor.Serialization/Extensions/LongExtensions.cs b/src/Blazor.Serialization/Extensions/LongExtensions.cs index 4aafd94..164005c 100644 --- a/src/Blazor.Serialization/Extensions/LongExtensions.cs +++ b/src/Blazor.Serialization/Extensions/LongExtensions.cs @@ -1,30 +1,30 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -/// -/// Extension methods for converting the JavaScript DOMTimeStamp -/// value into a C# localized . -/// -public static class LongExtensions -{ - /// - /// Converts the to a instance. - /// - /// The number of milliseconds past . - /// A new instance converted to a local date and time. - public static DateTime ToDateTimeFromUnix(this long millisecondsFromEpoch) => - DateTime.UnixEpoch.AddMilliseconds(millisecondsFromEpoch); - - /// - /// Converts the to a instance. - /// When is null, null is returned. - /// - /// The number of milliseconds past . - /// A new instance converted to a local date and time. - public static DateTime? ToDateTimeFromUnix(this long? millisecondsFromEpoch) => - millisecondsFromEpoch.HasValue - ? millisecondsFromEpoch.Value.ToDateTimeFromUnix() - : null; -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +/// +/// Extension methods for converting the JavaScript DOMTimeStamp +/// value into a C# localized . +/// +public static class LongExtensions +{ + /// + /// Converts the to a instance. + /// + /// The number of milliseconds past . + /// A new instance converted to a local date and time. + public static DateTime ToDateTimeFromUnix(this long millisecondsFromEpoch) => + DateTime.UnixEpoch.AddMilliseconds(millisecondsFromEpoch); + + /// + /// Converts the to a instance. + /// When is null, null is returned. + /// + /// The number of milliseconds past . + /// A new instance converted to a local date and time. + public static DateTime? ToDateTimeFromUnix(this long? millisecondsFromEpoch) => + millisecondsFromEpoch.HasValue + ? millisecondsFromEpoch.Value.ToDateTimeFromUnix() + : null; +} diff --git a/src/Blazor.Serialization/Extensions/SerializationExtensions.cs b/src/Blazor.Serialization/Extensions/SerializationExtensions.cs index d9df483..ed8a485 100644 --- a/src/Blazor.Serialization/Extensions/SerializationExtensions.cs +++ b/src/Blazor.Serialization/Extensions/SerializationExtensions.cs @@ -1,35 +1,35 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.Serialization.Extensions; - -/// -/// JSON serialization extension methods. -/// -public static class SerializationExtensions -{ - private static readonly JsonSerializerOptions _defaultOptions = new() - { - PropertyNamingPolicy = JsonNamingPolicy.CamelCase, - PropertyNameCaseInsensitive = true, - NumberHandling = JsonNumberHandling.AllowReadingFromString, - Converters = - { - new JsonStringEnumConverter() - } - }; - - /// - public static TResult? FromJson( - this string? json, - JsonSerializerOptions? options = null) => - json is { Length: > 0 } - ? Deserialize(json, options ?? _defaultOptions) - : default; - - /// - public static string ToJson( - this T value, - JsonSerializerOptions? options = null) => - Serialize(value, options ?? _defaultOptions); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.Serialization.Extensions; + +/// +/// JSON serialization extension methods. +/// +public static class SerializationExtensions +{ + private static readonly JsonSerializerOptions _defaultOptions = new() + { + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, + PropertyNameCaseInsensitive = true, + NumberHandling = JsonNumberHandling.AllowReadingFromString, + Converters = + { + new JsonStringEnumConverter() + } + }; + + /// + public static TResult? FromJson( + this string? json, + JsonSerializerOptions? options = null) => + json is { Length: > 0 } + ? Deserialize(json, options ?? _defaultOptions) + : default; + + /// + public static string ToJson( + this T value, + JsonSerializerOptions? options = null) => + Serialize(value, options ?? _defaultOptions); +} diff --git a/src/Blazor.Serialization/GlobalUsings.cs b/src/Blazor.Serialization/GlobalUsings.cs index e962dfe..010c5de 100644 --- a/src/Blazor.Serialization/GlobalUsings.cs +++ b/src/Blazor.Serialization/GlobalUsings.cs @@ -1,6 +1,6 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -global using System.Text.Json; -global using System.Text.Json.Serialization; +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +global using System.Text.Json; +global using System.Text.Json.Serialization; global using static System.Text.Json.JsonSerializer; \ No newline at end of file diff --git a/src/Blazor.SessionStorage.WebAssembly/ISessionStorageService.cs b/src/Blazor.SessionStorage.WebAssembly/ISessionStorageService.cs index 840c02b..09bf447 100644 --- a/src/Blazor.SessionStorage.WebAssembly/ISessionStorageService.cs +++ b/src/Blazor.SessionStorage.WebAssembly/ISessionStorageService.cs @@ -1,18 +1,18 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -/// -[JSAutoGenericInterop( - TypeName = "Storage", - Implementation = "window.sessionStorage", - Url = "https://developer.mozilla.org/docs/Web/API/Window/sessionStorage", - GenericMethodDescriptors = new[] - { - "getItem", - "setItem:value" - })] -public partial interface ISessionStorageService -{ +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +/// +[JSAutoGenericInterop( + TypeName = "Storage", + Implementation = "window.sessionStorage", + Url = "https://developer.mozilla.org/docs/Web/API/Window/sessionStorage", + GenericMethodDescriptors = new[] + { + "getItem", + "setItem:value" + })] +public partial interface ISessionStorageService +{ } \ No newline at end of file diff --git a/src/Blazor.SessionStorage/ISessionStorageService.cs b/src/Blazor.SessionStorage/ISessionStorageService.cs index bd27062..18586b6 100644 --- a/src/Blazor.SessionStorage/ISessionStorageService.cs +++ b/src/Blazor.SessionStorage/ISessionStorageService.cs @@ -1,15 +1,15 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -/// -[JSAutoInterop( - TypeName = "Storage", - Implementation = "window.sessionStorage", - HostingModel = BlazorHostingModel.Server, - OnlyGeneratePureJS = true, - Url = "https://developer.mozilla.org/docs/Web/API/Window/sessionStorage")] -public partial interface ISessionStorageService -{ +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +/// +[JSAutoInterop( + TypeName = "Storage", + Implementation = "window.sessionStorage", + HostingModel = BlazorHostingModel.Server, + OnlyGeneratePureJS = true, + Url = "https://developer.mozilla.org/docs/Web/API/Window/sessionStorage")] +public partial interface ISessionStorageService +{ } \ No newline at end of file diff --git a/src/Blazor.SourceGenerators/Builders/Indentation.cs b/src/Blazor.SourceGenerators/Builders/Indentation.cs index 4071801..bd58c31 100644 --- a/src/Blazor.SourceGenerators/Builders/Indentation.cs +++ b/src/Blazor.SourceGenerators/Builders/Indentation.cs @@ -1,15 +1,15 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -internal readonly record struct Indentation(int Level) -{ - private readonly int _spaces = 4; - - internal Indentation Reset() => ResetTo(0); - internal Indentation ResetTo(int level) => this with { Level = level }; - internal Indentation Increase(int extra = 0) => this with { Level = Level + 1 + extra }; - internal Indentation Decrease(int extra = 0) => this with { Level = Level - 1 - extra }; - - public override string ToString() => - new(' ', _spaces * Level); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +internal readonly record struct Indentation(int Level) +{ + private readonly int _spaces = 4; + + internal Indentation Reset() => ResetTo(0); + internal Indentation ResetTo(int level) => this with { Level = level }; + internal Indentation Increase(int extra = 0) => this with { Level = Level + 1 + extra }; + internal Indentation Decrease(int extra = 0) => this with { Level = Level - 1 - extra }; + + public override string ToString() => + new(' ', _spaces * Level); +} diff --git a/src/Blazor.SourceGenerators/Builders/IndentationAdjustment.cs b/src/Blazor.SourceGenerators/Builders/IndentationAdjustment.cs index 0878bda..fd407cb 100644 --- a/src/Blazor.SourceGenerators/Builders/IndentationAdjustment.cs +++ b/src/Blazor.SourceGenerators/Builders/IndentationAdjustment.cs @@ -1,11 +1,11 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Builders; - -internal enum IndentationAdjustment -{ - Noop, - Increase, - Decrease +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Builders; + +internal enum IndentationAdjustment +{ + Noop, + Increase, + Decrease }; \ No newline at end of file diff --git a/src/Blazor.SourceGenerators/Builders/MethodBuilderDetails.cs b/src/Blazor.SourceGenerators/Builders/MethodBuilderDetails.cs index 51857fc..156fcc9 100644 --- a/src/Blazor.SourceGenerators/Builders/MethodBuilderDetails.cs +++ b/src/Blazor.SourceGenerators/Builders/MethodBuilderDetails.cs @@ -1,81 +1,81 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Builders; - -internal readonly record struct MethodBuilderDetails( - CSharpMethod Method, - bool IsVoid, - bool IsPrimitiveType, - bool IsGenericReturnType, - bool ContainsGenericParameters, - string CSharpMethodName, - string FullyQualifiedJavaScriptIdentifier, - string ReturnType, - string BareType, - string Suffix, - string ExtendingType, - string? GenericTypeArgs) -{ - /// - /// A value representing the generic return type, "TValue". - /// - internal static readonly string GenericTypeValue = "TValue"; - - /// - /// A value representing the generic component type, "TComponent". - /// - internal const string GenericComponentType = "TComponent"; - - internal static readonly Func ToGenericTypeArgument = - string (string value) => $"<{value}>"; - - internal bool IsSerializable => IsGenericReturnType || ContainsGenericParameters; - - internal static MethodBuilderDetails Create(CSharpMethod method, GeneratorOptions options) - { - var isGenericReturnType = method.IsGenericReturnType(options); - var isPrimitiveType = TypeMap.PrimitiveTypes.IsPrimitiveType(method.RawReturnTypeName); - var containsGenericParameters = - method.ParameterDefinitions.Any(p => p.IsGenericParameter(method.RawName, options)); - var genericTypeArgs = isGenericReturnType - ? ToGenericTypeArgument(GenericTypeValue) - : containsGenericParameters ? ToGenericTypeArgument(GenericTypeValue) : null; - var fullyQualifiedJavaScriptIdentifier = method.JavaScriptMethodDependency?.InvokableMethodName; - fullyQualifiedJavaScriptIdentifier ??= - options.Implementation is not null - ? $"{options.Implementation}.{method.RawName}" - : method.RawName; - var (suffix, extendingType) = options.IsWebAssembly - ? ("", "IJSInProcessRuntime") - : ("Async", "IJSRuntime"); - - if (method.IsJavaScriptOverride(options) && options.Implementation is not null) - { - var impl = - options.Implementation.Substring( - options.Implementation.LastIndexOf(".") + 1); - - fullyQualifiedJavaScriptIdentifier = - $"blazorators.{impl}.{method.RawName}"; - - suffix = "Async"; - } - - var (returnType, bareType) = method.GetMethodTypes(options, isGenericReturnType, isPrimitiveType); - - return new MethodBuilderDetails( - Method: method, - IsVoid: method.IsVoid, - IsPrimitiveType: TypeMap.PrimitiveTypes.IsPrimitiveType(method.RawReturnTypeName), - IsGenericReturnType: isGenericReturnType, - ContainsGenericParameters: containsGenericParameters, - CSharpMethodName: method.RawName.CapitalizeFirstLetter(), - FullyQualifiedJavaScriptIdentifier: fullyQualifiedJavaScriptIdentifier, - ReturnType: returnType, - BareType: bareType, - Suffix: suffix, - ExtendingType: extendingType, - GenericTypeArgs: genericTypeArgs); - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Builders; + +internal readonly record struct MethodBuilderDetails( + CSharpMethod Method, + bool IsVoid, + bool IsPrimitiveType, + bool IsGenericReturnType, + bool ContainsGenericParameters, + string CSharpMethodName, + string FullyQualifiedJavaScriptIdentifier, + string ReturnType, + string BareType, + string Suffix, + string ExtendingType, + string? GenericTypeArgs) +{ + /// + /// A value representing the generic return type, "TValue". + /// + internal static readonly string GenericTypeValue = "TValue"; + + /// + /// A value representing the generic component type, "TComponent". + /// + internal const string GenericComponentType = "TComponent"; + + internal static readonly Func ToGenericTypeArgument = + string (string value) => $"<{value}>"; + + internal bool IsSerializable => IsGenericReturnType || ContainsGenericParameters; + + internal static MethodBuilderDetails Create(CSharpMethod method, GeneratorOptions options) + { + var isGenericReturnType = method.IsGenericReturnType(options); + var isPrimitiveType = TypeMap.PrimitiveTypes.IsPrimitiveType(method.RawReturnTypeName); + var containsGenericParameters = + method.ParameterDefinitions.Any(p => p.IsGenericParameter(method.RawName, options)); + var genericTypeArgs = isGenericReturnType + ? ToGenericTypeArgument(GenericTypeValue) + : containsGenericParameters ? ToGenericTypeArgument(GenericTypeValue) : null; + var fullyQualifiedJavaScriptIdentifier = method.JavaScriptMethodDependency?.InvokableMethodName; + fullyQualifiedJavaScriptIdentifier ??= + options.Implementation is not null + ? $"{options.Implementation}.{method.RawName}" + : method.RawName; + var (suffix, extendingType) = options.IsWebAssembly + ? ("", "IJSInProcessRuntime") + : ("Async", "IJSRuntime"); + + if (method.IsJavaScriptOverride(options) && options.Implementation is not null) + { + var impl = + options.Implementation.Substring( + options.Implementation.LastIndexOf(".") + 1); + + fullyQualifiedJavaScriptIdentifier = + $"blazorators.{impl}.{method.RawName}"; + + suffix = "Async"; + } + + var (returnType, bareType) = method.GetMethodTypes(options, isGenericReturnType, isPrimitiveType); + + return new MethodBuilderDetails( + Method: method, + IsVoid: method.IsVoid, + IsPrimitiveType: TypeMap.PrimitiveTypes.IsPrimitiveType(method.RawReturnTypeName), + IsGenericReturnType: isGenericReturnType, + ContainsGenericParameters: containsGenericParameters, + CSharpMethodName: method.RawName.CapitalizeFirstLetter(), + FullyQualifiedJavaScriptIdentifier: fullyQualifiedJavaScriptIdentifier, + ReturnType: returnType, + BareType: bareType, + Suffix: suffix, + ExtendingType: extendingType, + GenericTypeArgs: genericTypeArgs); + } +} diff --git a/src/Blazor.SourceGenerators/Builders/PropertyBuilderDetails.cs b/src/Blazor.SourceGenerators/Builders/PropertyBuilderDetails.cs index 72a3c1f..a8c4c48 100644 --- a/src/Blazor.SourceGenerators/Builders/PropertyBuilderDetails.cs +++ b/src/Blazor.SourceGenerators/Builders/PropertyBuilderDetails.cs @@ -1,37 +1,37 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Builders; - -internal readonly record struct PropertyBuilderDetails( - CSharpProperty Property, - string CSharpPropertyName, - string FullyQualifiedJavaScriptIdentifier, - string ReturnType, - string BareType, - string Suffix, - string ExtendingType, - string GenericTypeArgs) -{ - internal static PropertyBuilderDetails Create(CSharpProperty property, GeneratorOptions options) - { - var csharpPropertyName = property.RawName.CapitalizeFirstLetter(); - var javaScriptIndentifier = options.Implementation is not null - ? $"{options.Implementation}.{property.RawName}" - : property.RawName; - var (returnType, bareType) = property.GetPropertyTypes(options); - var (suffix, extendingType) = - options.IsWebAssembly ? ("", "IJSInProcessRuntime") : ("Async", "IJSRuntime"); - var genericTypeArgs = $"<{bareType}>"; - - return new PropertyBuilderDetails( - Property: property, - CSharpPropertyName: csharpPropertyName, - FullyQualifiedJavaScriptIdentifier: javaScriptIndentifier, - ReturnType: returnType, - BareType: bareType, - Suffix: suffix, - ExtendingType: extendingType, - GenericTypeArgs: genericTypeArgs); - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Builders; + +internal readonly record struct PropertyBuilderDetails( + CSharpProperty Property, + string CSharpPropertyName, + string FullyQualifiedJavaScriptIdentifier, + string ReturnType, + string BareType, + string Suffix, + string ExtendingType, + string GenericTypeArgs) +{ + internal static PropertyBuilderDetails Create(CSharpProperty property, GeneratorOptions options) + { + var csharpPropertyName = property.RawName.CapitalizeFirstLetter(); + var javaScriptIndentifier = options.Implementation is not null + ? $"{options.Implementation}.{property.RawName}" + : property.RawName; + var (returnType, bareType) = property.GetPropertyTypes(options); + var (suffix, extendingType) = + options.IsWebAssembly ? ("", "IJSInProcessRuntime") : ("Async", "IJSRuntime"); + var genericTypeArgs = $"<{bareType}>"; + + return new PropertyBuilderDetails( + Property: property, + CSharpPropertyName: csharpPropertyName, + FullyQualifiedJavaScriptIdentifier: javaScriptIndentifier, + ReturnType: returnType, + BareType: bareType, + Suffix: suffix, + ExtendingType: extendingType, + GenericTypeArgs: genericTypeArgs); + } +} diff --git a/src/Blazor.SourceGenerators/Builders/SourceBuilder.cs b/src/Blazor.SourceGenerators/Builders/SourceBuilder.cs index 37b0b7a..a6e78c2 100644 --- a/src/Blazor.SourceGenerators/Builders/SourceBuilder.cs +++ b/src/Blazor.SourceGenerators/Builders/SourceBuilder.cs @@ -1,368 +1,368 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -using System.Diagnostics; - -namespace Blazor.SourceGenerators.Builders; - -[DebuggerDisplay("{ToSourceCodeString()}", Name = "{_options.TypeName}")] -internal sealed class SourceBuilder -{ - private const string _newLine = "\r\n"; - private const string _twoNewLines = $"{_newLine}{_newLine}"; - - private readonly StringBuilder _builder = new(); - private readonly GeneratorOptions _options; - private readonly bool _isService; - - private Indentation _indentation = new(0); - private string? _implementationName; - private string? _interfaceName; - - internal ISet? Fields { get; private set; } - internal ISet? Methods { get; private set; } - - internal int IndentationLevel => _indentation.Level; - internal string ImplementationName => _implementationName ??= - $"{_options.Implementation.ToImplementationName(_isService)}"; - internal string InterfaceName => _interfaceName ??= - _options.Implementation.ToInterfaceName(_isService); - - internal SourceBuilder(GeneratorOptions options, bool isService = true) => - (_options, _isService) = (options, isService); - - internal SourceBuilder AppendCopyRightHeader() - { - _builder.Append($"// Copyright (c) David Pine. All rights reserved.{_newLine}"); - _builder.Append($"// Licensed under the MIT License:{_newLine}"); - _builder.Append($"// https://bit.ly/blazorators-license{_newLine}"); - _builder.Append($"// Auto-generated by blazorators.{_twoNewLines}"); - - return this; - } - - internal SourceBuilder AppendUsingDeclarations() - { - if (_options is { SupportsGenerics: true }) - { - _builder.Append($"using Blazor.Serialization.Extensions;{_newLine}"); - _builder.Append($"using System.Text.Json;{_newLine}"); - } - - if (!_options.IsWebAssembly) - { - _builder.Append($"using System.Threading.Tasks;{_newLine}"); - } - - _builder.Append(_newLine); - - return this; - } - - internal SourceBuilder AppendNamespace(string namespaceString, bool isNullableContext = true) - { - if (isNullableContext) - { - _builder.Append($"#nullable enable{_newLine}"); - } - - _builder.Append($"namespace {namespaceString};{_twoNewLines}"); - - return this; - } - - internal SourceBuilder AppendPublicInterfaceDeclaration() - { - _builder.Append($"/// {_newLine}"); - _builder.Append($"/// Source generated interface definition of the {_options.TypeName} type.{_newLine}"); - _builder.Append($"/// {_newLine}"); - _builder.Append($"public partial interface {InterfaceName}{_newLine}"); - - return this; - } - - internal SourceBuilder AppendInternalImplementationDeclaration() - { - _builder.Append($"/// {_newLine}"); - _builder.Append($"internal sealed class {ImplementationName} : {InterfaceName}{_newLine}"); - - return this; - } - - internal SourceBuilder AppendImplementationCtor() - { - var javaScriptRuntime = _options.IsWebAssembly - ? "IJSInProcessRuntime" - : "IJSRuntime"; - - _builder.Append($"{_indentation}internal readonly {javaScriptRuntime} _javaScript = null!;{_twoNewLines}"); - _builder.Append($"{_indentation}public {ImplementationName}({javaScriptRuntime} javaScript) =>{_newLine}"); - - IncreaseIndentation(); - - _builder.Append($"{_indentation}_javaScript = javaScript;{_twoNewLines}"); - - DecreaseIndentation(); - - return this; - } - - internal SourceBuilder AppendOpeningCurlyBrace(bool increaseIndentation = false) - { - IncreaseIndentationImpl(increaseIndentation); - - _builder.Append($"{_indentation}{{{_newLine}"); - - return this; - } - - internal SourceBuilder AppendClosingCurlyBrace(bool decreaseIndentation = false) - { - DecreaseIndentationImpl(decreaseIndentation); - - _builder.Append($"{_indentation}}}{_newLine}"); - - return this; - } - - internal SourceBuilder AppendTripleSlashMethodComments( - CSharpMethod method, - bool extrapolateParameters = false, - IndentationAdjustment adjustment = IndentationAdjustment.Noop) - { - AdjustIndentation(adjustment); - var indent = _indentation.ToString(); - - _builder.Append($"{indent}/// {_newLine}"); - - var jsMethodName = method.RawName.LowerCaseFirstLetter(); - var func = $"{_options.Implementation}.{jsMethodName}"; - - _builder.Append($"{indent}/// Source generated implementation of {func}.{_newLine}"); - var rootUrl = "https://developer.mozilla.org/docs/Web/API"; - var fullUrl = $"{rootUrl}/{_options.TypeName}/{jsMethodName}"; - _builder.Append($"{indent}/// {_newLine}"); - _builder.Append($"{indent}/// {_newLine}"); - - if (extrapolateParameters) - { - foreach (var (index, param) in method.ParameterDefinitions.Select()) - { - if (index.IsFirst) - { - _builder.Append( - $"/// The calling Razor (or Blazor) component.{_newLine}"); - } - - if (param.ActionDeclation is not null) - { - var name = param.ToArgumentString(); - var dependentTypes = param.ActionDeclation.DependentTypes.Keys; - var action = - $"Expects the name of a \"JSInvokableAttribute\" C# method with the following " + - $"System.Action{{{string.Join(", ", dependentTypes)}}}\"."; - _builder.Append( - $"/// {action}{_newLine}"); - } - else - { - _builder.Append( - $"/// The {param.RawTypeName} value.{_newLine}"); - } - } - } - - return this; - } - - internal SourceBuilder AppendEmptyTripleSlashInheritdocComments( - IndentationAdjustment adjustment = IndentationAdjustment.Noop) - { - AdjustIndentation(adjustment); - var indent = _indentation.ToString(); - - _builder.Append($"{indent}/// {_newLine}"); - - return this; - } - - internal SourceBuilder AppendTripleSlashInheritdocComments( - string csharpTypeName, - string memberName, - IndentationAdjustment adjustment = IndentationAdjustment.Noop) - { - AdjustIndentation(adjustment); - var indent = _indentation.ToString(); - - _builder.Append($"{indent}/// {_newLine}"); - - return this; - } - - internal SourceBuilder AppendTripleSlashPropertyComments( - CSharpProperty property, - IndentationAdjustment adjustment = IndentationAdjustment.Noop) - { - AdjustIndentation(adjustment); - var indent = _indentation.ToString(); - - _builder.Append($"{indent}/// {_newLine}"); - - var jsMethodName = property.RawName.LowerCaseFirstLetter(); - var func = $"{_options.Implementation}.{jsMethodName}"; - - _builder.Append($"{indent}/// Source generated implementation of {func}.\r\n"); - var rootUrl = "https://developer.mozilla.org/docs/Web/API"; - var fullUrl = $"{rootUrl}/{_options.TypeName}/{jsMethodName}"; - _builder.Append($"{indent}/// \r\n"); - _builder.Append($"{indent}/// \r\n"); - - return this; - } - - internal SourceBuilder AppendLine() - { - // We use a hard-coded new line instead of: - // _builder.AppendLine() as the new line value changes by environment. - // For consistency, we'll always generate the exact same new line. - _builder.Append(_newLine); - - return this; - } - - internal SourceBuilder AppendRaw( - string content, - bool appendNewLine = true, - bool postIncreaseIndentation = false, - bool omitIndentation = false) - { - var indentation = omitIndentation ? "" : _indentation.ToString(); - _builder.Append($"{indentation}{content}{(appendNewLine ? _newLine : string.Empty)}"); - - if (postIncreaseIndentation) - { - IncreaseIndentation(); - } - - return this; - } - - internal SourceBuilder IncreaseIndentation() - { - IncreaseIndentationImpl(true); - - return this; - } - - internal SourceBuilder AppendConditionalDelegateFields(List? methods) - { - if (methods is { Count: > 0 }) - { - foreach (var group in - methods.SelectMany(m => m.ParameterDefinitions) - .Where(param => param.ActionDeclation is not null) - .GroupBy(param => param.RawName)) - { - var param = group.First(); - var keys = - param.ActionDeclation!.ParameterDefinitions.Select(p => p.RawTypeName); - - var fieldName = $"_{param.RawName}"; - Fields ??= new HashSet(); - Fields.Add(fieldName); - - AppendRaw($"private Action<{string.Join(", ", keys)}>? {fieldName};"); - } - - AppendLine(); - } - - return this; - } - - internal SourceBuilder AppendConditionalDelegateCallbackMethods(List? methods) - { - if (methods is { Count: > 0 }) - { - var level = IndentationLevel; - - foreach (var group in - methods.SelectMany(m => m.ParameterDefinitions) - .Where(param => param.ActionDeclation is not null) - .GroupBy(param => param.RawName)) - { - var param = group.First(); - var methodName = $"On{param.RawName.CapitalizeFirstLetter()}"; - Methods ??= new HashSet(); - if (Methods.Add(methodName)) - { - var fieldName = $"_{param.RawName}"; - - AppendRaw("[JSInvokable]"); - AppendRaw($"public void {methodName}(", postIncreaseIndentation: true); - AppendParameters(param, fieldName); - } - } - - AppendLine(); - ResetIndentiationTo(level); - } - - return this; - } - - private SourceBuilder AppendParameters(CSharpType param, string fieldName) - { - var args = new List(); - foreach (var (interation, p) in param.ActionDeclation!.ParameterDefinitions!.Select()) - { - args.Add(p.RawName); - AppendRaw($"{p.RawTypeName} {p.RawName}", appendNewLine: false); - if (interation.HasMore) - { - AppendRaw(","); - } - else - { - AppendRaw(") =>", postIncreaseIndentation: true); - AppendRaw($"{fieldName}?.Invoke({string.Join(", ", args)});"); - } - } - - return this; - } - - internal SourceBuilder DecreaseIndentation() - { - DecreaseIndentationImpl(true); - - return this; - } - - internal SourceBuilder ResetIndentiationTo(int level) - { - _indentation = _indentation.ResetTo(level); - - return this; - } - - private void IncreaseIndentationImpl(bool increaseIndentation = false) => - AdjustIndentation(increaseIndentation - ? IndentationAdjustment.Increase - : IndentationAdjustment.Noop); - - private void DecreaseIndentationImpl(bool decreaseIndentation = false) => - AdjustIndentation(decreaseIndentation - ? IndentationAdjustment.Decrease - : IndentationAdjustment.Noop); - - private void AdjustIndentation(IndentationAdjustment adjustment) => - _indentation = adjustment switch - { - IndentationAdjustment.Increase => _indentation.Increase(), - IndentationAdjustment.Decrease => _indentation.Decrease(), - _ => _indentation - }; - - internal string ToSourceCodeString() => _builder.ToString(); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using System.Diagnostics; + +namespace Blazor.SourceGenerators.Builders; + +[DebuggerDisplay("{ToSourceCodeString()}", Name = "{_options.TypeName}")] +internal sealed class SourceBuilder +{ + private const string _newLine = "\r\n"; + private const string _twoNewLines = $"{_newLine}{_newLine}"; + + private readonly StringBuilder _builder = new(); + private readonly GeneratorOptions _options; + private readonly bool _isService; + + private Indentation _indentation = new(0); + private string? _implementationName; + private string? _interfaceName; + + internal ISet? Fields { get; private set; } + internal ISet? Methods { get; private set; } + + internal int IndentationLevel => _indentation.Level; + internal string ImplementationName => _implementationName ??= + $"{_options.Implementation.ToImplementationName(_isService)}"; + internal string InterfaceName => _interfaceName ??= + _options.Implementation.ToInterfaceName(_isService); + + internal SourceBuilder(GeneratorOptions options, bool isService = true) => + (_options, _isService) = (options, isService); + + internal SourceBuilder AppendCopyRightHeader() + { + _builder.Append($"// Copyright (c) David Pine. All rights reserved.{_newLine}"); + _builder.Append($"// Licensed under the MIT License:{_newLine}"); + _builder.Append($"// https://bit.ly/blazorators-license{_newLine}"); + _builder.Append($"// Auto-generated by blazorators.{_twoNewLines}"); + + return this; + } + + internal SourceBuilder AppendUsingDeclarations() + { + if (_options is { SupportsGenerics: true }) + { + _builder.Append($"using Blazor.Serialization.Extensions;{_newLine}"); + _builder.Append($"using System.Text.Json;{_newLine}"); + } + + if (!_options.IsWebAssembly) + { + _builder.Append($"using System.Threading.Tasks;{_newLine}"); + } + + _builder.Append(_newLine); + + return this; + } + + internal SourceBuilder AppendNamespace(string namespaceString, bool isNullableContext = true) + { + if (isNullableContext) + { + _builder.Append($"#nullable enable{_newLine}"); + } + + _builder.Append($"namespace {namespaceString};{_twoNewLines}"); + + return this; + } + + internal SourceBuilder AppendPublicInterfaceDeclaration() + { + _builder.Append($"/// {_newLine}"); + _builder.Append($"/// Source generated interface definition of the {_options.TypeName} type.{_newLine}"); + _builder.Append($"/// {_newLine}"); + _builder.Append($"public partial interface {InterfaceName}{_newLine}"); + + return this; + } + + internal SourceBuilder AppendInternalImplementationDeclaration() + { + _builder.Append($"/// {_newLine}"); + _builder.Append($"internal sealed class {ImplementationName} : {InterfaceName}{_newLine}"); + + return this; + } + + internal SourceBuilder AppendImplementationCtor() + { + var javaScriptRuntime = _options.IsWebAssembly + ? "IJSInProcessRuntime" + : "IJSRuntime"; + + _builder.Append($"{_indentation}internal readonly {javaScriptRuntime} _javaScript = null!;{_twoNewLines}"); + _builder.Append($"{_indentation}public {ImplementationName}({javaScriptRuntime} javaScript) =>{_newLine}"); + + IncreaseIndentation(); + + _builder.Append($"{_indentation}_javaScript = javaScript;{_twoNewLines}"); + + DecreaseIndentation(); + + return this; + } + + internal SourceBuilder AppendOpeningCurlyBrace(bool increaseIndentation = false) + { + IncreaseIndentationImpl(increaseIndentation); + + _builder.Append($"{_indentation}{{{_newLine}"); + + return this; + } + + internal SourceBuilder AppendClosingCurlyBrace(bool decreaseIndentation = false) + { + DecreaseIndentationImpl(decreaseIndentation); + + _builder.Append($"{_indentation}}}{_newLine}"); + + return this; + } + + internal SourceBuilder AppendTripleSlashMethodComments( + CSharpMethod method, + bool extrapolateParameters = false, + IndentationAdjustment adjustment = IndentationAdjustment.Noop) + { + AdjustIndentation(adjustment); + var indent = _indentation.ToString(); + + _builder.Append($"{indent}/// {_newLine}"); + + var jsMethodName = method.RawName.LowerCaseFirstLetter(); + var func = $"{_options.Implementation}.{jsMethodName}"; + + _builder.Append($"{indent}/// Source generated implementation of {func}.{_newLine}"); + var rootUrl = "https://developer.mozilla.org/docs/Web/API"; + var fullUrl = $"{rootUrl}/{_options.TypeName}/{jsMethodName}"; + _builder.Append($"{indent}/// {_newLine}"); + _builder.Append($"{indent}/// {_newLine}"); + + if (extrapolateParameters) + { + foreach (var (index, param) in method.ParameterDefinitions.Select()) + { + if (index.IsFirst) + { + _builder.Append( + $"/// The calling Razor (or Blazor) component.{_newLine}"); + } + + if (param.ActionDeclation is not null) + { + var name = param.ToArgumentString(); + var dependentTypes = param.ActionDeclation.DependentTypes.Keys; + var action = + $"Expects the name of a \"JSInvokableAttribute\" C# method with the following " + + $"System.Action{{{string.Join(", ", dependentTypes)}}}\"."; + _builder.Append( + $"/// {action}{_newLine}"); + } + else + { + _builder.Append( + $"/// The {param.RawTypeName} value.{_newLine}"); + } + } + } + + return this; + } + + internal SourceBuilder AppendEmptyTripleSlashInheritdocComments( + IndentationAdjustment adjustment = IndentationAdjustment.Noop) + { + AdjustIndentation(adjustment); + var indent = _indentation.ToString(); + + _builder.Append($"{indent}/// {_newLine}"); + + return this; + } + + internal SourceBuilder AppendTripleSlashInheritdocComments( + string csharpTypeName, + string memberName, + IndentationAdjustment adjustment = IndentationAdjustment.Noop) + { + AdjustIndentation(adjustment); + var indent = _indentation.ToString(); + + _builder.Append($"{indent}/// {_newLine}"); + + return this; + } + + internal SourceBuilder AppendTripleSlashPropertyComments( + CSharpProperty property, + IndentationAdjustment adjustment = IndentationAdjustment.Noop) + { + AdjustIndentation(adjustment); + var indent = _indentation.ToString(); + + _builder.Append($"{indent}/// {_newLine}"); + + var jsMethodName = property.RawName.LowerCaseFirstLetter(); + var func = $"{_options.Implementation}.{jsMethodName}"; + + _builder.Append($"{indent}/// Source generated implementation of {func}.\r\n"); + var rootUrl = "https://developer.mozilla.org/docs/Web/API"; + var fullUrl = $"{rootUrl}/{_options.TypeName}/{jsMethodName}"; + _builder.Append($"{indent}/// \r\n"); + _builder.Append($"{indent}/// \r\n"); + + return this; + } + + internal SourceBuilder AppendLine() + { + // We use a hard-coded new line instead of: + // _builder.AppendLine() as the new line value changes by environment. + // For consistency, we'll always generate the exact same new line. + _builder.Append(_newLine); + + return this; + } + + internal SourceBuilder AppendRaw( + string content, + bool appendNewLine = true, + bool postIncreaseIndentation = false, + bool omitIndentation = false) + { + var indentation = omitIndentation ? "" : _indentation.ToString(); + _builder.Append($"{indentation}{content}{(appendNewLine ? _newLine : string.Empty)}"); + + if (postIncreaseIndentation) + { + IncreaseIndentation(); + } + + return this; + } + + internal SourceBuilder IncreaseIndentation() + { + IncreaseIndentationImpl(true); + + return this; + } + + internal SourceBuilder AppendConditionalDelegateFields(List? methods) + { + if (methods is { Count: > 0 }) + { + foreach (var group in + methods.SelectMany(m => m.ParameterDefinitions) + .Where(param => param.ActionDeclation is not null) + .GroupBy(param => param.RawName)) + { + var param = group.First(); + var keys = + param.ActionDeclation!.ParameterDefinitions.Select(p => p.RawTypeName); + + var fieldName = $"_{param.RawName}"; + Fields ??= new HashSet(); + Fields.Add(fieldName); + + AppendRaw($"private Action<{string.Join(", ", keys)}>? {fieldName};"); + } + + AppendLine(); + } + + return this; + } + + internal SourceBuilder AppendConditionalDelegateCallbackMethods(List? methods) + { + if (methods is { Count: > 0 }) + { + var level = IndentationLevel; + + foreach (var group in + methods.SelectMany(m => m.ParameterDefinitions) + .Where(param => param.ActionDeclation is not null) + .GroupBy(param => param.RawName)) + { + var param = group.First(); + var methodName = $"On{param.RawName.CapitalizeFirstLetter()}"; + Methods ??= new HashSet(); + if (Methods.Add(methodName)) + { + var fieldName = $"_{param.RawName}"; + + AppendRaw("[JSInvokable]"); + AppendRaw($"public void {methodName}(", postIncreaseIndentation: true); + AppendParameters(param, fieldName); + } + } + + AppendLine(); + ResetIndentiationTo(level); + } + + return this; + } + + private SourceBuilder AppendParameters(CSharpType param, string fieldName) + { + var args = new List(); + foreach (var (interation, p) in param.ActionDeclation!.ParameterDefinitions!.Select()) + { + args.Add(p.RawName); + AppendRaw($"{p.RawTypeName} {p.RawName}", appendNewLine: false); + if (interation.HasMore) + { + AppendRaw(","); + } + else + { + AppendRaw(") =>", postIncreaseIndentation: true); + AppendRaw($"{fieldName}?.Invoke({string.Join(", ", args)});"); + } + } + + return this; + } + + internal SourceBuilder DecreaseIndentation() + { + DecreaseIndentationImpl(true); + + return this; + } + + internal SourceBuilder ResetIndentiationTo(int level) + { + _indentation = _indentation.ResetTo(level); + + return this; + } + + private void IncreaseIndentationImpl(bool increaseIndentation = false) => + AdjustIndentation(increaseIndentation + ? IndentationAdjustment.Increase + : IndentationAdjustment.Noop); + + private void DecreaseIndentationImpl(bool decreaseIndentation = false) => + AdjustIndentation(decreaseIndentation + ? IndentationAdjustment.Decrease + : IndentationAdjustment.Noop); + + private void AdjustIndentation(IndentationAdjustment adjustment) => + _indentation = adjustment switch + { + IndentationAdjustment.Increase => _indentation.Increase(), + IndentationAdjustment.Decrease => _indentation.Decrease(), + _ => _indentation + }; + + internal string ToSourceCodeString() => _builder.ToString(); +} diff --git a/src/Blazor.SourceGenerators/CSharp/CSharpAction.cs b/src/Blazor.SourceGenerators/CSharp/CSharpAction.cs index 5d403bf..b6dffa6 100644 --- a/src/Blazor.SourceGenerators/CSharp/CSharpAction.cs +++ b/src/Blazor.SourceGenerators/CSharp/CSharpAction.cs @@ -1,52 +1,52 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.CSharp; - -/// -/// Represents a C# delegate based on a TypeScript callback interface: -/// -/// For example: -/// -/// interface PositionCallback { -/// (position: GeolocationPosition): void; -/// } -/// -/// -/// Would be represented as: -/// -/// RawName: PositionCallback -/// RawReturnTypeName: void -/// ParameterDefinitions: new List<CSharpObject> { new(RawName: "position", RawTypeName: "GeolocationPosition") } -/// -/// -internal record CSharpAction( - string RawName, - string? RawReturnTypeName = "void", - List? ParameterDefinitions = null) : ICSharpDependencyGraphObject -{ - /// - /// The collection of types that this object depends on. - /// - public Dictionary DependentTypes { get; init; } - = new(StringComparer.OrdinalIgnoreCase); - - public IImmutableSet<(string TypeName, CSharpObject Object)> AllDependentTypes - { - get - { - Dictionary result = new(StringComparer.OrdinalIgnoreCase); - foreach (var prop - in DependentTypes.Select( - kvp => (TypeName: kvp.Key, Object: kvp.Value)) - .Concat(ParameterDefinitions.SelectMany( - p => p.AllDependentTypes))) - { - result[prop.TypeName] = prop.Object; - } - - return result.Select(kvp => (kvp.Key, kvp.Value)) - .ToImmutableHashSet(); - } - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.CSharp; + +/// +/// Represents a C# delegate based on a TypeScript callback interface: +/// +/// For example: +/// +/// interface PositionCallback { +/// (position: GeolocationPosition): void; +/// } +/// +/// +/// Would be represented as: +/// +/// RawName: PositionCallback +/// RawReturnTypeName: void +/// ParameterDefinitions: new List<CSharpObject> { new(RawName: "position", RawTypeName: "GeolocationPosition") } +/// +/// +internal record CSharpAction( + string RawName, + string? RawReturnTypeName = "void", + List? ParameterDefinitions = null) : ICSharpDependencyGraphObject +{ + /// + /// The collection of types that this object depends on. + /// + public Dictionary DependentTypes { get; init; } + = new(StringComparer.OrdinalIgnoreCase); + + public IImmutableSet<(string TypeName, CSharpObject Object)> AllDependentTypes + { + get + { + Dictionary result = new(StringComparer.OrdinalIgnoreCase); + foreach (var prop + in DependentTypes.Select( + kvp => (TypeName: kvp.Key, Object: kvp.Value)) + .Concat(ParameterDefinitions.SelectMany( + p => p.AllDependentTypes))) + { + result[prop.TypeName] = prop.Object; + } + + return result.Select(kvp => (kvp.Key, kvp.Value)) + .ToImmutableHashSet(); + } + } +} diff --git a/src/Blazor.SourceGenerators/CSharp/CSharpMethod.cs b/src/Blazor.SourceGenerators/CSharp/CSharpMethod.cs index b8da261..96cf152 100644 --- a/src/Blazor.SourceGenerators/CSharp/CSharpMethod.cs +++ b/src/Blazor.SourceGenerators/CSharp/CSharpMethod.cs @@ -1,55 +1,55 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.CSharp; - -internal record CSharpMethod( - string RawName, - string RawReturnTypeName, - List ParameterDefinitions, - JavaScriptMethod? JavaScriptMethodDependency = null) : ICSharpDependencyGraphObject -{ - public bool IsPureJavaScriptInvocation => - JavaScriptMethodDependency is { IsPure: true }; - - public bool IsNotBiDirectionalJavaScript => - JavaScriptMethodDependency is { IsBiDirectionalJavaScript: false }; - - public bool IsReturnTypeNullable => - RawReturnTypeName.Contains("null"); - - public bool IsVoid => RawReturnTypeName is "void"; - - public Dictionary DependentTypes { get; init; } - = new(StringComparer.OrdinalIgnoreCase); - - public IImmutableSet<(string TypeName, CSharpObject Object)> AllDependentTypes - { - get - { - Dictionary dependentTypes = new(StringComparer.OrdinalIgnoreCase); - if (ParameterDefinitions is { Count: > 0 }) - { - foreach (var kvp - in ParameterDefinitions.SelectMany(pd => pd.DependentTypes) - .Flatten(pair => pair.Value.DependentTypes)) - { - dependentTypes[kvp.Key] = kvp.Value; - } - } - if (JavaScriptMethodDependency is { ParameterDefinitions.Count: > 0 }) - { - foreach (var dependency - in JavaScriptMethodDependency.ParameterDefinitions.SelectMany(pd => pd.DependentTypes) - .Flatten(pair => pair.Value.DependentTypes)) - { - dependentTypes[dependency.Key] = dependency.Value; - } - } - - return dependentTypes.Select(kvp => (kvp.Key, kvp.Value)) - .Concat(this.GetAllDependencies()) - .ToImmutableHashSet(); - } - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.CSharp; + +internal record CSharpMethod( + string RawName, + string RawReturnTypeName, + List ParameterDefinitions, + JavaScriptMethod? JavaScriptMethodDependency = null) : ICSharpDependencyGraphObject +{ + public bool IsPureJavaScriptInvocation => + JavaScriptMethodDependency is { IsPure: true }; + + public bool IsNotBiDirectionalJavaScript => + JavaScriptMethodDependency is { IsBiDirectionalJavaScript: false }; + + public bool IsReturnTypeNullable => + RawReturnTypeName.Contains("null"); + + public bool IsVoid => RawReturnTypeName is "void"; + + public Dictionary DependentTypes { get; init; } + = new(StringComparer.OrdinalIgnoreCase); + + public IImmutableSet<(string TypeName, CSharpObject Object)> AllDependentTypes + { + get + { + Dictionary dependentTypes = new(StringComparer.OrdinalIgnoreCase); + if (ParameterDefinitions is { Count: > 0 }) + { + foreach (var kvp + in ParameterDefinitions.SelectMany(pd => pd.DependentTypes) + .Flatten(pair => pair.Value.DependentTypes)) + { + dependentTypes[kvp.Key] = kvp.Value; + } + } + if (JavaScriptMethodDependency is { ParameterDefinitions.Count: > 0 }) + { + foreach (var dependency + in JavaScriptMethodDependency.ParameterDefinitions.SelectMany(pd => pd.DependentTypes) + .Flatten(pair => pair.Value.DependentTypes)) + { + dependentTypes[dependency.Key] = dependency.Value; + } + } + + return dependentTypes.Select(kvp => (kvp.Key, kvp.Value)) + .Concat(this.GetAllDependencies()) + .ToImmutableHashSet(); + } + } +} diff --git a/src/Blazor.SourceGenerators/CSharp/CSharpObject.cs b/src/Blazor.SourceGenerators/CSharp/CSharpObject.cs index b43f546..b33001b 100644 --- a/src/Blazor.SourceGenerators/CSharp/CSharpObject.cs +++ b/src/Blazor.SourceGenerators/CSharp/CSharpObject.cs @@ -1,125 +1,125 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.CSharp; - -/// -/// A record the represents various C# objects. -/// -internal record CSharpObject( - string TypeName, - string? ExtendsTypeName) : ICSharpDependencyGraphObject -{ - /// - /// The collection of types that this object depends on. - /// - public Dictionary DependentTypes { get; init; } = - new(StringComparer.OrdinalIgnoreCase); - - public IImmutableSet<(string TypeName, CSharpObject Object)> AllDependentTypes - { - get - { - Dictionary result = new(StringComparer.OrdinalIgnoreCase); - foreach (var prop - in this.GetAllDependencies() - .Concat(Properties.SelectMany( - p => p.Value.AllDependentTypes)) - .Concat(Methods.SelectMany( - p => p.Value.AllDependentTypes))) - { - result[prop.TypeName] = prop.Object; - } - - return result.Select(kvp => (kvp.Key, kvp.Value)) - .Concat(new[] { (TypeName, Object: this) }) - .ToImmutableHashSet(); - } - } - - /// - /// The represent the raw parsed member name, while the - /// corresponding are the details. - /// - public Dictionary Properties { get; init; } = - new(StringComparer.OrdinalIgnoreCase); - - /// - /// The represent the raw parsed member name, while the - /// corresponding are the details. - /// - public Dictionary Methods { get; init; } = - new(StringComparer.OrdinalIgnoreCase); - - public bool IsActionParameter => - TypeName.EndsWith("Callback"); - - internal string ToClassString() - { - StringBuilder builder = new("#nullable enable\r\n"); - - builder.Append("using System.Text.Json.Serialization;\r\n\r\n"); - builder.Append("namespace Microsoft.JSInterop;\r\n\r\n"); - - builder.Append( - $"/// \r\n"); - builder.Append( - $"/// Source-generated object representing an ideally immutable {TypeName} value.\r\n"); - builder.Append( - $"/// \r\n"); - - builder.Append($"public class {TypeName}\r\n{{\r\n"); - - var memberCount = Properties.Count; - foreach (var (index, kvp) - in Properties.Select((kvp, index) => (index, kvp))) - { - var (memberName, member) = (kvp.Key, kvp.Value); - var typeName = member.MappedTypeName; - var nullableExpression = member.IsNullable && !typeName.EndsWith("?") ? "?" : ""; - var trivia = member.IsArray ? "[]" : ""; - var isPrimitive = TypeMap.PrimitiveTypes.IsPrimitiveType(typeName); - var statementTerminator = member.IsNullable || - typeName is "string" || isPrimitive is false ? " = default!;" : ""; - var csharpMemberName = memberName.CapitalizeFirstLetter(); - - builder.Append( - $" /// \r\n"); - builder.Append( - $" /// Source-generated property representing the {TypeName}.{memberName} value.\r\n"); - builder.Append( - $" /// \r\n"); - builder.Append( - $" [JsonPropertyName(\"{memberName}\")]\r\n"); - builder.Append( - $" public {typeName}{trivia}{nullableExpression} {csharpMemberName} {{ get; set; }}{statementTerminator}\r\n"); - - // Add readonly property for converting DOMTimeStamp (long) to DateTime. - if (member.RawTypeName is "DOMTimeStamp" or "DOMTimeStamp | null" - or "EpochTimeStamp" or "EpochTimeStamp | null") - { - builder.Append( - $" /// \r\n"); - builder.Append( - $" /// Source-generated property representing the {TypeName}.{memberName} value, \r\n"); - - builder.Append( - $" /// converted as a in UTC.\r\n"); - builder.Append( - $" /// \r\n"); - - var nullable = member.IsNullable ? "?" : ""; - builder.Append( - $" [JsonIgnore]\r\n"); - builder.Append( - $" public DateTime{nullable} {csharpMemberName}AsUtcDateTime => {csharpMemberName}.ToDateTimeFromUnix();\r\n"); - } - } - - builder.Append("}\r\n"); - var result = builder.ToString(); - return result; - } - - public override string ToString() => ToClassString(); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.CSharp; + +/// +/// A record the represents various C# objects. +/// +internal record CSharpObject( + string TypeName, + string? ExtendsTypeName) : ICSharpDependencyGraphObject +{ + /// + /// The collection of types that this object depends on. + /// + public Dictionary DependentTypes { get; init; } = + new(StringComparer.OrdinalIgnoreCase); + + public IImmutableSet<(string TypeName, CSharpObject Object)> AllDependentTypes + { + get + { + Dictionary result = new(StringComparer.OrdinalIgnoreCase); + foreach (var prop + in this.GetAllDependencies() + .Concat(Properties.SelectMany( + p => p.Value.AllDependentTypes)) + .Concat(Methods.SelectMany( + p => p.Value.AllDependentTypes))) + { + result[prop.TypeName] = prop.Object; + } + + return result.Select(kvp => (kvp.Key, kvp.Value)) + .Concat(new[] { (TypeName, Object: this) }) + .ToImmutableHashSet(); + } + } + + /// + /// The represent the raw parsed member name, while the + /// corresponding are the details. + /// + public Dictionary Properties { get; init; } = + new(StringComparer.OrdinalIgnoreCase); + + /// + /// The represent the raw parsed member name, while the + /// corresponding are the details. + /// + public Dictionary Methods { get; init; } = + new(StringComparer.OrdinalIgnoreCase); + + public bool IsActionParameter => + TypeName.EndsWith("Callback"); + + internal string ToClassString() + { + StringBuilder builder = new("#nullable enable\r\n"); + + builder.Append("using System.Text.Json.Serialization;\r\n\r\n"); + builder.Append("namespace Microsoft.JSInterop;\r\n\r\n"); + + builder.Append( + $"/// \r\n"); + builder.Append( + $"/// Source-generated object representing an ideally immutable {TypeName} value.\r\n"); + builder.Append( + $"/// \r\n"); + + builder.Append($"public class {TypeName}\r\n{{\r\n"); + + var memberCount = Properties.Count; + foreach (var (index, kvp) + in Properties.Select((kvp, index) => (index, kvp))) + { + var (memberName, member) = (kvp.Key, kvp.Value); + var typeName = member.MappedTypeName; + var nullableExpression = member.IsNullable && !typeName.EndsWith("?") ? "?" : ""; + var trivia = member.IsArray ? "[]" : ""; + var isPrimitive = TypeMap.PrimitiveTypes.IsPrimitiveType(typeName); + var statementTerminator = member.IsNullable || + typeName is "string" || isPrimitive is false ? " = default!;" : ""; + var csharpMemberName = memberName.CapitalizeFirstLetter(); + + builder.Append( + $" /// \r\n"); + builder.Append( + $" /// Source-generated property representing the {TypeName}.{memberName} value.\r\n"); + builder.Append( + $" /// \r\n"); + builder.Append( + $" [JsonPropertyName(\"{memberName}\")]\r\n"); + builder.Append( + $" public {typeName}{trivia}{nullableExpression} {csharpMemberName} {{ get; set; }}{statementTerminator}\r\n"); + + // Add readonly property for converting DOMTimeStamp (long) to DateTime. + if (member.RawTypeName is "DOMTimeStamp" or "DOMTimeStamp | null" + or "EpochTimeStamp" or "EpochTimeStamp | null") + { + builder.Append( + $" /// \r\n"); + builder.Append( + $" /// Source-generated property representing the {TypeName}.{memberName} value, \r\n"); + + builder.Append( + $" /// converted as a in UTC.\r\n"); + builder.Append( + $" /// \r\n"); + + var nullable = member.IsNullable ? "?" : ""; + builder.Append( + $" [JsonIgnore]\r\n"); + builder.Append( + $" public DateTime{nullable} {csharpMemberName}AsUtcDateTime => {csharpMemberName}.ToDateTimeFromUnix();\r\n"); + } + } + + builder.Append("}\r\n"); + var result = builder.ToString(); + return result; + } + + public override string ToString() => ToClassString(); +} diff --git a/src/Blazor.SourceGenerators/CSharp/CSharpProperty.cs b/src/Blazor.SourceGenerators/CSharp/CSharpProperty.cs index e3b891d..fda29cb 100644 --- a/src/Blazor.SourceGenerators/CSharp/CSharpProperty.cs +++ b/src/Blazor.SourceGenerators/CSharp/CSharpProperty.cs @@ -1,45 +1,45 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.CSharp; - -/// -/// A record the represents various C# members, such as properties, delegates and events. -/// -internal record CSharpProperty( - string RawName, - string RawTypeName, - bool IsNullable = false, - bool IsReadonly = false) : CSharpType(RawName, RawTypeName, IsNullable) -{ - public string MappedTypeName - { - get - { - var mappedTypeName = TypeMap.PrimitiveTypes[RawTypeName]; - if (mappedTypeName == RawTypeName) - { - if (IsArray) - { - mappedTypeName = mappedTypeName - .Replace("[]", "") - .Replace("ReadonlyArray<", "") - .Replace(">", ""); - } - - if (IsNullable) - { - mappedTypeName = mappedTypeName - .Replace("| null", ""); - } - } - - return mappedTypeName; - } - } - - public bool IsIndexer => RawName.StartsWith("[") && RawName.EndsWith("]"); - - public bool IsArray => RawTypeName.EndsWith("[]") || - (RawTypeName.StartsWith("ReadonlyArray<") && RawTypeName.EndsWith(">")); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.CSharp; + +/// +/// A record the represents various C# members, such as properties, delegates and events. +/// +internal record CSharpProperty( + string RawName, + string RawTypeName, + bool IsNullable = false, + bool IsReadonly = false) : CSharpType(RawName, RawTypeName, IsNullable) +{ + public string MappedTypeName + { + get + { + var mappedTypeName = TypeMap.PrimitiveTypes[RawTypeName]; + if (mappedTypeName == RawTypeName) + { + if (IsArray) + { + mappedTypeName = mappedTypeName + .Replace("[]", "") + .Replace("ReadonlyArray<", "") + .Replace(">", ""); + } + + if (IsNullable) + { + mappedTypeName = mappedTypeName + .Replace("| null", ""); + } + } + + return mappedTypeName; + } + } + + public bool IsIndexer => RawName.StartsWith("[") && RawName.EndsWith("]"); + + public bool IsArray => RawTypeName.EndsWith("[]") || + (RawTypeName.StartsWith("ReadonlyArray<") && RawTypeName.EndsWith(">")); +} diff --git a/src/Blazor.SourceGenerators/CSharp/CSharpTopLevelObject.cs b/src/Blazor.SourceGenerators/CSharp/CSharpTopLevelObject.cs index b914f47..8590878 100644 --- a/src/Blazor.SourceGenerators/CSharp/CSharpTopLevelObject.cs +++ b/src/Blazor.SourceGenerators/CSharp/CSharpTopLevelObject.cs @@ -1,555 +1,555 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -using Blazor.SourceGenerators.Builders; - -namespace Blazor.SourceGenerators.CSharp; - -internal sealed partial record CSharpTopLevelObject(string RawTypeName) - : ICSharpDependencyGraphObject -{ - public List? Properties { get; init; } = new(); - - public List? Methods { get; init; } = new(); - - public Dictionary DependentTypes { get; init; } = new(StringComparer.OrdinalIgnoreCase); - - public IImmutableSet<(string TypeName, CSharpObject Object)> AllDependentTypes - { - get - { - Dictionary result = new(StringComparer.OrdinalIgnoreCase); - foreach (var prop - in DependentTypes - .Select(kvp => (TypeName: kvp.Key, Object: kvp.Value)) - .Concat(Properties.SelectMany( - p => p.AllDependentTypes)) - .Concat(Methods.SelectMany( - p => p.AllDependentTypes))) - { - result[prop.TypeName] = prop.Object; - } - - return result.Select(pair => (pair.Key, pair.Value)) - .ToImmutableHashSet(); - } - } - - public int MemberCount => Properties!.Count + Methods!.Count; - - internal string ToInterfaceString( - GeneratorOptions options, - string? namespaceString) - { - var builder = new SourceBuilder(options) - .AppendCopyRightHeader() - .AppendUsingDeclarations() - .AppendNamespace(namespaceString ?? "Microsoft.JSInterop") - .AppendPublicInterfaceDeclaration() - .AppendOpeningCurlyBrace() - .IncreaseIndentation(); - - var methodLevel = builder.IndentationLevel; - - // Methods - foreach (var method in Methods ?? new List()) - { - var details = MethodBuilderDetails.Create(method, options); - builder.ResetIndentiationTo(methodLevel); - - var isJavaScriptOverride = method.IsJavaScriptOverride(options); - var isPureNonBiDirectionalOrOverriddenJS = - method.IsPureJavaScriptInvocation || - method.IsNotBiDirectionalJavaScript || - isJavaScriptOverride; - - if (isPureNonBiDirectionalOrOverriddenJS) - { - builder.AppendTripleSlashMethodComments(details.Method) - .AppendRaw( - $"{details.ReturnType} {details.CSharpMethodName}{details.Suffix}{details.GenericTypeArgs}(", - appendNewLine: false, - postIncreaseIndentation: true); - - if (method.ParameterDefinitions.Count > 0) - { - foreach (var (pi, parameter) in method.ParameterDefinitions.Select()) - { - var isGenericType = parameter.IsGenericParameter(method.RawName, options); - if (pi.IsLast) - { - if (details.IsSerializable) - { - builder.AppendRaw($"{parameter.ToParameterString(isGenericType)},") - .AppendRaw($"JsonSerializerOptions? options = null);") - .AppendLine(); - } - else - { - builder.AppendRaw($"{parameter.ToParameterString(isGenericType)});") - .AppendLine(); - } - } - else - { - if (pi.IsFirst) - { - builder.AppendLine(); - } - - builder.AppendRaw($"{parameter.ToParameterString(isGenericType)},"); - } - } - - builder.DecreaseIndentation(); - } - else - { - builder.AppendRaw(");", appendNewLine: true, omitIndentation: true); - } - } - else if (options.OnlyGeneratePureJS is false) - { - var genericTypeArgs = details.GenericTypeArgs ?? - MethodBuilderDetails.ToGenericTypeArgument( - MethodBuilderDetails.GenericComponentType); - - builder.AppendTripleSlashMethodComments(details.Method, extrapolateParameters: true) - .AppendRaw( - $"{details.ReturnType} {details.CSharpMethodName}{details.Suffix}{genericTypeArgs}(") - .AppendRaw($"TComponent component", appendNewLine: false, postIncreaseIndentation: true); - - if (method.ParameterDefinitions.Count > 0) - { - builder.AppendRaw(","); - foreach (var (pi, parameter) in method.ParameterDefinitions.Select()) - { - var isGenericType = parameter.IsGenericParameter(method.RawName, options); - if (pi.IsLast) - { - builder.AppendRaw($"{parameter.ToParameterString(isGenericType)}) where TComponent : class;") - .AppendLine(); - } - else - { - if (pi.IsFirst) - { - builder.AppendLine(); - } - - builder.AppendRaw($"{parameter.ToParameterString(isGenericType)},"); - } - } - - builder.DecreaseIndentation(); - } - else - { - builder.AppendRaw(") where TComponent : class;", appendNewLine: true, omitIndentation: true); - } - - builder.AppendTripleSlashMethodComments(details.Method) - .AppendRaw( - $"{details.ReturnType} {details.CSharpMethodName}{details.Suffix}(", - postIncreaseIndentation: true); - - if (method.ParameterDefinitions.Count > 0) - { - foreach (var (pi, parameter) in method.ParameterDefinitions.Select()) - { - var isGenericType = parameter.IsGenericParameter(method.RawName, options); - if (pi.IsLast) - { - builder.AppendRaw($"{parameter.ToActionString(isGenericType)});") - .AppendLine(); - } - else - { - if (pi.IsFirst) - { - builder.AppendLine(); - } - - builder.AppendRaw($"{parameter.ToActionString(isGenericType)},"); - } - } - - builder.DecreaseIndentation(); - } - else - { - builder.AppendRaw(");", appendNewLine: true, omitIndentation: true); - } - } - } - - // Properties - foreach (var (index, property) in (Properties ?? new List()).Select()) - { - if (index.IsFirst) builder.AppendLine(); - if (property.IsIndexer) continue; - - builder.ResetIndentiationTo(methodLevel); - - var details = PropertyBuilderDetails.Create(property, options); - - var accessors = details.Property.IsReadonly - ? "{ get; }" : "{ get; set; }"; - builder.AppendTripleSlashPropertyComments(details.Property) - .AppendRaw($"{details.ReturnType} {details.CSharpPropertyName} {accessors}"); - - if (!index.IsLast) - { - builder.AppendLine(); - } - } - - builder.ResetIndentiationTo(0); - builder.AppendClosingCurlyBrace(); - - var interfaceDeclaration = TryFormatCSharpSourceText(builder.ToSourceCodeString()); - return interfaceDeclaration; - } - - internal string ToImplementationString( - GeneratorOptions options, - string? namespaceString) - { - var builder = new SourceBuilder(options) - .AppendCopyRightHeader() - .AppendUsingDeclarations() - .AppendNamespace(namespaceString ?? "Microsoft.JSInterop") - .AppendInternalImplementationDeclaration() - .AppendOpeningCurlyBrace() - .IncreaseIndentation() - .AppendConditionalDelegateFields(Methods) - .AppendImplementationCtor(); - - var methodLevel = builder.IndentationLevel; - - builder.AppendConditionalDelegateCallbackMethods(Methods); - - // Methods - foreach (var (index, method) in (Methods ?? new List()).Select()) - { - var details = MethodBuilderDetails.Create(method, options); - builder.ResetIndentiationTo(methodLevel); - - var isJavaScriptOverride = method.IsJavaScriptOverride(options); - var isPureNonBiDirectionalOrOverriddenJS = - method.IsPureJavaScriptInvocation || - method.IsNotBiDirectionalJavaScript || - isJavaScriptOverride; - - if (isPureNonBiDirectionalOrOverriddenJS) - { - var memberName = $"{details.CSharpMethodName}{details.Suffix}"; - builder.AppendTripleSlashInheritdocComments(builder.InterfaceName, memberName) - .AppendRaw( - $"{details.ReturnType} {builder.InterfaceName}.{details.CSharpMethodName}{details.Suffix}{details.GenericTypeArgs}(", - appendNewLine: false, - postIncreaseIndentation: true); - - if (method.ParameterDefinitions.Count > 0) - { - var genericTypeParameterConstraint = details.IsGenericReturnType - ? $" where {MethodBuilderDetails.GenericTypeValue} : default" - : ""; - - foreach (var (pi, parameter) in method.ParameterDefinitions.Select()) - { - var isGenericType = parameter.IsGenericParameter(method.RawName, options); - if (pi.IsLast) - { - if (details.IsSerializable) - { - builder.AppendRaw($"{parameter.ToParameterString(isGenericType)},"); - builder.AppendRaw($"JsonSerializerOptions? options){genericTypeParameterConstraint} =>"); - } - else - { - builder.AppendRaw($"{parameter.ToParameterString(false, true)}) =>"); - } - } - else - { - builder.AppendRaw($"{parameter.ToParameterString(isGenericType, true)},"); - } - } - - if (details.IsVoid) - { - builder.AppendRaw($"_javaScript.InvokeVoid{details.Suffix}(", postIncreaseIndentation: true); - } - else - { - builder.AppendRaw($"_javaScript.Invoke{details.Suffix}<{details.BareType}>(", postIncreaseIndentation: true); - } - - builder.IncreaseIndentation() - .AppendRaw($"\"{details.FullyQualifiedJavaScriptIdentifier}\","); - // Write method body / expression, and arguments to javaScript.Invoke* - foreach (var (ai, parameter) in method.ParameterDefinitions.Select()) - { - var isGenericType = parameter.IsGenericParameter(method.RawName, options); - if (ai.IsLast) - { - if (details.IsGenericReturnType) - { - // Overridden to control explicitly - builder.AppendRaw($"{parameter.ToArgumentString(toJson: false)})"); - builder.AppendRaw($".FromJson{details.GenericTypeArgs}(options);"); - } - else - { - builder.AppendRaw($"{parameter.ToArgumentString(details.ContainsGenericParameters)});"); - } - - if (!index.IsLast) builder.AppendLine(); - } - else - { - builder.AppendRaw($"{parameter.ToArgumentString(isGenericType)},"); - } - } - - builder.DecreaseIndentation(); - } - else - { - builder.AppendRaw(") =>"); - if (details.IsVoid) - { - builder.AppendRaw($"_javaScript.InvokeVoid{details.Suffix}(\"{details.FullyQualifiedJavaScriptIdentifier}\");"); - builder.AppendLine(); - } - else - { - builder.AppendRaw($"_javaScript.Invoke{details.Suffix}<{details.BareType}>(\"{details.FullyQualifiedJavaScriptIdentifier}\");"); - builder.AppendLine(); - } - } - } - else if (options.OnlyGeneratePureJS is false) - { - var genericTypeArgs = details.GenericTypeArgs ?? - MethodBuilderDetails.ToGenericTypeArgument( - MethodBuilderDetails.GenericComponentType); - - var memberName = $"{details.CSharpMethodName}{details.Suffix}"; - builder.AppendTripleSlashInheritdocComments(builder.InterfaceName, memberName) - .AppendRaw( - $"{details.ReturnType} {builder.InterfaceName}.{details.CSharpMethodName}{details.Suffix}{genericTypeArgs}(", - postIncreaseIndentation: true) - .AppendRaw($"TComponent component", appendNewLine: false); - - if (method.ParameterDefinitions.Count > 0) - { - builder.AppendRaw( - ", ", false, false, true); - foreach (var (pi, parameter) in method.ParameterDefinitions.Select()) - { - if (pi.IsLast) - { - builder.AppendRaw($"{parameter.ToParameterString(false, true)}) where TComponent : class =>"); - } - else - { - builder.AppendRaw($"{parameter.ToParameterString(false, true)},"); - } - } - - if (details.IsVoid) - { - builder.AppendRaw($"_javaScript.InvokeVoid{details.Suffix}("); - } - else - { - builder.AppendRaw($"_javaScript.Invoke{details.Suffix}<{details.BareType}>("); - } - - builder.IncreaseIndentation() - .AppendRaw($"\"{details.FullyQualifiedJavaScriptIdentifier}\","); - - builder.AppendRaw($"DotNetObjectReference.Create(component),"); - - // Write method body / expression, and arguments to javaScript.Invoke* - foreach (var (ai, parameter) in method.ParameterDefinitions.Select()) - { - var isGenericType = parameter.IsGenericParameter(method.RawName, options); - if (ai.IsLast) - { - builder.AppendRaw($"{parameter.ToArgumentString(isGenericType)});"); - - if (!index.IsLast) builder.AppendLine(); - } - else - { - builder.AppendRaw($"{parameter.ToArgumentString(isGenericType)},"); - } - } - - builder.DecreaseIndentation(); - } - - builder.AppendTripleSlashInheritdocComments(builder.InterfaceName, memberName) - .AppendRaw( - $"{details.ReturnType} {builder.InterfaceName}.{details.CSharpMethodName}{details.Suffix}(", - postIncreaseIndentation: true); - - if (method.ParameterDefinitions.Count > 0) - { - foreach (var (pi, parameter) in method.ParameterDefinitions.Select()) - { - if (pi.IsLast) - { - builder.AppendRaw($"{parameter.ToActionString(false, true)})"); - builder.AppendOpeningCurlyBrace(); - } - else - { - builder.AppendRaw($"{parameter.ToActionString(false, true)},"); - } - } - - foreach (var parameter in method.ParameterDefinitions) - { - var isGenericType = parameter.IsGenericParameter(method.RawName, options); - var arg = parameter.ToArgumentString(isGenericType, true); - var fieldName = - builder.Fields?.FirstOrDefault(field => field.EndsWith(parameter.RawName)); - - if (fieldName is null) continue; - builder.AppendRaw($"{fieldName} = {arg};"); - } - - if (details.IsVoid) - { - var returnExpression = options.IsWebAssembly ? "" : "return "; - builder.AppendRaw($"{returnExpression}_javaScript.InvokeVoid{details.Suffix}("); - } - else - { - builder.AppendRaw($"return _javaScript.Invoke{details.Suffix}<{details.BareType}>("); - } - - builder.IncreaseIndentation() - .AppendRaw($"\"{details.FullyQualifiedJavaScriptIdentifier}\","); - - // Write method body / expression, and arguments to javaScript.Invoke* - foreach (var (ai, parameter) in method.ParameterDefinitions.Select()) - { - if (ai.IsFirst) - { - builder.AppendRaw($"DotNetObjectReference.Create(this),"); - } - - var isGenericType = parameter.IsGenericParameter(method.RawName, options); - var arg = parameter.ToArgumentString(isGenericType, true); - var methodName = - builder.Methods?.FirstOrDefault( - method => method.EndsWith(arg.Substring(2))); - var argExpression = methodName is not null ? $"nameof({methodName})" : arg; - if (ai.IsLast) - { - builder.AppendRaw($"{argExpression});"); - builder.AppendClosingCurlyBrace(); - - if (!index.IsLast) builder.AppendLine(); - } - else - { - builder.AppendRaw($"{argExpression},"); - } - } - - builder.DecreaseIndentation(); - } - } - } - - // Properties - foreach (var (index, property) in (Properties ?? new List()).Select()) - { - if (index.IsFirst) builder.AppendLine(); - if (property.IsIndexer) continue; - - builder.ResetIndentiationTo(methodLevel); - - var details = PropertyBuilderDetails.Create(property, options); - - builder.AppendTripleSlashInheritdocComments(builder.InterfaceName, details.CSharpPropertyName) - .AppendRaw($"{details.ReturnType} {builder.InterfaceName}.{details.CSharpPropertyName} =>", postIncreaseIndentation: true) - .AppendRaw($"_javaScript.Invoke{details.Suffix}{details.GenericTypeArgs}(", postIncreaseIndentation: true) - .AppendRaw($"\"eval\", \"{details.FullyQualifiedJavaScriptIdentifier}\");"); - - if (!index.IsLast) - { - builder.AppendLine(); - } - } - - builder.ResetIndentiationTo(0); - builder.AppendClosingCurlyBrace(); - - var implementation = TryFormatCSharpSourceText(builder.ToSourceCodeString()); - return implementation; - } - - internal string ToServiceCollectionExtensions( - GeneratorOptions options, - string implementation) - { - var addExpression = options.IsWebAssembly - ? @"services.AddSingleton(serviceProvider => - (IJSInProcessRuntime)serviceProvider.GetRequiredService()) - " - : "services"; - - var @interface = options.Implementation.ToInterfaceName(); - var nonService = options.Implementation.ToImplementationName(false); - var serviceLifetime = options.IsWebAssembly - ? "Singleton" - : "Scoped"; - - var extensions = $@"// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License: -// https://github.com/IEvangelist/blazorators/blob/main/LICENSE -// Auto-generated by blazorators. - -using Microsoft.JSInterop; - -namespace Microsoft.Extensions.DependencyInjection; - -/// -public static class {nonService}ServiceCollectionExtensions -{{ - /// - /// Adds the service to the service collection. - /// - public static IServiceCollection Add{nonService}Services( - this IServiceCollection services) => - {addExpression}.Add{serviceLifetime}<{@interface}, {implementation}>(); -}} -"; - - return extensions; - } - - static string TryFormatCSharpSourceText(string csharpSourceText) - { - try - { - return CSharpSyntaxTree.ParseText(csharpSourceText) - .GetRoot() - .NormalizeWhitespace() - .ToFullString(); - } - catch (Exception ex) - { - Console.WriteLine(ex); - - return csharpSourceText; - } - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using Blazor.SourceGenerators.Builders; + +namespace Blazor.SourceGenerators.CSharp; + +internal sealed partial record CSharpTopLevelObject(string RawTypeName) + : ICSharpDependencyGraphObject +{ + public List? Properties { get; init; } = new(); + + public List? Methods { get; init; } = new(); + + public Dictionary DependentTypes { get; init; } = new(StringComparer.OrdinalIgnoreCase); + + public IImmutableSet<(string TypeName, CSharpObject Object)> AllDependentTypes + { + get + { + Dictionary result = new(StringComparer.OrdinalIgnoreCase); + foreach (var prop + in DependentTypes + .Select(kvp => (TypeName: kvp.Key, Object: kvp.Value)) + .Concat(Properties.SelectMany( + p => p.AllDependentTypes)) + .Concat(Methods.SelectMany( + p => p.AllDependentTypes))) + { + result[prop.TypeName] = prop.Object; + } + + return result.Select(pair => (pair.Key, pair.Value)) + .ToImmutableHashSet(); + } + } + + public int MemberCount => Properties!.Count + Methods!.Count; + + internal string ToInterfaceString( + GeneratorOptions options, + string? namespaceString) + { + var builder = new SourceBuilder(options) + .AppendCopyRightHeader() + .AppendUsingDeclarations() + .AppendNamespace(namespaceString ?? "Microsoft.JSInterop") + .AppendPublicInterfaceDeclaration() + .AppendOpeningCurlyBrace() + .IncreaseIndentation(); + + var methodLevel = builder.IndentationLevel; + + // Methods + foreach (var method in Methods ?? new List()) + { + var details = MethodBuilderDetails.Create(method, options); + builder.ResetIndentiationTo(methodLevel); + + var isJavaScriptOverride = method.IsJavaScriptOverride(options); + var isPureNonBiDirectionalOrOverriddenJS = + method.IsPureJavaScriptInvocation || + method.IsNotBiDirectionalJavaScript || + isJavaScriptOverride; + + if (isPureNonBiDirectionalOrOverriddenJS) + { + builder.AppendTripleSlashMethodComments(details.Method) + .AppendRaw( + $"{details.ReturnType} {details.CSharpMethodName}{details.Suffix}{details.GenericTypeArgs}(", + appendNewLine: false, + postIncreaseIndentation: true); + + if (method.ParameterDefinitions.Count > 0) + { + foreach (var (pi, parameter) in method.ParameterDefinitions.Select()) + { + var isGenericType = parameter.IsGenericParameter(method.RawName, options); + if (pi.IsLast) + { + if (details.IsSerializable) + { + builder.AppendRaw($"{parameter.ToParameterString(isGenericType)},") + .AppendRaw($"JsonSerializerOptions? options = null);") + .AppendLine(); + } + else + { + builder.AppendRaw($"{parameter.ToParameterString(isGenericType)});") + .AppendLine(); + } + } + else + { + if (pi.IsFirst) + { + builder.AppendLine(); + } + + builder.AppendRaw($"{parameter.ToParameterString(isGenericType)},"); + } + } + + builder.DecreaseIndentation(); + } + else + { + builder.AppendRaw(");", appendNewLine: true, omitIndentation: true); + } + } + else if (options.OnlyGeneratePureJS is false) + { + var genericTypeArgs = details.GenericTypeArgs ?? + MethodBuilderDetails.ToGenericTypeArgument( + MethodBuilderDetails.GenericComponentType); + + builder.AppendTripleSlashMethodComments(details.Method, extrapolateParameters: true) + .AppendRaw( + $"{details.ReturnType} {details.CSharpMethodName}{details.Suffix}{genericTypeArgs}(") + .AppendRaw($"TComponent component", appendNewLine: false, postIncreaseIndentation: true); + + if (method.ParameterDefinitions.Count > 0) + { + builder.AppendRaw(","); + foreach (var (pi, parameter) in method.ParameterDefinitions.Select()) + { + var isGenericType = parameter.IsGenericParameter(method.RawName, options); + if (pi.IsLast) + { + builder.AppendRaw($"{parameter.ToParameterString(isGenericType)}) where TComponent : class;") + .AppendLine(); + } + else + { + if (pi.IsFirst) + { + builder.AppendLine(); + } + + builder.AppendRaw($"{parameter.ToParameterString(isGenericType)},"); + } + } + + builder.DecreaseIndentation(); + } + else + { + builder.AppendRaw(") where TComponent : class;", appendNewLine: true, omitIndentation: true); + } + + builder.AppendTripleSlashMethodComments(details.Method) + .AppendRaw( + $"{details.ReturnType} {details.CSharpMethodName}{details.Suffix}(", + postIncreaseIndentation: true); + + if (method.ParameterDefinitions.Count > 0) + { + foreach (var (pi, parameter) in method.ParameterDefinitions.Select()) + { + var isGenericType = parameter.IsGenericParameter(method.RawName, options); + if (pi.IsLast) + { + builder.AppendRaw($"{parameter.ToActionString(isGenericType)});") + .AppendLine(); + } + else + { + if (pi.IsFirst) + { + builder.AppendLine(); + } + + builder.AppendRaw($"{parameter.ToActionString(isGenericType)},"); + } + } + + builder.DecreaseIndentation(); + } + else + { + builder.AppendRaw(");", appendNewLine: true, omitIndentation: true); + } + } + } + + // Properties + foreach (var (index, property) in (Properties ?? new List()).Select()) + { + if (index.IsFirst) builder.AppendLine(); + if (property.IsIndexer) continue; + + builder.ResetIndentiationTo(methodLevel); + + var details = PropertyBuilderDetails.Create(property, options); + + var accessors = details.Property.IsReadonly + ? "{ get; }" : "{ get; set; }"; + builder.AppendTripleSlashPropertyComments(details.Property) + .AppendRaw($"{details.ReturnType} {details.CSharpPropertyName} {accessors}"); + + if (!index.IsLast) + { + builder.AppendLine(); + } + } + + builder.ResetIndentiationTo(0); + builder.AppendClosingCurlyBrace(); + + var interfaceDeclaration = TryFormatCSharpSourceText(builder.ToSourceCodeString()); + return interfaceDeclaration; + } + + internal string ToImplementationString( + GeneratorOptions options, + string? namespaceString) + { + var builder = new SourceBuilder(options) + .AppendCopyRightHeader() + .AppendUsingDeclarations() + .AppendNamespace(namespaceString ?? "Microsoft.JSInterop") + .AppendInternalImplementationDeclaration() + .AppendOpeningCurlyBrace() + .IncreaseIndentation() + .AppendConditionalDelegateFields(Methods) + .AppendImplementationCtor(); + + var methodLevel = builder.IndentationLevel; + + builder.AppendConditionalDelegateCallbackMethods(Methods); + + // Methods + foreach (var (index, method) in (Methods ?? new List()).Select()) + { + var details = MethodBuilderDetails.Create(method, options); + builder.ResetIndentiationTo(methodLevel); + + var isJavaScriptOverride = method.IsJavaScriptOverride(options); + var isPureNonBiDirectionalOrOverriddenJS = + method.IsPureJavaScriptInvocation || + method.IsNotBiDirectionalJavaScript || + isJavaScriptOverride; + + if (isPureNonBiDirectionalOrOverriddenJS) + { + var memberName = $"{details.CSharpMethodName}{details.Suffix}"; + builder.AppendTripleSlashInheritdocComments(builder.InterfaceName, memberName) + .AppendRaw( + $"{details.ReturnType} {builder.InterfaceName}.{details.CSharpMethodName}{details.Suffix}{details.GenericTypeArgs}(", + appendNewLine: false, + postIncreaseIndentation: true); + + if (method.ParameterDefinitions.Count > 0) + { + var genericTypeParameterConstraint = details.IsGenericReturnType + ? $" where {MethodBuilderDetails.GenericTypeValue} : default" + : ""; + + foreach (var (pi, parameter) in method.ParameterDefinitions.Select()) + { + var isGenericType = parameter.IsGenericParameter(method.RawName, options); + if (pi.IsLast) + { + if (details.IsSerializable) + { + builder.AppendRaw($"{parameter.ToParameterString(isGenericType)},"); + builder.AppendRaw($"JsonSerializerOptions? options){genericTypeParameterConstraint} =>"); + } + else + { + builder.AppendRaw($"{parameter.ToParameterString(false, true)}) =>"); + } + } + else + { + builder.AppendRaw($"{parameter.ToParameterString(isGenericType, true)},"); + } + } + + if (details.IsVoid) + { + builder.AppendRaw($"_javaScript.InvokeVoid{details.Suffix}(", postIncreaseIndentation: true); + } + else + { + builder.AppendRaw($"_javaScript.Invoke{details.Suffix}<{details.BareType}>(", postIncreaseIndentation: true); + } + + builder.IncreaseIndentation() + .AppendRaw($"\"{details.FullyQualifiedJavaScriptIdentifier}\","); + // Write method body / expression, and arguments to javaScript.Invoke* + foreach (var (ai, parameter) in method.ParameterDefinitions.Select()) + { + var isGenericType = parameter.IsGenericParameter(method.RawName, options); + if (ai.IsLast) + { + if (details.IsGenericReturnType) + { + // Overridden to control explicitly + builder.AppendRaw($"{parameter.ToArgumentString(toJson: false)})"); + builder.AppendRaw($".FromJson{details.GenericTypeArgs}(options);"); + } + else + { + builder.AppendRaw($"{parameter.ToArgumentString(details.ContainsGenericParameters)});"); + } + + if (!index.IsLast) builder.AppendLine(); + } + else + { + builder.AppendRaw($"{parameter.ToArgumentString(isGenericType)},"); + } + } + + builder.DecreaseIndentation(); + } + else + { + builder.AppendRaw(") =>"); + if (details.IsVoid) + { + builder.AppendRaw($"_javaScript.InvokeVoid{details.Suffix}(\"{details.FullyQualifiedJavaScriptIdentifier}\");"); + builder.AppendLine(); + } + else + { + builder.AppendRaw($"_javaScript.Invoke{details.Suffix}<{details.BareType}>(\"{details.FullyQualifiedJavaScriptIdentifier}\");"); + builder.AppendLine(); + } + } + } + else if (options.OnlyGeneratePureJS is false) + { + var genericTypeArgs = details.GenericTypeArgs ?? + MethodBuilderDetails.ToGenericTypeArgument( + MethodBuilderDetails.GenericComponentType); + + var memberName = $"{details.CSharpMethodName}{details.Suffix}"; + builder.AppendTripleSlashInheritdocComments(builder.InterfaceName, memberName) + .AppendRaw( + $"{details.ReturnType} {builder.InterfaceName}.{details.CSharpMethodName}{details.Suffix}{genericTypeArgs}(", + postIncreaseIndentation: true) + .AppendRaw($"TComponent component", appendNewLine: false); + + if (method.ParameterDefinitions.Count > 0) + { + builder.AppendRaw( + ", ", false, false, true); + foreach (var (pi, parameter) in method.ParameterDefinitions.Select()) + { + if (pi.IsLast) + { + builder.AppendRaw($"{parameter.ToParameterString(false, true)}) where TComponent : class =>"); + } + else + { + builder.AppendRaw($"{parameter.ToParameterString(false, true)},"); + } + } + + if (details.IsVoid) + { + builder.AppendRaw($"_javaScript.InvokeVoid{details.Suffix}("); + } + else + { + builder.AppendRaw($"_javaScript.Invoke{details.Suffix}<{details.BareType}>("); + } + + builder.IncreaseIndentation() + .AppendRaw($"\"{details.FullyQualifiedJavaScriptIdentifier}\","); + + builder.AppendRaw($"DotNetObjectReference.Create(component),"); + + // Write method body / expression, and arguments to javaScript.Invoke* + foreach (var (ai, parameter) in method.ParameterDefinitions.Select()) + { + var isGenericType = parameter.IsGenericParameter(method.RawName, options); + if (ai.IsLast) + { + builder.AppendRaw($"{parameter.ToArgumentString(isGenericType)});"); + + if (!index.IsLast) builder.AppendLine(); + } + else + { + builder.AppendRaw($"{parameter.ToArgumentString(isGenericType)},"); + } + } + + builder.DecreaseIndentation(); + } + + builder.AppendTripleSlashInheritdocComments(builder.InterfaceName, memberName) + .AppendRaw( + $"{details.ReturnType} {builder.InterfaceName}.{details.CSharpMethodName}{details.Suffix}(", + postIncreaseIndentation: true); + + if (method.ParameterDefinitions.Count > 0) + { + foreach (var (pi, parameter) in method.ParameterDefinitions.Select()) + { + if (pi.IsLast) + { + builder.AppendRaw($"{parameter.ToActionString(false, true)})"); + builder.AppendOpeningCurlyBrace(); + } + else + { + builder.AppendRaw($"{parameter.ToActionString(false, true)},"); + } + } + + foreach (var parameter in method.ParameterDefinitions) + { + var isGenericType = parameter.IsGenericParameter(method.RawName, options); + var arg = parameter.ToArgumentString(isGenericType, true); + var fieldName = + builder.Fields?.FirstOrDefault(field => field.EndsWith(parameter.RawName)); + + if (fieldName is null) continue; + builder.AppendRaw($"{fieldName} = {arg};"); + } + + if (details.IsVoid) + { + var returnExpression = options.IsWebAssembly ? "" : "return "; + builder.AppendRaw($"{returnExpression}_javaScript.InvokeVoid{details.Suffix}("); + } + else + { + builder.AppendRaw($"return _javaScript.Invoke{details.Suffix}<{details.BareType}>("); + } + + builder.IncreaseIndentation() + .AppendRaw($"\"{details.FullyQualifiedJavaScriptIdentifier}\","); + + // Write method body / expression, and arguments to javaScript.Invoke* + foreach (var (ai, parameter) in method.ParameterDefinitions.Select()) + { + if (ai.IsFirst) + { + builder.AppendRaw($"DotNetObjectReference.Create(this),"); + } + + var isGenericType = parameter.IsGenericParameter(method.RawName, options); + var arg = parameter.ToArgumentString(isGenericType, true); + var methodName = + builder.Methods?.FirstOrDefault( + method => method.EndsWith(arg.Substring(2))); + var argExpression = methodName is not null ? $"nameof({methodName})" : arg; + if (ai.IsLast) + { + builder.AppendRaw($"{argExpression});"); + builder.AppendClosingCurlyBrace(); + + if (!index.IsLast) builder.AppendLine(); + } + else + { + builder.AppendRaw($"{argExpression},"); + } + } + + builder.DecreaseIndentation(); + } + } + } + + // Properties + foreach (var (index, property) in (Properties ?? new List()).Select()) + { + if (index.IsFirst) builder.AppendLine(); + if (property.IsIndexer) continue; + + builder.ResetIndentiationTo(methodLevel); + + var details = PropertyBuilderDetails.Create(property, options); + + builder.AppendTripleSlashInheritdocComments(builder.InterfaceName, details.CSharpPropertyName) + .AppendRaw($"{details.ReturnType} {builder.InterfaceName}.{details.CSharpPropertyName} =>", postIncreaseIndentation: true) + .AppendRaw($"_javaScript.Invoke{details.Suffix}{details.GenericTypeArgs}(", postIncreaseIndentation: true) + .AppendRaw($"\"eval\", \"{details.FullyQualifiedJavaScriptIdentifier}\");"); + + if (!index.IsLast) + { + builder.AppendLine(); + } + } + + builder.ResetIndentiationTo(0); + builder.AppendClosingCurlyBrace(); + + var implementation = TryFormatCSharpSourceText(builder.ToSourceCodeString()); + return implementation; + } + + internal string ToServiceCollectionExtensions( + GeneratorOptions options, + string implementation) + { + var serviceLifetime = options.IsWebAssembly + ? "Singleton" + : "Scoped"; + var addExpression = options.IsWebAssembly + ? $@"services.Add{serviceLifetime}(serviceProvider => + (IJSInProcessRuntime)serviceProvider.GetRequiredService()) + " + : "services"; + + var @interface = options.Implementation.ToInterfaceName(); + var nonService = options.Implementation.ToImplementationName(false); + + var extensions = $@"// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License: +// https://github.com/IEvangelist/blazorators/blob/main/LICENSE +// Auto-generated by blazorators. + +using Microsoft.JSInterop; + +namespace Microsoft.Extensions.DependencyInjection; + +/// +public static class {nonService}ServiceCollectionExtensions +{{ + /// + /// Adds the service to the service collection. + /// + public static IServiceCollection Add{nonService}Services( + this IServiceCollection services) => + {addExpression}.Add{serviceLifetime}<{@interface}, {implementation}>(); +}} +"; + + return extensions; + } + + static string TryFormatCSharpSourceText(string csharpSourceText) + { + try + { + return CSharpSyntaxTree.ParseText(csharpSourceText) + .GetRoot() + .NormalizeWhitespace() + .ToFullString(); + } + catch (Exception ex) + { + Console.WriteLine(ex); + + return csharpSourceText; + } + } +} diff --git a/src/Blazor.SourceGenerators/CSharp/CSharpType.cs b/src/Blazor.SourceGenerators/CSharp/CSharpType.cs index 011e065..c922f13 100644 --- a/src/Blazor.SourceGenerators/CSharp/CSharpType.cs +++ b/src/Blazor.SourceGenerators/CSharp/CSharpType.cs @@ -1,105 +1,105 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -using Blazor.SourceGenerators.Builders; - -namespace Blazor.SourceGenerators.CSharp; - -internal record CSharpType( - string RawName, - string RawTypeName, - bool IsNullable = false, - CSharpAction? ActionDeclation = null) : ICSharpDependencyGraphObject -{ - public Dictionary DependentTypes - { - get - { - Dictionary result = new(StringComparer.OrdinalIgnoreCase); - foreach (var prop in ActionDeclation?.DependentTypes - ?? Enumerable.Empty>()) - { - result[prop.Key] = prop.Value; - } - - if (ActionDeclation is { ParameterDefinitions.Count: > 0 }) - { - foreach (var type in ActionDeclation.ParameterDefinitions) - { - foreach (var pair - in type.DependentTypes.SelectMany( - dt => dt.Value.AllDependentTypes)) - { - result[pair.TypeName] = pair.Object; - } - } - } - - return result; - } - } - - public IImmutableSet<(string TypeName, CSharpObject Object)> AllDependentTypes => - DependentTypes - .SelectMany(kvp => kvp.Value.AllDependentTypes) - .ToImmutableHashSet(); - - /// - /// Gets a string representation of the C# type as a parameter declaration. For example, - /// "DateTime date" might be returned from a with - /// "date" as its and "DateTime" - /// as its . - /// - public string ToParameterString(bool isGenericType = false, bool overrideNullability = false) - { - if (isGenericType) - { - return IsNullable - ? $"{MethodBuilderDetails.GenericTypeValue}? {ToArgumentString()}" - : $"{MethodBuilderDetails.GenericTypeValue} {ToArgumentString()}"; - } - - var isCallback = ActionDeclation is not null; - var typeName = TypeMap.PrimitiveTypes.IsPrimitiveType(RawTypeName) - ? TypeMap.PrimitiveTypes[RawTypeName] - : isCallback - ? "string" // When the action is a callback, we require `T` instance and callback names. - : RawTypeName; - - var parameterName = ToArgumentString(); - var parameterDefault = overrideNullability ? "" : " = null"; - - return IsNullable - ? $"{typeName}? {parameterName}{parameterDefault}" - : $"{typeName} {parameterName}"; - } - - public string ToActionString(bool isGenericType = false, bool overrideNullability = false) - { - if (ActionDeclation is not null) - { - var parameterName = ToArgumentString(asDelegate: true); - var dependentTypes = ActionDeclation.DependentTypes.Keys; - var parameterDefault = overrideNullability ? "" : " = null"; - - return IsNullable - ? $"Action<{string.Join(", ", dependentTypes)}>? {parameterName}{parameterDefault}" - : $"Action<{string.Join(", ", dependentTypes)}> {parameterName}"; - } - - return ToParameterString(isGenericType, overrideNullability); - } - - public string ToArgumentString(bool toJson = false, bool asDelegate = false) - { - var isCallback = ActionDeclation is not null; - var suffix = asDelegate ? "" : "MethodName"; - var parameterName = isCallback - ? $"on{RawName.CapitalizeFirstLetter()}{suffix}" - : RawName.LowerCaseFirstLetter(); - - return toJson - ? $"{parameterName}.ToJson(options)" - : parameterName; - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using Blazor.SourceGenerators.Builders; + +namespace Blazor.SourceGenerators.CSharp; + +internal record CSharpType( + string RawName, + string RawTypeName, + bool IsNullable = false, + CSharpAction? ActionDeclation = null) : ICSharpDependencyGraphObject +{ + public Dictionary DependentTypes + { + get + { + Dictionary result = new(StringComparer.OrdinalIgnoreCase); + foreach (var prop in ActionDeclation?.DependentTypes + ?? Enumerable.Empty>()) + { + result[prop.Key] = prop.Value; + } + + if (ActionDeclation is { ParameterDefinitions.Count: > 0 }) + { + foreach (var type in ActionDeclation.ParameterDefinitions) + { + foreach (var pair + in type.DependentTypes.SelectMany( + dt => dt.Value.AllDependentTypes)) + { + result[pair.TypeName] = pair.Object; + } + } + } + + return result; + } + } + + public IImmutableSet<(string TypeName, CSharpObject Object)> AllDependentTypes => + DependentTypes + .SelectMany(kvp => kvp.Value.AllDependentTypes) + .ToImmutableHashSet(); + + /// + /// Gets a string representation of the C# type as a parameter declaration. For example, + /// "DateTime date" might be returned from a with + /// "date" as its and "DateTime" + /// as its . + /// + public string ToParameterString(bool isGenericType = false, bool overrideNullability = false) + { + if (isGenericType) + { + return IsNullable + ? $"{MethodBuilderDetails.GenericTypeValue}? {ToArgumentString()}" + : $"{MethodBuilderDetails.GenericTypeValue} {ToArgumentString()}"; + } + + var isCallback = ActionDeclation is not null; + var typeName = TypeMap.PrimitiveTypes.IsPrimitiveType(RawTypeName) + ? TypeMap.PrimitiveTypes[RawTypeName] + : isCallback + ? "string" // When the action is a callback, we require `T` instance and callback names. + : RawTypeName; + + var parameterName = ToArgumentString(); + var parameterDefault = overrideNullability ? "" : " = null"; + + return IsNullable + ? $"{typeName}? {parameterName}{parameterDefault}" + : $"{typeName} {parameterName}"; + } + + public string ToActionString(bool isGenericType = false, bool overrideNullability = false) + { + if (ActionDeclation is not null) + { + var parameterName = ToArgumentString(asDelegate: true); + var dependentTypes = ActionDeclation.DependentTypes.Keys; + var parameterDefault = overrideNullability ? "" : " = null"; + + return IsNullable + ? $"Action<{string.Join(", ", dependentTypes)}>? {parameterName}{parameterDefault}" + : $"Action<{string.Join(", ", dependentTypes)}> {parameterName}"; + } + + return ToParameterString(isGenericType, overrideNullability); + } + + public string ToArgumentString(bool toJson = false, bool asDelegate = false) + { + var isCallback = ActionDeclation is not null; + var suffix = asDelegate ? "" : "MethodName"; + var parameterName = isCallback + ? $"on{RawName.CapitalizeFirstLetter()}{suffix}" + : RawName.LowerCaseFirstLetter(); + + return toJson + ? $"{parameterName}.ToJson(options)" + : parameterName; + } +} diff --git a/src/Blazor.SourceGenerators/CSharp/ICSharpDependencyGraphObject.cs b/src/Blazor.SourceGenerators/CSharp/ICSharpDependencyGraphObject.cs index 2d0c19a..6ff1882 100644 --- a/src/Blazor.SourceGenerators/CSharp/ICSharpDependencyGraphObject.cs +++ b/src/Blazor.SourceGenerators/CSharp/ICSharpDependencyGraphObject.cs @@ -1,11 +1,11 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.CSharp; - -internal interface ICSharpDependencyGraphObject -{ - Dictionary DependentTypes { get; } - - IImmutableSet<(string TypeName, CSharpObject Object)> AllDependentTypes { get; } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.CSharp; + +internal interface ICSharpDependencyGraphObject +{ + Dictionary DependentTypes { get; } + + IImmutableSet<(string TypeName, CSharpObject Object)> AllDependentTypes { get; } +} diff --git a/src/Blazor.SourceGenerators/Compat.cs b/src/Blazor.SourceGenerators/Compat.cs index fcedac9..ce4ff5d 100644 --- a/src/Blazor.SourceGenerators/Compat.cs +++ b/src/Blazor.SourceGenerators/Compat.cs @@ -1,9 +1,9 @@ -//// Copyright (c) David Pine. All rights reserved. -//// Licensed under the MIT License. - -using System.ComponentModel; - -namespace System.Runtime.CompilerServices; - -[EditorBrowsable(EditorBrowsableState.Never)] -internal class IsExternalInit { } +//// Copyright (c) David Pine. All rights reserved. +//// Licensed under the MIT License. + +using System.ComponentModel; + +namespace System.Runtime.CompilerServices; + +[EditorBrowsable(EditorBrowsableState.Never)] +internal class IsExternalInit { } diff --git a/src/Blazor.SourceGenerators/Diagnostics/Descriptors.cs b/src/Blazor.SourceGenerators/Diagnostics/Descriptors.cs index 3b1ed58..7236404 100644 --- a/src/Blazor.SourceGenerators/Diagnostics/Descriptors.cs +++ b/src/Blazor.SourceGenerators/Diagnostics/Descriptors.cs @@ -1,39 +1,39 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Diagnostics; - -static class Descriptors -{ - internal static readonly DiagnosticDescriptor TypeNameRequiredDiagnostic = new( - "BR0001", - "The TypeName is required to source generator JavaScript interop", - "JSAutoInteropAttribute must provide a 'TypeName', as it is required to source generate JavaScript interop extensions", - "Blazorators.JSAutoInteropAttribute", - DiagnosticSeverity.Error, - true); - - internal static readonly DiagnosticDescriptor PathFromWindowRequiredDiagnostic = new( - "BR0002", - "The Implementation is required to source generator JavaScript interop", - "JSAutoInteropAttribute must provide a 'Implementation', as it is required to source generate JavaScript interop extensions", - "Blazorators.JSAutoInteropAttribute", - DiagnosticSeverity.Error, - true); - - internal static readonly DiagnosticDescriptor UnableToParseGeneratorOptionsDiagnostic = new( - "BR0003", - "The GeneratorOptions required for source generation are unresolvable", - "JSAutoGenericInteropAttribute must provide the fully qualified 'Descriptors' type name.", - "Blazorators.JSAutoGenericInteropAttribute", - DiagnosticSeverity.Error, - true); - - internal static readonly DiagnosticDescriptor MissingBlazorSerializationPackageReferenceDiagnostic = new( - "BR0004", - "Missing package reference of Blazor.Serialization", - "When using JSAutoGenericInteropAttribute you must reference Blazor.Serialization.", - "Blazorators.JSAutoGenericInteropAttribute", - DiagnosticSeverity.Error, - true); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Diagnostics; + +static class Descriptors +{ + internal static readonly DiagnosticDescriptor TypeNameRequiredDiagnostic = new( + "BR0001", + "The TypeName is required to source generator JavaScript interop", + "JSAutoInteropAttribute must provide a 'TypeName', as it is required to source generate JavaScript interop extensions", + "Blazorators.JSAutoInteropAttribute", + DiagnosticSeverity.Error, + true); + + internal static readonly DiagnosticDescriptor PathFromWindowRequiredDiagnostic = new( + "BR0002", + "The Implementation is required to source generator JavaScript interop", + "JSAutoInteropAttribute must provide a 'Implementation', as it is required to source generate JavaScript interop extensions", + "Blazorators.JSAutoInteropAttribute", + DiagnosticSeverity.Error, + true); + + internal static readonly DiagnosticDescriptor UnableToParseGeneratorOptionsDiagnostic = new( + "BR0003", + "The GeneratorOptions required for source generation are unresolvable", + "JSAutoGenericInteropAttribute must provide the fully qualified 'Descriptors' type name.", + "Blazorators.JSAutoGenericInteropAttribute", + DiagnosticSeverity.Error, + true); + + internal static readonly DiagnosticDescriptor MissingBlazorSerializationPackageReferenceDiagnostic = new( + "BR0004", + "Missing package reference of Blazor.Serialization", + "When using JSAutoGenericInteropAttribute you must reference Blazor.Serialization.", + "Blazorators.JSAutoGenericInteropAttribute", + DiagnosticSeverity.Error, + true); +} diff --git a/src/Blazor.SourceGenerators/Expressions/SharedRegex.cs b/src/Blazor.SourceGenerators/Expressions/SharedRegex.cs index 9272cce..17597af 100644 --- a/src/Blazor.SourceGenerators/Expressions/SharedRegex.cs +++ b/src/Blazor.SourceGenerators/Expressions/SharedRegex.cs @@ -1,54 +1,54 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Expressions; - -internal static class SharedRegex -{ - // See: https://regex101.com/r/GV3DiG/1 - public static readonly Regex InterfaceRegex = - new("^(?'declaration'interface.*?{.*?})$", - RegexOptions.Singleline | RegexOptions.Multiline); - - public static readonly Regex InterfaceTypeNameRegex = - new("(?:interface )(?'TypeName'\\S+)"); - - public static readonly Regex ExtendsTypeNameRegex = - new("(?:extends )(?'TypeName'\\S+)"); - - public static readonly Regex TypeRegex = - new("^(?'type'type.*?)$", - RegexOptions.Singleline | RegexOptions.Multiline); - - public static readonly Regex TypeNameRegex = - new("(?:type )(?'TypeName'\\S+)"); - - /// - /// Given a string value of "clearWatch(watchId: number): void;", the - /// following capture groups would be present: - /// - /// MethodName: "clearWatch" - /// Parameters: "(watchId: number)" - /// ReturnType: ": void;" - /// - /// - public static readonly Regex TypeScriptMethodRegex = - new(@"^(?'MethodName'\S+(?=\())(?'Parameters'.*\))(?'ReturnType'\:.*)$", RegexOptions.Multiline); - - /// - /// Given a string value of "(position: GeolocationPosition): void;", the - /// following capture groups would be present: - /// - /// Parameters: "(position: GeolocationPosition" - /// ReturnType: ": void;" - /// - /// - public static readonly Regex TypeScriptCallbackRegex = - new(@"^(?'Parameters'\(.*\))(?'ReturnType'\:.*)$", RegexOptions.Multiline); - - public static readonly Regex TypeScriptPropertyRegex = - new(@"^(?'Name'.*)\:(?:.{1})(?'Type'.*)\;$", RegexOptions.Multiline); - - public static readonly Regex ArrayValuesRegex = - new(@"\[(?'Values'[^[\]]*)\]", RegexOptions.Multiline); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Expressions; + +internal static class SharedRegex +{ + // See: https://regex101.com/r/GV3DiG/1 + public static readonly Regex InterfaceRegex = + new("^(?'declaration'interface.*?{.*?})$", + RegexOptions.Singleline | RegexOptions.Multiline); + + public static readonly Regex InterfaceTypeNameRegex = + new("(?:interface )(?'TypeName'\\S+)"); + + public static readonly Regex ExtendsTypeNameRegex = + new("(?:extends )(?'TypeName'\\S+)"); + + public static readonly Regex TypeRegex = + new("^(?'type'type.*?)$", + RegexOptions.Singleline | RegexOptions.Multiline); + + public static readonly Regex TypeNameRegex = + new("(?:type )(?'TypeName'\\S+)"); + + /// + /// Given a string value of "clearWatch(watchId: number): void;", the + /// following capture groups would be present: + /// + /// MethodName: "clearWatch" + /// Parameters: "(watchId: number)" + /// ReturnType: ": void;" + /// + /// + public static readonly Regex TypeScriptMethodRegex = + new(@"^(?'MethodName'\S+(?=\())(?'Parameters'.*\))(?'ReturnType'\:.*)$", RegexOptions.Multiline); + + /// + /// Given a string value of "(position: GeolocationPosition): void;", the + /// following capture groups would be present: + /// + /// Parameters: "(position: GeolocationPosition" + /// ReturnType: ": void;" + /// + /// + public static readonly Regex TypeScriptCallbackRegex = + new(@"^(?'Parameters'\(.*\))(?'ReturnType'\:.*)$", RegexOptions.Multiline); + + public static readonly Regex TypeScriptPropertyRegex = + new(@"^(?'Name'.*)\:(?:.{1})(?'Type'.*)\;$", RegexOptions.Multiline); + + public static readonly Regex ArrayValuesRegex = + new(@"\[(?'Values'[^[\]]*)\]", RegexOptions.Multiline); +} diff --git a/src/Blazor.SourceGenerators/Extensions/AttributeSyntaxExtensions.cs b/src/Blazor.SourceGenerators/Extensions/AttributeSyntaxExtensions.cs index ba562d3..be04fe0 100644 --- a/src/Blazor.SourceGenerators/Extensions/AttributeSyntaxExtensions.cs +++ b/src/Blazor.SourceGenerators/Extensions/AttributeSyntaxExtensions.cs @@ -1,94 +1,94 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Extensions; - -static class AttributeSyntaxExtensions -{ - internal static GeneratorOptions GetGeneratorOptions( - this AttributeSyntax attribute, - bool supportsGenerics) - { - GeneratorOptions options = new(supportsGenerics); - if (attribute is { ArgumentList: not null }) - { - var removeQuotes = static string (string value) => value.Replace("\"", ""); - - foreach (var arg in attribute.ArgumentList.Arguments) - { - var propName = arg.NameEquals?.Name?.ToString(); - options = propName switch - { - nameof(options.TypeName) => options with - { - TypeName = removeQuotes(arg.Expression.ToString()) - }, - nameof(options.Implementation) => options with - { - Implementation = removeQuotes(arg.Expression.ToString()) - }, - nameof(options.OnlyGeneratePureJS) => options with - { - OnlyGeneratePureJS = bool.Parse(arg.Expression.ToString()) - }, - nameof(options.Url) => options with - { - Url = removeQuotes(arg.Expression.ToString()) - }, - "HostingModel" => options with - { - IsWebAssembly = arg.Expression.ToString().Contains("WebAssembly") - }, - nameof(options.GenericMethodDescriptors) => options with - { - GenericMethodDescriptors = ParseArray(arg.Expression.ToString()) - }, - nameof(options.PureJavaScriptOverrides) => options with - { - PureJavaScriptOverrides = ParseArray(arg.Expression.ToString()) - }, - nameof(options.TypeDeclarationSources) => options with - { - TypeDeclarationSources = ParseArray(arg.Expression.ToString()) - }, - - _ => options - }; - } - } - - return options; - } - - static string[]? ParseArray(string args) - { - var replacedArgs = args - .Replace("new[]", "") - .Replace("new []", "") - .Replace("new string[]", "") - .Replace("new string []", "") - .Replace("{", "[") - .Replace("}", "]"); - - var values = SharedRegex.ArrayValuesRegex - .GetMatchGroupValue(replacedArgs, "Values"); - - if (values is not null) - { - var trimmed = values.Trim(); - var descriptors = trimmed.Split(','); - - return descriptors - .Select(descriptor => - { - descriptor = descriptor - .Replace("\"", "") - .Trim(); - return descriptor; - }) - .ToArray(); - } - - return default; - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Extensions; + +static class AttributeSyntaxExtensions +{ + internal static GeneratorOptions GetGeneratorOptions( + this AttributeSyntax attribute, + bool supportsGenerics) + { + GeneratorOptions options = new(supportsGenerics); + if (attribute is { ArgumentList: not null }) + { + var removeQuotes = static string (string value) => value.Replace("\"", ""); + + foreach (var arg in attribute.ArgumentList.Arguments) + { + var propName = arg.NameEquals?.Name?.ToString(); + options = propName switch + { + nameof(options.TypeName) => options with + { + TypeName = removeQuotes(arg.Expression.ToString()) + }, + nameof(options.Implementation) => options with + { + Implementation = removeQuotes(arg.Expression.ToString()) + }, + nameof(options.OnlyGeneratePureJS) => options with + { + OnlyGeneratePureJS = bool.Parse(arg.Expression.ToString()) + }, + nameof(options.Url) => options with + { + Url = removeQuotes(arg.Expression.ToString()) + }, + "HostingModel" => options with + { + IsWebAssembly = arg.Expression.ToString().Contains("WebAssembly") + }, + nameof(options.GenericMethodDescriptors) => options with + { + GenericMethodDescriptors = ParseArray(arg.Expression.ToString()) + }, + nameof(options.PureJavaScriptOverrides) => options with + { + PureJavaScriptOverrides = ParseArray(arg.Expression.ToString()) + }, + nameof(options.TypeDeclarationSources) => options with + { + TypeDeclarationSources = ParseArray(arg.Expression.ToString()) + }, + + _ => options + }; + } + } + + return options; + } + + static string[]? ParseArray(string args) + { + var replacedArgs = args + .Replace("new[]", "") + .Replace("new []", "") + .Replace("new string[]", "") + .Replace("new string []", "") + .Replace("{", "[") + .Replace("}", "]"); + + var values = SharedRegex.ArrayValuesRegex + .GetMatchGroupValue(replacedArgs, "Values"); + + if (values is not null) + { + var trimmed = values.Trim(); + var descriptors = trimmed.Split(','); + + return descriptors + .Select(descriptor => + { + descriptor = descriptor + .Replace("\"", "") + .Trim(); + return descriptor; + }) + .ToArray(); + } + + return default; + } +} diff --git a/src/Blazor.SourceGenerators/Extensions/CSharpDependencyGraphExtensions.cs b/src/Blazor.SourceGenerators/Extensions/CSharpDependencyGraphExtensions.cs index 4ed77a7..8e4d238 100644 --- a/src/Blazor.SourceGenerators/Extensions/CSharpDependencyGraphExtensions.cs +++ b/src/Blazor.SourceGenerators/Extensions/CSharpDependencyGraphExtensions.cs @@ -1,23 +1,23 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Extensions; - -internal static class CSharpDependencyGraphExtensions -{ - internal static IImmutableSet<(string TypeName, CSharpObject Object)> GetAllDependencies( - this ICSharpDependencyGraphObject dependencyGraphObject) - { - Dictionary map = new(StringComparer.OrdinalIgnoreCase); - foreach (var kvp - in dependencyGraphObject.DependentTypes?.Flatten( - obj => obj.Value.DependentTypes) - ?? Enumerable.Empty>()) - { - map[kvp.Key] = kvp.Value; - } - - return map.Select(kvp => (kvp.Key, kvp.Value)) - .ToImmutableHashSet(); - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Extensions; + +internal static class CSharpDependencyGraphExtensions +{ + internal static IImmutableSet<(string TypeName, CSharpObject Object)> GetAllDependencies( + this ICSharpDependencyGraphObject dependencyGraphObject) + { + Dictionary map = new(StringComparer.OrdinalIgnoreCase); + foreach (var kvp + in dependencyGraphObject.DependentTypes?.Flatten( + obj => obj.Value.DependentTypes) + ?? Enumerable.Empty>()) + { + map[kvp.Key] = kvp.Value; + } + + return map.Select(kvp => (kvp.Key, kvp.Value)) + .ToImmutableHashSet(); + } +} diff --git a/src/Blazor.SourceGenerators/Extensions/CSharpMethodExtensions.cs b/src/Blazor.SourceGenerators/Extensions/CSharpMethodExtensions.cs index f471743..e0113b9 100644 --- a/src/Blazor.SourceGenerators/Extensions/CSharpMethodExtensions.cs +++ b/src/Blazor.SourceGenerators/Extensions/CSharpMethodExtensions.cs @@ -1,92 +1,92 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -using Blazor.SourceGenerators.Builders; - -namespace Blazor.SourceGenerators.Extensions; - -internal static class CSharpMethodExtensions -{ - internal static bool IsJavaScriptOverride(this CSharpMethod method, GeneratorOptions options) - { - var methodName = method.RawName.LowerCaseFirstLetter(); - return options?.PureJavaScriptOverrides - ?.Any(overriddenMethodName => overriddenMethodName == methodName) - ?? false; - } - - internal static bool IsGenericReturnType(this CSharpMethod method, GeneratorOptions options) => - options.GenericMethodDescriptors - ?.Any(descriptor => - { - // If the descriptor describes a parameter, it's not a generic return. - // TODO: consider APIs that might do this. - if (descriptor.Contains(":")) - { - return false; - } - - // If the descriptor is the method name - return descriptor == method.RawName; - }) - ?? false; - - internal static bool IsGenericParameter(string methodName, CSharpType parameter, GeneratorOptions options) => - options.GenericMethodDescriptors - ?.Any(descriptor => - { - if (!descriptor.StartsWith(methodName)) - { - return false; - } - - if (descriptor.Contains(":")) - { - var nameParamPair = descriptor.Split(':'); - return nameParamPair[1].StartsWith(parameter.RawName); - } - - return false; - }) - ?? false; - - internal static (string ReturnType, string BareType) GetMethodTypes( - this CSharpMethod method, GeneratorOptions options, bool isGenericReturnType, bool isPrimitiveType) - { - var primitiveType = isPrimitiveType - ? TypeMap.PrimitiveTypes[method.RawReturnTypeName] - : method.RawReturnTypeName; - - if (!method.IsVoid && isGenericReturnType) - { - var nullable = - method.IsReturnTypeNullable ? "?" : ""; - - return options.IsWebAssembly - ? ($"{MethodBuilderDetails.GenericTypeValue}{nullable}", primitiveType) - : ($"ValueTask<{MethodBuilderDetails.GenericTypeValue}{nullable}>", primitiveType); - } - - var isJavaScriptOverride = method.IsJavaScriptOverride(options); - if (options.IsWebAssembly && !isJavaScriptOverride) - { - var returnType = isPrimitiveType - ? primitiveType - : method.IsVoid - ? "void" - : method.RawReturnTypeName; - - return (returnType, primitiveType); - } - else - { - var returnType = isPrimitiveType - ? $"ValueTask<{primitiveType}>" - : method.IsVoid - ? "ValueTask" - : $"ValueTask<{method.RawReturnTypeName}>"; - - return (returnType, primitiveType); - } - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using Blazor.SourceGenerators.Builders; + +namespace Blazor.SourceGenerators.Extensions; + +internal static class CSharpMethodExtensions +{ + internal static bool IsJavaScriptOverride(this CSharpMethod method, GeneratorOptions options) + { + var methodName = method.RawName.LowerCaseFirstLetter(); + return options?.PureJavaScriptOverrides + ?.Any(overriddenMethodName => overriddenMethodName == methodName) + ?? false; + } + + internal static bool IsGenericReturnType(this CSharpMethod method, GeneratorOptions options) => + options.GenericMethodDescriptors + ?.Any(descriptor => + { + // If the descriptor describes a parameter, it's not a generic return. + // TODO: consider APIs that might do this. + if (descriptor.Contains(":")) + { + return false; + } + + // If the descriptor is the method name + return descriptor == method.RawName; + }) + ?? false; + + internal static bool IsGenericParameter(string methodName, CSharpType parameter, GeneratorOptions options) => + options.GenericMethodDescriptors + ?.Any(descriptor => + { + if (!descriptor.StartsWith(methodName)) + { + return false; + } + + if (descriptor.Contains(":")) + { + var nameParamPair = descriptor.Split(':'); + return nameParamPair[1].StartsWith(parameter.RawName); + } + + return false; + }) + ?? false; + + internal static (string ReturnType, string BareType) GetMethodTypes( + this CSharpMethod method, GeneratorOptions options, bool isGenericReturnType, bool isPrimitiveType) + { + var primitiveType = isPrimitiveType + ? TypeMap.PrimitiveTypes[method.RawReturnTypeName] + : method.RawReturnTypeName; + + if (!method.IsVoid && isGenericReturnType) + { + var nullable = + method.IsReturnTypeNullable ? "?" : ""; + + return options.IsWebAssembly + ? ($"{MethodBuilderDetails.GenericTypeValue}{nullable}", primitiveType) + : ($"ValueTask<{MethodBuilderDetails.GenericTypeValue}{nullable}>", primitiveType); + } + + var isJavaScriptOverride = method.IsJavaScriptOverride(options); + if (options.IsWebAssembly && !isJavaScriptOverride) + { + var returnType = isPrimitiveType + ? primitiveType + : method.IsVoid + ? "void" + : method.RawReturnTypeName; + + return (returnType, primitiveType); + } + else + { + var returnType = isPrimitiveType + ? $"ValueTask<{primitiveType}>" + : method.IsVoid + ? "ValueTask" + : $"ValueTask<{method.RawReturnTypeName}>"; + + return (returnType, primitiveType); + } + } +} diff --git a/src/Blazor.SourceGenerators/Extensions/CSharpPropertyExtensions.cs b/src/Blazor.SourceGenerators/Extensions/CSharpPropertyExtensions.cs index 2023649..87e032a 100644 --- a/src/Blazor.SourceGenerators/Extensions/CSharpPropertyExtensions.cs +++ b/src/Blazor.SourceGenerators/Extensions/CSharpPropertyExtensions.cs @@ -1,15 +1,15 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Extensions; - -internal static class CSharpPropertyExtensions -{ - internal static (string ReturnType, string BareType) GetPropertyTypes( - this CSharpProperty property, GeneratorOptions options) - { - return ( - ReturnType: options.IsWebAssembly ? property.MappedTypeName : $"ValueTask<{property.MappedTypeName}>", - BareType: property.MappedTypeName); - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Extensions; + +internal static class CSharpPropertyExtensions +{ + internal static (string ReturnType, string BareType) GetPropertyTypes( + this CSharpProperty property, GeneratorOptions options) + { + return ( + ReturnType: options.IsWebAssembly ? property.MappedTypeName : $"ValueTask<{property.MappedTypeName}>", + BareType: property.MappedTypeName); + } +} diff --git a/src/Blazor.SourceGenerators/Extensions/CSharpTypeExtensions.cs b/src/Blazor.SourceGenerators/Extensions/CSharpTypeExtensions.cs index 02036d7..2461d8a 100644 --- a/src/Blazor.SourceGenerators/Extensions/CSharpTypeExtensions.cs +++ b/src/Blazor.SourceGenerators/Extensions/CSharpTypeExtensions.cs @@ -1,26 +1,26 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Extensions; - -internal static class CSharpTypeExtensions -{ - internal static bool IsGenericParameter(this CSharpType parameter, string methodName, GeneratorOptions options) => - options.GenericMethodDescriptors - ?.Any(descriptor => - { - if (!descriptor.StartsWith(methodName)) - { - return false; - } - - if (descriptor.Contains(":")) - { - var nameParamPair = descriptor.Split(':'); - return nameParamPair[1].StartsWith(parameter.RawName); - } - - return false; - }) - ?? false; -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Extensions; + +internal static class CSharpTypeExtensions +{ + internal static bool IsGenericParameter(this CSharpType parameter, string methodName, GeneratorOptions options) => + options.GenericMethodDescriptors + ?.Any(descriptor => + { + if (!descriptor.StartsWith(methodName)) + { + return false; + } + + if (descriptor.Contains(":")) + { + var nameParamPair = descriptor.Split(':'); + return nameParamPair[1].StartsWith(parameter.RawName); + } + + return false; + }) + ?? false; +} diff --git a/src/Blazor.SourceGenerators/Extensions/EnumerableExtensions.cs b/src/Blazor.SourceGenerators/Extensions/EnumerableExtensions.cs index 4415e4c..f6a80c2 100644 --- a/src/Blazor.SourceGenerators/Extensions/EnumerableExtensions.cs +++ b/src/Blazor.SourceGenerators/Extensions/EnumerableExtensions.cs @@ -1,15 +1,15 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Extensions; - -internal static class EnumerableExtensions -{ - internal static IEnumerable Flatten( - this IEnumerable source, - Func> childSelector) => - source?.SelectMany( - child => childSelector(child).Flatten(childSelector)) - .Concat(source ?? Enumerable.Empty()) - ?? Enumerable.Empty(); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Extensions; + +internal static class EnumerableExtensions +{ + internal static IEnumerable Flatten( + this IEnumerable source, + Func> childSelector) => + source?.SelectMany( + child => childSelector(child).Flatten(childSelector)) + .Concat(source ?? Enumerable.Empty()) + ?? Enumerable.Empty(); +} diff --git a/src/Blazor.SourceGenerators/Extensions/GeneratorExecutionContextExtensions.cs b/src/Blazor.SourceGenerators/Extensions/GeneratorExecutionContextExtensions.cs index 03ec4a7..393438f 100644 --- a/src/Blazor.SourceGenerators/Extensions/GeneratorExecutionContextExtensions.cs +++ b/src/Blazor.SourceGenerators/Extensions/GeneratorExecutionContextExtensions.cs @@ -1,76 +1,76 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Extensions; - -internal static class GeneratorExecutionContextExtensions -{ - internal static GeneratorExecutionContext AddDependentTypesSource( - this GeneratorExecutionContext context, - CSharpTopLevelObject topLevelObject) - { - foreach (var (type, dependentObj) in - topLevelObject.AllDependentTypes.Where( - t => !t.Object.IsActionParameter)) - { - context.AddSource(type.ToGeneratedFileName(), - SourceText.From(dependentObj.ToString(), - Encoding.UTF8)); - } - - return context; - } - - internal static GeneratorExecutionContext AddInterfaceSource( - this GeneratorExecutionContext context, - CSharpTopLevelObject topLevelObject, - string @interface, - GeneratorOptions options, - string? @namespace) - { - context.AddSource( - $"{@interface}".ToGeneratedFileName(), - SourceText.From( - topLevelObject.ToInterfaceString( - options, - @namespace), - Encoding.UTF8)); - - return context; - } - - internal static GeneratorExecutionContext AddImplementationSource( - this GeneratorExecutionContext context, - CSharpTopLevelObject topLevelObject, - string implementation, - GeneratorOptions options, - string? @namespace) - { - context.AddSource( - $"{implementation}".ToGeneratedFileName(), - SourceText.From( - topLevelObject.ToImplementationString( - options, - @namespace), - Encoding.UTF8)); - - return context; - } - - internal static GeneratorExecutionContext AddDependencyInjectionExtensionsSource( - this GeneratorExecutionContext context, - CSharpTopLevelObject topLevelObject, - string implementation, - GeneratorOptions options) - { - context.AddSource( - $"{options.Implementation.ToImplementationName(false)}ServiceCollectionExtensions".ToGeneratedFileName(), - SourceText.From( - topLevelObject.ToServiceCollectionExtensions( - options, - implementation), - Encoding.UTF8)); - - return context; - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Extensions; + +internal static class GeneratorExecutionContextExtensions +{ + internal static GeneratorExecutionContext AddDependentTypesSource( + this GeneratorExecutionContext context, + CSharpTopLevelObject topLevelObject) + { + foreach (var (type, dependentObj) in + topLevelObject.AllDependentTypes.Where( + t => !t.Object.IsActionParameter)) + { + context.AddSource(type.ToGeneratedFileName(), + SourceText.From(dependentObj.ToString(), + Encoding.UTF8)); + } + + return context; + } + + internal static GeneratorExecutionContext AddInterfaceSource( + this GeneratorExecutionContext context, + CSharpTopLevelObject topLevelObject, + string @interface, + GeneratorOptions options, + string? @namespace) + { + context.AddSource( + $"{@interface}".ToGeneratedFileName(), + SourceText.From( + topLevelObject.ToInterfaceString( + options, + @namespace), + Encoding.UTF8)); + + return context; + } + + internal static GeneratorExecutionContext AddImplementationSource( + this GeneratorExecutionContext context, + CSharpTopLevelObject topLevelObject, + string implementation, + GeneratorOptions options, + string? @namespace) + { + context.AddSource( + $"{implementation}".ToGeneratedFileName(), + SourceText.From( + topLevelObject.ToImplementationString( + options, + @namespace), + Encoding.UTF8)); + + return context; + } + + internal static GeneratorExecutionContext AddDependencyInjectionExtensionsSource( + this GeneratorExecutionContext context, + CSharpTopLevelObject topLevelObject, + string implementation, + GeneratorOptions options) + { + context.AddSource( + $"{options.Implementation.ToImplementationName(false)}ServiceCollectionExtensions".ToGeneratedFileName(), + SourceText.From( + topLevelObject.ToServiceCollectionExtensions( + options, + implementation), + Encoding.UTF8)); + + return context; + } +} diff --git a/src/Blazor.SourceGenerators/Extensions/ListExtensions.cs b/src/Blazor.SourceGenerators/Extensions/ListExtensions.cs index e9535f4..4afc0e9 100644 --- a/src/Blazor.SourceGenerators/Extensions/ListExtensions.cs +++ b/src/Blazor.SourceGenerators/Extensions/ListExtensions.cs @@ -1,25 +1,25 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Extensions; - -static class ListExtensions -{ - internal static IEnumerable<(Interation Index, T Item)> Select(this List list) - { - var count = list.Count; - for (var i = 0; i < count; ++ i) - { - yield return (new(i, count), list[i]); - } - } -} - -readonly record struct Interation( - int Index, - int Count) -{ - internal bool IsFirst => Index is 0; - internal bool IsLast => Index == Count - 1; - internal bool HasMore => Index + 1 < Count; -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Extensions; + +static class ListExtensions +{ + internal static IEnumerable<(Interation Index, T Item)> Select(this List list) + { + var count = list.Count; + for (var i = 0; i < count; ++ i) + { + yield return (new(i, count), list[i]); + } + } +} + +readonly record struct Interation( + int Index, + int Count) +{ + internal bool IsFirst => Index is 0; + internal bool IsLast => Index == Count - 1; + internal bool HasMore => Index + 1 < Count; +} diff --git a/src/Blazor.SourceGenerators/Extensions/RegexExtensions.cs b/src/Blazor.SourceGenerators/Extensions/RegexExtensions.cs index 935e23f..74a15e7 100644 --- a/src/Blazor.SourceGenerators/Extensions/RegexExtensions.cs +++ b/src/Blazor.SourceGenerators/Extensions/RegexExtensions.cs @@ -1,21 +1,21 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Extensions; - -static class RegexExtensions -{ - internal static string? GetMatchGroupValue( - this Regex regex, string input, string groupName) => - regex.Match(input) is Match match - ? match.GetGroupValue(groupName) - : default; - - internal static string? GetGroupValue( - this Match match, string groupName) => - match switch - { - { Success: true } => match.Groups?[groupName]?.Value, - _ => default - }; -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Extensions; + +static class RegexExtensions +{ + internal static string? GetMatchGroupValue( + this Regex regex, string input, string groupName) => + regex.Match(input) is Match match + ? match.GetGroupValue(groupName) + : default; + + internal static string? GetGroupValue( + this Match match, string groupName) => + match switch + { + { Success: true } => match.Groups?[groupName]?.Value, + _ => default + }; +} diff --git a/src/Blazor.SourceGenerators/Extensions/StringExtensions.cs b/src/Blazor.SourceGenerators/Extensions/StringExtensions.cs index 2a8e573..a379902 100644 --- a/src/Blazor.SourceGenerators/Extensions/StringExtensions.cs +++ b/src/Blazor.SourceGenerators/Extensions/StringExtensions.cs @@ -1,33 +1,33 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Extensions; - -static class StringExtensions -{ - internal static string CapitalizeFirstLetter(this string name) => - $"{char.ToUpper(name[0])}{name.Substring(1, name.Length - 1)}"; - - internal static string LowerCaseFirstLetter(this string name) => - $"{char.ToLower(name[0])}{name.Substring(1, name.Length - 1)}"; - - internal static string ToGeneratedFileName(this string name) => $"{name}.g.cs"; - - internal static string ToImplementationName(this string implementation, bool isService = true) - { - var impl = (implementation.Contains(".") - ? implementation.Substring(implementation.LastIndexOf(".") + 1) - : implementation).CapitalizeFirstLetter(); - - return $"{impl}{(isService ? "Service" : "")}"; - } - - internal static string ToInterfaceName(this string implementation, bool isService = true) - { - var type = (implementation.Contains(".") - ? implementation.Substring(implementation.LastIndexOf(".") + 1) - : implementation).CapitalizeFirstLetter(); - - return $"I{type}{(isService ? "Service" : "")}"; - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Extensions; + +static class StringExtensions +{ + internal static string CapitalizeFirstLetter(this string name) => + $"{char.ToUpper(name[0])}{name.Substring(1, name.Length - 1)}"; + + internal static string LowerCaseFirstLetter(this string name) => + $"{char.ToLower(name[0])}{name.Substring(1, name.Length - 1)}"; + + internal static string ToGeneratedFileName(this string name) => $"{name}.g.cs"; + + internal static string ToImplementationName(this string implementation, bool isService = true) + { + var impl = (implementation.Contains(".") + ? implementation.Substring(implementation.LastIndexOf(".") + 1) + : implementation).CapitalizeFirstLetter(); + + return $"{impl}{(isService ? "Service" : "")}"; + } + + internal static string ToInterfaceName(this string implementation, bool isService = true) + { + var type = (implementation.Contains(".") + ? implementation.Substring(implementation.LastIndexOf(".") + 1) + : implementation).CapitalizeFirstLetter(); + + return $"I{type}{(isService ? "Service" : "")}"; + } +} diff --git a/src/Blazor.SourceGenerators/GlobalSuppressions.cs b/src/Blazor.SourceGenerators/GlobalSuppressions.cs index 439e95e..45ffada 100644 --- a/src/Blazor.SourceGenerators/GlobalSuppressions.cs +++ b/src/Blazor.SourceGenerators/GlobalSuppressions.cs @@ -1,34 +1,34 @@ -// This file is used by Code Analysis to maintain SuppressMessage -// attributes that are applied to this project. -// Project-level suppressions either have no target or are given -// a specific target and scoped to a namespace, type, member, etc. - -using System.Diagnostics.CodeAnalysis; - -[assembly: SuppressMessage( - "MicrosoftCodeAnalysisReleaseTracking", - "RS2008:Enable analyzer release tracking", - Justification = "", - Scope = "member", - Target = "~F:Blazor.SourceGenerators.JavaScriptInteropGenerator.s_typeNameRequiredDiagnostic")] - -[assembly: SuppressMessage( - "MicrosoftCodeAnalysisReleaseTracking", - "RS2008:Enable analyzer release tracking", - Justification = "", - Scope = "member", - Target = "~F:Blazor.SourceGenerators.JavaScriptInteropGenerator.s_pathFromWindowRequiredDiagnostic")] - -[assembly: SuppressMessage( - "Style", - "IDE0057:Use range operator", - Justification = "", - Scope = "member", - Target = "~M:Blazor.SourceGenerators.Extensions.StringExtensions.CapitalizeFirstLetter(System.String)~System.String")] - -[assembly: SuppressMessage("" + - "Style", - "IDE0057:Use range operator", - Justification = "", - Scope = "member", - Target = "~M:Blazor.SourceGenerators.Extensions.StringExtensions.LowerCaseFirstLetter(System.String)~System.String")] +// This file is used by Code Analysis to maintain SuppressMessage +// attributes that are applied to this project. +// Project-level suppressions either have no target or are given +// a specific target and scoped to a namespace, type, member, etc. + +using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage( + "MicrosoftCodeAnalysisReleaseTracking", + "RS2008:Enable analyzer release tracking", + Justification = "", + Scope = "member", + Target = "~F:Blazor.SourceGenerators.JavaScriptInteropGenerator.s_typeNameRequiredDiagnostic")] + +[assembly: SuppressMessage( + "MicrosoftCodeAnalysisReleaseTracking", + "RS2008:Enable analyzer release tracking", + Justification = "", + Scope = "member", + Target = "~F:Blazor.SourceGenerators.JavaScriptInteropGenerator.s_pathFromWindowRequiredDiagnostic")] + +[assembly: SuppressMessage( + "Style", + "IDE0057:Use range operator", + Justification = "", + Scope = "member", + Target = "~M:Blazor.SourceGenerators.Extensions.StringExtensions.CapitalizeFirstLetter(System.String)~System.String")] + +[assembly: SuppressMessage("" + + "Style", + "IDE0057:Use range operator", + Justification = "", + Scope = "member", + Target = "~M:Blazor.SourceGenerators.Extensions.StringExtensions.LowerCaseFirstLetter(System.String)~System.String")] diff --git a/src/Blazor.SourceGenerators/GlobalUsings.cs b/src/Blazor.SourceGenerators/GlobalUsings.cs index 45261ae..681d41a 100644 --- a/src/Blazor.SourceGenerators/GlobalUsings.cs +++ b/src/Blazor.SourceGenerators/GlobalUsings.cs @@ -1,21 +1,21 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -global using System.Collections.Concurrent; -global using System.Collections.Immutable; -global using System.Text; -global using System.Text.RegularExpressions; -global using Blazor.SourceGenerators.CSharp; -global using Blazor.SourceGenerators.Diagnostics; -global using Blazor.SourceGenerators.Expressions; -global using Blazor.SourceGenerators.Extensions; -global using Blazor.SourceGenerators.JavaScript; -global using Blazor.SourceGenerators.Parsers; -global using Blazor.SourceGenerators.Readers; -global using Blazor.SourceGenerators.Types; -global using Microsoft.CodeAnalysis; -global using Microsoft.CodeAnalysis.CSharp; -global using Microsoft.CodeAnalysis.CSharp.Syntax; -global using Microsoft.CodeAnalysis.Text; -global using static Blazor.SourceGenerators.Expressions.SharedRegex; -global using static Blazor.SourceGenerators.Source.SourceCode; +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +global using System.Collections.Concurrent; +global using System.Collections.Immutable; +global using System.Text; +global using System.Text.RegularExpressions; +global using Blazor.SourceGenerators.CSharp; +global using Blazor.SourceGenerators.Diagnostics; +global using Blazor.SourceGenerators.Expressions; +global using Blazor.SourceGenerators.Extensions; +global using Blazor.SourceGenerators.JavaScript; +global using Blazor.SourceGenerators.Parsers; +global using Blazor.SourceGenerators.Readers; +global using Blazor.SourceGenerators.Types; +global using Microsoft.CodeAnalysis; +global using Microsoft.CodeAnalysis.CSharp; +global using Microsoft.CodeAnalysis.CSharp.Syntax; +global using Microsoft.CodeAnalysis.Text; +global using static Blazor.SourceGenerators.Expressions.SharedRegex; +global using static Blazor.SourceGenerators.Source.SourceCode; diff --git a/src/Blazor.SourceGenerators/InterfaceDeclarationDetails.cs b/src/Blazor.SourceGenerators/InterfaceDeclarationDetails.cs index 2b9497b..7c11f9e 100644 --- a/src/Blazor.SourceGenerators/InterfaceDeclarationDetails.cs +++ b/src/Blazor.SourceGenerators/InterfaceDeclarationDetails.cs @@ -1,9 +1,9 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators; - -record class InterfaceDeclarationDetails( - GeneratorOptions Options, - InterfaceDeclarationSyntax InterfaceDeclaration, - AttributeSyntax InteropAttribute); +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators; + +record class InterfaceDeclarationDetails( + GeneratorOptions Options, + InterfaceDeclarationSyntax InterfaceDeclaration, + AttributeSyntax InteropAttribute); diff --git a/src/Blazor.SourceGenerators/Internals/Visibility.cs b/src/Blazor.SourceGenerators/Internals/Visibility.cs index bb505a7..87eea58 100644 --- a/src/Blazor.SourceGenerators/Internals/Visibility.cs +++ b/src/Blazor.SourceGenerators/Internals/Visibility.cs @@ -1,6 +1,6 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -using System.Runtime.CompilerServices; - +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using System.Runtime.CompilerServices; + [assembly: InternalsVisibleTo("Blazor.SourceGenerators.Tests")] \ No newline at end of file diff --git a/src/Blazor.SourceGenerators/JavaScript/JavaScriptMethod.cs b/src/Blazor.SourceGenerators/JavaScript/JavaScriptMethod.cs index 7dc1492..f63b748 100644 --- a/src/Blazor.SourceGenerators/JavaScript/JavaScriptMethod.cs +++ b/src/Blazor.SourceGenerators/JavaScript/JavaScriptMethod.cs @@ -1,36 +1,36 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.JavaScript; - -/// -/// An object that represents a JavaScript method. -/// -/// The exact name of the JavaScript API method. -/// -/// The invokable method name, when different than -/// the -/// the method is not considered pure. -/// The optional listing of method parameters. -/// A value indicating whether the JavaScript is bi-directional. -internal sealed record JavaScriptMethod( - string JavaScriptApiMethodName, - string? InvokableMethodName = null, - List? ParameterDefinitions = null, - bool IsBiDirectionalJavaScript = false) -{ - /// - /// A "pure" JavaScript method is one that - /// can be invoked without custom JavaScript. - /// - /// - /// The following example is a "pure" JavaScript function. - /// - /// window.prompt(message, default); - /// - /// This can be called from an IJSRuntime or IJSObjectReference instance directly. - /// - public bool IsPure => - JavaScriptApiMethodName == InvokableMethodName || - InvokableMethodName is null; -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.JavaScript; + +/// +/// An object that represents a JavaScript method. +/// +/// The exact name of the JavaScript API method. +/// +/// The invokable method name, when different than +/// the +/// the method is not considered pure. +/// The optional listing of method parameters. +/// A value indicating whether the JavaScript is bi-directional. +internal sealed record JavaScriptMethod( + string JavaScriptApiMethodName, + string? InvokableMethodName = null, + List? ParameterDefinitions = null, + bool IsBiDirectionalJavaScript = false) +{ + /// + /// A "pure" JavaScript method is one that + /// can be invoked without custom JavaScript. + /// + /// + /// The following example is a "pure" JavaScript function. + /// + /// window.prompt(message, default); + /// + /// This can be called from an IJSRuntime or IJSObjectReference instance directly. + /// + public bool IsPure => + JavaScriptApiMethodName == InvokableMethodName || + InvokableMethodName is null; +} diff --git a/src/Blazor.SourceGenerators/JavaScriptInteropGenerator.cs b/src/Blazor.SourceGenerators/JavaScriptInteropGenerator.cs index 2dbda3f..5e5dc9a 100644 --- a/src/Blazor.SourceGenerators/JavaScriptInteropGenerator.cs +++ b/src/Blazor.SourceGenerators/JavaScriptInteropGenerator.cs @@ -1,129 +1,129 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators; - -[Generator] -internal sealed partial class JavaScriptInteropGenerator : ISourceGenerator -{ - private readonly HashSet<(string FileName, string SourceCode)> _sourceCodeToAdd = new() - { - (nameof(RecordCompat).ToGeneratedFileName(), RecordCompat), - (nameof(BlazorHostingModel).ToGeneratedFileName(), BlazorHostingModel), - (nameof(JSAutoInteropAttribute).ToGeneratedFileName(), JSAutoInteropAttribute), - (nameof(JSAutoGenericInteropAttribute).ToGeneratedFileName(), JSAutoGenericInteropAttribute), - }; - - public void Initialize(GeneratorInitializationContext context) - { -#if DEBUG - if (!System.Diagnostics.Debugger.IsAttached) - { - //System.Diagnostics.Debugger.Launch(); - } -#endif - - // Register a syntax receiver that will be created for each generation pass - context.RegisterForSyntaxNotifications( - JavaScriptInteropSyntaxContextReceiver.Create); - } - - public void Execute(GeneratorExecutionContext context) - { - // Add source from text. - foreach (var (fileName, sourceCode) in _sourceCodeToAdd) - { - context.AddSource(fileName, - SourceText.From(sourceCode, Encoding.UTF8)); - } - - if (context.SyntaxContextReceiver is not JavaScriptInteropSyntaxContextReceiver receiver) - { - return; - } - - foreach (var (options, classDeclaration, attribute) in receiver.InterfaceDeclarations) - { - if (options is null || IsDiaganosticError(options, context, attribute)) - { - continue; - } - - var isPartial = classDeclaration.Modifiers.Any(m => m.IsKind(SyntaxKind.PartialKeyword)); - if (!isPartial) - { - continue; - } - - var model = context.Compilation.GetSemanticModel(classDeclaration.SyntaxTree); - var symbol = model.GetDeclaredSymbol(classDeclaration); - if (symbol is not ITypeSymbol typeSymbol || typeSymbol.IsStatic) - { - continue; - } - - foreach (var parser in options.Parsers) - { - var result = parser.ParseTargetType(options.TypeName!); - if (result.Status == ParserResultStatus.SuccessfullyParsed && - result.Value is not null) - { - var namespaceString = - (typeSymbol.ContainingNamespace.ToDisplayString(), classDeclaration.Parent) switch - { - (string { Length: > 0 } containingNamespace, _) => containingNamespace, - (_, BaseNamespaceDeclarationSyntax namespaceDeclaration) => namespaceDeclaration.Name.ToString(), - _ => null - }; - var @interface = - options.Implementation.ToInterfaceName(); - var implementation = - options.Implementation.ToImplementationName(); - - var topLevelObject = result.Value; - context.AddDependentTypesSource(topLevelObject) - .AddInterfaceSource(topLevelObject, @interface, options, namespaceString) - .AddImplementationSource(topLevelObject, implementation, options, namespaceString) - .AddDependencyInjectionExtensionsSource(topLevelObject, implementation, options); - } - } - } - } - - static bool IsDiaganosticError(GeneratorOptions options, GeneratorExecutionContext context, AttributeSyntax attribute) - { - if (options.TypeName is null) - { - context.ReportDiagnostic( - Diagnostic.Create( - Descriptors.TypeNameRequiredDiagnostic, - attribute.GetLocation())); - - return true; - } - - if (options.Implementation is null) - { - context.ReportDiagnostic( - Diagnostic.Create( - Descriptors.PathFromWindowRequiredDiagnostic, - attribute.GetLocation())); - - return true; - } - - if (options.SupportsGenerics && - context.Compilation.ReferencedAssemblyNames.Any(ai => - ai.Name.Equals("Blazor.Serialization", StringComparison.OrdinalIgnoreCase)) is false) - { - context.ReportDiagnostic( - Diagnostic.Create( - Descriptors.MissingBlazorSerializationPackageReferenceDiagnostic, - attribute.GetLocation())); - - return true; - } - - return false; - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators; + +[Generator] +internal sealed partial class JavaScriptInteropGenerator : ISourceGenerator +{ + private readonly HashSet<(string FileName, string SourceCode)> _sourceCodeToAdd = new() + { + (nameof(RecordCompat).ToGeneratedFileName(), RecordCompat), + (nameof(BlazorHostingModel).ToGeneratedFileName(), BlazorHostingModel), + (nameof(JSAutoInteropAttribute).ToGeneratedFileName(), JSAutoInteropAttribute), + (nameof(JSAutoGenericInteropAttribute).ToGeneratedFileName(), JSAutoGenericInteropAttribute), + }; + + public void Initialize(GeneratorInitializationContext context) + { +#if DEBUG + if (!System.Diagnostics.Debugger.IsAttached) + { + //System.Diagnostics.Debugger.Launch(); + } +#endif + + // Register a syntax receiver that will be created for each generation pass + context.RegisterForSyntaxNotifications( + JavaScriptInteropSyntaxContextReceiver.Create); + } + + public void Execute(GeneratorExecutionContext context) + { + // Add source from text. + foreach (var (fileName, sourceCode) in _sourceCodeToAdd) + { + context.AddSource(fileName, + SourceText.From(sourceCode, Encoding.UTF8)); + } + + if (context.SyntaxContextReceiver is not JavaScriptInteropSyntaxContextReceiver receiver) + { + return; + } + + foreach (var (options, classDeclaration, attribute) in receiver.InterfaceDeclarations) + { + if (options is null || IsDiaganosticError(options, context, attribute)) + { + continue; + } + + var isPartial = classDeclaration.Modifiers.Any(m => m.IsKind(SyntaxKind.PartialKeyword)); + if (!isPartial) + { + continue; + } + + var model = context.Compilation.GetSemanticModel(classDeclaration.SyntaxTree); + var symbol = model.GetDeclaredSymbol(classDeclaration); + if (symbol is not ITypeSymbol typeSymbol || typeSymbol.IsStatic) + { + continue; + } + + foreach (var parser in options.Parsers) + { + var result = parser.ParseTargetType(options.TypeName!); + if (result.Status == ParserResultStatus.SuccessfullyParsed && + result.Value is not null) + { + var namespaceString = + (typeSymbol.ContainingNamespace.ToDisplayString(), classDeclaration.Parent) switch + { + (string { Length: > 0 } containingNamespace, _) => containingNamespace, + (_, BaseNamespaceDeclarationSyntax namespaceDeclaration) => namespaceDeclaration.Name.ToString(), + _ => null + }; + var @interface = + options.Implementation.ToInterfaceName(); + var implementation = + options.Implementation.ToImplementationName(); + + var topLevelObject = result.Value; + context.AddDependentTypesSource(topLevelObject) + .AddInterfaceSource(topLevelObject, @interface, options, namespaceString) + .AddImplementationSource(topLevelObject, implementation, options, namespaceString) + .AddDependencyInjectionExtensionsSource(topLevelObject, implementation, options); + } + } + } + } + + static bool IsDiaganosticError(GeneratorOptions options, GeneratorExecutionContext context, AttributeSyntax attribute) + { + if (options.TypeName is null) + { + context.ReportDiagnostic( + Diagnostic.Create( + Descriptors.TypeNameRequiredDiagnostic, + attribute.GetLocation())); + + return true; + } + + if (options.Implementation is null) + { + context.ReportDiagnostic( + Diagnostic.Create( + Descriptors.PathFromWindowRequiredDiagnostic, + attribute.GetLocation())); + + return true; + } + + if (options.SupportsGenerics && + context.Compilation.ReferencedAssemblyNames.Any(ai => + ai.Name.Equals("Blazor.Serialization", StringComparison.OrdinalIgnoreCase)) is false) + { + context.ReportDiagnostic( + Diagnostic.Create( + Descriptors.MissingBlazorSerializationPackageReferenceDiagnostic, + attribute.GetLocation())); + + return true; + } + + return false; + } +} diff --git a/src/Blazor.SourceGenerators/JavaScriptInteropSyntaxContextReceiver.cs b/src/Blazor.SourceGenerators/JavaScriptInteropSyntaxContextReceiver.cs index bd7e04c..24b2336 100644 --- a/src/Blazor.SourceGenerators/JavaScriptInteropSyntaxContextReceiver.cs +++ b/src/Blazor.SourceGenerators/JavaScriptInteropSyntaxContextReceiver.cs @@ -1,40 +1,40 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators; - -internal class JavaScriptInteropSyntaxContextReceiver : ISyntaxContextReceiver -{ - internal static ISyntaxContextReceiver Create() => new JavaScriptInteropSyntaxContextReceiver(); - - public HashSet InterfaceDeclarations { get; } = new(); - - public void OnVisitSyntaxNode(GeneratorSyntaxContext context) - { - if (context.Node is InterfaceDeclarationSyntax interfaceDeclaration && - interfaceDeclaration.AttributeLists.Count > 0) - { - foreach (var attributeListSyntax in interfaceDeclaration.AttributeLists) - { - foreach (var attributeSyntax in attributeListSyntax.Attributes) - { - var name = attributeSyntax.Name.ToString(); - - var isAutoInterop = - nameof(JSAutoInteropAttribute).Contains(name); - var isAutoGenericInterop = - nameof(JSAutoGenericInteropAttribute).Contains(name); - - if (isAutoInterop || isAutoGenericInterop) - { - InterfaceDeclarations.Add( - new( - Options: attributeSyntax.GetGeneratorOptions(isAutoGenericInterop), - InterfaceDeclaration: interfaceDeclaration, - InteropAttribute: attributeSyntax)); - } - } - } - } - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators; + +internal class JavaScriptInteropSyntaxContextReceiver : ISyntaxContextReceiver +{ + internal static ISyntaxContextReceiver Create() => new JavaScriptInteropSyntaxContextReceiver(); + + public HashSet InterfaceDeclarations { get; } = new(); + + public void OnVisitSyntaxNode(GeneratorSyntaxContext context) + { + if (context.Node is InterfaceDeclarationSyntax interfaceDeclaration && + interfaceDeclaration.AttributeLists.Count > 0) + { + foreach (var attributeListSyntax in interfaceDeclaration.AttributeLists) + { + foreach (var attributeSyntax in attributeListSyntax.Attributes) + { + var name = attributeSyntax.Name.ToString(); + + var isAutoInterop = + nameof(JSAutoInteropAttribute).Contains(name); + var isAutoGenericInterop = + nameof(JSAutoGenericInteropAttribute).Contains(name); + + if (isAutoInterop || isAutoGenericInterop) + { + InterfaceDeclarations.Add( + new( + Options: attributeSyntax.GetGeneratorOptions(isAutoGenericInterop), + InterfaceDeclaration: interfaceDeclaration, + InteropAttribute: attributeSyntax)); + } + } + } + } + } +} diff --git a/src/Blazor.SourceGenerators/Options/GeneratorOptions.cs b/src/Blazor.SourceGenerators/Options/GeneratorOptions.cs index 3bd36bb..e658665 100644 --- a/src/Blazor.SourceGenerators/Options/GeneratorOptions.cs +++ b/src/Blazor.SourceGenerators/Options/GeneratorOptions.cs @@ -1,56 +1,56 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -/// -/// The options used (and parsed from the JSAutoInteropAttribute) to source-generate JavaScript interop. -/// -/// Indicates wether the generator supports generics. -/// The type name that corresponds to the lib.dom.d.ts interface. For example, "Geolocation" -/// The path from the window object. For example, "window.navigator.geolocation" (or "navigator.geolocation") -/// Whether to generate only pure JavaScript functions that do not require callbacks. For example, Geolocation.clearWatch is consider pure, but Geolocation.watchPosition is not. -/// The optional URL to the corresponding API. -/// The optional generic method descriptors value from the parsed JSAutoGenericInteropAttribute.GenericMethodDescriptors. -/// Overrides pure JavaScript calls. A custom impl must exist. -/// An optional array of TypeScript type declarations sources. Valid values are URLs or file paths. -/// -/// A value indicating whether to generate targeting WASM: -/// When true: Synchronous extensions are generated on the IJSInProcessRuntime type. -/// When false: Asynchronous extensions are generated on the IJSRuntime type. -/// -internal sealed record GeneratorOptions( - bool SupportsGenerics, - string TypeName = null!, - string Implementation = null!, - bool OnlyGeneratePureJS = false, - string? Url = null, - string[]? GenericMethodDescriptors = null, - string[]? PureJavaScriptOverrides = null, - string[]? TypeDeclarationSources = null, - bool IsWebAssembly = true) -{ - ISet? _parsers; - - /// - /// Get instance maps its - /// into a set of parsers. - /// When is null, or empty, - /// the default lib.dom.d.ts parser is used. - /// - internal ISet Parsers - { - get - { - _parsers ??= new HashSet(); - - foreach (var source in - TypeDeclarationSources?.Select(TypeDeclarationReader.Factory) - ?.Select(reader => new TypeDeclarationParser(reader)) - ?? new[] { TypeDeclarationParser.Default }) - { - _parsers.Add(source); - } - - return _parsers; - } - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +/// +/// The options used (and parsed from the JSAutoInteropAttribute) to source-generate JavaScript interop. +/// +/// Indicates wether the generator supports generics. +/// The type name that corresponds to the lib.dom.d.ts interface. For example, "Geolocation" +/// The path from the window object. For example, "window.navigator.geolocation" (or "navigator.geolocation") +/// Whether to generate only pure JavaScript functions that do not require callbacks. For example, Geolocation.clearWatch is consider pure, but Geolocation.watchPosition is not. +/// The optional URL to the corresponding API. +/// The optional generic method descriptors value from the parsed JSAutoGenericInteropAttribute.GenericMethodDescriptors. +/// Overrides pure JavaScript calls. A custom impl must exist. +/// An optional array of TypeScript type declarations sources. Valid values are URLs or file paths. +/// +/// A value indicating whether to generate targeting WASM: +/// When true: Synchronous extensions are generated on the IJSInProcessRuntime type. +/// When false: Asynchronous extensions are generated on the IJSRuntime type. +/// +internal sealed record GeneratorOptions( + bool SupportsGenerics, + string TypeName = null!, + string Implementation = null!, + bool OnlyGeneratePureJS = false, + string? Url = null, + string[]? GenericMethodDescriptors = null, + string[]? PureJavaScriptOverrides = null, + string[]? TypeDeclarationSources = null, + bool IsWebAssembly = true) +{ + ISet? _parsers; + + /// + /// Get instance maps its + /// into a set of parsers. + /// When is null, or empty, + /// the default lib.dom.d.ts parser is used. + /// + internal ISet Parsers + { + get + { + _parsers ??= new HashSet(); + + foreach (var source in + TypeDeclarationSources?.Select(TypeDeclarationReader.Factory) + ?.Select(reader => new TypeDeclarationParser(reader)) + ?? new[] { TypeDeclarationParser.Default }) + { + _parsers.Add(source); + } + + return _parsers; + } + } +} diff --git a/src/Blazor.SourceGenerators/Parsers/ParserResult.cs b/src/Blazor.SourceGenerators/Parsers/ParserResult.cs index 8b936c7..cb3e0b6 100644 --- a/src/Blazor.SourceGenerators/Parsers/ParserResult.cs +++ b/src/Blazor.SourceGenerators/Parsers/ParserResult.cs @@ -1,11 +1,11 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Parsers; - -internal readonly record struct ParserResult(ParserResultStatus Status) where T : class -{ - internal T? Value { get; init; } = default!; - - internal string? Error { get; init; } = default!; -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Parsers; + +internal readonly record struct ParserResult(ParserResultStatus Status) where T : class +{ + internal T? Value { get; init; } = default!; + + internal string? Error { get; init; } = default!; +} diff --git a/src/Blazor.SourceGenerators/Parsers/ParserResultOutputType.cs b/src/Blazor.SourceGenerators/Parsers/ParserResultOutputType.cs index c8855c6..774bb75 100644 --- a/src/Blazor.SourceGenerators/Parsers/ParserResultOutputType.cs +++ b/src/Blazor.SourceGenerators/Parsers/ParserResultOutputType.cs @@ -1,10 +1,10 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Parsers; - -internal enum ParserResultOutputType -{ - CSharp, - JavaScript -}; +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Parsers; + +internal enum ParserResultOutputType +{ + CSharp, + JavaScript +}; diff --git a/src/Blazor.SourceGenerators/Parsers/ParserResultStatus.cs b/src/Blazor.SourceGenerators/Parsers/ParserResultStatus.cs index 3cc1018..f3e888b 100644 --- a/src/Blazor.SourceGenerators/Parsers/ParserResultStatus.cs +++ b/src/Blazor.SourceGenerators/Parsers/ParserResultStatus.cs @@ -1,12 +1,12 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Parsers; - -internal enum ParserResultStatus -{ - Unknown, - TargetTypeNotFound, - SuccessfullyParsed, - ErrorParsing -}; +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Parsers; + +internal enum ParserResultStatus +{ + Unknown, + TargetTypeNotFound, + SuccessfullyParsed, + ErrorParsing +}; diff --git a/src/Blazor.SourceGenerators/Parsers/TypeDeclarationParser.Interfaces.cs b/src/Blazor.SourceGenerators/Parsers/TypeDeclarationParser.Interfaces.cs index 3b4a768..8e7338d 100644 --- a/src/Blazor.SourceGenerators/Parsers/TypeDeclarationParser.Interfaces.cs +++ b/src/Blazor.SourceGenerators/Parsers/TypeDeclarationParser.Interfaces.cs @@ -1,485 +1,485 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Parsers; - -internal sealed partial class TypeDeclarationParser -{ - internal CSharpObject? ToObject(string typeScriptTypeDeclaration) - { - CSharpObject? cSharpObject = null; - - var lineTokens = typeScriptTypeDeclaration.Split(new[] { '\n' }); - foreach (var (index, segment) in lineTokens.Select((s, i) => (i, s))) - { - if (index == 0) - { - var typeName = InterfaceTypeNameRegex.GetMatchGroupValue(segment, "TypeName"); - - // Ignore event targets for now. - var seg = segment.Replace(" extends EventTarget", ""); - var subclass = ExtendsTypeNameRegex.GetMatchGroupValue(seg, "TypeName"); - if (typeName is not null) - { - cSharpObject = new(typeName, subclass); - continue; - } - else - { - break; - } - } - - if (cSharpObject is null) - { - break; - } - - var line = segment.Trim(); - if (line.Length == 0) - { - continue; - } - - if (line == "}") - { - // We're done - break; - } - - if (IsMethod(line, out var method) && method is not null) - { - var methodName = method.GetGroupValue("MethodName"); - var parameters = method.GetGroupValue("Parameters"); - var returnType = method.GetGroupValue("ReturnType"); - - if (methodName is null || parameters is null || returnType is null) - { - continue; - } - - var (parameterDefinitions, javaScriptMethod) = - ParseParameters( - cSharpObject.TypeName, - methodName, - parameters, - obj => cSharpObject.DependentTypes![obj.TypeName] = obj); - - - var cSharpMethod = - ToMethod(methodName, returnType, parameterDefinitions, javaScriptMethod); - cSharpObject.Methods[cSharpMethod.RawName] = cSharpMethod; - - continue; - } - - if (IsProperty(line, out var property) && property is not null) - { - var name = property.GetGroupValue("Name"); - var type = property.GetGroupValue("Type"); - - if (name is null || type is null) - { - continue; - } - - var isReadonly = name.StartsWith("readonly "); - var isNullable = name.EndsWith("?") || type.Contains("| null"); - - name = name.Replace("?", "").Replace("readonly ", ""); - type = TryGetPrimitiveType(type); - - CSharpProperty cSharpProperty = new(name, type, isNullable, isReadonly); - cSharpObject.Properties[cSharpProperty.RawName] = cSharpProperty; - - var mappedType = cSharpProperty.MappedTypeName; - - // When a property defines a custom type, that type needs to also be parsed - // and source generated. This is so that dependent types are known and resolved. - if (!TypeMap.PrimitiveTypes.IsPrimitiveType(mappedType) && - _reader.TryGetDeclaration(mappedType, out var typeScriptDefinitionText) && - typeScriptDefinitionText is not null) - { - var obj = ToObject(typeScriptDefinitionText); - if (obj is not null) - { - cSharpObject.DependentTypes![obj.TypeName] = obj; - } - } - - continue; - } - } - - return cSharpObject; - } - - internal CSharpTopLevelObject? ToTopLevelObject(string typeScriptTypeDeclaration) - { - CSharpTopLevelObject? topLevelObject = null; - - var lineTokens = typeScriptTypeDeclaration.Split(new[] { '\n' }); - foreach (var (index, segment) in lineTokens.Select((s, i) => (i, s))) - { - if (index == 0) - { - var typeName = InterfaceTypeNameRegex.GetMatchGroupValue(segment, "TypeName"); - if (typeName is not null) - { - topLevelObject = new(typeName); - continue; - } - else - { - break; - } - } - - if (topLevelObject is null) - { - break; - } - - var line = segment.Trim(); - if (line.Length == 0) - { - continue; - } - - if (line == "}") - { - // We're done - break; - } - - if (IsMethod(line, out var method) && method is not null) - { - var methodName = method.GetGroupValue("MethodName"); - var parameters = method.GetGroupValue("Parameters"); - var returnType = method.GetGroupValue("ReturnType"); - - if (methodName is null || parameters is null || returnType is null) - { - continue; - } - - var (parameterDefinitions, javaScriptMethod) = - ParseParameters( - topLevelObject.RawTypeName, - methodName, - parameters, - obj => topLevelObject.DependentTypes![obj.TypeName] = obj); - - var cSharpMethod = - ToMethod(methodName, returnType, parameterDefinitions, javaScriptMethod); - - topLevelObject.Methods!.Add(cSharpMethod); - - continue; - } - - if (IsProperty(line, out var property) && property is not null) - { - var name = property.GetGroupValue("Name"); - var type = property.GetGroupValue("Type"); - - if (name is null || type is null) - { - continue; - } - - var isReadonly = name.StartsWith("readonly "); - var isNullable = name.EndsWith("?") || type.Contains("| null"); - - name = name.Replace("?", "").Replace("readonly ", ""); - type = TryGetPrimitiveType(type); - - CSharpProperty cSharpProperty = - new(name, - type, - isNullable, - isReadonly); - - topLevelObject.Properties!.Add(cSharpProperty); - - var mappedType = cSharpProperty.MappedTypeName; - - // When a property defines a custom type, that type needs to also be parsed - // and source generated. This is so that dependent types are known and resolved. - if (!TypeMap.PrimitiveTypes.IsPrimitiveType(mappedType) && - _reader.TryGetDeclaration(mappedType, out var typeScriptDefinitionText) && - typeScriptDefinitionText is not null) - { - var obj = ToObject(typeScriptDefinitionText); - if (obj is not null) - { - topLevelObject.DependentTypes![obj.TypeName] = obj; - } - } - - continue; - } - } - - return topLevelObject; - } - - private string TryGetPrimitiveType(string type) - { - if (!TypeMap.PrimitiveTypes.IsPrimitiveType(type) && - _reader.TryGetTypeAlias(type, out var typeAliasLine) && - typeAliasLine is not null) - { - if (typeAliasLine.Replace(";", "").Split('=') - is { Length: 2 } split) - { - if (split[1].Trim().Split('|') - is { Length: > 0 } values && - values.Select(v => v.Trim())?.ToList() - is { Count: > 0 } list) - { - var isStringAlias = list.All(v => v.StartsWith("\"") && v.EndsWith("\"")); - if (isStringAlias) - { - type = "string"; - } - } - } - } - - return type; - } - - private CSharpMethod ToMethod( - string methodName, - string returnType, - List parameterDefinitions, - JavaScriptMethod? javaScriptMethod) - { - var methodReturnType = CleanseReturnType(returnType); - CSharpMethod cSharpMethod = - new(methodName, - methodReturnType, - parameterDefinitions, - javaScriptMethod); - - var nonArrayMethodReturnType = methodReturnType.Replace("[]", ""); - if (!TypeMap.PrimitiveTypes.IsPrimitiveType(nonArrayMethodReturnType) && - _reader.TryGetDeclaration(nonArrayMethodReturnType, out var typeScriptDefinitionText) && - typeScriptDefinitionText is not null) - { - var dependentType = ToObject(typeScriptDefinitionText); - if (dependentType is not null) - { - cSharpMethod.DependentTypes![nonArrayMethodReturnType] = dependentType; - } - } - - return cSharpMethod; - } - - internal CSharpAction? ToAction(string typeScriptTypeDeclaration) - { - CSharpAction? cSharpAction = null; - - var lineTokens = typeScriptTypeDeclaration.Split(new[] { '\n' }); - foreach (var (index, segment) in lineTokens.Select((s, i) => (i, s))) - { - if (index == 0) - { - var typeName = InterfaceTypeNameRegex.GetMatchGroupValue(segment, "TypeName"); - if (typeName is not null) - { - cSharpAction = new(typeName); - continue; - } - else - { - break; - } - } - - if (cSharpAction is null) - { - break; - } - - var line = segment.Trim(); - if (line.Length == 0) - { - continue; - } - - if (line == "}") - { - // We're done - break; - } - - if (IsAction(line, out var action) && action is not null) - { - var parameters = action.GetGroupValue("Parameters"); - var returnType = action.GetGroupValue("ReturnType"); - - if (parameters is null || returnType is null) - { - continue; - } - - var (parameterDefinitions, _) = - ParseParameters( - cSharpAction.RawName, - cSharpAction.RawName, - parameters, - obj => cSharpAction.DependentTypes![obj.TypeName] = obj); - - cSharpAction = cSharpAction with - { - ParameterDefinitions = parameterDefinitions - }; - - continue; - } - } - - return cSharpAction; - } - - internal static string CleanseReturnType(string returnType) - { - // Example inputs: - // 1) ": void;" - // 2) ": string | null;" - return returnType.Replace(":", "").Replace(";", "").Trim(); - } - - internal (List Parameters, JavaScriptMethod? JavaScriptMethod) ParseParameters( - string typeName, - string rawName, - string parametersString, - Action appendDependentType) - { - List parameters = new(); - - // Example input: - // "(someCallback: CallbackType, someId?: number | null)" - var trimmedParameters = parametersString.Replace("(", "").Replace(")", ""); - var parameterLineTokenizer = trimmedParameters.Split(new[] { ':', ',', }); - - JavaScriptMethod? javaScriptMethod = new(rawName); - foreach (var parameterPair in parameterLineTokenizer.Where(t => t.Length > 0).Chunk(2)) - { - var isNullable = parameterPair[0].EndsWith("?"); - var parameterName = parameterPair[0].Replace("?", "").Trim(); - var parameterType = isNullable - ? parameterPair[1].Trim().Replace(" | null", "") - : parameterPair[1].Trim(); - - CSharpAction? action = null; - - // When a parameter defines a custom type, that type needs to also be parsed - // and source generated. This is so that dependent types are known and resolved. - if (!TypeMap.PrimitiveTypes.IsPrimitiveType(parameterType) && - _reader.TryGetDeclaration(parameterType, out var typeScriptDefinitionText) && - typeScriptDefinitionText is not null) - { - javaScriptMethod = javaScriptMethod with - { - InvokableMethodName = $"blazorators.{typeName.LowerCaseFirstLetter()}.{rawName}" - }; - - if (parameterType.EndsWith("Callback")) - { - action = ToAction(typeScriptDefinitionText); - javaScriptMethod = javaScriptMethod with - { - IsBiDirectionalJavaScript = true - }; - } - else - { - var obj = ToObject(typeScriptDefinitionText); - if (obj is not null) - { - appendDependentType(obj); - } - } - } - - parameters.Add(new(parameterName, parameterType, isNullable, action)); - } - - javaScriptMethod = javaScriptMethod with - { - ParameterDefinitions = parameters - }; - - return (parameters, javaScriptMethod); - } - - internal static bool IsAction( - string line, out Match? match) - { - match = TypeScriptCallbackRegex.Match(line); - return match.Success; - } - - internal static bool IsMethod( - string line, out Match? match) - { - match = TypeScriptMethodRegex.Match(line); - var isSuccess = match.Success; - if (isSuccess) - { - var methodName = match.GetGroupValue("MethodName"); - if (methodName is "addEventListener" or "removeEventListener") - { - return false; - } - - var returnType = match.GetGroupValue("ReturnType"); - if (returnType?.Contains("this") ?? false) - { - return false; - } - } - - return isSuccess; - } - - internal static bool IsProperty( - string line, - out Match? match) - { - match = TypeScriptPropertyRegex.Match(line); - var isSuccess = match.Success; - if (isSuccess) - { - var name = match.GetGroupValue("Name"); - if ((name is "addEventListener" or "removeEventListener") || - (name is not null && name.Contains("this"))) - { - return false; - } - - if (match.GetGroupValue("Type") is "void") - { - return false; - } - } - - return isSuccess; - } -} - -static class EnumerableExtensions -{ - internal static IEnumerable Chunk(this IEnumerable source, int chunksize) - { - while (source.Any()) - { - yield return source.Take(chunksize).ToArray(); - source = source.Skip(chunksize); - } - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Parsers; + +internal sealed partial class TypeDeclarationParser +{ + internal CSharpObject? ToObject(string typeScriptTypeDeclaration) + { + CSharpObject? cSharpObject = null; + + var lineTokens = typeScriptTypeDeclaration.Split(new[] { '\n' }); + foreach (var (index, segment) in lineTokens.Select((s, i) => (i, s))) + { + if (index == 0) + { + var typeName = InterfaceTypeNameRegex.GetMatchGroupValue(segment, "TypeName"); + + // Ignore event targets for now. + var seg = segment.Replace(" extends EventTarget", ""); + var subclass = ExtendsTypeNameRegex.GetMatchGroupValue(seg, "TypeName"); + if (typeName is not null) + { + cSharpObject = new(typeName, subclass); + continue; + } + else + { + break; + } + } + + if (cSharpObject is null) + { + break; + } + + var line = segment.Trim(); + if (line.Length == 0) + { + continue; + } + + if (line == "}") + { + // We're done + break; + } + + if (IsMethod(line, out var method) && method is not null) + { + var methodName = method.GetGroupValue("MethodName"); + var parameters = method.GetGroupValue("Parameters"); + var returnType = method.GetGroupValue("ReturnType"); + + if (methodName is null || parameters is null || returnType is null) + { + continue; + } + + var (parameterDefinitions, javaScriptMethod) = + ParseParameters( + cSharpObject.TypeName, + methodName, + parameters, + obj => cSharpObject.DependentTypes![obj.TypeName] = obj); + + + var cSharpMethod = + ToMethod(methodName, returnType, parameterDefinitions, javaScriptMethod); + cSharpObject.Methods[cSharpMethod.RawName] = cSharpMethod; + + continue; + } + + if (IsProperty(line, out var property) && property is not null) + { + var name = property.GetGroupValue("Name"); + var type = property.GetGroupValue("Type"); + + if (name is null || type is null) + { + continue; + } + + var isReadonly = name.StartsWith("readonly "); + var isNullable = name.EndsWith("?") || type.Contains("| null"); + + name = name.Replace("?", "").Replace("readonly ", ""); + type = TryGetPrimitiveType(type); + + CSharpProperty cSharpProperty = new(name, type, isNullable, isReadonly); + cSharpObject.Properties[cSharpProperty.RawName] = cSharpProperty; + + var mappedType = cSharpProperty.MappedTypeName; + + // When a property defines a custom type, that type needs to also be parsed + // and source generated. This is so that dependent types are known and resolved. + if (!TypeMap.PrimitiveTypes.IsPrimitiveType(mappedType) && + _reader.TryGetDeclaration(mappedType, out var typeScriptDefinitionText) && + typeScriptDefinitionText is not null) + { + var obj = ToObject(typeScriptDefinitionText); + if (obj is not null) + { + cSharpObject.DependentTypes![obj.TypeName] = obj; + } + } + + continue; + } + } + + return cSharpObject; + } + + internal CSharpTopLevelObject? ToTopLevelObject(string typeScriptTypeDeclaration) + { + CSharpTopLevelObject? topLevelObject = null; + + var lineTokens = typeScriptTypeDeclaration.Split(new[] { '\n' }); + foreach (var (index, segment) in lineTokens.Select((s, i) => (i, s))) + { + if (index == 0) + { + var typeName = InterfaceTypeNameRegex.GetMatchGroupValue(segment, "TypeName"); + if (typeName is not null) + { + topLevelObject = new(typeName); + continue; + } + else + { + break; + } + } + + if (topLevelObject is null) + { + break; + } + + var line = segment.Trim(); + if (line.Length == 0) + { + continue; + } + + if (line == "}") + { + // We're done + break; + } + + if (IsMethod(line, out var method) && method is not null) + { + var methodName = method.GetGroupValue("MethodName"); + var parameters = method.GetGroupValue("Parameters"); + var returnType = method.GetGroupValue("ReturnType"); + + if (methodName is null || parameters is null || returnType is null) + { + continue; + } + + var (parameterDefinitions, javaScriptMethod) = + ParseParameters( + topLevelObject.RawTypeName, + methodName, + parameters, + obj => topLevelObject.DependentTypes![obj.TypeName] = obj); + + var cSharpMethod = + ToMethod(methodName, returnType, parameterDefinitions, javaScriptMethod); + + topLevelObject.Methods!.Add(cSharpMethod); + + continue; + } + + if (IsProperty(line, out var property) && property is not null) + { + var name = property.GetGroupValue("Name"); + var type = property.GetGroupValue("Type"); + + if (name is null || type is null) + { + continue; + } + + var isReadonly = name.StartsWith("readonly "); + var isNullable = name.EndsWith("?") || type.Contains("| null"); + + name = name.Replace("?", "").Replace("readonly ", ""); + type = TryGetPrimitiveType(type); + + CSharpProperty cSharpProperty = + new(name, + type, + isNullable, + isReadonly); + + topLevelObject.Properties!.Add(cSharpProperty); + + var mappedType = cSharpProperty.MappedTypeName; + + // When a property defines a custom type, that type needs to also be parsed + // and source generated. This is so that dependent types are known and resolved. + if (!TypeMap.PrimitiveTypes.IsPrimitiveType(mappedType) && + _reader.TryGetDeclaration(mappedType, out var typeScriptDefinitionText) && + typeScriptDefinitionText is not null) + { + var obj = ToObject(typeScriptDefinitionText); + if (obj is not null) + { + topLevelObject.DependentTypes![obj.TypeName] = obj; + } + } + + continue; + } + } + + return topLevelObject; + } + + private string TryGetPrimitiveType(string type) + { + if (!TypeMap.PrimitiveTypes.IsPrimitiveType(type) && + _reader.TryGetTypeAlias(type, out var typeAliasLine) && + typeAliasLine is not null) + { + if (typeAliasLine.Replace(";", "").Split('=') + is { Length: 2 } split) + { + if (split[1].Trim().Split('|') + is { Length: > 0 } values && + values.Select(v => v.Trim())?.ToList() + is { Count: > 0 } list) + { + var isStringAlias = list.All(v => v.StartsWith("\"") && v.EndsWith("\"")); + if (isStringAlias) + { + type = "string"; + } + } + } + } + + return type; + } + + private CSharpMethod ToMethod( + string methodName, + string returnType, + List parameterDefinitions, + JavaScriptMethod? javaScriptMethod) + { + var methodReturnType = CleanseReturnType(returnType); + CSharpMethod cSharpMethod = + new(methodName, + methodReturnType, + parameterDefinitions, + javaScriptMethod); + + var nonArrayMethodReturnType = methodReturnType.Replace("[]", ""); + if (!TypeMap.PrimitiveTypes.IsPrimitiveType(nonArrayMethodReturnType) && + _reader.TryGetDeclaration(nonArrayMethodReturnType, out var typeScriptDefinitionText) && + typeScriptDefinitionText is not null) + { + var dependentType = ToObject(typeScriptDefinitionText); + if (dependentType is not null) + { + cSharpMethod.DependentTypes![nonArrayMethodReturnType] = dependentType; + } + } + + return cSharpMethod; + } + + internal CSharpAction? ToAction(string typeScriptTypeDeclaration) + { + CSharpAction? cSharpAction = null; + + var lineTokens = typeScriptTypeDeclaration.Split(new[] { '\n' }); + foreach (var (index, segment) in lineTokens.Select((s, i) => (i, s))) + { + if (index == 0) + { + var typeName = InterfaceTypeNameRegex.GetMatchGroupValue(segment, "TypeName"); + if (typeName is not null) + { + cSharpAction = new(typeName); + continue; + } + else + { + break; + } + } + + if (cSharpAction is null) + { + break; + } + + var line = segment.Trim(); + if (line.Length == 0) + { + continue; + } + + if (line == "}") + { + // We're done + break; + } + + if (IsAction(line, out var action) && action is not null) + { + var parameters = action.GetGroupValue("Parameters"); + var returnType = action.GetGroupValue("ReturnType"); + + if (parameters is null || returnType is null) + { + continue; + } + + var (parameterDefinitions, _) = + ParseParameters( + cSharpAction.RawName, + cSharpAction.RawName, + parameters, + obj => cSharpAction.DependentTypes![obj.TypeName] = obj); + + cSharpAction = cSharpAction with + { + ParameterDefinitions = parameterDefinitions + }; + + continue; + } + } + + return cSharpAction; + } + + internal static string CleanseReturnType(string returnType) + { + // Example inputs: + // 1) ": void;" + // 2) ": string | null;" + return returnType.Replace(":", "").Replace(";", "").Trim(); + } + + internal (List Parameters, JavaScriptMethod? JavaScriptMethod) ParseParameters( + string typeName, + string rawName, + string parametersString, + Action appendDependentType) + { + List parameters = new(); + + // Example input: + // "(someCallback: CallbackType, someId?: number | null)" + var trimmedParameters = parametersString.Replace("(", "").Replace(")", ""); + var parameterLineTokenizer = trimmedParameters.Split(new[] { ':', ',', }); + + JavaScriptMethod? javaScriptMethod = new(rawName); + foreach (var parameterPair in parameterLineTokenizer.Where(t => t.Length > 0).Chunk(2)) + { + var isNullable = parameterPair[0].EndsWith("?"); + var parameterName = parameterPair[0].Replace("?", "").Trim(); + var parameterType = isNullable + ? parameterPair[1].Trim().Replace(" | null", "") + : parameterPair[1].Trim(); + + CSharpAction? action = null; + + // When a parameter defines a custom type, that type needs to also be parsed + // and source generated. This is so that dependent types are known and resolved. + if (!TypeMap.PrimitiveTypes.IsPrimitiveType(parameterType) && + _reader.TryGetDeclaration(parameterType, out var typeScriptDefinitionText) && + typeScriptDefinitionText is not null) + { + javaScriptMethod = javaScriptMethod with + { + InvokableMethodName = $"blazorators.{typeName.LowerCaseFirstLetter()}.{rawName}" + }; + + if (parameterType.EndsWith("Callback")) + { + action = ToAction(typeScriptDefinitionText); + javaScriptMethod = javaScriptMethod with + { + IsBiDirectionalJavaScript = true + }; + } + else + { + var obj = ToObject(typeScriptDefinitionText); + if (obj is not null) + { + appendDependentType(obj); + } + } + } + + parameters.Add(new(parameterName, parameterType, isNullable, action)); + } + + javaScriptMethod = javaScriptMethod with + { + ParameterDefinitions = parameters + }; + + return (parameters, javaScriptMethod); + } + + internal static bool IsAction( + string line, out Match? match) + { + match = TypeScriptCallbackRegex.Match(line); + return match.Success; + } + + internal static bool IsMethod( + string line, out Match? match) + { + match = TypeScriptMethodRegex.Match(line); + var isSuccess = match.Success; + if (isSuccess) + { + var methodName = match.GetGroupValue("MethodName"); + if (methodName is "addEventListener" or "removeEventListener") + { + return false; + } + + var returnType = match.GetGroupValue("ReturnType"); + if (returnType?.Contains("this") ?? false) + { + return false; + } + } + + return isSuccess; + } + + internal static bool IsProperty( + string line, + out Match? match) + { + match = TypeScriptPropertyRegex.Match(line); + var isSuccess = match.Success; + if (isSuccess) + { + var name = match.GetGroupValue("Name"); + if ((name is "addEventListener" or "removeEventListener") || + (name is not null && name.Contains("this"))) + { + return false; + } + + if (match.GetGroupValue("Type") is "void") + { + return false; + } + } + + return isSuccess; + } +} + +static class EnumerableExtensions +{ + internal static IEnumerable Chunk(this IEnumerable source, int chunksize) + { + while (source.Any()) + { + yield return source.Take(chunksize).ToArray(); + source = source.Skip(chunksize); + } + } +} diff --git a/src/Blazor.SourceGenerators/Parsers/TypeDeclarationParser.cs b/src/Blazor.SourceGenerators/Parsers/TypeDeclarationParser.cs index ef0f7fa..0436bf2 100644 --- a/src/Blazor.SourceGenerators/Parsers/TypeDeclarationParser.cs +++ b/src/Blazor.SourceGenerators/Parsers/TypeDeclarationParser.cs @@ -1,52 +1,52 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Parsers; - -internal sealed partial class TypeDeclarationParser -{ - static readonly Lazy s_defaultParser = - new( - valueFactory: () => new TypeDeclarationParser(TypeDeclarationReader.Default)); - - readonly TypeDeclarationReader _reader; - - internal static TypeDeclarationParser Default => s_defaultParser.Value; - - internal TypeDeclarationParser(TypeDeclarationReader reader) => _reader = reader; - - public ParserResult ParseTargetType(string typeName) - { - ParserResult result = new(ParserResultStatus.Unknown); - - if (_reader.TryGetDeclaration(typeName, out var typeScriptDefinitionText) && - typeScriptDefinitionText is not null) - { - try - { - result = result with - { - Status = ParserResultStatus.SuccessfullyParsed, - Value = ToTopLevelObject(typeScriptDefinitionText) - }; - } - catch (Exception ex) - { - result = result with - { - Status = ParserResultStatus.ErrorParsing, - Error = ex.Message - }; - } - } - else - { - result = result with - { - Status = ParserResultStatus.TargetTypeNotFound - }; - } - - return result; - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Parsers; + +internal sealed partial class TypeDeclarationParser +{ + static readonly Lazy s_defaultParser = + new( + valueFactory: () => new TypeDeclarationParser(TypeDeclarationReader.Default)); + + readonly TypeDeclarationReader _reader; + + internal static TypeDeclarationParser Default => s_defaultParser.Value; + + internal TypeDeclarationParser(TypeDeclarationReader reader) => _reader = reader; + + public ParserResult ParseTargetType(string typeName) + { + ParserResult result = new(ParserResultStatus.Unknown); + + if (_reader.TryGetDeclaration(typeName, out var typeScriptDefinitionText) && + typeScriptDefinitionText is not null) + { + try + { + result = result with + { + Status = ParserResultStatus.SuccessfullyParsed, + Value = ToTopLevelObject(typeScriptDefinitionText) + }; + } + catch (Exception ex) + { + result = result with + { + Status = ParserResultStatus.ErrorParsing, + Error = ex.Message + }; + } + } + else + { + result = result with + { + Status = ParserResultStatus.TargetTypeNotFound + }; + } + + return result; + } +} diff --git a/src/Blazor.SourceGenerators/Readers/TypeDeclarationReader.Factory.cs b/src/Blazor.SourceGenerators/Readers/TypeDeclarationReader.Factory.cs index de77f07..b2b5b6b 100644 --- a/src/Blazor.SourceGenerators/Readers/TypeDeclarationReader.Factory.cs +++ b/src/Blazor.SourceGenerators/Readers/TypeDeclarationReader.Factory.cs @@ -1,35 +1,35 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Readers; - -internal sealed partial class TypeDeclarationReader -{ - static readonly ConcurrentDictionary s_readerCache = - new(StringComparer.OrdinalIgnoreCase); - - internal static TypeDeclarationReader Factory(string source) - { - var uri = new Uri(source); - var sourceKey = uri.IsFile ? uri.LocalPath : uri.OriginalString; - - var reader = - s_readerCache.GetOrAdd( - sourceKey, _ => new TypeDeclarationReader(uri)); - - return reader; - } - - internal static TypeDeclarationReader Default - { - get - { - var sourceKey = s_defaultTypeDeclarationSource.OriginalString; - var reader = - s_readerCache.GetOrAdd( - sourceKey, _ => new TypeDeclarationReader(s_defaultTypeDeclarationSource)); - - return reader; - } - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Readers; + +internal sealed partial class TypeDeclarationReader +{ + static readonly ConcurrentDictionary s_readerCache = + new(StringComparer.OrdinalIgnoreCase); + + internal static TypeDeclarationReader Factory(string source) + { + var uri = new Uri(source); + var sourceKey = uri.IsFile ? uri.LocalPath : uri.OriginalString; + + var reader = + s_readerCache.GetOrAdd( + sourceKey, _ => new TypeDeclarationReader(uri)); + + return reader; + } + + internal static TypeDeclarationReader Default + { + get + { + var sourceKey = s_defaultTypeDeclarationSource.OriginalString; + var reader = + s_readerCache.GetOrAdd( + sourceKey, _ => new TypeDeclarationReader(s_defaultTypeDeclarationSource)); + + return reader; + } + } +} diff --git a/src/Blazor.SourceGenerators/Readers/TypeDeclarationReader.LocalFiles.cs b/src/Blazor.SourceGenerators/Readers/TypeDeclarationReader.LocalFiles.cs index 688e979..6445641 100644 --- a/src/Blazor.SourceGenerators/Readers/TypeDeclarationReader.LocalFiles.cs +++ b/src/Blazor.SourceGenerators/Readers/TypeDeclarationReader.LocalFiles.cs @@ -1,9 +1,9 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Readers; - -internal sealed partial class TypeDeclarationReader -{ - string GetLocalFileText(string filePath) => File.ReadAllText(filePath); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Readers; + +internal sealed partial class TypeDeclarationReader +{ + string GetLocalFileText(string filePath) => File.ReadAllText(filePath); +} diff --git a/src/Blazor.SourceGenerators/Readers/TypeDeclarationReader.RemoteFile.cs b/src/Blazor.SourceGenerators/Readers/TypeDeclarationReader.RemoteFile.cs index 910bc94..d35991e 100644 --- a/src/Blazor.SourceGenerators/Readers/TypeDeclarationReader.RemoteFile.cs +++ b/src/Blazor.SourceGenerators/Readers/TypeDeclarationReader.RemoteFile.cs @@ -1,22 +1,22 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Readers; - -internal sealed partial class TypeDeclarationReader -{ - static readonly HttpClient s_httpClient = new(); - static readonly Uri s_defaultTypeDeclarationSource = - new("https://raw.githubusercontent.com/microsoft/TypeScript/main/lib/lib.dom.d.ts"); - - string GetRemoteFileText(string url) - { - var typeDeclarationText = - s_httpClient.GetStringAsync(url) - .ConfigureAwait(false) - .GetAwaiter() - .GetResult(); - - return typeDeclarationText; - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Readers; + +internal sealed partial class TypeDeclarationReader +{ + static readonly HttpClient s_httpClient = new(); + static readonly Uri s_defaultTypeDeclarationSource = + new("https://raw.githubusercontent.com/microsoft/TypeScript/main/lib/lib.dom.d.ts"); + + string GetRemoteFileText(string url) + { + var typeDeclarationText = + s_httpClient.GetStringAsync(url) + .ConfigureAwait(false) + .GetAwaiter() + .GetResult(); + + return typeDeclarationText; + } +} diff --git a/src/Blazor.SourceGenerators/Readers/TypeDeclarationReader.cs b/src/Blazor.SourceGenerators/Readers/TypeDeclarationReader.cs index 8f59aa7..a2ecd79 100644 --- a/src/Blazor.SourceGenerators/Readers/TypeDeclarationReader.cs +++ b/src/Blazor.SourceGenerators/Readers/TypeDeclarationReader.cs @@ -1,102 +1,102 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Readers; - -internal sealed partial class TypeDeclarationReader -{ - readonly Uri _typeDeclarationSource; - readonly Lazy _typeDeclarationText; - - IDictionary? _typeDeclarationMap; - IDictionary? _typeAliasMap; - - private IDictionary TypeDeclarationMap => - _typeDeclarationMap ??= ReadTypeDeclarationMap(_typeDeclarationText.Value); - - private IDictionary TypeAliasMap => - _typeAliasMap ??= ReadTypeAliasMap(_typeDeclarationText.Value); - - private TypeDeclarationReader( - Uri? typeDeclarationSource = null) - { - _typeDeclarationSource = typeDeclarationSource ?? s_defaultTypeDeclarationSource; - _typeDeclarationText = new Lazy( - valueFactory: () => _typeDeclarationSource.IsFile - ? GetLocalFileText(_typeDeclarationSource.LocalPath) - : GetRemoteFileText(_typeDeclarationSource.OriginalString)); - } - - IDictionary ReadTypeDeclarationMap(string typeDeclarations) - { - ConcurrentDictionary map = new(); - - try - { - if (typeDeclarations is { Length: > 0 }) - { - var matchCollection = - InterfaceRegex.Matches(typeDeclarations).Cast().Select(m => m.Value); - Parallel.ForEach( - matchCollection, - match => - { - var typeName = InterfaceTypeNameRegex.GetMatchGroupValue(match, "TypeName"); - if (typeName is not null) - { - map[typeName] = match; - } - }); - } - } - catch (Exception ex) - { - Console.WriteLine($"Error intializing lib dom parser. {ex}"); - } - - return map; - } - - IDictionary ReadTypeAliasMap(string typeDeclarations) - { - ConcurrentDictionary map = new(); - - try - { - if (typeDeclarations is { Length: > 0 }) - { - var matchCollection = - TypeRegex.Matches(typeDeclarations).Cast().Select(m => m.Value); - Parallel.ForEach( - matchCollection, - match => - { - var typeName = TypeNameRegex.GetMatchGroupValue(match, "TypeName"); - if (typeName is not null) - { - map[typeName] = match; - } - }); - } - } - catch (Exception ex) - { - Console.WriteLine($"Error intializing lib dom parser. {ex}"); - } - - return map; - } - - /// - /// For testing purposes. - /// - internal bool IsInitialized => TypeDeclarationMap is { Count: > 0 }; - - public bool TryGetDeclaration( - string typeName, out string? declaration) => - TypeDeclarationMap.TryGetValue(typeName, out declaration); - - public bool TryGetTypeAlias( - string typeAliasName, out string? typeAlias) => - TypeAliasMap.TryGetValue(typeAliasName, out typeAlias); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Readers; + +internal sealed partial class TypeDeclarationReader +{ + readonly Uri _typeDeclarationSource; + readonly Lazy _typeDeclarationText; + + IDictionary? _typeDeclarationMap; + IDictionary? _typeAliasMap; + + private IDictionary TypeDeclarationMap => + _typeDeclarationMap ??= ReadTypeDeclarationMap(_typeDeclarationText.Value); + + private IDictionary TypeAliasMap => + _typeAliasMap ??= ReadTypeAliasMap(_typeDeclarationText.Value); + + private TypeDeclarationReader( + Uri? typeDeclarationSource = null) + { + _typeDeclarationSource = typeDeclarationSource ?? s_defaultTypeDeclarationSource; + _typeDeclarationText = new Lazy( + valueFactory: () => _typeDeclarationSource.IsFile + ? GetLocalFileText(_typeDeclarationSource.LocalPath) + : GetRemoteFileText(_typeDeclarationSource.OriginalString)); + } + + IDictionary ReadTypeDeclarationMap(string typeDeclarations) + { + ConcurrentDictionary map = new(); + + try + { + if (typeDeclarations is { Length: > 0 }) + { + var matchCollection = + InterfaceRegex.Matches(typeDeclarations).Cast().Select(m => m.Value); + Parallel.ForEach( + matchCollection, + match => + { + var typeName = InterfaceTypeNameRegex.GetMatchGroupValue(match, "TypeName"); + if (typeName is not null) + { + map[typeName] = match; + } + }); + } + } + catch (Exception ex) + { + Console.WriteLine($"Error intializing lib dom parser. {ex}"); + } + + return map; + } + + IDictionary ReadTypeAliasMap(string typeDeclarations) + { + ConcurrentDictionary map = new(); + + try + { + if (typeDeclarations is { Length: > 0 }) + { + var matchCollection = + TypeRegex.Matches(typeDeclarations).Cast().Select(m => m.Value); + Parallel.ForEach( + matchCollection, + match => + { + var typeName = TypeNameRegex.GetMatchGroupValue(match, "TypeName"); + if (typeName is not null) + { + map[typeName] = match; + } + }); + } + } + catch (Exception ex) + { + Console.WriteLine($"Error intializing lib dom parser. {ex}"); + } + + return map; + } + + /// + /// For testing purposes. + /// + internal bool IsInitialized => TypeDeclarationMap is { Count: > 0 }; + + public bool TryGetDeclaration( + string typeName, out string? declaration) => + TypeDeclarationMap.TryGetValue(typeName, out declaration); + + public bool TryGetTypeAlias( + string typeAliasName, out string? typeAlias) => + TypeAliasMap.TryGetValue(typeAliasName, out typeAlias); +} diff --git a/src/Blazor.SourceGenerators/Source/SourceCode.BlazorHostingModel.cs b/src/Blazor.SourceGenerators/Source/SourceCode.BlazorHostingModel.cs index 51a75b5..c140706 100644 --- a/src/Blazor.SourceGenerators/Source/SourceCode.BlazorHostingModel.cs +++ b/src/Blazor.SourceGenerators/Source/SourceCode.BlazorHostingModel.cs @@ -1,24 +1,24 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Source; - -static partial class SourceCode -{ - internal const string BlazorHostingModel = @"/// -/// The Blazor hosting model source, either WebAssembly or Server. -/// -public enum BlazorHostingModel -{ - /// - /// This is the default. Use this to source generate targeting the synchronous IJSInProcessRuntime type. - /// - WebAssembly, - - /// - /// Use this to source generate targeting the synchronous IJSRuntime type. - /// - Server -}; -"; +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Source; + +static partial class SourceCode +{ + internal const string BlazorHostingModel = @"/// +/// The Blazor hosting model source, either WebAssembly or Server. +/// +public enum BlazorHostingModel +{ + /// + /// This is the default. Use this to source generate targeting the synchronous IJSInProcessRuntime type. + /// + WebAssembly, + + /// + /// Use this to source generate targeting the synchronous IJSRuntime type. + /// + Server +}; +"; } \ No newline at end of file diff --git a/src/Blazor.SourceGenerators/Source/SourceCode.JSAutoGenericInteropAttribute.cs b/src/Blazor.SourceGenerators/Source/SourceCode.JSAutoGenericInteropAttribute.cs index 6bf6768..d0d23e7 100644 --- a/src/Blazor.SourceGenerators/Source/SourceCode.JSAutoGenericInteropAttribute.cs +++ b/src/Blazor.SourceGenerators/Source/SourceCode.JSAutoGenericInteropAttribute.cs @@ -1,59 +1,59 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Source; - -static partial class SourceCode -{ - internal const string JSAutoGenericInteropAttribute = @"#nullable enable -/// -/// Use this attribute on public static partial extension method classes. -/// For example: -/// -/// -/// [JSAutoGenericInterop( -/// TypeName = ""Storage"", -/// Implementation = ""window.localStorage"", -/// HostingModel = BlazorHostingModel.WebAssembly, -/// Url = ""https://developer.mozilla.org/docs/Web/API/Window/localStorage"", -/// GenericMethodDescriptors = new[] -/// { -/// ""getItem"", -/// ""setItem:value"" -/// })] -/// public static partial LocalStorageExtensions -/// { -/// } -/// -/// -/// This will source generate all the extension methods for the IJSInProcessRuntime type for the localStorage APIs. -/// -public class JSAutoGenericInteropAttribute : JSAutoInteropAttribute -{ - /// - /// The descriptors that define which APIs are to use default JSON serialization and support generics. - /// For example: - /// - /// new[] - /// { - /// ""getItem"", // Serializes the return type of getItem as TValue - /// ""setItem:value"" // Serializes the value parameter of the setItem TValue - /// } - /// - /// - public string[] GenericMethodDescriptors { get; set; } = null!; - - /// - /// The overrides that define which APIs to override (only applicable for pure JavaScript). - /// For example: - /// - /// new[] - /// { - /// ""getVoices"", // A pure JS method with by this name will have a custom impl. - /// } - /// - /// - public string[] PureJavaScriptOverrides { get; set; } = null!; -} -"; +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Source; + +static partial class SourceCode +{ + internal const string JSAutoGenericInteropAttribute = @"#nullable enable +/// +/// Use this attribute on public static partial extension method classes. +/// For example: +/// +/// +/// [JSAutoGenericInterop( +/// TypeName = ""Storage"", +/// Implementation = ""window.localStorage"", +/// HostingModel = BlazorHostingModel.WebAssembly, +/// Url = ""https://developer.mozilla.org/docs/Web/API/Window/localStorage"", +/// GenericMethodDescriptors = new[] +/// { +/// ""getItem"", +/// ""setItem:value"" +/// })] +/// public static partial LocalStorageExtensions +/// { +/// } +/// +/// +/// This will source generate all the extension methods for the IJSInProcessRuntime type for the localStorage APIs. +/// +public class JSAutoGenericInteropAttribute : JSAutoInteropAttribute +{ + /// + /// The descriptors that define which APIs are to use default JSON serialization and support generics. + /// For example: + /// + /// new[] + /// { + /// ""getItem"", // Serializes the return type of getItem as TValue + /// ""setItem:value"" // Serializes the value parameter of the setItem TValue + /// } + /// + /// + public string[] GenericMethodDescriptors { get; set; } = null!; + + /// + /// The overrides that define which APIs to override (only applicable for pure JavaScript). + /// For example: + /// + /// new[] + /// { + /// ""getVoices"", // A pure JS method with by this name will have a custom impl. + /// } + /// + /// + public string[] PureJavaScriptOverrides { get; set; } = null!; +} +"; } \ No newline at end of file diff --git a/src/Blazor.SourceGenerators/Source/SourceCode.JSAutoInteropAttribute.cs b/src/Blazor.SourceGenerators/Source/SourceCode.JSAutoInteropAttribute.cs index b3ba543..5412597 100644 --- a/src/Blazor.SourceGenerators/Source/SourceCode.JSAutoInteropAttribute.cs +++ b/src/Blazor.SourceGenerators/Source/SourceCode.JSAutoInteropAttribute.cs @@ -1,68 +1,68 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Source; - -static partial class SourceCode -{ - internal const string JSAutoInteropAttribute = @"#nullable enable -/// -/// Use this attribute on public static partial extension method classes. -/// For example: -/// -/// [JSAutoInterop( -/// TypeName = ""Storage"", -/// Implementation = ""window.localStorage"", -/// HostingModel = BlazorHostingModel.WebAssembly, -/// Url = ""https://developer.mozilla.org/docs/Web/API/Window/localStorage"")] -/// public static partial LocalStorageExtensions -/// { -/// } -/// -/// This will source generate all the extension methods for the IJSInProcessRuntime type for the localStorage APIs. -/// -[AttributeUsage( - AttributeTargets.Interface, - Inherited = false, - AllowMultiple = false)] -public class JSAutoInteropAttribute : Attribute -{ - /// - /// The type name that corresponds to the lib.dom.d.ts interface. For example, ""Geolocation"". - /// For more information, search 'interface {Name}' - /// here for types. - /// - public string TypeName { get; set; } = null!; - - /// - /// The path from the window object to the corresponding implementation. - /// For example, if the was ""Geolocation"", this would be - /// ""window.navigator.geolocation"" (or ""navigator.geolocation""). - /// - public string Implementation { get; set; } = null!; - - /// - /// Whether to generate only pure JavaScript functions that do not require callbacks. - /// For example, ""Geolocation.clearWatch"" is consider pure, but ""Geolocation.watchPosition"" is not. - /// Defaults to true. - /// - public bool OnlyGeneratePureJS { get; set; } = true; - - /// - /// The Blazor hosting model to generate source for. WebAssembly creates IJSInProcessRuntime extensions, - /// while Server creates IJSRuntime extensions. Defaults to . - /// - public BlazorHostingModel HostingModel { get; set; } = BlazorHostingModel.WebAssembly; - - /// - /// The optional URL to the corresponding API. - /// - public string? Url { get; set; } - - /// - /// An optional array of TypeScript type declarations sources. Valid values are URLs or file paths. - /// - public string[]? TypeDeclarationSources { get; set; } -} -"; +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Source; + +static partial class SourceCode +{ + internal const string JSAutoInteropAttribute = @"#nullable enable +/// +/// Use this attribute on public static partial extension method classes. +/// For example: +/// +/// [JSAutoInterop( +/// TypeName = ""Storage"", +/// Implementation = ""window.localStorage"", +/// HostingModel = BlazorHostingModel.WebAssembly, +/// Url = ""https://developer.mozilla.org/docs/Web/API/Window/localStorage"")] +/// public static partial LocalStorageExtensions +/// { +/// } +/// +/// This will source generate all the extension methods for the IJSInProcessRuntime type for the localStorage APIs. +/// +[AttributeUsage( + AttributeTargets.Interface, + Inherited = false, + AllowMultiple = false)] +public class JSAutoInteropAttribute : Attribute +{ + /// + /// The type name that corresponds to the lib.dom.d.ts interface. For example, ""Geolocation"". + /// For more information, search 'interface {Name}' + /// here for types. + /// + public string TypeName { get; set; } = null!; + + /// + /// The path from the window object to the corresponding implementation. + /// For example, if the was ""Geolocation"", this would be + /// ""window.navigator.geolocation"" (or ""navigator.geolocation""). + /// + public string Implementation { get; set; } = null!; + + /// + /// Whether to generate only pure JavaScript functions that do not require callbacks. + /// For example, ""Geolocation.clearWatch"" is consider pure, but ""Geolocation.watchPosition"" is not. + /// Defaults to true. + /// + public bool OnlyGeneratePureJS { get; set; } = true; + + /// + /// The Blazor hosting model to generate source for. WebAssembly creates IJSInProcessRuntime extensions, + /// while Server creates IJSRuntime extensions. Defaults to . + /// + public BlazorHostingModel HostingModel { get; set; } = BlazorHostingModel.WebAssembly; + + /// + /// The optional URL to the corresponding API. + /// + public string? Url { get; set; } + + /// + /// An optional array of TypeScript type declarations sources. Valid values are URLs or file paths. + /// + public string[]? TypeDeclarationSources { get; set; } +} +"; } \ No newline at end of file diff --git a/src/Blazor.SourceGenerators/Source/SourceCode.RecordCompat.cs b/src/Blazor.SourceGenerators/Source/SourceCode.RecordCompat.cs index 2261b5e..9955f3d 100644 --- a/src/Blazor.SourceGenerators/Source/SourceCode.RecordCompat.cs +++ b/src/Blazor.SourceGenerators/Source/SourceCode.RecordCompat.cs @@ -1,15 +1,15 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - - -namespace Blazor.SourceGenerators.Source; -static partial class SourceCode -{ - internal const string RecordCompat = @"using System.ComponentModel; - -namespace System.Runtime.CompilerServices -{ - [EditorBrowsable(EditorBrowsableState.Never)] - internal class IsExternalInit { } -}"; -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + + +namespace Blazor.SourceGenerators.Source; +static partial class SourceCode +{ + internal const string RecordCompat = @"using System.ComponentModel; + +namespace System.Runtime.CompilerServices +{ + [EditorBrowsable(EditorBrowsableState.Never)] + internal class IsExternalInit { } +}"; +} diff --git a/src/Blazor.SourceGenerators/Types/TypeMap.cs b/src/Blazor.SourceGenerators/Types/TypeMap.cs index 6e2de51..e8d9456 100644 --- a/src/Blazor.SourceGenerators/Types/TypeMap.cs +++ b/src/Blazor.SourceGenerators/Types/TypeMap.cs @@ -1,40 +1,40 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Blazor.SourceGenerators.Types; - -internal static class TypeMap -{ - internal static readonly Primitives PrimitiveTypes = new(); - - internal class Primitives - { - internal static readonly Dictionary _primitiveTypeMap = - new(StringComparer.OrdinalIgnoreCase) - { - // The JavaScript Number type is a double-precision 64-bit binary format IEEE 754 value - ["number"] = "double", - ["string"] = "string", - ["boolean"] = "bool", - ["enum"] = "enum", - ["Date"] = "DateTime", - ["DOMTimeStamp"] = "long", - ["EpochTimeStamp"] = "long", - ["number | null"] = "double?", - ["string | null"] = "string?", - ["boolean | null"] = "bool?", - ["enum | null"] = "enum?", - ["Date | null"] = "DateTime?", - ["DOMTimeStamp | null"] = "long?", - ["EpochTimeStamp | null"] = "long?", - //["Array"] = "[]" - }; - - internal bool IsPrimitiveType(string typeScriptType) => - _primitiveTypeMap.ContainsKey(typeScriptType) || - _primitiveTypeMap.Values.Any(value => value == typeScriptType); - - internal string this[string typeScriptType] => - _primitiveTypeMap.TryGetValue(typeScriptType, out var csharpType) ? csharpType : typeScriptType; - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Blazor.SourceGenerators.Types; + +internal static class TypeMap +{ + internal static readonly Primitives PrimitiveTypes = new(); + + internal class Primitives + { + internal static readonly Dictionary _primitiveTypeMap = + new(StringComparer.OrdinalIgnoreCase) + { + // The JavaScript Number type is a double-precision 64-bit binary format IEEE 754 value + ["number"] = "double", + ["string"] = "string", + ["boolean"] = "bool", + ["enum"] = "enum", + ["Date"] = "DateTime", + ["DOMTimeStamp"] = "long", + ["EpochTimeStamp"] = "long", + ["number | null"] = "double?", + ["string | null"] = "string?", + ["boolean | null"] = "bool?", + ["enum | null"] = "enum?", + ["Date | null"] = "DateTime?", + ["DOMTimeStamp | null"] = "long?", + ["EpochTimeStamp | null"] = "long?", + //["Array"] = "[]" + }; + + internal bool IsPrimitiveType(string typeScriptType) => + _primitiveTypeMap.ContainsKey(typeScriptType) || + _primitiveTypeMap.Values.Any(value => value == typeScriptType); + + internal string this[string typeScriptType] => + _primitiveTypeMap.TryGetValue(typeScriptType, out var csharpType) ? csharpType : typeScriptType; + } +} diff --git a/src/Blazor.SpeechRecognition.WebAssembly/DefaultSpeechRecognitionService.cs b/src/Blazor.SpeechRecognition.WebAssembly/DefaultSpeechRecognitionService.cs index 6091a57..88dc148 100644 --- a/src/Blazor.SpeechRecognition.WebAssembly/DefaultSpeechRecognitionService.cs +++ b/src/Blazor.SpeechRecognition.WebAssembly/DefaultSpeechRecognitionService.cs @@ -1,110 +1,110 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -internal sealed class DefaultSpeechRecognitionService : ISpeechRecognitionService -{ - readonly IJSInProcessRuntime _javaScript; - readonly SpeechRecognitionCallbackRegistry _callbackRegistry = new(); - - IJSInProcessObjectReference? _speechRecognitionModule; - SpeechRecognitionSubject? _speechRecognition; - - public DefaultSpeechRecognitionService( - IJSInProcessRuntime javaScript) => _javaScript = javaScript; - - void InitializeSpeechRecognitionSubject() - { - if (_speechRecognition is not null) - { - CancelSpeechRecognition(false); - _speechRecognition.Dispose(); - } - - _speechRecognition = SpeechRecognitionSubject.Factory( - _callbackRegistry.InvokeOnRecognized); - } - - /// - public async Task InitializeModuleAsync(bool logModuleDetails) - { - _speechRecognitionModule = - await _javaScript.InvokeAsync( - "import", - "./_content/Blazor.SpeechRecognition.WebAssembly/blazorators.speechRecognition.js"); - - if (logModuleDetails) - { - _speechRecognitionModule?.InvokeVoid( - JavaScriptInteropMethodIdentifiers.LogModuleDetails); - } - } - - /// - public void CancelSpeechRecognition( - bool isAborted) => - _speechRecognitionModule?.InvokeVoid( - JavaScriptInteropMethodIdentifiers.CancelSpeechRecognition, - isAborted); - - /// - public IDisposable RecognizeSpeech( - string language, - Action onRecognized, - Action? onError, - Action? onStarted, - Action? onEnded) - { - InitializeSpeechRecognitionSubject(); - - var key = Guid.NewGuid(); - _callbackRegistry.RegisterOnRecognized(key, onRecognized); - - if (onError is not null) - _callbackRegistry.RegisterOnError(key, onError); - if (onStarted is not null) - _callbackRegistry.RegisterOnStarted(key, onStarted); - if (onEnded is not null) - _callbackRegistry.RegisterOnEnded(key, onEnded); - - _speechRecognitionModule?.InvokeVoid( - JavaScriptInteropMethodIdentifiers.RecognizeSpeech, - DotNetObjectReference.Create(this), - language, - key, - nameof(OnSpeechRecognized), - nameof(OnRecognitionError), - nameof(OnStarted), - nameof(OnEnded)); - - return _speechRecognition!; - } - - [JSInvokable] - public void OnStarted(string key) => _callbackRegistry.InvokeOnStarted(key); - - [JSInvokable] - public void OnEnded(string key) => _callbackRegistry.InvokeOnEnded(key); - - [JSInvokable] - public void OnRecognitionError(string key, SpeechRecognitionErrorEvent errorEvent) => - _callbackRegistry.InvokeOnError(key, errorEvent); - - [JSInvokable] - public void OnSpeechRecognized(string key, string transcript, bool isFinal) => - _speechRecognition?.RecognitionReceived( - new SpeechRecognitionResult(key, transcript, isFinal)); - - async ValueTask IAsyncDisposable.DisposeAsync() - { - _speechRecognition?.Dispose(); - _speechRecognition = null; - - if (_speechRecognitionModule is not null) - { - await _speechRecognitionModule.DisposeAsync(); - _speechRecognitionModule = null; - } - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +internal sealed class DefaultSpeechRecognitionService : ISpeechRecognitionService +{ + readonly IJSInProcessRuntime _javaScript; + readonly SpeechRecognitionCallbackRegistry _callbackRegistry = new(); + + IJSInProcessObjectReference? _speechRecognitionModule; + SpeechRecognitionSubject? _speechRecognition; + + public DefaultSpeechRecognitionService( + IJSInProcessRuntime javaScript) => _javaScript = javaScript; + + void InitializeSpeechRecognitionSubject() + { + if (_speechRecognition is not null) + { + CancelSpeechRecognition(false); + _speechRecognition.Dispose(); + } + + _speechRecognition = SpeechRecognitionSubject.Factory( + _callbackRegistry.InvokeOnRecognized); + } + + /// + public async Task InitializeModuleAsync(bool logModuleDetails) + { + _speechRecognitionModule = + await _javaScript.InvokeAsync( + "import", + "./_content/Blazor.SpeechRecognition.WebAssembly/blazorators.speechRecognition.js"); + + if (logModuleDetails) + { + _speechRecognitionModule?.InvokeVoid( + JavaScriptInteropMethodIdentifiers.LogModuleDetails); + } + } + + /// + public void CancelSpeechRecognition( + bool isAborted) => + _speechRecognitionModule?.InvokeVoid( + JavaScriptInteropMethodIdentifiers.CancelSpeechRecognition, + isAborted); + + /// + public IDisposable RecognizeSpeech( + string language, + Action onRecognized, + Action? onError, + Action? onStarted, + Action? onEnded) + { + InitializeSpeechRecognitionSubject(); + + var key = Guid.NewGuid(); + _callbackRegistry.RegisterOnRecognized(key, onRecognized); + + if (onError is not null) + _callbackRegistry.RegisterOnError(key, onError); + if (onStarted is not null) + _callbackRegistry.RegisterOnStarted(key, onStarted); + if (onEnded is not null) + _callbackRegistry.RegisterOnEnded(key, onEnded); + + _speechRecognitionModule?.InvokeVoid( + JavaScriptInteropMethodIdentifiers.RecognizeSpeech, + DotNetObjectReference.Create(this), + language, + key, + nameof(OnSpeechRecognized), + nameof(OnRecognitionError), + nameof(OnStarted), + nameof(OnEnded)); + + return _speechRecognition!; + } + + [JSInvokable] + public void OnStarted(string key) => _callbackRegistry.InvokeOnStarted(key); + + [JSInvokable] + public void OnEnded(string key) => _callbackRegistry.InvokeOnEnded(key); + + [JSInvokable] + public void OnRecognitionError(string key, SpeechRecognitionErrorEvent errorEvent) => + _callbackRegistry.InvokeOnError(key, errorEvent); + + [JSInvokable] + public void OnSpeechRecognized(string key, string transcript, bool isFinal) => + _speechRecognition?.RecognitionReceived( + new SpeechRecognitionResult(key, transcript, isFinal)); + + async ValueTask IAsyncDisposable.DisposeAsync() + { + _speechRecognition?.Dispose(); + _speechRecognition = null; + + if (_speechRecognitionModule is not null) + { + await _speechRecognitionModule.DisposeAsync(); + _speechRecognitionModule = null; + } + } +} diff --git a/src/Blazor.SpeechRecognition.WebAssembly/Extensions/SpeechRecognitionServiceCollectionExtensions.cs b/src/Blazor.SpeechRecognition.WebAssembly/Extensions/SpeechRecognitionServiceCollectionExtensions.cs index 04d46b8..051a791 100644 --- a/src/Blazor.SpeechRecognition.WebAssembly/Extensions/SpeechRecognitionServiceCollectionExtensions.cs +++ b/src/Blazor.SpeechRecognition.WebAssembly/Extensions/SpeechRecognitionServiceCollectionExtensions.cs @@ -1,22 +1,22 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.Extensions.DependencyInjection; - -/// -/// Extensions methods for registering the type. -/// -public static class SpeechRecognitionServiceCollectionExtensions -{ - /// - /// Adds the necessary services for the to be consumable. - /// - /// The service collection to add additional services to. - /// The same instance that was added to. - public static IServiceCollection AddSpeechRecognitionServices( - this IServiceCollection services) => - services.AddSingleton( - serviceProvider => - (IJSInProcessRuntime)serviceProvider.GetRequiredService()) - .AddSingleton(); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.Extensions.DependencyInjection; + +/// +/// Extensions methods for registering the type. +/// +public static class SpeechRecognitionServiceCollectionExtensions +{ + /// + /// Adds the necessary services for the to be consumable. + /// + /// The service collection to add additional services to. + /// The same instance that was added to. + public static IServiceCollection AddSpeechRecognitionServices( + this IServiceCollection services) => + services.AddSingleton( + serviceProvider => + (IJSInProcessRuntime)serviceProvider.GetRequiredService()) + .AddSingleton(); +} diff --git a/src/Blazor.SpeechRecognition.WebAssembly/GlobalUsings.cs b/src/Blazor.SpeechRecognition.WebAssembly/GlobalUsings.cs index 8ec4df0..480136c 100644 --- a/src/Blazor.SpeechRecognition.WebAssembly/GlobalUsings.cs +++ b/src/Blazor.SpeechRecognition.WebAssembly/GlobalUsings.cs @@ -1,8 +1,8 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -global using System.Collections.Concurrent; -global using System.Reactive.Linq; -global using System.Reactive.Subjects; -global using System.Text.Json.Serialization; -global using Microsoft.JSInterop; +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +global using System.Collections.Concurrent; +global using System.Reactive.Linq; +global using System.Reactive.Subjects; +global using System.Text.Json.Serialization; +global using Microsoft.JSInterop; diff --git a/src/Blazor.SpeechRecognition.WebAssembly/ISpeechRecognitionService.cs b/src/Blazor.SpeechRecognition.WebAssembly/ISpeechRecognitionService.cs index a623730..64d4591 100644 --- a/src/Blazor.SpeechRecognition.WebAssembly/ISpeechRecognitionService.cs +++ b/src/Blazor.SpeechRecognition.WebAssembly/ISpeechRecognitionService.cs @@ -1,50 +1,50 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -/// -/// A service the exposes various JavaScript interop capabilities specific to the -/// speechRecognition APIs. See -/// -public interface ISpeechRecognitionService : IAsyncDisposable -{ - /// - /// Call once, before using in the consuming components - /// OnAfterRenderAsync(bool firstRender) override, when firstRender is true. - /// - /// - /// When true, logs the module details to the JavaScript console as a group. - /// - Task InitializeModuleAsync(bool logModuleDetails = true); - - /// - /// Cancels the active speech recognition session. - /// - /// - /// Is aborted controls which API to call, - /// either speechRecognition.stop or speechRecognition.abort. - /// - void CancelSpeechRecognition(bool isAborted); - - /// - /// Starts the speech recognition process. Returns an - /// that acts as the subscription. The various callbacks are invoked as they occur, - /// and will continue to fire until the subscription is disposed of. - /// - /// The BCP47 language tag. - /// The callback to invoke when onrecognized fires. - /// The optional callback to invoke when onerror fires. - /// The optional callback to invoke when onstarted fires. - /// The optional callback to invoke when onended fires. - /// - /// To unsubscribe from the speech recognition, call - /// . - /// - IDisposable RecognizeSpeech( - string language, - Action onRecognized, - Action? onError = null, - Action? onStarted = null, - Action? onEnded = null); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +/// +/// A service the exposes various JavaScript interop capabilities specific to the +/// speechRecognition APIs. See +/// +public interface ISpeechRecognitionService : IAsyncDisposable +{ + /// + /// Call once, before using in the consuming components + /// OnAfterRenderAsync(bool firstRender) override, when firstRender is true. + /// + /// + /// When true, logs the module details to the JavaScript console as a group. + /// + Task InitializeModuleAsync(bool logModuleDetails = true); + + /// + /// Cancels the active speech recognition session. + /// + /// + /// Is aborted controls which API to call, + /// either speechRecognition.stop or speechRecognition.abort. + /// + void CancelSpeechRecognition(bool isAborted); + + /// + /// Starts the speech recognition process. Returns an + /// that acts as the subscription. The various callbacks are invoked as they occur, + /// and will continue to fire until the subscription is disposed of. + /// + /// The BCP47 language tag. + /// The callback to invoke when onrecognized fires. + /// The optional callback to invoke when onerror fires. + /// The optional callback to invoke when onstarted fires. + /// The optional callback to invoke when onended fires. + /// + /// To unsubscribe from the speech recognition, call + /// . + /// + IDisposable RecognizeSpeech( + string language, + Action onRecognized, + Action? onError = null, + Action? onStarted = null, + Action? onEnded = null); +} diff --git a/src/Blazor.SpeechRecognition.WebAssembly/JavaScriptInteropMethodIdentifiers.cs b/src/Blazor.SpeechRecognition.WebAssembly/JavaScriptInteropMethodIdentifiers.cs index 6c3f158..237420c 100644 --- a/src/Blazor.SpeechRecognition.WebAssembly/JavaScriptInteropMethodIdentifiers.cs +++ b/src/Blazor.SpeechRecognition.WebAssembly/JavaScriptInteropMethodIdentifiers.cs @@ -1,11 +1,11 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -internal static class JavaScriptInteropMethodIdentifiers -{ - internal const string RecognizeSpeech = "recognizeSpeech"; - internal const string CancelSpeechRecognition = "cancelSpeechRecognition"; - internal const string LogModuleDetails = "logModuleDetails"; -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +internal static class JavaScriptInteropMethodIdentifiers +{ + internal const string RecognizeSpeech = "recognizeSpeech"; + internal const string CancelSpeechRecognition = "cancelSpeechRecognition"; + internal const string LogModuleDetails = "logModuleDetails"; +} diff --git a/src/Blazor.SpeechRecognition.WebAssembly/Models/SpeechRecognitionErrorEvent.cs b/src/Blazor.SpeechRecognition.WebAssembly/Models/SpeechRecognitionErrorEvent.cs index 668481b..873a447 100644 --- a/src/Blazor.SpeechRecognition.WebAssembly/Models/SpeechRecognitionErrorEvent.cs +++ b/src/Blazor.SpeechRecognition.WebAssembly/Models/SpeechRecognitionErrorEvent.cs @@ -1,13 +1,13 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -/// -/// The speech recognition error and message pair. -/// -/// The error's -/// -public record class SpeechRecognitionErrorEvent( - [property: JsonPropertyName("error")] string Error, +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +/// +/// The speech recognition error and message pair. +/// +/// The error's +/// +public record class SpeechRecognitionErrorEvent( + [property: JsonPropertyName("error")] string Error, [property: JsonPropertyName("message")] string Message); \ No newline at end of file diff --git a/src/Blazor.SpeechRecognition.WebAssembly/Models/SpeechRecognitionResult.cs b/src/Blazor.SpeechRecognition.WebAssembly/Models/SpeechRecognitionResult.cs index c39418f..bb1c906 100644 --- a/src/Blazor.SpeechRecognition.WebAssembly/Models/SpeechRecognitionResult.cs +++ b/src/Blazor.SpeechRecognition.WebAssembly/Models/SpeechRecognitionResult.cs @@ -1,22 +1,22 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -/// -/// An object representing the result of speech recongition. -/// -/// -/// A value that uniquely identifies the recognition result. -/// Is typically used to pair callbacks to callers. -/// -/// -/// The current text transcript from what was recognized as speech. -/// -/// -/// Whether the value is considered final. -/// When true, the contains a -/// complete text representation of the recognized speech. -/// -public record class SpeechRecognitionResult( +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +/// +/// An object representing the result of speech recongition. +/// +/// +/// A value that uniquely identifies the recognition result. +/// Is typically used to pair callbacks to callers. +/// +/// +/// The current text transcript from what was recognized as speech. +/// +/// +/// Whether the value is considered final. +/// When true, the contains a +/// complete text representation of the recognized speech. +/// +public record class SpeechRecognitionResult( string Key, string Transcript, bool IsFinal); \ No newline at end of file diff --git a/src/Blazor.SpeechRecognition.WebAssembly/SpeechRecognitionCallbackRegistry.cs b/src/Blazor.SpeechRecognition.WebAssembly/SpeechRecognitionCallbackRegistry.cs index 24f995a..853fd23 100644 --- a/src/Blazor.SpeechRecognition.WebAssembly/SpeechRecognitionCallbackRegistry.cs +++ b/src/Blazor.SpeechRecognition.WebAssembly/SpeechRecognitionCallbackRegistry.cs @@ -1,76 +1,76 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -internal sealed class SpeechRecognitionCallbackRegistry -{ - readonly ConcurrentDictionary> _onResultCallbackRegister = new(); - readonly ConcurrentDictionary> _onErrorCallbackRegister = new(); - readonly ConcurrentDictionary _onStartedCallbackRegister = new(); - readonly ConcurrentDictionary _onEndedCallbackRegister = new(); - - internal void RegisterOnRecognized( - Guid key, Action callback) => - _onResultCallbackRegister[key] = callback; - - internal void RegisterOnError( - Guid key, Action callback) => - _onErrorCallbackRegister[key] = callback; - - internal void RegisterOnStarted( - Guid key, Action callback) => - _onStartedCallbackRegister[key] = callback; - - internal void RegisterOnEnded( - Guid key, Action callback) => - _onEndedCallbackRegister[key] = callback; - - internal void InvokeOnRecognized( - string key, string transcript) => - OnInvokeCallback( - key, _onResultCallbackRegister, - callback => callback?.Invoke(transcript), - remove: false); - - internal void InvokeOnError( - string key, SpeechRecognitionErrorEvent error) => - OnInvokeCallback( - key, _onErrorCallbackRegister, - callback => callback?.Invoke(error)); - - internal void InvokeOnStarted(string key) => - OnInvokeCallback( - key, _onStartedCallbackRegister, - callback => callback?.Invoke()); - - internal void InvokeOnEnded(string key) => - OnInvokeCallback( - key, _onEndedCallbackRegister, - callback => callback?.Invoke()); - - static void OnInvokeCallback( - string key, - ConcurrentDictionary callbackRegister, - Action handleCallback, - bool remove = true) - { - if (key is null or { Length: 0 } || - callbackRegister is null or { Count: 0 }) - { - return; - } - - if (Guid.TryParse(key, out var guid)) - { - if (remove && callbackRegister.TryRemove(guid, out var callback)) - { - handleCallback?.Invoke(callback); - } - else if (!remove && callbackRegister.TryGetValue(guid, out callback)) - { - handleCallback?.Invoke(callback); - } - } - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +internal sealed class SpeechRecognitionCallbackRegistry +{ + readonly ConcurrentDictionary> _onResultCallbackRegister = new(); + readonly ConcurrentDictionary> _onErrorCallbackRegister = new(); + readonly ConcurrentDictionary _onStartedCallbackRegister = new(); + readonly ConcurrentDictionary _onEndedCallbackRegister = new(); + + internal void RegisterOnRecognized( + Guid key, Action callback) => + _onResultCallbackRegister[key] = callback; + + internal void RegisterOnError( + Guid key, Action callback) => + _onErrorCallbackRegister[key] = callback; + + internal void RegisterOnStarted( + Guid key, Action callback) => + _onStartedCallbackRegister[key] = callback; + + internal void RegisterOnEnded( + Guid key, Action callback) => + _onEndedCallbackRegister[key] = callback; + + internal void InvokeOnRecognized( + string key, string transcript) => + OnInvokeCallback( + key, _onResultCallbackRegister, + callback => callback?.Invoke(transcript), + remove: false); + + internal void InvokeOnError( + string key, SpeechRecognitionErrorEvent error) => + OnInvokeCallback( + key, _onErrorCallbackRegister, + callback => callback?.Invoke(error)); + + internal void InvokeOnStarted(string key) => + OnInvokeCallback( + key, _onStartedCallbackRegister, + callback => callback?.Invoke()); + + internal void InvokeOnEnded(string key) => + OnInvokeCallback( + key, _onEndedCallbackRegister, + callback => callback?.Invoke()); + + static void OnInvokeCallback( + string key, + ConcurrentDictionary callbackRegister, + Action handleCallback, + bool remove = true) + { + if (key is null or { Length: 0 } || + callbackRegister is null or { Count: 0 }) + { + return; + } + + if (Guid.TryParse(key, out var guid)) + { + if (remove && callbackRegister.TryRemove(guid, out var callback)) + { + handleCallback?.Invoke(callback); + } + else if (!remove && callbackRegister.TryGetValue(guid, out callback)) + { + handleCallback?.Invoke(callback); + } + } + } +} diff --git a/src/Blazor.SpeechRecognition.WebAssembly/SpeechRecognitionSubject.cs b/src/Blazor.SpeechRecognition.WebAssembly/SpeechRecognitionSubject.cs index 31d5213..07e299d 100644 --- a/src/Blazor.SpeechRecognition.WebAssembly/SpeechRecognitionSubject.cs +++ b/src/Blazor.SpeechRecognition.WebAssembly/SpeechRecognitionSubject.cs @@ -1,36 +1,36 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -internal sealed class SpeechRecognitionSubject : IDisposable -{ - readonly Subject _speechRecognitionSubject = new(); - readonly IObservable<(string, string)> _speechRecognitionObservable; - readonly IDisposable _speechRecognitionSubscription; - readonly Action _observer; - - private SpeechRecognitionSubject( - Action observer) - { - _observer = observer; - _speechRecognitionObservable = - _speechRecognitionSubject.AsObservable() - .Where(recognition => recognition.IsFinal) - .Select(recognition => (recognition.Key, recognition.Transcript)); - - _speechRecognitionSubscription = - _speechRecognitionObservable.Subscribe( - ((string Key, string SpeechRecognition) tuple) => - _observer(tuple.Key, tuple.SpeechRecognition)); - } - - internal static SpeechRecognitionSubject Factory( - Action observer) => new(observer); - - internal void RecognitionReceived( - SpeechRecognitionResult recognition) => - _speechRecognitionSubject.OnNext(recognition); - - public void Dispose() => _speechRecognitionSubscription.Dispose(); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +internal sealed class SpeechRecognitionSubject : IDisposable +{ + readonly Subject _speechRecognitionSubject = new(); + readonly IObservable<(string, string)> _speechRecognitionObservable; + readonly IDisposable _speechRecognitionSubscription; + readonly Action _observer; + + private SpeechRecognitionSubject( + Action observer) + { + _observer = observer; + _speechRecognitionObservable = + _speechRecognitionSubject.AsObservable() + .Where(recognition => recognition.IsFinal) + .Select(recognition => (recognition.Key, recognition.Transcript)); + + _speechRecognitionSubscription = + _speechRecognitionObservable.Subscribe( + ((string Key, string SpeechRecognition) tuple) => + _observer(tuple.Key, tuple.SpeechRecognition)); + } + + internal static SpeechRecognitionSubject Factory( + Action observer) => new(observer); + + internal void RecognitionReceived( + SpeechRecognitionResult recognition) => + _speechRecognitionSubject.OnNext(recognition); + + public void Dispose() => _speechRecognitionSubscription.Dispose(); +} diff --git a/src/Blazor.SpeechRecognition/DefaultSpeechRecognitionService.cs b/src/Blazor.SpeechRecognition/DefaultSpeechRecognitionService.cs index 0771e89..dffe7bd 100644 --- a/src/Blazor.SpeechRecognition/DefaultSpeechRecognitionService.cs +++ b/src/Blazor.SpeechRecognition/DefaultSpeechRecognitionService.cs @@ -1,160 +1,160 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -internal sealed class DefaultSpeechRecognitionService : ISpeechRecognitionService -{ - readonly ConcurrentDictionary> _onStartedCallbackRegistry = new(); - readonly ConcurrentDictionary> _onEndedCallbackRegistry = new(); - readonly ConcurrentDictionary> _onErrorCallbackRegistry = new(); - readonly ConcurrentDictionary> _onResultCallbackRegistry = new(); - readonly Lazy> _speechRecognitionModule; - SpeechRecognitionSubject? _speechRecognition; - - public DefaultSpeechRecognitionService( - IJSRuntime javaScript) => - _speechRecognitionModule = - new(() => javaScript.InvokeAsync( - "import", - "./_content/Blazor.SpeechRecognition.WebAssembly/blazorators.speechRecognition.js") - .AsTask()); - - async ValueTask InitializeSpeechRecognitionSubjectAsync() - { - if (_speechRecognition is not null) - { - await CancelSpeechRecognitionAsync(false); - _speechRecognition.Dispose(); - } - - _speechRecognition = SpeechRecognitionSubject.Factory( - async (key, speechRecognition) => - { - if (Guid.TryParse(key, out var guid) && - _onResultCallbackRegistry.TryGetValue(guid, out var onRecognized)) - { - await onRecognized.Invoke(speechRecognition) - .ConfigureAwait(false); - } - }); - } - - /// - public async Task CancelSpeechRecognitionAsync(bool isAborted) - { - var module = await _speechRecognitionModule.Value; - if (module is not null) - { - await module.InvokeVoidAsync( - JavaScriptInteropMethodIdentifiers.CancelSpeechRecognition, - isAborted); - } - } - - /// - public async Task RecognizeSpeechAsync( - string language, - Func onRecognized, - Func? onError, - Func? onStarted, - Func? onEnded) - { - var module = await _speechRecognitionModule.Value; - if (module is not null) - { - await InitializeSpeechRecognitionSubjectAsync(); - - var key = Guid.NewGuid(); - - if (onStarted is not null) _onStartedCallbackRegistry[key] = onStarted; - if (onEnded is not null) _onEndedCallbackRegistry[key] = onEnded; - if (onError is not null) _onErrorCallbackRegistry[key] = onError; - - _onResultCallbackRegistry.Clear(); - _onResultCallbackRegistry[key] = onRecognized; - - await module.InvokeVoidAsync( - JavaScriptInteropMethodIdentifiers.RecognizeSpeech, - DotNetObjectReference.Create(this), - language, - key, - nameof(OnSpeechRecongizedAsync), - nameof(OnRecognitionErrorAsync), - nameof(OnStartedAsync), - nameof(OnEndedAsync)); - } - - return _speechRecognition!; - } - - [JSInvokable] - public Task OnStartedAsync(string key) => - OnInvokeCallbackAsync( - key, _onStartedCallbackRegistry, - async callback => - await callback.Invoke().ConfigureAwait(false)); - - [JSInvokable] - public Task OnEndedAsync(string key) => - OnInvokeCallbackAsync( - key, _onEndedCallbackRegistry, - async callback => - await callback.Invoke().ConfigureAwait(false)); - - [JSInvokable] - public Task OnRecognitionErrorAsync(string key, SpeechRecognitionErrorEvent errorEvent) => - OnInvokeCallbackAsync( - key, _onErrorCallbackRegistry, - async callback => - await callback.Invoke(errorEvent).ConfigureAwait(false)); - - [JSInvokable] - public void OnSpeechRecongizedAsync(string key, string transcript, bool isFinal) => - _speechRecognition?.RecognitionReceived( - new SpeechRecognitionResult(key, transcript, isFinal)); - - static Task OnInvokeCallbackAsync( - string key, - ConcurrentDictionary callbackRegistry, - Func handleCallback, - bool remove = true) - { - if (key is null or { Length: 0 }) - { - return Task.CompletedTask; - } - - if (callbackRegistry is null or { Count: 0 }) - { - return Task.CompletedTask; - } - - if (handleCallback is not null && - Guid.TryParse(key, out var guid)) - { - if (remove && callbackRegistry.TryRemove(guid, out var callback)) - { - handleCallback?.Invoke(callback); - } - else if (!remove && callbackRegistry.TryGetValue(guid, out callback)) - { - handleCallback?.Invoke(callback); - } - } - - return Task.CompletedTask; - } - - async ValueTask IAsyncDisposable.DisposeAsync() - { - _speechRecognition?.Dispose(); - _speechRecognition = null; - - if (_speechRecognitionModule.IsValueCreated) - { - var module = await _speechRecognitionModule.Value; - await module.DisposeAsync(); - } - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +internal sealed class DefaultSpeechRecognitionService : ISpeechRecognitionService +{ + readonly ConcurrentDictionary> _onStartedCallbackRegistry = new(); + readonly ConcurrentDictionary> _onEndedCallbackRegistry = new(); + readonly ConcurrentDictionary> _onErrorCallbackRegistry = new(); + readonly ConcurrentDictionary> _onResultCallbackRegistry = new(); + readonly Lazy> _speechRecognitionModule; + SpeechRecognitionSubject? _speechRecognition; + + public DefaultSpeechRecognitionService( + IJSRuntime javaScript) => + _speechRecognitionModule = + new(() => javaScript.InvokeAsync( + "import", + "./_content/Blazor.SpeechRecognition.WebAssembly/blazorators.speechRecognition.js") + .AsTask()); + + async ValueTask InitializeSpeechRecognitionSubjectAsync() + { + if (_speechRecognition is not null) + { + await CancelSpeechRecognitionAsync(false); + _speechRecognition.Dispose(); + } + + _speechRecognition = SpeechRecognitionSubject.Factory( + async (key, speechRecognition) => + { + if (Guid.TryParse(key, out var guid) && + _onResultCallbackRegistry.TryGetValue(guid, out var onRecognized)) + { + await onRecognized.Invoke(speechRecognition) + .ConfigureAwait(false); + } + }); + } + + /// + public async Task CancelSpeechRecognitionAsync(bool isAborted) + { + var module = await _speechRecognitionModule.Value; + if (module is not null) + { + await module.InvokeVoidAsync( + JavaScriptInteropMethodIdentifiers.CancelSpeechRecognition, + isAborted); + } + } + + /// + public async Task RecognizeSpeechAsync( + string language, + Func onRecognized, + Func? onError, + Func? onStarted, + Func? onEnded) + { + var module = await _speechRecognitionModule.Value; + if (module is not null) + { + await InitializeSpeechRecognitionSubjectAsync(); + + var key = Guid.NewGuid(); + + if (onStarted is not null) _onStartedCallbackRegistry[key] = onStarted; + if (onEnded is not null) _onEndedCallbackRegistry[key] = onEnded; + if (onError is not null) _onErrorCallbackRegistry[key] = onError; + + _onResultCallbackRegistry.Clear(); + _onResultCallbackRegistry[key] = onRecognized; + + await module.InvokeVoidAsync( + JavaScriptInteropMethodIdentifiers.RecognizeSpeech, + DotNetObjectReference.Create(this), + language, + key, + nameof(OnSpeechRecongizedAsync), + nameof(OnRecognitionErrorAsync), + nameof(OnStartedAsync), + nameof(OnEndedAsync)); + } + + return _speechRecognition!; + } + + [JSInvokable] + public Task OnStartedAsync(string key) => + OnInvokeCallbackAsync( + key, _onStartedCallbackRegistry, + async callback => + await callback.Invoke().ConfigureAwait(false)); + + [JSInvokable] + public Task OnEndedAsync(string key) => + OnInvokeCallbackAsync( + key, _onEndedCallbackRegistry, + async callback => + await callback.Invoke().ConfigureAwait(false)); + + [JSInvokable] + public Task OnRecognitionErrorAsync(string key, SpeechRecognitionErrorEvent errorEvent) => + OnInvokeCallbackAsync( + key, _onErrorCallbackRegistry, + async callback => + await callback.Invoke(errorEvent).ConfigureAwait(false)); + + [JSInvokable] + public void OnSpeechRecongizedAsync(string key, string transcript, bool isFinal) => + _speechRecognition?.RecognitionReceived( + new SpeechRecognitionResult(key, transcript, isFinal)); + + static Task OnInvokeCallbackAsync( + string key, + ConcurrentDictionary callbackRegistry, + Func handleCallback, + bool remove = true) + { + if (key is null or { Length: 0 }) + { + return Task.CompletedTask; + } + + if (callbackRegistry is null or { Count: 0 }) + { + return Task.CompletedTask; + } + + if (handleCallback is not null && + Guid.TryParse(key, out var guid)) + { + if (remove && callbackRegistry.TryRemove(guid, out var callback)) + { + handleCallback?.Invoke(callback); + } + else if (!remove && callbackRegistry.TryGetValue(guid, out callback)) + { + handleCallback?.Invoke(callback); + } + } + + return Task.CompletedTask; + } + + async ValueTask IAsyncDisposable.DisposeAsync() + { + _speechRecognition?.Dispose(); + _speechRecognition = null; + + if (_speechRecognitionModule.IsValueCreated) + { + var module = await _speechRecognitionModule.Value; + await module.DisposeAsync(); + } + } +} diff --git a/src/Blazor.SpeechRecognition/Extensions/SpeechRecognitionServiceCollectionExtensions.cs b/src/Blazor.SpeechRecognition/Extensions/SpeechRecognitionServiceCollectionExtensions.cs index c7536ad..ea91717 100644 --- a/src/Blazor.SpeechRecognition/Extensions/SpeechRecognitionServiceCollectionExtensions.cs +++ b/src/Blazor.SpeechRecognition/Extensions/SpeechRecognitionServiceCollectionExtensions.cs @@ -1,19 +1,19 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.Extensions.DependencyInjection; - -/// -/// Extensions methods for registering the type. -/// -public static class SpeechRecognitionServiceCollectionExtensions -{ - /// - /// Adds the necessary services for the to be consumable. - /// - /// The service collection to add additional services to. - /// The same instance that was added to. - public static IServiceCollection AddSpeechRecognitionServices( - this IServiceCollection services) => - services.AddSingleton(); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.Extensions.DependencyInjection; + +/// +/// Extensions methods for registering the type. +/// +public static class SpeechRecognitionServiceCollectionExtensions +{ + /// + /// Adds the necessary services for the to be consumable. + /// + /// The service collection to add additional services to. + /// The same instance that was added to. + public static IServiceCollection AddSpeechRecognitionServices( + this IServiceCollection services) => + services.AddScoped(); +} diff --git a/src/Blazor.SpeechRecognition/GlobalUsings.cs b/src/Blazor.SpeechRecognition/GlobalUsings.cs index 8ec4df0..480136c 100644 --- a/src/Blazor.SpeechRecognition/GlobalUsings.cs +++ b/src/Blazor.SpeechRecognition/GlobalUsings.cs @@ -1,8 +1,8 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -global using System.Collections.Concurrent; -global using System.Reactive.Linq; -global using System.Reactive.Subjects; -global using System.Text.Json.Serialization; -global using Microsoft.JSInterop; +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +global using System.Collections.Concurrent; +global using System.Reactive.Linq; +global using System.Reactive.Subjects; +global using System.Text.Json.Serialization; +global using Microsoft.JSInterop; diff --git a/src/Blazor.SpeechRecognition/ISpeechRecognitionService.cs b/src/Blazor.SpeechRecognition/ISpeechRecognitionService.cs index 988a0cb..ea3955a 100644 --- a/src/Blazor.SpeechRecognition/ISpeechRecognitionService.cs +++ b/src/Blazor.SpeechRecognition/ISpeechRecognitionService.cs @@ -1,41 +1,41 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -/// -/// A service the exposes various JavaScript interop capabilities specific to the -/// speechRecognition APIs. See -/// -public interface ISpeechRecognitionService : IAsyncDisposable -{ - /// - /// Cancels the active speech recognition session. - /// - /// - /// Is aborted controls which API to call, - /// either speechRecognition.stop or speechRecognition.abort. - /// - Task CancelSpeechRecognitionAsync(bool isAborted); - - /// - /// Starts the speech recognition process. Returns an - /// that acts as the subscription. The various callbacks are invoked as they occur, - /// and will continue to fire until the subscription is disposed of. - /// - /// The BCP47 language tag. - /// The callback to invoke when onrecognized fires. - /// The optional callback to invoke when onerror fires. - /// The optional callback to invoke when onstarted fires. - /// The optional callback to invoke when onended fires. - /// - /// To unsubscribe from the speech recognition, call - /// . - /// - Task RecognizeSpeechAsync( - string language, - Func onRecognized, - Func? onError = null, - Func? onStarted = null, - Func? onEnded = null); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +/// +/// A service the exposes various JavaScript interop capabilities specific to the +/// speechRecognition APIs. See +/// +public interface ISpeechRecognitionService : IAsyncDisposable +{ + /// + /// Cancels the active speech recognition session. + /// + /// + /// Is aborted controls which API to call, + /// either speechRecognition.stop or speechRecognition.abort. + /// + Task CancelSpeechRecognitionAsync(bool isAborted); + + /// + /// Starts the speech recognition process. Returns an + /// that acts as the subscription. The various callbacks are invoked as they occur, + /// and will continue to fire until the subscription is disposed of. + /// + /// The BCP47 language tag. + /// The callback to invoke when onrecognized fires. + /// The optional callback to invoke when onerror fires. + /// The optional callback to invoke when onstarted fires. + /// The optional callback to invoke when onended fires. + /// + /// To unsubscribe from the speech recognition, call + /// . + /// + Task RecognizeSpeechAsync( + string language, + Func onRecognized, + Func? onError = null, + Func? onStarted = null, + Func? onEnded = null); +} diff --git a/src/Blazor.SpeechRecognition/JavaScriptInteropMethodIdentifiers.cs b/src/Blazor.SpeechRecognition/JavaScriptInteropMethodIdentifiers.cs index 6cf9b8f..41b7980 100644 --- a/src/Blazor.SpeechRecognition/JavaScriptInteropMethodIdentifiers.cs +++ b/src/Blazor.SpeechRecognition/JavaScriptInteropMethodIdentifiers.cs @@ -1,10 +1,10 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -internal static class JavaScriptInteropMethodIdentifiers -{ - internal const string RecognizeSpeech = "recognizeSpeech"; - internal const string CancelSpeechRecognition = "cancelSpeechRecognition"; -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +internal static class JavaScriptInteropMethodIdentifiers +{ + internal const string RecognizeSpeech = "recognizeSpeech"; + internal const string CancelSpeechRecognition = "cancelSpeechRecognition"; +} diff --git a/src/Blazor.SpeechRecognition/Models/SpeechRecognitionErrorEvent.cs b/src/Blazor.SpeechRecognition/Models/SpeechRecognitionErrorEvent.cs index 668481b..873a447 100644 --- a/src/Blazor.SpeechRecognition/Models/SpeechRecognitionErrorEvent.cs +++ b/src/Blazor.SpeechRecognition/Models/SpeechRecognitionErrorEvent.cs @@ -1,13 +1,13 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -/// -/// The speech recognition error and message pair. -/// -/// The error's -/// -public record class SpeechRecognitionErrorEvent( - [property: JsonPropertyName("error")] string Error, +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +/// +/// The speech recognition error and message pair. +/// +/// The error's +/// +public record class SpeechRecognitionErrorEvent( + [property: JsonPropertyName("error")] string Error, [property: JsonPropertyName("message")] string Message); \ No newline at end of file diff --git a/src/Blazor.SpeechRecognition/Models/SpeechRecognitionResult.cs b/src/Blazor.SpeechRecognition/Models/SpeechRecognitionResult.cs index c39418f..bb1c906 100644 --- a/src/Blazor.SpeechRecognition/Models/SpeechRecognitionResult.cs +++ b/src/Blazor.SpeechRecognition/Models/SpeechRecognitionResult.cs @@ -1,22 +1,22 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -/// -/// An object representing the result of speech recongition. -/// -/// -/// A value that uniquely identifies the recognition result. -/// Is typically used to pair callbacks to callers. -/// -/// -/// The current text transcript from what was recognized as speech. -/// -/// -/// Whether the value is considered final. -/// When true, the contains a -/// complete text representation of the recognized speech. -/// -public record class SpeechRecognitionResult( +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +/// +/// An object representing the result of speech recongition. +/// +/// +/// A value that uniquely identifies the recognition result. +/// Is typically used to pair callbacks to callers. +/// +/// +/// The current text transcript from what was recognized as speech. +/// +/// +/// Whether the value is considered final. +/// When true, the contains a +/// complete text representation of the recognized speech. +/// +public record class SpeechRecognitionResult( string Key, string Transcript, bool IsFinal); \ No newline at end of file diff --git a/src/Blazor.SpeechRecognition/SpeechRecognitionSubject.cs b/src/Blazor.SpeechRecognition/SpeechRecognitionSubject.cs index f3ce590..0c460c8 100644 --- a/src/Blazor.SpeechRecognition/SpeechRecognitionSubject.cs +++ b/src/Blazor.SpeechRecognition/SpeechRecognitionSubject.cs @@ -1,39 +1,39 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -internal sealed class SpeechRecognitionSubject : IDisposable -{ - readonly Subject _speechRecognitionSubject = new(); - readonly IObservable<(string, string)> _speechRecognitionObservable; - readonly IDisposable _speechRecognitionSubscription; - readonly Func _observer; - - private SpeechRecognitionSubject( - Func observer) - { - _observer = observer; - _speechRecognitionObservable = - _speechRecognitionSubject.AsObservable() - .Where(recognition => recognition.IsFinal) - .Select(recognition => (recognition.Key, recognition.Transcript)); - - _speechRecognitionSubscription = - _speechRecognitionObservable.Select( - ((string Key, string SpeechRecognition) tuple) => - Observable.FromAsync( - async () => await _observer(tuple.Key, tuple.SpeechRecognition))) - .Merge(maxConcurrent: 3) - .Subscribe(); - } - - internal static SpeechRecognitionSubject Factory( - Func observer) => new(observer); - - internal void RecognitionReceived( - SpeechRecognitionResult recognition) => - _speechRecognitionSubject.OnNext(recognition); - - public void Dispose() => _speechRecognitionSubscription.Dispose(); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +internal sealed class SpeechRecognitionSubject : IDisposable +{ + readonly Subject _speechRecognitionSubject = new(); + readonly IObservable<(string, string)> _speechRecognitionObservable; + readonly IDisposable _speechRecognitionSubscription; + readonly Func _observer; + + private SpeechRecognitionSubject( + Func observer) + { + _observer = observer; + _speechRecognitionObservable = + _speechRecognitionSubject.AsObservable() + .Where(recognition => recognition.IsFinal) + .Select(recognition => (recognition.Key, recognition.Transcript)); + + _speechRecognitionSubscription = + _speechRecognitionObservable.Select( + ((string Key, string SpeechRecognition) tuple) => + Observable.FromAsync( + async () => await _observer(tuple.Key, tuple.SpeechRecognition))) + .Merge(maxConcurrent: 3) + .Subscribe(); + } + + internal static SpeechRecognitionSubject Factory( + Func observer) => new(observer); + + internal void RecognitionReceived( + SpeechRecognitionResult recognition) => + _speechRecognitionSubject.OnNext(recognition); + + public void Dispose() => _speechRecognitionSubscription.Dispose(); +} diff --git a/src/Blazor.SpeechSynthesis.WebAssembly/Extensions/SpeechSynthesisServiceExtensions.cs b/src/Blazor.SpeechSynthesis.WebAssembly/Extensions/SpeechSynthesisServiceExtensions.cs index 9381080..ec8c5bc 100644 --- a/src/Blazor.SpeechSynthesis.WebAssembly/Extensions/SpeechSynthesisServiceExtensions.cs +++ b/src/Blazor.SpeechSynthesis.WebAssembly/Extensions/SpeechSynthesisServiceExtensions.cs @@ -1,135 +1,135 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -using System.Collections.Concurrent; - -namespace Microsoft.JSInterop; - -/// -/// Extension methods for the functionality. -/// -public static class SpeechSynthesisServiceExtensions -{ - readonly static ConcurrentDictionary> s_callbackRegistry = new(); - readonly static ConcurrentDictionary> s_utteranceEndedCallbackRegistry = new(); - - /// - /// This extension wraps the - /// functionality, and exposes the native onend callback. When the utterance is done being read back, - /// the elapsed time in milliseconds is returned. - /// - /// - /// When the instance doesn't support the event - /// callback, this error is thrown. - /// - public static void Speak( - this ISpeechSynthesisService service, - SpeechSynthesisUtterance utterance, - Action onUtteranceEnded) - { - if (service is SpeechSynthesisService and { _javaScript: { } } svc) - { - s_utteranceEndedCallbackRegistry[utterance.Text] = onUtteranceEnded; - service.Speak(utterance); - } - else - { - throw new InvalidOperationException( - "SpeechSynthesisService is not available."); - } - } - - /// - /// The callback that is invoked from the blazorators.speechSynthesis.speak when the utterance is read. - /// - /// The text from the utterance that was read. - /// - /// The elapsed time in milliseconds that it took to read the utterance. - /// - [JSInvokable(nameof(OnUtteranceEnded))] - public static void OnUtteranceEnded( - string text, double elapsedTimeSpokenInMilliseconds) - { - if (s_utteranceEndedCallbackRegistry.TryRemove( - text, out var callback)) - { - callback.Invoke(elapsedTimeSpokenInMilliseconds); - } - } - - /// - /// A method used to register a callback for when the speech - /// synthesis service underlying voices have changed. - /// - /// - /// The current instance to register the - /// speechSynthesis.onvoiceschanged callback to. - /// - /// - /// The callback to invoke when the speechSynthesis.onvoiceschanged is fired. - /// - /// - /// When the instance doesn't support the event - /// callback, this error is thrown. - /// - public static void OnVoicesChanged( - this ISpeechSynthesisService service, - Func onVoicesChanged) - { - if (service is SpeechSynthesisService and { _javaScript: { } } svc) - { - var key = Guid.NewGuid(); - s_callbackRegistry[key] = onVoicesChanged; - svc._javaScript.InvokeVoid( - "blazorators.speechSynthesis.onVoicesChanged", - "Blazor.SpeechSynthesis.WebAssembly", - nameof(VoicesChangedAsync), - key); - } - else - { - throw new InvalidOperationException( - "SpeechSynthesisService is not available."); - } - } - - /// - /// The callback. - /// - /// The identifier that flows through the interop pipeline. - [JSInvokable(nameof(VoicesChangedAsync))] - public static async Task VoicesChangedAsync(string guid) - { - if (Guid.TryParse(guid, out var key) && - s_callbackRegistry.TryRemove(key, out var callback)) - { - await callback.Invoke().ConfigureAwait(false); - } - } - - /// - /// Removes the subscription, assigns speechSynthesis.onvoiceschanged to null. - /// - /// - /// The current instance to unsubscribe the - /// speechSynthesis.onvoiceschanged callback from. - /// - /// - /// When the instance doesn't support the event - /// callback, this error is thrown. - /// - public static void UnsubscribeFromVoicesChanged( - this ISpeechSynthesisService service) - { - if (service is SpeechSynthesisService and { _javaScript: { } } svc) - { - svc._javaScript.InvokeVoid( - "blazorators.speechSynthesis.unsubscribeVoicesChanged"); - } - else - { - throw new InvalidOperationException( - "SpeechSynthesisService is not available."); - } - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Concurrent; + +namespace Microsoft.JSInterop; + +/// +/// Extension methods for the functionality. +/// +public static class SpeechSynthesisServiceExtensions +{ + readonly static ConcurrentDictionary> s_callbackRegistry = new(); + readonly static ConcurrentDictionary> s_utteranceEndedCallbackRegistry = new(); + + /// + /// This extension wraps the + /// functionality, and exposes the native onend callback. When the utterance is done being read back, + /// the elapsed time in milliseconds is returned. + /// + /// + /// When the instance doesn't support the event + /// callback, this error is thrown. + /// + public static void Speak( + this ISpeechSynthesisService service, + SpeechSynthesisUtterance utterance, + Action onUtteranceEnded) + { + if (service is SpeechSynthesisService and { _javaScript: { } } svc) + { + s_utteranceEndedCallbackRegistry[utterance.Text] = onUtteranceEnded; + service.Speak(utterance); + } + else + { + throw new InvalidOperationException( + "SpeechSynthesisService is not available."); + } + } + + /// + /// The callback that is invoked from the blazorators.speechSynthesis.speak when the utterance is read. + /// + /// The text from the utterance that was read. + /// + /// The elapsed time in milliseconds that it took to read the utterance. + /// + [JSInvokable(nameof(OnUtteranceEnded))] + public static void OnUtteranceEnded( + string text, double elapsedTimeSpokenInMilliseconds) + { + if (s_utteranceEndedCallbackRegistry.TryRemove( + text, out var callback)) + { + callback.Invoke(elapsedTimeSpokenInMilliseconds); + } + } + + /// + /// A method used to register a callback for when the speech + /// synthesis service underlying voices have changed. + /// + /// + /// The current instance to register the + /// speechSynthesis.onvoiceschanged callback to. + /// + /// + /// The callback to invoke when the speechSynthesis.onvoiceschanged is fired. + /// + /// + /// When the instance doesn't support the event + /// callback, this error is thrown. + /// + public static void OnVoicesChanged( + this ISpeechSynthesisService service, + Func onVoicesChanged) + { + if (service is SpeechSynthesisService and { _javaScript: { } } svc) + { + var key = Guid.NewGuid(); + s_callbackRegistry[key] = onVoicesChanged; + svc._javaScript.InvokeVoid( + "blazorators.speechSynthesis.onVoicesChanged", + "Blazor.SpeechSynthesis.WebAssembly", + nameof(VoicesChangedAsync), + key); + } + else + { + throw new InvalidOperationException( + "SpeechSynthesisService is not available."); + } + } + + /// + /// The callback. + /// + /// The identifier that flows through the interop pipeline. + [JSInvokable(nameof(VoicesChangedAsync))] + public static async Task VoicesChangedAsync(string guid) + { + if (Guid.TryParse(guid, out var key) && + s_callbackRegistry.TryRemove(key, out var callback)) + { + await callback.Invoke().ConfigureAwait(false); + } + } + + /// + /// Removes the subscription, assigns speechSynthesis.onvoiceschanged to null. + /// + /// + /// The current instance to unsubscribe the + /// speechSynthesis.onvoiceschanged callback from. + /// + /// + /// When the instance doesn't support the event + /// callback, this error is thrown. + /// + public static void UnsubscribeFromVoicesChanged( + this ISpeechSynthesisService service) + { + if (service is SpeechSynthesisService and { _javaScript: { } } svc) + { + svc._javaScript.InvokeVoid( + "blazorators.speechSynthesis.unsubscribeVoicesChanged"); + } + else + { + throw new InvalidOperationException( + "SpeechSynthesisService is not available."); + } + } +} diff --git a/src/Blazor.SpeechSynthesis.WebAssembly/ISpeechSynthesisService.cs b/src/Blazor.SpeechSynthesis.WebAssembly/ISpeechSynthesisService.cs index 1847774..d403c85 100644 --- a/src/Blazor.SpeechSynthesis.WebAssembly/ISpeechSynthesisService.cs +++ b/src/Blazor.SpeechSynthesis.WebAssembly/ISpeechSynthesisService.cs @@ -1,17 +1,17 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -[JSAutoGenericInterop( - TypeName = "SpeechSynthesis", - Implementation = "window.speechSynthesis", - Url = "https://developer.mozilla.org/docs/Web/API/SpeechSynthesis", - OnlyGeneratePureJS = true, - PureJavaScriptOverrides = new[] - { - "getVoices" - })] -public partial interface ISpeechSynthesisService -{ +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +[JSAutoGenericInterop( + TypeName = "SpeechSynthesis", + Implementation = "window.speechSynthesis", + Url = "https://developer.mozilla.org/docs/Web/API/SpeechSynthesis", + OnlyGeneratePureJS = true, + PureJavaScriptOverrides = new[] + { + "getVoices" + })] +public partial interface ISpeechSynthesisService +{ } \ No newline at end of file diff --git a/src/Blazor.SpeechSynthesis/ISpeechSynthesisService.cs b/src/Blazor.SpeechSynthesis/ISpeechSynthesisService.cs index f7a4c18..38a2e09 100644 --- a/src/Blazor.SpeechSynthesis/ISpeechSynthesisService.cs +++ b/src/Blazor.SpeechSynthesis/ISpeechSynthesisService.cs @@ -1,18 +1,18 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -namespace Microsoft.JSInterop; - -[JSAutoGenericInterop( - TypeName = "SpeechSynthesis", - Implementation = "window.speechSynthesis", - HostingModel = BlazorHostingModel.Server, - Url = "https://developer.mozilla.org/docs/Web/API/SpeechSynthesis", - OnlyGeneratePureJS = true, - PureJavaScriptOverrides = new[] - { - "getVoices" - })] -public partial interface ISpeechSynthesisService -{ +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.JSInterop; + +[JSAutoGenericInterop( + TypeName = "SpeechSynthesis", + Implementation = "window.speechSynthesis", + HostingModel = BlazorHostingModel.Server, + Url = "https://developer.mozilla.org/docs/Web/API/SpeechSynthesis", + OnlyGeneratePureJS = true, + PureJavaScriptOverrides = new[] + { + "getVoices" + })] +public partial interface ISpeechSynthesisService +{ } \ No newline at end of file diff --git a/tests/Blazor.SourceGenerators.Tests/AssertStringExtensions.cs b/tests/Blazor.SourceGenerators.Tests/AssertStringExtensions.cs index e338937..3506bbe 100644 --- a/tests/Blazor.SourceGenerators.Tests/AssertStringExtensions.cs +++ b/tests/Blazor.SourceGenerators.Tests/AssertStringExtensions.cs @@ -1,12 +1,12 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -using System.Text.RegularExpressions; - -namespace Blazor.SourceGenerators.Tests; - -static class AssertStringExtensions -{ - internal static string NormalizeNewlines(this string value) => - Regex.Replace(value, @"\r\n|\n\r|\n|\r", "\r\n"); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using System.Text.RegularExpressions; + +namespace Blazor.SourceGenerators.Tests; + +static class AssertStringExtensions +{ + internal static string NormalizeNewlines(this string value) => + Regex.Replace(value, @"\r\n|\n\r|\n|\r", "\r\n"); +} diff --git a/tests/Blazor.SourceGenerators.Tests/CSharpTypeTests.cs b/tests/Blazor.SourceGenerators.Tests/CSharpTypeTests.cs index a34bfd4..323cb91 100644 --- a/tests/Blazor.SourceGenerators.Tests/CSharpTypeTests.cs +++ b/tests/Blazor.SourceGenerators.Tests/CSharpTypeTests.cs @@ -1,21 +1,21 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -using Blazor.SourceGenerators.CSharp; -using Xunit; - -namespace Blazor.SourceGenerators.Tests; - -public class CSharpTypeTests -{ - [ - Theory, - InlineData("date", "Date", true, "DateTime? date = null"), - InlineData("date", "Date", false, "DateTime date"), - InlineData("count", "number", true, "double? count = null"), - InlineData("IsBusy", "boolean", false, "bool isBusy") - ] - public void ToParametersCorrectlyFormatsString( - string name, string typeName, bool isNullable, string expected) => - Assert.Equal(expected, new CSharpType(name, typeName, isNullable).ToParameterString()); -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using Blazor.SourceGenerators.CSharp; +using Xunit; + +namespace Blazor.SourceGenerators.Tests; + +public class CSharpTypeTests +{ + [ + Theory, + InlineData("date", "Date", true, "DateTime? date = null"), + InlineData("date", "Date", false, "DateTime date"), + InlineData("count", "number", true, "double? count = null"), + InlineData("IsBusy", "boolean", false, "bool isBusy") + ] + public void ToParametersCorrectlyFormatsString( + string name, string typeName, bool isNullable, string expected) => + Assert.Equal(expected, new CSharpType(name, typeName, isNullable).ToParameterString()); +} diff --git a/tests/Blazor.SourceGenerators.Tests/GeneratorBaseUnitTests.cs b/tests/Blazor.SourceGenerators.Tests/GeneratorBaseUnitTests.cs index 5287876..3d6d4bd 100644 --- a/tests/Blazor.SourceGenerators.Tests/GeneratorBaseUnitTests.cs +++ b/tests/Blazor.SourceGenerators.Tests/GeneratorBaseUnitTests.cs @@ -1,65 +1,65 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -using Basic.Reference.Assemblies; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp; -using Xunit; - -namespace Blazor.SourceGenerators.Tests; - -/// -/// Borrowed from: https://github.com/jaredpar/channel9-source-generators/blob/main/GeneratorsUnitTests/GeneratorBaseUnitTests.cs -/// -public abstract class GeneratorBaseUnitTests -{ - public abstract IEnumerable SourceGenerators { get; } - - public static Compilation GetCompilation(string sourceCode) => - GetCompilation(new[] { CSharpSyntaxTree.ParseText(sourceCode) }); - - public static Compilation GetCompilation(IEnumerable syntaxTrees) - { - var options = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary); - - var compilation = CSharpCompilation.Create( - assemblyName: "TestAssembly", - syntaxTrees: syntaxTrees, - options: options) - .WithReferenceAssemblies(ReferenceAssemblyKind.Net60); - - return compilation; - } - - public GeneratorDriverRunResult GetRunResult(string sourceCode) - { - var compilation = GetCompilation(sourceCode); - var driver = CSharpGeneratorDriver.Create(SourceGenerators); - return driver - .RunGenerators(compilation) - .GetRunResult(); - } - - public void VerifyCompiles(string sourceCode) - { - var all = new SyntaxTree[] { CSharpSyntaxTree.ParseText(sourceCode) }; - var result = GetRunResult(sourceCode); - var compilation = GetCompilation(all.Concat(result.GeneratedTrees)); - var diagnostics = compilation - .GetDiagnostics() - .Where(x => x.Severity is DiagnosticSeverity.Error or DiagnosticSeverity.Warning); - Assert.Empty(diagnostics); - } - - public static void VerifyGeneratedCode(string expectedCode, SyntaxTree actualTree) - { - var actualCode = Trim(actualTree.ToString()); - - Assert.Equal(Trim(expectedCode), actualCode); - - static string Trim(string s) - { - return s.Trim(' ', '\n', '\r'); - } - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using Basic.Reference.Assemblies; +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp; +using Xunit; + +namespace Blazor.SourceGenerators.Tests; + +/// +/// Borrowed from: https://github.com/jaredpar/channel9-source-generators/blob/main/GeneratorsUnitTests/GeneratorBaseUnitTests.cs +/// +public abstract class GeneratorBaseUnitTests +{ + public abstract IEnumerable SourceGenerators { get; } + + public static Compilation GetCompilation(string sourceCode) => + GetCompilation(new[] { CSharpSyntaxTree.ParseText(sourceCode) }); + + public static Compilation GetCompilation(IEnumerable syntaxTrees) + { + var options = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary); + + var compilation = CSharpCompilation.Create( + assemblyName: "TestAssembly", + syntaxTrees: syntaxTrees, + options: options) + .WithReferenceAssemblies(ReferenceAssemblyKind.Net60); + + return compilation; + } + + public GeneratorDriverRunResult GetRunResult(string sourceCode) + { + var compilation = GetCompilation(sourceCode); + var driver = CSharpGeneratorDriver.Create(SourceGenerators); + return driver + .RunGenerators(compilation) + .GetRunResult(); + } + + public void VerifyCompiles(string sourceCode) + { + var all = new SyntaxTree[] { CSharpSyntaxTree.ParseText(sourceCode) }; + var result = GetRunResult(sourceCode); + var compilation = GetCompilation(all.Concat(result.GeneratedTrees)); + var diagnostics = compilation + .GetDiagnostics() + .Where(x => x.Severity is DiagnosticSeverity.Error or DiagnosticSeverity.Warning); + Assert.Empty(diagnostics); + } + + public static void VerifyGeneratedCode(string expectedCode, SyntaxTree actualTree) + { + var actualCode = Trim(actualTree.ToString()); + + Assert.Equal(Trim(expectedCode), actualCode); + + static string Trim(string s) + { + return s.Trim(' ', '\n', '\r'); + } + } +} diff --git a/tests/Blazor.SourceGenerators.Tests/JavaScriptInteropTests.cs b/tests/Blazor.SourceGenerators.Tests/JavaScriptInteropTests.cs index 92c8d6f..f5a0cab 100644 --- a/tests/Blazor.SourceGenerators.Tests/JavaScriptInteropTests.cs +++ b/tests/Blazor.SourceGenerators.Tests/JavaScriptInteropTests.cs @@ -1,34 +1,34 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -using Microsoft.CodeAnalysis; -using Xunit; - -namespace Blazor.SourceGenerators.Tests; - -public class JavaScriptInteropTests : GeneratorBaseUnitTests -{ - public override IEnumerable SourceGenerators => - new[] { new JavaScriptInteropGenerator() }; - - public SyntaxTree GetGeneratedTree(string sourceCode) - { - var result = GetRunResult(sourceCode); - return result.GeneratedTrees.Single(x => x.FilePath.Contains("Extensions")); - } - - [Fact] - public void Basic() - { - // TODO: write test - _ = @" -using System; -using Microsoft.JSInterop.Attributes; - -#pragma warning disable 649 - -[JavaScriptInterop] -public static partial class -"; - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using Microsoft.CodeAnalysis; +using Xunit; + +namespace Blazor.SourceGenerators.Tests; + +public class JavaScriptInteropTests : GeneratorBaseUnitTests +{ + public override IEnumerable SourceGenerators => + new[] { new JavaScriptInteropGenerator() }; + + public SyntaxTree GetGeneratedTree(string sourceCode) + { + var result = GetRunResult(sourceCode); + return result.GeneratedTrees.Single(x => x.FilePath.Contains("Extensions")); + } + + [Fact] + public void Basic() + { + // TODO: write test + _ = @" +using System; +using Microsoft.JSInterop.Attributes; + +#pragma warning disable 649 + +[JavaScriptInterop] +public static partial class +"; + } +} diff --git a/tests/Blazor.SourceGenerators.Tests/LibDomParserInterfacesTests.cs b/tests/Blazor.SourceGenerators.Tests/LibDomParserInterfacesTests.cs index bd79a34..83ac58d 100644 --- a/tests/Blazor.SourceGenerators.Tests/LibDomParserInterfacesTests.cs +++ b/tests/Blazor.SourceGenerators.Tests/LibDomParserInterfacesTests.cs @@ -1,136 +1,136 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -using Blazor.SourceGenerators.Parsers; -using Xunit; - -namespace Blazor.SourceGenerators.Tests; - -public class LibDomParserInterfacesTests -{ - [Fact] - public void CorrectlyConvertsTypeScriptInterfaceToCSharpClass() - { - var text = @"interface MediaKeySystemConfiguration { - audioCapabilities?: MediaKeySystemMediaCapability[]; - distinctiveIdentifier?: MediaKeysRequirement; - initDataTypes?: string[]; - label?: string; - persistentState?: MediaKeysRequirement; - sessionTypes?: string[]; - videoCapabilities?: MediaKeySystemMediaCapability[]; -}"; - var sut = TypeDeclarationParser.Default; - var actual = sut.ToObject(text); - var expected = @"#nullable enable -using System.Text.Json.Serialization; - -namespace Microsoft.JSInterop; - -/// -/// Source-generated object representing an ideally immutable MediaKeySystemConfiguration value. -/// -public class MediaKeySystemConfiguration -{ - /// - /// Source-generated property representing the MediaKeySystemConfiguration.audioCapabilities value. - /// - [JsonPropertyName(""audioCapabilities"")] - public MediaKeySystemMediaCapability[]? AudioCapabilities { get; set; } = default!; - /// - /// Source-generated property representing the MediaKeySystemConfiguration.distinctiveIdentifier value. - /// - [JsonPropertyName(""distinctiveIdentifier"")] - public string? DistinctiveIdentifier { get; set; } = default!; - /// - /// Source-generated property representing the MediaKeySystemConfiguration.initDataTypes value. - /// - [JsonPropertyName(""initDataTypes"")] - public string[]? InitDataTypes { get; set; } = default!; - /// - /// Source-generated property representing the MediaKeySystemConfiguration.label value. - /// - [JsonPropertyName(""label"")] - public string? Label { get; set; } = default!; - /// - /// Source-generated property representing the MediaKeySystemConfiguration.persistentState value. - /// - [JsonPropertyName(""persistentState"")] - public string? PersistentState { get; set; } = default!; - /// - /// Source-generated property representing the MediaKeySystemConfiguration.sessionTypes value. - /// - [JsonPropertyName(""sessionTypes"")] - public string[]? SessionTypes { get; set; } = default!; - /// - /// Source-generated property representing the MediaKeySystemConfiguration.videoCapabilities value. - /// - [JsonPropertyName(""videoCapabilities"")] - public MediaKeySystemMediaCapability[]? VideoCapabilities { get; set; } = default!; -} -"; - - Assert.NotNull(actual); - - var actualStr = actual.ToString(); - Assert.Equal(expected.NormalizeNewlines(), actualStr.NormalizeNewlines()); - - // As of right now the MediaKeysRequirement is not parsed. - // It's a type alias, not an interface. - Assert.Single(actual.DependentTypes); - } - - [Fact] - public void CorrectlyConvertsTypeScriptInterfaceToCSharpExtensionObject() - { - var text = @"interface Geolocation { - clearWatch(watchId: number): void; - getCurrentPosition(successCallback: PositionCallback, errorCallback?: PositionErrorCallback | null, options?: PositionOptions): void; - watchPosition(successCallback: PositionCallback, errorCallback?: PositionErrorCallback | null, options?: PositionOptions): number; -}"; - var sut = TypeDeclarationParser.Default; - var actual = sut.ToTopLevelObject(text); - - Assert.NotNull(actual); - - // 1. "successCallback" -ignored - //interface PositionCallback { - // (position: GeolocationPosition): void; - //} - // 2. "position" - //interface GeolocationPosition { - // readonly coords: GeolocationCoordinates; - // readonly timestamp: DOMTimeStamp; - //} - // 3. "coords" - //interface GeolocationCoordinates { - // readonly accuracy: number; - // readonly altitude: number | null; - // readonly altitudeAccuracy: number | null; - // readonly heading: number | null; - // readonly latitude: number; - // readonly longitude: number; - // readonly speed: number | null; - //} - // 4. "errorCallback" -ignored - // interface PositionErrorCallback { - // (positionError: GeolocationPositionError): void; - //} - // 5. "positionError" - // interface GeolocationPositionError { - // readonly code: number; - // readonly message: string; - // readonly PERMISSION_DENIED: number; - // readonly POSITION_UNAVAILABLE: number; - // readonly TIMEOUT: number; - //} - // 6. "options" - //interface PositionOptions { - // enableHighAccuracy ?: boolean; - // maximumAge ?: number; - // timeout ?: number; - //} - - Assert.Equal(4, actual.AllDependentTypes.Count); - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using Blazor.SourceGenerators.Parsers; +using Xunit; + +namespace Blazor.SourceGenerators.Tests; + +public class LibDomParserInterfacesTests +{ + [Fact] + public void CorrectlyConvertsTypeScriptInterfaceToCSharpClass() + { + var text = @"interface MediaKeySystemConfiguration { + audioCapabilities?: MediaKeySystemMediaCapability[]; + distinctiveIdentifier?: MediaKeysRequirement; + initDataTypes?: string[]; + label?: string; + persistentState?: MediaKeysRequirement; + sessionTypes?: string[]; + videoCapabilities?: MediaKeySystemMediaCapability[]; +}"; + var sut = TypeDeclarationParser.Default; + var actual = sut.ToObject(text); + var expected = @"#nullable enable +using System.Text.Json.Serialization; + +namespace Microsoft.JSInterop; + +/// +/// Source-generated object representing an ideally immutable MediaKeySystemConfiguration value. +/// +public class MediaKeySystemConfiguration +{ + /// + /// Source-generated property representing the MediaKeySystemConfiguration.audioCapabilities value. + /// + [JsonPropertyName(""audioCapabilities"")] + public MediaKeySystemMediaCapability[]? AudioCapabilities { get; set; } = default!; + /// + /// Source-generated property representing the MediaKeySystemConfiguration.distinctiveIdentifier value. + /// + [JsonPropertyName(""distinctiveIdentifier"")] + public string? DistinctiveIdentifier { get; set; } = default!; + /// + /// Source-generated property representing the MediaKeySystemConfiguration.initDataTypes value. + /// + [JsonPropertyName(""initDataTypes"")] + public string[]? InitDataTypes { get; set; } = default!; + /// + /// Source-generated property representing the MediaKeySystemConfiguration.label value. + /// + [JsonPropertyName(""label"")] + public string? Label { get; set; } = default!; + /// + /// Source-generated property representing the MediaKeySystemConfiguration.persistentState value. + /// + [JsonPropertyName(""persistentState"")] + public string? PersistentState { get; set; } = default!; + /// + /// Source-generated property representing the MediaKeySystemConfiguration.sessionTypes value. + /// + [JsonPropertyName(""sessionTypes"")] + public string[]? SessionTypes { get; set; } = default!; + /// + /// Source-generated property representing the MediaKeySystemConfiguration.videoCapabilities value. + /// + [JsonPropertyName(""videoCapabilities"")] + public MediaKeySystemMediaCapability[]? VideoCapabilities { get; set; } = default!; +} +"; + + Assert.NotNull(actual); + + var actualStr = actual.ToString(); + Assert.Equal(expected.NormalizeNewlines(), actualStr.NormalizeNewlines()); + + // As of right now the MediaKeysRequirement is not parsed. + // It's a type alias, not an interface. + Assert.Single(actual.DependentTypes); + } + + [Fact] + public void CorrectlyConvertsTypeScriptInterfaceToCSharpExtensionObject() + { + var text = @"interface Geolocation { + clearWatch(watchId: number): void; + getCurrentPosition(successCallback: PositionCallback, errorCallback?: PositionErrorCallback | null, options?: PositionOptions): void; + watchPosition(successCallback: PositionCallback, errorCallback?: PositionErrorCallback | null, options?: PositionOptions): number; +}"; + var sut = TypeDeclarationParser.Default; + var actual = sut.ToTopLevelObject(text); + + Assert.NotNull(actual); + + // 1. "successCallback" -ignored + //interface PositionCallback { + // (position: GeolocationPosition): void; + //} + // 2. "position" + //interface GeolocationPosition { + // readonly coords: GeolocationCoordinates; + // readonly timestamp: DOMTimeStamp; + //} + // 3. "coords" + //interface GeolocationCoordinates { + // readonly accuracy: number; + // readonly altitude: number | null; + // readonly altitudeAccuracy: number | null; + // readonly heading: number | null; + // readonly latitude: number; + // readonly longitude: number; + // readonly speed: number | null; + //} + // 4. "errorCallback" -ignored + // interface PositionErrorCallback { + // (positionError: GeolocationPositionError): void; + //} + // 5. "positionError" + // interface GeolocationPositionError { + // readonly code: number; + // readonly message: string; + // readonly PERMISSION_DENIED: number; + // readonly POSITION_UNAVAILABLE: number; + // readonly TIMEOUT: number; + //} + // 6. "options" + //interface PositionOptions { + // enableHighAccuracy ?: boolean; + // maximumAge ?: number; + // timeout ?: number; + //} + + Assert.Equal(4, actual.AllDependentTypes.Count); + } +} diff --git a/tests/Blazor.SourceGenerators.Tests/LibDomParserTests.cs b/tests/Blazor.SourceGenerators.Tests/LibDomParserTests.cs index fe57a9f..08e5ac6 100644 --- a/tests/Blazor.SourceGenerators.Tests/LibDomParserTests.cs +++ b/tests/Blazor.SourceGenerators.Tests/LibDomParserTests.cs @@ -1,39 +1,39 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -using Blazor.SourceGenerators.Parsers; -using Xunit; - -namespace Blazor.SourceGenerators.Tests; - -public class LibDomParserTests -{ - [Fact] - public void ParseStaticObjectCorrectly() - { - var sut = TypeDeclarationParser.Default; - var parserResult = sut.ParseTargetType("Geolocation"); - - Assert.Equal(ParserResultStatus.SuccessfullyParsed, parserResult.Status); - - var result = parserResult.Value; - Assert.NotNull(result); - Assert.Equal(3, result.MemberCount); - - var methods = result.Methods; - Assert.NotNull(methods); - Assert.Equal(3, methods.Count); - Assert.Contains(methods, m => m.RawName == "clearWatch"); - Assert.Contains(methods, m => m.RawName == "getCurrentPosition"); - Assert.Contains(methods, m => m.RawName == "watchPosition"); - - var properties = result.Properties; - Assert.NotNull(properties); - Assert.Empty(properties); - - var dependencies = result.DependentTypes; - Assert.NotNull(dependencies); - Assert.Single(dependencies); - Assert.True(dependencies.ContainsKey("PositionOptions")); - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using Blazor.SourceGenerators.Parsers; +using Xunit; + +namespace Blazor.SourceGenerators.Tests; + +public class LibDomParserTests +{ + [Fact] + public void ParseStaticObjectCorrectly() + { + var sut = TypeDeclarationParser.Default; + var parserResult = sut.ParseTargetType("Geolocation"); + + Assert.Equal(ParserResultStatus.SuccessfullyParsed, parserResult.Status); + + var result = parserResult.Value; + Assert.NotNull(result); + Assert.Equal(3, result.MemberCount); + + var methods = result.Methods; + Assert.NotNull(methods); + Assert.Equal(3, methods.Count); + Assert.Contains(methods, m => m.RawName == "clearWatch"); + Assert.Contains(methods, m => m.RawName == "getCurrentPosition"); + Assert.Contains(methods, m => m.RawName == "watchPosition"); + + var properties = result.Properties; + Assert.NotNull(properties); + Assert.Empty(properties); + + var dependencies = result.DependentTypes; + Assert.NotNull(dependencies); + Assert.Single(dependencies); + Assert.True(dependencies.ContainsKey("PositionOptions")); + } +} diff --git a/tests/Blazor.SourceGenerators.Tests/LibDomReaderTests.cs b/tests/Blazor.SourceGenerators.Tests/LibDomReaderTests.cs index b35cd42..4dfece1 100644 --- a/tests/Blazor.SourceGenerators.Tests/LibDomReaderTests.cs +++ b/tests/Blazor.SourceGenerators.Tests/LibDomReaderTests.cs @@ -1,89 +1,89 @@ -// Copyright (c) David Pine. All rights reserved. -// Licensed under the MIT License. - -using System.Diagnostics; -using Blazor.SourceGenerators.Readers; -using Xunit; - -namespace Blazor.SourceGenerators.Tests; - -public class LibDomReaderTests -{ - [Fact] - public void InitializesTypeDefinitionsCorrectly() - { - var stopwatch = Stopwatch.StartNew(); - - var sut = TypeDeclarationReader.Default; - _ = sut.TryGetDeclaration("foo", out var _); - - stopwatch.Stop(); - - Assert.True(sut.IsInitialized); - Assert.True(stopwatch.Elapsed < TimeSpan.FromSeconds(1.5)); - } - - public static IEnumerable TryGetDeclarationInput - { - get - { - yield return new object[] - { - "PositionCallback", - @"interface PositionCallback { - (position: GeolocationPosition): void; -}", - }; - - yield return new object[] - { - "PositionOptions", - @"interface PositionOptions { - enableHighAccuracy?: boolean; - maximumAge?: number; - timeout?: number; -}", - }; - } - } - - [ - Theory, - MemberData(nameof(TryGetDeclarationInput)) - ] - public void TryGetDeclarationReturnsCorrectly(string typeName, string expected) - { - var sut = TypeDeclarationReader.Default; - var result = sut.TryGetDeclaration(typeName, out var actual); - - Assert.True(result); - Assert.NotNull(actual); - Assert.Equal(expected.NormalizeNewlines(), actual.NormalizeNewlines()); - } - - public static IEnumerable TryGetTypeAliasInput - { - get - { - yield return new object[] - { - "ClientTypes", - @"type ClientTypes = ""all"" | ""sharedworker"" | ""window"" | ""worker"";", - }; - } - } - - [ - Theory, - MemberData(nameof(TryGetTypeAliasInput)) - ] - public void TryGetTypeAliasReturnsCorrectly(string typeAlias, string expected) - { - var sut = TypeDeclarationReader.Default; - var result = sut.TryGetTypeAlias(typeAlias, out var actual); - - Assert.True(result); - Assert.NotNull(actual); - Assert.Equal(expected.NormalizeNewlines(), actual.NormalizeNewlines()); - } -} +// Copyright (c) David Pine. All rights reserved. +// Licensed under the MIT License. + +using System.Diagnostics; +using Blazor.SourceGenerators.Readers; +using Xunit; + +namespace Blazor.SourceGenerators.Tests; + +public class LibDomReaderTests +{ + [Fact] + public void InitializesTypeDefinitionsCorrectly() + { + var stopwatch = Stopwatch.StartNew(); + + var sut = TypeDeclarationReader.Default; + _ = sut.TryGetDeclaration("foo", out var _); + + stopwatch.Stop(); + + Assert.True(sut.IsInitialized); + Assert.True(stopwatch.Elapsed < TimeSpan.FromSeconds(1.5)); + } + + public static IEnumerable TryGetDeclarationInput + { + get + { + yield return new object[] + { + "PositionCallback", + @"interface PositionCallback { + (position: GeolocationPosition): void; +}", + }; + + yield return new object[] + { + "PositionOptions", + @"interface PositionOptions { + enableHighAccuracy?: boolean; + maximumAge?: number; + timeout?: number; +}", + }; + } + } + + [ + Theory, + MemberData(nameof(TryGetDeclarationInput)) + ] + public void TryGetDeclarationReturnsCorrectly(string typeName, string expected) + { + var sut = TypeDeclarationReader.Default; + var result = sut.TryGetDeclaration(typeName, out var actual); + + Assert.True(result); + Assert.NotNull(actual); + Assert.Equal(expected.NormalizeNewlines(), actual.NormalizeNewlines()); + } + + public static IEnumerable TryGetTypeAliasInput + { + get + { + yield return new object[] + { + "ClientTypes", + @"type ClientTypes = ""all"" | ""sharedworker"" | ""window"" | ""worker"";", + }; + } + } + + [ + Theory, + MemberData(nameof(TryGetTypeAliasInput)) + ] + public void TryGetTypeAliasReturnsCorrectly(string typeAlias, string expected) + { + var sut = TypeDeclarationReader.Default; + var result = sut.TryGetTypeAlias(typeAlias, out var actual); + + Assert.True(result); + Assert.NotNull(actual); + Assert.Equal(expected.NormalizeNewlines(), actual.NormalizeNewlines()); + } +}