flint-orm 0.4.3 → 0.4.5

package/dist/migration/types.d.ts

@@ -3,6 +3,7 @@ export interface SerializedColumn {
     name: string;
     sqlType: 'text' | 'integer' | 'real' | 'blob';
     isPrimaryKey: boolean;
+    isAutoIncrement?: boolean;
     isNotNull: boolean;
     isUnique: boolean;
     hasDefault: boolean;

package/dist/src/cli.js

@@ -275,6 +275,9 @@ function diffColumns(tableName, prevCols, currCols) {
     if (prevCol.isPrimaryKey !== currCol.isPrimaryKey) {
       unsafe = true;
     }
+    if ((prevCol.isAutoIncrement ?? false) !== (currCol.isAutoIncrement ?? false)) {
+      unsafe = true;
+    }
     if (prevCol.isNotNull !== currCol.isNotNull) {
       if (prevCol.isNotNull && !currCol.isNotNull) {
         unsafe = true;
@@ -529,6 +532,7 @@ function serializeColumn(col) {
     name: col.name,
     sqlType: internal.sqlType,
     isPrimaryKey: internal.isPrimaryKey,
+    isAutoIncrement: internal.isAutoIncrement ?? false,
     isNotNull: internal.isNotNull,
     isUnique: internal.isUnique,
     hasDefault: internal.hasDefault,
@@ -592,6 +596,8 @@ function columnToDDL(col) {
   const parts = [col.name, sqlType(col)];
   if (col.isPrimaryKey)
     parts.push("PRIMARY KEY");
+  if (col.isAutoIncrement === true)
+    parts.push("AUTOINCREMENT");
   if (col.isNotNull && !col.isPrimaryKey)
     parts.push("NOT NULL");
   if (col.isUnique && !col.isPrimaryKey)
@@ -775,24 +781,7 @@ function serializeOpArg(op) {
   }
 }
 function serializeColumnArg(col) {
-  const obj = {
-    name: col.name,
-    sqlType: col.sqlType,
-    isPrimaryKey: col.isPrimaryKey,
-    isNotNull: col.isNotNull,
-    isUnique: col.isUnique,
-    hasDefault: col.hasDefault,
-    defaultValue: col.defaultValue
-  };
-  if (col.referencesTable && col.referencesColumn) {
-    obj.referencesTable = col.referencesTable;
-    obj.referencesColumn = col.referencesColumn;
-    if (col.onDelete)
-      obj.onDelete = col.onDelete;
-    if (col.onUpdate)
-      obj.onUpdate = col.onUpdate;
-  }
-  return JSON.stringify(obj);
+  return JSON.stringify(col);
 }
 function serializeIndexArg(idx) {
   return `{ name: ${JSON.stringify(idx.name)}, columns: ${JSON.stringify(idx.columns)}, unique: ${idx.unique} }`;
@@ -832,7 +821,7 @@ async function generate(tables, migrationsDir, nameOrOptions) {
   const migrationDir = join(migrationsDir, folderName);
   mkdirSync(migrationDir, { recursive: true });
   const uniqueOps = [...new Set(operations.map((op) => op.type))];
-  const imports = uniqueOps.map((op) => `import { ${op} } from "flint-orm/migration/operations";`).join(`
+  const imports = uniqueOps.map((op) => `import { ${op} } from "flint-orm/migration";`).join(`
 `);
   const operationLines = operations.map((op) => {
     const arg = serializeOpArg(op);
@@ -13666,48 +13655,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) {

package/dist/src/migration/index.js

@@ -57,6 +57,7 @@ function serializeColumn(col) {
     name: col.name,
     sqlType: internal.sqlType,
     isPrimaryKey: internal.isPrimaryKey,
+    isAutoIncrement: internal.isAutoIncrement ?? false,
     isNotNull: internal.isNotNull,
     isUnique: internal.isUnique,
     hasDefault: internal.hasDefault,
@@ -207,6 +208,9 @@ function diffColumns(tableName, prevCols, currCols) {
     if (prevCol.isPrimaryKey !== currCol.isPrimaryKey) {
       unsafe = true;
     }
+    if ((prevCol.isAutoIncrement ?? false) !== (currCol.isAutoIncrement ?? false)) {
+      unsafe = true;
+    }
     if (prevCol.isNotNull !== currCol.isNotNull) {
       if (prevCol.isNotNull && !currCol.isNotNull) {
         unsafe = true;
@@ -463,6 +467,8 @@ function columnToDDL(col) {
   const parts = [col.name, sqlType(col)];
   if (col.isPrimaryKey)
     parts.push("PRIMARY KEY");
+  if (col.isAutoIncrement === true)
+    parts.push("AUTOINCREMENT");
   if (col.isNotNull && !col.isPrimaryKey)
     parts.push("NOT NULL");
   if (col.isUnique && !col.isPrimaryKey)
@@ -646,24 +652,7 @@ function serializeOpArg(op) {
   }
 }
 function serializeColumnArg(col) {
-  const obj = {
-    name: col.name,
-    sqlType: col.sqlType,
-    isPrimaryKey: col.isPrimaryKey,
-    isNotNull: col.isNotNull,
-    isUnique: col.isUnique,
-    hasDefault: col.hasDefault,
-    defaultValue: col.defaultValue
-  };
-  if (col.referencesTable && col.referencesColumn) {
-    obj.referencesTable = col.referencesTable;
-    obj.referencesColumn = col.referencesColumn;
-    if (col.onDelete)
-      obj.onDelete = col.onDelete;
-    if (col.onUpdate)
-      obj.onUpdate = col.onUpdate;
-  }
-  return JSON.stringify(obj);
+  return JSON.stringify(col);
 }
 function serializeIndexArg(idx) {
   return `{ name: ${JSON.stringify(idx.name)}, columns: ${JSON.stringify(idx.columns)}, unique: ${idx.unique} }`;
@@ -703,7 +692,7 @@ async function generate(tables, migrationsDir, nameOrOptions) {
   const migrationDir = join(migrationsDir, folderName);
   mkdirSync(migrationDir, { recursive: true });
   const uniqueOps = [...new Set(operations.map((op) => op.type))];
-  const imports = uniqueOps.map((op) => `import { ${op} } from "flint-orm/migration/operations";`).join(`
+  const imports = uniqueOps.map((op) => `import { ${op} } from "flint-orm/migration";`).join(`
 `);
   const operationLines = operations.map((op) => {
     const arg = serializeOpArg(op);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flint-orm",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "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 }
   }
 }