Split file

src/config/load/resolvers.js

@@ -1,4 +1,4 @@
-import { getPluginPath } from '../plugin/load.js'
+import { getPluginPath } from '../plugin/import.js'
 import { CONFIG_PLUGIN_TYPE } from '../plugin/types.js'
 
 // The `config` can be:

src/config/plugin/import.js

@@ -0,0 +1,74 @@
+import { createRequire } from 'module'
+
+import { PluginError, UserError } from '../../error/main.js'
+import { wrapError } from '../../error/wrap.js'
+import { PLUGINS_IMPORT_BASE } from '../normalize/cwd.js'
+
+import { getModuleId } from './id.js'
+
+// Builtin modules are lazy loaded for performance reasons.
+// The return value is shallow merged to make it a plain object instead of
+// a dynamic `Module` instance.
+export const importPlugin = async function ({
+  id,
+  type,
+  selectProp,
+  modulePrefix,
+  builtins,
+  isCombinationDimension,
+}) {
+  const moduleId = getModuleId(id, type, isCombinationDimension)
+  const builtin = builtins[moduleId]
+
+  if (builtin !== undefined) {
+    return await builtin()
+  }
+
+  const moduleName = `${modulePrefix}${moduleId}`
+  const pluginPath = safeGetPluginPath({
+    moduleName,
+    type,
+    selectProp,
+    base: PLUGINS_IMPORT_BASE,
+  })
+
+  try {
+    return await import(pluginPath)
+  } catch (error) {
+    throw wrapError(
+      error,
+      `Could not load "${type}" module "${moduleId}"\n\n`,
+      PluginError,
+    )
+  }
+}
+
+// Find the local file path of a plugin.
+// We enforce a naming convention for all plugins.
+// All plugins are Node modules.
+// We do not allow npm @scope because:
+//  - This is simpler for users
+//  - This prevent the confusion (which could be malicious) created by the
+//    ambiguity
+// TODO: use import.meta.resolve() when available
+const safeGetPluginPath = function ({ moduleName, type, selectProp, base }) {
+  try {
+    return getPluginPath(moduleName, type, base)
+  } catch (error) {
+    throw wrapError(error, `Configuration property "${selectProp}"`, UserError)
+  }
+}
+
+export const getPluginPath = function (moduleName, type, base) {
+  const { resolve } = createRequire(new URL(base, import.meta.url))
+
+  try {
+    return resolve(moduleName)
+  } catch (error) {
+    throw wrapError(
+      error,
+      `must be a valid package name: "${moduleName}".
+This Node module was not found, please ensure it is installed.\n\n`,
+    )
+  }
+}

src/config/plugin/load.js

@@ -1,11 +1,5 @@
-import { createRequire } from 'module'
-
-import { PluginError, UserError } from '../../error/main.js'
-import { wrapError } from '../../error/wrap.js'
-import { PLUGINS_IMPORT_BASE } from '../normalize/cwd.js'
-
 import { getPluginConfig } from './config.js'
-import { getModuleId } from './id.js'
+import { importPlugin } from './import.js'
 import { normalizePlugin } from './normalize.js'
 
 // Import plugin's code
@@ -65,70 +59,3 @@ const loadPlugin = async function (
   })
   return { ...pluginC, config: pluginConfig }
 }
-
-// Builtin modules are lazy loaded for performance reasons.
-// The return value is shallow merged to make it a plain object instead of
-// a dynamic `Module` instance.
-const importPlugin = async function ({
-  id,
-  type,
-  selectProp,
-  modulePrefix,
-  builtins,
-  isCombinationDimension,
-}) {
-  const moduleId = getModuleId(id, type, isCombinationDimension)
-  const builtin = builtins[moduleId]
-
-  if (builtin !== undefined) {
-    return await builtin()
-  }
-
-  const moduleName = `${modulePrefix}${moduleId}`
-  const pluginPath = safeGetPluginPath({
-    moduleName,
-    type,
-    selectProp,
-    base: PLUGINS_IMPORT_BASE,
-  })
-
-  try {
-    return await import(pluginPath)
-  } catch (error) {
-    throw wrapError(
-      error,
-      `Could not load "${type}" module "${moduleId}"\n\n`,
-      PluginError,
-    )
-  }
-}
-
-// Find the local file path of a plugin.
-// We enforce a naming convention for all plugins.
-// All plugins are Node modules.
-// We do not allow npm @scope because:
-//  - This is simpler for users
-//  - This prevent the confusion (which could be malicious) created by the
-//    ambiguity
-// TODO: use import.meta.resolve() when available
-const safeGetPluginPath = function ({ moduleName, type, selectProp, base }) {
-  try {
-    return getPluginPath(moduleName, type, base)
-  } catch (error) {
-    throw wrapError(error, `Configuration property "${selectProp}"`, UserError)
-  }
-}
-
-export const getPluginPath = function (moduleName, type, base) {
-  const { resolve } = createRequire(new URL(base, import.meta.url))
-
-  try {
-    return resolve(moduleName)
-  } catch (error) {
-    throw wrapError(
-      error,
-      `must be a valid package name: "${moduleName}".
-This Node module was not found, please ensure it is installed.\n\n`,
-    )
-  }
-}