-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
New options for deprecate() function #19133
Merged
Merged
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
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
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
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
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
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
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
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 |
---|---|---|
|
@@ -10,13 +10,18 @@ declare global { | |
}; | ||
} | ||
|
||
export type DeprecationStages = 'available' | 'enabled'; | ||
|
||
export interface DeprecationOptions { | ||
id: string; | ||
until: string; | ||
url?: string; | ||
for: string; | ||
mehulkar marked this conversation as resolved.
Show resolved
Hide resolved
mehulkar marked this conversation as resolved.
Show resolved
Hide resolved
|
||
since: Partial<Record<DeprecationStages, string>>; | ||
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. Thanks for the assist @dfreeman! |
||
} | ||
|
||
export type DeprecateFunc = (message: string, test?: boolean, options?: DeprecationOptions) => void; | ||
export type MissingOptionDeprecateFunc = (id: string) => string; | ||
|
||
/** | ||
@module @ember/debug | ||
|
@@ -64,7 +69,11 @@ let registerHandler: (handler: HandlerCallback) => void = () => {}; | |
let missingOptionsDeprecation: string; | ||
let missingOptionsIdDeprecation: string; | ||
let missingOptionsUntilDeprecation: string; | ||
let missingOptionsForDeprecation: MissingOptionDeprecateFunc = () => ''; | ||
let missingOptionsSinceDeprecation: MissingOptionDeprecateFunc = () => ''; | ||
let deprecate: DeprecateFunc = () => {}; | ||
let FOR_MISSING_DEPRECATIONS = new Set(); | ||
let SINCE_MISSING_DEPRECATIONS = new Set(); | ||
|
||
if (DEBUG) { | ||
registerHandler = function registerHandler(handler: HandlerCallback) { | ||
|
@@ -154,6 +163,13 @@ if (DEBUG) { | |
'`options` should include `id` and `until` properties.'; | ||
missingOptionsIdDeprecation = 'When calling `deprecate` you must provide `id` in options.'; | ||
missingOptionsUntilDeprecation = 'When calling `deprecate` you must provide `until` in options.'; | ||
|
||
missingOptionsForDeprecation = (id: string) => { | ||
return `When calling \`deprecate\` you must provide \`for\` in options. Missing options.for in "${id}" deprecation`; | ||
}; | ||
missingOptionsSinceDeprecation = (id: string) => { | ||
return `When calling \`deprecate\` you must provide \`since\` in options. Missing options.since in "${id}" deprecation`; | ||
}; | ||
/** | ||
@module @ember/debug | ||
@public | ||
|
@@ -176,8 +192,10 @@ if (DEBUG) { | |
"view.helper.select". | ||
@param {string} options.until The version of Ember when this deprecation | ||
warning will be removed. | ||
@param {String} options.for A namespace for the deprecation, usually the package name | ||
@param {Object} options.since Describes when the deprecation became available and enabled. | ||
@param {String} [options.url] An optional url to the transition guide on the | ||
emberjs.com website. | ||
emberjs.com website. | ||
@static | ||
@public | ||
@since 1.0.0 | ||
|
@@ -187,6 +205,32 @@ if (DEBUG) { | |
assert(missingOptionsIdDeprecation, Boolean(options!.id)); | ||
assert(missingOptionsUntilDeprecation, Boolean(options!.until)); | ||
|
||
if (!options!.for && !FOR_MISSING_DEPRECATIONS.has(options!.id)) { | ||
FOR_MISSING_DEPRECATIONS.add(options!.id); | ||
|
||
deprecate(missingOptionsForDeprecation(options!.id), Boolean(options!.for), { | ||
id: 'ember-source.deprecation-without-for', | ||
until: '4.0.0', | ||
for: 'ember-source', | ||
since: { | ||
available: '3.24.0', | ||
}, | ||
}); | ||
} | ||
|
||
if (!options!.since && !SINCE_MISSING_DEPRECATIONS.has(options!.id)) { | ||
SINCE_MISSING_DEPRECATIONS.add(options!.id); | ||
|
||
deprecate(missingOptionsSinceDeprecation(options!.id), Boolean(options!.since), { | ||
id: 'ember-source.deprecation-without-since', | ||
until: '4.0.0', | ||
for: 'ember-source', | ||
since: { | ||
available: '3.24.0', | ||
}, | ||
}); | ||
} | ||
|
||
invoke('deprecate', message, test, options); | ||
}; | ||
} | ||
|
@@ -198,4 +242,8 @@ export { | |
missingOptionsDeprecation, | ||
missingOptionsIdDeprecation, | ||
missingOptionsUntilDeprecation, | ||
missingOptionsForDeprecation, | ||
missingOptionsSinceDeprecation, | ||
FOR_MISSING_DEPRECATIONS, | ||
SINCE_MISSING_DEPRECATIONS, | ||
}; |
Oops, something went wrong.
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.
2bf857e