fix: guarantee that option is not already set on load error

tada5hi · Nov 30, 2022 · b1736dd · b1736dd
1 parent d7b31ef
commit b1736dd
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/src/loader/file-type/script/async.ts b/src/loader/file-type/script/async.ts
@@ -39,14 +39,26 @@ export async function loadScriptFile(
             isObject(e) &&
             hasOwnProperty(e, 'code')
         ) {
-            if (e.code === 'ERR_MODULE_NOT_FOUND' || e.code === 'MODULE_NOT_FOUND') {
+            if (
+                !options.withExtension &&
+                (
+                    e.code === 'ERR_MODULE_NOT_FOUND' ||
+                    e.code === 'MODULE_NOT_FOUND'
+                )
+            ) {
                 return loadScriptFile(locatorInfo, {
                     ...options,
                     withExtension: true,
                 });
             }
 
-            if (e.code === 'ERR_UNSUPPORTED_ESM_URL_SCHEME' || e.code === 'UNSUPPORTED_ESM_URL_SCHEME') {
+            if (
+                !options.withFilePrefix &&
+                (
+                    e.code === 'ERR_UNSUPPORTED_ESM_URL_SCHEME' ||
+                    e.code === 'UNSUPPORTED_ESM_URL_SCHEME'
+                )
+            ) {
                 return loadScriptFile(locatorInfo, {
                     ...options,
                     withFilePrefix: true,

diff --git a/src/loader/file-type/script/sync.ts b/src/loader/file-type/script/sync.ts
@@ -36,7 +36,13 @@ export function loadScriptFileSync(
             isObject(e) &&
             hasOwnProperty(e, 'code')
         ) {
-            if (e.code === 'ERR_MODULE_NOT_FOUND' || e.code === 'MODULE_NOT_FOUND') {
+            if (
+                !options.withExtension &&
+                (
+                    e.code === 'ERR_MODULE_NOT_FOUND' ||
+                    e.code === 'MODULE_NOT_FOUND'
+                )
+            ) {
                 return loadScriptFileSync(locatorInfo, {
                     ...options,
                     withExtension: true,

diff --git a/test/unit/loader.spec.ts b/test/unit/loader.spec.ts
@@ -8,13 +8,16 @@
 
 import path from "path";
 import {
-    buildLoaderFilePath, loadScriptFile,
+    buildLoaderFilePath,
+    loadFile,
+    loadFileSync,
+    loadScriptFile,
     loadScriptFileExport,
-    loadScriptFileExportSync, loadScriptFileSync,
+    loadScriptFileExportSync,
+    loadScriptFileSync,
     locateFile,
     locateFileSync
 } from "../../src";
-import {loadFile, loadFileSync} from "../../src";
 
 const basePath = path.join(__dirname, '..', 'data');
 
@@ -120,5 +123,11 @@ describe('src/loader/**', () => {
         locatorInfo = locateFileSync( 'file.foo', {path: [basePath]});
         loaderContent = loadFileSync(locatorInfo);
         expect(loaderContent).toBeUndefined();
+
+        loaderContent = await loadFile('file.foo');
+        expect(loaderContent).toBeUndefined();
+
+        loaderContent = loadFileSync('file.foo');
+        expect(loaderContent).toBeUndefined();
     });
 });