lib: do not register DOMException in a module

joyeecheung · joyeecheung · commit 976065d9cb88 · 2018-12-01T07:01:51.000+08:00
Instead of registering it in a global scope of a native module and expecting that it only gets evaluated when the module is actually compiled and run and will not be evaluated because the module can be cached, directly register the DOMException constructor onto Environment during bootstrap for clarity, since this is a side effect that has to happen during bootstrap. PR-URL: #24708 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
@@ -566,7 +566,9 @@
 
   function setupDOMException() {
     // Registers the constructor with C++.
-    NativeModule.require('internal/domexception');
+    const DOMException = NativeModule.require('internal/domexception');
+    const { registerDOMException } = internalBinding('messaging');
+    registerDOMException(DOMException);
   }
 
   function setupInspector(originalConsole, wrappedConsole) {
diff --git a/lib/internal/domexception.js b/lib/internal/domexception.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { registerDOMException } = internalBinding('messaging');
 const { ERR_INVALID_THIS } = require('internal/errors').codes;
 
 const internalsMap = new WeakMap();
@@ -85,5 +84,3 @@ for (const [name, codeName, value] of [
 }
 
 module.exports = DOMException;
-
-registerDOMException(DOMException);

Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,9 @@`
`566`	`566`
`567`	`567`	`function setupDOMException() {`
`568`	`568`	`// Registers the constructor with C++.`
`569`		`- NativeModule.require('internal/domexception');`
	`569`	`+ const DOMException = NativeModule.require('internal/domexception');`
	`570`	`+ const { registerDOMException } = internalBinding('messaging');`
	`571`	`+ registerDOMException(DOMException);`
`570`	`572`	`}`
`571`	`573`
`572`	`574`	`function setupInspector(originalConsole, wrappedConsole) {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`'use strict';`
`2`	`2`
`3`		`-const { registerDOMException } = internalBinding('messaging');`
`4`	`3`	`const { ERR_INVALID_THIS } = require('internal/errors').codes;`
`5`	`4`
`6`	`5`	`const internalsMap = new WeakMap();`
`@@ -85,5 +84,3 @@ for (const [name, codeName, value] of [`
`85`	`84`	`}`
`86`	`85`
`87`	`86`	`module.exports = DOMException;`
`88`		`-`
`89`		`-registerDOMException(DOMException);`