loader: remove alternative format mapping

Author: efekrskl

lib/internal/modules/esm/get_format.js

@@ -78,25 +78,6 @@ const protocolHandlers = {
   'node:'() { return 'builtin'; },
 };
 
-function getFormatFromImportAttributes(importAttributes) {
-  if (
-    !importAttributes ||
-    !ObjectPrototypeHasOwnProperty(importAttributes, 'type') ||
-    typeof importAttributes.type !== 'string'
-  ) {
-    return undefined;
-  }
-
-  if (
-    getOptionValue('--experimental-import-text') &&
-    importAttributes.type === 'text'
-  ) {
-    return 'text';
-  }
-
-  return undefined;
-}
-
 /**
  * Determine whether the given ambiguous source contains CommonJS or ES module syntax.
  * @param {string | Buffer | undefined} [source]
@@ -261,11 +242,6 @@ function getFileProtocolModuleFormat(url, context = { __proto__: null }, ignoreE
  * @returns {Promise<string> | string | undefined} only works when enabled
  */
 function defaultGetFormatWithoutErrors(url, context) {
-  const format = getFormatFromImportAttributes(context?.importAttributes);
-  if (format !== undefined) {
-    return format;
-  }
-
   const protocol = url.protocol;
   if (!ObjectPrototypeHasOwnProperty(protocolHandlers, protocol)) {
     return null;
@@ -279,11 +255,6 @@ function defaultGetFormatWithoutErrors(url, context) {
  * @returns {Promise<string> | string | undefined} only works when enabled
  */
 function defaultGetFormat(url, context) {
-  const format = getFormatFromImportAttributes(context?.importAttributes);
-  if (format !== undefined) {
-    return format;
-  }
-
   const protocol = url.protocol;
   if (!ObjectPrototypeHasOwnProperty(protocolHandlers, protocol)) {
     return null;

lib/internal/modules/esm/load.js

@@ -6,6 +6,7 @@ const {
 const {
   kEmptyObject,
 } = require('internal/util');
+const { getOptionValue } = require('internal/options');
 
 const { defaultGetFormat } = require('internal/modules/esm/get_format');
 const { validateAttributes, emitImportAssertionWarning } = require('internal/modules/esm/assert');
@@ -48,6 +49,10 @@ function getSourceSync(url, context) {
   return { __proto__: null, responseURL, source };
 }
 
+function isExperimentalTextImport(importAttributes) {
+  return getOptionValue('--experimental-import-text') &&
+    importAttributes?.type === 'text';
+}
 
 /**
  * Node.js default load hook.
@@ -90,8 +95,12 @@ function defaultLoad(url, context = kEmptyObject) {
     }
 
     if (format == null) {
+      if (isExperimentalTextImport(importAttributes)) {
+        format = 'text';
+      }
+
       // Now that we have the source for the module, run `defaultGetFormat` to detect its format.
-      format = defaultGetFormat(urlInstance, {
+      format ??= defaultGetFormat(urlInstance, {
         __proto__: context,
         importAttributes,
       });
@@ -157,6 +166,10 @@ function defaultLoadSync(url, context = kEmptyObject) {
       context = { __proto__: context, source };
     }
 
+    if (format == null && isExperimentalTextImport(importAttributes)) {
+      format = 'text';
+    }
+
     // Now that we have the source for the module, run `defaultGetFormat` to detect its format.
     format ??= defaultGetFormat(urlInstance, {
       __proto__: context,

lib/internal/modules/esm/resolve.js

@@ -937,11 +937,13 @@ function throwIfInvalidParentURL(parentURL) {
  * @param {string} specifier - The specifier to resolve.
  * @param {object} [context] - The context object containing the parent URL and conditions.
  * @param {string} [context.parentURL] - The URL of the parent module.
+ * @param {object} [context.importAttributes] - The import attributes for resolving the specifier.
  * @param {string[]} [context.conditions] - The conditions for resolving the specifier.
  * @returns {{url: string, format?: string}}
  */
 function defaultResolve(specifier, context = {}) {
   let { parentURL, conditions } = context;
+  const { importAttributes } = context;
   throwIfInvalidParentURL(parentURL);
 
   let parsedParentURL;
@@ -1004,12 +1006,18 @@ function defaultResolve(specifier, context = {}) {
     throw error;
   }
 
+  let format = defaultGetFormatWithoutErrors(url, context);
+  if (getOptionValue('--experimental-import-text') &&
+      importAttributes?.type === 'text') {
+    format = 'text';
+  }
+
   return {
     __proto__: null,
     // Do NOT cast `url` to a string: that will work even when there are real
     // problems, silencing them
     url: url.href,
-    format: defaultGetFormatWithoutErrors(url, context),
+    format,
   };
 }