nextjs-cms 0.9.31 → 0.9.33

package/dist/cli/lib/update-sections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-sections.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/update-sections.ts"],"names":[],"mappings":"AAw3EA,wBAAsB,cAAc,CAAC,SAAS,UAAQ,iBAoBrD"}
+{"version":3,"file":"update-sections.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/update-sections.ts"],"names":[],"mappings":"AAklFA,wBAAsB,cAAc,CAAC,SAAS,UAAQ,iBAoBrD"}

package/dist/cli/lib/update-sections.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import { intro, log, select, spinner } from '@clack/prompts';
+import { intro, log, note, select, spinner } from '@clack/prompts';
 import chalk from 'chalk';
 import { eq, sql } from 'drizzle-orm';
 import { getCMSConfig } from '../../core/config/index.js';
@@ -180,7 +180,7 @@ function generateFieldSQL(input) {
             fieldSQL += 'VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci';
             break;
         case is(input, TagsField):
-            fieldSQL += 'VARCHAR(50)  CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci';
+            fieldSQL += 'LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci';
             break;
         default:
             fieldSQL += 'VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci';
@@ -192,8 +192,8 @@ function generateFieldSQL(input) {
     else if (!input.defaultValue) {
         fieldSQL += ' DEFAULT NULL';
     }
-    if (input.defaultValue !== null && input.defaultValue !== undefined && input.required) {
-        // Only add sql default when the field is required,
+    if (input.defaultValue !== null && input.defaultValue !== undefined) {
+        // TODO: Should we only add sql default when the field is required?
         // to allow null values in non-required fields
         // with defaultValue prop set.
         // Example: Admin cleared the defaultValue of
@@ -379,6 +379,125 @@ function buildSelectDbFieldConfig(name, label, type = 'text', required = true) {
         order: 0,
     });
 }
+function emptyTableRegistryConfig() {
+    return { unmanagedColumns: [] };
+}
+function parseTableRegistryConfig(value, tableName) {
+    if (!value)
+        return emptyTableRegistryConfig();
+    try {
+        const parsed = JSON.parse(value);
+        const unmanagedColumns = Array.isArray(parsed.unmanagedColumns)
+            ? parsed.unmanagedColumns.filter((column) => typeof column === 'string' && column.trim().length > 0)
+            : [];
+        return { unmanagedColumns: [...new Set(unmanagedColumns)] };
+    }
+    catch (error) {
+        console.warn(chalk.yellow(`  - Warning: Invalid config for table '${tableName}'. Ignoring table config.`));
+        return emptyTableRegistryConfig();
+    }
+}
+function serializeTableRegistryConfig(config) {
+    return JSON.stringify({
+        unmanagedColumns: [...new Set(config.unmanagedColumns)].sort(),
+    });
+}
+async function updateTableRegistryConfig(tableName, config) {
+    await db
+        .update(NextJsCmsTablesTable)
+        .set({ config: serializeTableRegistryConfig(config) })
+        .where(eq(NextJsCmsTablesTable.tableName, tableName));
+}
+function columnTypeForSelectDbSummary(type) {
+    return type === 'number' ? 'INT' : 'VARCHAR(255)';
+}
+function getFieldSummaryType(field) {
+    switch (true) {
+        case is(field, NumberField):
+            return 'INT';
+        case is(field, TextField):
+            return `VARCHAR(${field.maxLength ?? 255})`;
+        case is(field, TextAreaField) || is(field, RichTextField):
+            return 'LONGTEXT';
+        case is(field, DateField):
+            return field.format === 'datetime' ? 'DATETIME' : 'DATE';
+        case is(field, CheckboxField):
+            return 'BOOLEAN';
+        default:
+            return 'configured';
+    }
+}
+function normalizeColumnTypeForSummary(type) {
+    const normalized = type.toUpperCase();
+    if (normalized === 'INT(11)')
+        return 'INT';
+    return normalized;
+}
+function formatExistingTableColumns(existingStructure) {
+    const columns = Object.values(existingStructure).map((column) => {
+        return `  - ${column.Field}: ${normalizeColumnTypeForSummary(column.Type)}`;
+    });
+    return columns.length > 0 ? columns : ['  - none'];
+}
+function buildDesiredTableSummary(table) {
+    if (table.sectionType === 'selectDb' && table.selectDb) {
+        const identifierSummary = table.selectDb.identifierTypeExplicit
+            ? `  - Identifier: ${table.selectDb.identifier}, identifierType: ${table.selectDb.identifierType} -> ${columnTypeForSelectDbSummary(table.selectDb.identifierType)}`
+            : `  - Identifier: ${table.selectDb.identifier}`;
+        const labelSummary = table.selectDb.labelTypeExplicit
+            ? `  - Label: ${table.selectDb.label}, labelType: ${table.selectDb.labelType} -> ${columnTypeForSelectDbSummary(table.selectDb.labelType)}`
+            : `  - Label: ${table.selectDb.label}`;
+        return [identifierSummary, labelSummary];
+    }
+    return table.fields.flatMap((field) => {
+        return getFieldColumnName(field).map((column) => `  - ${column}: ${getFieldSummaryType(field)}`);
+    });
+}
+function buildExistingTableDifferences(table, existingStructure) {
+    const configuredColumns = table.fields.flatMap(getFieldColumnName);
+    const existingColumns = Object.keys(existingStructure);
+    const missingColumns = configuredColumns.filter((column) => !existingColumns.includes(column));
+    const extraColumns = existingColumns.filter((column) => !configuredColumns.includes(column));
+    const typeMismatches = table.fields.flatMap((field) => {
+        return getFieldColumnName(field).flatMap((column) => {
+            const existingColumn = existingStructure[column];
+            if (!existingColumn)
+                return [];
+            const expectedType = normalizeColumnTypeForSummary(getFieldSummaryType(field));
+            const actualType = normalizeColumnTypeForSummary(existingColumn.Type);
+            if (expectedType === 'CONFIGURED' || expectedType === actualType)
+                return [];
+            return `    - ${column}: config ${expectedType}, table ${actualType}`;
+        });
+    });
+    const differences = [];
+    differences.push(`  - Missing configured columns: ${missingColumns.length > 0 ? missingColumns.join(', ') : 'none'}`);
+    differences.push(`  - Extra existing columns: ${extraColumns.length > 0 ? extraColumns.join(', ') : 'none'}`);
+    if (typeMismatches.length > 0) {
+        differences.push('  - Type mismatches:');
+        differences.push(...typeMismatches);
+    }
+    else {
+        differences.push('  - Type mismatches: none');
+    }
+    return differences;
+}
+function buildExistingTablePromptMessage(table, existingStructure) {
+    return [
+        `Table '${table.name}' already exists in your database, here's the table and config summary:`,
+        '',
+        'Your config:',
+        ...buildDesiredTableSummary(table),
+        '',
+        'Existing table:',
+        ...formatExistingTableColumns(existingStructure),
+        '',
+        'Differences:',
+        ...buildExistingTableDifferences(table, existingStructure),
+        '',
+        'How do you want to handle this table?',
+    ].join('\n');
+}
 function buildLocaleFieldConfig() {
     return textField({
         name: 'locale',
@@ -440,6 +559,12 @@ async function ensureTableRegistryEntry(tableName, sectionName) {
         console.error('Error inserting into __nextjs_cms_tables table:', error);
     });
 }
+async function ensureTableRegistryConfigColumn() {
+    const columns = await MysqlTableChecker.getColumns('__nextjs_cms_tables');
+    if (columns.includes('config'))
+        return;
+    await db.execute(sql `ALTER TABLE __nextjs_cms_tables ADD COLUMN config LONGTEXT NULL`);
+}
 async function createTable(table, options) {
     /**
      * Generate the CREATE TABLE SQL
@@ -669,6 +794,14 @@ async function updateTable(table, s, ctx) {
      * Filter out the fields that already exist in the table
      */
     const existingFields = existingFieldsData ? Object.keys(existingFieldsData) : [];
+    const configuredFields = table.fields.flatMap(getFieldColumnName);
+    const tableConfig = parseTableRegistryConfig(table.config, table.name);
+    const prunedUnmanagedColumns = tableConfig.unmanagedColumns.filter((column) => existingFields.includes(column) && !configuredFields.includes(column));
+    if (prunedUnmanagedColumns.length !== tableConfig.unmanagedColumns.length) {
+        tableConfig.unmanagedColumns = prunedUnmanagedColumns;
+        await updateTableRegistryConfig(table.name, tableConfig);
+    }
+    const unmanagedColumns = new Set(tableConfig.unmanagedColumns);
     const fieldsToAdd = table.fields.filter((field) => !getFieldColumnName(field).some((col) => existingFields.includes(col)));
     /**
      * Let's find out fields that need to be updated.
@@ -682,8 +815,9 @@ async function updateTable(table, s, ctx) {
      * or if it has a destinationDb, TODO: Add the values to the destination table? (CRITICAL! Loss of data if not done)
      * we should mark it for removal.
      */
-    let fieldsToRemove = existingFields.filter((existingField) => !table.fields.some((field) => getFieldColumnName(field).includes(existingField)) ||
-        table.fields.some((field) => field.destinationDb && getFieldColumnName(field).includes(existingField)));
+    let fieldsToRemove = existingFields.filter((existingField) => !unmanagedColumns.has(existingField) &&
+        (!table.fields.some((field) => getFieldColumnName(field).includes(existingField)) ||
+            table.fields.some((field) => field.destinationDb && getFieldColumnName(field).includes(existingField))));
     /**
      * Check if there are fields to update
      */
@@ -907,15 +1041,18 @@ async function updateTable(table, s, ctx) {
         s.stop('Found ' + fieldsToRemove.length + ' field(s) to remove:');
         for (const field of fieldsToRemove) {
             const shouldRemove = await select({
-                message: `You are about to remove field '${field}' of table '${table.name}'. Remove it?`,
+                message: `Field '${field}' exists in table '${table.name}' but is not in your config.\n\nWhat do you want to do?`,
                 options: [
-                    { value: 'no', label: 'No' },
-                    { value: 'yes', label: 'Yes' },
+                    { value: 'yes', label: 'Drop field' },
+                    { value: 'no', label: 'Keep field' },
+                    { value: 'ask_later', label: 'Ask me later' },
                 ],
                 initialValue: 'no',
             });
             if (shouldRemove === 'yes') {
                 log.info(chalk.red(`Removing field '${field}'`));
+                tableConfig.unmanagedColumns = tableConfig.unmanagedColumns.filter((column) => column !== field);
+                await updateTableRegistryConfig(table.name, tableConfig);
                 alterTableSQLs.push({
                     field: field,
                     table: table.name,
@@ -923,8 +1060,13 @@ async function updateTable(table, s, ctx) {
                     sql: `DROP COLUMN \`${field}\``,
                 });
             }
+            else if (shouldRemove === 'no') {
+                tableConfig.unmanagedColumns = [...new Set([...tableConfig.unmanagedColumns, field])];
+                await updateTableRegistryConfig(table.name, tableConfig);
+                log.info(chalk.yellow(`- Field ${chalk.underline.italic(field)} kept as an unmanaged column.`));
+            }
             else {
-                log.info(chalk.yellow(`- Field ${chalk.underline.italic(field)} not removed.`));
+                log.info(chalk.yellow(`- Field ${chalk.underline.italic(field)} not removed. You will be asked again later.`));
             }
         }
         s.start();
@@ -961,7 +1103,7 @@ async function updateTable(table, s, ctx) {
     sqlErrors += keyErrors;
     s.stop(chalk.italic.hex(`${sqlErrors > 0 ? `#FFA500` : `#fafafa`}`)(`- Table \`${table.name}\` modified successfully ${sqlErrors > 0 ? `with ${sqlErrors} error(s).` : ''}`));
 }
-const main = async (s) => {
+const main = async (spinnerObject) => {
     const cmsConfig = await getCMSConfig();
     const schemaGenerationEnabled = cmsConfig.schemaGeneration.drizzle.enabled;
     const schemaOutDir = cmsConfig.schemaGeneration.drizzle.outDir;
@@ -973,7 +1115,7 @@ const main = async (s) => {
      */
     if (schemaGenerationEnabled) {
         console.log(chalk.white(`Generating Drizzle schema...`));
-        s.start();
+        spinnerObject.start();
     }
     else {
         console.log(chalk.yellow(`Schema generation is disabled. Skipping Drizzle schema generation.`));
@@ -987,8 +1129,7 @@ const main = async (s) => {
     const externalSelectDbTables = new Set();
     const localesTableAssetMetadata = new Map();
     sections = await SectionFactory.getSectionsSilently();
-    console.log(`Found ${sections.length} section(s) to insert: `);
-    console.log(chalk.gray(sections.map((s) => s.name).join(', ')));
+    note(sections.length === 0 ? chalk.dim('(none)') : sections.map((s) => chalk.gray(`• ${s.name}`)).join('\n'), `Sections to insert (${sections.length})`);
     /**
      * Let's see if the table `__nextjs_cms_tables` exists in the database.
      * If it doesn't, we'll create it using the same schema as `NextJsCmsTablesTable`.
@@ -997,9 +1138,11 @@ const main = async (s) => {
             CREATE TABLE IF NOT EXISTS __nextjs_cms_tables (
                 name VARCHAR(100) NOT NULL PRIMARY KEY,
                 section VARCHAR(200),
+                config LONGTEXT,
                 created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
             )
         `);
+    await ensureTableRegistryConfigColumn();
     /**
      * Persistent key/value store for CMS-level state that must survive config removal.
      */
@@ -1017,6 +1160,7 @@ const main = async (s) => {
     existingTables = await db
         .select({
         name: NextJsCmsTablesTable.tableName,
+        config: NextJsCmsTablesTable.config,
     })
         .from(NextJsCmsTablesTable);
     /**
@@ -1113,9 +1257,11 @@ const main = async (s) => {
         for (const field of s.fields) {
             if (isExternalSelectDbField(field) && !externalSelectDbTables.has(field.db.table)) {
                 externalSelectDbTables.add(field.db.table);
-                const identifierFieldConfig = buildSelectDbFieldConfig(field.db.identifier, 'Option Id', field.db.identifierType ?? 'text');
-                const labelFieldConfig = buildSelectDbFieldConfig(field.db.label, 'Option Label');
-                const selectDbFieldConfigs = [identifierFieldConfig, labelFieldConfig];
+                const identifierType = field.db.identifierType ?? 'text';
+                const labelType = field.db.labelType ?? 'text';
+                const identifierFieldConfig = buildSelectDbFieldConfig(field.db.identifier, 'Option Id', identifierType);
+                const typedLabelFieldConfig = buildSelectDbFieldConfig(field.db.label, 'Option Label', labelType);
+                const selectDbFieldConfigs = [identifierFieldConfig, typedLabelFieldConfig];
                 if (field.db.orderBy &&
                     field.db.orderBy !== field.db.identifier &&
                     field.db.orderBy !== field.db.label) {
@@ -1128,6 +1274,14 @@ const main = async (s) => {
                     sectionType: 'selectDb',
                     identifier: identifierFieldConfig,
                     primaryKey: [identifierFieldConfig],
+                    selectDb: {
+                        identifier: field.db.identifier,
+                        identifierType,
+                        identifierTypeExplicit: field.db.identifierType !== undefined,
+                        label: field.db.label,
+                        labelType,
+                        labelTypeExplicit: field.db.labelType !== undefined,
+                    },
                 });
                 const selectDbSchema = generateDrizzleSchema({
                     name: field.db.table,
@@ -1138,7 +1292,7 @@ const main = async (s) => {
                 selectDbSchema.drizzleImports.forEach((type) => drizzleImports.add(type));
             }
             if (field.destinationDb) {
-                console.log('Destination DB found for input:', field.name, 'with table:', field.destinationDb.table);
+                log.info(`Destination DB found for input: ${chalk.cyan(field.name)} with table: ${chalk.cyan(field.destinationDb.table)}`);
                 const parentIdentifierType = s.db.identifier.type;
                 const referenceIdFieldConfig = parentIdentifierType === 'number'
                     ? numberField({
@@ -1385,7 +1539,7 @@ const main = async (s) => {
      * Reject the run before schema writes if any section configuration is unsafe.
      */
     if (configurationErrors.length > 0) {
-        s.stop(`update-sections aborted: ${configurationErrors.length} configuration conflict(s) detected.\n` +
+        spinnerObject.stop(`update-sections aborted: ${configurationErrors.length} configuration conflict(s) detected.\n` +
             configurationErrors.map((e) => `  - ${e}`).join('\n') +
             `\n\nThe suffix '${RESERVED_TABLE_SUFFIX}' and the column name '${RESERVED_COLUMN_NAME}' are reserved for the localization system. Section-managed tables must be referenced with the 'section' prop. Please update cms.config.ts and re-run.`);
         throw new Error('update-sections: configuration conflicts detected');
@@ -1408,10 +1562,10 @@ const main = async (s) => {
             "} from 'drizzle-orm/mysql-core'\n\n" +
             drizzleTableSchemas.join('\n');
         fs.writeFileSync(schemaFilePath, schemaFileContent, 'utf8');
-        s.stop();
+        spinnerObject.stop();
     }
     console.log(chalk.white('Finding tables to create, update or remove...'));
-    s.start();
+    spinnerObject.start();
     /**
      * Filter out the tables that already exist in the database
      */
@@ -1420,23 +1574,24 @@ const main = async (s) => {
      * Let's find out tables that need to be updated.
      * If a table exists in both the desired tables and the existing tables, we should mark it for update.
      */
-    const tablesToUpdate = desiredTables.filter((table) => existingTables.some((existingTable) => existingTable.name === table.name));
+    const tablesToUpdate = desiredTables
+        .filter((table) => existingTables.some((existingTable) => existingTable.name === table.name))
+        .map((table) => {
+        const existingTable = existingTables.find((existingTable) => existingTable.name === table.name);
+        return { ...table, config: existingTable?.config };
+    });
     /**
      * Let's find out tables to remove as well.
      * If a table exists in the database but not in the desired tables, we should mark it for removal.
      */
     let tablesToRemove = existingTables.filter((existingTable) => !desiredTables.some((table) => table.name === existingTable.name));
-    s.stop();
-    console.log('Desired tables:');
-    console.log(chalk.gray(desiredTables.map((table) => table.name).join(', ')));
-    console.log('Existing tables:');
-    console.log(chalk.gray(existingTables.map((table) => table.name).join(', ')));
-    console.log('Tables to update:');
-    console.log(chalk.gray(tablesToUpdate.map((table) => table.name).join(', ')));
-    console.log('Tables to create:');
-    console.log(chalk.gray(tablesToCreate.map((table) => table.name).join(', ')));
-    console.log('Tables to remove:');
-    console.log(chalk.gray(tablesToRemove.map((table) => table.name).join(', ')));
+    spinnerObject.stop();
+    const formatTableList = (tables, color) => tables.length === 0 ? chalk.dim('(none)') : tables.map((table) => color(`• ${table.name}`)).join('\n');
+    note(formatTableList(desiredTables, chalk.gray), `Desired tables (${desiredTables.length})`);
+    note(formatTableList(existingTables, chalk.gray), `Existing tables (${existingTables.length})`);
+    note(formatTableList(tablesToUpdate, chalk.yellow), `Tables to update (${tablesToUpdate.length})`);
+    note(formatTableList(tablesToCreate, chalk.green), `Tables to create (${tablesToCreate.length})`);
+    note(formatTableList(tablesToRemove, chalk.red), `Tables to remove (${tablesToRemove.length})`);
     console.log(`\n`);
     intro(chalk.inverse(' update-sections '));
     const localizationCurrentlyEnabled = cmsConfig.localization?.enabled === true;
@@ -1473,12 +1628,12 @@ const main = async (s) => {
         const storedPendingDisableLocalizationState = storedEnabledLocalizationState?.transition?.type === 'disable' ? storedEnabledLocalizationState : null;
         if (storedEnabledLocalizationState &&
             storedEnabledLocalizationState.defaultLocale !== configLocalizationState.defaultLocale) {
-            s.stop(`Aborting. Changing localization defaultLocale is not supported (stored='${storedEnabledLocalizationState.defaultLocale}', config='${configLocalizationState.defaultLocale}'). Revert cms.config.ts and re-run update-sections.`);
+            spinnerObject.stop(`Aborting. Changing localization defaultLocale is not supported (stored='${storedEnabledLocalizationState.defaultLocale}', config='${configLocalizationState.defaultLocale}'). Revert cms.config.ts and re-run update-sections.`);
             return;
         }
         if (storedPendingEnableLocalizationState &&
             storedPendingEnableLocalizationState.defaultLocale !== configLocalizationState.defaultLocale) {
-            s.stop(`Aborting. Changing localization defaultLocale while enable is pending is not supported (stored='${storedPendingEnableLocalizationState.defaultLocale}', config='${configLocalizationState.defaultLocale}'). Revert cms.config.ts and re-run update-sections.`);
+            spinnerObject.stop(`Aborting. Changing localization defaultLocale while enable is pending is not supported (stored='${storedPendingEnableLocalizationState.defaultLocale}', config='${configLocalizationState.defaultLocale}'). Revert cms.config.ts and re-run update-sections.`);
             return;
         }
         /**
@@ -1509,7 +1664,7 @@ const main = async (s) => {
                 : `  - No existing tables need a locale backfill; update-sections will verify localized tables after sync.`;
             const isEnableRetry = storedPendingEnableLocalizationState?.transition.status === 'pending';
             const isDisableRecovery = storedPendingDisableLocalizationState?.transition?.status === 'pending';
-            s.stop();
+            spinnerObject.stop();
             const confirm = await select({
                 message: (isDisableRecovery
                     ? `A previous localization disable attempt did not complete, but cms.config.ts has localization enabled again. update-sections will repair localization artifacts and clear the pending disable state after verification.\n\n`
@@ -1527,7 +1682,7 @@ const main = async (s) => {
                 initialValue: 'no',
             });
             if (confirm !== 'yes') {
-                s.stop('Aborted. Reconfigure cms.config.ts and re-run update-sections.');
+                spinnerObject.stop('Aborted. Reconfigure cms.config.ts and re-run update-sections.');
                 return;
             }
             localizationTransition = 'enable';
@@ -1539,7 +1694,7 @@ const main = async (s) => {
                 ...(isEnableRetry || isDisableRecovery ? { lastAttemptAt: now } : {}),
             });
             await writeStoredLocalizationState(enablePendingState);
-            s.start();
+            spinnerObject.start();
         }
         await ensureEditorPhotosLocaleColumn(configLocalizationState.defaultLocale, editorPhotosColumns);
     }
@@ -1564,7 +1719,7 @@ const main = async (s) => {
                 affected.push({ name: existing.name, type: 'localized_table' });
             }
         }
-        s.stop();
+        spinnerObject.stop();
         const isDisableRetry = storedEnabledLocalizationState.transition?.status === 'pending';
         const confirm = await select({
             message: (isDisableRetry
@@ -1586,7 +1741,7 @@ const main = async (s) => {
             initialValue: 'no',
         });
         if (confirm !== 'yes') {
-            s.stop('Aborted. Reconfigure cms.config.ts and re-run update-sections.');
+            spinnerObject.stop('Aborted. Reconfigure cms.config.ts and re-run update-sections.');
             return;
         }
         localizationTransition = 'disable';
@@ -1626,7 +1781,7 @@ const main = async (s) => {
         else {
             log.info(chalk.gray(`  - 'editor_photos' already delocalized; resuming junction/_locales cleanup.`));
         }
-        s.start();
+        spinnerObject.start();
     }
     const defaultLocaleCode = localizationCurrentlyEnabled
         ? (cmsConfig.localization?.defaultLocale ?? storedEnabledLocalizationState?.defaultLocale ?? 'en')
@@ -1640,7 +1795,7 @@ const main = async (s) => {
          * Loop through the tables to update
          */
         for (const table of tablesToUpdate) {
-            await updateTable(table, s, ctx);
+            await updateTable(table, spinnerObject, ctx);
         }
     }
     /**
@@ -1652,23 +1807,26 @@ const main = async (s) => {
          * Loop through the tables to create
          */
         for (const table of tablesToCreate) {
-            const tableExistsInDatabase = (await MysqlTableChecker.getExistingTableStructure(table.name)) !== null;
-            if (tableExistsInDatabase) {
-                s.stop();
-                const overwriteExistingTable = await select({
-                    message: `Table '${table.name}' already exists in your database, overwrite its fields if any?`,
+            const existingTableStructure = await MysqlTableChecker.getExistingTableStructure(table.name);
+            if (existingTableStructure) {
+                spinnerObject.stop();
+                const handleExistingTable = await select({
+                    message: buildExistingTablePromptMessage(table, existingTableStructure),
                     options: [
-                        { value: 'yes', label: 'Yes, overwrite fields' },
-                        { value: 'no', label: 'No, skip for now' },
+                        { value: 'configure', label: 'Configure table (Recommended)' },
+                        {
+                            value: 'ask_later',
+                            label: 'Ask later and skip for now (Not recommended and may produce runtime errors!)',
+                        },
                     ],
-                    initialValue: 'yes',
+                    initialValue: 'configure',
                 });
-                if (overwriteExistingTable === 'yes') {
+                if (handleExistingTable === 'configure') {
                     await ensureTableRegistryEntry(table.name, table.sectionName);
-                    await updateTable(table, s, ctx);
+                    await updateTable(table, spinnerObject, ctx);
                 }
                 else {
-                    console.log(chalk.yellow(`Skipping existing table '${table.name}'.`));
+                    console.log(chalk.yellow(`Skipping existing table '${table.name}'. You will be asked again later.`));
                 }
                 continue;
             }
@@ -1677,7 +1835,7 @@ const main = async (s) => {
              * If there are, ask the user if they want to create the new table or rename a removed table
              */
             if (tablesToRemove.length > 0) {
-                s.stop();
+                spinnerObject.stop();
                 const opType = await select({
                     message: `Is table '${table.name}' for section '${table.sectionName}' a new table?`,
                     options: [
@@ -1685,7 +1843,7 @@ const main = async (s) => {
                         { value: 'rename', label: 'Rename existing table' },
                     ],
                 });
-                s.start();
+                spinnerObject.start();
                 switch (opType) {
                     case 'new': {
                         console.log(chalk.blueBright(`Creating table '${table.name}' for section '${table.sectionName}'`));
@@ -1694,7 +1852,7 @@ const main = async (s) => {
                         break;
                     }
                     case 'rename': {
-                        s.stop();
+                        spinnerObject.stop();
                         const tableToRename = await select({
                             message: `Select the table to rename to '${table.name}'`,
                             options: tablesToRemove.map((table) => {
@@ -1704,7 +1862,7 @@ const main = async (s) => {
                         if (tableToRename && typeof tableToRename === 'string') {
                             console.log(`Renaming table '${tableToRename}' to '${table.name}'`);
                             await renameTable(tableToRename, table.name);
-                            await updateTable(table, s, ctx);
+                            await updateTable(table, spinnerObject, ctx);
                             /**
                              * Remove the table from the tablesToRemove array
                              */
@@ -1750,7 +1908,7 @@ const main = async (s) => {
                 opType = autoDropLocales;
             }
             else {
-                s.stop();
+                spinnerObject.stop();
                 opType = await select({
                     message: `You are about to remove table '${table.name}'. Proceed?`,
                     options: [
@@ -1760,7 +1918,7 @@ const main = async (s) => {
                     ],
                     initialValue: 'later',
                 });
-                s.start();
+                spinnerObject.start();
             }
             switch (opType) {
                 case 'yes':

package/dist/cli/utils/schema-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-generator.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/schema-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAoB7D,MAAM,WAAW,YAAY;IACzB,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAA;IACzC,iBAAiB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAA;CAC7C;AAED,MAAM,WAAW,YAAY;IACzB,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,YAAY,CAAA;IAChD,OAAO,EAAE,WAAW,GAAG,WAAW,GAAG,YAAY,CAAA;CACpD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CA8BtE;AAED,wBAAgB,qBAAqB,CACjC,KAAK,EAAE;IACH,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,UAAU,CAAC,EAAE,WAAW,CAAA;IACxB,mBAAmB,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACxC,KAAK,CAAC,EAAE;QAAE,OAAO,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACxD,MAAM,CAAC,EAAE;QAAE,OAAO,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACzD,QAAQ,CAAC,EAAE;QAAE,OAAO,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAC9D,EACD,YAAY,EAAE,YAAY,GAC3B;IACC,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,MAAM,EAAE,CAAA;CAC3B,CA4MA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE;IAC/C,eAAe,EAAE,MAAM,CAAA;IACvB,gBAAgB,EAAE,WAAW,CAAA;IAC7B,eAAe,EAAE,WAAW,EAAE,CAAA;IAC9B,YAAY,EAAE,YAAY,CAAA;CAC7B,GAAG;IACA,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,MAAM,EAAE,CAAA;CAC3B,CA+CA"}
+{"version":3,"file":"schema-generator.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/schema-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAoB7D,MAAM,WAAW,YAAY;IACzB,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAA;IACzC,iBAAiB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAA;CAC7C;AAED,MAAM,WAAW,YAAY;IACzB,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,YAAY,CAAA;IAChD,OAAO,EAAE,WAAW,GAAG,WAAW,GAAG,YAAY,CAAA;CACpD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CA8BtE;AAED,wBAAgB,qBAAqB,CACjC,KAAK,EAAE;IACH,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,UAAU,CAAC,EAAE,WAAW,CAAA;IACxB,mBAAmB,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACxC,KAAK,CAAC,EAAE;QAAE,OAAO,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACxD,MAAM,CAAC,EAAE;QAAE,OAAO,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACzD,QAAQ,CAAC,EAAE;QAAE,OAAO,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAC9D,EACD,YAAY,EAAE,YAAY,GAC3B;IACC,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,MAAM,EAAE,CAAA;CAC3B,CA+MA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE;IAC/C,eAAe,EAAE,MAAM,CAAA;IACvB,gBAAgB,EAAE,WAAW,CAAA;IAC7B,eAAe,EAAE,WAAW,EAAE,CAAA;IAC9B,YAAY,EAAE,YAAY,CAAA;CAC7B,GAAG;IACA,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,MAAM,EAAE,CAAA;CAC3B,CA+CA"}

package/dist/cli/utils/schema-generator.js

@@ -152,13 +152,16 @@ export function generateDrizzleSchema(table, caseStyleFns) {
                 }
                 break;
             case 'map':
-            case 'tags':
             case 'photo':
             case 'video':
             case 'document':
                 columnType = `varchar('${input.name}', { length: 255 })`; // TEXT type
                 drizzleColumnType = 'varchar';
                 break;
+            case 'tags':
+                columnType = `longtext('${input.name}')`;
+                drizzleColumnType = 'longtext';
+                break;
             default:
                 // TODO: Should I throw an error instead?
                 columnType = `varchar('${input.name}', { length: 255 })`;