nextjs-cms-kit 0.5.65 → 0.5.67

package/dist/commands/db-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"db-config.d.ts","sourceRoot":"","sources":["../../src/commands/db-config.ts"],"names":[],"mappings":"AAEA,wBAAsB,WAAW,CAAC,GAAG,EAAE,OAAO,iBAc7C"}
+{"version":3,"file":"db-config.d.ts","sourceRoot":"","sources":["../../src/commands/db-config.ts"],"names":[],"mappings":"AAGA,wBAAsB,WAAW,CAAC,GAAG,EAAE,OAAO,iBAiB7C"}

package/dist/commands/db-config.js

@@ -1,18 +1,22 @@
 import chalk from 'chalk';
+import * as p from '@clack/prompts';
 export async function runDbConfig(dev) {
+    let exitCode = 0;
     try {
+        p.log.info(chalk.cyan('Configuring database'));
         // Lazy import to avoid eager database connection
-        const { dbConfigSetup } = await import('../lib/db-config-setup.js');
+        const { dbConfigSetup } = await import('../lib/db-config.js');
         await dbConfigSetup({ dev });
+        p.outro(chalk.inverse(' ✓ Database configuration completed '));
     }
     catch (error) {
-        console.error(chalk.red('Error during initialization:'), error);
-        process.exit(1);
+        console.error(chalk.red('✗ Error during database configuration:'), error);
+        exitCode = 1;
     }
     finally {
         // Lazy import for cleanup
         const { dbConnectionClose } = await import('nextjs-cms/db/client');
         await dbConnectionClose();
-        process.exit(0);
     }
+    process.exit(exitCode);
 }

package/dist/commands/fix-master-admin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fix-master-admin.d.ts","sourceRoot":"","sources":["../../src/commands/fix-master-admin.ts"],"names":[],"mappings":"AAEA,wBAAsB,iBAAiB,kBActC"}
+{"version":3,"file":"fix-master-admin.d.ts","sourceRoot":"","sources":["../../src/commands/fix-master-admin.ts"],"names":[],"mappings":"AAGA,wBAAsB,iBAAiB,kBAiBtC"}

package/dist/commands/fix-master-admin.js

@@ -1,18 +1,22 @@
 import chalk from 'chalk';
+import * as p from '@clack/prompts';
 export async function runFixMasterAdmin() {
+    let exitCode = 0;
     try {
+        p.log.info(chalk.cyan('Looking up sections'));
         // Lazy import to avoid eager database connection
-        const { fixMasterAdmin } = await import('../lib/fix-master-admin.js');
-        await fixMasterAdmin();
+        const { fixMasterAdminPrivileges } = await import('../lib/fix-master-admin.js');
+        await fixMasterAdminPrivileges();
+        p.outro(chalk.inverse(' ✓ Master admin privileges fixed '));
     }
     catch (error) {
         console.error(chalk.red('Error fixing master admin privileges:'), error);
-        process.exit(1);
+        exitCode = 1;
     }
     finally {
         // Lazy import for cleanup
         const { dbConnectionClose } = await import('nextjs-cms/db/client');
         await dbConnectionClose();
-        process.exit(0);
     }
+    process.exit(exitCode);
 }

package/dist/commands/set-master-admin.d.ts

@@ -1,2 +1,2 @@
-export declare function runSetMasterAdmin(dev: boolean): Promise<void>;
+export declare function runSetMasterAdmin(): Promise<void>;
 //# sourceMappingURL=set-master-admin.d.ts.map

package/dist/commands/set-master-admin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"set-master-admin.d.ts","sourceRoot":"","sources":["../../src/commands/set-master-admin.ts"],"names":[],"mappings":"AAEA,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,OAAO,iBAuBnD"}
+{"version":3,"file":"set-master-admin.d.ts","sourceRoot":"","sources":["../../src/commands/set-master-admin.ts"],"names":[],"mappings":"AAGA,wBAAsB,iBAAiB,kBAoBtC"}

package/dist/commands/set-master-admin.js

@@ -1,27 +1,25 @@
 import chalk from 'chalk';
-export async function runSetMasterAdmin(dev) {
+import * as p from '@clack/prompts';
+export async function runSetMasterAdmin() {
+    p.log.info(chalk.cyan('Setting up master admin'));
+    let exitCode = 0;
     try {
-        console.log(chalk.hex('#E8DCFF').bold('nextjs-cms-kit'));
-        console.log(chalk.green('nextjs-cms CLI toolkit for managing your nextjs-cms application'));
-        console.log(chalk.gray('--------------------------'));
-        console.log(chalk.hex('#E8DCFF').bold('set-master-admin'));
-        console.log('Set or update master admin password');
-        console.log(chalk.gray('--------------------------'));
-        console.log(chalk.yellow(`Running in ${dev ? 'development' : 'production'} mode`));
-        console.log(chalk.gray('--------------------------'));
-        console.log(chalk.gray(`.......................................................`));
-        // Lazy import to avoid eager database connection
         const { setMasterAdmin } = await import('../lib/set-master-admin.js');
         await setMasterAdmin();
+        p.outro(chalk.inverse(' ✓ Master admin setup completed successfully '));
     }
     catch (error) {
-        console.error(chalk.red('Error resetting master admin:'), error);
-        process.exit(1);
+        p.log.error(chalk.red('✗ Error resetting master admin:'));
+        console.error(error);
+        // Lazy import for cleanup
+        const { dbConnectionClose } = await import('nextjs-cms/db/client');
+        await dbConnectionClose();
+        exitCode = 1;
     }
     finally {
         // Lazy import for cleanup
         const { dbConnectionClose } = await import('nextjs-cms/db/client');
         await dbConnectionClose();
-        process.exit(0);
     }
+    process.exit(exitCode);
 }

package/dist/commands/setup.d.ts

@@ -1,2 +1,2 @@
-export declare function runSetup(dev: boolean): Promise<void>;
+export declare function runSetup(dev: boolean, skipDbConfig: boolean): Promise<void>;
 //# sourceMappingURL=setup.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/commands/setup.ts"],"names":[],"mappings":"AAIA,wBAAsB,QAAQ,CAAC,GAAG,EAAE,OAAO,iBA8D1C"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/commands/setup.ts"],"names":[],"mappings":"AAGA,wBAAsB,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,iBAiCjE"}

package/dist/commands/setup.js

@@ -1,62 +1,34 @@
-import { note, intro, outro, spinner } from '@clack/prompts';
-import { spawn } from 'child_process';
+import * as p from '@clack/prompts';
 import chalk from 'chalk';
-export async function runSetup(dev) {
-    const s = spinner();
-    console.log(chalk.hex('#E8DCFF').bold('nextjs-cms-kit'));
-    console.log(chalk.green('nextjs-cms CLI toolkit for managing your nextjs-cms application'));
-    console.log(chalk.gray('--------------------------'));
-    console.log(chalk.hex('#E8DCFF').bold('setup'));
-    console.log('Complete nextjs-cms setup');
-    console.log(chalk.gray('--------------------------'));
-    console.log(chalk.yellow(`Running in ${dev ? 'development' : 'production'} mode`));
-    console.log(chalk.gray('--------------------------'));
-    console.log(chalk.gray(`.......................................................`));
-    console.log();
-    intro('Setting up nextjs-cms... 🚀');
+export async function runSetup(dev, skipDbConfig) {
+    let exitCode = 0;
     try {
-        note('Configuring database...');
-        // Lazy import to avoid eager database connection
-        const { dbConfigSetup } = await import('../lib/db-config-setup.js');
-        await dbConfigSetup({ dev });
-        note('Generating database schema...');
-        // Use spawn to properly handle streams and prevent hanging
-        await new Promise((resolve, reject) => {
-            const child = spawn('pnpm drizzle-kit push --force --config=drizzle.config.ts', {
-                cwd: process.cwd(),
-                env: { ...process.env },
-                stdio: 'inherit', // Inherit stdio to prevent hanging and show output directly
-                shell: true,
-            });
-            child.on('close', (code) => {
-                if (code === 0) {
-                    resolve();
-                }
-                else {
-                    reject(new Error(`drizzle-kit push exited with code ${code}`));
-                }
-            });
-            child.on('error', (error) => {
-                reject(error);
-            });
-        });
-        s.message('Database schema generated');
-        note('Setting up master admin...');
-        // Lazy import to avoid eager database connection
+        if (!skipDbConfig) {
+            p.log.info(chalk.cyan('Configuring database'));
+            const { dbConfigSetup } = await import('../lib/db-config.js');
+            await dbConfigSetup({ dev });
+        }
+        p.log.info(chalk.cyan('Generating database tables'));
+        const { generateDatabaseTables } = await import('../lib/db-migrate.js');
+        await generateDatabaseTables();
+        p.log.info(chalk.cyan('Setting up master admin'));
         const { setMasterAdmin } = await import('../lib/set-master-admin.js');
         await setMasterAdmin();
-        note('Master admin configured');
-        outro('nextjs-cms setup completed successfully! 🎉');
+        p.outro(chalk.inverse(' ✓ nextjs-cms setup completed successfully '));
     }
     catch (error) {
-        console.error(chalk.red('Error during setup:'), error);
-        s.stop('Setup failed');
-        process.exit(1);
+        console.log('');
+        console.error(chalk.red('✗ Error during setup:'), error);
+        p.outro(chalk.red('✗ Setup failed'));
+        // Lazy import for cleanup
+        const { dbConnectionClose } = await import('nextjs-cms/db/client');
+        await dbConnectionClose();
+        exitCode = 1;
     }
     finally {
         // Lazy import for cleanup
         const { dbConnectionClose } = await import('nextjs-cms/db/client');
         await dbConnectionClose();
-        process.exit(0);
     }
+    process.exit(exitCode);
 }

package/dist/commands/update-sections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-sections.d.ts","sourceRoot":"","sources":["../../src/commands/update-sections.ts"],"names":[],"mappings":"AAEA,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,OAAO,iBA4BnD"}
+{"version":3,"file":"update-sections.d.ts","sourceRoot":"","sources":["../../src/commands/update-sections.ts"],"names":[],"mappings":"AAGA,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,OAAO,iBAsBnD"}

package/dist/commands/update-sections.js

@@ -1,32 +1,27 @@
 import chalk from 'chalk';
+import * as p from '@clack/prompts';
 export async function runUpdateSections(dev) {
+    let exitCode = 0;
     try {
-        console.log(chalk.hex('#E8DCFF').bold('nextjs-cms-kit'));
-        console.log(chalk.green('nextjs-cms CLI toolkit for managing your nextjs-cms application'));
-        console.log(chalk.gray('--------------------------'));
-        console.log(chalk.hex('#E8DCFF').bold('update-sections'));
-        console.log('Update database tables based on current sections and update master admin privileges');
-        console.log(chalk.gray('--------------------------'));
-        console.log(chalk.yellow(`Running in ${dev ? 'development' : 'production'} mode`));
-        console.log(chalk.gray('--------------------------'));
-        console.log(chalk.gray(`.......................................................`));
-        // Lazy import to avoid eager database connection
+        p.log.info(chalk.cyan('Updating sections'));
         const { updateSections } = await import('../lib/update-sections.js');
         await updateSections(dev);
-        console.log(chalk.blue('Modifying master admin privileges...'));
+        p.log.info(chalk.cyan('Modifying master admin privileges'));
         // Lazy import to avoid eager database connection
-        const { fixMasterAdminPrivileges } = await import('../lib/actions.js');
+        const { fixMasterAdminPrivileges } = await import('../lib/fix-master-admin.js');
         await fixMasterAdminPrivileges();
-        console.log(chalk.green('Master admin privileges fixed.'));
+        p.log.message(chalk.green(' - ✓ Master admin privileges fixed.'));
+        p.outro(chalk.inverse(' ✓ Sections updated '));
     }
     catch (error) {
-        console.error(chalk.red('Error updating sections:'), error);
-        process.exit(1);
+        p.log.error(chalk.red('✗ Error updating sections:'));
+        console.error(error);
+        exitCode = 1;
     }
     finally {
         // Lazy import for cleanup
         const { dbConnectionClose } = await import('nextjs-cms/db/client');
         await dbConnectionClose();
-        process.exit(0);
     }
+    process.exit(exitCode);
 }

package/dist/index.js

@@ -1,12 +1,10 @@
 #!/usr/bin/env node
 import dotenv from 'dotenv';
-import program from './lib/program.js';
-import * as p from '@clack/prompts';
+import program from './program/program.js';
 program.parse(process.argv);
 // Load environment file based on parsed dev flag
 if (Boolean(program.opts().dev) === true) {
-    p.note('🔧 Using development environment file');
-    dotenv.config({ path: '.env.development' });
+    dotenv.config({ path: '.env.development', quiet: true });
     process.env.NODE_ENV = 'development';
 }
 else {

package/dist/lib/{db-config-setup.d.ts → db-config.d.ts}

@@ -1,4 +1,4 @@
 export declare function dbConfigSetup(options: {
     dev: boolean;
 }): Promise<void>;
-//# sourceMappingURL=db-config-setup.d.ts.map
+//# sourceMappingURL=db-config.d.ts.map

package/dist/lib/db-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"db-config.d.ts","sourceRoot":"","sources":["../../src/lib/db-config.ts"],"names":[],"mappings":"AAmCA,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,iBAyO5D"}

package/dist/lib/{db-config-setup.js → db-config.js}

@@ -1,8 +1,10 @@
 import { createConnection } from 'mysql2/promise';
-import { intro, isCancel, outro, text, spinner, note } from '@clack/prompts';
+import * as p from '@clack/prompts';
 import fs from 'fs';
 import path from 'path';
 import { cwd } from 'process';
+import chalk from 'chalk';
+import ora from 'ora';
 /**
  * Removes specific environment variables from the .env file content
  * Removes both the generated comment block and the individual variable lines
@@ -27,67 +29,58 @@ function isValidPort(value) {
 }
 export async function dbConfigSetup(options) {
     const { dev = false } = options;
-    intro(`Welcome to nextjs-cms! Let's set up the database...`);
+    const envFileName = dev ? '.env.development' : '.env.production';
     /**
      * Step 1: Ask for connection credentials
      */
-    note('Please provide your MySQL/MariaDB server credentials', 'Database Connection');
-    const dbHost = await text({
-        message: 'Database host:',
-        placeholder: 'localhost',
-        defaultValue: 'localhost',
-        validate(value) {
-            if (value && value.length < 2)
-                return `Database host must be at least 2 characters`;
-        },
-    });
-    if (isCancel(dbHost)) {
-        outro(`nextjs-cms init cancelled by user.`);
-        return;
-    }
-    const dbPort = await text({
-        message: 'Database port:',
-        placeholder: '3306',
-        defaultValue: '3306',
-        validate(value) {
-            if (value && !isValidPort(value)) {
-                return `Database port must be a valid number between 1 and 65535`;
-            }
-        },
-    });
-    if (isCancel(dbPort)) {
-        outro(`nextjs-cms init cancelled by user.`);
-        return;
-    }
-    const dbUser = await text({
-        message: 'Database username:',
-        validate(value) {
-            if (value.length < 1)
-                return `Database username is required`;
-        },
-    });
-    if (isCancel(dbUser)) {
-        outro(`nextjs-cms init cancelled by user.`);
-        return;
-    }
-    const dbPassword = await text({
-        message: 'Database password:',
-        validate(value) {
-            if (value.length < 1)
-                return `Database password is required`;
+    p.log.info('Database Connection');
+    p.log.message('Please provide your MySQL/MariaDB server credentials');
+    const { dbHost, dbPort, dbUser, dbPassword } = await p.group({
+        dbHost: () => p.text({
+            message: 'Database host:',
+            placeholder: 'localhost',
+            defaultValue: 'localhost',
+            validate(value) {
+                if (value && value.length < 2)
+                    return `Database host must be at least 2 characters`;
+            },
+        }),
+        dbPort: () => p.text({
+            message: 'Database port:',
+            placeholder: '3306',
+            defaultValue: '3306',
+            validate(value) {
+                if (value && !isValidPort(value)) {
+                    return `Database port must be a valid number between 1 and 65535`;
+                }
+            },
+        }),
+        dbUser: () => p.text({
+            message: 'Database username:',
+            validate(value) {
+                if (value.length < 1)
+                    return `Database username is required`;
+            },
+        }),
+        dbPassword: () => p.text({
+            message: 'Database password:',
+            validate(value) {
+                if (value.length < 1)
+                    return `Database password is required`;
+            },
+        }),
+    }, {
+        onCancel: () => {
+            p.cancel(`Aborted\n`);
+            process.exit(1);
         },
     });
-    if (isCancel(dbPassword)) {
-        outro(`nextjs-cms init cancelled by user.`);
-        return;
-    }
     /**
      * Step 2: Test the database connection
      */
-    const s = spinner();
+    const s = ora('Testing database connection...').start();
     let migrationClient;
     try {
-        s.start('Testing database connection...');
         /**
          * It's recommended to not use a pool connection for migrations, that's why we're creating a new connection here.
          */
@@ -98,13 +91,14 @@ export async function dbConfigSetup(options) {
             database: '',
             port: parseInt(String(dbPort), 10),
         });
-        s.stop('✓ Connected successfully!');
+        s.stop();
+        p.log.success(chalk.green('✓ Connected successfully!'));
         /**
          * Step 3: Now that connection is successful, ask for database name
          */
-        note('If the database does not exist, it will be created', 'Database Name');
-        const dbName = await text({
+        const dbName = await p.text({
             message: 'Database name:',
+            placeholder: 'If the database does not exist, it will be created',
             validate(value) {
                 if (value.length < 2)
                     return `Database name must be at least 2 characters`;
@@ -114,9 +108,9 @@ export async function dbConfigSetup(options) {
                 }
             },
         });
-        if (isCancel(dbName)) {
-            outro(`nextjs-cms init cancelled by user.`);
-            return;
+        if (p.isCancel(dbName)) {
+            p.cancel(`Aborted\n`);
+            process.exit(1);
         }
         /**
          * Step 4: Create the database
@@ -126,11 +120,12 @@ export async function dbConfigSetup(options) {
          * Let's create the database using parameterized query to prevent SQL injection
          */
         await migrationClient.query('CREATE DATABASE IF NOT EXISTS ??', [dbName]);
-        s.stop('✓ Database created successfully!');
+        s.stop();
+        p.log.success(chalk.green('✓ Database created successfully!'));
         /**
          * Let's save the database credentials in the .env file
          */
-        const envPath = path.resolve(cwd(), dev ? '.env.development' : '.env.production');
+        const envPath = path.resolve(cwd(), envFileName);
         /**
          * If the .env file does not exist, we'll create it
          */
@@ -173,18 +168,45 @@ DB_PASSWORD='${dbPassword}'
             DB_USER: String(dbUser),
             DB_PASSWORD: String(dbPassword),
         };
-        const { reloadAndUpdateEnvironmentVariables } = await import('./reload-env.js');
-        const reloadSuccess = reloadAndUpdateEnvironmentVariables(dbVariables, dev ? '.env.development' : '.env.production');
-        if (reloadSuccess) {
-            console.log('✓ Environment variables reloaded successfully!');
-        }
-        else {
-            console.warn('⚠️ Environment variables written to file but could not be reloaded in current process');
+        const { reloadAndUpdateEnvironmentVariables } = await import('../utils/reload-env.js');
+        reloadAndUpdateEnvironmentVariables(dbVariables, envFileName);
+        /**
+         * Get environment variables from env and check if they are correct
+         */
+        const envDbHost = process.env.DB_HOST;
+        const envDbPort = process.env.DB_PORT;
+        const envDbName = process.env.DB_NAME;
+        const envDbUser = process.env.DB_USER;
+        const envDbPassword = process.env.DB_PASSWORD;
+        // Validate that the values match what we just set
+        const mismatches = [];
+        if (envDbHost !== String(dbHost))
+            mismatches.push('DB_HOST');
+        if (envDbPort !== String(dbPort))
+            mismatches.push('DB_PORT');
+        if (envDbName !== String(dbName))
+            mismatches.push('DB_NAME');
+        if (envDbUser !== String(dbUser))
+            mismatches.push('DB_USER');
+        if (envDbPassword !== String(dbPassword))
+            mismatches.push('DB_PASSWORD');
+        if (mismatches.length > 0) {
+            p.log.error(`✗ Couldn't save database credentials to ${envFileName} file}`);
+            console.error(`Please save these values manually to the ${envFileName} file:`);
+            console.error(`DB_HOST: ${dbHost}`);
+            console.error(`DB_PORT: ${dbPort}`);
+            console.error(`DB_NAME: ${dbName}`);
+            console.error(`DB_USER: ${dbUser}`);
+            console.error(`DB_PASSWORD: ${dbPassword}`);
+            console.error();
+            console.error(chalk.cyan(`and then run: ${chalk.green(`pnpm nextjs-cms ${dev ? '-d' : ''} setup --continue`)} to continue your setup`));
+            process.exit(1);
         }
-        outro(`✓ Database setup completed successfully!`);
+        p.log.message(chalk.cyan(` - Saved database credentials to ${envFileName} file`));
     }
     catch (error) {
-        s.stop('✗ Database setup failed!');
+        s.stop();
+        p.log.error(chalk.red('✗ Database setup failed!'));
         const errorMessage = error instanceof Error ? error.message : String(error);
         const errorCode = error && typeof error === 'object' && 'code' in error ? error.code : null;
         // Provide specific error messages based on error type
@@ -202,7 +224,7 @@ DB_PASSWORD='${dbPassword}'
         else {
             console.error('\n❌ Error:', errorMessage);
         }
-        outro(`\nSetup failed. Please check the errors above and try again.`);
+        p.outro(`\nSetup failed. Please check the errors above and try again.`);
         process.exit(1);
     }
     finally {

package/dist/lib/db-migrate.d.ts

@@ -0,0 +1,2 @@
+export declare function generateDatabaseTables(): Promise<void>;
+//# sourceMappingURL=db-migrate.d.ts.map

package/dist/lib/db-migrate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"db-migrate.d.ts","sourceRoot":"","sources":["../../src/lib/db-migrate.ts"],"names":[],"mappings":"AAOA,wBAAsB,sBAAsB,kBAqF3C"}

package/dist/lib/db-migrate.js

@@ -0,0 +1,84 @@
+import * as p from '@clack/prompts';
+import { execWithSpinner } from '../utils/exec-utils.js';
+import chalk from 'chalk';
+import { MysqlTableChecker } from 'nextjs-cms/core/db';
+import { db } from 'nextjs-cms/db/client';
+import { sql } from 'nextjs-cms/db';
+export async function generateDatabaseTables() {
+    /**
+     * We should first drop all primary keys from the tables
+     */
+    const _existingTables = [];
+    const tablesToCheck = [
+        '__nextjs_cms_tables',
+        'cms_settings',
+        'admins',
+        'admin_privileges',
+        'access_tokens',
+        'editor_photos',
+    ];
+    try {
+        const result = await MysqlTableChecker.getExistingTables();
+        result.forEach((table) => {
+            if (tablesToCheck.includes(table)) {
+                _existingTables.push(table);
+            }
+        });
+        if (_existingTables.length > 0) {
+            const allOrSome = _existingTables.length === tablesToCheck.length ? 'all' : 'some';
+            p.log.warn(chalk.yellow(`You already have ${allOrSome === 'some' ? 'a few required tables from' : ''} a previous database schema:`));
+            for (const table of _existingTables) {
+                p.log.message(chalk.yellow(`  - ${table}`));
+            }
+            p.log.message(chalk.cyan('These tables will be dropped and new ones will be created.'));
+            const answer = await p.select({
+                message: 'Do you want to continue? (y/n)',
+                options: [
+                    { value: 'y', label: 'Yes' },
+                    { value: 'n', label: 'No' },
+                ],
+                initialValue: 'n',
+            });
+            if (p.isCancel(answer) || answer !== 'y') {
+                p.log.error(chalk.red('Aborted\n'));
+                process.exit(1);
+            }
+            try {
+                // Disable foreign key checks to allow dropping tables with foreign key constraints
+                await db.execute(sql `SET FOREIGN_KEY_CHECKS = 0`);
+                // Drop all tables at once
+                for (const table of _existingTables) {
+                    await db.execute(sql `DROP TABLE IF EXISTS \`${sql.raw(table)}\``);
+                }
+                // Re-enable foreign key checks
+                await db.execute(sql `SET FOREIGN_KEY_CHECKS = 1`);
+            }
+            catch (error) {
+                // Re-enable foreign key checks even if there's an error
+                await db.execute(sql `SET FOREIGN_KEY_CHECKS = 1`).catch(() => {
+                    // Ignore errors when re-enabling
+                });
+                console.error(chalk.red('✗ Error dropping existing tables:'), error);
+                p.log.error(chalk.red('✗ Failed to drop existing tables'));
+                throw error;
+            }
+        }
+        const spinner = await execWithSpinner({
+            command: 'pnpm',
+            args: ['drizzle-kit', 'push', '--force', '--config=drizzle.config.ts'],
+            cwd: process.cwd(),
+            stdout: 'pipe', // Show output
+            stderr: 'inherit', // Show errors
+            spinnerText: 'Generating database tables...',
+            checkExitCode: true, // Throw on non-zero exit codes
+            checkStderrForErrors: true, // Also check for errors in output even if exit code is 0
+        });
+        spinner?.stop();
+        p.log.success(chalk.green('✓ Database tables generated'));
+    }
+    catch (error) {
+        console.error(chalk.red('✗ Error generating database tables:'), error);
+        p.log.error(chalk.red('✗ Failed to generate database tables'));
+        process.exit(1);
+    }
+}

package/dist/lib/fix-master-admin.d.ts

@@ -1,2 +1,2 @@
-export declare function fixMasterAdmin(): Promise<void>;
+export declare function fixMasterAdminPrivileges(): Promise<void>;
 //# sourceMappingURL=fix-master-admin.d.ts.map

package/dist/lib/fix-master-admin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fix-master-admin.d.ts","sourceRoot":"","sources":["../../src/lib/fix-master-admin.ts"],"names":[],"mappings":"AAEA,wBAAsB,cAAc,kBAKnC"}
+{"version":3,"file":"fix-master-admin.d.ts","sourceRoot":"","sources":["../../src/lib/fix-master-admin.ts"],"names":[],"mappings":"AAAA,wBAAsB,wBAAwB,kBA6B7C"}