diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml index 8fc5d00d..d654dc32 100644 --- a/.github/workflows/backend-ci.yml +++ b/.github/workflows/backend-ci.yml @@ -41,5 +41,11 @@ jobs: - name: Build run: dotnet build ScriptBee.slnx --no-restore + - name: Restore .NET local tools + run: dotnet tool restore + + - name: Run CSharpier format check + run: dotnet tool run csharpier check . + - name: Test run: dotnet test ScriptBee.slnx --no-build --verbosity normal diff --git a/DxWorks.ScriptBee.Plugin.Api/HelperFunctions.cs b/DxWorks.ScriptBee.Plugin.Api/HelperFunctions.cs index 8ed021ef..fcee4c50 100644 --- a/DxWorks.ScriptBee.Plugin.Api/HelperFunctions.cs +++ b/DxWorks.ScriptBee.Plugin.Api/HelperFunctions.cs @@ -1,5 +1,3 @@ namespace DxWorks.ScriptBee.Plugin.Api; -public static partial class HelperFunctions -{ -} +public static partial class HelperFunctions { } diff --git a/DxWorks.ScriptBee.Plugin.Api/IModelLinker.cs b/DxWorks.ScriptBee.Plugin.Api/IModelLinker.cs index 3faf43af..c36496c4 100644 --- a/DxWorks.ScriptBee.Plugin.Api/IModelLinker.cs +++ b/DxWorks.ScriptBee.Plugin.Api/IModelLinker.cs @@ -2,8 +2,11 @@ public interface IModelLinker : IPlugin { - public Task LinkModel(Dictionary, Dictionary> context, - Dictionary? configuration = default, CancellationToken cancellationToken = default); + public Task LinkModel( + Dictionary, Dictionary> context, + Dictionary? configuration = default, + CancellationToken cancellationToken = default + ); public string GetName(); } diff --git a/DxWorks.ScriptBee.Plugin.Api/IModelLoader.cs b/DxWorks.ScriptBee.Plugin.Api/IModelLoader.cs index 1a04d20b..28730663 100644 --- a/DxWorks.ScriptBee.Plugin.Api/IModelLoader.cs +++ b/DxWorks.ScriptBee.Plugin.Api/IModelLoader.cs @@ -4,15 +4,26 @@ namespace DxWorks.ScriptBee.Plugin.Api; public interface IModelLoader : IPlugin { - [Obsolete("Use LoadModel(IEnumerable fileStreams, Dictionary? configuration = default, CancellationToken cancellationToken = default) instead")] - public Task>> LoadModel(List fileStreams, - Dictionary? configuration = default, CancellationToken cancellationToken = default); + [Obsolete( + "Use LoadModel(IEnumerable fileStreams, Dictionary? configuration = default, CancellationToken cancellationToken = default) instead" + )] + public Task>> LoadModel( + List fileStreams, + Dictionary? configuration = default, + CancellationToken cancellationToken = default + ); public Task>> LoadModel( - IEnumerable fileStreams, Dictionary? configuration = default, - CancellationToken cancellationToken = default) + IEnumerable fileStreams, + Dictionary? configuration = default, + CancellationToken cancellationToken = default + ) { - return LoadModel(fileStreams.Select(x => x.Stream).ToList(), configuration, cancellationToken); + return LoadModel( + fileStreams.Select(x => x.Stream).ToList(), + configuration, + cancellationToken + ); } public string GetName(); diff --git a/DxWorks.ScriptBee.Plugin.Api/IPlugin.cs b/DxWorks.ScriptBee.Plugin.Api/IPlugin.cs index e90b2957..88ccfcf9 100644 --- a/DxWorks.ScriptBee.Plugin.Api/IPlugin.cs +++ b/DxWorks.ScriptBee.Plugin.Api/IPlugin.cs @@ -1,5 +1,3 @@ namespace DxWorks.ScriptBee.Plugin.Api; -public interface IPlugin -{ -} +public interface IPlugin { } diff --git a/DxWorks.ScriptBee.Plugin.Api/IScriptGeneratorStrategy.cs b/DxWorks.ScriptBee.Plugin.Api/IScriptGeneratorStrategy.cs index f5b95fd2..5f4b67ce 100644 --- a/DxWorks.ScriptBee.Plugin.Api/IScriptGeneratorStrategy.cs +++ b/DxWorks.ScriptBee.Plugin.Api/IScriptGeneratorStrategy.cs @@ -10,20 +10,37 @@ public interface IScriptGeneratorStrategy : IPlugin public string GenerateClassName(Type classType); - public string GenerateClassName(Type classType, Type baseClassType, out HashSet baseClassGenericTypes); + public string GenerateClassName( + Type classType, + Type baseClassType, + out HashSet baseClassGenericTypes + ); public string GenerateClassStart(); public string GenerateClassEnd(); - public string GenerateField(string fieldModifier, Type fieldType, string fieldName, - out HashSet genericTypes); - - public string GenerateProperty(string propertyModifier, Type propertyType, string propertyName, - out HashSet genericTypes); - - public string GenerateMethod(string methodModifier, Type methodType, string methodName, - List> methodParams, out HashSet genericTypes); + public string GenerateField( + string fieldModifier, + Type fieldType, + string fieldName, + out HashSet genericTypes + ); + + public string GenerateProperty( + string propertyModifier, + Type propertyType, + string propertyName, + out HashSet genericTypes + ); + + public string GenerateMethod( + string methodModifier, + Type methodType, + string methodName, + List> methodParams, + out HashSet genericTypes + ); public string GenerateModelDeclaration(string modelType); diff --git a/DxWorks.ScriptBee.Plugin.Api/IScriptRunner.cs b/DxWorks.ScriptBee.Plugin.Api/IScriptRunner.cs index 89b70cbd..b98abf24 100644 --- a/DxWorks.ScriptBee.Plugin.Api/IScriptRunner.cs +++ b/DxWorks.ScriptBee.Plugin.Api/IScriptRunner.cs @@ -7,6 +7,11 @@ public interface IScriptRunner : IPlugin { public string Language { get; } // todo move in manifest.yaml - public Task RunAsync(IProject project, IHelperFunctionsContainer helperFunctionsContainer, - IEnumerable parameters, string scriptContent, CancellationToken cancellationToken = default); + public Task RunAsync( + IProject project, + IHelperFunctionsContainer helperFunctionsContainer, + IEnumerable parameters, + string scriptContent, + CancellationToken cancellationToken = default + ); } diff --git a/DxWorks.ScriptBee.Plugin.Api/Model/IContext.cs b/DxWorks.ScriptBee.Plugin.Api/Model/IContext.cs index 63bed43d..7fe17b34 100644 --- a/DxWorks.ScriptBee.Plugin.Api/Model/IContext.cs +++ b/DxWorks.ScriptBee.Plugin.Api/Model/IContext.cs @@ -2,11 +2,17 @@ public interface IContext { - public Dictionary, Dictionary> Models { get; set; } + public Dictionary< + Tuple, + Dictionary + > Models { get; set; } public Dictionary, Dictionary> Tags { get; set; } - public void SetModel(Tuple tuple, Dictionary objectsDictionary); + public void SetModel( + Tuple tuple, + Dictionary objectsDictionary + ); public void RemoveLoaderEntries(string sourceName); public List GetClasses(); diff --git a/DxWorks.ScriptBee.Plugin.Api/ScriptBeeModel.cs b/DxWorks.ScriptBee.Plugin.Api/ScriptBeeModel.cs index 65a952b9..09659b95 100644 --- a/DxWorks.ScriptBee.Plugin.Api/ScriptBeeModel.cs +++ b/DxWorks.ScriptBee.Plugin.Api/ScriptBeeModel.cs @@ -5,4 +5,4 @@ namespace DxWorks.ScriptBee.Plugin.Api; public class ScriptBeeModel : Expando { public bool Ignored { get; set; } -} \ No newline at end of file +} diff --git a/DxWorks.ScriptBee.Plugin.Api/Services/IHelperFunctionsResultService.cs b/DxWorks.ScriptBee.Plugin.Api/Services/IHelperFunctionsResultService.cs index e342d272..81f72990 100644 --- a/DxWorks.ScriptBee.Plugin.Api/Services/IHelperFunctionsResultService.cs +++ b/DxWorks.ScriptBee.Plugin.Api/Services/IHelperFunctionsResultService.cs @@ -2,9 +2,19 @@ public interface IHelperFunctionsResultService { - Task UploadResultAsync(string fileName, string type, string content, CancellationToken cancellationToken = default); + Task UploadResultAsync( + string fileName, + string type, + string content, + CancellationToken cancellationToken = default + ); - Task UploadResultAsync(string fileName, string type, Stream content, CancellationToken cancellationToken = default); + Task UploadResultAsync( + string fileName, + string type, + Stream content, + CancellationToken cancellationToken = default + ); void UploadResult(string fileName, string type, string content); diff --git a/Plugins/CHANGELOG.md b/Plugins/CHANGELOG.md index 0fc900aa..8d0ce076 100644 --- a/Plugins/CHANGELOG.md +++ b/Plugins/CHANGELOG.md @@ -9,7 +9,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Changed -- update `Jint` to 4.16.0 +- update `Jint` to 4.16.1 - update `Microsoft.CodeAnalysis` to 5.9.0 - update `@angular/common` to 22.1.2 - update `@angular/compiler` to 22.1.2