loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

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

Browse Source 
* Remove DateTime mapping from concrete TypeScript generators that do not have full support for Date deserialization

* Fix model unit tests

* Regenerate samples
This commit is contained in:
Alexey Makhrov
2020-02-16 22:52:50 -08:00
committed by GitHub
parent 32b9b399fd
commit acf85921e4
41 changed files with 45 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularJsClientCodegen.java
View File

@@ -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);

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java
View File

@@ -36,8 +36,6 @@ public class TypeScriptAureliaClientCodegen extends AbstractTypeScriptClientCode
outputFolder = "generated-code/typescript-aurelia";
embeddedTemplateDir = templateDir = "typescript-aurelia";
typeMapping.put("DateTime", "Date");
}
@Override

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java
View File

@@ -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()));

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java
View File

@@ -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,

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java
View File

@@ -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",

1
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
View File

@@ -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()));

4
modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularModelTest.java
View File

@@ -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);

2
modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangularjs/TypeScriptAngularJsModelTest.java
View File

@@ -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);

2
samples/client/petstore/typescript-angular-v2/default/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-angular-v2/npm/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-angular-v2/with-interfaces/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-angular-v4.3/npm/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-angular-v4/npm/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-angularjs/model/Order.ts
View File

@@ -19,7 +19,7 @@ export interface Order {
"id"?: number;
"petId"?: number;
"quantity"?: number;
"shipDate"?: Date;
"shipDate"?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-aurelia/default/models.ts
View File

@@ -37,7 +37,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

4
samples/client/petstore/typescript-axios/builds/default/api.ts
View File

@@ -89,10 +89,10 @@ export interface Order {
quantity?: number;
/**
*
* @type {Date}
* @type {string}
* @memberof Order
*/
shipDate?: Date;
shipDate?: string;
/**
* Order Status
* @type {string}

4
samples/client/petstore/typescript-axios/builds/es6-target/api.ts
View File

@@ -89,10 +89,10 @@ export interface Order {
quantity?: number;
/**
*
* @type {Date}
* @type {string}
* @memberof Order
*/
shipDate?: Date;
shipDate?: string;
/**
* Order Status
* @type {string}

4
samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts
View File

@@ -127,10 +127,10 @@ export interface Order {
quantity?: number;
/**
*
* @type {Date}
* @type {string}
* @memberof Order
*/
shipDate?: Date;
shipDate?: string;
/**
* Order Status
* @type {string}

4
samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts
View File

@@ -89,10 +89,10 @@ export interface Order {
quantity?: number;
/**
*
* @type {Date}
* @type {string}
* @memberof Order
*/
shipDate?: Date;
shipDate?: string;
/**
* Order Status
* @type {string}

4
samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/order.ts
View File

@@ -39,10 +39,10 @@ export interface Order {
quantity?: number;
/**
*
* @type {Date}
* @type {string}
* @memberof Order
*/
shipDate?: Date;
shipDate?: string;
/**
* Order Status
* @type {string}

4
samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts
View File

@@ -89,10 +89,10 @@ export interface Order {
quantity?: number;
/**
*
* @type {Date}
* @type {string}
* @memberof Order
*/
shipDate?: Date;
shipDate?: string;
/**
* Order Status
* @type {string}

2
samples/client/petstore/typescript-inversify/model/order.ts
View File

@@ -18,7 +18,7 @@ export interface Order {
id?: number;
petId?: number;
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status
*/

2
samples/client/petstore/typescript-jquery/default/model/Order.ts
View File

@@ -22,7 +22,7 @@ export interface Order {
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status

2
samples/client/petstore/typescript-jquery/npm/model/Order.ts
View File

@@ -22,7 +22,7 @@ export interface Order {
quantity?: number;
shipDate?: Date;
shipDate?: string;
/**
* Order Status

2
samples/client/petstore/typescript-redux-query/builds/default/.openapi-generator/VERSION
View File

@@ -1 +1 @@
4.2.3-SNAPSHOT
4.3.0-SNAPSHOT

4
samples/client/petstore/typescript-rxjs/builds/default/models/Order.ts
View File

@@ -33,10 +33,10 @@ export interface Order {
*/
quantity?: number;
/**
* @type {Date}
* @type {string}
* @memberof Order
*/
shipDate?: Date;
shipDate?: string;
/**
* Order Status
* @type {string}

4
samples/client/petstore/typescript-rxjs/builds/es6-target/models/Order.ts
View File

@@ -33,10 +33,10 @@ export interface Order {
*/
quantity?: number;
/**
* @type {Date}
* @type {string}
* @memberof Order
*/
shipDate?: Date;
shipDate?: string;
/**
* Order Status
* @type {string}

4
samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Order.ts
View File

@@ -33,10 +33,10 @@ export interface Order {
*/
quantity?: number;
/**
* @type {Date}
* @type {string}
* @memberof Order
*/
shipDate?: Date;
shipDate?: string;
/**
* Order Status
* @type {string}

4
samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Order.ts
View File

@@ -33,10 +33,10 @@ export interface Order {
*/
quantity?: number;
/**
* @type {Date}
* @type {string}
* @memberof Order
*/
shipDate?: Date;
shipDate?: string;
/**
* Order Status
* @type {string}