esm: emit a TypeError when using an unknown import attribute

nodejs-github-bot · Oct 14, 2023 · Oct 11, 2023 · Oct 11, 2023 · Oct 11, 2023 · Oct 11, 2023
commit 97597fb1f112d9c3621f2d46c72aae8d53e082fc
diff --git a/doc/api/errors.md b/doc/api/errors.md
@@ -1786,6 +1786,16 @@ added:
 
 An import attribute is not supported by this version of Node.js.
 
+<a id="ERR_IMPORT_ATTRIBUTE_UNSUPPORTED"></a>
+
+### `ERR_IMPORT_ATTRIBUTE_UNSUPPORTED`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+An import attribute is not supported by this version of Node.js.
+
 <a id="ERR_INCOMPATIBLE_OPTION_PAIR"></a>
 
 ### `ERR_INCOMPATIBLE_OPTION_PAIR`

diff --git a/lib/internal/errors.js b/lib/internal/errors.js
@@ -1286,6 +1286,8 @@ E('ERR_IMPORT_ASSERTION_TYPE_MISSING',
   'Module "%s" needs an import attribute of type "%s"', TypeError);
 E('ERR_IMPORT_ASSERTION_TYPE_UNSUPPORTED',
   'Import attribute type "%s" is unsupported', TypeError);
+E('ERR_IMPORT_ATTRIBUTE_UNSUPPORTED',
+  'Import attribute "%s" with value "%s" is not supported', TypeError);
 E('ERR_INCOMPATIBLE_OPTION_PAIR',
   'Option "%s" cannot be used in combination with option "%s"', TypeError);
 E('ERR_INPUT_TYPE_NOT_ALLOWED', '--input-type can only be used with string ' +

diff --git a/lib/internal/modules/esm/assert.js b/lib/internal/modules/esm/assert.js
@@ -3,6 +3,7 @@
 const {
   ArrayPrototypeFilter,
   ArrayPrototypeIncludes,
+  ObjectKeys,
   ObjectValues,
   ObjectPrototypeHasOwnProperty,
 } = primordials;
@@ -12,6 +13,7 @@ const {
   ERR_IMPORT_ASSERTION_TYPE_FAILED,
   ERR_IMPORT_ASSERTION_TYPE_MISSING,
   ERR_IMPORT_ASSERTION_TYPE_UNSUPPORTED,
+  ERR_IMPORT_ATTRIBUTE_UNSUPPORTED,
 } = require('internal/errors').codes;
 
 // The HTML spec has an implied default type of `'javascript'`.
@@ -53,6 +55,12 @@ const supportedAssertionTypes = ArrayPrototypeFilter(
  */
 function validateAttributes(url, format,
                             importAttributes = { __proto__: null }) {
+  const keys = ObjectKeys(importAttributes);
+  for (let i = 0; i < keys.length; i++) {
+    if (keys[i] !== 'type') {
+      throw new ERR_IMPORT_ATTRIBUTE_UNSUPPORTED(keys[i], importAttributes[keys[i]]);
+    }
+  }
   const validType = formatTypeMap[format];
 
   switch (validType) {

diff --git a/test/es-module/test-esm-import-assertion-2.mjs b/test/es-module/test-esm-import-assertion-2.mjs
diff --git a/test/es-module/test-esm-import-attributes-errors.js b/test/es-module/test-esm-import-attributes-errors.js
@@ -11,6 +11,11 @@ async function test() {
     { code: 'ERR_UNKNOWN_MODULE_FORMAT' }
   );
 
+  await rejects(
+    import('data:text/css,', { with: { unsupportedAttribute: 'value' } }),
+    { code: 'ERR_IMPORT_ATTRIBUTE_UNSUPPORTED' }
+  );
+
   await rejects(
     import(`data:text/javascript,import${JSON.stringify(jsModuleDataUrl)}with{type:"json"}`),
     { code: 'ERR_IMPORT_ASSERTION_TYPE_FAILED' }

diff --git a/test/es-module/test-esm-import-attributes-validation.js b/test/es-module/test-esm-import-attributes-validation.js
@@ -18,6 +18,14 @@ assert.throws(() => validateAttributes(url, 'json', {}), {
   code: 'ERR_IMPORT_ASSERTION_TYPE_MISSING',
 });
 
+assert.throws(() => validateAttributes(url, 'json', { type: 'json', unsupportedAttribute: 'value' }), {
+  code: 'ERR_IMPORT_ATTRIBUTE_UNSUPPORTED',
+});
+
+assert.throws(() => validateAttributes(url, 'module', { unsupportedAttribute: 'value' }), {
+  code: 'ERR_IMPORT_ATTRIBUTE_UNSUPPORTED',
+});
+
 assert.throws(() => validateAttributes(url, 'module', { type: 'json' }), {
   code: 'ERR_IMPORT_ASSERTION_TYPE_FAILED',
 });