dirsql 0.4.36 → 0.4.37

package/dist/load-extension-entries.d.ts

@@ -0,0 +1,10 @@
+export type Toml = Record<string, any>;
+/** Load a config's `[[dirsql.extension]]` entries with its base directory.
+ *
+ * `null` when the config is missing, unreadable/malformed, or declares no
+ * extension array — the caller leaves such configs to the core.
+ */
+export declare function loadExtensionEntries(configPath: string): {
+    entries: Toml[];
+    base: string;
+} | null;

package/dist/load-extension-entries.js

@@ -0,0 +1,27 @@
+// Read a TOML config's `[[dirsql.extension]]` array off disk.
+import { existsSync, readFileSync } from "node:fs";
+import { dirname, resolve as resolvePath } from "node:path";
+import { parse as parseToml } from "smol-toml";
+/** Load a config's `[[dirsql.extension]]` entries with its base directory.
+ *
+ * `null` when the config is missing, unreadable/malformed, or declares no
+ * extension array — the caller leaves such configs to the core.
+ */
+export function loadExtensionEntries(configPath) {
+    if (!existsSync(configPath)) {
+        return null;
+    }
+    let doc;
+    try {
+        doc = parseToml(readFileSync(configPath, "utf8"));
+    }
+    catch {
+        // Leave a malformed config for the core to report.
+        return null;
+    }
+    const dirsql = (doc.dirsql ?? {});
+    if (!Array.isArray(dirsql.extension)) {
+        return null;
+    }
+    return { entries: dirsql.extension, base: dirname(resolvePath(configPath)) };
+}

package/dist/resolve-config-extensions.d.ts

@@ -1,4 +1,15 @@
 import type { ExtensionSpec } from "./dirsql.js";
+/**
+ * Resolve a TOML config's `[[dirsql.extension]]` entries to literal paths.
+ *
+ * Returns the resolved specs — every entry resolved via
+ * `resolveExtensionPath` against the config file's parent directory — when at
+ * least one entry's `path` is a bare package name. Returns `null` when the
+ * caller should not intervene: the config is missing, malformed, declares no
+ * extensions, or uses only literal paths — leaving the core's own loading
+ * (and error reporting) untouched. Throws if a package name cannot be
+ * resolved.
+ */
 export declare function resolveConfigExtensionSpecs(configPath: string): ExtensionSpec[] | null;
 /**
  * Resolve the `[[dirsql.extension]]` entries of several configs, in order.

package/dist/resolve-config-extensions.js

@@ -7,10 +7,17 @@
 // own config-extension loading so the entries are not loaded twice.
 //
 // Shared by the `DirSQL` constructor (`config` option) and the CLI launcher.
-import { existsSync, readFileSync } from "node:fs";
-import { dirname, resolve as resolvePath } from "node:path";
-import { parse as parseToml } from "smol-toml";
+import { loadExtensionEntries } from "./load-extension-entries.js";
 import { isBareName, resolveExtensionPath } from "./resolve-extension.js";
+function hasBareName(entries) {
+    return entries.some((e) => typeof e.path === "string" && isBareName(e.path));
+}
+function resolveEntries(entries, base) {
+    return entries.map((e) => ({
+        path: resolveExtensionPath(e.path, base, true),
+        entrypoint: typeof e.entrypoint === "string" ? e.entrypoint : undefined,
+    }));
+}
 /**
  * Resolve a TOML config's `[[dirsql.extension]]` entries to literal paths.
  *
@@ -22,38 +29,6 @@ import { isBareName, resolveExtensionPath } from "./resolve-extension.js";
  * (and error reporting) untouched. Throws if a package name cannot be
  * resolved.
  */
-/** Load a config's `[[dirsql.extension]]` entries with its base directory.
- *
- * `null` when the config is missing, unreadable/malformed, or declares no
- * extension array — the caller leaves such configs to the core.
- */
-function loadExtensionEntries(configPath) {
-    if (!existsSync(configPath)) {
-        return null;
-    }
-    let doc;
-    try {
-        doc = parseToml(readFileSync(configPath, "utf8"));
-    }
-    catch {
-        // Leave a malformed config for the core to report.
-        return null;
-    }
-    const dirsql = (doc.dirsql ?? {});
-    if (!Array.isArray(dirsql.extension)) {
-        return null;
-    }
-    return { entries: dirsql.extension, base: dirname(resolvePath(configPath)) };
-}
-function hasBareName(entries) {
-    return entries.some((e) => typeof e.path === "string" && isBareName(e.path));
-}
-function resolveEntries(entries, base) {
-    return entries.map((e) => ({
-        path: resolveExtensionPath(e.path, base, true),
-        entrypoint: typeof e.entrypoint === "string" ? e.entrypoint : undefined,
-    }));
-}
 export function resolveConfigExtensionSpecs(configPath) {
     const loaded = loadExtensionEntries(configPath);
     if (loaded === null || !hasBareName(loaded.entries)) {

package/dist/resolve-extension.d.ts

@@ -1,4 +1,4 @@
-import { type PackageResolver } from "./package-dir.js";
+import type { PackageResolver } from "./package-dir.js";
 /** True when `path` is a bare package name rather than a file path. */
 export declare function isBareName(path: string): boolean;
 /**

package/dist/resolve-extension.js

@@ -11,10 +11,10 @@
 //      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, readdirSync, statSync } from "node:fs";
+import { existsSync, statSync } from "node:fs";
 import { createRequire } from "node:module";
-import { isAbsolute, join, resolve as resolvePath } from "node:path";
-import { packageDir } from "./package-dir.js";
+import { isAbsolute, resolve as resolvePath } from "node:path";
+import { resolvePackage } from "./resolve-package.js";
 // Suffixes that mark a value as "already a file path" (so package resolution is
 // never attempted).
 const LOADABLE_SUFFIXES = [".so", ".dylib", ".dll", ".node"];
@@ -25,16 +25,6 @@ function defaultResolver() {
         paths: (s) => req.resolve.paths(s),
     };
 }
-/** Loadable-file glob suffix(es) for the current platform. */
-function platformSuffixes() {
-    if (process.platform === "darwin") {
-        return [".dylib", ".node"];
-    }
-    if (process.platform === "win32") {
-        return [".dll", ".node"];
-    }
-    return [".so", ".node"];
-}
 /** True when `path` is a bare package name rather than a file path. */
 export function isBareName(path) {
     if (path.includes("/") || path.includes("\\")) {
@@ -42,23 +32,6 @@ export function isBareName(path) {
     }
     return !LOADABLE_SUFFIXES.some((s) => path.endsWith(s));
 }
-/** Glob the platform loadable inside a bare name's package dir. */
-function resolvePackage(name, resolver) {
-    const dir = packageDir(name, resolver);
-    const suffixes = platformSuffixes();
-    const matches = readdirSync(dir, { recursive: true })
-        .filter((entry) => suffixes.some((s) => entry.endsWith(s)))
-        .map((entry) => join(dir, entry))
-        .sort();
-    const desc = suffixes.join(" / ");
-    if (matches.length === 0) {
-        throw new Error(`no loadable extension file (${desc}) found in package '${name}' (searched ${dir})`);
-    }
-    if (matches.length > 1) {
-        throw new Error(`multiple loadable extension files found in package '${name}': ${matches.join(", ")}; disambiguate with a literal path`);
-    }
-    return matches[0];
-}
 /**
  * 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

package/dist/resolve-package.d.ts

@@ -0,0 +1,3 @@
+import { type PackageResolver } from "./package-dir.js";
+/** Glob the platform loadable inside a bare name's package dir. */
+export declare function resolvePackage(name: string, resolver: PackageResolver): string;

package/dist/resolve-package.js

@@ -0,0 +1,31 @@
+// Glob a bare package name's platform loadable out of its installed directory.
+import { readdirSync } from "node:fs";
+import { join } from "node:path";
+import { packageDir } from "./package-dir.js";
+/** Loadable-file glob suffix(es) for the current platform. */
+function platformSuffixes() {
+    if (process.platform === "darwin") {
+        return [".dylib", ".node"];
+    }
+    if (process.platform === "win32") {
+        return [".dll", ".node"];
+    }
+    return [".so", ".node"];
+}
+/** Glob the platform loadable inside a bare name's package dir. */
+export function resolvePackage(name, resolver) {
+    const dir = packageDir(name, resolver);
+    const suffixes = platformSuffixes();
+    const matches = readdirSync(dir, { recursive: true })
+        .filter((entry) => suffixes.some((s) => entry.endsWith(s)))
+        .map((entry) => join(dir, entry))
+        .sort();
+    const desc = suffixes.join(" / ");
+    if (matches.length === 0) {
+        throw new Error(`no loadable extension file (${desc}) found in package '${name}' (searched ${dir})`);
+    }
+    if (matches.length > 1) {
+        throw new Error(`multiple loadable extension files found in package '${name}': ${matches.join(", ")}; disambiguate with a literal path`);
+    }
+    return matches[0];
+}

package/package.json

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