Skip to content

fix: resolveOneOf should work with false value #889

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
merged 4 commits into from
Sep 26, 2023
Merged

fix: resolveOneOf should work with false value #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a2dd1a
fix: resolveOneOf should work with false value
Vinzius Sep 26, 2023
ff45458
feat: keep ?? operator
Vinzius Sep 26, 2023
51d3916
refactor: improve formatting
Vinzius Sep 26, 2023
dc3e949
feat: prefer ?? operator
Vinzius Sep 26, 2023
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
12 changes: 12 additions & 0 deletions packages/clients/src/helpers/__tests__/marshalling.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,18 @@ describe('resolveOneOf', () => {
),
).toStrictEqual({})
})

it('handles false kind values, like boolean.false', () => {
expect(
resolveOneOf(
[
{ default: undefined, param: 'my_key_1', value: false },
{ default: undefined, param: 'my_key_2', value: true },
],
false,
),
).toStrictEqual({ my_key_1: false })
})
})

describe('unmarshalDate', () => {
Expand Down
11 changes: 8 additions & 3 deletions packages/clients/src/helpers/marshalling.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,14 @@ export const resolveOneOf = <T>(
}[],
isRequired = false,
): Record<string, T> => {
const elt = list.find(obj => obj.value) || list.find(obj => obj.default)
const value = elt?.value || elt?.default
if (value) return { [elt.param]: value }
const elt =
list.find(obj => obj.value !== undefined) ??
list.find(obj => obj.default !== undefined)
const value = elt?.value ?? elt?.default
if (elt && value !== undefined) {
return { [elt.param]: value }
}

if (isRequired) {
const keyList = list.map(obj => obj.param).join(' or ')
throw new TypeError(`one of ${keyList} must be indicated in the request`)
Expand Down