zenstack-kit 0.1.5 → 0.1.8

package/README.md

@@ -79,7 +79,7 @@ The `init` command offers two options:
 ### 4. Generate migrations
 
 ```bash
-zenstack-kit migrate:generate --name add_posts
+zenstack-kit migrate create --name add_posts
 ```
 
 This creates a migration in Prisma format:
@@ -95,7 +95,7 @@ prisma/migrations/
 ### 5. Apply migrations
 
 ```bash
-zenstack-kit migrate:apply
+zenstack-kit migrate apply
 ```
 
 Migrations are tracked in the `_prisma_migrations` table, making them compatible with `prisma migrate deploy`.
@@ -126,12 +126,12 @@ Options:
 - `--create-initial` - Create snapshot and initial migration
 - `-c, --config <path>` - Path to zenstack-kit config file
 
-### `zenstack-kit migrate:generate`
+### `zenstack-kit migrate create`
 
 Generate a new SQL migration from schema changes.
 
 ```bash
-zenstack-kit migrate:generate --name add_users
+zenstack-kit migrate create --name add_users
 ```
 
 Options:
@@ -141,12 +141,12 @@ Options:
 - `--dialect <dialect>` - Database dialect (`sqlite`, `postgres`, `mysql`)
 - `-c, --config <path>` - Path to zenstack-kit config file
 
-### `zenstack-kit migrate:apply`
+### `zenstack-kit migrate apply`
 
 Apply pending migrations to the database.
 
 ```bash
-zenstack-kit migrate:apply
+zenstack-kit migrate apply
 ```
 
 Options:
@@ -156,6 +156,20 @@ Options:
 - `--table <name>` - Migrations table name (default: `_prisma_migrations`)
 - `--db-schema <name>` - Database schema for migrations table (PostgreSQL only, default: `public`)
 - `--preview` - Preview pending migrations without applying
+- `--mark-applied` - Mark pending migrations as applied without running SQL
+- `-c, --config <path>` - Path to zenstack-kit config file
+
+### `zenstack-kit migrate rehash`
+
+Rebuild the migration log checksums from the `migration.sql` files (useful after manual edits).
+
+```bash
+zenstack-kit migrate rehash
+```
+
+Options:
+- `-m, --migrations <path>` - Migrations directory
+- `--migration <name>` - Rehash a single migration folder
 - `-c, --config <path>` - Path to zenstack-kit config file
 
 ### `zenstack-kit pull`
@@ -170,6 +184,7 @@ Options:
 - `-o, --output <path>` - Output path for schema (default: `./schema.zmodel`)
 - `--dialect <dialect>` - Database dialect
 - `--url <url>` - Database connection URL
+- `--preview` - Preview generated schema and diff without writing files
 - `-c, --config <path>` - Path to zenstack-kit config file
 
 Features:

package/dist/cli/app.d.ts

@@ -5,6 +5,7 @@
  * Commands:
  *   migrate create    Generate a new SQL migration
  *   migrate apply     Apply pending migrations
+ *   migrate rehash    Rebuild migration log checksums from migration.sql files
  *   init              Initialize snapshot from existing schema
  *   pull              Introspect database and generate schema
  */

package/dist/cli/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/cli/app.tsx"],"names":[],"mappings":";AAEA;;;;;;;;GAQG;AA0SH,wBAAgB,MAAM,SAkBrB"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/cli/app.tsx"],"names":[],"mappings":";AAEA;;;;;;;;;GASG;AAuTH,wBAAgB,MAAM,SAkBrB"}

package/dist/cli/app.js

@@ -6,17 +6,19 @@ import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-run
  * Commands:
  *   migrate create    Generate a new SQL migration
  *   migrate apply     Apply pending migrations
+ *   migrate rehash    Rebuild migration log checksums from migration.sql files
  *   init              Initialize snapshot from existing schema
  *   pull              Introspect database and generate schema
  */
 import { useState, useEffect } from "react";
 import { render, Box, Text, useApp, useInput } from "ink";
 import SelectInput from "ink-select-input";
-import { runMigrateGenerate, runMigrateApply, runInit, runPull, CommandError, } from "./commands.js";
+import { runMigrateGenerate, runMigrateApply, runMigrateRehash, runInit, runPull, CommandError, } from "./commands.js";
 import { promptSnapshotExists, promptFreshInit, promptPullConfirm, promptTableRename, promptColumnRename, promptMigrationName, promptMigrationConfirm, } from "./prompts.js";
 const commands = [
     { label: "migrate create", value: "migrate create", description: "Generate a new SQL migration file" },
     { label: "migrate apply", value: "migrate apply", description: "Apply pending SQL migrations" },
+    { label: "migrate rehash", value: "migrate rehash", description: "Rebuild migration log checksums" },
     { label: "init", value: "init", description: "Initialize snapshot from existing schema" },
     { label: "pull", value: "pull", description: "Introspect database and generate schema" },
     { label: "help", value: "help", description: "Show help information" },
@@ -29,7 +31,7 @@ function parseArgs() {
     let command;
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
-        // Handle "migrate create" and "migrate apply" subcommands
+        // Handle "migrate create", "migrate apply", and "migrate rehash" subcommands
         if (arg === "migrate" && args[i + 1] === "create") {
             command = "migrate create";
             i++; // Skip the next argument
@@ -38,6 +40,10 @@ function parseArgs() {
             command = "migrate apply";
             i++; // Skip the next argument
         }
+        else if (arg === "migrate" && args[i + 1] === "rehash") {
+            command = "migrate rehash";
+            i++; // Skip the next argument
+        }
         else if (arg === "init" || arg === "pull" || arg === "help") {
             command = arg;
         }
@@ -50,6 +56,9 @@ function parseArgs() {
         else if (arg === "--migrations" || arg === "-m") {
             options.migrations = args[++i];
         }
+        else if (arg === "--migration") {
+            options.migration = args[++i];
+        }
         else if (arg === "--dialect") {
             options.dialect = args[++i];
         }
@@ -74,6 +83,9 @@ function parseArgs() {
         else if (arg === "--preview") {
             options.preview = true;
         }
+        else if (arg === "--mark-applied") {
+            options.markApplied = true;
+        }
         else if (arg === "--force" || arg === "-f") {
             options.force = true;
         }
@@ -101,7 +113,7 @@ function Status({ type, message }) {
 }
 // Help display component
 function HelpDisplay() {
-    return (_jsxs(Box, { flexDirection: "column", paddingY: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "zenstack-kit" }), _jsx(Text, { dimColor: true, children: "Database tooling for ZenStack schemas" }), _jsx(Text, { children: " " }), _jsx(Text, { bold: true, children: "Commands:" }), commands.filter(c => c.value !== "exit").map((cmd) => (_jsxs(Box, { marginLeft: 2, children: [_jsx(Box, { width: 20, children: _jsx(Text, { color: "yellow", children: cmd.label }) }), _jsx(Text, { dimColor: true, children: cmd.description })] }, cmd.value))), _jsx(Text, { children: " " }), _jsx(Text, { bold: true, children: "Options:" }), _jsxs(Box, { marginLeft: 2, flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: "-s, --schema <path>     Path to ZenStack schema" }), _jsx(Text, { dimColor: true, children: "-m, --migrations <path>  Migrations directory" }), _jsx(Text, { dimColor: true, children: "-n, --name <name>        Migration name" }), _jsx(Text, { dimColor: true, children: "--dialect <dialect>      Database dialect (sqlite, postgres, mysql)" }), _jsx(Text, { dimColor: true, children: "--url <url>              Database connection URL" }), _jsx(Text, { dimColor: true, children: "--create-initial         Create initial migration (skip prompt)" }), _jsx(Text, { dimColor: true, children: "--baseline               Create baseline only (skip prompt)" }), _jsx(Text, { dimColor: true, children: "--preview                Preview pending migrations without applying" }), _jsx(Text, { dimColor: true, children: "-f, --force              Force operation without confirmation" }), _jsx(Text, { dimColor: true, children: "-c, --config <path>     Path to zenstack-kit config file" })] })] }));
+    return (_jsxs(Box, { flexDirection: "column", paddingY: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "zenstack-kit" }), _jsx(Text, { dimColor: true, children: "Database tooling for ZenStack schemas" }), _jsx(Text, { children: " " }), _jsx(Text, { bold: true, children: "Commands:" }), commands.filter(c => c.value !== "exit").map((cmd) => (_jsxs(Box, { marginLeft: 2, children: [_jsx(Box, { width: 20, children: _jsx(Text, { color: "yellow", children: cmd.label }) }), _jsx(Text, { dimColor: true, children: cmd.description })] }, cmd.value))), _jsx(Text, { children: " " }), _jsx(Text, { bold: true, children: "Options:" }), _jsxs(Box, { marginLeft: 2, flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: "-s, --schema <path>     Path to ZenStack schema" }), _jsx(Text, { dimColor: true, children: "-m, --migrations <path>  Migrations directory" }), _jsx(Text, { dimColor: true, children: "-n, --name <name>        Migration name" }), _jsx(Text, { dimColor: true, children: "--dialect <dialect>      Database dialect (sqlite, postgres, mysql)" }), _jsx(Text, { dimColor: true, children: "--url <url>              Database connection URL" }), _jsx(Text, { dimColor: true, children: "--migration <name>       Target a single migration (rehash only)" }), _jsx(Text, { dimColor: true, children: "--create-initial         Create initial migration (skip prompt)" }), _jsx(Text, { dimColor: true, children: "--baseline               Create baseline only (skip prompt)" }), _jsx(Text, { dimColor: true, children: "--preview                Preview pending migrations without applying" }), _jsx(Text, { dimColor: true, children: "--mark-applied           Mark pending migrations as applied without running SQL" }), _jsx(Text, { dimColor: true, children: "-f, --force              Force operation without confirmation" }), _jsx(Text, { dimColor: true, children: "-c, --config <path>     Path to zenstack-kit config file" })] })] }));
 }
 function CliApp({ initialCommand, options }) {
     const { exit } = useApp();
@@ -167,6 +179,9 @@ function CliApp({ initialCommand, options }) {
                 else if (command === "migrate apply") {
                     await runMigrateApply(ctx);
                 }
+                else if (command === "migrate rehash") {
+                    await runMigrateRehash(ctx);
+                }
                 else if (command === "init") {
                     await runInit(ctx);
                 }

package/dist/cli/commands.d.ts

@@ -11,6 +11,7 @@ export interface CommandOptions {
     schema?: string;
     migrations?: string;
     name?: string;
+    migration?: string;
     dialect?: string;
     url?: string;
     output?: string;
@@ -19,6 +20,7 @@ export interface CommandOptions {
     baseline?: boolean;
     createInitial?: boolean;
     preview?: boolean;
+    markApplied?: boolean;
     force?: boolean;
     config?: string;
 }
@@ -63,6 +65,10 @@ export declare function runMigrateGenerate(ctx: CommandContext): Promise<void>;
  * migrate:apply command
  */
 export declare function runMigrateApply(ctx: CommandContext): Promise<void>;
+/**
+ * migrate:rehash command
+ */
+export declare function runMigrateRehash(ctx: CommandContext): Promise<void>;
 /**
  * init command
  */

package/dist/cli/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/cli/commands.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/cli/commands.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands.js

@@ -6,9 +6,11 @@
  */
 import * as fs from "fs";
 import * as path from "path";
+import * as os from "os";
+import { execFileSync } from "child_process";
 import { loadConfig } from "../config/loader.js";
 import { pullSchema } from "../schema/pull.js";
-import { createPrismaMigration, applyPrismaMigrations, previewPrismaMigrations, hasPrismaSchemaChanges, hasSnapshot, scanMigrationFolders, writeMigrationLog, initializeSnapshot, createInitialMigration, detectPotentialRenames, } from "../migrations/prisma.js";
+import { createPrismaMigration, applyPrismaMigrations, previewPrismaMigrations, hasPrismaSchemaChanges, hasSnapshot, scanMigrationFolders, readMigrationLog, writeMigrationLog, getMigrationLogPath, calculateChecksum, initializeSnapshot, createInitialMigration, detectPotentialRenames, } from "../migrations/prisma.js";
 export class CommandError extends Error {
     constructor(message) {
         super(message);
@@ -148,6 +150,9 @@ export async function runMigrateApply(ctx) {
         throw new CommandError("Database connection URL is required for non-sqlite dialects.");
     }
     const databasePath = dialect === "sqlite" ? connectionUrl : undefined;
+    if (ctx.options.preview && ctx.options.markApplied) {
+        throw new CommandError("Cannot use --preview and --mark-applied together.");
+    }
     // Preview mode - show pending migrations without applying
     if (ctx.options.preview) {
         ctx.log("info", "Preview mode - no changes will be applied.");
@@ -171,12 +176,21 @@ export async function runMigrateApply(ctx) {
             ctx.log("info", `${preview.alreadyApplied.length} migration(s) already applied`);
         }
         for (const migration of preview.pending) {
-            ctx.log("info", `Migration: ${migration.name}`);
-            ctx.log("info", `SQL:\n${migration.sql}`);
+            const statementCount = migration.sql
+                .split(/;(?:\s*\n|\s*$)/)
+                .map((s) => s.trim())
+                .filter((s) => s.length > 0 && !s.startsWith("--")).length;
+            ctx.log("info", `Migration: ${migration.name} (${statementCount} statement${statementCount === 1 ? "" : "s"})`);
         }
+        ctx.log("info", "Use the migration.sql files to review full SQL.");
         return;
     }
-    ctx.log("info", "Applying migrations...");
+    if (ctx.options.markApplied) {
+        ctx.log("info", "Marking migrations as applied (no SQL will be executed)...");
+    }
+    else {
+        ctx.log("info", "Applying migrations...");
+    }
     const result = await applyPrismaMigrations({
         migrationsFolder: outputPath,
         dialect,
@@ -184,6 +198,7 @@ export async function runMigrateApply(ctx) {
         databasePath,
         migrationsTable,
         migrationsSchema,
+        markApplied: ctx.options.markApplied,
     });
     // Handle coherence errors
     if (result.coherenceErrors && result.coherenceErrors.length > 0) {
@@ -198,8 +213,10 @@ export async function runMigrateApply(ctx) {
         ctx.log("error", "  - Migrations were applied manually without using zenstack-kit");
         ctx.log("error", "  - The migration log file was modified or deleted");
         ctx.log("error", "  - Different migration histories exist across environments");
+        ctx.log("error", "  - Migration.sql files were edited after being logged");
         ctx.log("error", "");
         ctx.log("error", "To resolve, ensure your migration log matches your database state.");
+        ctx.log("error", "If you edited migration.sql files, run 'zenstack-kit migrate rehash' to rebuild log checksums.");
         throw new CommandError("Migration history is inconsistent");
     }
     if (result.applied.length === 0 && !result.failed) {
@@ -210,12 +227,52 @@ export async function runMigrateApply(ctx) {
         return;
     }
     for (const item of result.applied) {
-        ctx.log("success", `Applied: ${item.migrationName} (${item.duration}ms)`);
+        const action = ctx.options.markApplied ? "Marked applied" : "Applied";
+        ctx.log("success", `${action}: ${item.migrationName} (${item.duration}ms)`);
     }
     if (result.failed) {
         throw new CommandError(`Migration failed: ${result.failed.migrationName} - ${result.failed.error}`);
     }
 }
+/**
+ * migrate:rehash command
+ */
+export async function runMigrateRehash(ctx) {
+    const { outputPath } = await resolveConfig(ctx);
+    const targetMigration = ctx.options.migration;
+    if (targetMigration) {
+        const sqlPath = path.join(outputPath, targetMigration, "migration.sql");
+        if (!fs.existsSync(sqlPath)) {
+            throw new CommandError(`Migration not found: ${targetMigration}`);
+        }
+        const sqlContent = await fs.promises.readFile(sqlPath, "utf-8");
+        const checksum = calculateChecksum(sqlContent);
+        const entries = await readMigrationLog(outputPath);
+        const existingIndex = entries.findIndex((e) => e.name === targetMigration);
+        if (existingIndex === -1) {
+            entries.push({ name: targetMigration, checksum });
+        }
+        else {
+            entries[existingIndex] = { name: targetMigration, checksum };
+        }
+        await writeMigrationLog(outputPath, entries);
+        const logPath = getMigrationLogPath(outputPath);
+        ctx.log("success", `Updated checksum for ${targetMigration}`);
+        ctx.log("info", `Log: ${logPath}`);
+        ctx.log("warning", "If this migration was already applied, make sure the database checksum matches the updated log.");
+        return;
+    }
+    const migrations = await scanMigrationFolders(outputPath);
+    if (migrations.length === 0) {
+        ctx.log("warning", "No migrations found.");
+        return;
+    }
+    await writeMigrationLog(outputPath, migrations);
+    const logPath = getMigrationLogPath(outputPath);
+    ctx.log("success", `Migration log rebuilt with ${migrations.length} migration(s)`);
+    ctx.log("info", `Log: ${logPath}`);
+    ctx.log("warning", "If these migrations were already applied, make sure the database checksums match the updated log.");
+}
 /**
  * init command
  */
@@ -334,6 +391,42 @@ export async function runPull(ctx) {
             return;
         }
     }
+    if (ctx.options.preview) {
+        ctx.log("info", "Preview mode - no files will be written.");
+        const result = await pullSchema({
+            dialect,
+            connectionUrl,
+            databasePath,
+            outputPath: schemaOutputPath,
+            writeFile: false,
+        });
+        if (fs.existsSync(schemaOutputPath)) {
+            const diffOutput = await buildSchemaDiff(schemaOutputPath, result.schema);
+            if (diffOutput) {
+                const { text, truncated } = truncateLines(diffOutput, 200);
+                ctx.log("info", `Diff (existing -> generated):\n${text}`);
+                if (truncated) {
+                    ctx.log("info", "Diff truncated. Use --output to write and inspect the full schema.");
+                }
+            }
+            else {
+                ctx.log("info", "Diff unavailable; showing generated schema preview.");
+                const { text, truncated } = truncateLines(result.schema, 200);
+                ctx.log("info", `Generated schema:\n${text}`);
+                if (truncated) {
+                    ctx.log("info", "Preview truncated. Use --output to write and inspect the full schema.");
+                }
+            }
+        }
+        else {
+            const { text, truncated } = truncateLines(result.schema, 200);
+            ctx.log("info", `Generated schema:\n${text}`);
+            if (truncated) {
+                ctx.log("info", "Preview truncated. Use --output to write and inspect the full schema.");
+            }
+        }
+        return;
+    }
     ctx.log("info", "Pulling schema from database...");
     const result = await pullSchema({
         dialect,
@@ -349,3 +442,33 @@ export async function runPull(ctx) {
         ctx.log("warning", "You should run 'zenstack-kit init' to reset the snapshot after reviewing the schema.");
     }
 }
+async function buildSchemaDiff(existingPath, nextSchema) {
+    const tempDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), "zenstack-kit-pull-"));
+    const nextPath = path.join(tempDir, "schema.zmodel");
+    try {
+        await fs.promises.writeFile(nextPath, nextSchema, "utf-8");
+        try {
+            return execFileSync("git", ["diff", "--no-index", "--no-color", "--", existingPath, nextPath], { encoding: "utf-8" });
+        }
+        catch (error) {
+            const stdout = error.stdout;
+            if (stdout) {
+                return stdout.toString();
+            }
+            return null;
+        }
+    }
+    finally {
+        await fs.promises.rm(tempDir, { recursive: true, force: true });
+    }
+}
+function truncateLines(text, maxLines) {
+    const lines = text.split("\n");
+    if (lines.length <= maxLines) {
+        return { text, truncated: false };
+    }
+    return {
+        text: lines.slice(0, maxLines).join("\n"),
+        truncated: true,
+    };
+}

package/dist/cli/index.d.ts

@@ -5,6 +5,7 @@
  * Commands:
  *   migrate:generate  Generate a new SQL migration
  *   migrate:apply     Apply pending migrations
+ *   migrate:rehash    Rebuild migration log checksums
  *   init              Initialize snapshot from existing schema
  *   pull              Introspect database and generate schema
  */

package/dist/cli/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AAEA;;;;;;;;GAQG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AAEA;;;;;;;;;GASG"}

package/dist/cli/index.js

@@ -5,6 +5,7 @@
  * Commands:
  *   migrate:generate  Generate a new SQL migration
  *   migrate:apply     Apply pending migrations
+ *   migrate:rehash    Rebuild migration log checksums
  *   init              Initialize snapshot from existing schema
  *   pull              Introspect database and generate schema
  */

package/dist/cli/prompts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../src/cli/prompts.tsx"],"names":[],"mappings":"AAAA;;GAEG;AAMH,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,cAAc,GAAG,UAAU,GAAG,gBAAgB,CAAC;AACjF,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,IAAI,CAAC;AAsCzC;;GAEG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,UAAU,CAAC,CAyBhE;AAED;;GAEG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,UAAU,CAAC,CAyB3D;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CA+BjF;AAED,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,eAAe,CAAC;AA2CtD;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,WAAW,GAAE,MAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CAc5F;AAED,MAAM,MAAM,sBAAsB,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEzD;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAkCnG;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAyBvF;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,YAAY,CAAC,CAyBvB"}
+{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../src/cli/prompts.tsx"],"names":[],"mappings":"AAAA;;GAEG;AAMH,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,cAAc,GAAG,UAAU,GAAG,gBAAgB,CAAC;AACjF,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,IAAI,CAAC;AAsCzC;;GAEG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,UAAU,CAAC,CAyBhE;AAED;;GAEG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,UAAU,CAAC,CAyB3D;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CA+BjF;AAED,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,eAAe,CAAC;AAyCtD;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,WAAW,GAAE,MAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CAc5F;AAED,MAAM,MAAM,sBAAsB,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEzD;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAkCnG;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAyBvF;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,YAAY,CAAC,CAyBvB"}

package/dist/cli/prompts.js

@@ -3,7 +3,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * Interactive prompts for the init command using ink
  */
 import React, { useState } from "react";
-import { render, Box, Text } from "ink";
+import { render, Box, Text, useInput } from "ink";
 import SelectInput from "ink-select-input";
 function SelectPrompt({ message, items, onSelect }) {
     const [selectedIndex, setSelectedIndex] = useState(0);
@@ -101,8 +101,6 @@ function TextInputPrompt({ message, placeholder, onSubmit, }) {
             setValue((prev) => prev + input);
         }
     };
-    // Use ink's useInput hook
-    const { useInput } = require("ink");
     useInput(handleInput);
     return (_jsx(Box, { flexDirection: "column", children: _jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: "? " }), _jsxs(Text, { children: [message, " "] }), _jsxs(Text, { dimColor: true, children: ["(", placeholder, "): "] }), _jsx(Text, { children: value }), _jsx(Text, { color: "gray", children: "\u2588" })] }) }));
 }

package/dist/migrations/prisma/apply.d.ts

@@ -12,6 +12,8 @@ export interface ApplyPrismaMigrationsOptions {
     migrationsTable?: string;
     /** Migrations schema (PostgreSQL only, default: public) */
     migrationsSchema?: string;
+    /** Mark migrations as applied without executing SQL */
+    markApplied?: boolean;
 }
 export interface ApplyPrismaMigrationsResult {
     applied: Array<{

package/dist/migrations/prisma/apply.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../../src/migrations/prisma/apply.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAIjE,MAAM,WAAW,4BAA4B;IAC3C,6BAA6B;IAC7B,gBAAgB,EAAE,MAAM,CAAC;IACzB,uBAAuB;IACvB,OAAO,EAAE,aAAa,CAAC;IACvB,8BAA8B;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,2BAA2B;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,0DAA0D;IAC1D,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,2DAA2D;IAC3D,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,KAAK,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5D,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,MAAM,CAAC,EAAE;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAClD,eAAe,CAAC,EAAE,uBAAuB,EAAE,CAAC;CAC7C;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,kBAAkB,GAAG,iBAAiB,GAAG,mBAAmB,GAAG,gBAAgB,GAAG,mBAAmB,CAAC;IAC5G,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,uBAAuB,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,6BAA6B;IAC5C,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9C,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B;AA2QD;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,2BAA2B,CAAC,CAuHtC;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,6BAA6B,CAAC,CA0DxC"}
+{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../../src/migrations/prisma/apply.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAIjE,MAAM,WAAW,4BAA4B;IAC3C,6BAA6B;IAC7B,gBAAgB,EAAE,MAAM,CAAC;IACzB,uBAAuB;IACvB,OAAO,EAAE,aAAa,CAAC;IACvB,8BAA8B;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,2BAA2B;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,0DAA0D;IAC1D,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,2DAA2D;IAC3D,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uDAAuD;IACvD,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,KAAK,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5D,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,MAAM,CAAC,EAAE;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAClD,eAAe,CAAC,EAAE,uBAAuB,EAAE,CAAC;CAC7C;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,kBAAkB,GAAG,iBAAiB,GAAG,mBAAmB,GAAG,gBAAgB,GAAG,mBAAmB,CAAC;IAC5G,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,uBAAuB,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,6BAA6B;IAC5C,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9C,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B;AA2QD;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,2BAA2B,CAAC,CA0HtC;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,6BAA6B,CAAC,CA0DxC"}

package/dist/migrations/prisma/apply.js

@@ -298,17 +298,20 @@ export async function applyPrismaMigrations(options) {
                     error: `Checksum mismatch for migration ${folderName}.\n` +
                         `Expected: ${logEntry.checksum}\n` +
                         `Found: ${checksum}\n` +
-                        `The migration file may have been modified after generation.`,
+                        `The migration file may have been modified after generation.\n` +
+                        `If you intended this, run 'zenstack-kit migrate rehash' to rebuild log checksums.`,
                 };
                 break;
             }
             const startTime = Date.now();
             try {
-                // Execute the migration SQL using direct driver access
-                await executeRawSql(options.dialect, sqlContent, {
-                    connectionUrl: options.connectionUrl,
-                    databasePath: options.databasePath,
-                });
+                if (!options.markApplied) {
+                    // Execute the migration SQL using direct driver access
+                    await executeRawSql(options.dialect, sqlContent, {
+                        connectionUrl: options.connectionUrl,
+                        databasePath: options.databasePath,
+                    });
+                }
                 // Record the migration (still use Kysely for this since it's simple INSERT)
                 await recordMigration(db, migrationsTable, migrationsSchema, options.dialect, folderName, checksum);
                 result.applied.push({

package/dist/schema/pull.d.ts

@@ -13,6 +13,8 @@ export interface PullOptions {
     databasePath?: string;
     /** Output path for schema */
     outputPath: string;
+    /** Write the schema to outputPath (default: true) */
+    writeFile?: boolean;
 }
 export interface PullResult {
     outputPath: string;

package/dist/schema/pull.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/schema/pull.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEnF,MAAM,WAAW,WAAW;IAC1B,uBAAuB;IACvB,OAAO,EAAE,aAAa,CAAC;IACvB,8BAA8B;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gDAAgD;IAChD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6BAA6B;IAC7B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB;AAofD,wBAAsB,UAAU,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAwC1E"}
+{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/schema/pull.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEnF,MAAM,WAAW,WAAW;IAC1B,uBAAuB;IACvB,OAAO,EAAE,aAAa,CAAC;IACvB,8BAA8B;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gDAAgD;IAChD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6BAA6B;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,qDAAqD;IACrD,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB;AA8lBD,wBAAsB,UAAU,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CA4C1E"}

package/dist/schema/pull.js

@@ -52,6 +52,10 @@ function normalizeType(dataType) {
     const isArray = lower.endsWith("[]");
     const base = isArray ? lower.slice(0, -2) : lower;
     const normalized = base.replace(/\(.+\)/, "").trim();
+    if (normalized.includes("uuid") || normalized.includes("citext"))
+        return { type: "String", isArray };
+    if (normalized.includes("jsonb"))
+        return { type: "Json", isArray };
     if (normalized.includes("bigint"))
         return { type: "BigInt", isArray };
     if (normalized.includes("int"))
@@ -87,7 +91,7 @@ function buildDatasourceBlock(dialect) {
     ].join("\n");
 }
 function buildModelBlock(options) {
-    const { table, foreignKeys, indexes, primaryKeys, allTables } = options;
+    const { table, foreignKeys, indexes, primaryKeys, allTables, columnDefaults } = options;
     const modelName = toPascalCase(table.name) || "Model";
     const fieldLines = [];
     // Get primary key columns for this table
@@ -123,6 +127,45 @@ function buildModelBlock(options) {
             }
         }
     }
+    const getDefaultExpr = (columnName) => columnDefaults.get(columnName) ?? null;
+    const buildDefaultAttribute = (defaultExpr, dataType) => {
+        if (!defaultExpr)
+            return null;
+        const normalized = defaultExpr.trim();
+        if (!normalized || normalized.toLowerCase() === "null")
+            return null;
+        const lower = normalized.toLowerCase();
+        if (lower.includes("nextval("))
+            return null;
+        if (lower === "current_timestamp" ||
+            lower === "current_timestamp()" ||
+            lower === "now()" ||
+            lower.includes("datetime('now") ||
+            lower.includes("now()")) {
+            return "@default(now())";
+        }
+        if (lower.includes("uuid_generate_v4()") || lower.includes("gen_random_uuid()") || lower === "uuid()") {
+            return "@default(uuid())";
+        }
+        if (lower === "true" || lower === "false") {
+            return `@default(${lower})`;
+        }
+        if ((lower === "0" || lower === "1") && dataType.toLowerCase().includes("bool")) {
+            return `@default(${lower === "1" ? "true" : "false"})`;
+        }
+        if (/^-?\d+(\.\d+)?$/.test(normalized)) {
+            return `@default(${normalized})`;
+        }
+        if ((normalized.startsWith("'") && normalized.endsWith("'")) ||
+            (normalized.startsWith("\"") && normalized.endsWith("\""))) {
+            const unquoted = normalized
+                .slice(1, -1)
+                .replace(/''/g, "'")
+                .replace(/\\"/g, "\"");
+            return `@default(${JSON.stringify(unquoted)})`;
+        }
+        return "@default(dbgenerated())";
+    };
     const sortedColumns = [...table.columns].sort((a, b) => a.name.localeCompare(b.name));
     for (const column of sortedColumns) {
         const fieldName = toCamelCase(column.name) || column.name;
@@ -146,7 +189,13 @@ function buildModelBlock(options) {
             modifiers.push(`@map("${column.name}")`);
         }
         if (column.hasDefaultValue && !modifiers.some((m) => m.includes("@default"))) {
-            modifiers.push("@default(dbgenerated())");
+            const attr = buildDefaultAttribute(getDefaultExpr(column.name), column.dataType);
+            if (attr) {
+                modifiers.push(attr);
+            }
+            else {
+                modifiers.push("@default(dbgenerated())");
+            }
         }
         const typeSuffix = isArray ? "[]" : "";
         const modifierText = modifiers.length > 0 ? ` ${modifiers.join(" ")}` : "";
@@ -389,6 +438,51 @@ async function extractPrimaryKeys(db, dialect, tableNames) {
     }
     return primaryKeys;
 }
+async function extractColumnDefaults(db, dialect, tableNames) {
+    const defaultsByTable = new Map();
+    const tableSet = new Set(tableNames);
+    const setDefault = (table, column, value) => {
+        if (!defaultsByTable.has(table)) {
+            defaultsByTable.set(table, new Map());
+        }
+        defaultsByTable.get(table).set(column, value);
+    };
+    if (dialect === "sqlite") {
+        for (const tableName of tableNames) {
+            const result = await sql `
+        PRAGMA table_info(${sql.raw(`"${tableName}"`)})
+      `.execute(db);
+            for (const row of result.rows) {
+                setDefault(tableName, row.name, row.dflt_value);
+            }
+        }
+    }
+    else if (dialect === "postgres") {
+        const result = await sql `
+      SELECT table_name, column_name, column_default
+      FROM information_schema.columns
+      WHERE table_schema = 'public'
+    `.execute(db);
+        for (const row of result.rows) {
+            if (!tableSet.has(row.table_name))
+                continue;
+            setDefault(row.table_name, row.column_name, row.column_default);
+        }
+    }
+    else if (dialect === "mysql") {
+        const result = await sql `
+      SELECT TABLE_NAME, COLUMN_NAME, COLUMN_DEFAULT
+      FROM information_schema.COLUMNS
+      WHERE TABLE_SCHEMA = DATABASE()
+    `.execute(db);
+        for (const row of result.rows) {
+            if (!tableSet.has(row.TABLE_NAME))
+                continue;
+            setDefault(row.TABLE_NAME, row.COLUMN_NAME, row.COLUMN_DEFAULT);
+        }
+    }
+    return defaultsByTable;
+}
 export async function pullSchema(options) {
     const { db, destroy } = await createKyselyAdapter({
         dialect: options.dialect,
@@ -403,16 +497,20 @@ export async function pullSchema(options) {
         const foreignKeys = await extractForeignKeys(db, options.dialect);
         const indexes = await extractIndexes(db, options.dialect, tableNames);
         const primaryKeys = await extractPrimaryKeys(db, options.dialect, tableNames);
+        const columnDefaultsByTable = await extractColumnDefaults(db, options.dialect, tableNames);
         const blocks = filtered.map((table) => buildModelBlock({
             table,
             foreignKeys,
             indexes,
             primaryKeys,
             allTables,
+            columnDefaults: columnDefaultsByTable.get(table.name) ?? new Map(),
         }));
         const schema = [buildDatasourceBlock(options.dialect), ...blocks].join("\n\n");
-        await fs.mkdir(path.dirname(options.outputPath), { recursive: true });
-        await fs.writeFile(options.outputPath, schema.trimEnd() + "\n", "utf-8");
+        if (options.writeFile !== false) {
+            await fs.mkdir(path.dirname(options.outputPath), { recursive: true });
+            await fs.writeFile(options.outputPath, schema.trimEnd() + "\n", "utf-8");
+        }
         return {
             outputPath: options.outputPath,
             schema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zenstack-kit",
-  "version": "0.1.5",
+  "version": "0.1.8",
   "description": "Drizzle-kit like CLI tooling for ZenStack schemas with Kysely support",
   "type": "module",
   "main": "./dist/index.js",