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

TypeScript: add typeRoots to tsconfig #2395

Merged
merged 2 commits into from
Mar 17, 2019
Merged

TypeScript: add typeRoots to tsconfig #2395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adb6618
TypeScript: add typeRoots to tsconfig
karlvr Mar 14, 2019
05d23a3
Update petstore examples for all TypeScript variants
karlvr Mar 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion modules/openapi-generator/src/main/resources/typescript-angular/tsconfig.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
"outDir": "./dist",
"noLib": false,
"declaration": true,
"lib": [ "es6", "dom" ]
"lib": [ "es6", "dom" ],
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
"node_modules",
Expand Down
5 changes: 4 additions & 1 deletion modules/openapi-generator/src/main/resources/typescript-aurelia/tsconfig.json.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
"module": "commonjs",
"noImplicitAny": true,
"outDir": "dist",
"rootDir": "."
"rootDir": ".",
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
"dist",
Expand Down
8 changes: 6 additions & 2 deletions modules/openapi-generator/src/main/resources/typescript-axios/tsconfig.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@
"module": "commonjs",
"noImplicitAny": true,
"outDir": "dist",
"rootDir": "."{{^supportsES6}},
"rootDir": ".",
{{^supportsES6}}
"lib": [
"es6",
"dom"
]
],
{{/supportsES6}}
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
"dist",
Expand Down
8 changes: 6 additions & 2 deletions modules/openapi-generator/src/main/resources/typescript-fetch/tsconfig.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@
"module": "commonjs",
"moduleResolution": "node",
"outDir": "dist",
"rootDir": "."{{^supportsES6}},
"rootDir": ".",
{{^supportsES6}}
"lib": [
"es6",
"dom"
]
],
{{/supportsES6}}
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
"dist",
Expand Down
5 changes: 4 additions & 1 deletion modules/openapi-generator/src/main/resources/typescript-inversify/tsconfig.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
"outDir": "./dist",
"noLib": false,
"declaration": true,
"lib": [ "es6", "dom" ]
"lib": [ "es6", "dom" ],
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
"node_modules",
Expand Down
5 changes: 4 additions & 1 deletion modules/openapi-generator/src/main/resources/typescript-jquery/tsconfig.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
"removeComments": true,
"sourceMap": true,
"noLib": false,
"declaration": true
"declaration": true,
"typeRoots": [
"node_modules/@types"
]
},
"files": [
"index.ts",
Expand Down
5 changes: 4 additions & 1 deletion modules/openapi-generator/src/main/resources/typescript-node/tsconfig.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
"noLib": false,
"declaration": true,
"lib": ["dom", "es6", "es5", "dom.iterable", "scripthost"],
"outDir": "dist"
"outDir": "dist",
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
"dist",
Expand Down
8 changes: 6 additions & 2 deletions modules/openapi-generator/src/main/resources/typescript-rxjs/tsconfig.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@
"module": "commonjs",
"moduleResolution": "node",
"outDir": "dist",
"rootDir": "."{{^supportsES6}},
"rootDir": ".",
{{^supportsES6}}
"lib": [
"es6",
"dom"
]
],
{{/supportsES6}}
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
"dist",
Expand Down
5 changes: 4 additions & 1 deletion samples/client/petstore/typescript-angular-v2/npm/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
"outDir": "./dist",
"noLib": false,
"declaration": true,
"lib": [ "es6", "dom" ]
"lib": [ "es6", "dom" ],
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
"node_modules",
Expand Down
5 changes: 4 additions & 1 deletion samples/client/petstore/typescript-angular-v4.3/npm/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
"outDir": "./dist",
"noLib": false,
"declaration": true,
"lib": [ "es6", "dom" ]
"lib": [ "es6", "dom" ],
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
"node_modules",
Expand Down
5 changes: 4 additions & 1 deletion samples/client/petstore/typescript-angular-v4/npm/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
"outDir": "./dist",
"noLib": false,
"declaration": true,
"lib": [ "es6", "dom" ]
"lib": [ "es6", "dom" ],
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
"node_modules",
Expand Down
5 changes: 4 additions & 1 deletion .../client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
"outDir": "./dist",
"noLib": false,
"declaration": true,
"lib": [ "es6", "dom" ]
"lib": [ "es6", "dom" ],
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
"node_modules",
Expand Down
5 changes: 4 additions & 1 deletion samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
"outDir": "./dist",
"noLib": false,
"declaration": true,
"lib": [ "es6", "dom" ]
"lib": [ "es6", "dom" ],
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
"node_modules",
Expand Down
5 changes: 4 additions & 1 deletion .../client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
"outDir": "./dist",
"noLib": false,
"declaration": true,
"lib": [ "es6", "dom" ]
"lib": [ "es6", "dom" ],
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
"node_modules",
Expand Down
5 changes: 4 additions & 1 deletion samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
"outDir": "./dist",
"noLib": false,
"declaration": true,
"lib": [ "es6", "dom" ]
"lib": [ "es6", "dom" ],
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
"node_modules",
Expand Down
6 changes: 5 additions & 1 deletion samples/client/petstore/typescript-axios/builds/es6-target/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
"module": "commonjs",
"noImplicitAny": true,
"outDir": "dist",
"rootDir": "." },
"rootDir": ".",
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
"dist",
"node_modules"
Expand Down
3 changes: 3 additions & 0 deletions ...tstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
"lib": [
"es6",
"dom"
],
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
Expand Down
3 changes: 3 additions & 0 deletions samples/client/petstore/typescript-axios/builds/with-npm-version/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
"lib": [
"es6",
"dom"
],
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
Expand Down
3 changes: 3 additions & 0 deletions samples/client/petstore/typescript-fetch/builds/default/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
"lib": [
"es6",
"dom"
],
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
Expand Down
6 changes: 5 additions & 1 deletion samples/client/petstore/typescript-fetch/builds/es6-target/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
"module": "commonjs",
"moduleResolution": "node",
"outDir": "dist",
"rootDir": "." },
"rootDir": ".",
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
"dist",
"node_modules"
Expand Down
3 changes: 3 additions & 0 deletions samples/client/petstore/typescript-fetch/builds/with-interfaces/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
"lib": [
"es6",
"dom"
],
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
Expand Down
3 changes: 3 additions & 0 deletions samples/client/petstore/typescript-fetch/builds/with-npm-version/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
"lib": [
"es6",
"dom"
],
"typeRoots": [
"node_modules/@types"
]
},
"exclude": [
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.0-SNAPSHOT
4.0.0-SNAPSHOT
24 changes: 12 additions & 12 deletions samples/client/petstore/typescript-jquery/default/api/PetApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,19 @@ export class PetApi {
/**
*
* @summary Add a new pet to the store
* @param pet Pet object that needs to be added to the store
* @param body Pet object that needs to be added to the store
*/
public addPet(pet: models.Pet, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
public addPet(body: models.Pet, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
{ response: JQueryXHR; body?: any; },
{ response: JQueryXHR; errorThrown: string }
> {
let localVarPath = this.basePath + '/pet';

let queryParameters: any = {};
let headerParams: any = {};
// verify required parameter 'pet' is not null or undefined
if (pet === null || pet === undefined) {
throw new Error('Required parameter pet was null or undefined when calling addPet.');
// verify required parameter 'body' is not null or undefined
if (body === null || body === undefined) {
throw new Error('Required parameter body was null or undefined when calling addPet.');
}


Expand Down Expand Up @@ -95,7 +95,7 @@ export class PetApi {
processData: false
};

requestOptions.data = JSON.stringify(pet);
requestOptions.data = JSON.stringify(body);
if (headerParams['Content-Type']) {
requestOptions.contentType = headerParams['Content-Type'];
}
Expand Down Expand Up @@ -415,19 +415,19 @@ export class PetApi {
/**
*
* @summary Update an existing pet
* @param pet Pet object that needs to be added to the store
* @param body Pet object that needs to be added to the store
*/
public updatePet(pet: models.Pet, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
public updatePet(body: models.Pet, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
{ response: JQueryXHR; body?: any; },
{ response: JQueryXHR; errorThrown: string }
> {
let localVarPath = this.basePath + '/pet';

let queryParameters: any = {};
let headerParams: any = {};
// verify required parameter 'pet' is not null or undefined
if (pet === null || pet === undefined) {
throw new Error('Required parameter pet was null or undefined when calling updatePet.');
// verify required parameter 'body' is not null or undefined
if (body === null || body === undefined) {
throw new Error('Required parameter body was null or undefined when calling updatePet.');
}


Expand Down Expand Up @@ -461,7 +461,7 @@ export class PetApi {
processData: false
};

requestOptions.data = JSON.stringify(pet);
requestOptions.data = JSON.stringify(body);
if (headerParams['Content-Type']) {
requestOptions.contentType = headerParams['Content-Type'];
}
Expand Down
12 changes: 6 additions & 6 deletions samples/client/petstore/typescript-jquery/default/api/StoreApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,19 +234,19 @@ export class StoreApi {
/**
*
* @summary Place an order for a pet
* @param order order placed for purchasing the pet
* @param body order placed for purchasing the pet
*/
public placeOrder(order: models.Order, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
public placeOrder(body: models.Order, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
{ response: JQueryXHR; body: models.Order; },
{ response: JQueryXHR; errorThrown: string }
> {
let localVarPath = this.basePath + '/store/order';

let queryParameters: any = {};
let headerParams: any = {};
// verify required parameter 'order' is not null or undefined
if (order === null || order === undefined) {
throw new Error('Required parameter order was null or undefined when calling placeOrder.');
// verify required parameter 'body' is not null or undefined
if (body === null || body === undefined) {
throw new Error('Required parameter body was null or undefined when calling placeOrder.');
}


Expand All @@ -271,7 +271,7 @@ export class StoreApi {
processData: false
};

requestOptions.data = JSON.stringify(order);
requestOptions.data = JSON.stringify(body);
if (headerParams['Content-Type']) {
requestOptions.contentType = headerParams['Content-Type'];
}
Expand Down
Loading