@team-supercharge/oasg 13.0.0-python-upgrade-5d937276.0 → 13.0.0-react-upgrade-cef0d034.0

package/README.md

@@ -454,12 +454,12 @@ Common target parameters
 | packageName | Name of the generated NPM package | Y | - |
 | repository | URL of the NPM package registry | Y | - |
 
-#### `react-native`
+#### `react`
 
 ```json
 {
-  "id": "client-react-native",
-  "type": "react-native",
+  "id": "client-react",
+  "type": "react",
   "source": "source-merged",
   "packageName": "@project/oasg-example-react-native",
   "repository": "https://gitlab.supercharge.io/api/v4/projects/1226/packages/npm/"
@@ -481,8 +481,7 @@ Common target parameters
   "type": "stubby",
   "source": "source-merged",
   "generateWithDocker": "true",
-  "repository": "registry.supercharge.io/misc/oasg-example",
-  "generator": "https://gitlab.supercharge.io/misc/openapi-generator-sc/-/package_files/225/download"
+  "repository": "registry.supercharge.io/misc/oasg-example"
 }
 ```
 
@@ -606,7 +605,6 @@ TBD
   "generatorId": "swift5",
   "source": "source-merged",
   "projectName": "OASgExample",
-  "generator": "https://gitlab.supercharge.io/misc/openapi-generator-sc/-/package_files/348/download",
   "repository": "git@gitlab.supercharge.io:example/openapi-generator-source.git",
   "interfaceType": "Combine",
   "generatorCustomArgs": "--model-name-suffix=ApiModel"
@@ -620,6 +618,25 @@ TBD
 | interfaceType | Response type of the generated client: `Combine` / `Result` / `RxSwift` / `AsyncAwait` / `PromiseKit` | Y | - |
 | generatorCustomArgs | Custom arguments of the generator | N | - |
 
+#### `flutter`
+
+```json
+{
+  "id": "client-flutter",
+  "type": "flutter",
+  "source": "source-merged",
+  "packageName": "OASgExample",
+  "repository": "git@gitlab.supercharge.io:example/openapi-generator-source.git",
+  "generatorCustomArgs": "--model-name-suffix=ApiModel"
+}
+```
+
+|Parameter| Description| Required | Default |
+|-|-|-|-|
+| packageName | Name of the package | Y | - |
+| repository | URL of the generated client api code repository | Y | - |
+| generatorCustomArgs | Custom arguments of the generator | N | - |
+
 #### `python`
 
 ```json
@@ -762,7 +779,7 @@ This section covers the breaking changes and their migrations across major versi
 
 ## From `12.x.x` to `13.0.0`
 
-### Schema naming updates in `angular`, `python` targets
+### Schema naming updates in `angular`, `python`, `ios`, `nestjs`, `react` targets
 
 With the update to [OpenAPI Generator 7.0.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.0.0) the same breaking changes appear as in other targets before:
 
@@ -778,6 +795,11 @@ and more:
 
 * the default `ngVersion` parameter is set to `16.0.0` if you wish to specify another version, use e.g `"generatorCustomArgs": "-p ngVersion=12"` in your `config.json`
 
+### Breaking in `react-native` target
+
+* as both technologies used the same `typescript-fetch`-based generator, with this version the previous `react-native` target has been renamed to a more generic `react` name
+* if at the future the best practices would change between the web-based _React_ and _React Native_ mobile projects, the `react-native` target will be reintroduced
+
 ## From `11.x.x` to `12.0.0`
 
 The following options from the `openapi` target type has been moved to the [Source](#source) configuration.

package/bin/oasg

@@ -34,16 +34,17 @@ const PROXY_PORT = '9999';
 const DEFAULT_GENERATOR_MAPPING = {
   // client targets
   "android":          { version: '6.6.0',   generator: 'kotlin' },
-  "angular":          { version: '7.0.0',   generator: 'typescript-angular' },
-  "feign":            { version: '6.6.0',   generator: 'spring' },
-  "feign-kotlin":     { version: '6.6.0',   generator: 'kotlin-spring' },
-  "ios":              { version: '4.3.1',   generator: 'swift5' },
-  "python":           { version: '7.0.0',   generator: 'python' },
-  "react-native":     { version: '4.3.1',   generator: 'typescript-fetch' },
+  "angular":          { version: '7.0.1',   generator: 'typescript-angular' },
+  "feign":            { version: '7.0.1',   generator: 'spring' },
+  "feign-kotlin":     { version: '7.0.1',   generator: 'kotlin-spring' },
+  "flutter":          { version: '7.0.0',   generator: 'dart-dio' },
+  "ios":              { version: '7.0.1',   generator: 'swift5' },
+  "python":           { version: '7.0.1',   generator: 'python' },
+  "react":            { version: '7.0.1',   generator: 'typescript-fetch' },
   // server targets
-  "nestjs":           { version: '5.4.0',   generator: 'typescript-angular' },
-  "spring":           { version: '6.6.0',   generator: 'spring' },
-  "spring-kotlin":    { version: '6.6.0',   generator: 'kotlin-spring' },
+  "nestjs":           { version: '7.0.1',   generator: 'typescript-angular' },
+  "spring":           { version: '7.0.1',   generator: 'spring' },
+  "spring-kotlin":    { version: '7.0.1',   generator: 'kotlin-spring' },
   // misc targets
   "contract-testing": { version: '4.3.1',   generator: 'typescript-node' },
   "openapi":          { version: undefined, generator: undefined },

package/config.schema.yml

@@ -11,7 +11,7 @@ properties:
     items:
       oneOf:
         - $ref: '#/targets/Angular'
-        - $ref: '#/targets/ReactNative'
+        - $ref: '#/targets/React'
         - $ref: '#/targets/Feign'
         - $ref: '#/targets/FeignKotlin'
         - $ref: '#/targets/Spring'
@@ -23,6 +23,7 @@ properties:
         - $ref: '#/targets/ContractTesting'
         - $ref: '#/targets/NestJS'
         - $ref: '#/targets/OpenAPI'
+        - $ref: '#/targets/Flutter'
 required:
   - targets
 additionalProperties: false
@@ -120,12 +121,12 @@ targets:
           - packageName
           - repository
 
-  ReactNative:
+  React:
     allOf:
       - $ref: '#/targets/Base'
       - properties:
           type:
-            pattern: "^react-native$"
+            pattern: "^react$"
           packageName:
             type: string
           repository:
@@ -331,6 +332,20 @@ targets:
           fileName:
             type: string
 
+  Flutter:
+    allOf:
+      - $ref: '#/targets/Base'
+      - properties:
+          type:
+            pattern: "^flutter$"
+          packageName:
+            type: string
+          repository:
+            type: string
+        required:
+        - packageName
+        - repository
+
 definitions:
   # default
   SourceOverrides:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "13.0.0-python-upgrade-5d937276.0",
+  "version": "13.0.0-react-upgrade-cef0d034.0",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",

package/targets/feign/generator-config.json

@@ -2,6 +2,7 @@
   "library": "spring-cloud",
   "dateLibrary": "java8",
   "java8": true,
+  "useTags": true,
   "hideGenerationTimestamp": true,
   "booleanGetterPrefix": "is",
   "generateForOpenFeign": true,
@@ -17,9 +18,9 @@
     "java.time.OffsetDateTime": "java.time.Instant",
     "java.util.Date": "java.time.LocalDate"
   },
-  "inlineSchemaNameDefaults": {
-    "arrayItemSuffix": "",
-    "mapItemSuffix": "",
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
     "SKIP_SCHEMA_REUSE": "true"
   }
 }

package/targets/feign/templates/beanValidation.mustache

@@ -1,7 +1,2 @@
-{{! https://github.com/OpenAPITools/openapi-generator/pull/5960 }}
-{{#required}}{{^isReadOnly}}{{^isNullable}}
-    @NotNull{{/isNullable}}{{/isReadOnly}}
-{{/required}}{{#isContainer}}{{^isPrimitiveType}}{{^isEnum}}
-    @Valid{{/isEnum}}{{/isPrimitiveType}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}
-    @Valid{{/isPrimitiveType}}{{/isContainer}}
-{{>beanValidationCore}}
+{{! only add @NotNull if property not nullable }}
+{{#required}}{{^isReadOnly}}{{^isNullable}}@NotNull {{/isNullable}}{{/isReadOnly}}{{/required}}{{#isContainer}}{{^isPrimitiveType}}{{^isEnum}}@Valid {{/isEnum}}{{/isPrimitiveType}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}@Valid {{/isPrimitiveType}}{{/isContainer}}{{>beanValidationCore}}

package/targets/feign/templates/formParams.mustache

@@ -1,2 +1,3 @@
-{{! https://github.com/OpenAPITools/openapi-generator/issues/7794 }}
+{{! annotate RequestPart instead of RequestParam when model is not array }}
+{{! add bean validation conditinally if param is file }}
 {{#isFormParam}}{{^isFile}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{/useBeanValidation}} {{#isModel}}@RequestPart{{/isModel}}{{^isModel}}{{#isArray}}@RequestPart{{/isArray}}{{^isArray}}@RequestPart{{/isArray}}{{/isModel}}(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}){{>dateTimeParam}} {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{/useBeanValidation}} @RequestPart(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{#isArray}}List<{{/isArray}}{{#reactive}}Flux<Part>{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isArray}}>{{/isArray}} {{paramName}}{{/isFile}}{{/isFormParam}}

package/targets/feign/templates/libraries/spring-cloud/clientConfiguration.mustache

@@ -0,0 +1,118 @@
+{{! import ConditionalOnProperty if any auth methods are anbled }}
+package {{configPackage}};
+
+{{#authMethods}}
+{{#isBasicBasic}}
+import feign.auth.BasicAuthRequestInterceptor;
+{{^hasApiKeyMethods}}
+import org.springframework.beans.factory.annotation.Value;
+{{/hasApiKeyMethods}}
+{{/isBasicBasic}}
+{{/authMethods}}
+{{#hasAuthMethods}}
+import org.springframework.context.annotation.Bean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+{{#hasApiKeyMethods}}
+import org.springframework.beans.factory.annotation.Value;
+{{/hasApiKeyMethods}}
+{{#hasOAuthMethods}}
+import org.springframework.security.authentication.AnonymousAuthenticationToken;
+import org.springframework.security.oauth2.client.AuthorizedClientServiceOAuth2AuthorizedClientManager;
+import org.springframework.security.oauth2.client.OAuth2AuthorizeRequest;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
+import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
+import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
+import org.springframework.security.oauth2.core.OAuth2AccessToken;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.http.HttpHeaders;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+
+{{/hasOAuthMethods}}
+{{/hasAuthMethods}}
+import org.springframework.context.annotation.Configuration;
+
+
+@Configuration
+public class ClientConfiguration {
+
+{{#authMethods}}
+    {{#isBasicBasic}}
+  @Value("${{openbrace}}{{#lambda.lowercase}}{{{title}}}{{/lambda.lowercase}}.security.{{{name}}}.username:{{closebrace}}")
+  private String {{{name}}}Username;
+
+  @Value("${{openbrace}}{{#lambda.lowercase}}{{{title}}}{{/lambda.lowercase}}.security.{{{name}}}.password:{{closebrace}}")
+  private String {{{name}}}Password;
+
+  @Bean
+  @ConditionalOnProperty(name = "{{#lambda.lowercase}}{{{title}}}{{/lambda.lowercase}}.security.{{{name}}}.username")
+  public BasicAuthRequestInterceptor {{{name}}}RequestInterceptor() {
+    return new BasicAuthRequestInterceptor(this.{{{name}}}Username, this.{{{name}}}Password);
+  }
+
+    {{/isBasicBasic}}
+    {{#isApiKey}}
+  @Value("${{openbrace}}{{#lambda.lowercase}}{{{title}}}{{/lambda.lowercase}}.security.{{{name}}}.key:{{closebrace}}")
+  private String {{{name}}}Key;
+
+  @Bean
+  @ConditionalOnProperty(name = "{{#lambda.lowercase}}{{{title}}}{{/lambda.lowercase}}.security.{{{name}}}.key")
+  public ApiKeyRequestInterceptor {{{name}}}RequestInterceptor() {
+    return new ApiKeyRequestInterceptor({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{{keyParamName}}}", this.{{{name}}}Key);
+  }
+
+    {{/isApiKey}}
+    {{#isOAuth}}
+  private static final String CLIENT_PRINCIPAL_{{#lambda.uppercase}}{{{flow}}}{{/lambda.uppercase}} = "oauth2FeignClient";
+
+  @Bean
+  @ConditionalOnProperty( prefix = "spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", name = "enabled", havingValue = "true" )
+  public OAuth2RequestInterceptor {{{flow}}}OAuth2RequestInterceptor(final OAuth2AuthorizedClientManager {{{flow}}}AuthorizedClientManager ) {
+     return new OAuth2RequestInterceptor(OAuth2AuthorizeRequest.withClientRegistrationId("{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}")
+            .principal( new AnonymousAuthenticationToken( CLIENT_PRINCIPAL_{{#lambda.uppercase}}{{{flow}}}{{/lambda.uppercase}}, CLIENT_PRINCIPAL_{{#lambda.uppercase}}{{{flow}}}{{/lambda.uppercase}}, AuthorityUtils.createAuthorityList( "ROLE_ANONYMOUS" ) ) )
+            .build(), {{{flow}}}AuthorizedClientManager );
+  }
+
+  @Bean
+  @ConditionalOnProperty( prefix = "spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", name = "enabled", havingValue = "true" )
+  public OAuth2AuthorizedClientManager {{{flow}}}AuthorizedClientManager(ClientRegistrationRepository clientRegistrationRepository,
+        OAuth2AuthorizedClientService authorizedClientService ) {
+    return new AuthorizedClientServiceOAuth2AuthorizedClientManager( clientRegistrationRepository, authorizedClientService );
+  }
+    {{/isOAuth}}
+{{/authMethods}}
+{{#hasOAuthMethods}}
+  public static class OAuth2RequestInterceptor implements RequestInterceptor {
+
+    private final OAuth2AuthorizedClientManager oAuth2AuthorizedClientManager;
+    private final OAuth2AuthorizeRequest oAuth2AuthorizeRequest;
+
+    public OAuth2RequestInterceptor(OAuth2AuthorizeRequest oAuth2AuthorizeRequest,OAuth2AuthorizedClientManager oAuth2AuthorizedClientManager){
+      this.oAuth2AuthorizeRequest = oAuth2AuthorizeRequest;
+      this.oAuth2AuthorizedClientManager = oAuth2AuthorizedClientManager;
+    }
+
+    @Override
+    public void apply( final RequestTemplate template ) {
+      template.header( HttpHeaders.AUTHORIZATION, getBearerToken() );
+    }
+
+    public OAuth2AccessToken getAccessToken() {
+      final OAuth2AuthorizedClient authorizedClient = oAuth2AuthorizedClientManager.authorize(oAuth2AuthorizeRequest);
+      if (authorizedClient == null) {
+        throw new OAuth2AuthenticationException( "Client failed to authenticate");
+      }
+     return authorizedClient.getAccessToken();
+    }
+
+    public String getBearerToken() {
+      final OAuth2AccessToken accessToken = getAccessToken();
+      return String.format( "%s %s", accessToken.getTokenType().getValue(), accessToken.getTokenValue() );
+    }
+  }
+{{/hasOAuthMethods}}
+
+}

package/targets/feign/templates/libraries/spring-cloud/pom-sb3.mustache

@@ -16,7 +16,7 @@
         {{/springDocDocumentationProvider}}
         {{^springDocDocumentationProvider}}
         {{#swagger2AnnotationLibrary}}
-        <swagger-annotations.version>}2.2.7</swagger-annotations.version>
+        <swagger-annotations.version>2.2.7</swagger-annotations.version>
         {{/swagger2AnnotationLibrary}}
         {{/springDocDocumentationProvider}}
     </properties>
@@ -47,18 +47,18 @@
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
         <plugins>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <executions>
-                <execution>
-                    <id>attach-sources</id>
-                    <goals>
-                        <goal>jar</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -107,10 +107,10 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-oauth2-client</artifactId>
             {{^parentOverridden}}
-            <version>2.2.5.RELEASE</version>
+            <version>6.1.1</version>
             {{/parentOverridden}}
         </dependency>
         {{#withXml}}

package/targets/feign/templates/libraries/spring-cloud/pom.mustache

@@ -23,7 +23,7 @@
         <swagger-annotations.version>1.6.6</swagger-annotations.version>
         {{/swagger1AnnotationLibrary}}
         {{#swagger2AnnotationLibrary}}
-        <swagger-annotations.version>}2.2.7</swagger-annotations.version>
+        <swagger-annotations.version>2.2.7</swagger-annotations.version>
         {{/swagger2AnnotationLibrary}}
         {{/springDocDocumentationProvider}}
         {{/springFoxDocumentationProvider}}
@@ -46,18 +46,18 @@
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
         <plugins>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-source-plugin</artifactId>
-              <executions>
-                  <execution>
-                      <id>attach-sources</id>
-                      <goals>
-                          <goal>jar</goal>
-                      </goals>
-                  </execution>
-              </executions>
-          </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -123,10 +123,10 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-oauth2-client</artifactId>
             {{^parentOverridden}}
-            <version>2.2.5.RELEASE</version>
+            <version>5.7.8</version>
             {{/parentOverridden}}
         </dependency>
         {{#withXml}}

package/targets/feign-kotlin/generator-config.json

@@ -18,9 +18,9 @@
     "java.time.OffsetDateTime": "java.time.Instant",
     "java.util.Date": "java.time.LocalDate"
   },
-  "inlineSchemaNameDefaults": {
-    "arrayItemSuffix": "",
-    "mapItemSuffix": "",
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
     "SKIP_SCHEMA_REUSE": "true"
   }
 }

package/targets/feign-kotlin/templates/libraries/spring-cloud/pom-sb3.mustache

@@ -1,5 +1,6 @@
 {{! attach sources }}
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>{{groupId}}</groupId>
     <artifactId>{{artifactId}}</artifactId>

package/targets/flutter/generate.sh

@@ -0,0 +1,22 @@
+#/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 \
+  -ppubLibrary=$packageName \
+  -ppubName=$packageName \
+  -ppubRepository=$repository \
+  -ppubVersion=$version $generatorCustomArgs
+
+cd out/$targetId
+dart pub get
+dart run build_runner build
+cd ..

package/targets/flutter/generator-config.json

@@ -0,0 +1,8 @@
+{
+  "serializationLibrary": "json_serializable",
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
+    "SKIP_SCHEMA_REUSE": "true"
+  }
+}

package/targets/flutter/publish.sh

@@ -0,0 +1,26 @@
+#/bin/bash
+
+source $(dirname "$0")/../common.sh
+
+cd out
+git clone $repository generator-source
+rm -rf generator-source/$packageName
+cp -rf $targetId/* generator-source
+
+cd generator-source
+if [ $(git status --porcelain | wc -l) -eq "0" ]; then
+  echo "🟢 No changes"
+else
+  git add .
+  git commit -m "chore(release): $version"
+
+  if [ "$preRelease" == "false" ]; then git push; fi
+
+  tagVersion="v$version"
+  git tag -f $tagVersion
+  git push origin -f --tags
+fi
+
+cd ..
+rm -rf generator-source
+cd ../..

package/targets/ios/generate.sh

@@ -10,5 +10,6 @@ java -jar $binary generate \
   -i $openApiFile \
   -t $templateDir \
   -o out/$targetId \
+  -c $(dirname "$0")/generator-config.json \
   -pprojectName=$projectName \
   -presponseAs=$interfaceType $generatorCustomArgs

package/targets/ios/generator-config.json

@@ -0,0 +1,7 @@
+{
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
+    "SKIP_SCHEMA_REUSE": "true"
+  }
+}

package/targets/ios/publish.sh

@@ -14,7 +14,7 @@ else
   git add .
   git commit -m "chore(release): $version"
 
-  if [ "$preRelease" == "false" ]; then git push origin master; fi
+  if [ "$preRelease" == "false" ]; then git push; fi
 
   tagVersion="v$version"
   git tag -f $tagVersion

package/targets/nestjs/generate.sh

@@ -34,6 +34,7 @@ rm reorder-operations.js
 node unescape-patterns.js
 rm unescape-patterns.js
 
+# rewrite path parameters
 node rewrite-path-parameters.js
 rm rewrite-path-parameters.js
 

package/targets/nestjs/generator-config.json

@@ -36,5 +36,10 @@
   },
   "typeMappings": {
     "Blob": "Express.Multer.File"
+  },
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
+    "SKIP_SCHEMA_REUSE": "true"
   }
 }

package/targets/nestjs/templates/api.service.mustache

@@ -47,7 +47,7 @@ export abstract class {{classname}} {
   //// @{{httpMethod}}('{{path}}'){{#isMultipart}}
   @UseInterceptors(FileInterceptor({{#formParams}}{{#isFile}}'{{paramName}}'{{/isFile}}{{/formParams}})){{/isMultipart}}
   @HttpCode({{#responses.0}}{{code}}{{/responses.0}})
-  private _{{nickname}}(@Request() req{{#allParams}}{{^isBodyParam}}, {{#isQueryParam}}@Query({{/isQueryParam}}{{#isPathParam}}@Param({{/isPathParam}}{{#isHeaderParam}}@Headers({{/isHeaderParam}}{{#isFormParam}}{{^isFile}}@Body({{/isFile}}{{#isFile}}@UploadedFile({{/isFile}}{{/isFormParam}}'{{paramName}}'{{#required}}, RequiredPipe{{/required}}{{#isArray}}, new ApiParseArrayPipe({ optional: true{{#items}}{{#isNumeric}}, items: Number{{/isNumeric}}{{#isBoolean}}, items: Boolean{{/isBoolean}}{{/items}} }){{/isArray}}{{#isNumber}}, OptionalParseFloatPipe{{/isNumber}}{{#isFloat}}, OptionalParseFloatPipe{{/isFloat}}{{#isDouble}}, OptionalParseFloatPipe{{/isDouble}}{{#isInteger}}, OptionalParseIntPipe{{/isInteger}}{{#isLong}}, OptionalParseIntPipe{{/isLong}}{{#isBoolean}}, OptionalParseBoolPipe{{/isBoolean}}{{#allowableValues}}{{^enumVars.empty}}, new OptionalParseEnumPipe({{{dataType}}}){{/enumVars.empty}}{{/allowableValues}}) {{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{/isBodyParam}}{{/allParams}}{{#bodyParam}}, @Body(new ApiValidationPipe({ whitelist: true, forbidNonWhitelisted: true })) requestBody{{^required}}?{{/required}}: {{{dataType}}}{{/bodyParam}}): Promise<{{#returnType}}{{#isResponseFile}}StreamableFile{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
+  private _{{nickname}}(@Request() req{{#allParams}}{{^isBodyParam}}, {{#isQueryParam}}@Query({{/isQueryParam}}{{#isPathParam}}@Param({{/isPathParam}}{{#isHeaderParam}}@Headers({{/isHeaderParam}}{{#isFormParam}}{{^isFile}}@Body({{/isFile}}{{#isFile}}@UploadedFile({{/isFile}}{{/isFormParam}}'{{paramName}}'{{#required}}{{#isHeaderParam}}{{/isHeaderParam}}{{^isHeaderParam}}, RequiredPipe{{/isHeaderParam}}{{/required}}{{#isArray}}, new ApiParseArrayPipe({ optional: true{{#items}}{{#isNumeric}}, items: Number{{/isNumeric}}{{#isBoolean}}, items: Boolean{{/isBoolean}}{{/items}} }){{/isArray}}{{#isNumber}}, OptionalParseFloatPipe{{/isNumber}}{{#isFloat}}, OptionalParseFloatPipe{{/isFloat}}{{#isDouble}}, OptionalParseFloatPipe{{/isDouble}}{{#isInteger}}, OptionalParseIntPipe{{/isInteger}}{{#isLong}}, OptionalParseIntPipe{{/isLong}}{{#isBoolean}}, OptionalParseBoolPipe{{/isBoolean}}{{#allowableValues}}{{^enumVars.empty}}, new OptionalParseEnumPipe({{{dataType}}}){{/enumVars.empty}}{{/allowableValues}}) {{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{/isBodyParam}}{{/allParams}}{{#bodyParam}}, @Body(new ApiValidationPipe({ whitelist: true, forbidNonWhitelisted: true })) requestBody{{^required}}?{{/required}}: {{{dataType}}}{{/bodyParam}}): Promise<{{#returnType}}{{#isResponseFile}}StreamableFile{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
     return this.{{nickname}}({{#allParams.0}}{ params: { {{#allParams}}{{^isBodyParam}}{{^-first}}, {{/-first}}{{paramName}}{{/isBodyParam}}{{/allParams}} }{{#bodyParam}}, body: requestBody{{/bodyParam}} }, {{/allParams.0}}req);
   }
 

package/targets/nestjs/templates/reorder-operations.js

@@ -3,7 +3,7 @@ const fs = require('fs');
 const apiFolder = './api';
 const apiFileSuffix = '.api.ts';
 const separator = '// ||||||||||\n';
-const pathParamKey = 'encodeURIComponent';
+const pathParamKey = 'this.configuration.encodeParam';
 
 const apiFiles = fs.readdirSync(apiFolder).filter(fileName => fileName.endsWith(apiFileSuffix));
 apiFiles.forEach(apiFile => reorderOperations(apiFile));

package/targets/nestjs/templates/rewrite-path-parameters.js

@@ -11,8 +11,8 @@ function rewritePathParameters(fileName) {
     const file = `${apiFolder}/${fileName}`;
     const contents = fs.readFileSync(file, 'utf-8');
 
-    var result = contents.replace(/\${encodeURIComponent\(String\(/g, ':');
-    result = result.replace(/\)\)\}/g, '');
+    var result = contents.replace(/\${this\.configuration\.encodeParam\({name:\s"/g, ':');
+    result = result.replace(/".*}\)}/g, '');
 
     var options = { flag : 'w', encoding: 'utf8' };
     fs.writeFileSync(file, result, options);

package/targets/react/generator-config.json

@@ -0,0 +1,12 @@
+{
+  "typescriptThreePlus": "true",
+  "supportsES6": "true",
+  "modelPropertyNaming": "original",
+  "withInterfaces": "true",
+  "fileNaming": "camelCase",
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
+    "SKIP_SCHEMA_REUSE": "true"
+  }
+}

package/targets/spring/generator-config.json

@@ -13,14 +13,14 @@
   "annotationLibrary": "none",
   "useSpringBoot3": true,
   "typeMappings": {
-    "OffsetDateTime": "Instant"
+    "OffsetDateTime": "java.time.Instant"
   },
   "importMappings": {
     "java.time.OffsetDateTime": "java.time.Instant"
   },
-  "inlineSchemaNameDefaults": {
-    "arrayItemSuffix": "",
-    "mapItemSuffix": "",
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
     "SKIP_SCHEMA_REUSE": "true"
   }
 }