@cspell/dynamic-import 6.26.3 → 6.28.0

package/dist/cjs/index.d.ts

@@ -0,0 +1,2 @@
+export declare function dynamicImport<Module>(moduleName: string | URL, paths: string | URL | (string | URL)[] | undefined): Promise<Module>;
+//# sourceMappingURL=index.d.ts.map

package/dist/cjs/index.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dynamicImport = void 0;
+async function dynamicImport(moduleName, paths) {
+    const { dynamicImportFrom } = await import('../esm/dynamicImport.mjs');
+    return dynamicImportFrom(moduleName, paths);
+}
+exports.dynamicImport = dynamicImport;
+//# sourceMappingURL=index.js.map

package/dist/esm/dynamicImport.d.mts

@@ -0,0 +1,8 @@
+/**
+ * Dynamically import a module using `import`.
+ * @param moduleName - name of module, or relative path.
+ * @param paths - search paths
+ * @returns the loaded module.
+ */
+export declare function dynamicImportFrom<Module>(moduleName: string | URL, paths: string | URL | (string | URL)[] | undefined): Promise<Module>;
+//# sourceMappingURL=dynamicImport.d.mts.map

package/dist/esm/dynamicImport.mjs

@@ -0,0 +1,49 @@
+import { sep as pathSep } from 'path';
+import { pathToFileURL } from 'url';
+/**
+ * Dynamically import a module using `import`.
+ * @param moduleName - name of module, or relative path.
+ * @param paths - search paths
+ * @returns the loaded module.
+ */
+export async function dynamicImportFrom(moduleName, paths) {
+    paths = Array.isArray(paths) ? paths : paths ? [paths] : undefined;
+    if (!paths || !paths.length || typeof moduleName !== 'string') {
+        try {
+            return await import(moduleName.toString());
+        }
+        catch (e) {
+            // console.log('%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;
+    let lastError = undefined;
+    for (const parent of paths) {
+        try {
+            const url = typeof parent === 'string'
+                ? parent.startsWith('file://')
+                    ? new URL(parent)
+                    : pathToFileURL(parent + pathSep)
+                : parent;
+            const location = await resolve(moduleName, url.toString());
+            return await import(location);
+        }
+        catch (err) {
+            lastError = err;
+        }
+    }
+    throw lastError;
+}
+function toError(e) {
+    if (isError(e))
+        return e;
+    return new Error(e?.toString());
+}
+function isError(e) {
+    return e instanceof Error;
+}
+//# sourceMappingURL=dynamicImport.mjs.map

package/{lib/index.js → dist/esm/index.d.mts}

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

package/{lib/index.d.ts → dist/esm/index.mjs}

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

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

@@ -0,0 +1,3 @@
+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

@@ -0,0 +1,21 @@
+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

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "6.26.3",
+  "version": "6.28.0",
   "description": "Dynamic Module Loader",
   "keywords": [
     "module",
@@ -15,13 +15,20 @@
   "author": "Jason Dent <jason@streetsidesoftware.nl>",
   "homepage": "https://github.com/streetsidesoftware/cspell/tree/main/packages/dynamic-import#readme",
   "license": "MIT",
-  "type": "module",
-  "main": "dist/cjs/index.cjs",
-  "module": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "type": "commonjs",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.mjs",
+  "types": "./dist/cjs/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/cjs/index.js",
+      "import": "./dist/esm/index.mjs"
+    }
+  },
   "files": [
     "lib",
     "dist",
+    "!**/*.tsbuildInfo",
     "!**/__mocks__",
     "!**/*.spec.*",
     "!**/*.test.*",
@@ -29,12 +36,15 @@
     "!**/*.map"
   ],
   "scripts": {
-    "build": "pnpm build:cjs",
-    "build:cjs": "rollup -c rollup.config.mjs",
+    "build": "tsc -b .",
+    "build:clean": "shx rm -rf dist coverage && pnpm build",
+    "clean-build": "pnpm build:clean",
+    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
     "coverage:vitest": "vitest run --coverage",
     "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
     "test-watch": "vitest",
-    "test": "vitest run"
+    "test": "vitest run",
+    "watch": "tsc -b . --watch"
   },
   "repository": {
     "type": "git",
@@ -46,15 +56,8 @@
   "engines": {
     "node": ">=14"
   },
-  "devDependencies": {
-    "@rollup/plugin-commonjs": "^24.0.1",
-    "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.1",
-    "rollup": "^3.15.0",
-    "vitest": "^0.28.5"
-  },
   "dependencies": {
     "import-meta-resolve": "^2.2.1"
   },
-  "gitHead": "b8c6e0a31c58ad61b4814f92dccfe3df4999ff81"
+  "gitHead": "1c314413e76908e5fbf61fd2555726112b177c0e"
 }

package/dist/cjs/index.cjs

@@ -1,65 +0,0 @@
-'use strict';
-
-var path = require('path');
-var url = require('url');
-
-/**
- * Thunk Layer for `import` to allow dynamic imports.
- * @param {string} module - name of module to load
- * @returns
- */
-function dImport(module) {
-    return import(module.toString());
-}
-
-/**
- * Lazy load the importer so we can use an ESM packages inside a cjs file.
- */
-
-/**
- * @type {Promise<typeof import('import-meta-resolve')> | undefined}
- */
-let pImportResolve;
-
-/**
- * Dynamically import a module using `import`.
- * @param {string} moduleName - name of module, or relative path.
- * @param {(string | URL)[] | string | URL} paths - search paths
- * @returns the loaded module.
- */
-async function dynamicImportFrom(moduleName, paths) {
-    paths = Array.isArray(paths) ? paths : paths ? [paths] : undefined;
-    if (!paths || !paths.length || typeof moduleName !== 'string') {
-        try {
-            return await dImport(moduleName);
-        } catch (err) {
-            err.code = err.code ?? 'ERR_MODULE_NOT_FOUND';
-            throw err;
-        }
-    }
-
-    const importResolveModule = await (pImportResolve || (pImportResolve = dImport('import-meta-resolve')));
-
-    const { resolve } = importResolveModule;
-
-    let lastError = undefined;
-
-    for (const parent of paths) {
-        try {
-            const url$1 =
-                typeof parent === 'string'
-                    ? parent.startsWith('file://')
-                        ? new URL(parent)
-                        : url.pathToFileURL(parent + path.sep)
-                    : parent;
-            const location = await resolve(moduleName, url$1);
-            return await dImport(location);
-        } catch (err) {
-            lastError = err;
-        }
-    }
-    throw lastError;
-}
-
-exports.dynamicImport = dynamicImportFrom;
-//# sourceMappingURL=index.cjs.map

package/lib/dImport.d.ts

@@ -1,6 +0,0 @@
-/**
- * Thunk Layer for `import` to allow dynamic imports.
- * @param {string} module - name of module to load
- * @returns
- */
-export function dImport(module: string): Promise<any>;

package/lib/dImport.js

@@ -1,8 +0,0 @@
-/**
- * Thunk Layer for `import` to allow dynamic imports.
- * @param {string} module - name of module to load
- * @returns
- */
-export function dImport(module) {
-    return import(module.toString());
-}

package/lib/dynamicImport.d.ts

@@ -1,11 +0,0 @@
-/**
- * Dynamically import a module using `import`.
- * @param moduleName - name of module, or relative path.
- * @param searchPath - absolute search path, URL, or array of paths. Note: Paths must be absolute.
- *    The last path element of the URL will be removed if it does not end in a `/`.
- * @returns Promise resolving to the loaded module.
- */
-export declare function dynamicImportFrom<T>(
-    moduleName: string,
-    searchPath: (string | URL)[] | string | URL
-): Promise<T>;

package/lib/dynamicImport.js

@@ -1,52 +0,0 @@
-import { dImport } from './dImport.js';
-import { sep as pathSep } from 'path';
-import { pathToFileURL } from 'url';
-
-/**
- * Lazy load the importer so we can use an ESM packages inside a cjs file.
- */
-
-/**
- * @type {Promise<typeof import('import-meta-resolve')> | undefined}
- */
-let pImportResolve;
-
-/**
- * Dynamically import a module using `import`.
- * @param {string} moduleName - name of module, or relative path.
- * @param {(string | URL)[] | string | URL} paths - search paths
- * @returns the loaded module.
- */
-export async function dynamicImportFrom(moduleName, paths) {
-    paths = Array.isArray(paths) ? paths : paths ? [paths] : undefined;
-    if (!paths || !paths.length || typeof moduleName !== 'string') {
-        try {
-            return await dImport(moduleName);
-        } catch (err) {
-            err.code = err.code ?? 'ERR_MODULE_NOT_FOUND';
-            throw err;
-        }
-    }
-
-    const importResolveModule = await (pImportResolve || (pImportResolve = dImport('import-meta-resolve')));
-
-    const { resolve } = importResolveModule;
-
-    let lastError = undefined;
-
-    for (const parent of paths) {
-        try {
-            const url =
-                typeof parent === 'string'
-                    ? parent.startsWith('file://')
-                        ? new URL(parent)
-                        : pathToFileURL(parent + pathSep)
-                    : parent;
-            const location = await resolve(moduleName, url);
-            return await dImport(location);
-        } catch (err) {
-            lastError = err;
-        }
-    }
-    throw lastError;
-}