Merge branch 'OpenAPITools:master' into fix/protobuf-discriminator-issues

Author: Ocsidot

.github/workflows/samples-typescript-client.yaml

@@ -4,6 +4,7 @@ on:
   push:
     paths:
       - samples/client/others/typescript-angular/**
+      - samples/client/others/typescript-angular-v20/**
       # comment out angular released before Nov 2023
       #- samples/client/petstore/typescript-angular-v12-provided-in-root/**
       #- samples/client/petstore/typescript-angular-v13-provided-in-root/**
@@ -43,6 +44,7 @@ on:
   pull_request:
     paths:
       - samples/client/others/typescript-angular/**
+      - samples/client/others/typescript-angular-v20/**
       #- samples/client/petstore/typescript-angular-v12-provided-in-root/**
       #- samples/client/petstore/typescript-angular-v13-provided-in-root/**
       #- samples/client/petstore/typescript-angular-v14-provided-in-root/**
@@ -92,6 +94,7 @@ jobs:
           - "20.x"
         sample:
           - samples/client/others/typescript-angular/
+          - samples/client/others/typescript-angular-v20/
           #- samples/client/petstore/typescript-angular-v12-provided-in-root/
           #- samples/client/petstore/typescript-angular-v13-provided-in-root/
           #- samples/client/petstore/typescript-angular-v14-provided-in-root/

.github/workflows/samples-typescript-encode-decode.yaml

@@ -16,9 +16,9 @@ jobs:
           # clients
           - samples/client/others/typescript/encode-decode/test
         node-version:
-          - 16
-          - 18
           - 20
+          - 22
+          - 24
     steps:
       - uses: actions/checkout@v5
 

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

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

bin/configs/typescript-angular-v20-query-param-deep-object.yaml

@@ -0,0 +1,8 @@
+generatorName: typescript-angular
+outputDir: samples/client/others/typescript-angular-v20/builds/query-param-form
+inputSpec: modules/openapi-generator/src/test/resources/3_0/query-param-form.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+additionalProperties:
+  ngVersion: 20.0.0
+  npmName: sample-angular-20-0-0-query-param-form
+  supportsES6: true

bin/configs/typescript-angular-v20-query-param-form.yaml

@@ -0,0 +1,8 @@
+generatorName: typescript-angular
+outputDir: samples/client/others/typescript-angular-v20/builds/query-param-json
+inputSpec: modules/openapi-generator/src/test/resources/3_0/query-param-json.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+additionalProperties:
+  ngVersion: 20.0.0
+  npmName: sample-angular-20-0-0-query-param-json
+  supportsES6: true

bin/configs/typescript-angular-v20-query-param-json.yaml

@@ -204,6 +204,7 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("param.mustache", getIndexDirectory(), "param.ts"));
         supportingFiles.add(new SupportingFile("gitignore", "", ".gitignore"));
         supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        supportingFiles.add(new SupportingFile("queryParams.mustache", getIndexDirectory(), "query.params.ts"));
 
         if(ngVersionAtLeast_17) {
             supportingFiles.add(new SupportingFile("README.mustache", getIndexDirectory(), "README.md"));

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

@@ -33,7 +33,9 @@ include = ["{{packageName}}/py.typed"]
 
 [tool.poetry.dependencies]
 python = "^3.9"
+{{^async}}
 urllib3 = ">= 2.1.0, < 3.0.0"
+{{/async}}
 python-dateutil = ">= 2.8.2"
 {{#asyncio}}
 aiohttp = ">= 3.8.4"
@@ -59,7 +61,9 @@ lazy-imports = ">= 1, < 2"
 requires-python = ">=3.9"
 
 dependencies = [
+{{^async}}
   "urllib3 (>=2.1.0,<3.0.0)",
+{{/async}}
   "python-dateutil (>=2.8.2)",
 {{#httpx}}
   "httpx (>=0.28.1)",

modules/openapi-generator/src/main/resources/python/pyproject.mustache

@@ -1,4 +1,6 @@
+{{^async}}
 urllib3 >= 2.1.0, < 3.0.0
+{{/async}}
 python_dateutil >= 2.8.2
 {{#asyncio}}
 aiohttp >= 3.8.4

modules/openapi-generator/src/main/resources/python/requirements.mustache

@@ -15,7 +15,9 @@ NAME = "{{{projectName}}}"
 VERSION = "{{packageVersion}}"
 PYTHON_REQUIRES = ">= 3.9"
 REQUIRES = [
+{{^async}}
     "urllib3 >= 2.1.0, < 3.0.0",
+{{/async}}
     "python-dateutil >= 2.8.2",
 {{#asyncio}}
     "aiohttp >= 3.8.4",