@deterministic-code/datasources 0.1.6 → 0.1.10

package/dist/DriverLoader.js

@@ -1,16 +1,34 @@
 import { readFileSync } from "node:fs";
 import { createRequire, registerHooks } from "node:module";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { ProviderNotInstalledError } from "./ProviderNotInstalledError.js";
 const require = createRequire(import.meta.url);
-const appRequire = () => createRequire(join(process.cwd(), "package.json"));
+const requirers = () => [
+    createRequire(join(process.cwd(), "package.json")),
+    ...(process.argv[1] ? [createRequire(process.argv[1])] : []),
+    require,
+];
+const missingModule = (error) => error instanceof Error &&
+    "code" in error &&
+    (error.code === "MODULE_NOT_FOUND" ||
+        error.code === "ERR_MODULE_NOT_FOUND" ||
+        error.code === "ERR_PACKAGE_PATH_NOT_EXPORTED");
 const virtual = new Map();
 const virtualBySource = new Map();
 let typeScriptHook = false;
 let compiling = false;
+let compilingRoot = "";
 let nextVirtual = 0;
+/* v8 ignore start */
+const underRoot = (url) => {
+    if (!url.startsWith("file:"))
+        return false;
+    const path = fileURLToPath(url);
+    return path === compilingRoot || path.startsWith(`${compilingRoot}/`);
+};
+/* v8 ignore stop */
 const installTypeScriptHook = () => {
     if (typeScriptHook)
         return;
@@ -21,7 +39,7 @@ const installTypeScriptHook = () => {
             const parentURL = context.parentURL ? virtual.get(context.parentURL) ?? context.parentURL : undefined;
             const resolved = nextResolve(specifier, parentURL ? { ...context, parentURL } : context);
             /* v8 ignore next */
-            if (!compiling || !resolved.url.endsWith(".ts"))
+            if (!compiling || !resolved.url.endsWith(".ts") || !underRoot(resolved.url))
                 return resolved;
             const existing = virtualBySource.get(resolved.url);
             /* v8 ignore next */
@@ -33,7 +51,7 @@ const installTypeScriptHook = () => {
             return { url, shortCircuit: true };
         },
         load: (url, context, nextLoad) => {
-            const original = virtual.get(url) ?? (compiling && url.endsWith(".ts") ? url : undefined);
+            const original = virtual.get(url) ?? (compiling && url.endsWith(".ts") && underRoot(url) ? url : undefined);
             /* v8 ignore next */
             if (!original)
                 return nextLoad(url, context);
@@ -58,14 +76,27 @@ const instantiate = (catalog) => {
     }
     finally {
         compiling = false;
+        compilingRoot = "";
     }
 };
 const instantiateLoaded = (catalog) => {
-    const loaded = appRequire()(catalog.location);
-    const Type = loaded[catalog.module];
-    if (typeof Type !== "function")
-        throw new ProviderNotInstalledError(catalog.name);
-    return new Type();
+    let last;
+    for (const req of requirers()) {
+        try {
+            compilingRoot = dirname(req.resolve(catalog.location));
+            const loaded = req(catalog.location);
+            const Type = loaded[catalog.module];
+            if (typeof Type !== "function")
+                throw new ProviderNotInstalledError(catalog.name);
+            return new Type();
+        }
+        catch (error) {
+            last = error;
+            if (error instanceof ProviderNotInstalledError || !missingModule(error))
+                throw error;
+        }
+    }
+    throw last instanceof ProviderNotInstalledError ? last : new ProviderNotInstalledError(catalog.name);
 };
 export class DriverLoader {
     static load = (catalog) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deterministic-code/datasources",
-  "version": "0.1.6",
+  "version": "0.1.10",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",