Skip to content

Commit 6f9d825

Browse files
authored
[typescript-fetch] Make FormData optional (#6077)
Check "typeof FormData" first. This allows the code to also work in nodejs with isomorphic-fetch.
1 parent 354f195 commit 6f9d825

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class BaseAPI {
5050
// do not handle correctly sometimes.
5151
url += '?' + this.configuration.queryParamsStringify(context.query);
5252
}
53-
const body = (context.body instanceof FormData || context.body instanceof URLSearchParams || isBlob(context.body))
53+
const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
5454
? context.body
5555
: JSON.stringify(context.body);
5656

samples/client/petstore/typescript-fetch/builds/default/runtime.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class BaseAPI {
6161
// do not handle correctly sometimes.
6262
url += '?' + this.configuration.queryParamsStringify(context.query);
6363
}
64-
const body = (context.body instanceof FormData || context.body instanceof URLSearchParams || isBlob(context.body))
64+
const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
6565
? context.body
6666
: JSON.stringify(context.body);
6767

samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class BaseAPI {
6161
// do not handle correctly sometimes.
6262
url += '?' + this.configuration.queryParamsStringify(context.query);
6363
}
64-
const body = (context.body instanceof FormData || context.body instanceof URLSearchParams || isBlob(context.body))
64+
const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
6565
? context.body
6666
: JSON.stringify(context.body);
6767

samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class BaseAPI {
6161
// do not handle correctly sometimes.
6262
url += '?' + this.configuration.queryParamsStringify(context.query);
6363
}
64-
const body = (context.body instanceof FormData || context.body instanceof URLSearchParams || isBlob(context.body))
64+
const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
6565
? context.body
6666
: JSON.stringify(context.body);
6767

samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class BaseAPI {
6161
// do not handle correctly sometimes.
6262
url += '?' + this.configuration.queryParamsStringify(context.query);
6363
}
64-
const body = (context.body instanceof FormData || context.body instanceof URLSearchParams || isBlob(context.body))
64+
const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
6565
? context.body
6666
: JSON.stringify(context.body);
6767

samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/runtime.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class BaseAPI {
6161
// do not handle correctly sometimes.
6262
url += '?' + this.configuration.queryParamsStringify(context.query);
6363
}
64-
const body = (context.body instanceof FormData || context.body instanceof URLSearchParams || isBlob(context.body))
64+
const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
6565
? context.body
6666
: JSON.stringify(context.body);
6767

samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class BaseAPI {
6161
// do not handle correctly sometimes.
6262
url += '?' + this.configuration.queryParamsStringify(context.query);
6363
}
64-
const body = (context.body instanceof FormData || context.body instanceof URLSearchParams || isBlob(context.body))
64+
const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
6565
? context.body
6666
: JSON.stringify(context.body);
6767

samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class BaseAPI {
6161
// do not handle correctly sometimes.
6262
url += '?' + this.configuration.queryParamsStringify(context.query);
6363
}
64-
const body = (context.body instanceof FormData || context.body instanceof URLSearchParams || isBlob(context.body))
64+
const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
6565
? context.body
6666
: JSON.stringify(context.body);
6767

0 commit comments

Comments
 (0)