Skip to content

[typescript-fetch] allow initOverrides with async function #12098

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

Merged
macjohnny merged 16 commits into from
Apr 23, 2022
Merged

[typescript-fetch] allow initOverrides with async function #12098

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d31aa34
[typescript-fetch] allow initOverrides with async function
mkusaka Apr 9, 2022
a40a951
[typescript-fetch] update samples
mkusaka Apr 9, 2022
fa9e111
[typescript-fetch] refactoring initFnction apply
mkusaka Apr 9, 2022
089d587
[typescript-fetch] update samples
mkusaka Apr 9, 2022
34872df
[typescript-fetch] refactoring create body function
mkusaka Apr 9, 2022
f8e2de6
[typescript-fetch] update samples
mkusaka Apr 9, 2022
d1a2891
[typescript-fetch] make interface more flexible
mkusaka Apr 9, 2022
2ac41dd
[typescript-fetch] update samples
mkusaka Apr 9, 2022
d5441cb
Merge branch 'master' of https://github.com/mkusaka/openapi-generator…
mkusaka Apr 10, 2022
1921df7
[typescript-fetch] support 2.x version of typescript & update samples
mkusaka Apr 10, 2022
b6979e6
Merge branch 'master' of https://github.com/mkusaka/openapi-generator…
mkusaka Apr 12, 2022
f0fad97
[typescript-axios] update samples
mkusaka Apr 12, 2022
89d73f6
[typescript-fetch] refactor: add type alias
mkusaka Apr 17, 2022
6ac3a92
[typescript-fetch] override with init params even if initOverrides is…
mkusaka Apr 23, 2022
a7443ee
[typescript-fetch] update samples
mkusaka Apr 23, 2022
c5cdd9b
merge master & resolve conflict
mkusaka Apr 23, 2022
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
Prev Previous commit
Next Next commit
[typescript-fetch] support 2.x version of typescript & update samples
  • Loading branch information
@mkusaka
mkusaka committed Apr 10, 2022
commit 1921df7bed24c21d70677feb63fe2e59a6492d26
16 changes: 3 additions & 13 deletions modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,11 @@ export class BaseAPI {
context
})

const createRequestBody = (body: HTTPBody) => (isFormData(body) || isURLSearchParams(body) || isBlob(body))
? body
: JSON.stringify(body);

const init: RequestInit = {
...initWithOverride,
body: createRequestBody(initWithOverride.body)
body: ((typeof FormData !== "undefined" && initWithOverride.body instanceof FormData) || initWithOverride.body instanceof URLSearchParams || isBlob(initWithOverride.body))
? initWithOverride.body
: JSON.stringify(initWithOverride.body)
}

return { url, init };
Expand Down Expand Up @@ -183,14 +181,6 @@ export class BaseAPI {
}
};

function isFormData(value: any): value is FormData {
return typeof FormData !== "undefined" && value instanceof FormData
}

function isURLSearchParams(value: any): value is URLSearchParams {
return value instanceof URLSearchParams
}

function isBlob(value: any): value is Blob {
return typeof Blob !== 'undefined' && value instanceof Blob
}
Expand Down
16 changes: 3 additions & 13 deletions samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,11 @@ export class BaseAPI {
context
})

const createRequestBody = (body: HTTPBody) => (isFormData(body) || isURLSearchParams(body) || isBlob(body))
? body
: JSON.stringify(body);

const init: RequestInit = {
...initWithOverride,
body: createRequestBody(initWithOverride.body)
body: ((typeof FormData !== "undefined" && initWithOverride.body instanceof FormData) || initWithOverride.body instanceof URLSearchParams || isBlob(initWithOverride.body))
? initWithOverride.body
: JSON.stringify(initWithOverride.body)
}

return { url, init };
Expand Down Expand Up @@ -194,14 +192,6 @@ export class BaseAPI {
}
};

function isFormData(value: any): value is FormData {
return typeof FormData !== "undefined" && value instanceof FormData
}

function isURLSearchParams(value: any): value is URLSearchParams {
return value instanceof URLSearchParams
}

function isBlob(value: any): value is Blob {
return typeof Blob !== 'undefined' && value instanceof Blob
}
Expand Down
16 changes: 3 additions & 13 deletions samples/client/petstore/typescript-fetch/builds/default/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,11 @@ export class BaseAPI {
context
})

const createRequestBody = (body: HTTPBody) => (isFormData(body) || isURLSearchParams(body) || isBlob(body))
? body
: JSON.stringify(body);

const init: RequestInit = {
...initWithOverride,
body: createRequestBody(initWithOverride.body)
body: ((typeof FormData !== "undefined" && initWithOverride.body instanceof FormData) || initWithOverride.body instanceof URLSearchParams || isBlob(initWithOverride.body))
? initWithOverride.body
: JSON.stringify(initWithOverride.body)
}

return { url, init };
Expand Down Expand Up @@ -194,14 +192,6 @@ export class BaseAPI {
}
};

function isFormData(value: any): value is FormData {
return typeof FormData !== "undefined" && value instanceof FormData
}

function isURLSearchParams(value: any): value is URLSearchParams {
return value instanceof URLSearchParams
}

function isBlob(value: any): value is Blob {
return typeof Blob !== 'undefined' && value instanceof Blob
}
Expand Down
16 changes: 3 additions & 13 deletions samples/client/petstore/typescript-fetch/builds/enum/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,11 @@ export class BaseAPI {
context
})

const createRequestBody = (body: HTTPBody) => (isFormData(body) || isURLSearchParams(body) || isBlob(body))
? body
: JSON.stringify(body);

const init: RequestInit = {
...initWithOverride,
body: createRequestBody(initWithOverride.body)
body: ((typeof FormData !== "undefined" && initWithOverride.body instanceof FormData) || initWithOverride.body instanceof URLSearchParams || isBlob(initWithOverride.body))
? initWithOverride.body
: JSON.stringify(initWithOverride.body)
}

return { url, init };
Expand Down Expand Up @@ -194,14 +192,6 @@ export class BaseAPI {
}
};

function isFormData(value: any): value is FormData {
return typeof FormData !== "undefined" && value instanceof FormData
}

function isURLSearchParams(value: any): value is URLSearchParams {
return value instanceof URLSearchParams
}

function isBlob(value: any): value is Blob {
return typeof Blob !== 'undefined' && value instanceof Blob
}
Expand Down
36 changes: 36 additions & 0 deletions samples/client/petstore/typescript-fetch/builds/es6-target/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 3 additions & 13 deletions samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,11 @@ export class BaseAPI {
context
})

const createRequestBody = (body: HTTPBody) => (isFormData(body) || isURLSearchParams(body) || isBlob(body))
? body
: JSON.stringify(body);

const init: RequestInit = {
...initWithOverride,
body: createRequestBody(initWithOverride.body)
body: ((typeof FormData !== "undefined" && initWithOverride.body instanceof FormData) || initWithOverride.body instanceof URLSearchParams || isBlob(initWithOverride.body))
? initWithOverride.body
: JSON.stringify(initWithOverride.body)
}

return { url, init };
Expand Down Expand Up @@ -194,14 +192,6 @@ export class BaseAPI {
}
};

function isFormData(value: any): value is FormData {
return typeof FormData !== "undefined" && value instanceof FormData
}

function isURLSearchParams(value: any): value is URLSearchParams {
return value instanceof URLSearchParams
}

function isBlob(value: any): value is Blob {
return typeof Blob !== 'undefined' && value instanceof Blob
}
Expand Down
16 changes: 3 additions & 13 deletions samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,11 @@ export class BaseAPI {
context
})

const createRequestBody = (body: HTTPBody) => (isFormData(body) || isURLSearchParams(body) || isBlob(body))
? body
: JSON.stringify(body);

const init: RequestInit = {
...initWithOverride,
body: createRequestBody(initWithOverride.body)
body: ((typeof FormData !== "undefined" && initWithOverride.body instanceof FormData) || initWithOverride.body instanceof URLSearchParams || isBlob(initWithOverride.body))
? initWithOverride.body
: JSON.stringify(initWithOverride.body)
}

return { url, init };
Expand Down Expand Up @@ -194,14 +192,6 @@ export class BaseAPI {
}
};

function isFormData(value: any): value is FormData {
return typeof FormData !== "undefined" && value instanceof FormData
}

function isURLSearchParams(value: any): value is URLSearchParams {
return value instanceof URLSearchParams
}

function isBlob(value: any): value is Blob {
return typeof Blob !== 'undefined' && value instanceof Blob
}
Expand Down
16 changes: 3 additions & 13 deletions samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,11 @@ export class BaseAPI {
context
})

const createRequestBody = (body: HTTPBody) => (isFormData(body) || isURLSearchParams(body) || isBlob(body))
? body
: JSON.stringify(body);

const init: RequestInit = {
...initWithOverride,
body: createRequestBody(initWithOverride.body)
body: ((typeof FormData !== "undefined" && initWithOverride.body instanceof FormData) || initWithOverride.body instanceof URLSearchParams || isBlob(initWithOverride.body))
? initWithOverride.body
: JSON.stringify(initWithOverride.body)
}

return { url, init };
Expand Down Expand Up @@ -194,14 +192,6 @@ export class BaseAPI {
}
};

function isFormData(value: any): value is FormData {
return typeof FormData !== "undefined" && value instanceof FormData
}

function isURLSearchParams(value: any): value is URLSearchParams {
return value instanceof URLSearchParams
}

function isBlob(value: any): value is Blob {
return typeof Blob !== 'undefined' && value instanceof Blob
}
Expand Down
16 changes: 3 additions & 13 deletions samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,11 @@ export class BaseAPI {
context
})

const createRequestBody = (body: HTTPBody) => (isFormData(body) || isURLSearchParams(body) || isBlob(body))
? body
: JSON.stringify(body);

const init: RequestInit = {
...initWithOverride,
body: createRequestBody(initWithOverride.body)
body: ((typeof FormData !== "undefined" && initWithOverride.body instanceof FormData) || initWithOverride.body instanceof URLSearchParams || isBlob(initWithOverride.body))
? initWithOverride.body
: JSON.stringify(initWithOverride.body)
}

return { url, init };
Expand Down Expand Up @@ -194,14 +192,6 @@ export class BaseAPI {
}
};

function isFormData(value: any): value is FormData {
return typeof FormData !== "undefined" && value instanceof FormData
}

function isURLSearchParams(value: any): value is URLSearchParams {
return value instanceof URLSearchParams
}

function isBlob(value: any): value is Blob {
return typeof Blob !== 'undefined' && value instanceof Blob
}
Expand Down
16 changes: 3 additions & 13 deletions samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,11 @@ export class BaseAPI {
context
})

const createRequestBody = (body: HTTPBody) => (isFormData(body) || isURLSearchParams(body) || isBlob(body))
? body
: JSON.stringify(body);

const init: RequestInit = {
...initWithOverride,
body: createRequestBody(initWithOverride.body)
body: ((typeof FormData !== "undefined" && initWithOverride.body instanceof FormData) || initWithOverride.body instanceof URLSearchParams || isBlob(initWithOverride.body))
? initWithOverride.body
: JSON.stringify(initWithOverride.body)
}

return { url, init };
Expand Down Expand Up @@ -194,14 +192,6 @@ export class BaseAPI {
}
};

function isFormData(value: any): value is FormData {
return typeof FormData !== "undefined" && value instanceof FormData
}

function isURLSearchParams(value: any): value is URLSearchParams {
return value instanceof URLSearchParams
}

function isBlob(value: any): value is Blob {
return typeof Blob !== 'undefined' && value instanceof Blob
}
Expand Down
16 changes: 3 additions & 13 deletions samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,11 @@ export class BaseAPI {
context
})

const createRequestBody = (body: HTTPBody) => (isFormData(body) || isURLSearchParams(body) || isBlob(body))
? body
: JSON.stringify(body);

const init: RequestInit = {
...initWithOverride,
body: createRequestBody(initWithOverride.body)
body: ((typeof FormData !== "undefined" && initWithOverride.body instanceof FormData) || initWithOverride.body instanceof URLSearchParams || isBlob(initWithOverride.body))
? initWithOverride.body
: JSON.stringify(initWithOverride.body)
}

return { url, init };
Expand Down Expand Up @@ -194,14 +192,6 @@ export class BaseAPI {
}
};

function isFormData(value: any): value is FormData {
return typeof FormData !== "undefined" && value instanceof FormData
}

function isURLSearchParams(value: any): value is URLSearchParams {
return value instanceof URLSearchParams
}

function isBlob(value: any): value is Blob {
return typeof Blob !== 'undefined' && value instanceof Blob
}
Expand Down
16 changes: 3 additions & 13 deletions samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,11 @@ export class BaseAPI {
context
})

const createRequestBody = (body: HTTPBody) => (isFormData(body) || isURLSearchParams(body) || isBlob(body))
? body
: JSON.stringify(body);

const init: RequestInit = {
...initWithOverride,
body: createRequestBody(initWithOverride.body)
body: ((typeof FormData !== "undefined" && initWithOverride.body instanceof FormData) || initWithOverride.body instanceof URLSearchParams || isBlob(initWithOverride.body))
? initWithOverride.body
: JSON.stringify(initWithOverride.body)
}

return { url, init };
Expand Down Expand Up @@ -194,14 +192,6 @@ export class BaseAPI {
}
};

function isFormData(value: any): value is FormData {
return typeof FormData !== "undefined" && value instanceof FormData
}

function isURLSearchParams(value: any): value is URLSearchParams {
return value instanceof URLSearchParams
}

function isBlob(value: any): value is Blob {
return typeof Blob !== 'undefined' && value instanceof Blob
}
Expand Down
Loading