@solcreek/cli 0.4.27 → 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/dist/utils/nextjs.d.ts

@@ -45,6 +45,22 @@ export declare function readAdapterCompat(cwd: string): {
  * the Creek adapter handles middleware via typed AdapterOutputs.
  */
 export declare function patchBundledWorker(bundleDir: string, openNextDir: string): void;
+/**
+ * Ensure @prisma/adapter-d1 is resolvable at build time for the zero-change
+ * Prisma-on-D1 swap. adapter-creek aliases `@prisma/adapter-better-sqlite3` to
+ * a PrismaD1-backed shim that imports `@prisma/adapter-d1`; that package is an
+ * OPTIONAL peer of the adapter (not shipped to non-Prisma projects), so it is
+ * lazily installed into .creek only when the project actually uses the
+ * better-sqlite3 Prisma adapter. Installed matching the project's Prisma
+ * version — the adapter packages release in lockstep with @prisma/client, so a
+ * matching driver-adapter interface avoids subtle version skew.
+ *
+ * No-op unless @prisma/adapter-better-sqlite3 is present, or if adapter-d1 is
+ * already resolvable (project dep or a prior .creek install).
+ *
+ * Exported for tests.
+ */
+export declare function ensurePrismaD1(cwd: string): void;
 /**
  * Fix the standalone output path for monorepo builds.
  *

package/dist/utils/nextjs.js

@@ -128,6 +128,7 @@ export function buildNextjs(cwd, isMonorepo, projectName) {
     if (version && semverGte(version, "16.2.3")) {
         const adapterPath = ensureAdapter(cwd);
         if (adapterPath) {
+            ensurePrismaD1(cwd);
             buildWithAdapter(cwd, adapterPath);
             return;
         }
@@ -205,6 +206,10 @@ const OPENNEXT_PKG = "@opennextjs/cloudflare";
 const OPENNEXT_VERSION = "^1.18.0";
 const ADAPTER_PKG = "@solcreek/adapter-creek";
 const ADAPTER_VERSION = "^0.2.2";
+// Zero-change Prisma-on-D1: the adapter's build-time swap targets this
+// adapter and imports @prisma/adapter-d1 (an optional peer it doesn't ship).
+const PRISMA_BSQLITE_PKG = "@prisma/adapter-better-sqlite3";
+const PRISMA_D1_PKG = "@prisma/adapter-d1";
 // Adapter < 0.2.2 resolves its dependencies against paths that don't exist
 // under the .creek lazy install (0.2.0: the cache handler; 0.2.1: the
 // wrangler bin) — npm hoists them to the top of the tree, so the adapter's
@@ -283,6 +288,56 @@ function ensureAdapter(cwd) {
         consola.success(`  ${ADAPTER_PKG} installed`);
     return resolved;
 }
+/**
+ * Ensure @prisma/adapter-d1 is resolvable at build time for the zero-change
+ * Prisma-on-D1 swap. adapter-creek aliases `@prisma/adapter-better-sqlite3` to
+ * a PrismaD1-backed shim that imports `@prisma/adapter-d1`; that package is an
+ * OPTIONAL peer of the adapter (not shipped to non-Prisma projects), so it is
+ * lazily installed into .creek only when the project actually uses the
+ * better-sqlite3 Prisma adapter. Installed matching the project's Prisma
+ * version — the adapter packages release in lockstep with @prisma/client, so a
+ * matching driver-adapter interface avoids subtle version skew.
+ *
+ * No-op unless @prisma/adapter-better-sqlite3 is present, or if adapter-d1 is
+ * already resolvable (project dep or a prior .creek install).
+ *
+ * Exported for tests.
+ */
+export function ensurePrismaD1(cwd) {
+    const projectRequire = createRequire(join(cwd, "noop.js"));
+    try {
+        projectRequire.resolve(PRISMA_BSQLITE_PKG);
+    }
+    catch {
+        return; // Not a Prisma-on-D1 (better-sqlite3 adapter) project.
+    }
+    // createRequire from .creek walks up into the project's node_modules too, so
+    // this single check covers both a prior .creek install and a project dep.
+    const creekDir = join(cwd, CREEK_DIR);
+    try {
+        createRequire(join(creekDir, "noop.js")).resolve(PRISMA_D1_PKG);
+        return; // Already available.
+    }
+    catch {
+        // Fall through to install.
+    }
+    let version = "latest";
+    try {
+        const clientPkg = JSON.parse(readFileSync(projectRequire.resolve("@prisma/client/package.json"), "utf-8"));
+        if (clientPkg.version)
+            version = clientPkg.version;
+    }
+    catch {
+        // No @prisma/client version readable — fall back to latest.
+    }
+    consola.start(`  Installing ${PRISMA_D1_PKG}@${version} (Prisma on D1)...`);
+    if (installCreekDep(creekDir, PRISMA_D1_PKG, version)) {
+        consola.success(`  ${PRISMA_D1_PKG} installed`);
+    }
+    else {
+        consola.warn(`  Could not install ${PRISMA_D1_PKG} — Prisma build may fail`);
+    }
+}
 /**
  * Ensure @opennextjs/cloudflare is available in .creek/node_modules.
  * Returns the path to the opennextjs-cloudflare CLI binary.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solcreek/cli",
-  "version": "0.4.27",
+  "version": "0.4.29",
   "description": "CLI for the Creek deployment platform",
   "type": "module",
   "main": "./dist/index.js",
@@ -44,6 +44,7 @@
     "hono": "^4.7.4",
     "jsdom": "^29.0.1",
     "miniflare": "^4.20260317.3",
+    "msw": "^2.12.14",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
     "typescript": "^5.8.2",