Merge https://github.com/openapitools/openapi-generator into fix-cpp-qt-enum-asjsonobject

Author: wing328

CI/circle_parallel.sh

@@ -74,8 +74,8 @@ elif [ "$NODE_INDEX" = "3" ]; then
   [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
   #nvm install stable
   # install v16 instead of the latest stable version
-  nvm install 16
-  nvm alias default 16
+  nvm install 18
+  nvm alias default 18
   node --version
 
   # Each step uses the same `$BASH_ENV`, so need to modify it

bin/configs/typescript-angular-v19-deep-object.yaml

@@ -0,0 +1,8 @@
+generatorName: typescript-angular
+outputDir: samples/client/petstore/typescript-angular-v19/builds/deep-object
+inputSpec: modules/openapi-generator/src/test/resources/3_0/deep-object-query.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+additionalProperties:
+  ngVersion: 19.0.0
+  npmName: sample-angular-19-0-0-deep-object
+  supportsES6: true

docs/templating.md

@@ -820,15 +820,21 @@ Many generators (*those extending DefaultCodegen*) come with a small set of lamb
 
 - `lowercase` - Converts all of the characters in this fragment to lower case using the rules of the `ROOT` locale.
 - `uppercase` - Converts all of the characters in this fragment to upper case using the rules of the `ROOT` locale.
+- `snakecase` - Converts text in a fragment to snake case. For example `once upon a time` to `once_upon_a_time`.
 - `titlecase` - Converts text in a fragment to title case. For example `once upon a time` to `Once Upon A Time`.
+- `kebabcase` - Converts text in a fragment to snake case. For example `Once Upon A Time` to `once-upon-a-time`.
+- `pascalcase` - Converts text in a fragment to snake case. For example `once upon a time` to `OnceUponATime`.
 - `camelcase` - Converts text in a fragment to camelCase. For example `Input-text` to `inputText`.
 - `uncamelize` - Converts text in a fragment from camelCase or PascalCase to a string of words separated by whitespaces. For example `inputText` to `Input Text`.
+- `forwardslash` - Replaces all occurrences of `\/`, `\` and `//` in a fragment by `/`.
+- `backslash` - Replaces all occurrences `/` in a fragment by `\`.
+- `doublequote` - Prepends `"` to the beginning and appends `"` to the end of a fragment.
 - `indented` - Prepends 4 spaces indention from second line of a fragment on. First line will be indented by Mustache.
 - `indented_8` - Prepends 8 spaces indention from second line of a fragment on. First line will be indented by Mustache.
 - `indented_12` - Prepends 12 spaces indention from second line of a fragment on. First line will be indented by Mustache.
 - `indented_16` -Prepends 16 spaces indention from second line of a fragment on. First line will be indented by Mustache.
 
-Lambda is invoked by `lambda.[lambda name]` expression. For example: `{{#lambda.lowercase}}FRAGMENT TO LOWERCASE{{/lambda.lowercase}}` to lower case text between `lambda.lowercase`.
+Some generators provide additional lambdas. Lambda is invoked by `lambda.[lambda name]` expression. For example: `{{#lambda.lowercase}}FRAGMENT TO LOWERCASE{{/lambda.lowercase}}` to lower case text between `lambda.lowercase`.
 
 ## Extensions
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -404,6 +404,8 @@ public void processOpts() {
      * If common lambdas are not desired, override addMustacheLambdas() method
      * and return empty builder.
      *
+     * Corresponding user documentation: docs/templating.md, section "Mustache Lambdas"
+     *
      * @return preinitialized map with common lambdas
      */
     protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {

modules/openapi-generator/src/main/resources/Java/RFC3339InstantDeserializer.mustache

@@ -19,7 +19,7 @@ import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer;
 
 {{>generatedAnnotation}}
 public class RFC3339InstantDeserializer<T extends Temporal> extends InstantDeserializer<T> {
-
+    private static final long serialVersionUID = 1L;
     private final static boolean DEFAULT_NORMALIZE_ZONE_ID = JavaTimeFeature.NORMALIZE_DESERIALIZED_ZONE_ID.enabledByDefault();
     private final static boolean DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS
     = JavaTimeFeature.ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS.enabledByDefault();

modules/openapi-generator/src/main/resources/Java/RFC3339JavaTimeModule.mustache

@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.module.SimpleModule;
 
 {{>generatedAnnotation}}
 public class RFC3339JavaTimeModule extends SimpleModule {
+    private static final long serialVersionUID = 1L;
 
     public RFC3339JavaTimeModule() {
         super("RFC3339JavaTimeModule");

modules/openapi-generator/src/main/resources/JavaJaxRS/enumClass.mustache

@@ -36,8 +36,12 @@
       this.value = value;
     }
 
-    @Override
     @JsonValue
+    public {{{dataType}}} getValue() {
+      return value;
+    }
+
+    @Override
     public String toString() {
       return String.valueOf(value);
     }

modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache

@@ -493,7 +493,7 @@ namespace {{packageName}}.Client
             {
                 InterceptRequest(request);
 
-                RestResponse<T> response = await getResponse(client);
+                RestResponse<T> response = await getResponse(client).ConfigureAwait(false);
 
                 // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
                 if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
@@ -562,7 +562,7 @@ namespace {{packageName}}.Client
         {
             if (policyResult.Outcome == OutcomeType.Successful) 
             {
-                return await client.Deserialize<T>(policyResult.Result, cancellationToken);
+                return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
             }
             else
             {
@@ -621,7 +621,7 @@ namespace {{packageName}}.Client
                 {
                     var policy = RetryConfiguration.AsyncRetryPolicy;
                     var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
-                    return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
+                    return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
                 }
                 else
                 {

modules/openapi-generator/src/main/resources/typescript-angular/api.base.service.mustache

@@ -29,22 +29,27 @@ export class BaseService {
         return consumes.indexOf('multipart/form-data') !== -1;
     }
 
-    protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams {
+    protected addToHttpParams(httpParams: HttpParams, value: any, key?: string, isDeep: boolean = false): HttpParams {
         // If the value is an object (but not a Date), recursively add its keys.
         if (typeof value === 'object' && !(value instanceof Date)) {
-            return this.addToHttpParamsRecursive(httpParams, value);
+            return this.addToHttpParamsRecursive(httpParams, value, isDeep ? key : undefined, isDeep);
         }
         return this.addToHttpParamsRecursive(httpParams, value, key);
     }
 
-    protected addToHttpParamsRecursive(httpParams: HttpParams, value?: any, key?: string): HttpParams {
+    protected addToHttpParamsRecursive(httpParams: HttpParams, value?: any, key?: string, isDeep: boolean = false): HttpParams {
         if (value === null || value === undefined) {
             return httpParams;
         }
         if (typeof value === 'object') {
             // If JSON format is preferred, key must be provided.
             if (key != null) {
-                return httpParams.append(key, JSON.stringify(value));
+                return isDeep
+                    ? Object.keys(value as Record<string, any>).reduce(
+                        (hp, k) => hp.append(`${key}[${k}]`, value[k]),
+                        httpParams,
+                    )
+                    : httpParams.append(key, JSON.stringify(value));
             }
             // Otherwise, if it's an array, add each element.
             if (Array.isArray(value)) {

modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache

@@ -130,7 +130,7 @@ export class {{classname}} extends BaseService {
         {{/isArray}}
         {{^isArray}}
         localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
-          <any>{{paramName}}, '{{baseName}}');
+          <any>{{paramName}}, '{{baseName}}'{{#isDeepObject}}, true{{/isDeepObject}});
         {{/isArray}}
 {{/queryParams}}