@wix/zero-config-implementation 1.26.0 → 1.28.0

package/src/module-loader.ts

@@ -1,9 +1,17 @@
 import { createRequire } from 'node:module'
 import { ResultAsync, errAsync, okAsync } from 'neverthrow'
 import type { ComponentType } from 'react'
-import { IoError } from './errors'
 
-type IoErrorInstance = InstanceType<typeof IoError>
+/**
+ * Structured failure from `loadModule` when both ESM import and CJS require fail.
+ * Carries each error separately so callers can report them independently.
+ */
+export interface LoadModuleFailure {
+  /** The ESM import error, or null when no ESM was attempted (e.g. empty path). */
+  esmError: Error | null
+  /** The CJS require error, or a generic error for the empty-path case. */
+  cjsError: Error
+}
 
 /**
  * Attempts to load a module, first via ESM `import()`, then via CJS `require`.
@@ -16,22 +24,24 @@ type IoErrorInstance = InstanceType<typeof IoError>
  *
  * @param entryPath - Absolute path to the module entry point.
  * @returns A `ResultAsync` containing the module exports on success.
- * @errors {IoError} When both ESM import and CJS require fail.
+ * @errors {LoadModuleFailure} When both ESM import and CJS require fail.
  */
-export function loadModule(entryPath: string): ResultAsync<Record<string, unknown>, IoErrorInstance> {
-  return ResultAsync.fromPromise(import(entryPath) as Promise<Record<string, unknown>>, () => null).orElse(() => {
+export function loadModule(entryPath: string): ResultAsync<Record<string, unknown>, LoadModuleFailure> {
+  if (!entryPath) {
+    return errAsync({ esmError: null, cjsError: new Error('No compiled entry path provided') })
+  }
+
+  return ResultAsync.fromPromise(
+    import(entryPath) as Promise<Record<string, unknown>>,
+    (esmErr): Error => (esmErr instanceof Error ? esmErr : new Error(String(esmErr))),
+  ).orElse((esmError) => {
     try {
       const require = createRequire(import.meta.url)
       const exports = require(entryPath)
       return okAsync(exports as Record<string, unknown>)
     } catch (requireErr) {
-      const cause = requireErr instanceof Error ? requireErr : new Error(String(requireErr))
-      return errAsync(
-        new IoError(`Failed to load ${entryPath}: ${cause.message}`, {
-          cause,
-          props: { phase: 'load' },
-        }),
-      )
+      const cjsError = requireErr instanceof Error ? requireErr : new Error(String(requireErr))
+      return errAsync({ esmError, cjsError })
     }
   })
 }