loader: remove bytes implementation

Author: efekrskl

lib/internal/modules/esm/assert.js

@@ -33,11 +33,13 @@ const formatTypeMap = {
   'wasm': kImplicitTypeAttribute, // It's unclear whether the HTML spec will require an type attribute or not for Wasm; see https://github.com/WebAssembly/esm-integration/issues/42
 };
 
-const experimentalFormatTypeMap = {
-  '__proto__': null,
-  'bytes': 'bytes',
-  'text': 'text',
-};
+function getFormatType(format) {
+  if (format === 'text' && getOptionValue('--experimental-import-text')) {
+    return 'text';
+  }
+
+  return formatTypeMap[format];
+}
 
 /**
  * The HTML spec disallows the default type to be explicitly specified
@@ -49,18 +51,6 @@ const supportedTypeAttributes = ArrayPrototypeFilter(
   ObjectValues(formatTypeMap),
   (type) => type !== kImplicitTypeAttribute);
 
-function getExperimentalFormatType(format) {
-  const type = experimentalFormatTypeMap[format];
-  if (type === undefined) {
-    return undefined;
-  }
-  if (!getOptionValue('--experimental-raw-imports')) {
-    return undefined;
-  }
-  return type;
-}
-
-
 /**
  * Test a module's import attributes.
  * @param {string} url The URL of the imported module, for error reporting.
@@ -78,7 +68,7 @@ function validateAttributes(url, format,
       throw new ERR_IMPORT_ATTRIBUTE_UNSUPPORTED(keys[i], importAttributes[keys[i]], url);
     }
   }
-  const validType = formatTypeMap[format] ?? getExperimentalFormatType(format);
+  const validType = getFormatType(format);
 
   switch (validType) {
     case undefined:
@@ -120,8 +110,7 @@ function handleInvalidType(url, type) {
 
   // `type` might not have been one of the types we understand.
   if (!ArrayPrototypeIncludes(supportedTypeAttributes, type) &&
-      !(ObjectPrototypeHasOwnProperty(experimentalFormatTypeMap, type) &&
-        getOptionValue('--experimental-raw-imports'))) {
+      !(type === 'text' && getOptionValue('--experimental-import-text'))) {
     throw new ERR_IMPORT_ATTRIBUTE_UNSUPPORTED('type', type, url);
   }
 

lib/internal/modules/esm/get_format.js

@@ -80,21 +80,21 @@ const protocolHandlers = {
 
 function getFormatFromImportAttributes(importAttributes) {
   if (
-    !getOptionValue('--experimental-raw-imports') ||
     !importAttributes ||
     !ObjectPrototypeHasOwnProperty(importAttributes, 'type') ||
     typeof importAttributes.type !== 'string'
   ) {
     return undefined;
   }
 
-  switch (importAttributes.type) {
-    case 'text':
-    case 'bytes':
-      return importAttributes.type;
-    default:
-      return undefined;
+  if (
+    getOptionValue('--experimental-import-text') &&
+    importAttributes.type === 'text'
+  ) {
+    return 'text';
   }
+
+  return undefined;
 }
 
 /**

lib/internal/modules/esm/translators.js

@@ -652,13 +652,3 @@ translators.set('text', function textStrategy(url, translateContext) {
     this.setExport('default', source);
   });
 });
-
-// Strategy for loading source as raw bytes.
-translators.set('bytes', function bytesStrategy(url, translateContext) {
-  let { source } = translateContext;
-  assertBufferSource(source, false, 'load');
-  source = new Uint8Array(Buffer.from(source));
-  return new ModuleWrap(url, undefined, ['default'], function() {
-    this.setExport('default', source);
-  });
-});

src/node_options.cc

@@ -632,10 +632,10 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
   AddAlias("--loader", "--experimental-loader");
   AddOption("--experimental-modules", "", NoOp{}, kAllowedInEnvvar);
   AddOption("--experimental-wasm-modules", "", NoOp{}, kAllowedInEnvvar);
-  AddOption("--experimental-raw-imports",
-            "experimental support for raw source imports with import "
+  AddOption("--experimental-import-text",
+            "experimental support for importing source as text with import "
             "attributes",
-            &EnvironmentOptions::experimental_raw_imports,
+            &EnvironmentOptions::experimental_import_text,
             kAllowedInEnvvar);
   AddOption("--experimental-import-meta-resolve",
             "experimental ES Module import.meta.resolve() parentURL support",

src/node_options.h

@@ -134,7 +134,7 @@ class EnvironmentOptions : public Options {
   std::string localstorage_file;
   bool experimental_global_navigator = true;
   bool experimental_global_web_crypto = true;
-  bool experimental_raw_imports = false;
+  bool experimental_import_text = false;
   bool experimental_import_meta_resolve = false;
   std::string input_type;  // Value of --input-type
   bool entry_is_url = false;

test/es-module/test-esm-import-attributes-errors.js

@@ -31,11 +31,6 @@ async function test() {
     { code: 'ERR_IMPORT_ATTRIBUTE_UNSUPPORTED' }
   );
 
-  await assert.rejects(
-    import(jsModuleDataUrl, { with: { type: 'bytes' } }),
-    { code: 'ERR_IMPORT_ATTRIBUTE_UNSUPPORTED' }
-  );
-
   await assert.rejects(
     import(jsModuleDataUrl, { with: { type: 'json', other: 'unsupported' } }),
     { code: 'ERR_IMPORT_ATTRIBUTE_UNSUPPORTED' }

test/es-module/test-esm-import-attributes-errors.mjs

@@ -26,11 +26,6 @@ await assert.rejects(
   { code: 'ERR_IMPORT_ATTRIBUTE_UNSUPPORTED' }
 );
 
-await assert.rejects(
-  import(jsModuleDataUrl, { with: { type: 'bytes' } }),
-  { code: 'ERR_IMPORT_ATTRIBUTE_UNSUPPORTED' }
-);
-
 await assert.rejects(
   import(jsModuleDataUrl, { with: { type: 'json', other: 'unsupported' } }),
   { code: 'ERR_IMPORT_ATTRIBUTE_UNSUPPORTED' }

…tal-raw-imports-attributes-validation.js …esm-import-attributes-validation-text.jstest/es-module/test-esm-import-experimental-raw-imports-attributes-validation.js renamed to test/es-module/test-esm-import-attributes-validation-text.js test/es-module/test-esm-import-experimental-raw-imports-attributes-validation.js renamed to test/es-module/test-esm-import-attributes-validation-text.js

@@ -1,4 +1,4 @@
-// Flags: --expose-internals --experimental-raw-imports
+// Flags: --expose-internals --experimental-import-text
 'use strict';
 require('../common');
 
@@ -8,7 +8,6 @@ const { validateAttributes } = require('internal/modules/esm/assert');
 
 const url = 'test://';
 
-// ... {type = 'text'}
 assert.ok(validateAttributes(url, 'text', { type: 'text' }));
 
 assert.throws(() => validateAttributes(url, 'text', {}), {
@@ -18,14 +17,3 @@ assert.throws(() => validateAttributes(url, 'text', {}), {
 assert.throws(() => validateAttributes(url, 'module', { type: 'text' }), {
   code: 'ERR_IMPORT_ATTRIBUTE_TYPE_INCOMPATIBLE',
 });
-
-// ... {type = 'bytes'}
-assert.ok(validateAttributes(url, 'bytes', { type: 'bytes' }));
-
-assert.throws(() => validateAttributes(url, 'bytes', {}), {
-  code: 'ERR_IMPORT_ATTRIBUTE_MISSING',
-});
-
-assert.throws(() => validateAttributes(url, 'module', { type: 'bytes' }), {
-  code: 'ERR_IMPORT_ATTRIBUTE_TYPE_INCOMPATIBLE',
-});

…rt-experimental-raw-imports-disabled.mjs …module/test-esm-import-text-disabled.mjstest/es-module/test-esm-import-experimental-raw-imports-disabled.mjs renamed to test/es-module/test-esm-import-text-disabled.mjs test/es-module/test-esm-import-experimental-raw-imports-disabled.mjs renamed to test/es-module/test-esm-import-text-disabled.mjs

@@ -10,13 +10,3 @@ await assert.rejects(
   import('data:text/plain,hello%20world', { with: { type: 'text' } }),
   { code: 'ERR_UNKNOWN_MODULE_FORMAT' },
 );
-
-await assert.rejects(
-  import('../fixtures/file-to-read-without-bom.txt', { with: { type: 'bytes' } }),
-  { code: 'ERR_UNKNOWN_FILE_EXTENSION' },
-);
-
-await assert.rejects(
-  import('data:text/plain,hello%20world', { with: { type: 'bytes' } }),
-  { code: 'ERR_UNKNOWN_MODULE_FORMAT' },
-);

…-esm-import-experimental-raw-imports.mjs test/es-module/test-esm-import-text.mjstest/es-module/test-esm-import-experimental-raw-imports.mjs renamed to test/es-module/test-esm-import-text.mjs test/es-module/test-esm-import-experimental-raw-imports.mjs renamed to test/es-module/test-esm-import-text.mjs

@@ -1,51 +1,30 @@
-// Flags: --experimental-raw-imports
+// Flags: --experimental-import-text
 import '../common/index.mjs';
 import assert from 'assert';
-import { Buffer } from 'buffer';
 
 import staticText from '../fixtures/file-to-read-without-bom.txt' with { type: 'text' };
 import staticTextWithBOM from '../fixtures/file-to-read-with-bom.txt' with { type: 'text' };
-import staticBytes from '../fixtures/file-to-read-without-bom.txt' with { type: 'bytes' };
 
 const expectedText = 'abc\ndef\nghi\n';
-const expectedBytes = Buffer.from(expectedText);
 
 assert.strictEqual(staticText, expectedText);
 assert.strictEqual(staticTextWithBOM, expectedText);
 
-assert.ok(staticBytes instanceof Uint8Array);
-assert.deepStrictEqual(Buffer.from(staticBytes), expectedBytes);
-
 const dynamicText = await import('../fixtures/file-to-read-without-bom.txt', {
   with: { type: 'text' },
 });
 assert.strictEqual(dynamicText.default, expectedText);
 
-const dynamicBytes = await import('../fixtures/file-to-read-without-bom.txt', {
-  with: { type: 'bytes' },
-});
-assert.deepStrictEqual(Buffer.from(dynamicBytes.default), expectedBytes);
-
 const dataText = await import('data:text/plain,hello%20world', {
   with: { type: 'text' },
 });
 assert.strictEqual(dataText.default, 'hello world');
 
-const dataBytes = await import('data:text/plain,hello%20world', {
-  with: { type: 'bytes' },
-});
-assert.strictEqual(Buffer.from(dataBytes.default).toString(), 'hello world');
-
 const dataJsAsText = await import('data:text/javascript,export{}', {
   with: { type: 'text' },
 });
 assert.strictEqual(dataJsAsText.default, 'export{}');
 
-const dataJsAsBytes = await import('data:text/javascript,export{}', {
-  with: { type: 'bytes' },
-});
-assert.strictEqual(Buffer.from(dataJsAsBytes.default).toString(), 'export{}');
-
 const dataInvalidUtf8 = await import('data:text/plain,%66%6f%80%6f', {
   with: { type: 'text' },
 });
@@ -56,11 +35,6 @@ const jsAsText = await import('../fixtures/syntax/bad_syntax.js', {
 });
 assert.match(jsAsText.default, /^var foo bar;/);
 
-const jsAsBytes = await import('../fixtures/syntax/bad_syntax.js', {
-  with: { type: 'bytes' },
-});
-assert.match(Buffer.from(jsAsBytes.default).toString(), /^var foo bar;/);
-
 const jsonAsText = await import('../fixtures/invalid.json', {
   with: { type: 'text' },
 });