Merge pull request #29 from MobileTeleSystems/feature/alpha

Version 3.2

Author: genusP

.github/workflows/publish.yml

@@ -26,6 +26,8 @@ jobs:
       PackageOutputDir: ".packages"
       Prerelease: ${{ github.event.inputs.prerelease || 'false' }}
       PushPackage: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event.inputs.push }}
+      NpmTokenExists: ${{ secrets.NPM_TOKEN != '' }}
+      Platforms: "linux-x64 linux-musl-x64 osx-x64 osx-arm64 win-x64"
 
     steps:
       - uses: actions/checkout@v4
@@ -37,6 +39,11 @@ jobs:
         with:
           dotnet-version: 9.0.x
 
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
       - name: Install GitVersion
         uses: gittools/actions/gitversion/setup@v3.0.0
         with:
@@ -46,27 +53,62 @@ jobs:
         run: |
           ${GITVERSION_PATH}/dotnet-gitversion /output buildserver /output json
 
-      - name: Pack
+      - name: Pack Nuget
         run: |
           dotnet pack --nologo -o ${PackageOutputDir}  \
            -p:PackageVersion=${GitVersion_SemVer} \
-           -p:AssemblyVersion=${GitVersion_AssemblySemFileVer} \
            -p:FileVersion=${GitVersion_MajorMinorPatch} \
            -p:AssemblyVersion=${GitVersion_AssemblySemVer} \
            -p:FileVersion=${GitVersion_MajorMinorPatch} \
            -p:Configuration=Release
 
+      - name: Pack Npm
+        run: |
+          ROOT=$(pwd)
+          cd src/ApiCodeGenerator.Npm
+          npm install
+          npm version ${GitVersion_FullSemVer} --no-git-tag-version
+          npm run pack-ci -- ${ROOT}/${PackageOutputDir}
+
+      - name: Pack Npm Binaries
+        run: |
+          ROOT=$(pwd)
+          for PLATFORM in ${{ env.Platforms }}; do
+            echo "Building for platform: $PLATFORM"
+            dotnet publish src/ApiCodeGenerator.MSBuild \
+              -c Release \
+              -f net8.0 \
+              -r $PLATFORM \
+              --self-contained \
+              -p:PublishTrimmed=false \
+              -o ./bin/publish/$PLATFORM
+
+            # Create tgz archive with platform name only
+            cd ./bin/publish/$PLATFORM
+            tar -czf $ROOT/${PackageOutputDir}/${PLATFORM}.tgz *
+            cd $ROOT
+
+            echo "Created archive: ${PLATFORM}.tgz"
+          done
+
       - name: Nuget Push
         if: env.PushPackage == 'true'
         working-directory: ${{ env.PackageOutputDir }}
         run: dotnet nuget push *.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}}
 
+      - name: Npm Push
+        if: env.PushPackage == 'true' && env.NpmTokenExists == 'true'
+        uses: JS-DevTools/npm-publish@v4
+        with:
+          token: ${{ secrets.NPM_TOKEN }}
+          package: ${{ env.PackageOutputDir }}
+
       - name: Create Release
         uses: ncipollo/release-action@v1
         with:
           name: v${{ env.GitVersion_SemVer }}
           tag: v${{ env.GitVersion_SemVer }}
-          artifacts: ${{ env.PackageOutputDir }}/*.nupkg
+          artifacts: ${{ env.PackageOutputDir }}/*.nupkg,${{ env.PackageOutputDir }}/*.tgz
           generateReleaseNotes: true
           commit: ${{ env.GitVersion_Sha}}
           prerelease: ${{ env.Prerelease }}

.gitignore

@@ -5,6 +5,13 @@
 .vs/
 bin/
 obj/
+binaries/
+coverage/
+dist/
+node_modules/
 
 *.user
 msbuild.binlog
+package-lock.json
+acg.js
+acg.d.ts

ApiCodeGenerator.code-workspace

@@ -0,0 +1,14 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"path": "src/ApiCodeGenerator.Npm"
+		}
+	],
+	"settings": {
+		"autoHide.hideSideBarsOnDebug": false,
+		"autoHide.hidePanelOnDebug": false
+	}
+}

GitVersion.yml

@@ -1,13 +1,13 @@
+next-version: "3.2.0"
 mode: ContinuousDelivery
 branches:
-    main:
-        mode: ContinuousDeployment
-        label: ''
-        increment: Patch
-        is-main-branch: true
-    develop:
-        label: rc
+  main:
+    mode: ContinuousDeployment
+    label: ""
+    increment: Patch
+    is-main-branch: true
+  develop:
+    label: rc
 ignore:
   sha: []
 merge-message-formats: {}
-

src/ApiCodeGenerator.AsyncApi/ApiCodeGenerator.AsyncApi.nuspec

@@ -22,6 +22,8 @@
     <file src="bin\$configuration$\netstandard2.0\ApiCodeGenerator.*.dll" target="lib\netstandard2.0" />
     <file src="..\Sdk\Sdk.props" target="Sdk\Sdk.props" />
     <file src="..\Sdk\Sdk.targets" target="Sdk\Sdk.targets" />
+    <file src="..\Sdk\NpmPack.targets" target="Sdk\NpmPack.targets" />
+    <file src="..\Sdk\postinstall.js" target="Sdk\postinstall.js" />
     <file src="..\..\LICENSE" target="LICENSE" />
   </files>
 </package>

src/ApiCodeGenerator.Core/GenerationTask.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
@@ -91,8 +91,9 @@ public async Task<bool> ExecuteAsync(string nswagFilePath,
             vars["OutFile"] = outFilePath;
             var roVariables = new ReadOnlyDictionary<string, string>(vars);
 
-            LogMessage("Values of nswag variables");
-            LogMessage(string.Join(Environment.NewLine, vars.Select(_ => $"\t[{_.Key}] = {_.Value}")));
+            LogMessage("Values of nswag variables: {0}{1}",
+                Environment.NewLine,
+                string.Join(Environment.NewLine, vars.Select(_ => $"\t[{_.Key}] = {_.Value}")));
 
             JObject? baseNswagDocument = LoadBaseNswag(baseNswagFilePath);
             var nswagDocument = _documentFactory.LoadNswagDocument(nswagFilePath, roVariables, baseNswagDocument);
@@ -110,18 +111,18 @@ public async Task<bool> ExecuteAsync(string nswagFilePath,
                 return false;
             }
 
-            var context = await CreateGenerationContext(nswagDocument, nswagFilePath, roVariables);
-
-            if (context is not null)
+            try
             {
-                if (context.DocumentReader is null)
-                {
-                    Log?.LogWarning(NotSetInput, nswagFilePath, "Source not set. Skip generation.");
-                    return true;
-                }
+                var context = await CreateGenerationContext(nswagDocument, nswagFilePath, roVariables);
 
-                try
+                if (context is not null)
                 {
+                    if (context.DocumentReader is null)
+                    {
+                        Log?.LogWarning(NotSetInput, nswagFilePath, "Source not set. Skip generation.");
+                        return true;
+                    }
+
                     LogMessage($"Use settings: {generatorSettings.Key}");
                     var contentGenerator = await contentGeneratorFactory.Invoke(context);
 
@@ -137,14 +138,14 @@ public async Task<bool> ExecuteAsync(string nswagFilePath,
                     {
                         Log?.LogError(WriteFileErr, outFilePath, "Unable write file. Error: {0}", ex.Message);
                     }
-                }
-                catch (InvalidOperationException ex)
-                {
-                    Log?.LogError(GenerationErr, nswagFilePath, ex.Message);
-                    return false;
-                }
 
-                return true;
+                    return true;
+                }
+            }
+            catch (InvalidOperationException ex)
+            {
+                Log?.LogError(GenerationErr, nswagFilePath, ex.Message);
+                return false;
             }
 
             return false;

src/ApiCodeGenerator.MSBuild/ApiCodeGenerator.MSBuild.csproj

@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net9.0;net8.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;netstandard2.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <Nullable>enable</Nullable>
+    <InvariantGlobalization>true</InvariantGlobalization>
     <!--Параметры пакета в Directory.Build.targets-->
   </PropertyGroup>
 
@@ -23,13 +24,19 @@
     <None Include="..\ApiCodeGenerator.Core\bin\$(Configuration)\netstandard2.0\ApiCodeGenerator.Core.dll" Link="ApiCodeGenerator.Core.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="..\ApiCodeGenerator.OpenApi\bin\$(Configuration)\netstandard2.0\ApiCodeGenerator.OpenApi.dll" CopyToPublishDirectory="Always" />
+    <None Include="..\ApiCodeGenerator.AsyncApi\bin\$(Configuration)\netstandard2.0\ApiCodeGenerator.AsyncApi.dll" CopyToPublishDirectory="Always" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\ApiCodeGenerator.Abstraction\ApiCodeGenerator.Abstraction.csproj" />
   </ItemGroup>
 
+  <ItemGroup Label="Nswag prerequiries">
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="9.0.0" />
+  </ItemGroup>
+
   <Import Project="./ApiCodeGenerator.MSBuild.Console.targets" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
   <Import Project="./ApiCodeGenerator.MSBuild.Task.targets" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
 
-</Project>
+</Project>

src/ApiCodeGenerator.MSBuild/ApiCodeGenerator.MSBuild.nuspec

@@ -8,7 +8,7 @@
     <description>Adds API client generation to the project based on the NSwag file and the API description document.</description>
     <repository type="git" url="$repository$" />
     <dependencies>
-      <dependency id="Microsoft.Extensions.ApiDescription.Client" version="5.0" />
+      <dependency id="Microsoft.Extensions.ApiDescription.Client" version="10.0" />
       <dependency id="NSwag.MSBuild" version="$nswagVersion$" />
     </dependencies>
     <license type="file">LICENSE</license>

src/ApiCodeGenerator.MSBuild/Console/ConsoleLogAdapter.cs

@@ -1,21 +1,43 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO;
 using ApiCodeGenerator.Abstraction;
 
 namespace ApiCodeGenerator.MSBuild
 {
     internal class ConsoleLogAdapter : ILogger
     {
         public void LogError(string? code, string? sourceFile, string message, params object[] messageArgs)
-            => Console.Error.WriteLine($"{sourceFile}: {string.Format(message, messageArgs)}");
+            => Log(Console.Error, "error", code, sourceFile, string.Format(message, messageArgs));
 
         public void LogMessage(string? code, string? sourceFile, string message, params object[] messageArgs)
-            => Console.WriteLine($"INFO: {string.Format(message, messageArgs)}");
+            => Log(Console.Out, code is null ? null : "info", code, sourceFile, string.Format(message, messageArgs));
 
         public void LogWarning(string? code, string? sourceFile, string message, params object[] messageArgs)
-            => Console.WriteLine($"WARNING {sourceFile}: {string.Format(message, messageArgs)}");
+            => Log(Console.Out, "warning", code, sourceFile, string.Format(message, messageArgs));
+
+        private static void Log(TextWriter writer, string? type, string? code, string? file, string message)
+        {
+            if (file is not null)
+            {
+                writer.Write(Path.IsPathFullyQualified(file)
+                    ? file
+                    : Path.GetFullPath(file));
+                writer.Write("(1,1): ");
+            }
+
+            if (type is not null)
+            {
+                writer.Write(type);
+                if (code is not null)
+                {
+                    writer.Write(" ");
+                    writer.Write(code);
+                }
+
+                writer.Write(": ");
+            }
+
+            writer.WriteLine(message);
+        }
     }
 }

src/ApiCodeGenerator.MSBuild/Console/GenerateCommand.cs

@@ -50,7 +50,7 @@ public GenerateCommand()
             this.SetHandler(ExecuteAsync);
         }
 
-        private Task ExecuteAsync(InvocationContext context)
+        private async Task ExecuteAsync(InvocationContext context)
         {
 #if DEBUG
             System.Diagnostics.Debugger.Launch();
@@ -66,7 +66,8 @@ private Task ExecuteAsync(InvocationContext context)
             var factory = GetGenerationTaskFactory(nswagToolPath);
             AddExtesionsProbingPaths(extPaths);
             var generator = factory.Create(extPaths, new ConsoleLogAdapter());
-            return generator.ExecuteAsync(nswagFile, openApiFile, outFile, variables, baseNswagFile);
+            var result = await generator.ExecuteAsync(nswagFile, openApiFile, outFile, variables, baseNswagFile);
+            context.ExitCode = result ? 0 : 1;
         }
 
         private IGenerationTaskFactory GetGenerationTaskFactory(string? nswagToolsPath)
@@ -77,7 +78,7 @@ private IGenerationTaskFactory GetGenerationTaskFactory(string? nswagToolsPath)
             AssemblyResolver.Register(context);
 
             var thisAssemblyPath = GetThisAssemblyPath();
-            AssemblyResolver.AddProbingPath(SelectToolsFrameworkFolder(nswagToolsPath ?? Path.Combine(thisAssemblyPath, NswagToolsDirName)));
+            AssemblyResolver.AddProbingPath(nswagToolsPath ?? Path.Combine(thisAssemblyPath, NswagToolsDirName));
             AssemblyResolver.AddProbingPath(thisAssemblyPath);
 
             var coreAsm = context.LoadFromAssemblyName(new AssemblyName("ApiCodeGenerator.Core"));
@@ -103,24 +104,5 @@ private static string GetThisAssemblyPath()
             var thisAsmPath = Assembly.GetExecutingAssembly().Location;
             return Path.GetDirectoryName(thisAsmPath)!;
         }
-
-        private static string[] SelectToolsFrameworkFolder(string path)
-        {
-            // Для NET >= 6 добавляем в список источников папку с фрейворком AspNetCore
-            var aspVersion = $"{Environment.Version.Major}.{Environment.Version.Minor}.*";
-            return new[]
-            {
-                path,
-                GetAspSharedFrameworkFolder(aspVersion),
-            };
-
-            static string GetAspSharedFrameworkFolder(string version)
-            {
-                var asm = Assembly.Load("System.Threading");
-                var shared = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(asm.Location)))!;
-                var asp = Path.Combine(shared, "Microsoft.AspNetCore.App");
-                return Directory.GetDirectories(asp, version).OrderBy(_ => _).Last();
-            }
-        }
     }
 }