diff --git a/backend/Naninovel.Language.Bindings/Language.cs b/backend/Naninovel.Language.Bindings/Language.cs index d7aa846..c9c19fd 100644 --- a/backend/Naninovel.Language.Bindings/Language.cs +++ b/backend/Naninovel.Language.Bindings/Language.cs @@ -1,15 +1,14 @@ using System.Diagnostics.CodeAnalysis; using Bootsharp; -using Bootsharp.DependencyInjection; +using Bootsharp.Inject; using Microsoft.Extensions.DependencyInjection; using Naninovel.Bindings; using Naninovel.Language; -using static Naninovel.Bindings.Utilities; [assembly: ExcludeFromCodeCoverage] -[assembly: JSNamespace(NamespacePattern, NamespaceReplacement)] +[assembly: JSPreferences(Space = [Space.Pattern, Space.Replacement])] [assembly: JSImport(typeof(IDiagnosticPublisher))] -[assembly: JSExport( +[assembly: JSExport([ typeof(ISettingsHandler), typeof(IMetadataHandler), typeof(IDocumentHandler), @@ -18,12 +17,12 @@ typeof(IFoldingHandler), typeof(ISymbolHandler), typeof(ITokenHandler), - typeof(IHoverHandler), - InvokePattern = "(.+)", InvokeReplacement = "Naninovel.Bindings.Utilities.Try(() => $1)")] + typeof(IHoverHandler) +])] namespace Naninovel.Language; -public static partial class Language +public static class Language { [JSInvokable] public static void BootServer () => new ServiceCollection() diff --git a/backend/Naninovel.Language.Bindings/Naninovel.Language.Bindings.csproj b/backend/Naninovel.Language.Bindings/Naninovel.Language.Bindings.csproj index e5ff411..5324404 100644 --- a/backend/Naninovel.Language.Bindings/Naninovel.Language.Bindings.csproj +++ b/backend/Naninovel.Language.Bindings/Naninovel.Language.Bindings.csproj @@ -12,9 +12,9 @@ - - - + + + diff --git a/backend/Naninovel.Language.Test/Naninovel.Language.Test.csproj b/backend/Naninovel.Language.Test/Naninovel.Language.Test.csproj index 8731984..ef2054b 100644 --- a/backend/Naninovel.Language.Test/Naninovel.Language.Test.csproj +++ b/backend/Naninovel.Language.Test/Naninovel.Language.Test.csproj @@ -11,11 +11,11 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/backend/Naninovel.Language.WASM/Naninovel.Language.WASM.csproj b/backend/Naninovel.Language.WASM/Naninovel.Language.WASM.csproj index 5325ca1..194697f 100644 --- a/backend/Naninovel.Language.WASM/Naninovel.Language.WASM.csproj +++ b/backend/Naninovel.Language.WASM/Naninovel.Language.WASM.csproj @@ -9,7 +9,7 @@ - + diff --git a/backend/Naninovel.Language.WASM/Program.cs b/backend/Naninovel.Language.WASM/Program.cs index e92d00d..2ba999c 100644 --- a/backend/Naninovel.Language.WASM/Program.cs +++ b/backend/Naninovel.Language.WASM/Program.cs @@ -1,9 +1,9 @@ using System.Diagnostics.CodeAnalysis; using Bootsharp; -using static Naninovel.Bindings.Utilities; +using Naninovel.Bindings; [assembly: ExcludeFromCodeCoverage] -[assembly: JSNamespace(NamespacePattern, NamespaceReplacement)] +[assembly: JSPreferences(Space = [Space.Pattern, Space.Replacement])] namespace Naninovel.Language; diff --git a/backend/Naninovel.Language/Naninovel.Language.csproj b/backend/Naninovel.Language/Naninovel.Language.csproj index eb2d1eb..a38e642 100644 --- a/backend/Naninovel.Language/Naninovel.Language.csproj +++ b/backend/Naninovel.Language/Naninovel.Language.csproj @@ -13,7 +13,7 @@ - +