@solcreek/cli 0.4.28 → 0.4.29

package/dist/commands/db.js

@@ -163,7 +163,7 @@ const migrateCommand = defineCommand({
         },
         dir: {
             type: "string",
-            description: "Migration directory path. Default: auto-detect drizzle/, drizzle/migrations/, migrations/, sql/",
+            description: "Migration directory path. Default: auto-detect drizzle/, drizzle/migrations/, prisma/migrations/, migrations/, sql/",
             required: false,
         },
         "dry-run": {
@@ -198,7 +198,7 @@ const migrateCommand = defineCommand({
         if (!migrationDir) {
             const msg = args.dir
                 ? `Migration directory not found: ${args.dir}`
-                : "No migration directory found. Looked for: drizzle/, drizzle/migrations/, migrations/, sql/. Use --dir to specify.";
+                : "No migration directory found. Looked for: drizzle/, drizzle/migrations/, prisma/migrations/, migrations/, sql/. Use --dir to specify.";
             if (jsonMode)
                 jsonOutput({ ok: false, error: "no_migration_dir", message: msg }, 1);
             consola.error(msg);

package/dist/commands/migrate.d.ts

@@ -6,8 +6,8 @@
  */
 /**
  * Find the migration directory relative to cwd.
- * Returns the absolute path of the first candidate that exists and
- * contains at least one .sql file, or null if none found.
+ * Returns the absolute path of the first candidate that holds migrations
+ * (flat `.sql` or Prisma's nested `<name>/migration.sql`), or null.
  */
 export declare function detectMigrationDir(cwd: string): string | null;
 export interface MigrationFile {
@@ -17,8 +17,13 @@ export interface MigrationFile {
     path: string;
 }
 /**
- * Read .sql files from a directory, sorted lexicographically.
- * Non-.sql files and empty .sql files are skipped.
+ * Read migrations from a directory in either layout, sorted lexicographically
+ * by name (Drizzle's `NNNN_` prefixes and Prisma's `<timestamp>_` prefixes both
+ * sort chronologically). Empty migrations are skipped.
+ *
+ *  - flat: each `.sql` file is a migration; name = file name (e.g. `0001_init.sql`)
+ *  - nested: each `<name>/migration.sql` is a migration; name = subdir name
+ *    (e.g. `20260614120000_init`) — the identifier Prisma tracks
  */
 export declare function parseMigrationFiles(dir: string): MigrationFile[];
 /**

package/dist/commands/migrate.js

@@ -10,33 +10,49 @@ import { join, resolve } from "node:path";
 const CANDIDATE_DIRS = [
     "drizzle",
     "drizzle/migrations",
+    "prisma/migrations",
     "migrations",
     "sql",
 ];
+/**
+ * Whether a directory holds migrations in either supported layout:
+ *  - flat: `.sql` files directly in the dir (Drizzle `drizzle-kit generate`,
+ *    plain SQL dirs)
+ *  - nested: `<name>/migration.sql` per migration (Prisma `prisma migrate`)
+ */
+function hasMigrations(dir) {
+    let entries;
+    try {
+        entries = readdirSync(dir);
+    }
+    catch {
+        return false; // Permission error or not a directory.
+    }
+    if (entries.some((f) => f.endsWith(".sql")))
+        return true;
+    return entries.some((f) => existsSync(join(dir, f, "migration.sql")));
+}
 /**
  * Find the migration directory relative to cwd.
- * Returns the absolute path of the first candidate that exists and
- * contains at least one .sql file, or null if none found.
+ * Returns the absolute path of the first candidate that holds migrations
+ * (flat `.sql` or Prisma's nested `<name>/migration.sql`), or null.
  */
 export function detectMigrationDir(cwd) {
     for (const dir of CANDIDATE_DIRS) {
         const abs = resolve(cwd, dir);
-        if (existsSync(abs)) {
-            try {
-                const files = readdirSync(abs);
-                if (files.some((f) => f.endsWith(".sql")))
-                    return abs;
-            }
-            catch {
-                // Permission error or not a directory — skip
-            }
-        }
+        if (existsSync(abs) && hasMigrations(abs))
+            return abs;
     }
     return null;
 }
 /**
- * Read .sql files from a directory, sorted lexicographically.
- * Non-.sql files and empty .sql files are skipped.
+ * Read migrations from a directory in either layout, sorted lexicographically
+ * by name (Drizzle's `NNNN_` prefixes and Prisma's `<timestamp>_` prefixes both
+ * sort chronologically). Empty migrations are skipped.
+ *
+ *  - flat: each `.sql` file is a migration; name = file name (e.g. `0001_init.sql`)
+ *  - nested: each `<name>/migration.sql` is a migration; name = subdir name
+ *    (e.g. `20260614120000_init`) — the identifier Prisma tracks
  */
 export function parseMigrationFiles(dir) {
     let entries;
@@ -46,10 +62,19 @@ export function parseMigrationFiles(dir) {
     catch {
         return [];
     }
-    return entries
-        .filter((f) => f.endsWith(".sql"))
-        .sort()
-        .map((name) => ({ name, path: join(dir, name) }))
+    const files = [];
+    for (const name of entries) {
+        if (name.endsWith(".sql")) {
+            files.push({ name, path: join(dir, name) });
+            continue;
+        }
+        // Prisma nests each migration as `<name>/migration.sql`.
+        const nested = join(dir, name, "migration.sql");
+        if (existsSync(nested))
+            files.push({ name, path: nested });
+    }
+    return files
+        .sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0))
         .filter((f) => {
         try {
             const content = readFileSync(f.path, "utf-8").trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solcreek/cli",
-  "version": "0.4.28",
+  "version": "0.4.29",
   "description": "CLI for the Creek deployment platform",
   "type": "module",
   "main": "./dist/index.js",