[typescript] Remove incomplete support of Date type (#5314)

amakhrov · web-flow · commit acf85921e4e7 · 2020-02-17T07:52:50.000+01:00
* Remove DateTime mapping from concrete TypeScript generators that do not have full support for Date deserialization

* Fix model unit tests

* Regenerate samples
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
@@ -86,8 +86,6 @@ public TypeScriptAngularClientCodegen() {
         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
@@ -34,8 +34,6 @@ public TypeScriptAngularJsClientCodegen() {
         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
@@ -36,8 +36,6 @@ public TypeScriptAureliaClientCodegen() {
 
         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
@@ -55,8 +55,6 @@ public TypeScriptAxiosClientCodegen() {
         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
@@ -58,8 +58,6 @@ public TypeScriptInversifyClientCodegen() {
         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
@@ -53,8 +53,6 @@ public TypeScriptJqueryClientCodegen() {
         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
@@ -58,7 +58,6 @@ public TypeScriptRxjsClientCodegen() {
 
         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()));
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
@@ -76,9 +76,9 @@ public void simpleModelTest() {
         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
@@ -75,7 +75,7 @@ public void simpleModelTest() {
         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);
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-4.2.3-SNAPSHOT
+4.3.0-SNAPSHOT
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@ public TypeScriptAureliaClientCodegen() {`
`36`	`36`
`37`	`37`	`outputFolder = "generated-code/typescript-aurelia";`
`38`	`38`	`embeddedTemplateDir = templateDir = "typescript-aurelia";`
`39`		`-`
`40`		`- typeMapping.put("DateTime", "Date");`
`41`	`39`	`}`
`42`	`40`
`43`	`41`	`@Override`