module: improve support of data: URLs

Add support for loading modules using percent-encoded URLs. PR-URL: #37392 Backport-PR-URL: #37859 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Bradley Farias <[email protected]> Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Jan Krems <[email protected]> Reviewed-By: Guy Bedford <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Zijian Liu <[email protected]>
nodejs · Mar 29, 2021 · 7b0ed4b · 7b0ed4b
1 parent 2da24ac
commit 7b0ed4b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/internal/modules/esm/get_source.js b/lib/internal/modules/esm/get_source.js
@@ -1,5 +1,8 @@
 'use strict';
 
+const {
+  decodeURIComponent,
+} = primordials;
 const { getOptionValue } = require('internal/options');
 const manifest = getOptionValue('--experimental-policy') ?
   require('internal/process/policy').manifest :
@@ -28,8 +31,8 @@ async function defaultGetSource(url, { format } = {}, defaultGetSource) {
     if (!match) {
       throw new ERR_INVALID_URL(url);
     }
-    const [ , base64, body ] = match;
-    source = Buffer.from(body, base64 ? 'base64' : 'utf8');
+    const { 1: base64, 2: body } = match;
+    source = Buffer.from(decodeURIComponent(body), base64 ? 'base64' : 'utf8');
   } else {
     throw new ERR_INVALID_URL_SCHEME(['file', 'data']);
   }

diff --git a/test/es-module/test-esm-data-urls.js b/test/es-module/test-esm-data-urls.js
@@ -102,4 +102,9 @@ function createBase64URL(mime, body) {
       assert.strictEqual(e.code, 'ERR_INVALID_RETURN_PROPERTY_VALUE');
     }
   }
+  {
+    const plainESMURL = 'data:text/javascript,export%20default%202';
+    const module = await import(plainESMURL);
+    assert.strictEqual(module.default, 2);
+  }
 })().then(common.mustCall());