winkler-pixop · CaptainAye · Oct 1, 2024 · Oct 1, 2024 · Oct 1, 2024 · Oct 1, 2024
diff --git a/.ddev/web-build/Dockerfile.maven b/.ddev/web-build/Dockerfile.maven
@@ -0,0 +1 @@
+RUN apt update && apt install -y maven
diff --git a/.github/workflows/samples-scala.yaml b/.github/workflows/samples-scala.yaml
@@ -23,6 +23,7 @@ jobs:
           - 'samples/client/petstore/java/okhttp-gson'
           - samples/client/petstore/scalaz
           - samples/client/petstore/scala-pekko
+          - samples/client/petstore/scala-http4s
           #- samples/client/petstore/scala-sttp # won't pass while the same tests in circleci pass
           # servers
           - samples/server/petstore/scala-lagom-server

diff --git a/README.md b/README.md
@@ -1045,6 +1045,7 @@ Here is a list of template creators:
    * Scala (sttp): @chameleon82
    * Scala (sttp4): @flsh86
    * Scala (Pekko): @mickaelmagniez
+   * Scala (http4s): @JennyLeahy
    * Swift: @tkqubo
    * Swift 3: @hexelon
    * Swift 4: @ehyche
@@ -1213,7 +1214,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Rust                  | @frol (2017/07) @farcaller (2017/08) @richardwhiuk (2019/07) @paladinzh (2020/05) @jacob-pro (2022/10)                                                                                                                                                |
 | Scala                 | @clasnake (2017/07), @shijinkui  (2018/01), @ramzimaalej (2018/03), @chameleon82 (2020/03), @Bouillie (2020/04) @fish86 (2023/06)                                                               |
 | Swift                 | @jgavris (2017/07) @ehyche (2017/08) @Edubits (2017/09) @jaz-ah (2017/09) @4brunu (2019/11) @dydus0x14 (2023/06)                                                                                                                                                           |
-| TypeScript            | @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02) @davidgamero (2022/03) @mkusaka (2022/04) |
+| TypeScript            | @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02) @davidgamero (2022/03) @mkusaka (2022/04) @joscha (2024/10)    |
 | Xojo                  | @Topheee (2023/04)                                                                                                                                                                                                                                    |
 
 

diff --git a/bin/configs/rust-reqwest-petstore-async-tokensource.yaml b/bin/configs/rust-reqwest-petstore-async-tokensource.yaml
@@ -0,0 +1,11 @@
+generatorName: rust
+outputDir: samples/client/petstore/rust/reqwest/petstore-async-tokensource
+library: reqwest
+inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust
+additionalProperties:
+  supportAsync: true
+  supportTokenSource: true
+  supportMultipleResponses: true
+  packageName: petstore-reqwest-async-tokensource
+  useSingleRequestParameter: true
diff --git a/bin/configs/scala-http4s.yaml b/bin/configs/scala-http4s.yaml
@@ -0,0 +1,6 @@
+generatorName: scala-http4s
+outputDir: samples/client/petstore/scala-http4s
+inputSpec: modules/openapi-generator/src/test/resources/3_0/scala-http4s/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/scala-http4s
+additionalProperties:
+  artifactId: scala-http4s-client
diff --git a/bin/configs/swift6-alamofireLibrary.yaml b/bin/configs/swift6-alamofireLibrary.yaml
@@ -6,6 +6,7 @@ templateDir: modules/openapi-generator/src/main/resources/swift6
 generateAliasAsModel: true
 useCustomDateWithoutTime: true
 additionalProperties:
+  responseAs: ObjcBlock
   podAuthors: ""
   podSummary: PetstoreClient
   projectName: PetstoreClient

diff --git a/bin/configs/swift6-api-non-static-method.yaml b/bin/configs/swift6-api-non-static-method.yaml
@@ -4,8 +4,9 @@ library: alamofire
 inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/swift6
 additionalProperties:
-  responseAs: AsyncAwait,Combine,Result,PromiseKit,RxSwift
+  responseAs: AsyncAwait,Combine,Result,PromiseKit,RxSwift,ObjcBlock
   apiStaticMethod: false
+  mapFileBinaryToData: true
   podAuthors: ""
   podSummary: PetstoreClient
   projectName: PetstoreClient

diff --git a/bin/configs/swift6-combineDeferredLibrary.yaml b/bin/configs/swift6-combineDeferredLibrary.yaml
@@ -5,6 +5,7 @@ templateDir: modules/openapi-generator/src/main/resources/swift6
 generateAliasAsModel: true
 additionalProperties:
   responseAs: Combine
+  useSPMFileStructure: false
   podAuthors: ""
   podSummary: PetstoreClient
   projectName: PetstoreClient

diff --git a/bin/configs/swift6-combineLibrary.yaml b/bin/configs/swift6-combineLibrary.yaml
@@ -6,6 +6,7 @@ generateAliasAsModel: true
 additionalProperties:
   responseAs: Combine
   combineDeferred: false
+  swiftPackagePath: "Sources/CombineLibrary"
   podAuthors: ""
   podSummary: PetstoreClient
   projectName: PetstoreClient

diff --git a/bin/configs/swift6-objcCompatible.yaml b/bin/configs/swift6-objcCompatible.yaml
@@ -4,6 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-
 templateDir: modules/openapi-generator/src/main/resources/swift6
 generateAliasAsModel: true
 additionalProperties:
+  responseAs: ObjcBlock
   podAuthors: ""
   podSummary: PetstoreClient
   objcCompatible: true

diff --git a/bin/configs/swift6-oneOf.yaml b/bin/configs/swift6-oneOf.yaml
@@ -4,6 +4,8 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf.yaml
 templateDir: modules/openapi-generator/src/main/resources/swift6
 generateAliasAsModel: true
 additionalProperties:
+  responseAs: ObjcBlock
+  useSPMFileStructure: false
   podAuthors: ""
   podSummary: PetstoreClient
   projectName: PetstoreClient

diff --git a/bin/configs/swift6-promisekitLibrary.yaml b/bin/configs/swift6-promisekitLibrary.yaml
@@ -4,6 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-
 templateDir: modules/openapi-generator/src/main/resources/swift6
 generateAliasAsModel: true
 additionalProperties:
+  useSPMFileStructure: false
   responseAs: PromiseKit
   podAuthors: ""
   podSummary: PetstoreClient

diff --git a/bin/configs/swift6-resultLibrary.yaml b/bin/configs/swift6-resultLibrary.yaml
@@ -5,6 +5,7 @@ templateDir: modules/openapi-generator/src/main/resources/swift6
 generateAliasAsModel: true
 additionalProperties:
   responseAs: Result
+  useSPMFileStructure: false
   podAuthors: ""
   podSummary: PetstoreClient
   sortParamsByRequiredFlag: false

diff --git a/bin/configs/swift6-rxswiftLibrary.yaml b/bin/configs/swift6-rxswiftLibrary.yaml
@@ -5,6 +5,7 @@ templateDir: modules/openapi-generator/src/main/resources/swift6
 generateAliasAsModel: true
 additionalProperties:
   responseAs: RxSwift
+  useSPMFileStructure: false
   podAuthors: ""
   podSummary: PetstoreClient
   projectName: PetstoreClient

diff --git a/bin/configs/swift6-urlsessionLibrary.yaml b/bin/configs/swift6-urlsessionLibrary.yaml
@@ -5,10 +5,12 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-
 templateDir: modules/openapi-generator/src/main/resources/swift6
 generateAliasAsModel: true
 additionalProperties:
+  responseAs: ObjcBlock
   podAuthors: ""
   podSummary: PetstoreClient
   projectName: PetstoreClient
   podHomepage: https://github.com/openapitools/openapi-generator
   useSPMFileStructure: true
+  mapFileBinaryToData: true
   useClasses: true
   swiftUseApiNamespace: true
diff --git a/bin/configs/swift6-validation.yaml b/bin/configs/swift6-validation.yaml
@@ -4,6 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/validation.yaml
 templateDir: modules/openapi-generator/src/main/resources/swift6
 generateAliasAsModel: true
 additionalProperties:
+  useSPMFileStructure: false
   podAuthors: ""
   podSummary: PetstoreClient
   projectName: PetstoreClient

diff --git a/bin/configs/typescript-consolidated-single-value-enum.yaml b/bin/configs/typescript-consolidated-single-value-enum.yaml
@@ -0,0 +1,4 @@
+generatorName: typescript
+outputDir: samples/client/others/typescript/builds/enum-single-value
+inputSpec: modules/openapi-generator/src/test/resources/3_1/enum-single-value.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript
diff --git a/bin/configs/typescript-node-3.0.yaml b/bin/configs/typescript-node-3.0.yaml
@@ -0,0 +1,4 @@
+generatorName: typescript-node
+outputDir: samples/client/petstore/typescript-node/3_0
+inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript-node/SampleProject.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-node
diff --git a/docs/file-post-processing.md b/docs/file-post-processing.md
@@ -19,6 +19,7 @@ Also refer to the relevant documentation for [CLI](./usage.md), [Maven Plugin](h
 The following environment variables are supported by their respective generators:
 <!-- query with: grep -Rn '_POST_PROCESS_FILE"' modules | grep -Eo '[^"]+_POST_PROCESS_FILE' | sort -u -->
 
+* `AVRO_POST_PROCESS_FILE`
 * `CPP_POST_PROCESS_FILE`
 * `CSHARP_POST_PROCESS_FILE`
 * `C_POST_PROCESS_FILE`

diff --git a/docs/generators.md b/docs/generators.md
@@ -59,6 +59,7 @@ The following generators are available:
 * [rust](generators/rust.md)  
 * [scala-akka](generators/scala-akka.md)  
 * [scala-gatling](generators/scala-gatling.md)  
+* [scala-http4s](generators/scala-http4s.md)  
 * [scala-pekko](generators/scala-pekko.md)  
 * [scala-sttp](generators/scala-sttp.md)  
 * [scala-sttp4 (beta)](generators/scala-sttp4.md)  

diff --git a/docs/generators/rust.md b/docs/generators/rust.md
@@ -29,6 +29,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |supportAsync|If set, generate async function call instead. This option is for 'reqwest' library only| |true|
 |supportMiddleware|If set, add support for reqwest-middleware. This option is for 'reqwest' library only| |false|
 |supportMultipleResponses|If set, return type wraps an enum of all possible 2xx schemas. This option is for 'reqwest' library only| |false|
+|supportTokenSource|If set, add support for google-cloud-token. This option is for 'reqwest' library only and requires the 'supportAsync' option| |false|
 |useSingleRequestParameter|Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter.| |false|
 |withAWSV4Signature|whether to include AWS v4 signature support| |false|