From cadc3a42bec4743d4d17801c0407a0e04db47a0d Mon Sep 17 00:00:00 2001 From: Alexey Makhrov <amakhrov@gmail.com> Date: Thu, 13 Feb 2020 13:11:04 -0800 Subject: [PATCH 1/3] Remove DateTime mapping from concrete TypeScript generators that do not have full support for Date deserialization --- .../codegen/languages/TypeScriptAngularClientCodegen.java | 2 -- .../codegen/languages/TypeScriptAngularJsClientCodegen.java | 2 -- .../codegen/languages/TypeScriptAureliaClientCodegen.java | 2 -- .../codegen/languages/TypeScriptAxiosClientCodegen.java | 2 -- .../codegen/languages/TypeScriptInversifyClientCodegen.java | 2 -- .../codegen/languages/TypeScriptJqueryClientCodegen.java | 2 -- .../codegen/languages/TypeScriptRxjsClientCodegen.java | 1 - 7 files changed, 13 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index e0862844b48..bbf91dbd9b4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -86,8 +86,6 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode apiPackage = "api"; modelPackage = "model"; - typeMapping.put("DateTime", "Date"); - this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json")); this.cliOptions.add(CliOption.newBoolean(WITH_INTERFACES, diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularJsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularJsClientCodegen.java index b87271157b2..3b514117189 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularJsClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularJsClientCodegen.java @@ -34,8 +34,6 @@ public class TypeScriptAngularJsClientCodegen extends AbstractTypeScriptClientCo apiPackage = "api"; modelPackage = "model"; - typeMapping.put("DateTime", "Date"); - removeOption(NPM_NAME); removeOption(NPM_VERSION); removeOption(SNAPSHOT); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java index 0f5c23937b6..01aac376295 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java @@ -36,8 +36,6 @@ public class TypeScriptAureliaClientCodegen extends AbstractTypeScriptClientCode outputFolder = "generated-code/typescript-aurelia"; embeddedTemplateDir = templateDir = "typescript-aurelia"; - - typeMapping.put("DateTime", "Date"); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java index f652bae2c57..4d9f1438350 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java @@ -55,8 +55,6 @@ public class TypeScriptAxiosClientCodegen extends AbstractTypeScriptClientCodege outputFolder = "generated-code/typescript-axios"; embeddedTemplateDir = templateDir = "typescript-axios"; - typeMapping.put("DateTime", "Date"); - this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url of your private npmRepo in the package.json")); this.cliOptions.add(new CliOption(WITH_INTERFACES, "Setting this property to true will generate interfaces next to the default class implementations.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); this.cliOptions.add(new CliOption(SEPARATE_MODELS_AND_API, "Put the model and api in separate folders and in separate classes", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java index 07113268d90..75b91392fa1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java @@ -58,8 +58,6 @@ public class TypeScriptInversifyClientCodegen extends AbstractTypeScriptClientCo apiPackage = "api"; modelPackage = "model"; - typeMapping.put("DateTime", "Date"); - this.reservedWords.add("map"); this.cliOptions.add(new CliOption(NPM_REPOSITORY, diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java index 4b62e5b5750..275af5c82e2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java @@ -53,8 +53,6 @@ public class TypeScriptJqueryClientCodegen extends AbstractTypeScriptClientCodeg outputFolder = "generated-code/typescript-jquery"; embeddedTemplateDir = templateDir = "typescript-jquery"; - typeMapping.put("DateTime", "Date"); - this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json")); this.cliOptions.add(new CliOption(JQUERY_ALREADY_IMPORTED, "When using this in legacy app using mix of typescript and javascript, this will only declare jquery and not import it", diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java index 8c5a6392d68..13a17b5f518 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java @@ -58,7 +58,6 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen languageSpecificPrimitives.add("Blob"); typeMapping.put("file", "Blob"); - typeMapping.put("DateTime", "Date"); this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json")); this.cliOptions.add(new CliOption(WITH_INTERFACES, "Setting this property to true will generate interfaces next to the default class implementations.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); -- GitLab From b4429d88d812b451e785c58d370c80cf44a531f1 Mon Sep 17 00:00:00 2001 From: Alexey Makhrov <amakhrov@gmail.com> Date: Thu, 13 Feb 2020 13:19:50 -0800 Subject: [PATCH 2/3] Fix model unit tests --- .../typescriptangular/TypeScriptAngularModelTest.java | 4 ++-- .../typescriptangularjs/TypeScriptAngularJsModelTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularModelTest.java index 35a01220ce6..2116d62bfc5 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularModelTest.java @@ -76,9 +76,9 @@ public class TypeScriptAngularModelTest { final CodegenProperty property3 = cm.vars.get(2); Assert.assertEquals(property3.baseName, "createdAt"); Assert.assertEquals(property3.complexType, null); - Assert.assertEquals(property3.dataType, "Date"); + Assert.assertEquals(property3.dataType, "string"); Assert.assertEquals(property3.name, "createdAt"); - Assert.assertEquals(property3.baseType, "Date"); + Assert.assertEquals(property3.baseType, "string"); Assert.assertEquals(property3.defaultValue, "undefined"); Assert.assertTrue(property3.hasMore); Assert.assertFalse(property3.required); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangularjs/TypeScriptAngularJsModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangularjs/TypeScriptAngularJsModelTest.java index e5627c54051..30cb23de1d2 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangularjs/TypeScriptAngularJsModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangularjs/TypeScriptAngularJsModelTest.java @@ -75,7 +75,7 @@ public class TypeScriptAngularJsModelTest { final CodegenProperty property3 = cm.vars.get(2); Assert.assertEquals(property3.baseName, "createdAt"); Assert.assertEquals(property3.complexType, null); - Assert.assertEquals(property3.dataType, "Date"); + Assert.assertEquals(property3.dataType, "string"); Assert.assertEquals(property3.name, "createdAt"); Assert.assertEquals(property3.defaultValue, "undefined"); Assert.assertTrue(property3.hasMore); -- GitLab From 65ce1e2415ebdc7c5b07ff9929df63066587c0f9 Mon Sep 17 00:00:00 2001 From: Alexey Makhrov <amakhrov@gmail.com> Date: Fri, 14 Feb 2020 12:53:10 -0800 Subject: [PATCH 3/3] Regenerate samples --- .../petstore/typescript-angular-v2/default/model/order.ts | 2 +- .../client/petstore/typescript-angular-v2/npm/model/order.ts | 2 +- .../typescript-angular-v2/with-interfaces/model/order.ts | 2 +- .../petstore/typescript-angular-v4.3/npm/model/order.ts | 2 +- .../client/petstore/typescript-angular-v4/npm/model/order.ts | 2 +- .../builds/default/model/order.ts | 2 +- .../builds/with-npm/model/order.ts | 2 +- .../builds/default/model/order.ts | 2 +- .../builds/with-npm/model/order.ts | 2 +- .../builds/default/model/order.ts | 2 +- .../builds/with-npm/model/order.ts | 2 +- .../builds/default/model/order.ts | 2 +- .../builds/with-npm/model/order.ts | 2 +- .../builds/single-request-parameter/model/order.ts | 2 +- .../builds/with-npm/model/order.ts | 2 +- .../builds/with-prefixed-module-name/model/order.ts | 2 +- samples/client/petstore/typescript-angularjs/model/Order.ts | 2 +- samples/client/petstore/typescript-aurelia/default/models.ts | 2 +- .../client/petstore/typescript-axios/builds/default/api.ts | 4 ++-- .../client/petstore/typescript-axios/builds/es6-target/api.ts | 4 ++-- .../typescript-axios/builds/with-complex-headers/api.ts | 4 ++-- .../petstore/typescript-axios/builds/with-interfaces/api.ts | 4 ++-- .../model/some/levels/deep/order.ts | 4 ++-- .../petstore/typescript-axios/builds/with-npm-version/api.ts | 4 ++-- samples/client/petstore/typescript-inversify/model/order.ts | 2 +- .../client/petstore/typescript-jquery/default/model/Order.ts | 2 +- samples/client/petstore/typescript-jquery/npm/model/Order.ts | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../petstore/typescript-rxjs/builds/default/models/Order.ts | 4 ++-- .../typescript-rxjs/builds/es6-target/models/Order.ts | 4 ++-- .../typescript-rxjs/builds/with-interfaces/models/Order.ts | 4 ++-- .../typescript-rxjs/builds/with-npm-version/models/Order.ts | 4 ++-- 32 files changed, 42 insertions(+), 42 deletions(-) diff --git a/samples/client/petstore/typescript-angular-v2/default/model/order.ts b/samples/client/petstore/typescript-angular-v2/default/model/order.ts index c8d8a5e55c0..a29bebe4906 100644 --- a/samples/client/petstore/typescript-angular-v2/default/model/order.ts +++ b/samples/client/petstore/typescript-angular-v2/default/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-angular-v2/npm/model/order.ts b/samples/client/petstore/typescript-angular-v2/npm/model/order.ts index c8d8a5e55c0..a29bebe4906 100644 --- a/samples/client/petstore/typescript-angular-v2/npm/model/order.ts +++ b/samples/client/petstore/typescript-angular-v2/npm/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/order.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/order.ts index c8d8a5e55c0..a29bebe4906 100644 --- a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/order.ts +++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/model/order.ts b/samples/client/petstore/typescript-angular-v4.3/npm/model/order.ts index c8d8a5e55c0..a29bebe4906 100644 --- a/samples/client/petstore/typescript-angular-v4.3/npm/model/order.ts +++ b/samples/client/petstore/typescript-angular-v4.3/npm/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-angular-v4/npm/model/order.ts b/samples/client/petstore/typescript-angular-v4/npm/model/order.ts index c8d8a5e55c0..a29bebe4906 100644 --- a/samples/client/petstore/typescript-angular-v4/npm/model/order.ts +++ b/samples/client/petstore/typescript-angular-v4/npm/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/model/order.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/model/order.ts index c8d8a5e55c0..a29bebe4906 100644 --- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/model/order.ts +++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/model/order.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/model/order.ts index c8d8a5e55c0..a29bebe4906 100644 --- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/model/order.ts +++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/model/order.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/model/order.ts index c8d8a5e55c0..a29bebe4906 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/model/order.ts +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/model/order.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/model/order.ts index c8d8a5e55c0..a29bebe4906 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/model/order.ts +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/model/order.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/model/order.ts index c8d8a5e55c0..a29bebe4906 100644 --- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/model/order.ts +++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/model/order.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/model/order.ts index 1d7860172c6..f2c21d7d24c 100644 --- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/model/order.ts +++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/model/order.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/model/order.ts index c8d8a5e55c0..a29bebe4906 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/model/order.ts +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/model/order.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/model/order.ts index c8d8a5e55c0..a29bebe4906 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/model/order.ts +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/model/order.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/model/order.ts index c8d8a5e55c0..a29bebe4906 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/model/order.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/model/order.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/model/order.ts index c8d8a5e55c0..a29bebe4906 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/model/order.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/model/order.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/model/order.ts index c8d8a5e55c0..a29bebe4906 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/model/order.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-angularjs/model/Order.ts b/samples/client/petstore/typescript-angularjs/model/Order.ts index 82074ad1b89..5e59bc02ea6 100644 --- a/samples/client/petstore/typescript-angularjs/model/Order.ts +++ b/samples/client/petstore/typescript-angularjs/model/Order.ts @@ -19,7 +19,7 @@ export interface Order { "id"?: number; "petId"?: number; "quantity"?: number; - "shipDate"?: Date; + "shipDate"?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-aurelia/default/models.ts b/samples/client/petstore/typescript-aurelia/default/models.ts index 80d73eab8fd..92e8ed2dc0d 100644 --- a/samples/client/petstore/typescript-aurelia/default/models.ts +++ b/samples/client/petstore/typescript-aurelia/default/models.ts @@ -37,7 +37,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-axios/builds/default/api.ts b/samples/client/petstore/typescript-axios/builds/default/api.ts index 8785e2e2ccf..3592be77d5f 100644 --- a/samples/client/petstore/typescript-axios/builds/default/api.ts +++ b/samples/client/petstore/typescript-axios/builds/default/api.ts @@ -89,10 +89,10 @@ export interface Order { quantity?: number; /** * - * @type {Date} + * @type {string} * @memberof Order */ - shipDate?: Date; + shipDate?: string; /** * Order Status * @type {string} diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/api.ts b/samples/client/petstore/typescript-axios/builds/es6-target/api.ts index 8785e2e2ccf..3592be77d5f 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/api.ts +++ b/samples/client/petstore/typescript-axios/builds/es6-target/api.ts @@ -89,10 +89,10 @@ export interface Order { quantity?: number; /** * - * @type {Date} + * @type {string} * @memberof Order */ - shipDate?: Date; + shipDate?: string; /** * Order Status * @type {string} diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts index b31f48eef27..66c69d86946 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts @@ -127,10 +127,10 @@ export interface Order { quantity?: number; /** * - * @type {Date} + * @type {string} * @memberof Order */ - shipDate?: Date; + shipDate?: string; /** * Order Status * @type {string} diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts index 37f4fd36fb9..efbe9589e12 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts @@ -89,10 +89,10 @@ export interface Order { quantity?: number; /** * - * @type {Date} + * @type {string} * @memberof Order */ - shipDate?: Date; + shipDate?: string; /** * Order Status * @type {string} diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/order.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/order.ts index 1458595e20a..cc229cb85e6 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/order.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/order.ts @@ -39,10 +39,10 @@ export interface Order { quantity?: number; /** * - * @type {Date} + * @type {string} * @memberof Order */ - shipDate?: Date; + shipDate?: string; /** * Order Status * @type {string} diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts index 8785e2e2ccf..3592be77d5f 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts @@ -89,10 +89,10 @@ export interface Order { quantity?: number; /** * - * @type {Date} + * @type {string} * @memberof Order */ - shipDate?: Date; + shipDate?: string; /** * Order Status * @type {string} diff --git a/samples/client/petstore/typescript-inversify/model/order.ts b/samples/client/petstore/typescript-inversify/model/order.ts index 895639cfb5d..4bd3d5e3c67 100644 --- a/samples/client/petstore/typescript-inversify/model/order.ts +++ b/samples/client/petstore/typescript-inversify/model/order.ts @@ -18,7 +18,7 @@ export interface Order { id?: number; petId?: number; quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status */ diff --git a/samples/client/petstore/typescript-jquery/default/model/Order.ts b/samples/client/petstore/typescript-jquery/default/model/Order.ts index 806c36c4dc8..af5570597c8 100644 --- a/samples/client/petstore/typescript-jquery/default/model/Order.ts +++ b/samples/client/petstore/typescript-jquery/default/model/Order.ts @@ -22,7 +22,7 @@ export interface Order { quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status diff --git a/samples/client/petstore/typescript-jquery/npm/model/Order.ts b/samples/client/petstore/typescript-jquery/npm/model/Order.ts index 806c36c4dc8..af5570597c8 100644 --- a/samples/client/petstore/typescript-jquery/npm/model/Order.ts +++ b/samples/client/petstore/typescript-jquery/npm/model/Order.ts @@ -22,7 +22,7 @@ export interface Order { quantity?: number; - shipDate?: Date; + shipDate?: string; /** * Order Status diff --git a/samples/client/petstore/typescript-redux-query/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-redux-query/builds/default/.openapi-generator/VERSION index 58592f031f6..bfbf77eb7fa 100644 --- a/samples/client/petstore/typescript-redux-query/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-redux-query/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -4.2.3-SNAPSHOT \ No newline at end of file +4.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-rxjs/builds/default/models/Order.ts b/samples/client/petstore/typescript-rxjs/builds/default/models/Order.ts index b2fb531cc11..c6b7790d702 100644 --- a/samples/client/petstore/typescript-rxjs/builds/default/models/Order.ts +++ b/samples/client/petstore/typescript-rxjs/builds/default/models/Order.ts @@ -33,10 +33,10 @@ export interface Order { */ quantity?: number; /** - * @type {Date} + * @type {string} * @memberof Order */ - shipDate?: Date; + shipDate?: string; /** * Order Status * @type {string} diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Order.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Order.ts index b2fb531cc11..c6b7790d702 100644 --- a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Order.ts +++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Order.ts @@ -33,10 +33,10 @@ export interface Order { */ quantity?: number; /** - * @type {Date} + * @type {string} * @memberof Order */ - shipDate?: Date; + shipDate?: string; /** * Order Status * @type {string} diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Order.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Order.ts index b2fb531cc11..c6b7790d702 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Order.ts +++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Order.ts @@ -33,10 +33,10 @@ export interface Order { */ quantity?: number; /** - * @type {Date} + * @type {string} * @memberof Order */ - shipDate?: Date; + shipDate?: string; /** * Order Status * @type {string} diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Order.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Order.ts index b2fb531cc11..c6b7790d702 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Order.ts +++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Order.ts @@ -33,10 +33,10 @@ export interface Order { */ quantity?: number; /** - * @type {Date} + * @type {string} * @memberof Order */ - shipDate?: Date; + shipDate?: string; /** * Order Status * @type {string} -- GitLab