nextjs-cms 0.9.21 → 0.9.22

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":"AAmzEA,wBAAsB,cAAc,CAAC,SAAS,UAAQ,iBAoBrD"}
+{"version":3,"file":"update-sections.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/update-sections.ts"],"names":[],"mappings":"AAm3EA,wBAAsB,cAAc,CAAC,SAAS,UAAQ,iBAoBrD"}

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

@@ -383,6 +383,40 @@ function buildLocaleFieldConfig() {
         order: 0,
     });
 }
+async function createEditorPhotosTable(localized) {
+    await db.execute(sql `
+        CREATE TABLE IF NOT EXISTS \`editor_photos\` (
+            \`photo\` VARCHAR(100) NOT NULL PRIMARY KEY,
+            \`section\` VARCHAR(100) NOT NULL,
+            \`item_id\` VARCHAR(50) NOT NULL,
+            \`field\` VARCHAR(100) NOT NULL,
+            \`meta\` LONGTEXT,
+            ${localized ? sql `\`locale\` VARCHAR(10) NOT NULL,` : sql ``}
+            \`linked\` BOOLEAN DEFAULT false,
+            \`created_at\` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+        )
+    `);
+}
+async function ensureEditorPhotosLocaleColumn(defaultLocaleCode, knownColumns) {
+    let columns = knownColumns ?? (await MysqlTableChecker.getColumns('editor_photos').catch(() => []));
+    if (columns.includes('locale')) {
+        return false;
+    }
+    if (columns.length === 0) {
+        await createEditorPhotosTable(true);
+        columns = await MysqlTableChecker.getColumns('editor_photos').catch(() => []);
+        if (columns.includes('locale')) {
+            log.info(chalk.gray(`  - Created 'editor_photos' table with 'locale' column.`));
+            return true;
+        }
+        throw new Error(`Failed to create 'editor_photos' table with a 'locale' column.`);
+    }
+    await db.execute(sql `ALTER TABLE \`editor_photos\` ADD COLUMN \`locale\` VARCHAR(10) DEFAULT NULL`);
+    await db.execute(sql `UPDATE \`editor_photos\` SET \`locale\` = ${defaultLocaleCode} WHERE \`locale\` IS NULL`);
+    await db.execute(sql `ALTER TABLE \`editor_photos\` MODIFY COLUMN \`locale\` VARCHAR(10) NOT NULL`);
+    log.info(chalk.gray(`  - Added 'locale' column to 'editor_photos' and backfilled existing rows with '${defaultLocaleCode}'.`));
+    return true;
+}
 async function ensureTableRegistryEntry(tableName, sectionName) {
     await db
         .insert(NextJsCmsTablesTable)
@@ -987,46 +1021,54 @@ const main = async (s) => {
      */
     const RESERVED_TABLE_SUFFIX = '_locales';
     const RESERVED_COLUMN_NAME = 'locale';
-    const reservedNameErrors = [];
+    const configurationErrors = [];
+    const builtSections = sections.map((_s) => {
+        const section = _s.build();
+        section.buildFields();
+        return section;
+    });
+    const managedSectionTables = new Map(builtSections.map((section) => [section.db.table, section.name]));
     /**
      * Insert the sections into the database
      */
-    for (const _s of sections) {
-        const s = _s.build();
-        s.buildFields();
+    for (const s of builtSections) {
         localesTableAssetMetadata.set(s.localesTableName, {
             sectionName: s.name,
             fields: getLocalizedAssetFields(s.fieldConfigs),
         });
         if (s.db.table.endsWith(RESERVED_TABLE_SUFFIX)) {
-            reservedNameErrors.push(`Section '${s.name}': table name '${s.db.table}' ends with reserved suffix '${RESERVED_TABLE_SUFFIX}'.`);
+            configurationErrors.push(`Section '${s.name}': table name '${s.db.table}' ends with reserved suffix '${RESERVED_TABLE_SUFFIX}'.`);
         }
         for (const field of s.fields) {
             if (field.name === RESERVED_COLUMN_NAME) {
-                reservedNameErrors.push(`Section '${s.name}', field '${field.name}': field name '${RESERVED_COLUMN_NAME}' is reserved.`);
+                configurationErrors.push(`Section '${s.name}', field '${field.name}': field name '${RESERVED_COLUMN_NAME}' is reserved.`);
             }
             if (field.destinationDb) {
                 if (field.destinationDb.table.endsWith(RESERVED_TABLE_SUFFIX)) {
-                    reservedNameErrors.push(`Section '${s.name}', field '${field.name}': destinationDb.table '${field.destinationDb.table}' ends with reserved suffix '${RESERVED_TABLE_SUFFIX}'.`);
+                    configurationErrors.push(`Section '${s.name}', field '${field.name}': destinationDb.table '${field.destinationDb.table}' ends with reserved suffix '${RESERVED_TABLE_SUFFIX}'.`);
                 }
                 if (field.destinationDb.itemIdentifier === RESERVED_COLUMN_NAME ||
                     field.destinationDb.selectIdentifier === RESERVED_COLUMN_NAME) {
-                    reservedNameErrors.push(`Section '${s.name}', field '${field.name}': destinationDb identifier column name '${RESERVED_COLUMN_NAME}' is reserved.`);
+                    configurationErrors.push(`Section '${s.name}', field '${field.name}': destinationDb identifier column name '${RESERVED_COLUMN_NAME}' is reserved.`);
                 }
             }
             if (isExternalSelectDbField(field)) {
+                const ownerSectionName = managedSectionTables.get(field.db.table);
+                if (ownerSectionName) {
+                    configurationErrors.push(`Section '${s.name}', field '${field.name}': db.table '${field.db.table}' belongs to managed section '${ownerSectionName}'. Use the 'section' prop instead of 'db' so update-sections does not treat the section table as an external lookup table.`);
+                }
                 if (field.db.table.endsWith(RESERVED_TABLE_SUFFIX)) {
-                    reservedNameErrors.push(`Section '${s.name}', field '${field.name}': db.table '${field.db.table}' ends with reserved suffix '${RESERVED_TABLE_SUFFIX}'.`);
+                    configurationErrors.push(`Section '${s.name}', field '${field.name}': db.table '${field.db.table}' ends with reserved suffix '${RESERVED_TABLE_SUFFIX}'.`);
                 }
                 const reservedColumns = [field.db.identifier, field.db.label, field.db.orderBy].filter((column) => column === RESERVED_COLUMN_NAME);
                 if (reservedColumns.length > 0) {
-                    reservedNameErrors.push(`Section '${s.name}', field '${field.name}': db column name '${RESERVED_COLUMN_NAME}' is reserved.`);
+                    configurationErrors.push(`Section '${s.name}', field '${field.name}': db column name '${RESERVED_COLUMN_NAME}' is reserved.`);
                 }
             }
         }
         const galleryForValidation = await s.getGallery();
         if (galleryForValidation?.db.tableName && galleryForValidation.db.tableName.endsWith(RESERVED_TABLE_SUFFIX)) {
-            reservedNameErrors.push(`Section '${s.name}': gallery table '${galleryForValidation.db.tableName}' ends with reserved suffix '${RESERVED_TABLE_SUFFIX}'.`);
+            configurationErrors.push(`Section '${s.name}': gallery table '${galleryForValidation.db.tableName}' ends with reserved suffix '${RESERVED_TABLE_SUFFIX}'.`);
         }
         /**
          * Generate the Drizzle schema for the table
@@ -1335,13 +1377,13 @@ const main = async (s) => {
         }
     }
     /**
-     * Reject the run before any DB write if any section used a reserved name.
+     * Reject the run before schema writes if any section configuration is unsafe.
      */
-    if (reservedNameErrors.length > 0) {
-        s.stop(`update-sections aborted: ${reservedNameErrors.length} reserved-name conflict(s) detected.\n` +
-            reservedNameErrors.map((e) => `  - ${e}`).join('\n') +
-            `\n\nThe suffix '${RESERVED_TABLE_SUFFIX}' and the column name '${RESERVED_COLUMN_NAME}' are reserved for the localization system. Please rename and re-run.`);
-        throw new Error('update-sections: reserved name conflicts detected');
+    if (configurationErrors.length > 0) {
+        s.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');
     }
     /**
      * Write schema file if schema generation is enabled
@@ -1423,6 +1465,7 @@ const main = async (s) => {
     if (localizationCurrentlyEnabled && cmsConfig.localization) {
         const configLocalizationState = buildStoredEnabledLocalizationState(cmsConfig.localization);
         enableTargetState = configLocalizationState;
+        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.`);
@@ -1451,18 +1494,23 @@ const main = async (s) => {
             }
         }
         const needsEditorPhotosMigration = editorPhotosExists && !editorPhotosHasLocale;
-        const shouldRunEnableTransition = storedPendingEnableLocalizationState || !storedEnabledLocalizationState;
+        const shouldRunEnableTransition = storedPendingEnableLocalizationState ||
+            !storedEnabledLocalizationState ||
+            storedPendingDisableLocalizationState;
         if (shouldRunEnableTransition) {
             const affectedList = [...(needsEditorPhotosMigration ? ['editor_photos'] : []), ...affectedLocalizedTables];
             const affectedListText = affectedList.length > 0
                 ? affectedList.map((n) => `  - ${n}`).join('\n')
                 : `  - 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();
             const confirm = await select({
-                message: (isEnableRetry
-                    ? `A previous localization enable attempt did not complete. update-sections will retry setup now.\n\n`
-                    : `It looks like you enabled localization. Your existing data in these tables will be marked as defaultLocale '${configLocalizationState.defaultLocale}':\n`) +
+                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`
+                    : isEnableRetry
+                        ? `A previous localization enable attempt did not complete. update-sections will retry setup now.\n\n`
+                        : `It looks like you enabled localization. Your existing data in these tables will be marked as defaultLocale '${configLocalizationState.defaultLocale}':\n`) +
                     affectedListText +
                     `\n\n${chalk.redBright('WARNING:')} Existing data in these tables MUST already be in '${configLocalizationState.defaultLocale}'. ` +
                     `Changing defaultLocale after this point is not supported. If your data is not in '${configLocalizationState.defaultLocale}', ` +
@@ -1483,22 +1531,12 @@ const main = async (s) => {
                 type: 'enable',
                 status: 'pending',
                 startedAt: storedPendingEnableLocalizationState?.transition.startedAt ?? now,
-                ...(isEnableRetry ? { lastAttemptAt: now } : {}),
+                ...(isEnableRetry || isDisableRecovery ? { lastAttemptAt: now } : {}),
             });
             await writeStoredLocalizationState(enablePendingState);
-            if (needsEditorPhotosMigration) {
-                try {
-                    await db.execute(sql `ALTER TABLE \`editor_photos\` ADD COLUMN \`locale\` VARCHAR(10) DEFAULT NULL`);
-                    await db.execute(sql `UPDATE \`editor_photos\` SET \`locale\` = ${configLocalizationState.defaultLocale} WHERE \`locale\` IS NULL`);
-                    await db.execute(sql `ALTER TABLE \`editor_photos\` MODIFY COLUMN \`locale\` VARCHAR(10) NOT NULL`);
-                    log.info(chalk.gray(`  - Added 'locale' column to 'editor_photos' and backfilled existing rows with '${configLocalizationState.defaultLocale}'.`));
-                }
-                catch (error) {
-                    console.error(chalk.red(`  - Error migrating 'editor_photos' for localization enable:`, error));
-                }
-            }
             s.start();
         }
+        await ensureEditorPhotosLocaleColumn(configLocalizationState.defaultLocale, editorPhotosColumns);
     }
     else if (!localizationCurrentlyEnabled && storedEnabledLocalizationState) {
         /**
@@ -1534,6 +1572,7 @@ const main = async (s) => {
                 `  3. Drop '_locales' tables entirely\n\n` +
                 `Affected tables:\n` +
                 affected.map((t) => `  - ${t.name} (${t.type})`).join('\n') +
+                `\n\n${chalk.redBright('WARNING: This action is irreversible and will permanently delete data and affected tables. It is recommended to make a backup of your data before proceeding.')}` +
                 `\n\nProceed?`,
             options: [
                 { value: 'yes', label: `Yes, that's correct` },

package/dist/core/db/table-checker/MysqlTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MysqlTable.d.ts","sourceRoot":"","sources":["../../../../src/core/db/table-checker/MysqlTable.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAG7C;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,cAAc;WACpC,iBAAiB;WAgBjB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;WAkBhD,eAAe,CAAC,KAAK,EAAE,MAAM;;;kBAIR,MAAM;qBAAW,MAAM,EAAE;;;kBAC1B,MAAM;qBAAW,MAAM,EAAE;;;;kBACtB,MAAM;qBAAW,MAAM,EAAE;;;WA2DhD,yBAAyB,CAAC,KAAK,EAAE,MAAM;;mBAU7B,MAAM;kBACP,MAAM;kBACN,MAAM;iBACP,MAAM;qBACF,MAAM;mBACR,MAAM;;;CAahC"}
+{"version":3,"file":"MysqlTable.d.ts","sourceRoot":"","sources":["../../../../src/core/db/table-checker/MysqlTable.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAG7C;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,cAAc;WACpC,iBAAiB;WAgBjB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;WAoBhD,eAAe,CAAC,KAAK,EAAE,MAAM;;;kBAIR,MAAM;qBAAW,MAAM,EAAE;;;kBAC1B,MAAM;qBAAW,MAAM,EAAE;;;;kBACtB,MAAM;qBAAW,MAAM,EAAE;;;WA2DhD,yBAAyB,CAAC,KAAK,EAAE,MAAM;;mBAU7B,MAAM;kBACP,MAAM;kBACN,MAAM;iBACP,MAAM;qBACF,MAAM;mBACR,MAAM;;;CAahC"}

package/dist/core/db/table-checker/MysqlTable.js

@@ -26,7 +26,9 @@ export class MysqlTableChecker extends DbTableChecker {
        SELECT COLUMN_NAME 
       FROM information_schema.COLUMNS c
       inner join information_schema.TABLES t ON t.TABLE_NAME = c.TABLE_NAME
-      WHERE t.TABLE_NAME = ${tableName}`;
+      WHERE t.TABLE_SCHEMA = DATABASE()
+        AND c.TABLE_SCHEMA = DATABASE()
+        AND t.TABLE_NAME = ${tableName}`;
         const _cols = [];
         const _res = await db.execute(statement);
         // @ts-ignore

package/dist/core/fields/date-range.d.ts

@@ -70,13 +70,13 @@ declare const optionsSchema: z.ZodObject<{
     maxDate: z.ZodOptional<z.ZodUnion<readonly [z.ZodDate, z.ZodLiteral<"now">]>>;
     defaultStartValue: z.ZodOptional<z.ZodDate>;
     defaultEndValue: z.ZodOptional<z.ZodDate>;
-    order: z.ZodOptional<z.ZodNumber>;
-    localized: z.ZodOptional<z.ZodBoolean>;
     label: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>>;
     required: z.ZodOptional<z.ZodBoolean>;
     defaultValue: z.ZodOptional<z.ZodAny>;
+    order: z.ZodOptional<z.ZodNumber>;
     conditionalRules: z.ZodOptional<z.ZodArray<z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>>>;
     adminGenerated: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<true>, z.ZodLiteral<false>, z.ZodLiteral<"readonly">]>>;
+    localized: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;
 declare const dateRangeFieldConfigSchema: z.ZodObject<{
     /**
@@ -97,13 +97,13 @@ declare const dateRangeFieldConfigSchema: z.ZodObject<{
     maxDate: z.ZodOptional<z.ZodUnion<readonly [z.ZodDate, z.ZodLiteral<"now">]>>;
     defaultStartValue: z.ZodOptional<z.ZodDate>;
     defaultEndValue: z.ZodOptional<z.ZodDate>;
-    order: z.ZodOptional<z.ZodNumber>;
-    localized: z.ZodOptional<z.ZodBoolean>;
     label: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>>;
     required: z.ZodOptional<z.ZodBoolean>;
     defaultValue: z.ZodOptional<z.ZodAny>;
+    order: z.ZodOptional<z.ZodNumber>;
     conditionalRules: z.ZodOptional<z.ZodArray<z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>>>;
     adminGenerated: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<true>, z.ZodLiteral<false>, z.ZodLiteral<"readonly">]>>;
+    localized: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;
 export type DateRangeFieldConfig = z.infer<typeof dateRangeFieldConfigSchema>;
 /**