dirsql 0.4.47 → 0.4.48

package/dist/core.d.ts

@@ -36,6 +36,6 @@ export interface CoreModule {
     configPathsFromArgv(argv: string[]): string[];
     planConfigExtensions(configs: ConfigSource[]): ExtensionPlanEntry[] | null;
     selectLoadable(name: string, dirs: string[], candidates: string[]): string;
-    isBareName(path: string): boolean;
+    planExtensionPath(path: string, base: string, resolveRelative: boolean): ExtensionPlanEntry;
 }
 export declare function getCore(): CoreModule;

package/dist/resolve-extension.js

@@ -1,6 +1,8 @@
 // Resolve an extension entry's `path` to a concrete loadable file.
 //
-// Resolution is an ordered probe (file-first, then package):
+// Resolution is an ordered probe (file-first, then package), planned by the
+// core (`planExtensionPath`) and carried out here: only locating an installed
+// package is host-specific.
 //
 //   1. Path-looking (contains a separator, or ends in `.so` / `.dylib` /
 //      `.dll` / `.node`) -> returned as a file path: made absolute against
@@ -8,14 +10,10 @@
 //      verbatim (programmatic entries).
 //   2. Bare package name -> a same-named local file under `base` shadows the
 //      package; otherwise the package dir is located via `require.resolve`
-//      and the current platform's loadable is globbed from inside it. Zero
-//      matches and multiple matches are both hard errors -- disambiguate
-//      with a literal path.
-import { existsSync, statSync } from "node:fs";
-import { isAbsolute, resolve as resolvePath } from "node:path";
+//      and the current platform's loadable is picked from inside it.
 import { getCore } from "./core.js";
 import { defaultResolver } from "./default-resolver.js";
-import { resolvePackage } from "./resolve-package.js";
+import { planEntryPath } from "./plan-entry-path.js";
 /**
  * Resolve an extension `path` to a concrete file. `base` is the directory a
  * relative path and the bare-name shadow probe resolve against (a config file's
@@ -24,15 +22,5 @@ import { resolvePackage } from "./resolve-package.js";
  * when false it is returned verbatim (programmatic semantics).
  */
 export function resolveExtensionPath(path, base, resolveRelative, resolver = defaultResolver()) {
-    if (!getCore().isBareName(path)) {
-        if (resolveRelative && !isAbsolute(path)) {
-            return resolvePath(base, path);
-        }
-        return path;
-    }
-    const local = resolvePath(base, path);
-    if (existsSync(local) && statSync(local).isFile()) {
-        return local;
-    }
-    return resolvePackage(path, resolver);
+    return planEntryPath(getCore().planExtensionPath(path, base, resolveRelative), resolver);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dirsql",
-  "version": "0.4.47",
+  "version": "0.4.48",
   "description": "Ephemeral SQL index over a local directory",
   "license": "MIT",
   "repository": "https://github.com/thekevinscott/dirsql",
@@ -221,10 +221,10 @@
     ]
   },
   "optionalDependencies": {
-    "@dirsql/lib-linux-x64-gnu": "0.4.47",
-    "@dirsql/lib-linux-arm64-gnu": "0.4.47",
-    "@dirsql/lib-darwin-x64": "0.4.47",
-    "@dirsql/lib-darwin-arm64": "0.4.47",
-    "@dirsql/lib-win32-x64-msvc": "0.4.47"
+    "@dirsql/lib-linux-x64-gnu": "0.4.48",
+    "@dirsql/lib-linux-arm64-gnu": "0.4.48",
+    "@dirsql/lib-darwin-x64": "0.4.48",
+    "@dirsql/lib-darwin-arm64": "0.4.48",
+    "@dirsql/lib-win32-x64-msvc": "0.4.48"
   }
 }