flint-orm 0.4.2 → 0.4.4

package/dist/src/cli.js

@@ -13485,15 +13485,65 @@ var import_picocolors = __toESM(require_picocolors(), 1);
 init_diff();
 async function loadConfig() {
   const configPath = resolve3(process.cwd(), "flint.config.ts");
+  if (!existsSync3(configPath)) {
+    note(`Could not find ${import_picocolors.default.bold("flint.config.ts")} in the current directory.
+
+` + `Create one with:
+
+` + `  ${import_picocolors.default.dim("import { defineConfig } from 'flint-orm/config';")}
+` + `  ${import_picocolors.default.dim("export default defineConfig({")}
+` + `  ${import_picocolors.default.dim("  driver: 'bun-sqlite',")}
+` + `  ${import_picocolors.default.dim("  database: { url: './app.db' },")}
+` + `  ${import_picocolors.default.dim("  schema: './db',")}
+` + `  ${import_picocolors.default.dim("});")}
+`, "Missing config");
+    process.exit(1);
+  }
   const configUrl = pathToFileURL2(configPath).href;
   const mod = await import(configUrl);
-  return mod.default;
+  const config = mod.default;
+  if (!config || typeof config !== "object") {
+    note(`${import_picocolors.default.bold("flint.config.ts")} does not export a config object.
+
+Make sure it has a default export:
+
+  ${import_picocolors.default.dim("export default defineConfig({ ... })")}
+`, "Invalid config");
+    process.exit(1);
+  }
+  const missing = [];
+  if (!config.driver)
+    missing.push("driver");
+  if (!config.database)
+    missing.push("database");
+  if (!config.schema)
+    missing.push("schema");
+  if (missing.length > 0) {
+    note(`${import_picocolors.default.bold("flint.config.ts")} is missing required fields: ${import_picocolors.default.bold(missing.join(", "))}
+
+A valid config looks like:
+
+  ${import_picocolors.default.dim("export default defineConfig({")}
+  ${import_picocolors.default.dim("  driver: 'bun-sqlite',")}
+  ${import_picocolors.default.dim("  database: { url: './app.db' },")}
+  ${import_picocolors.default.dim("  schema: './db',")}
+  ${import_picocolors.default.dim("});")}
+`, "Invalid config");
+    process.exit(1);
+  }
+  return config;
 }
 function isTableDef(value) {
   return value !== null && typeof value === "object" && "_" in value && typeof value._ === "object" && typeof value._.name === "string";
 }
 async function discoverTables(schemaPath) {
   const abs = isAbsolute(schemaPath) ? schemaPath : resolve3(process.cwd(), schemaPath);
+  if (!existsSync3(abs)) {
+    note(`Schema path ${import_picocolors.default.bold(abs)} does not exist.
+
+Check the ${import_picocolors.default.bold("schema")} field in your ${import_picocolors.default.bold("flint.config.ts")}.`, "Schema not found");
+    process.exit(1);
+  }
   const stat = statSync(abs);
   if (stat.isFile()) {
     return importTableFile(abs);
@@ -13501,11 +13551,23 @@ async function discoverTables(schemaPath) {
   if (stat.isDirectory()) {
     return importTableFolder(abs);
   }
-  throw new Error(`Schema path does not exist: ${abs}`);
+  note(`Schema path ${import_picocolors.default.bold(abs)} is not a file or directory.`, "Invalid schema path");
+  process.exit(1);
 }
 async function importTableFile(filePath) {
   const url = pathToFileURL2(filePath).href;
-  const mod = await import(url);
+  let mod;
+  try {
+    mod = await import(url);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    note(`Could not load schema file ${import_picocolors.default.bold(filePath)}:
+
+  ${import_picocolors.default.dim(msg)}
+
+Make sure the file exports table() definitions.`, "Schema import error");
+    process.exit(1);
+  }
   const tables = [];
   for (const exportValue of Object.values(mod)) {
     if (isTableDef(exportValue)) {
@@ -13546,7 +13608,14 @@ async function cmdGenerate(args, config) {
       for (const folder of folders) {
         const statePath = join3(migrationsDir, folder, "state.json");
         if (existsSync3(statePath)) {
-          previousState = JSON.parse(readFileSync4(statePath, "utf-8"));
+          try {
+            previousState = JSON.parse(readFileSync4(statePath, "utf-8"));
+          } catch {
+            note(`Could not parse ${import_picocolors.default.bold(statePath)}.
+
+The file may be corrupted. Delete it and run ${import_picocolors.default.bold("flint generate")} again.`, "Invalid state file");
+            process.exit(1);
+          }
           break;
         }
       }
@@ -13581,7 +13650,11 @@ async function cmdGenerate(args, config) {
     if (err instanceof Error && err.message.includes("No changes detected")) {
       outro("Schema is already up to date.");
     } else {
-      throw err;
+      const msg = err instanceof Error ? err.message : String(err);
+      note(`Migration generation failed:
+
+  ${import_picocolors.default.dim(msg)}`, "Error");
+      process.exit(1);
     }
   }
 }
@@ -13593,48 +13666,74 @@ async function cmdMigrate(args, config) {
   const isLocalDriver = config.driver === "bun-sqlite" || config.driver === "better-sqlite3";
   const dbUrl = isLocalDriver ? resolve3(process.cwd(), config.database.url) : config.database.url;
   let executor;
-  switch (config.driver) {
-    case "bun-sqlite": {
-      const { BunSqliteExecutor: BunSqliteExecutor2 } = await Promise.resolve().then(() => (init_bun_sqlite(), exports_bun_sqlite));
-      const { Database: Database10 } = await import("bun:sqlite");
-      executor = new BunSqliteExecutor2(new Database10(dbUrl));
-      break;
-    }
-    case "better-sqlite3": {
-      const { BetterSqlite3Executor: BetterSqlite3Executor2 } = await Promise.resolve().then(() => (init_better_sqlite3(), exports_better_sqlite3));
-      const Database10 = (await Promise.resolve().then(() => __toESM(require_lib(), 1))).default;
-      executor = new BetterSqlite3Executor2(new Database10(dbUrl));
-      break;
-    }
-    case "libsql": {
-      const { LibsqlExecutor: LibsqlExecutor2 } = await Promise.resolve().then(() => (init_libsql(), exports_libsql));
-      const { createClient: createLibsqlClient } = await Promise.resolve().then(() => (init_node(), exports_node));
-      executor = new LibsqlExecutor2(createLibsqlClient({ url: dbUrl, authToken: config.database.authToken }));
-      break;
-    }
-    case "libsql-web": {
-      const { LibsqlWebExecutor: LibsqlWebExecutor2 } = await Promise.resolve().then(() => (init_libsql_web(), exports_libsql_web));
-      const { createClient: createLibsqlWebClient } = await Promise.resolve().then(() => (init_web2(), exports_web));
-      executor = new LibsqlWebExecutor2(createLibsqlWebClient({ url: dbUrl, authToken: config.database.authToken }));
-      break;
-    }
-    case "turso-sync": {
-      const { TursoSyncExecutor: TursoSyncExecutor2 } = await Promise.resolve().then(() => (init_turso_sync(), exports_turso_sync));
-      const { connect: connect4 } = await Promise.resolve().then(() => (init_promise2(), exports_promise));
-      const db = await connect4({ path: dbUrl, authToken: config.database.authToken });
-      executor = new TursoSyncExecutor2(db);
-      break;
+  const DRIVER_PACKAGES = {
+    "better-sqlite3": "better-sqlite3",
+    libsql: "@libsql/client",
+    "libsql-web": "@libsql/client",
+    turso: "@tursodatabase/database",
+    "turso-sync": "@tursodatabase/sync"
+  };
+  try {
+    switch (config.driver) {
+      case "bun-sqlite": {
+        const { BunSqliteExecutor: BunSqliteExecutor2 } = await Promise.resolve().then(() => (init_bun_sqlite(), exports_bun_sqlite));
+        const { Database: Database10 } = await import("bun:sqlite");
+        executor = new BunSqliteExecutor2(new Database10(dbUrl));
+        break;
+      }
+      case "better-sqlite3": {
+        const { BetterSqlite3Executor: BetterSqlite3Executor2 } = await Promise.resolve().then(() => (init_better_sqlite3(), exports_better_sqlite3));
+        const Database10 = (await Promise.resolve().then(() => __toESM(require_lib(), 1))).default;
+        executor = new BetterSqlite3Executor2(new Database10(dbUrl));
+        break;
+      }
+      case "libsql": {
+        const { LibsqlExecutor: LibsqlExecutor2 } = await Promise.resolve().then(() => (init_libsql(), exports_libsql));
+        const { createClient: createLibsqlClient } = await Promise.resolve().then(() => (init_node(), exports_node));
+        executor = new LibsqlExecutor2(createLibsqlClient({ url: dbUrl, authToken: config.database.authToken }));
+        break;
+      }
+      case "libsql-web": {
+        const { LibsqlWebExecutor: LibsqlWebExecutor2 } = await Promise.resolve().then(() => (init_libsql_web(), exports_libsql_web));
+        const { createClient: createLibsqlWebClient } = await Promise.resolve().then(() => (init_web2(), exports_web));
+        executor = new LibsqlWebExecutor2(createLibsqlWebClient({ url: dbUrl, authToken: config.database.authToken }));
+        break;
+      }
+      case "turso-sync": {
+        const { TursoSyncExecutor: TursoSyncExecutor2 } = await Promise.resolve().then(() => (init_turso_sync(), exports_turso_sync));
+        const { connect: connect4 } = await Promise.resolve().then(() => (init_promise2(), exports_promise));
+        const db = await connect4({ path: dbUrl, authToken: config.database.authToken });
+        executor = new TursoSyncExecutor2(db);
+        break;
+      }
+      case "turso": {
+        const { TursoExecutor: TursoExecutor2 } = await Promise.resolve().then(() => (init_turso(), exports_turso));
+        const { connect: connect4 } = await Promise.resolve().then(() => (init_promise3(), exports_promise2));
+        const db = await connect4(dbUrl);
+        executor = new TursoExecutor2(db);
+        break;
+      }
+      default:
+        cancel(`Unsupported driver: ${config.driver}`);
+        process.exit(1);
     }
-    case "turso": {
-      const { TursoExecutor: TursoExecutor2 } = await Promise.resolve().then(() => (init_turso(), exports_turso));
-      const { connect: connect4 } = await Promise.resolve().then(() => (init_promise3(), exports_promise2));
-      const db = await connect4(dbUrl);
-      executor = new TursoExecutor2(db);
-      break;
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    const pkg = DRIVER_PACKAGES[config.driver];
+    if (pkg && (msg.includes("Cannot find module") || msg.includes("ERR_MODULE_NOT_FOUND") || msg.includes("not found"))) {
+      const installCmd = pkg === "@libsql/client" ? "npm install @libsql/client" : `npm install ${pkg}`;
+      note(`Driver "${config.driver}" is not installed.
+
+Install it with:
+
+  ${import_picocolors.default.dim(installCmd)}
+`, "Missing driver");
+    } else {
+      note(`Failed to load driver "${config.driver}":
+
+  ${import_picocolors.default.dim(msg)}`, "Error");
     }
-    default:
-      cancel(`Unsupported driver: ${config.driver}`);
-      process.exit(1);
+    process.exit(1);
   }
   try {
     if (statusOnly) {
@@ -13738,7 +13837,8 @@ main().catch((err) => {
   if (isCancel(err) || err instanceof CancellationError) {
     cancel("Operation cancelled.");
   } else {
-    cancel(err.message ?? "An error occurred");
+    const msg = err instanceof Error ? err.message : String(err);
+    note(msg || "An unexpected error occurred.", "Error");
   }
   process.exit(1);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flint-orm",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "bin": {
     "flint": "./dist/src/cli.js"
   },
@@ -65,22 +65,31 @@
     "format": "oxfmt --write",
     "check": "oxlint && oxfmt"
   },
-  "dependencies": {
+  "dependencies": {},
+  "devDependencies": {
     "@clack/prompts": "1.7.0",
     "@libsql/client": "0.17.4",
     "@tursodatabase/database": "0.6.1",
     "@tursodatabase/sync": "0.6.1",
-    "better-sqlite3": "12.11.1",
-    "picocolors": "1.1.1"
-  },
-  "devDependencies": {
     "@types/better-sqlite3": "7.6.13",
     "@types/bun": "1.3.14",
     "@types/node": "26.1.1",
+    "better-sqlite3": "12.11.1",
     "oxfmt": "0.57.0",
-    "oxlint": "1.72.0"
+    "oxlint": "1.72.0",
+    "picocolors": "1.1.1"
   },
   "peerDependencies": {
-    "typescript": "7.0.2"
+    "@libsql/client": ">=0.17.4",
+    "@tursodatabase/database": ">=0.6.1",
+    "@tursodatabase/sync": ">=0.6.1",
+    "better-sqlite3": ">=12.11.1",
+    "typescript": ">=5.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@libsql/client": { "optional": true },
+    "@tursodatabase/database": { "optional": true },
+    "@tursodatabase/sync": { "optional": true },
+    "better-sqlite3": { "optional": true }
   }
 }