nextjs-cms 0.9.10 → 0.9.12

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

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

@@ -13,6 +13,17 @@ import { intro, select, spinner, log } from '@clack/prompts';
 import { MysqlTableChecker } from '../../core/db/index.js';
 import { generateDrizzleSchema, generateLocalesTableSchema, resolveCaseStyleFns } from '../utils/schema-generator.js';
 import { addTableKeys } from '../utils/add-table-keys.js';
+/**
+ * Returns all DB column names a field owns.
+ * Most fields own a single column (field.name), but rarely some fields own two,
+ * like DateRangeField (startName, endName).
+ */
+function getFieldColumnName(field) {
+    if (is(field, DateRangeField)) {
+        return [field.startName, field.endName];
+    }
+    return [field.name];
+}
 function generateFieldSQL(input) {
     /**
      * DateRangeField emits two columns — one for startName, one for endName.
@@ -322,21 +333,21 @@ async function updateTable(table, s) {
      * Filter out the fields that already exist in the table
      */
     const existingFields = existingFieldsData ? Object.keys(existingFieldsData) : [];
-    const fieldsToAdd = table.fields.filter((field) => !existingFields.some((existingField) => existingField === field.name));
+    const fieldsToAdd = table.fields.filter((field) => !getFieldColumnName(field).some((col) => existingFields.includes(col)));
     /**
      * Let's find out fields that need to be updated.
      * If a field exists in both the desired fields and the existing fields, we should mark it for update.
      * TODO: Actually, we should check if the field needs to be updated, and only update if necessary. (INFORMATION_SCHEMA will help)
      */
-    const fieldsToUpdate = table.fields.filter((field) => existingFields.some((existingField) => existingField === field.name));
+    const fieldsToUpdate = table.fields.filter((field) => getFieldColumnName(field).some((col) => existingFields.includes(col)));
     /**
      * Let's find out fields to remove as well.
      * If a field exists in the table but not in the desired fields,
      * 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) => field.name === existingField) ||
-        table.fields.some((field) => field.destinationDb && field.name === existingField));
+    let fieldsToRemove = existingFields.filter((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
      */
@@ -350,22 +361,15 @@ async function updateTable(table, s) {
             //  and data may be lost! (e.g. changing a field from VARCHAR to INT)
             if (field.destinationDb)
                 continue;
-            let fieldSQL = generateFieldSQL(field);
-            /**
-             * Check if the field is a primary key
-             */
-            if (field.name === table.identifier?.name) {
-                fieldSQL += ' FIRST';
+            const fieldSQLResult = [generateFieldSQL(field)].flat();
+            for (const fieldSQL of fieldSQLResult) {
+                alterTableSQLs.push({
+                    field: field.name,
+                    table: table.name,
+                    action: 'modify',
+                    sql: `MODIFY COLUMN ${fieldSQL}`,
+                });
             }
-            /**
-             * Add the SQL to modify the field
-             */
-            alterTableSQLs.push({
-                field: field.name,
-                table: table.name,
-                action: 'modify',
-                sql: `MODIFY COLUMN ${fieldSQL}`,
-            });
         }
     }
     /**
@@ -378,13 +382,8 @@ async function updateTable(table, s) {
         for (const field of fieldsToAdd) {
             if (field.destinationDb)
                 continue;
-            let fieldSQL = generateFieldSQL(field);
-            /**
-             * Check if the field is an identifier
-             */
-            if (field.name === table.identifier?.name) {
-                fieldSQL += ' UNIQUE FIRST';
-            }
+            const fieldSQLResult = [generateFieldSQL(field)].flat();
+            const isIdentifier = fieldSQLResult.length === 1 && field.name === table.identifier?.name;
             /**
              * Check if there are fields to remove
              * If there are, ask the user if they want to add the new field or rename a to-be-removed field
@@ -405,12 +404,14 @@ async function updateTable(table, s) {
                          * Field doesn't exist.
                          * Add the field to the table
                          */
-                        alterTableSQLs.push({
-                            field: field.name,
-                            table: table.name,
-                            action: 'add',
-                            sql: `ADD COLUMN ${fieldSQL}`,
-                        });
+                        for (const fieldSQL of fieldSQLResult) {
+                            alterTableSQLs.push({
+                                field: field.name,
+                                table: table.name,
+                                action: 'add',
+                                sql: `ADD COLUMN ${fieldSQL}${isIdentifier ? ' UNIQUE FIRST' : ''}`,
+                            });
+                        }
                         break;
                     case 'rename': {
                         s.stop();
@@ -448,12 +449,14 @@ async function updateTable(table, s) {
                  * Field doesn't exist.
                  * Add the field to the table
                  */
-                alterTableSQLs.push({
-                    field: field.name,
-                    table: table.name,
-                    action: 'add',
-                    sql: `ADD COLUMN ${fieldSQL}`,
-                });
+                for (const fieldSQL of fieldSQLResult) {
+                    alterTableSQLs.push({
+                        field: field.name,
+                        table: table.name,
+                        action: 'add',
+                        sql: `ADD COLUMN ${fieldSQL}${isIdentifier ? ' UNIQUE FIRST' : ''}`,
+                    });
+                }
             }
         }
     }

package/dist/utils/date-bounds.js

@@ -1,5 +1,5 @@
 import dayjs from 'dayjs';
-import utc from 'dayjs/plugin/utc';
+import utc from 'dayjs/plugin/utc.js';
 import * as z from 'zod';
 dayjs.extend(utc);
 export const dateBoundSchema = z.union([z.date(), z.literal('now')]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextjs-cms",
-  "version": "0.9.10",
+  "version": "0.9.12",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
@@ -209,9 +209,9 @@
     "prettier": "^3.3.3",
     "tsx": "^4.20.6",
     "typescript": "^5.9.2",
-    "@lzcms/tsconfig": "0.1.0",
     "@lzcms/eslint-config": "0.3.0",
-    "@lzcms/prettier-config": "0.1.0"
+    "@lzcms/prettier-config": "0.1.0",
+    "@lzcms/tsconfig": "0.1.0"
   },
   "license": "MIT",
   "keywords": [