-
Notifications
You must be signed in to change notification settings - Fork 214
fix: merge compatible definitions in union types #722
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
Draft
dmchurch
wants to merge
7
commits into
vega:next
Choose a base branch
from
dmchurch:merge-definitions
base: next
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
246b65c
fix: Merge compatible definitions in union types
dmchurch 6b0e19b
Update src/Utils/mergeDefinitions.ts
dmchurch 109b78e
Updating test snapshots; fixing reachability tests
dmchurch 291ebf9
Simplifying logic in addReachable, adding tests
dmchurch 30c22f7
Adding functional tests, mergeDefinitions tests
dmchurch 58f0dc9
Adding enum-merging to mergeDefinitions, unit test
dmchurch 79d1855
mergeDefinitions works on trivially-mergable types
dmchurch 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 hidden or 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 hidden or 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 |
---|---|---|
@@ -0,0 +1,25 @@ | ||
import { Definition } from "../Schema/Definition"; | ||
import { uniqueArray } from "./uniqueArray"; | ||
|
||
/** | ||
* Attempt to merge two disjoint definitions into one. Definitions are disjoint | ||
* (and therefore mergeable) if all of the following are true: | ||
* 1) Each has a 'type' property, and they share no types in common, | ||
* 2) The cross-type validation properties 'enum' and 'const' are not on either definition, and | ||
* 3) The two definitions have no properties besides 'type' in common. | ||
* | ||
* Returns the merged definition, or null if the two defs were not disjoint. | ||
*/ | ||
export function mergeDefinitions(def1: Definition, def2: Definition): Definition | null { | ||
const { type: type1, ...props1 } = def1; | ||
const { type: type2, ...props2 } = def2; | ||
const types = [type1!, type2!].flat(); | ||
if (!type1 || !type2 || uniqueArray(types).length !== types.length) { | ||
return null; | ||
} | ||
const keys = [Object.keys(props1), Object.keys(props2)].flat(); | ||
if (keys.includes("enum") || keys.includes("const") || uniqueArray(keys).length !== keys.length) { | ||
return null; | ||
} | ||
return { type: types, ...props1, ...props2 }; | ||
} |
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.
Uh oh!
There was an error while loading. Please reload this page.