@team-supercharge/oasg 16.3.1-chore-update-dotnet-target-81ecf803.0 → 16.4.0-feature-aspdotnetcore-generator-f348f200.0

package/README.md

@@ -1006,6 +1006,27 @@ Validations from OpenAPI spec:
 | packageName | Name of the generated package | Y | - |
 | generatorCustomArgs | Custom arguments of the generator (--global-property, --additional-properties) | N | - |
 
+#### `dotnet-webapi`
+
+```json
+{
+  "id": "dotnet-webapi",
+  "type": "dotnet-webapi",
+  "source": "source-merged",
+  "sourceUrl": "https://api.nuget.org/v3/index.json",
+  "apiKey": "apiKey",
+  "packageName": "packageName",
+  "generatorCustomArgs": "--global-property=supportingFiles,modelDocs --additional-properties=nullableReferenceTypes=false"
+}
+```
+
+| Parameter           | Description                                                                    | Required | Default |
+| ------------------- | ------------------------------------------------------------------------------ | -------- | ------- |
+| sourceUrl           | Url to where the package will be published                                     | Y        | -       |
+| apiKey              | Api key of nuget source                                                        | Y        | -       |
+| packageName         | Name of the generated package                                                  | Y        | -       |
+| generatorCustomArgs | Custom arguments of the generator (--global-property, --additional-properties) | N        | -       |
+
 #### `postman`
 
 ```json

package/bin/oasg

@@ -53,7 +53,8 @@ const DEFAULT_GENERATOR_MAPPING = {
   "spring-kotlin":                { version: '7.11.0',  generator: 'kotlin-spring' },
   "python-fastapi":               { version: '7.8.0',   generator: 'python-fastapi' },
   "python-fastapi-raw-request":   { version: '7.0.1',   generator: 'python-fastapi' },
-  "dotnet":                       { version: '7.11.0',   generator: 'csharp-functions' },
+  "dotnet":                       { version: '7.8.0',   generator: 'csharp-functions' },
+  "dotnet-webapi":                { version: '7.11.0',   generator: 'aspnetcore' },
   // misc targets
   "contract-testing":             { version: '4.3.1',   generator: 'typescript-node' },
   "openapi":                      { version: undefined, generator: undefined },

package/config.schema.yml

@@ -29,6 +29,7 @@ properties:
         - $ref: '#/targets/Flutter'
         - $ref: '#/targets/Kmp'
         - $ref: '#/targets/Dotnet'
+        - $ref: '#/targets/DotnetWebApi'
         - $ref: '#/targets/Postman'
         - $ref: '#/targets/TypeScriptAxios'
         - $ref: '#/targets/TypeScriptFetch'
@@ -413,6 +414,23 @@ targets:
           - apiKey
           - packageName
 
+  DotnetWebApi:
+    allOf:
+      - $ref: '#/targets/Base'
+      - properties:
+          type:
+            pattern: '^dotnet-webapi$'
+          sourceUrl:
+            type: string
+          apiKey:
+            type: string
+          packageName:
+            type: string
+        required:
+          - sourceUrl
+          - apiKey
+          - packageName    
+
   Kmp:
     allOf:
       - $ref: '#/targets/Base'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "16.3.1-chore-update-dotnet-target-81ecf803.0",
+  "version": "16.4.0-feature-aspdotnetcore-generator-f348f200.0",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",

package/targets/dotnet/publish.sh

@@ -9,8 +9,15 @@ dotnet restore
 dotnet build -c Release
 dotnet pack -c Release -p:Version=$version -p:IsPackable=true
 
+isWindows=false
+if [[ "$OSTYPE" == "cygwin"* ]] || [[ "$OSTYPE" == "msys"* ]]; then
+    isWindows=true
+fi
+storePasswordOption=$([[ $isWindows == true ]] && echo "" || echo "--store-password-in-clear-text")
+
 # publish
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?><configuration></configuration>" > nuget.config
-nuget push "src/**/bin/Release/*.nupkg" -ConfigFile nuget.config -ApiKey "${apiKey}" -Source ${sourceUrl}
+dotnet nuget add source "${sourceUrl}" -n Feed -u User -p "${apiKey}" --configfile nuget.config $storePasswordOption
+dotnet nuget push "src/**/bin/Release/*.nupkg" -s ${sourceUrl} -k AZ
 
 cd ../..

package/targets/dotnet-webapi/generate.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+source $(dirname "$0")/../common.sh
+
+rm -rf out/$targetId
+mkdir -p out/$targetId
+
+java -jar $binary generate \
+  -g $generatorId \
+  -i $openApiFile \
+  -t $templateDir \
+  -o out/$targetId \
+  -c $(dirname "$0")/generator-config.json \
+  -p "packageVersion=$version,packageName=$packageName" \
+  $generatorCustomArgs

package/targets/dotnet-webapi/generator-config.json

@@ -0,0 +1,18 @@
+{
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
+    "SKIP_SCHEMA_REUSE": "true"
+  },
+  "additionalProperties": {
+    "aspnetCoreVersion": "8.0",
+    "operationIsAsync": true,
+    "buildTarget": "library",
+    "generateBody": false,
+    "useDateTimeOffset": true,
+    "nullableReferenceTypes": true,
+    "operationResultTask": true,
+    "enumNameSuffix": "",
+    "enumValueSuffix": ""
+  }
+}

package/targets/dotnet-webapi/publish.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+source $(dirname "$0")/../common.sh
+
+cd out/$targetId
+
+# pack
+dotnet restore
+dotnet build -c Release
+dotnet pack -c Release -p:Version=$version -p:IsPackable=true
+
+# publish
+dotnet nuget push "src/**/bin/Release/*.nupkg" --api-key "${apiKey}" --source ${sourceUrl}
+
+cd ../..