diff --git a/lib/internal/util.js b/lib/internal/util.js index bb2a101c4e8648..f5b5fbedd46b4f 100644 --- a/lib/internal/util.js +++ b/lib/internal/util.js @@ -385,6 +385,17 @@ function once(callback) { }; } +const ReflectApply = Reflect.apply; + +// This function is borrowed from the function with the same name on V8 Extras' +// `utils` object. V8 implements Reflect.apply very efficiently in conjunction +// with the spread syntax, such that no additional special case is needed for +// function calls w/o arguments. +// Refs: https://github.com/v8/v8/blob/d6ead37d265d7215cf9c5f768f279e21bd170212/src/js/prologue.js#L152-L156 +function uncurryThis(func) { + return (thisArg, ...args) => ReflectApply(func, thisArg, args); +} + module.exports = { assertCrypto, cachedResult, @@ -405,6 +416,7 @@ module.exports = { promisify, spliceOne, removeColors, + uncurryThis, // Symbol used to customize promisify conversion customPromisifyArgs: kCustomPromisifyArgsSymbol, diff --git a/lib/internal/util/comparisons.js b/lib/internal/util/comparisons.js index 3470f206661557..18fb7905073a1e 100644 --- a/lib/internal/util/comparisons.js +++ b/lib/internal/util/comparisons.js @@ -24,12 +24,7 @@ const { ONLY_ENUMERABLE } } = internalBinding('util'); - -const ReflectApply = Reflect.apply; - -function uncurryThis(func) { - return (thisArg, ...args) => ReflectApply(func, thisArg, args); -} +const { uncurryThis } = require('internal/util'); const kStrict = true; const kLoose = false; diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js index dc97e6dceb8c5a..ca78425a52a332 100644 --- a/lib/internal/util/inspect.js +++ b/lib/internal/util/inspect.js @@ -17,7 +17,8 @@ const { customInspectSymbol, isError, join, - removeColors + removeColors, + uncurryThis } = require('internal/util'); const { @@ -68,17 +69,6 @@ const assert = require('internal/assert'); // Avoid monkey-patched built-ins. const { Object } = primordials; -const ReflectApply = Reflect.apply; - -// This function is borrowed from the function with the same name on V8 Extras' -// `utils` object. V8 implements Reflect.apply very efficiently in conjunction -// with the spread syntax, such that no additional special case is needed for -// function calls w/o arguments. -// Refs: https://github.com/v8/v8/blob/d6ead37d265d7215cf9c5f768f279e21bd170212/src/js/prologue.js#L152-L156 -function uncurryThis(func) { - return (thisArg, ...args) => ReflectApply(func, thisArg, args); -} - const propertyIsEnumerable = uncurryThis(Object.prototype.propertyIsEnumerable); const regExpToString = uncurryThis(RegExp.prototype.toString); const dateToISOString = uncurryThis(Date.prototype.toISOString); diff --git a/lib/internal/util/types.js b/lib/internal/util/types.js index 865818c661b78d..f41d11443f2bb5 100644 --- a/lib/internal/util/types.js +++ b/lib/internal/util/types.js @@ -1,15 +1,6 @@ 'use strict'; -const ReflectApply = Reflect.apply; - -// This function is borrowed from the function with the same name on V8 Extras' -// `utils` object. V8 implements Reflect.apply very efficiently in conjunction -// with the spread syntax, such that no additional special case is needed for -// function calls w/o arguments. -// Refs: https://github.com/v8/v8/blob/d6ead37d265d7215cf9c5f768f279e21bd170212/src/js/prologue.js#L152-L156 -function uncurryThis(func) { - return (thisArg, ...args) => ReflectApply(func, thisArg, args); -} +const { uncurryThis } = require('internal/util'); const TypedArrayPrototype = Object.getPrototypeOf(Uint8Array.prototype); diff --git a/lib/util.js b/lib/util.js index 8c4c0cb098c990..d087c740b04d8b 100644 --- a/lib/util.js +++ b/lib/util.js @@ -42,13 +42,9 @@ const { deprecate, getSystemErrorName: internalErrorName, promisify, + uncurryThis } = require('internal/util'); -const ReflectApply = Reflect.apply; - -function uncurryThis(func) { - return (thisArg, ...args) => ReflectApply(func, thisArg, args); -} const objectToString = uncurryThis(Object.prototype.toString); let internalDeepEqual;