@schemic/cli 0.1.0-alpha.0 → 0.1.0-alpha.1

package/lib/cli.js

@@ -7,7 +7,7 @@ import {
   mkdirSync as mkdirSync3,
   writeFileSync as writeFileSync3
 } from "fs";
-import { dirname as dirname2, join as join2, relative as relative2 } from "path";
+import { dirname as dirname2, join as join3, relative as relative2 } from "path";
 import { createInterface } from "readline/promises";
 import {
   actionLabel,
@@ -423,6 +423,9 @@ async function closeQuietly(conn) {
 }
 
 // src/cli/resolve.ts
+import { createRequire } from "module";
+import { join as join2 } from "path";
+import { pathToFileURL } from "url";
 import {
   driverNames,
   getDriver as getDriver3,
@@ -434,12 +437,18 @@ async function ensureDriver(name) {
   if (driverNames().includes(name)) return;
   const pkg = `@schemic/${name}`;
   try {
-    await import(pkg);
-  } catch (e) {
-    throw new Error(
-      `could not load the "${name}" database driver (package ${pkg}). Install it (e.g. \`bun add ${pkg}\`).
-  ${e instanceof Error ? e.message : String(e)}`
-    );
+    const fromCwd = createRequire(join2(process.cwd(), "noop.js"));
+    await import(pathToFileURL(fromCwd.resolve(pkg)).href);
+  } catch {
+    try {
+      await import(pkg);
+    } catch (e) {
+      throw new Error(
+        `could not load the "${name}" database driver (package ${pkg}). Install it in your project, then re-run:
+    bun add ${pkg}
+  (${e instanceof Error ? e.message : String(e)})`
+      );
+    }
   }
   if (!driverNames().includes(name))
     throw new Error(`package ${pkg} did not register a "${name}" driver.`);
@@ -480,7 +489,9 @@ async function resolveTargets(opts) {
     const picked = key !== void 0 ? list.find((c) => c.key === key) : list.length === 1 ? list[0] : void 0;
     if (!picked) {
       if (key !== void 0)
-        throw new Error(`Connection "${name}" has no element with key "${key}".`);
+        throw new Error(
+          `Connection "${name}" has no element with key "${key}".`
+        );
       throw new Error(
         `Connection "${name}" resolved to ${list.length} connections (a collection); address one with --connection ${name}:<key> or use --all.`
       );
@@ -823,7 +834,7 @@ kindFlags(
             const abs = kind === "table" ? loc.get(name) : void 0;
             return abs ? relative2(config.root, abs) : relative2(
               config.root,
-              join2(
+              join3(
                 config.schemaPath,
                 driver.registry.display(kind).folder,
                 `${name}.ts`
@@ -1262,7 +1273,7 @@ configFlag(
         "`schemic new` needs a schema directory \u2014 your schema is a single file."
       );
     const content = driver.scaffoldEntity(kind, name);
-    const target = join2(
+    const target = join3(
       config.schemaPath,
       driver.registry.display(kind).folder,
       `${name}.ts`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schemic/cli",
-  "version": "0.1.0-alpha.0",
+  "version": "0.1.0-alpha.1",
   "description": "The Schemic CLI — driver-agnostic schema migrations (gen/migrate/diff/push/pull/check).",
   "license": "MIT",
   "author": "Vertio Solutions",

package/src/cli/resolve.ts

@@ -10,6 +10,9 @@
 // connects the sibling on demand (the dependency graph falls out of access; cycles error) and we close
 // anything it opened once resolution settles. The returned configs are connected FRESH by each command.
 
+import { createRequire } from "node:module";
+import { join } from "node:path";
+import { pathToFileURL } from "node:url";
 import {
   type ConnectionEntry,
   type ConnectionOverrides,
@@ -32,12 +35,23 @@ import {
 export async function ensureDriver(name: string): Promise<void> {
   if (driverNames().includes(name)) return;
   const pkg = `@schemic/${name}`;
+  // Resolve the driver from the USER's project (cwd) first, then fall back to the CLI's own location.
+  // The CLI is often run via `bunx`/`npx` from a temp dir, so a plain `import(pkg)` (resolved relative
+  // to the CLI module) would MISS a driver installed in the user's project — resolve from cwd instead.
   try {
-    await import(pkg);
-  } catch (e) {
-    throw new Error(
-      `could not load the "${name}" database driver (package ${pkg}). Install it (e.g. \`bun add ${pkg}\`).\n  ${e instanceof Error ? e.message : String(e)}`,
-    );
+    const fromCwd = createRequire(join(process.cwd(), "noop.js"));
+    await import(pathToFileURL(fromCwd.resolve(pkg)).href);
+  } catch {
+    try {
+      await import(pkg);
+    } catch (e) {
+      throw new Error(
+        `could not load the "${name}" database driver (package ${pkg}). ` +
+          `Install it in your project, then re-run:\n    bun add ${pkg}\n  (${
+            e instanceof Error ? e.message : String(e)
+          })`,
+      );
+    }
   }
   if (!driverNames().includes(name))
     throw new Error(`package ${pkg} did not register a "${name}" driver.`);
@@ -71,9 +85,13 @@ function parseArgs(arg: string[] | undefined): Record<string, string> {
 }
 
 /** Split a `<name>` / `<name>:<key>` address on the FIRST colon. */
-function splitAddress(address: string): [name: string, key: string | undefined] {
+function splitAddress(
+  address: string,
+): [name: string, key: string | undefined] {
   const i = address.indexOf(":");
-  return i < 0 ? [address, undefined] : [address.slice(0, i), address.slice(i + 1)];
+  return i < 0
+    ? [address, undefined]
+    : [address.slice(0, i), address.slice(i + 1)];
 }
 
 /**
@@ -120,7 +138,9 @@ export async function resolveTargets(
           : undefined;
     if (!picked) {
       if (key !== undefined)
-        throw new Error(`Connection "${name}" has no element with key "${key}".`);
+        throw new Error(
+          `Connection "${name}" has no element with key "${key}".`,
+        );
       throw new Error(
         `Connection "${name}" resolved to ${list.length} connections (a collection); address one with --connection ${name}:<key> or use --all.`,
       );