Skip to content
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

Jump to bottom

fix: resolve mismatch with types declaration and docs for resourceQuery #13296

Merged
merged 6 commits into from
May 19, 2021
Merged

fix: resolve mismatch with types declaration and docs for resourceQuery #13296

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
743b190
fix: resolve mismatch with types declaration and docs for resourceQuery
bolariin May 3, 2021
0d1e2f9
Apply requested changes
bolariin May 6, 2021
23df156
Add description to 'RuleSetLogicalConditions' definition
bolariin May 6, 2021
0e881be
fix schema for absolute conditions and add test cases
sokra May 17, 2021
c7d7940
Merge branch 'master' into issue-13284
sokra May 17, 2021
e570628
Update snaphots
bolariin May 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions declarations/WebpackOptions.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,15 +244,15 @@ export type RuleSetCondition =
/**
* Logical AND.
*/
and?: RuleSetConditions;
and?: RuleSetCondition;
sokra marked this conversation as resolved.
Show resolved Hide resolved
/**
* Logical NOT.
*/
not?: RuleSetConditions;
not?: RuleSetCondition;
/**
* Logical OR.
*/
or?: RuleSetConditions;
or?: RuleSetCondition;
}
| ((value: string) => boolean)
| RuleSetConditions;
Expand Down
2 changes: 1 addition & 1 deletion schemas/WebpackOptions.check.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions schemas/WebpackOptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3380,23 +3380,23 @@
"description": "Logical AND.",
"oneOf": [
{
"$ref": "#/definitions/RuleSetConditions"
"$ref": "#/definitions/RuleSetCondition"
}
]
},
"not": {
"description": "Logical NOT.",
"oneOf": [
{
"$ref": "#/definitions/RuleSetConditions"
"$ref": "#/definitions/RuleSetCondition"
}
]
},
"or": {
"description": "Logical OR.",
"oneOf": [
{
"$ref": "#/definitions/RuleSetConditions"
"$ref": "#/definitions/RuleSetCondition"
}
]
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you put the whole object with and, or, not into a separate definition RuleSetLogicalConditions.

This helps in generating more readable typings.

Expand Down