-
Notifications
You must be signed in to change notification settings - Fork 14
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.
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
add strictObject decoder #58
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -293,6 +293,43 @@ export class Decoder<A> { | |
}); | ||
} | ||
|
||
static strictObject<A>(decoders?: DecoderObject<A>) { | ||
const decoderKeys = isJsonObject(decoders) ? Object.keys(decoders) : []; | ||
return new Decoder((json: unknown) => { | ||
const invalidKeys = isJsonObject(json) | ||
? Object.keys(json).filter((key: string) => !decoderKeys.some((validKey: string) => key === validKey)) | ||
: []; | ||
|
||
if (invalidKeys.length > 0) { | ||
return Result.err({message: `the following keys are present but not expected: ${invalidKeys.join(", ")}`}); | ||
} | ||
Comment on lines
+298
to
+305
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. it might be better to represent this decoder as the intersection of the standard |
||
|
||
if (isJsonObject(json) && decoders) { | ||
let obj: any = {}; | ||
for (const key in decoders) { | ||
if (decoders.hasOwnProperty(key)) { | ||
const r = decoders[key].decode(json[key]); | ||
if (r.ok === true) { | ||
// tslint:disable-next-line:strict-type-predicates | ||
if (r.result !== undefined) { | ||
obj[key] = r.result; | ||
} | ||
} else if (json[key] === undefined) { | ||
return Result.err({message: `the key '${key}' is required but was not present`}); | ||
} else { | ||
return Result.err(prependAt(`.${key}`, r.error)); | ||
} | ||
} | ||
} | ||
return Result.ok(obj); | ||
} else if (isJsonObject(json)) { | ||
return Result.ok(json); | ||
} else { | ||
return Result.err({message: expectedGot('an object', json)}); | ||
} | ||
}); | ||
} | ||
|
||
/** | ||
* Decoder for json arrays. Runs `decoder` on each array element, and succeeds | ||
* if all elements are successfully decoded. If no `decoder` argument is | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,6 +11,7 @@ export { | |
unknownJson, | ||
constant, | ||
object, | ||
strictObject, | ||
array, | ||
tuple, | ||
dict, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we don't need to decode
decoders
do we? Can just beCan we make
decoders
a required field? Then it would be even simpler: