refactor: remove unused, duplicated code in deprecate module (#14579)

* remove obsolete tests

 * remove unused deprecate API

 * make a warnOnce helper for the deprecate methods

 * misc. copyediting, e.g. variable names, whitespace

 * test that any deprecation warns once at most

 * use strict
This commit is contained in:
Charles Kerr 2018-09-12 17:13:22 -05:00 committed by GitHub
parent d78a2a110a
commit a3f7e298cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 71 additions and 97 deletions

View file

@ -1,6 +1,20 @@
'use strict'
let deprecationHandler = null
function warnOnce (oldName, newName) {
let warned = false
const msg = newName
? `'${oldName}' is deprecated and will be removed. Please use '${newName}' instead.`
: `'${oldName}' is deprecated and will be removed.`
return () => {
if (!warned && !process.noDeprecation) {
warned = true
deprecate.log(msg)
}
}
}
const deprecate = {
setHandler: (handler) => { deprecationHandler = handler },
getHandler: () => deprecationHandler,
@ -18,100 +32,61 @@ const deprecate = {
return console.warn(`(electron) ${message}`)
}
},
renameFunction: function (fn, oldName, newName) {
let warned = false
return function () {
if (!(warned || process.noDeprecation)) {
warned = true
deprecate.warn(oldName, newName)
}
return fn.apply(this, arguments)
}
},
removeFunction: (oldName) => {
if (!process.noDeprecation) {
deprecate.log(`The '${oldName}' function has been deprecated and marked for removal.`)
}
},
alias: function (object, oldName, newName) {
let warned = false
const newFn = function () {
if (!(warned || process.noDeprecation)) {
warned = true
deprecate.warn(oldName, newName)
}
return this[newName].apply(this, arguments)
}
if (typeof object === 'function') {
object.prototype[newName] = newFn
} else {
object[oldName] = newFn
}
},
event: (emitter, oldName, newName) => {
let warned = false
return emitter.on(newName, function (...args) {
if (this.listenerCount(oldName) === 0) return
if (warned || process.noDeprecation) return
warned = true
if (newName.startsWith('-')) {
deprecate.log(`'${oldName}' event has been deprecated.`)
} else {
deprecate.warn(`'${oldName}' event`, `'${newName}' event`)
event: (emitter, oldName, newName) => {
const warn = newName.startsWith('-') /* internal event */
? warnOnce(`${oldName} event`)
: warnOnce(`${oldName} event`, `${newName} event`)
return emitter.on(newName, function (...args) {
if (this.listenerCount(oldName) !== 0) {
warn()
this.emit(oldName, ...args)
}
this.emit(oldName, ...args)
})
},
removeProperty: (object, deprecated, ignoreMissingProps = false) => {
let warned = false
let warn = () => {
if (!(warned || process.noDeprecation)) {
warned = true
deprecate.log(`The '${deprecated}' property has been deprecated and marked for removal.`)
}
removeProperty: (o, removedName) => {
// if the property's already been removed, warn about it
if (!(removedName in o)) {
deprecate.log(`Unable to remove property '${removedName}' from an object that lacks it.`)
}
if (!(deprecated in object)) {
if (ignoreMissingProps) return
throw new Error('Cannot deprecate a property on an object which does not have that property')
}
let temp = object[deprecated]
return Object.defineProperty(object, deprecated, {
// wrap the deprecated property in an accessor to warn
const warn = warnOnce(removedName)
let val = o[removedName]
return Object.defineProperty(o, removedName, {
configurable: true,
get: () => {
warn()
return temp
return val
},
set: (newValue) => {
set: newVal => {
warn()
temp = newValue
val = newVal
}
})
},
renameProperty: (object, oldName, newName) => {
let warned = false
let warn = () => {
if (!(warned || process.noDeprecation)) {
warned = true
deprecate.warn(oldName, newName)
}
}
if (!(newName in object) && (oldName in object)) {
renameProperty: (o, oldName, newName) => {
const warn = warnOnce(oldName, newName)
// if the new property isn't there yet,
// inject it and warn about it
if ((oldName in o) && !(newName in o)) {
warn()
object[newName] = object[oldName]
o[newName] = o[oldName]
}
return Object.defineProperty(object, oldName, {
get: function () {
// wrap the deprecated property in an accessor to warn
// and redirect to the new property
return Object.defineProperty(o, oldName, {
get: () => {
warn()
return this[newName]
return o[newName]
},
set: function (value) {
set: value => {
warn()
this[newName] = value
o[newName] = value
}
})
}