nextjs-cms 0.7.9 → 0.7.10

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

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

@@ -11,7 +11,7 @@ import { FileField } from '../../core/fields/index.js';
 import chalk from 'chalk';
 import { intro, select, spinner, log } from '@clack/prompts';
 import { MysqlTableChecker } from '../../core/db/index.js';
-import { generateDrizzleSchema } from '../utils/schema-generator.js';
+import { generateDrizzleSchema, resolveCaseStyleFns } from '../utils/schema-generator.js';
 import { addTableKeys } from '../utils/add-table-keys.js';
 function generateFieldSQL(input) {
     let fieldSQL = `\`${input.name}\` `;
@@ -525,8 +525,9 @@ const main = async (s) => {
     else {
         console.log(chalk.yellow(`Schema generation is disabled. Skipping Drizzle schema generation.`));
     }
+    const caseStyleFns = resolveCaseStyleFns(cmsConfig.schemaGeneration.drizzle.naming);
     const drizzleTableSchemas = [];
-    const drizzleColumnTypes = ['mysqlTable'];
+    const drizzleImports = new Set(['mysqlTable']);
     let sections = [];
     const desiredTables = [];
     let existingTables = [];
@@ -556,17 +557,13 @@ const main = async (s) => {
         /**
          * Generate the Drizzle schema for the table
          */
-        const drizzleSchema = await generateDrizzleSchema({
+        const drizzleSchema = generateDrizzleSchema({
             name: s.db.table,
             fields: s.fieldConfigs,
             identifier: s.db.identifier,
-        });
+        }, caseStyleFns);
         drizzleTableSchemas.push(drizzleSchema.schema);
-        drizzleSchema.columnTypes.forEach((type) => {
-            if (!drizzleColumnTypes.includes(type)) {
-                drizzleColumnTypes.push(type);
-            }
-        });
+        drizzleSchema.drizzleImports.forEach((type) => drizzleImports.add(type));
         desiredTables.push({
             name: s.db.table,
             fields: s.fields,
@@ -614,6 +611,17 @@ const main = async (s) => {
                      */
                     primaryKey: [referenceIdFieldConfig, selectIdFieldConfig],
                 });
+                const destDbFields = [
+                    { name: field.destinationDb.itemIdentifier, type: 'text', required: true },
+                    { name: field.destinationDb.selectIdentifier, type: 'text', required: true },
+                ];
+                const destDbSchema = generateDrizzleSchema({
+                    name: field.destinationDb.table,
+                    fields: destDbFields,
+                    compositePrimaryKey: destDbFields,
+                }, caseStyleFns);
+                drizzleTableSchemas.push(destDbSchema.schema);
+                destDbSchema.drizzleImports.forEach((type) => drizzleImports.add(type));
             }
         }
         /**
@@ -654,6 +662,32 @@ const main = async (s) => {
                 identifier: photoField,
                 primaryKey: [photoField],
             });
+            const gallerySchema = generateDrizzleSchema({
+                name: gallery.db.tableName,
+                fields: [
+                    {
+                        name: gallery.db.referenceIdentifierField || 'reference_id',
+                        type: 'text',
+                        required: true,
+                    },
+                    {
+                        name: gallery.db.photoNameField || 'photo',
+                        type: 'text',
+                        required: true,
+                    },
+                    {
+                        name: gallery.db.metaField || 'meta',
+                        type: 'textarea',
+                        required: false,
+                    },
+                ],
+                identifier: {
+                    name: gallery.db.photoNameField || 'photo',
+                    type: 'text',
+                },
+            }, caseStyleFns);
+            drizzleTableSchemas.push(gallerySchema.schema);
+            gallerySchema.drizzleImports.forEach((type) => drizzleImports.add(type));
         }
     }
     /**
@@ -667,9 +701,9 @@ const main = async (s) => {
             fs.mkdirSync(schemaOutDir, { recursive: true });
         }
         /**
-         * Append the Drizzle column types to the schema file
+         * Append the Drizzle imports to the schema file
          */
-        fs.appendFileSync(schemaFilePath, 'import {' + drizzleColumnTypes.join(',') + "} from 'drizzle-orm/mysql-core'\n\n");
+        fs.appendFileSync(schemaFilePath, 'import {' + [...drizzleImports].join(',') + "} from 'drizzle-orm/mysql-core'\n\n");
         /**
          * Append the Drizzle table schemas to the schema file
          */

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

@@ -1,10 +1,26 @@
 import type { FieldConfig } from '../../core/fields/index.js';
+export interface CaseStyleFns {
+    tableCaseStyleFn: (str: string) => string;
+    columnCaseStyleFn: (str: string) => string;
+}
+export interface NamingConfig {
+    tables: 'camelCase' | 'snakeCase' | 'pascalCase';
+    columns: 'camelCase' | 'snakeCase' | 'pascalCase';
+}
+/**
+ * Resolves case-style functions from the naming configuration.
+ * Centralises the switch logic that was previously duplicated across generators.
+ */
+export declare function resolveCaseStyleFns(naming: NamingConfig): CaseStyleFns;
 export declare function generateDrizzleSchema(table: {
     name: string;
     fields: FieldConfig[];
-    identifier: FieldConfig;
-}): Promise<{
+    identifier?: FieldConfig;
+    compositePrimaryKey?: {
+        name: string;
+    }[];
+}, caseStyleFns: CaseStyleFns): {
     schema: string;
-    columnTypes: string[];
-}>;
+    drizzleImports: string[];
+};
 //# sourceMappingURL=schema-generator.d.ts.map

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,wBAAsB,qBAAqB,CAAC,KAAK,EAAE;IAC/C,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,UAAU,EAAE,WAAW,CAAA;CAC1B,GAAG,OAAO,CAAC;IACR,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,EAAE,CAAA;CACxB,CAAC,CAqKD"}
+{"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;CAC3C,EACD,YAAY,EAAE,YAAY,GAC3B;IACC,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,MAAM,EAAE,CAAA;CAC3B,CAwIA"}

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

@@ -13,12 +13,13 @@ function toSnakeCase(str) {
         .replace(/^_/, '') // Remove leading underscore if any
         .toLowerCase();
 }
-export async function generateDrizzleSchema(table) {
-    const { getCMSConfig } = await import('../../core/config/index.js');
+/**
+ * Resolves case-style functions from the naming configuration.
+ * Centralises the switch logic that was previously duplicated across generators.
+ */
+export function resolveCaseStyleFns(naming) {
     let tableCaseStyleFn;
-    let columnCaseStyleFn;
-    const lzConfig = await getCMSConfig();
-    switch (lzConfig.schemaGeneration.drizzle.naming.tables) {
+    switch (naming.tables) {
         case 'snakeCase':
             tableCaseStyleFn = toSnakeCase;
             break;
@@ -30,7 +31,8 @@ export async function generateDrizzleSchema(table) {
             tableCaseStyleFn = toPascalCase;
             break;
     }
-    switch (lzConfig.schemaGeneration.drizzle.naming.columns) {
+    let columnCaseStyleFn;
+    switch (naming.columns) {
         case 'snakeCase':
             columnCaseStyleFn = toSnakeCase;
             break;
@@ -42,12 +44,11 @@ export async function generateDrizzleSchema(table) {
             columnCaseStyleFn = toCamelCase;
             break;
     }
-    /**
-     * This function generates a Drizzle schema for a given table.
-     * It takes a table object with a name, inputs (fields), and an identifier field.
-     * It returns an object containing the generated schema as a string and an array of column types.
-     */
-    const drizzleColumnTypes = [];
+    return { tableCaseStyleFn, columnCaseStyleFn };
+}
+export function generateDrizzleSchema(table, caseStyleFns) {
+    const { tableCaseStyleFn, columnCaseStyleFn } = caseStyleFns;
+    const drizzleImports = [];
     let schema = '';
     const schemaName = tableCaseStyleFn(`${table.name}_table`);
     schema += `export const ${schemaName} = mysqlTable('${table.name}', {\n`;
@@ -58,7 +59,6 @@ export async function generateDrizzleSchema(table) {
             continue;
         let columnType;
         let drizzleColumnType;
-        // let columnOptions = ''
         switch (input.type) {
             case 'text':
                 columnType = `varchar('${input.name}', { length: ${input.maxLength ?? 255} })`;
@@ -145,27 +145,30 @@ export async function generateDrizzleSchema(table) {
         if (input.required) {
             columnType += `.notNull()`;
         }
-        if (input === table.identifier) {
+        if (table.identifier && input === table.identifier) {
             columnType += `.primaryKey()`;
         }
         /*if (input.type === 'date') {
             columnType += `.defaultNow()`
         }*/
         schema += `    ${columnCaseStyleFn(input.name)}: ${columnType},\n`;
-        /**
-         * First, let's check if the column type is already in the drizzleColumnTypes array
-         */
-        if (drizzleColumnType && !drizzleColumnTypes.includes(drizzleColumnType)) {
-            /**
-             * If it's not, add it to the array
-             */
-            drizzleColumnTypes.push(drizzleColumnType);
+        if (drizzleColumnType && !drizzleImports.includes(drizzleColumnType)) {
+            drizzleImports.push(drizzleColumnType);
         }
     }
     schema = schema.slice(0, -2); // Remove the last comma and newline
-    schema += `\n});\n\n`;
+    if (table.compositePrimaryKey && table.compositePrimaryKey.length > 1) {
+        const pkCols = table.compositePrimaryKey.map((f) => `table.${columnCaseStyleFn(f.name)}`).join(', ');
+        schema += `\n}, (table) => [primaryKey({ columns: [${pkCols}] })]);\n\n`;
+        if (!drizzleImports.includes('primaryKey')) {
+            drizzleImports.push('primaryKey');
+        }
+    }
+    else {
+        schema += `\n});\n\n`;
+    }
     return {
         schema: schema,
-        columnTypes: drizzleColumnTypes,
+        drizzleImports,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextjs-cms",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
@@ -200,9 +200,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/eslint-config": "0.3.0"
+    "@lzcms/tsconfig": "0.1.0"
   },
   "license": "MIT",
   "keywords": [