lib: make DOMException in globalThis

Refs: nodejs#39098
XadillaX · Jun 28, 2021 · b3e19fb · b3e19fb
1 parent 2de139b
commit b3e19fb
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 13 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -349,6 +349,7 @@ module.exports = {
     BigInt: 'readable',
     BigInt64Array: 'readable',
     BigUint64Array: 'readable',
+    DOMException: 'readable',
     Event: 'readable',
     EventTarget: 'readable',
     MessageChannel: 'readable',

diff --git a/doc/api/globals.md b/doc/api/globals.md
@@ -380,6 +380,15 @@ added: v0.0.1
 
 [`setTimeout`][] is described in the [timers][] section.
 
+## `DOMException`
+<!-- YAML
+added: REPLACEME
+-->
+
+<!-- type=global -->
+
+The WHATWG `DOMException` class.
+
 ## `TextDecoder`
 <!-- YAML
 added: v11.0.0

diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
@@ -52,7 +52,7 @@ const {
   globalThis,
 } = primordials;
 const config = internalBinding('config');
-const { deprecate } = require('internal/util');
+const { deprecate, lazyDOMExceptionClass } = require('internal/util');
 
 setupProcessObject();
 
@@ -201,6 +201,12 @@ if (!config.noBrowserGlobals) {
   exposeInterface(globalThis, 'URL', URL);
   // https://url.spec.whatwg.org/#urlsearchparams
   exposeInterface(globalThis, 'URLSearchParams', URLSearchParams);
+  exposeGetterAndSetter(globalThis,
+                        'DOMException',
+                        lazyDOMExceptionClass,
+                        (value) => {
+                          exposeInterface(globalThis, 'DOMException', value);
+                        });
 
   const {
     TextEncoder, TextDecoder
@@ -484,6 +490,15 @@ function exposeInterface(target, name, interfaceObject) {
   });
 }
 
+function exposeGetterAndSetter(target, name, getter, setter = undefined) {
+  ObjectDefineProperty(target, name, {
+    enumerable: false,
+    configurable: true,
+    get: getter,
+    set: setter,
+  });
+}
+
 // https://heycam.github.io/webidl/#define-the-operations
 function defineOperation(target, name, method) {
   ObjectDefineProperty(target, name, {

diff --git a/lib/internal/util.js b/lib/internal/util.js
@@ -443,6 +443,12 @@ function createDeferredPromise() {
 }
 
 let DOMException;
+const lazyDOMExceptionClass = () => {
+  if (DOMException === undefined)
+    DOMException = internalBinding('messaging').DOMException;
+  return DOMException;
+};
+
 const lazyDOMException = hideStackFrames((message, name) => {
   if (DOMException === undefined)
     DOMException = internalBinding('messaging').DOMException;
@@ -466,6 +472,7 @@ module.exports = {
   isInsideNodeModules,
   join,
   lazyDOMException,
+  lazyDOMExceptionClass,
   normalizeEncoding,
   once,
   promisify,

diff --git a/test/parallel/test-global-domexception.js b/test/parallel/test-global-domexception.js
@@ -0,0 +1,11 @@
+'use strict';
+
+require('../common');
+
+const assert = require('assert');
+
+assert.strictEqual(typeof DOMException, 'function');
+
+assert.throws(() => {
+  atob('我要抛错！');
+}, DOMException);
diff --git a/test/wpt/test-atob.js b/test/wpt/test-atob.js
@@ -12,8 +12,6 @@ runner.setFlags(['--expose-internals']);
 runner.setInitScript(`
   const { internalBinding } = require('internal/test/binding');
   const { atob, btoa } = require('buffer');
-  const { DOMException } = internalBinding('messaging');
-  global.DOMException = DOMException;
 `);
 
 runner.runJsTests();
diff --git a/test/wpt/test-url.js b/test/wpt/test-url.js
@@ -5,14 +5,4 @@ const { WPTRunner } = require('../common/wpt');
 
 const runner = new WPTRunner('url');
 
-// Needed to access to DOMException.
-runner.setFlags(['--expose-internals']);
-
-// DOMException is needed by urlsearchparams-constructor.any.js
-runner.setInitScript(`
-  const { internalBinding } = require('internal/test/binding');
-  const { DOMException } = internalBinding('messaging');
-  global.DOMException = DOMException;
-`);
-
 runner.runJsTests();