spfn 0.2.0-beta.56 → 0.2.0-beta.58

package/README.md

@@ -69,6 +69,9 @@ already exists). See [Scaffold structure](#scaffold-structure) for what lands on
 |--------|-------------|
 | `-y, --yes` | Skip prompts, use defaults |
 
+Generated projects pin `drizzle-orm` and `drizzle-kit` to `1.0.0-rc.4`, matching
+`@spfn/core` and the rest of the published SPFN database packages.
+
 ### `spfn add <package>`
 
 Installs an SPFN ecosystem package and applies its pre-built migrations. The package
@@ -167,7 +170,7 @@ loaded `.env` chain.
 | Subcommand | Description |
 |------------|-------------|
 | `db generate` (`g`) | Generate migrations from schema changes (timestamp-prefixed) |
-| `db push` | Apply schema to DB. Safe by default; destructive changes need confirmation. `--force` applies destructive changes, `--dry-run` previews |
+| `db push` | Diff with Drizzle Kit's current PostgreSQL engine and apply the selected DDL atomically. Destructive changes need confirmation; `--force` applies them, `--dry-run` previews |
 | `db migrate` (`m`) | Run pending migrations. `--with-backup` snapshots first |
 | `db studio` | Open Drizzle Studio. `-p, --port` (auto-finds a free port) |
 | `db check` | Verify the database connection |
@@ -379,8 +382,9 @@ type ships from `spfn` (`@type {import('spfn').SpfnConfig}`).
 - **`spfn start` needs a prior `spfn build`.** It hard-fails without `.spfn/server`,
   `.spfn/prod-server.mjs`, and `.next`.
 - **Destructive DB commands are guarded.** `db drop` double-confirms (and verifies the
-  target); `db push` applies additive changes but withholds destructive ones unless
-  `--force`/confirmed. Prefer `db generate` + `db migrate` for production; `db push` is dev-only.
+  target); `db push` applies the selected statements in one transaction and withholds
+  destructive ones unless `--force`/confirmed. Prefer `db generate` + `db migrate` for
+  production; `db push` is dev-only.
 - **`spfn add` requires a scoped package name** (must contain `/`) and only applies
   migrations when `DATABASE_URL` is set — otherwise it skips with a hint.
 - **Package manager is auto-detected from lockfiles.** If detection is wrong (e.g. mixed

package/dist/index.js

@@ -869,7 +869,7 @@ var init_deployment_config = __esm({
 
 // src/utils/version.ts
 function getCliVersion() {
-  return "0.2.0-beta.56";
+  return "0.2.0-beta.58";
 }
 function getTagFromVersion(version) {
   const match = version.match(/-([a-z]+)\./i);
@@ -896,8 +896,8 @@ async function setupPackageJson(cwd, packageJsonPath, packageJson, packageManage
   const spfnTag = getSpfnTag();
   packageJson.dependencies["@spfn/core"] = spfnTag;
   packageJson.dependencies["@sinclair/typebox"] = "^0.34.0";
-  packageJson.dependencies["drizzle-orm"] = "^0.45.0";
-  packageJson.dependencies["drizzle-typebox"] = "^0.1.0";
+  packageJson.dependencies["drizzle-orm"] = "1.0.0-rc.4";
+  packageJson.dependencies["drizzle-typebox"] = "^0.3.3";
   packageJson.dependencies["postgres"] = "^3.4.0";
   packageJson.dependencies["pg"] = "^8.16.3";
   packageJson.dependencies["spfn"] = spfnTag;
@@ -908,7 +908,7 @@ async function setupPackageJson(cwd, packageJsonPath, packageJson, packageManage
   packageJson.devDependencies["@types/node"] = "^20.11.0";
   packageJson.devDependencies["tsx"] = "^4.20.6";
   packageJson.devDependencies["tsup"] = "^8.5.0";
-  packageJson.devDependencies["drizzle-kit"] = "^0.31.5";
+  packageJson.devDependencies["drizzle-kit"] = "1.0.0-rc.4";
   packageJson.devDependencies["dotenv"] = "^17.2.3";
   if (!packageJson.scripts["build"]) {
     packageJson.scripts["build"] = "next build --turbopack";
@@ -1461,7 +1461,7 @@ async function executeFunctionMigrations(functionMigrations) {
     throw new Error("DATABASE_URL not found in environment");
   }
   const connection = postgres.default(env2.DATABASE_URL, { max: 1 });
-  const db = drizzle(connection);
+  const db = drizzle({ client: connection });
   try {
     await migrateLegacyTable(db, functionMigrations);
     for (const func of functionMigrations) {
@@ -2886,7 +2886,7 @@ async function createPushConnection() {
     max: 1,
     ...shouldRelaxDbTls(env.DATABASE_URL) ? { ssl: { rejectUnauthorized: false } } : {}
   });
-  const db = drizzle(pool);
+  const db = drizzle({ client: pool });
   return {
     db,
     close: () => pool.end()
@@ -3002,6 +3002,32 @@ function displayApplySummary(applied, skipped) {
 }
 
 // src/commands/db/push.ts
+async function resolvePushPlan(imports, db, schemaFilter) {
+  const { pushSchema } = await import("drizzle-kit/api-postgres");
+  const { sqlStatements, hints } = await pushSchema(
+    imports,
+    db,
+    {
+      schemas: schemaFilter,
+      tables: [],
+      entities: void 0,
+      extensions: []
+    }
+  );
+  const pushHints = hints;
+  const hintStatements = pushHints.flatMap((hint) => hint.statement ? [hint.statement] : []);
+  return {
+    statements: [...hintStatements, ...sqlStatements],
+    hints: pushHints
+  };
+}
+async function applyStatements(db, statements) {
+  await db.transaction(async (tx) => {
+    for (const statement of statements) {
+      await tx.execute(sql.raw(statement));
+    }
+  });
+}
 async function dbPush(options = {}) {
   validateDatabasePrerequisites();
   loadEnv3();
@@ -3033,27 +3059,11 @@ async function dbPush(options = {}) {
   const schemaFilter = Array.from(detectedSchemas);
   const { db, close } = await createPushConnection();
   try {
-    const { pushSchema } = await import("drizzle-kit/api");
-    const { statementsToExecute } = await pushSchema(
-      imports,
-      db,
-      schemaFilter
-    );
-    const managedSchemaSet = new Set(schemaFilter);
-    const patched = statementsToExecute.filter((s) => {
-      const dropMatch = s.match(/^\s*DROP\s+SCHEMA\s+"?([^"\s;]+)"?/i);
-      if (dropMatch && managedSchemaSet.has(dropMatch[1])) {
-        console.log(chalk14.dim(`  [skip] DROP SCHEMA "${dropMatch[1]}" \u2014 managed schema, ignoring`));
-        return false;
-      }
-      return true;
-    }).map(
-      (s) => s.replace(/^CREATE SCHEMA(?!\s+IF\s+NOT\s+EXISTS)/i, "CREATE SCHEMA IF NOT EXISTS")
-    );
-    const ensureSchemas = schemaFilter.filter((s) => s !== "public").map((s) => `CREATE SCHEMA IF NOT EXISTS "${s}";
-`);
-    const statements = [...ensureSchemas, ...patched];
-    if (patched.length === 0) {
+    const { statements, hints } = await resolvePushPlan(imports, db, schemaFilter);
+    for (const hint of hints) {
+      console.log(chalk14.yellow(`\u26A0\uFE0F  ${hint.hint}`));
+    }
+    if (statements.length === 0) {
       console.log(chalk14.green("\u2705 No changes detected \u2014 database is up to date\n"));
       await applyFunctionMigrations();
       return;
@@ -3066,25 +3076,14 @@ async function dbPush(options = {}) {
     displayClassifiedStatements(result);
     if (options.force) {
       console.log(chalk14.dim("\n--force: applying all changes..."));
-      for (const stmt of statements) {
-        await db.execute(sql.raw(stmt));
-      }
+      await applyStatements(db, statements);
       displayApplySummary(statements.length, 0);
     } else if (result.destructive.length === 0) {
-      for (const stmt of statements) {
-        await db.execute(sql.raw(stmt));
-      }
+      await applyStatements(db, statements);
       displayApplySummary(statements.length, 0);
     } else {
       const destructiveSet = new Set(result.destructive.map((s) => s.sql));
       const nonDestructive = statements.filter((s) => !destructiveSet.has(s));
-      if (nonDestructive.length > 0) {
-        for (const stmt of nonDestructive) {
-          await db.execute(sql.raw(stmt));
-        }
-        console.log(chalk14.green(`
-\u2705 Applied ${nonDestructive.length} safe statement(s)`));
-      }
       console.log(chalk14.red(`
 \u274C ${result.destructive.length} destructive change(s) require confirmation:`));
       for (const stmt of result.destructive) {
@@ -3098,11 +3097,12 @@ async function dbPush(options = {}) {
         initial: false
       });
       if (confirm) {
-        for (const stmt of result.destructive) {
-          await db.execute(sql.raw(stmt.sql));
-        }
+        await applyStatements(db, statements);
         displayApplySummary(statements.length, 0);
       } else {
+        if (nonDestructive.length > 0) {
+          await applyStatements(db, nonDestructive);
+        }
         displayApplySummary(nonDestructive.length, result.destructive.length);
         console.log(chalk14.dim("Tip: Use --force to apply all changes without prompting.\n"));
       }
@@ -3547,7 +3547,7 @@ async function dbMigrate(options = {}) {
   const projectMigrationsDir = join20(process.cwd(), "src/server/drizzle");
   if (existsSync21(projectMigrationsDir)) {
     const projConn = postgres.default(env4.DATABASE_URL, { max: 1 });
-    const projDb = drizzle(projConn);
+    const projDb = drizzle({ client: projConn });
     try {
       console.log(chalk19.blue("\u{1F4E6} Running project migrations..."));
       await migrate(projDb, {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "spfn",
-  "version": "0.2.0-beta.56",
+  "version": "0.2.0-beta.58",
   "description": "Superfunction CLI - Add SPFN to your Next.js project",
   "type": "module",
   "bin": {
-    "spfn": "./bin/spfn.js"
+    "spfn": "bin/spfn.js"
   },
   "types": "./dist/index.d.ts",
   "files": [
@@ -13,6 +13,7 @@
   ],
   "scripts": {
     "build": "tsup && node scripts/copy-templates.js",
+    "test": "vitest run",
     "prepack": "node -e \"require('fs').copyFileSync('../../LICENSE','LICENSE')\"",
     "dev": "tsup --watch",
     "type-check": "tsc --noEmit",
@@ -40,7 +41,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/spfn/spfn.git",
+    "url": "git+https://github.com/fxylabs/spfn.git",
     "directory": "packages/cli"
   },
   "publishConfig": {
@@ -48,9 +49,9 @@
     "tag": "beta"
   },
   "bugs": {
-    "url": "https://github.com/spfn/spfn/issues"
+    "url": "https://github.com/fxylabs/spfn/issues"
   },
-  "homepage": "https://github.com/spfn/spfn/tree/main/packages/cli#readme",
+  "homepage": "https://github.com/fxylabs/spfn/tree/main/packages/cli#readme",
   "engines": {
     "node": ">=18.18.0"
   },
@@ -68,8 +69,8 @@
     "chokidar": "^4.0.3",
     "commander": "^11.1.0",
     "dotenv": "^17.2.3",
-    "drizzle-kit": "^0.31.6",
-    "drizzle-orm": "^0.45.0",
+    "drizzle-kit": "1.0.0-rc.4",
+    "drizzle-orm": "1.0.0-rc.4",
     "execa": "^8.0.1",
     "fs-extra": "^11.2.0",
     "ora": "^7.0.1",
@@ -83,6 +84,7 @@
     "@napi-rs/keyring": "^1.1.0"
   },
   "devDependencies": {
+    "@electric-sql/pglite": "^0.5.4",
     "@spfn/core": "workspace:*",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^20.11.0",
@@ -90,6 +92,7 @@
     "@types/prompts": "^2.4.9",
     "concurrently": "^9.2.1",
     "tsx": "^4.20.6",
-    "typescript": "^5.3.3"
+    "typescript": "^5.3.3",
+    "vitest": "^4.0.6"
   }
 }