@cspell/dynamic-import 7.1.1 → 7.3.0

package/dist/esm/dynamicImport.d.mts

@@ -5,4 +5,11 @@
  * @returns the loaded module.
  */
 export declare function dynamicImportFrom<Module>(moduleName: string | URL, paths: string | URL | (string | URL)[] | undefined): Promise<Module>;
+/**
+ * Use Import.meta.resolve logic to try and determine possible locations for a module.
+ * @param moduleName - name of module, relative path, or absolute path.
+ * @param paths - Places to start resolving from.
+ * @returns location of module
+ */
+export declare function importResolveModuleName(moduleName: string | URL, paths: (string | URL)[]): URL;
 //# sourceMappingURL=dynamicImport.d.mts.map

package/dist/esm/dynamicImport.mjs

@@ -1,3 +1,4 @@
+import { resolve } from 'import-meta-resolve';
 import { sep as pathSep } from 'path';
 import { pathToFileURL } from 'url';
 const isWindowsPath = /^[a-z]:\\/i;
@@ -9,33 +10,38 @@ const isWindowsPath = /^[a-z]:\\/i;
  */
 export async function dynamicImportFrom(moduleName, paths) {
     paths = Array.isArray(paths) ? paths : paths ? [paths] : undefined;
-    const modulesNameToImport = typeof moduleName === 'string' && isWindowsPath.test(moduleName) ? pathToFileURL(moduleName) : moduleName;
+    const modulesNameToImport = normalizeModuleName(moduleName);
     if (!paths || !paths.length || typeof moduleName !== 'string') {
         try {
             return await import(modulesNameToImport.toString());
         }
         catch (e) {
-            // console.log('%o', e);
+            // console.warn('Error %o', e);
             const err = toError(e);
             // err.code = err.code || 'ERR_MODULE_NOT_FOUND';
             throw err;
         }
     }
-    const importResolveModule = await import('import-meta-resolve');
-    const { resolve } = importResolveModule;
+    const location = importResolveModuleName(moduleName, paths);
+    return await import(location.toString());
+}
+/**
+ * Use Import.meta.resolve logic to try and determine possible locations for a module.
+ * @param moduleName - name of module, relative path, or absolute path.
+ * @param paths - Places to start resolving from.
+ * @returns location of module
+ */
+export function importResolveModuleName(moduleName, paths) {
+    const modulesNameToImport = normalizeModuleName(moduleName);
     let lastError = undefined;
     for (const parent of paths) {
-        const url = typeof parent === 'string'
-            ? parent.startsWith('file://')
-                ? new URL(parent)
-                : pathToFileURL(parent + pathSep)
-            : parent;
-        let resolved = '';
-        let location = '';
         try {
-            resolved = resolve(modulesNameToImport.toString(), url.toString());
-            location = isWindowsPath.test(resolved) ? pathToFileURL(resolved).toString() : resolved;
-            return await import(location);
+            const url = typeof parent === 'string'
+                ? parent.startsWith('file://')
+                    ? new URL(parent)
+                    : pathToFileURL(parent + pathSep)
+                : parent;
+            return new URL(resolve(modulesNameToImport.toString(), url.toString()));
         }
         catch (err) {
             // console.warn('%o', { moduleName, modulesNameToImport, paths, parentUrl: url, err, resolved, location });
@@ -44,6 +50,9 @@ export async function dynamicImportFrom(moduleName, paths) {
     }
     throw lastError;
 }
+function normalizeModuleName(moduleName) {
+    return typeof moduleName === 'string' && isWindowsPath.test(moduleName) ? pathToFileURL(moduleName) : moduleName;
+}
 function toError(e) {
     if (isError(e))
         return e;

package/dist/esm/index.d.mts

@@ -1,2 +1,2 @@
-export { dynamicImportFrom as dynamicImport } from './dynamicImport.mjs';
+export { dynamicImportFrom as dynamicImport, importResolveModuleName } from './dynamicImport.mjs';
 //# sourceMappingURL=index.d.mts.map

package/dist/esm/index.mjs

@@ -1,2 +1,2 @@
-export { dynamicImportFrom as dynamicImport } from './dynamicImport.mjs';
+export { dynamicImportFrom as dynamicImport, importResolveModuleName } from './dynamicImport.mjs';
 //# sourceMappingURL=index.mjs.map

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "7.1.1",
+  "version": "7.3.0",
   "description": "Dynamic Module Loader",
   "keywords": [
     "module",
@@ -37,7 +37,8 @@
   ],
   "scripts": {
     "build": "tsc -b .",
-    "build:clean": "shx rm -rf dist coverage && pnpm build",
+    "build:clean": "pnpm clean && pnpm build",
+    "clean": "shx rm -rf dist coverage",
     "clean-build": "pnpm build:clean",
     "coverage": "vitest run --coverage",
     "test-watch": "vitest",
@@ -57,5 +58,5 @@
   "dependencies": {
     "import-meta-resolve": "^3.0.0"
   },
-  "gitHead": "2dafa5386c58637614034c7a6d0fa13c03b16e41"
+  "gitHead": "4a16b099b64c5b55645529a4ae79bc32aaf0fc8e"
 }

package/dist/esm/test.cjs.d.mts

@@ -1,3 +0,0 @@
-export declare function test(): Promise<[string, string, string, string, string]>;
-export declare function callDynamicImport<Module>(file: string | URL, paths?: string | URL | (string | URL)[]): Promise<Module>;
-//# sourceMappingURL=test.cjs.d.mts.map

package/dist/esm/test.cjs.mjs

@@ -1,21 +0,0 @@
-import * as path from 'path';
-import { fileURLToPath, pathToFileURL } from 'url';
-import { dynamicImport } from '../cjs/index.js';
-const fixtures = pathToFileURL('./fixtures/');
-async function callHello(file, paths) {
-    // console.log('%o %o', file.toString(), paths?.toString());
-    return (await dynamicImport(file, paths)).sayHello('Bob.');
-}
-export function test() {
-    return Promise.all([
-        callHello(pathToFileURL('./fixtures/hello_world.mjs')),
-        callHello(path.resolve('./fixtures/hello_world.mjs')),
-        callHello('./hello_world.mjs', [fixtures]),
-        callHello('./hello_world.mjs', [fileURLToPath(fixtures)]),
-        callHello(pathToFileURL('./fixtures/hello_world.mjs'), [fileURLToPath(fixtures)]),
-    ]);
-}
-export async function callDynamicImport(file, paths) {
-    return await dynamicImport(file, paths);
-}
-//# sourceMappingURL=test.cjs.mjs.map