Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Multiple enhancements to typescript fetch generator #145

Merged
merged 7 commits into from Jul 18, 2018
Merged

Multiple enhancements to typescript fetch generator #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
feb426a
Multiple enhancements to typescript fetch generator that is a copy fr…
JFCote May 24, 2018
fc96236
Merge branch 'master' into multiple-typescript-fetch-enhancements
wing328 Jun 12, 2018
a2a51c6
comment out test
wing328 Jun 12, 2018
9831401
revert previous change
wing328 Jun 12, 2018
86c3bc0
Merge branch 'master' into multiple-typescript-fetch-enhancements
JFCote Jul 17, 2018
842b334
Fix to make the CI work. Regenerated all fetch samples
JFCote Jul 18, 2018
32f63d6
Put back the pom.xml
JFCote Jul 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java
View file
Open in desktop
Expand Up @@ -54,7 +54,7 @@ public class CodegenProperty implements Cloneable {
public boolean exclusiveMinimum;
public boolean exclusiveMaximum;
public boolean hasMore, required, secondaryParam;
public boolean hasMoreNonReadOnly; // for model constructor, true if next properyt is not readonly
public boolean hasMoreNonReadOnly; // for model constructor, true if next property is not readonly
public boolean isPrimitiveType, isContainer, isNotContainer;
public boolean isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBinary, isFile, isBoolean, isDate, isDateTime, isUuid;
public boolean isListContainer, isMapContainer;
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/typescript-fetch/api.mustache
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ export interface FetchArgs {
* @class BaseAPI
*/
export class BaseAPI {
protected configuration: Configuration;
protected configuration: Configuration | undefined;

constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected fetch: FetchAPI = portableFetch) {
if (configuration) {
Expand All @@ -61,7 +61,7 @@ export class BaseAPI {
* @extends {Error}
*/
export class RequiredError extends Error {
name: "RequiredError"
name: "RequiredError" = "RequiredError";
constructor(public field: string, msg?: string) {
super(msg);
}
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/typescript-fetch/modelEnum.mustache
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
export enum {{classname}} {
{{#allowableValues}}
{{#enumVars}}
{{{name}}} = <any> {{{value}}}{{^-last}},{{/-last}}
{{{name}}} = {{{value}}}{{^-last}},{{/-last}}
{{/enumVars}}
{{/allowableValues}}
}
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ export namespace {{classname}} {
export enum {{enumName}} {
{{#allowableValues}}
{{#enumVars}}
{{{name}}} = <any> {{{value}}}{{^-last}},{{/-last}}
{{{name}}} = {{{value}}}{{^-last}},{{/-last}}
{{/enumVars}}
{{/allowableValues}}
}
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/typescript-fetch/package.mustache
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
},
"devDependencies": {
"@types/node": "^8.0.9",
"typescript": "^2.0"
"typescript": "^2.4"
}{{#npmRepository}},{{/npmRepository}}
{{#npmRepository}}
"publishConfig":{
Expand Down
16 changes: 8 additions & 8 deletions samples/client/petstore/typescript-fetch/builds/default/api.ts
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@ export interface FetchArgs {
* @class BaseAPI
*/
export class BaseAPI {
protected configuration: Configuration;
protected configuration: Configuration | undefined;

constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected fetch: FetchAPI = portableFetch) {
if (configuration) {
Expand All @@ -72,7 +72,7 @@ export class BaseAPI {
* @extends {Error}
*/
export class RequiredError extends Error {
name: "RequiredError"
name: "RequiredError" = "RequiredError";
constructor(public field: string, msg?: string) {
super(msg);
}
Expand Down Expand Up @@ -178,9 +178,9 @@ export namespace Order {
* @enum {string}
*/
export enum StatusEnum {
Placed = <any> 'placed',
Approved = <any> 'approved',
Delivered = <any> 'delivered'
Placed = 'placed',
Approved = 'approved',
Delivered = 'delivered'
}
}

Expand Down Expand Up @@ -238,9 +238,9 @@ export namespace Pet {
* @enum {string}
*/
export enum StatusEnum {
Available = <any> 'available',
Pending = <any> 'pending',
Sold = <any> 'sold'
Available = 'available',
Pending = 'pending',
Sold = 'sold'
}
}

Expand Down
16 changes: 8 additions & 8 deletions samples/client/petstore/typescript-fetch/builds/es6-target/api.ts
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@ export interface FetchArgs {
* @class BaseAPI
*/
export class BaseAPI {
protected configuration: Configuration;
protected configuration: Configuration | undefined;

constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected fetch: FetchAPI = portableFetch) {
if (configuration) {
Expand All @@ -72,7 +72,7 @@ export class BaseAPI {
* @extends {Error}
*/
export class RequiredError extends Error {
name: "RequiredError"
name: "RequiredError" = "RequiredError";
constructor(public field: string, msg?: string) {
super(msg);
}
Expand Down Expand Up @@ -178,9 +178,9 @@ export namespace Order {
* @enum {string}
*/
export enum StatusEnum {
Placed = <any> 'placed',
Approved = <any> 'approved',
Delivered = <any> 'delivered'
Placed = 'placed',
Approved = 'approved',
Delivered = 'delivered'
}
}

Expand Down Expand Up @@ -238,9 +238,9 @@ export namespace Pet {
* @enum {string}
*/
export enum StatusEnum {
Available = <any> 'available',
Pending = <any> 'pending',
Sold = <any> 'sold'
Available = 'available',
Pending = 'pending',
Sold = 'sold'
}
}

Expand Down
69 changes: 0 additions & 69 deletions samples/client/petstore/typescript-fetch/builds/es6-target/package-lock.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/es6-target/package.json
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
},
"devDependencies": {
"@types/node": "^8.0.9",
"typescript": "^2.0"
"typescript": "^2.4"
},
"publishConfig":{
"registry":"https://skimdb.npmjs.com/registry"
Expand Down
16 changes: 8 additions & 8 deletions samples/client/petstore/typescript-fetch/builds/with-interfaces/api.ts
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@ export interface FetchArgs {
* @class BaseAPI
*/
export class BaseAPI {
protected configuration: Configuration;
protected configuration: Configuration | undefined;

constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected fetch: FetchAPI = portableFetch) {
if (configuration) {
Expand All @@ -72,7 +72,7 @@ export class BaseAPI {
* @extends {Error}
*/
export class RequiredError extends Error {
name: "RequiredError"
name: "RequiredError" = "RequiredError";
constructor(public field: string, msg?: string) {
super(msg);
}
Expand Down Expand Up @@ -178,9 +178,9 @@ export namespace Order {
* @enum {string}
*/
export enum StatusEnum {
Placed = <any> 'placed',
Approved = <any> 'approved',
Delivered = <any> 'delivered'
Placed = 'placed',
Approved = 'approved',
Delivered = 'delivered'
}
}

Expand Down Expand Up @@ -238,9 +238,9 @@ export namespace Pet {
* @enum {string}
*/
export enum StatusEnum {
Available = <any> 'available',
Pending = <any> 'pending',
Sold = <any> 'sold'
Available = 'available',
Pending = 'pending',
Sold = 'sold'
}
}

Expand Down
16 changes: 8 additions & 8 deletions samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@ export interface FetchArgs {
* @class BaseAPI
*/
export class BaseAPI {
protected configuration: Configuration;
protected configuration: Configuration | undefined;

constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected fetch: FetchAPI = portableFetch) {
if (configuration) {
Expand All @@ -72,7 +72,7 @@ export class BaseAPI {
* @extends {Error}
*/
export class RequiredError extends Error {
name: "RequiredError"
name: "RequiredError" = "RequiredError";
constructor(public field: string, msg?: string) {
super(msg);
}
Expand Down Expand Up @@ -178,9 +178,9 @@ export namespace Order {
* @enum {string}
*/
export enum StatusEnum {
Placed = <any> 'placed',
Approved = <any> 'approved',
Delivered = <any> 'delivered'
Placed = 'placed',
Approved = 'approved',
Delivered = 'delivered'
}
}

Expand Down Expand Up @@ -238,9 +238,9 @@ export namespace Pet {
* @enum {string}
*/
export enum StatusEnum {
Available = <any> 'available',
Pending = <any> 'pending',
Sold = <any> 'sold'
Available = 'available',
Pending = 'pending',
Sold = 'sold'
}
}

Expand Down
69 changes: 0 additions & 69 deletions samples/client/petstore/typescript-fetch/builds/with-npm-version/package-lock.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
},
"devDependencies": {
"@types/node": "^8.0.9",
"typescript": "^2.0"
"typescript": "^2.4"
},
"publishConfig":{
"registry":"https://skimdb.npmjs.com/registry"
Expand Down