@team-supercharge/oasg 18.2.1 → 18.3.0

package/bin/oasg

@@ -38,9 +38,9 @@ const DEFAULT_GENERATOR_MAPPING = {
   // client targets
   "android":                      { version: '7.17.0',  generator: 'kotlin' },
   "angular":                      { version: '7.11.0',  generator: 'typescript-angular' },
-  "feign":                        { version: '7.12.0',  generator: 'spring' },
-  "feign-kotlin":                 { version: '7.12.0',  generator: 'kotlin-spring' },
-  "plain-java":                   { version: '7.12.0',  generator: 'java' },
+  "feign":                        { version: '7.22.0',  generator: 'spring' },
+  "feign-kotlin":                 { version: '7.22.0',  generator: 'kotlin-spring' },
+  "plain-java":                   { version: '7.22.0',  generator: 'java' },
   "flutter":                      { version: '7.0.1',   generator: 'dart-dio' },
   "ios":                          { version: '7.0.1',   generator: 'swift5' },
   "apple-swift":                  { version: undefined, generator: undefined },
@@ -52,8 +52,8 @@ const DEFAULT_GENERATOR_MAPPING = {
   "typescript-fetch":             { version: '7.11.0',  generator: 'typescript-fetch' },
   // server targets
   "nestjs":                       { version: '7.0.1',   generator: 'typescript-angular' },
-  "spring":                       { version: '7.12.0',  generator: 'spring' },
-  "spring-kotlin":                { version: '7.12.0',  generator: 'kotlin-spring' },
+  "spring":                       { version: '7.22.0',  generator: 'spring' },
+  "spring-kotlin":                { version: '7.22.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' },
@@ -741,4 +741,3 @@ function determineArtifactVersion(argv) {
 function determinePreRelease(argv) {
   return argv.preRelease ? true : false;
 }
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "18.2.1",
+  "version": "18.3.0",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",
@@ -36,9 +36,9 @@
     "express": "^4.18.2",
     "express-http-proxy": "^1.6.3",
     "glob": "^10.2.1",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.3.0",
     "json-schema-merge-allof": "^0.8.1",
-    "openapi-to-postmanv2": "4.24.0",
+    "openapi-to-postmanv2": "6.3.0",
     "openapi-typescript-validator-ext-ref": "^3.2.0-external-ref-support",
     "swagger-ui-express": "^5.0.1",
     "yamljs": "^0.3.0",
@@ -51,5 +51,14 @@
     "jest": "^29.5.0",
     "jest-html-reporter": "^4.4.0",
     "jest-junit": "^17.0.0"
+  },
+  "overrides": {
+    "lodash": "^4.18.1",
+    "@redocly/respect-core": {
+      "js-yaml": "4.3.0"
+    },
+    "openapi-to-postmanv2": {
+      "js-yaml": "4.3.0"
+    }
   }
 }

package/targets/dotnet-webapi-system-text-json/README.md

@@ -125,15 +125,15 @@ public class PetHandlers
 {
     // Operation with a response body -> return the response model
     public Task<Pet> Handle(AddPetRequest request)
-        => Task.FromResult(request.pet);
+        => Task.FromResult(request.Pet);
 
     public async Task<Pet> Handle(GetPetByIdRequest request)
-        => await _repository.GetAsync(request.petId)
-           ?? throw new PetNotFoundException(request.petId);
+        => await _repository.GetAsync(request.PetId)
+           ?? throw new PetNotFoundException(request.PetId);
 
     // No-response-body operation -> return Task (the endpoint returns NoContent)
     public Task Handle(DeletePetRequest request)
-        => _repository.DeleteAsync(request.petId);
+        => _repository.DeleteAsync(request.PetId);
 }
 ```
 
@@ -164,7 +164,7 @@ public class GetPetByIdHandler(IHttpContextAccessor http)
     {
         var user = http.HttpContext!.User;            // authenticated principal
         var tenant = user.FindFirst("tenant")?.Value;
-        return await _repository.GetAsync(request.petId, tenant);
+        return await _repository.GetAsync(request.PetId, tenant);
     }
 }
 ```

package/targets/dotnet-webapi-system-text-json/templates/minimalEndpoints.mustache

@@ -41,7 +41,7 @@ namespace {{packageName}}
 {{#operations}}
 {{#operation}}
     /// <summary>Wolverine request for {{classname}}.{{operationId}}, carrying every parameter.</summary>
-    public record {{operationId}}Request({{#allParams}}{{>paramType}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}});
+    public record {{operationId}}Request({{#allParams}}{{>paramType}} {{#lambda.pascalcase}}{{paramName}}{{/lambda.pascalcase}}{{^-last}}, {{/-last}}{{/allParams}});
 {{/operation}}
 {{/operations}}
 {{/apis}}

package/targets/feign/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,4 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+wrapperVersion=3.3.4
+distributionType=bin
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar

package/targets/feign/generate.sh

@@ -5,13 +5,26 @@ source $(dirname "$0")/../common.sh
 rm -rf out/$targetId
 mkdir -p out/$targetId
 
+properties=(
+  "artifactId=${artifactId}"
+  "groupId=${groupId}"
+  "artifactVersion=${version}"
+  "basePackage=${basePackage}"
+  "apiPackage=${basePackage}.api"
+  "modelPackage=${basePackage}.model"
+  "configPackage=${basePackage}.config"
+)
+
+props=$(IFS=,; echo "${properties[*]}")
+
 java -jar $binary generate \
   -g $generatorId \
   -i $openApiFile \
   -t $templateDir \
   -o out/$targetId \
   -c $(dirname "$0")/generator-config.json \
-  -p "artifactId=${artifactId},groupId=${groupId},basePackage=${basePackage},apiPackage=${basePackage}.api,modelPackage=${basePackage}.model,invokerPackage=${basePackage}.client,artifactVersion=${version}" $generatorCustomArgs
+  -p "$props" \
+  $generatorCustomArgs
 
 cd out/$targetId
 cp $(dirname "$0")/mvnw .

package/targets/feign/generator-config.json

@@ -1,22 +1,15 @@
 {
   "library": "spring-cloud",
-  "dateLibrary": "java8",
-  "java8": true,
   "useTags": true,
   "hideGenerationTimestamp": true,
   "booleanGetterPrefix": "is",
-  "generateForOpenFeign": true,
-  "removeEnumValuePrefix": false,
   "documentationProvider": "none",
   "annotationLibrary": "none",
-  "useSpringBoot3": true,
   "typeMappings": {
-    "OffsetDateTime": "java.time.Instant",
-    "Date": "java.time.LocalDate"
+    "OffsetDateTime": "Instant"
   },
   "importMappings": {
-    "java.time.OffsetDateTime": "java.time.Instant",
-    "java.util.Date": "java.time.LocalDate"
+    "OffsetDateTime": "java.time.Instant"
   },
   "inlineSchemaOptions": {
     "ARRAY_ITEM_SUFFIX": "",