lib: replace Map global by the primordials

PR-URL: #31155 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
nodejs · Jan 6, 2020 · 20ecb5d · 20ecb5d
1 parent f268621
commit 20ecb5d
Show file tree

Hide file tree

Showing 23 changed files with 31 additions and 1 deletion.
diff --git a/lib/.eslintrc.yaml b/lib/.eslintrc.yaml
@@ -19,6 +19,8 @@ rules:
       message: "Use `const { Error } = primordials;` instead of the global."
     - name: JSON
       message: "Use `const { JSON } = primordials;` instead of the global."
+    - name: Map
+      message: "Use `const { Map } = primordials;` instead of the global."
     - name: Math
       message: "Use `const { Math } = primordials;` instead of the global."
     - name: Number

diff --git a/lib/assert.js b/lib/assert.js
@@ -26,6 +26,7 @@ const {
   ObjectIs,
   ObjectKeys,
   ObjectPrototypeIsPrototypeOf,
+  Map,
   RegExpPrototypeTest,
 } = primordials;
 

diff --git a/lib/domain.js b/lib/domain.js
@@ -29,6 +29,7 @@
 const {
   Array,
   Error,
+  Map,
   ObjectDefineProperty,
   ReflectApply,
   Symbol,

diff --git a/lib/fs.js b/lib/fs.js
@@ -25,6 +25,7 @@
 'use strict';
 
 const {
+  Map,
   MathMax,
   NumberIsSafeInteger,
   ObjectCreate,

diff --git a/lib/inspector.js b/lib/inspector.js
@@ -3,6 +3,7 @@
 const {
   JSONParse,
   JSONStringify,
+  Map,
   Symbol,
 } = primordials;
 

diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
@@ -45,11 +45,12 @@
 
 const {
   Error,
-  ReflectGet,
+  Map,
   ObjectCreate,
   ObjectDefineProperty,
   ObjectKeys,
   ObjectPrototypeHasOwnProperty,
+  ReflectGet,
   SafeSet,
 } = primordials;
 

diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const {
+  Map,
   ObjectDefineProperty,
   SafeWeakMap,
 } = primordials;

diff --git a/lib/internal/cluster/child.js b/lib/internal/cluster/child.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const {
+  Map,
   ObjectAssign,
 } = primordials;
 

diff --git a/lib/internal/cluster/master.js b/lib/internal/cluster/master.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const {
+  Map,
   ObjectKeys,
   ObjectValues,
 } = primordials;

diff --git a/lib/internal/cluster/round_robin_handle.js b/lib/internal/cluster/round_robin_handle.js
@@ -2,6 +2,7 @@
 
 const {
   Boolean,
+  Map,
 } = primordials;
 
 const assert = require('internal/assert');

diff --git a/lib/internal/cluster/utils.js b/lib/internal/cluster/utils.js
@@ -1,5 +1,9 @@
 'use strict';
 
+const {
+  Map,
+} = primordials;
+
 module.exports = {
   sendHelper,
   internal

diff --git a/lib/internal/console/constructor.js b/lib/internal/console/constructor.js
@@ -8,6 +8,7 @@ const {
   ArrayIsArray,
   Boolean,
   Error,
+  Map,
   MathFloor,
   Number,
   ObjectDefineProperties,

diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js
@@ -4,6 +4,7 @@
 // https://encoding.spec.whatwg.org
 
 const {
+  Map,
   ObjectCreate,
   ObjectDefineProperties,
   ObjectGetOwnPropertyDescriptors,

diff --git a/lib/internal/errors.js b/lib/internal/errors.js
@@ -13,6 +13,7 @@
 const {
   ArrayIsArray,
   Error,
+  Map,
   MathAbs,
   NumberIsInteger,
   ObjectDefineProperty,

diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
@@ -5,6 +5,7 @@
 const {
   ArrayFrom,
   ArrayIsArray,
+  Map,
   MathMin,
   ObjectAssign,
   ObjectCreate,

diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -25,6 +25,7 @@ const {
   ArrayIsArray,
   Error,
   JSONParse,
+  Map,
   ObjectCreate,
   ObjectDefineProperty,
   ObjectFreeze,

diff --git a/lib/internal/process/signal.js b/lib/internal/process/signal.js
@@ -1,5 +1,9 @@
 'use strict';
 
+const {
+  Map,
+} = primordials;
+
 const {
   errnoException,
 } = require('internal/errors');

diff --git a/lib/internal/source_map/source_map_cache.js b/lib/internal/source_map/source_map_cache.js
@@ -6,6 +6,7 @@ const {
   ObjectKeys,
   ObjectGetOwnPropertyDescriptor,
   ObjectPrototypeHasOwnProperty,
+  Map,
   MapPrototypeEntries,
   WeakMap,
   WeakMapPrototypeGet,

diff --git a/lib/internal/util.js b/lib/internal/util.js
@@ -4,6 +4,7 @@ const {
   ArrayFrom,
   ArrayIsArray,
   Error,
+  Map,
   ObjectCreate,
   ObjectDefineProperties,
   ObjectDefineProperty,

diff --git a/lib/internal/util/comparisons.js b/lib/internal/util/comparisons.js
@@ -6,6 +6,7 @@ const {
   BooleanPrototypeValueOf,
   DatePrototypeGetTime,
   Error,
+  Map,
   NumberIsNaN,
   NumberPrototypeValueOf,
   ObjectGetOwnPropertySymbols,

diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
@@ -10,6 +10,7 @@ const {
   DatePrototypeToString,
   ErrorPrototypeToString,
   JSONStringify,
+  Map,
   MapPrototype,
   MapPrototypeEntries,
   MathFloor,

diff --git a/lib/perf_hooks.js b/lib/perf_hooks.js
@@ -3,6 +3,7 @@
 const {
   ArrayIsArray,
   Boolean,
+  Map,
   NumberIsSafeInteger,
   ObjectDefineProperties,
   ObjectDefineProperty,

diff --git a/lib/v8.js b/lib/v8.js
@@ -23,6 +23,7 @@ const {
   Int16Array,
   Int32Array,
   Int8Array,
+  Map,
   ObjectPrototypeToString,
   Symbol,
   Uint16Array,
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ @@
     const {
       Array,
       Error,
+      Map,
       ObjectDefineProperty,
       ReflectApply,
       Symbol,
@@ Expand Down @@