nextjs-cms 0.9.37 → 0.9.39

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

@@ -22,12 +22,12 @@ export class MysqlTableChecker extends DbTableChecker {
         return _tables;
     }
     static async getColumns(tableName) {
-        const statement = sql `
-       SELECT COLUMN_NAME 
-      FROM information_schema.COLUMNS c
-      inner join information_schema.TABLES t ON t.TABLE_NAME = c.TABLE_NAME
-      WHERE t.TABLE_SCHEMA = DATABASE()
-        AND c.TABLE_SCHEMA = DATABASE()
+        const statement = sql `
+       SELECT COLUMN_NAME 
+      FROM information_schema.COLUMNS c
+      inner join information_schema.TABLES t ON t.TABLE_NAME = c.TABLE_NAME
+      WHERE t.TABLE_SCHEMA = DATABASE()
+        AND c.TABLE_SCHEMA = DATABASE()
         AND t.TABLE_NAME = ${tableName}`;
         const _cols = [];
         const _res = await db.execute(statement);
@@ -84,10 +84,10 @@ export class MysqlTableChecker extends DbTableChecker {
                     fullTextKeys.push({ name: key, columns: _fullTextKeyMap[key] });
             }
             // Foreign keys should be retrieved from information_schema
-            const [foreignKeys] = await db.execute(sql `
-            SELECT COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME
-            FROM information_schema.KEY_COLUMN_USAGE
-            WHERE TABLE_NAME = ${table} AND CONSTRAINT_NAME != 'PRIMARY' AND REFERENCED_TABLE_NAME IS NOT NULL;
+            const [foreignKeys] = await db.execute(sql `
+            SELECT COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME
+            FROM information_schema.KEY_COLUMN_USAGE
+            WHERE TABLE_NAME = ${table} AND CONSTRAINT_NAME != 'PRIMARY' AND REFERENCED_TABLE_NAME IS NOT NULL;
         `);
             return { primaryKeys, uniqueKeys, indexKeys, foreignKeys, fullTextKeys };
         }

package/dist/core/factories/FieldFactory.d.ts

@@ -60,11 +60,6 @@ export declare class FieldFactory {
      * Generate the fields
      */
     generateFields(): Promise<void>;
-    /**
-     * Sort the fields.
-     * This function sorts the conditional fields into their respective fields.
-     */
-    private sortFields;
     /**
      * Sort fields by their order property, preserving original position for fields without order.
      *
@@ -112,7 +107,7 @@ export declare class FieldFactory {
             label: string;
             required: boolean;
             localized?: boolean;
-            conditionalFields: import("../types/index.js").ConditionalField[];
+            conditionalGroup?: import("../types/index.js").ConditionalGroupClient;
             readonly: boolean;
             defaultValue: any;
             value: any;

package/dist/core/factories/FieldFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FieldFactory.d.ts","sourceRoot":"","sources":["../../../src/core/factories/FieldFactory.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,KAAK,EAAgD,OAAO,EAAuB,MAAM,sBAAsB,CAAA;AAWtH,KAAK,eAAe,GACd;IACI,IAAI,EAAE,KAAK,CAAA;IACX,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,CAAC,EAAE,KAAK,CAAA;CACjB,GACD;IACI,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;CAC1B,CAAA;AAEP,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,MAAM,CAAyC;IACvD,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,aAAa,CAAa;IAClC,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM,CAAA;IAC9B,SAAS,CAAC,WAAW,EAAE,MAAM,CAAA;IAC7B,OAAO,CAAC,YAAY,CAA4B;IAGhD;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAY;IAEjD;;OAEG;gBACS,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,eAAe;IASnE;;OAEG;IACU,UAAU;YAUT,aAAa;YASb,qBAAqB;IAqInC;;;;OAIG;YACW,qBAAqB;IAsDnC;;;;OAIG;YACW,cAAc;IAuB5B;;;;;OAKG;YACW,YAAY;IAsB1B,OAAO,CAAC,kBAAkB;IAa1B;;OAEG;IACU,cAAc;IAqB3B;;;OAGG;IACH,OAAO,CAAC,UAAU;IA4ElB;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,iBAAiB;IAMzB;;;;;;;;;;;;;;;OAeG;IACH,OAAO,CAAC,iBAAiB;IAOzB;;;OAGG;IACU,gBAAgB;;;;;;;;;;;;;;;;IAiF7B,OAAO,CAAC,0BAA0B;IA6DlC,IAAI,WAAW,IAAI,OAAO,GAAG,SAAS,CAErC;IACD,IAAI,YAAY,IAAI,MAAM,CAEzB;IACD,IAAI,KAAK,IAAI,OAAO,CAEnB;CACJ"}
+{"version":3,"file":"FieldFactory.d.ts","sourceRoot":"","sources":["../../../src/core/factories/FieldFactory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,KAAK,EAAgD,OAAO,EAAuB,MAAM,sBAAsB,CAAA;AAUtH,KAAK,eAAe,GACd;IACI,IAAI,EAAE,KAAK,CAAA;IACX,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,CAAC,EAAE,KAAK,CAAA;CACjB,GACD;IACI,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;CAC1B,CAAA;AAEP,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,MAAM,CAAyC;IACvD,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,aAAa,CAAa;IAClC,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM,CAAA;IAC9B,SAAS,CAAC,WAAW,EAAE,MAAM,CAAA;IAC7B,OAAO,CAAC,YAAY,CAA4B;IAGhD;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAY;IAEjD;;OAEG;gBACS,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,eAAe;IASnE;;OAEG;IACU,UAAU;YAUT,aAAa;YASb,qBAAqB;IAqInC;;;;OAIG;YACW,qBAAqB;IAsDnC;;;;OAIG;YACW,cAAc;IAuB5B;;;;;OAKG;YACW,YAAY;IAsB1B,OAAO,CAAC,kBAAkB;IAa1B;;OAEG;IACU,cAAc;IAmB3B;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,iBAAiB;IAMzB;;;;;;;;;;;;;;;OAeG;IACH,OAAO,CAAC,iBAAiB;IAOzB;;;OAGG;IACU,gBAAgB;;;;;;;;;;;;;;;;IAkF7B,OAAO,CAAC,0BAA0B;IA6DlC,IAAI,WAAW,IAAI,OAAO,GAAG,SAAS,CAErC;IACD,IAAI,YAAY,IAAI,MAAM,CAEzB;IACD,IAAI,KAAK,IAAI,OAAO,CAEnB;CACJ"}

package/dist/core/factories/FieldFactory.js

@@ -1,6 +1,5 @@
 import chalk from 'chalk';
 import { sql } from 'drizzle-orm';
-import { cloneDeep } from 'lodash-es';
 import { db } from '../../db/client.js';
 import getString from '../../translations/index.js';
 import { resolveLanguage, resolveMultilingualString } from '../../translations/language-utils.js';
@@ -303,70 +302,6 @@ export class FieldFactory {
              */
             await this.prepareField(input);
         }
-        this.sortFields();
-    }
-    /**
-     * Sort the fields.
-     * This function sorts the conditional fields into their respective fields.
-     */
-    sortFields() {
-        if (this._error)
-            return;
-        if (!this._sectionInfo)
-            return;
-        /**
-         * Create a map of conditional fields
-         */
-        const _conditionalFieldMap = new Map();
-        /**
-         * Loop through the fields and get the conditional fields
-         */
-        for (const input of this._sectionInfo.fields) {
-            input.conditionalFields = [];
-            /**
-             * Check if the field is conditional.
-             */
-            if (input.isConditional()) {
-                for (const rule of input.conditionalRules ?? []) {
-                    /**
-                     * Add the conditional input to the conditional fields lists
-                     */
-                    if (!_conditionalFieldMap.has(rule.field.name)) {
-                        _conditionalFieldMap.set(rule.field.name, []);
-                    }
-                    _conditionalFieldMap.get(rule.field.name).push(
-                    /**
-                     * Clone the conditional field to avoid reference issues
-                     */
-                    cloneDeep({
-                        field: input.exportForClient(),
-                        rule: {
-                            condition: rule.condition,
-                            value: rule.value,
-                        },
-                    }));
-                }
-            }
-        }
-        /**
-         * Assign conditionalFields to the appropriate fields
-         */
-        for (const field of this._sectionInfo.fields) {
-            const matchingConditionalFields = _conditionalFieldMap.get(field.name);
-            if (matchingConditionalFields) {
-                field.conditionalFields.push(...matchingConditionalFields.map((clonedConditionalField) => ({
-                    ...clonedConditionalField,
-                    rule: {
-                        condition: clonedConditionalField.rule.condition,
-                        value: clonedConditionalField.rule.value,
-                    },
-                })));
-            }
-        }
-        /**
-         * Destroy the map
-         */
-        _conditionalFieldMap.clear();
     }
     /**
      * Sort fields by their order property, preserving original position for fields without order.
@@ -439,9 +374,9 @@ export class FieldFactory {
                 const field = fields[j];
                 if (!field)
                     continue;
-                // Skip conditional fields (they're nested in their parent field)
-                if (field.isConditional())
-                    continue;
+                // Conditional fields are included here and self-gate on the client via their
+                // `conditionalGroup` (watching their controlling fields), so any field type can gate
+                // any other. Persistence is still decided server-side in `checkConditionalField`.
                 // For new item operations, exclude fields with adminGenerated not set to true
                 if (isNewOperation && field.adminGenerated !== true)
                     continue;

package/dist/core/factories/section-factory-with-esbuild.js

@@ -460,15 +460,15 @@ export class SectionFactory {
                             importErr.message.includes('Cannot find module') &&
                             importErr.message.includes('.section')) {
                             this.sectionProcessingErrors[file] ??= [];
-                            this.sectionProcessingErrors[file].push(`❌ Invalid section import detected.
-
-Sections MUST use extensionless relative imports:
-
-  ✅ import exampleSection from './example.section'
-  ❌ import exampleSection from './example.section.ts'
-  ❌ import exampleSection from './example.section.js'
-
-This file is bundled with esbuild, so Node never resolves the import directly.
+                            this.sectionProcessingErrors[file].push(`❌ Invalid section import detected.
+
+Sections MUST use extensionless relative imports:
+
+  ✅ import exampleSection from './example.section'
+  ❌ import exampleSection from './example.section.ts'
+  ❌ import exampleSection from './example.section.js'
+
+This file is bundled with esbuild, so Node never resolves the import directly.
 If you added an extension manually, remove it.`);
                             this.errorCount++;
                             continue;

package/dist/core/factories/section-factory-with-jiti.js

@@ -417,15 +417,15 @@ export class SectionFactory {
                             importErr.message.includes('Cannot find module') &&
                             importErr.message.includes('.section')) {
                             this.sectionProcessingErrors[file] ??= [];
-                            this.sectionProcessingErrors[file].push(`❌ Invalid section import detected.
-
-Sections MUST use extensionless relative imports:
-
-  ✅ import exampleSection from './example.section'
-  ❌ import exampleSection from './example.section.ts'
-  ❌ import exampleSection from './example.section.js'
-
-This file is bundled with jiti, so Node never resolves the import directly.
+                            this.sectionProcessingErrors[file].push(`❌ Invalid section import detected.
+
+Sections MUST use extensionless relative imports:
+
+  ✅ import exampleSection from './example.section'
+  ❌ import exampleSection from './example.section.ts'
+  ❌ import exampleSection from './example.section.js'
+
+This file is bundled with jiti, so Node never resolves the import directly.
 If you added an extension manually, remove it.`);
                             this.errorCount++;
                             continue;

package/dist/core/fields/checkbox.d.ts

@@ -21,7 +21,7 @@ export declare class CheckboxField extends Field<'checkbox', Config> {
         label: string;
         required: boolean;
         localized?: boolean;
-        conditionalFields: import("../types/index.js").ConditionalField[];
+        conditionalGroup?: import("../types/index.js").ConditionalGroupClient;
         readonly: boolean;
         defaultValue: any;
         value: any;
@@ -34,7 +34,7 @@ declare const optionsSchema: z.ZodObject<{
     label: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>>;
     required: z.ZodOptional<z.ZodBoolean>;
     order: z.ZodOptional<z.ZodNumber>;
-    conditionalRules: z.ZodOptional<z.ZodArray<z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>>>;
+    conditionalRules: z.ZodOptional<z.ZodUnion<readonly [z.ZodTuple<[z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>], null>, z.ZodCustom<import("../types/index.js").ConditionalRuleGroup, import("../types/index.js").ConditionalRuleGroup>]>>;
     adminGenerated: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<true>, z.ZodLiteral<false>, z.ZodLiteral<"readonly">]>>;
     localized: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;
@@ -46,7 +46,7 @@ declare const checkboxFieldConfigSchema: z.ZodObject<{
     label: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>>;
     required: z.ZodOptional<z.ZodBoolean>;
     order: z.ZodOptional<z.ZodNumber>;
-    conditionalRules: z.ZodOptional<z.ZodArray<z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>>>;
+    conditionalRules: z.ZodOptional<z.ZodUnion<readonly [z.ZodTuple<[z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>], null>, z.ZodCustom<import("../types/index.js").ConditionalRuleGroup, import("../types/index.js").ConditionalRuleGroup>]>>;
     adminGenerated: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<true>, z.ZodLiteral<false>, z.ZodLiteral<"readonly">]>>;
     localized: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;

package/dist/core/fields/color.d.ts

@@ -26,7 +26,7 @@ export declare class ColorField extends Field<'color', Config> {
         label: string;
         required: boolean;
         localized?: boolean;
-        conditionalFields: import("../types/index.js").ConditionalField[];
+        conditionalGroup?: import("../types/index.js").ConditionalGroupClient;
         readonly: boolean;
         defaultValue: any;
         value: any;
@@ -50,7 +50,7 @@ declare const optionsSchema: z.ZodObject<{
     label: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>>;
     required: z.ZodOptional<z.ZodBoolean>;
     order: z.ZodOptional<z.ZodNumber>;
-    conditionalRules: z.ZodOptional<z.ZodArray<z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>>>;
+    conditionalRules: z.ZodOptional<z.ZodUnion<readonly [z.ZodTuple<[z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>], null>, z.ZodCustom<import("../types/index.js").ConditionalRuleGroup, import("../types/index.js").ConditionalRuleGroup>]>>;
     adminGenerated: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<true>, z.ZodLiteral<false>, z.ZodLiteral<"readonly">]>>;
     localized: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;
@@ -67,7 +67,7 @@ declare const colorFieldConfigSchema: z.ZodObject<{
     label: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>>;
     required: z.ZodOptional<z.ZodBoolean>;
     order: z.ZodOptional<z.ZodNumber>;
-    conditionalRules: z.ZodOptional<z.ZodArray<z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>>>;
+    conditionalRules: z.ZodOptional<z.ZodUnion<readonly [z.ZodTuple<[z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>], null>, z.ZodCustom<import("../types/index.js").ConditionalRuleGroup, import("../types/index.js").ConditionalRuleGroup>]>>;
     adminGenerated: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<true>, z.ZodLiteral<false>, z.ZodLiteral<"readonly">]>>;
     localized: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;

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

@@ -74,7 +74,7 @@ declare const optionsSchema: z.ZodObject<{
     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>>>;
+    conditionalRules: z.ZodOptional<z.ZodUnion<readonly [z.ZodTuple<[z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>], null>, z.ZodCustom<import("../types/index.js").ConditionalRuleGroup, import("../types/index.js").ConditionalRuleGroup>]>>;
     adminGenerated: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<true>, z.ZodLiteral<false>, z.ZodLiteral<"readonly">]>>;
     localized: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;
@@ -101,7 +101,7 @@ declare const dateRangeFieldConfigSchema: z.ZodObject<{
     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>>>;
+    conditionalRules: z.ZodOptional<z.ZodUnion<readonly [z.ZodTuple<[z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>], null>, z.ZodCustom<import("../types/index.js").ConditionalRuleGroup, import("../types/index.js").ConditionalRuleGroup>]>>;
     adminGenerated: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<true>, z.ZodLiteral<false>, z.ZodLiteral<"readonly">]>>;
     localized: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;

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

@@ -50,7 +50,7 @@ export declare class DateField extends Field<'date', Config> {
         label: string;
         required: boolean;
         localized?: boolean;
-        conditionalFields: import("../types/index.js").ConditionalField[];
+        conditionalGroup?: import("../types/index.js").ConditionalGroupClient;
         readonly: boolean;
         defaultValue: any;
         value: any;
@@ -83,7 +83,7 @@ declare const optionsSchema: z.ZodObject<{
     label: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>>;
     required: z.ZodOptional<z.ZodBoolean>;
     order: z.ZodOptional<z.ZodNumber>;
-    conditionalRules: z.ZodOptional<z.ZodArray<z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>>>;
+    conditionalRules: z.ZodOptional<z.ZodUnion<readonly [z.ZodTuple<[z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>], null>, z.ZodCustom<import("../types/index.js").ConditionalRuleGroup, import("../types/index.js").ConditionalRuleGroup>]>>;
     adminGenerated: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<true>, z.ZodLiteral<false>, z.ZodLiteral<"readonly">]>>;
     localized: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;
@@ -107,7 +107,7 @@ declare const dateFieldConfigSchema: z.ZodObject<{
     label: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>>;
     required: z.ZodOptional<z.ZodBoolean>;
     order: z.ZodOptional<z.ZodNumber>;
-    conditionalRules: z.ZodOptional<z.ZodArray<z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>>>;
+    conditionalRules: z.ZodOptional<z.ZodUnion<readonly [z.ZodTuple<[z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>], null>, z.ZodCustom<import("../types/index.js").ConditionalRuleGroup, import("../types/index.js").ConditionalRuleGroup>]>>;
     adminGenerated: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<true>, z.ZodLiteral<false>, z.ZodLiteral<"readonly">]>>;
     localized: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;

package/dist/core/fields/document.d.ts

@@ -67,7 +67,7 @@ export declare class DocumentField extends FileField<'document', Config> {
         label: string;
         required: boolean;
         localized?: boolean;
-        conditionalFields: import("../types/index.js").ConditionalField[];
+        conditionalGroup?: import("../types/index.js").ConditionalGroupClient;
         readonly: boolean;
         defaultValue: any;
         value: any;
@@ -136,7 +136,7 @@ declare const optionsSchema: z.ZodObject<{
     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>>>;
+    conditionalRules: z.ZodOptional<z.ZodUnion<readonly [z.ZodTuple<[z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>], null>, z.ZodCustom<import("../types/index.js").ConditionalRuleGroup, import("../types/index.js").ConditionalRuleGroup>]>>;
     adminGenerated: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<true>, z.ZodLiteral<false>, z.ZodLiteral<"readonly">]>>;
     localized: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;
@@ -180,7 +180,7 @@ declare const documentFieldConfigSchema: z.ZodObject<{
     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>>>;
+    conditionalRules: z.ZodOptional<z.ZodUnion<readonly [z.ZodTuple<[z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>], null>, z.ZodCustom<import("../types/index.js").ConditionalRuleGroup, import("../types/index.js").ConditionalRuleGroup>]>>;
     adminGenerated: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<true>, z.ZodLiteral<false>, z.ZodLiteral<"readonly">]>>;
     localized: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;

package/dist/core/fields/field.d.ts

@@ -1,5 +1,5 @@
 import { entityKind } from '../helpers/index.js';
-import type { ConditionalField, ConditionalRule, FieldType } from '../types/index.js';
+import type { ConditionalGroupClient, ConditionalRule, ConditionalRuleGroup, ConditionalRulesConfig, FieldType } from '../types/index.js';
 import type { MultilingualString } from '../../translations/language-utils.js';
 import * as z from 'zod';
 /**
@@ -19,7 +19,7 @@ export declare abstract class Field<TType extends FieldType = FieldType, TExtraF
     readonly localized: boolean;
     readonly order: number | undefined;
     readonly groupId: number | undefined;
-    readonly conditionalRules: ConditionalRule[] | undefined;
+    readonly conditionalRules: ConditionalRulesConfig | undefined;
     protected language: string;
     protected fallbackLanguage: string;
     /**
@@ -44,10 +44,6 @@ export declare abstract class Field<TType extends FieldType = FieldType, TExtraF
         itemIdentifier: string;
         selectIdentifier: string;
     };
-    /**
-     * Dynamically generated fields based on the value of `conditionalRules` from conditional fields.
-     */
-    conditionalFields: ConditionalField[];
     value: any;
     constructor(config: BaseFieldConfig<TExtraFieldConfig>, fieldType: TType);
     abstract checkRequired(): void;
@@ -91,19 +87,36 @@ export declare abstract class Field<TType extends FieldType = FieldType, TExtraF
         label: string;
         required: boolean;
         localized?: boolean;
-        conditionalFields: ConditionalField[];
+        conditionalGroup?: ConditionalGroupClient;
         readonly: boolean;
         defaultValue: any;
         value: any;
     };
     hasSqlNameAndValue(): boolean;
     /**
-     * Check if field is conditional
+     * Normalize this field's `conditionalRules` config into a single group of rules, or `undefined`
+     * when the field has none. The one place either layer turns the authoring form (a single-rule
+     * array or an `and()` / `or()` group) into the group shape the evaluator consumes.
+     */
+    getConditionalGroup(): ConditionalRuleGroup | undefined;
+    /**
+     * Project this field's rule group into its client-safe form: each rule references its controlling
+     * field by name rather than carrying the full field config. Returns `undefined` when not
+     * conditional, so it is omitted from the exported config.
+     */
+    private exportConditionalGroup;
+    /**
+     * Check if field is conditional.
+     *
+     * A field is conditional once it has at least one rule that names a controlling field, a
+     * condition and a value. `value` is checked against `undefined` rather than for truthiness, so
+     * `false`, `0` and `''` stay valid values to compare against.
      */
     isConditional(): boolean;
 }
 export type FieldClientConfig = ReturnType<Field['exportForClient']>;
 export declare const conditionalRuleSchema: z.ZodCustom<ConditionalRule, ConditionalRule>;
+export declare const conditionalRuleGroupSchema: z.ZodCustom<ConditionalRuleGroup, ConditionalRuleGroup>;
 /**
  * Base field configuration schema
  * This schema defines the base properties that all fields share
@@ -116,11 +129,11 @@ export declare const baseFieldConfigSchema: z.ZodObject<{
     defaultValue: z.ZodOptional<z.ZodAny>;
     order: z.ZodOptional<z.ZodNumber>;
     /**
-     * Set if the field is only visible when all conditions are met.
-     * For now, conditionalRules only support one condition rule.
-     * If the condition is met, the field will be visible.
+     * Make the field visible only when its rule(s) match the current value of the controlling
+     * field(s). A single rule is written as a one-element array; two or more rules must be combined
+     * explicitly with `and(...)` or `or(...)`.
      */
-    conditionalRules: z.ZodOptional<z.ZodArray<z.ZodCustom<ConditionalRule, ConditionalRule>>>;
+    conditionalRules: z.ZodOptional<z.ZodUnion<readonly [z.ZodTuple<[z.ZodCustom<ConditionalRule, ConditionalRule>], null>, z.ZodCustom<ConditionalRuleGroup, ConditionalRuleGroup>]>>;
     /**
      * adminGenerated is used to determine if the field is generated by the admin or not.
      * If set to false, the field will not be included in the form.

package/dist/core/fields/field.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"field.d.ts","sourceRoot":"","sources":["../../../src/core/fields/field.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"field.d.ts","sourceRoot":"","sources":["../../../src/core/fields/field.ts"],"names":[],"mappings":"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"}

package/dist/core/fields/field.js

@@ -1,4 +1,4 @@
-import { entityKind } from '../helpers/index.js';
+import { entityKind, normalizeConditionalRules } from '../helpers/index.js';
 import { resolveMultilingualString } from '../../translations/language-utils.js';
 import * as z from 'zod';
 /**
@@ -39,10 +39,6 @@ export class Field {
      * The primary key is automatically set as the combination of the reference item identifier and the option identifier.
      */
     destinationDb;
-    /**
-     * Dynamically generated fields based on the value of `conditionalRules` from conditional fields.
-     */
-    conditionalFields = [];
     /*protected*/ value;
     // No need to access the config
     // protected config: BaseFieldConfig<TExtraFieldConfig>
@@ -121,7 +117,7 @@ export class Field {
             label: this.getLocalizedLabel(),
             required: this.required,
             localized: this.localized,
-            conditionalFields: this.conditionalFields,
+            conditionalGroup: this.exportConditionalGroup(),
             readonly: this.adminGenerated === 'readonly',
             defaultValue: this.defaultValue,
             value: this.value,
@@ -131,25 +127,54 @@ export class Field {
         return this.adminGenerated === true;
     }
     /**
-     * Check if field is conditional
+     * Normalize this field's `conditionalRules` config into a single group of rules, or `undefined`
+     * when the field has none. The one place either layer turns the authoring form (a single-rule
+     * array or an `and()` / `or()` group) into the group shape the evaluator consumes.
+     */
+    getConditionalGroup() {
+        return normalizeConditionalRules(this.conditionalRules);
+    }
+    /**
+     * Project this field's rule group into its client-safe form: each rule references its controlling
+     * field by name rather than carrying the full field config. Returns `undefined` when not
+     * conditional, so it is omitted from the exported config.
+     */
+    exportConditionalGroup() {
+        const group = this.getConditionalGroup();
+        if (!group)
+            return undefined;
+        return {
+            match: group.match,
+            rules: group.rules.map((rule) => ({
+                field: rule.field.name,
+                condition: rule.condition,
+                value: rule.value,
+            })),
+        };
+    }
+    /**
+     * Check if field is conditional.
+     *
+     * A field is conditional once it has at least one rule that names a controlling field, a
+     * condition and a value. `value` is checked against `undefined` rather than for truthiness, so
+     * `false`, `0` and `''` stay valid values to compare against.
      */
     isConditional() {
-        let status = true;
-        if (this.conditionalRules && this.conditionalRules.length > 0) {
-            this.conditionalRules.map((rule) => {
-                if (!rule.field || !rule.value || !rule.condition) {
-                    return (status = false);
-                }
-            });
-        }
-        else {
-            status = false;
-        }
-        return status;
+        const group = this.getConditionalGroup();
+        if (!group || group.rules.length === 0)
+            return false;
+        return group.rules.every((rule) => !!rule.field && !!rule.condition && rule.value !== undefined);
     }
 }
 // Schema for ConditionalRule (circular dependency with FieldConfig, so use custom)
 export const conditionalRuleSchema = z.custom();
+// Schema for a rule group produced by and() / or(). Guarded so a bare multi-rule array (which the
+// config type already forbids) also fails validation at runtime rather than being mistaken for one.
+export const conditionalRuleGroupSchema = z.custom((value) => !!value &&
+    typeof value === 'object' &&
+    !Array.isArray(value) &&
+    (value.match === 'all' || value.match === 'any') &&
+    Array.isArray(value.rules));
 /**
  * Base field configuration schema
  * This schema defines the base properties that all fields share
@@ -165,11 +190,14 @@ export const baseFieldConfigSchema = z.strictObject({
     defaultValue: z.any().optional().describe('The default value of the field'),
     order: z.number().optional().describe('The order of the field'),
     /**
-     * Set if the field is only visible when all conditions are met.
-     * For now, conditionalRules only support one condition rule.
-     * If the condition is met, the field will be visible.
+     * Make the field visible only when its rule(s) match the current value of the controlling
+     * field(s). A single rule is written as a one-element array; two or more rules must be combined
+     * explicitly with `and(...)` or `or(...)`.
      */
-    conditionalRules: z.array(conditionalRuleSchema).optional().describe('Conditional rules for the field'),
+    conditionalRules: z
+        .union([z.tuple([conditionalRuleSchema]), conditionalRuleGroupSchema])
+        .optional()
+        .describe('Conditional visibility rules: a single-rule array, or an and()/or() group'),
     /**
      * adminGenerated is used to determine if the field is generated by the admin or not.
      * If set to false, the field will not be included in the form.

package/dist/core/fields/index.d.ts

@@ -37,6 +37,7 @@ export type { BaseFieldConfig, FieldClientConfig } from './field.js';
 export { FileField } from './fileField.js';
 export { fieldGroup } from './field-group.js';
 export type { FieldGroup, FieldGroupOptions, FieldGroupConfig } from './field-group.js';
+export { and, or } from '../helpers/conditional-rules.js';
 import type { TextFieldConfig } from './text.js';
 import type { NumberFieldConfig } from './number.js';
 import type { TextAreaFieldConfig } from './textArea.js';

package/dist/core/fields/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/fields/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/fields/index.ts"],"names":[],"mappings":"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"}

package/dist/core/fields/index.js

@@ -18,3 +18,5 @@ export { SlugField, slugField } from './slug.js';
 export { Field } from './field.js';
 export { FileField } from './fileField.js';
 export { fieldGroup } from './field-group.js';
+// Conditional-rule grouping wrappers, imported by section configs alongside the field factories.
+export { and, or } from '../helpers/conditional-rules.js';

package/dist/core/fields/map.d.ts

@@ -75,7 +75,7 @@ export declare class MapField extends Field<'map', Config> {
         label: string;
         required: boolean;
         localized?: boolean;
-        conditionalFields: import("../types/index.js").ConditionalField[];
+        conditionalGroup?: import("../types/index.js").ConditionalGroupClient;
         readonly: boolean;
         defaultValue: any;
     };
@@ -118,7 +118,7 @@ declare const optionsSchema: z.ZodObject<{
     label: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>>;
     required: z.ZodOptional<z.ZodBoolean>;
     order: z.ZodOptional<z.ZodNumber>;
-    conditionalRules: z.ZodOptional<z.ZodArray<z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>>>;
+    conditionalRules: z.ZodOptional<z.ZodUnion<readonly [z.ZodTuple<[z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>], null>, z.ZodCustom<import("../types/index.js").ConditionalRuleGroup, import("../types/index.js").ConditionalRuleGroup>]>>;
     adminGenerated: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<true>, z.ZodLiteral<false>, z.ZodLiteral<"readonly">]>>;
     localized: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;
@@ -150,7 +150,7 @@ declare const mapFieldConfigSchema: z.ZodObject<{
     label: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>>;
     required: z.ZodOptional<z.ZodBoolean>;
     order: z.ZodOptional<z.ZodNumber>;
-    conditionalRules: z.ZodOptional<z.ZodArray<z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>>>;
+    conditionalRules: z.ZodOptional<z.ZodUnion<readonly [z.ZodTuple<[z.ZodCustom<import("../types/index.js").ConditionalRule, import("../types/index.js").ConditionalRule>], null>, z.ZodCustom<import("../types/index.js").ConditionalRuleGroup, import("../types/index.js").ConditionalRuleGroup>]>>;
     adminGenerated: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<true>, z.ZodLiteral<false>, z.ZodLiteral<"readonly">]>>;
     localized: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;