nextjs-cms 0.5.56 → 0.5.58

package/dist/core/fields/photo.js

@@ -8,7 +8,6 @@ import { customAlphabet } from 'nanoid';
 import { FileField } from './fileField.js';
 import { humanReadableFileSize } from '../../utils/index.js';
 import { getCMSConfig } from '../config/index.js';
-const cmsConfig = getCMSConfig();
 const sizeSchema = z.strictObject({
     width: z.number().describe('Image width in pixels'),
     height: z.number().describe('Image height in pixels'),
@@ -75,9 +74,10 @@ export class PhotoField extends FileField {
     maxFileSize;
     mimeType;
     extensions;
-    thumbnail;
+    _thumbnail = undefined;
+    /** Thumbnail config passed via field options (may be undefined if using CMS defaults) */
+    _thumbnailConfig = undefined;
     removeExtension;
-    uploadsFolder = cmsConfig.media.upload.path;
     /**
      * _file is the file object if it's present
      * Whereas the value is the path to the file
@@ -95,8 +95,8 @@ export class PhotoField extends FileField {
         this.blurPlaceholder = config.blurPlaceholder;
         this.size = config.size;
         this.maxFileSize = config.maxFileSize ?? { size: 2, unit: 'mb' };
-        this.thumbnail = config.thumbnail ?? cmsConfig.media.images.thumbnail;
         this.removeExtension = config.removeExtension ?? true;
+        this._thumbnailConfig = config.thumbnail;
         this.extensions = config.fileType ?? ['jpeg'];
         /**
          * Replace 'jpg' with 'jpeg'
@@ -122,10 +122,36 @@ export class PhotoField extends FileField {
             this._allowedExtensions.push('jpg');
         }
     }
+    /**
+     * Get the thumbnail configuration.
+     * Uses user-provided config if available, otherwise fetches from CMS config.
+     * Note: getCMSConfig() handles caching with version checking internally.
+     */
+    async getThumbnail() {
+        // If user provided config, use it (no need to fetch CMS config)
+        if (this._thumbnailConfig) {
+            this._thumbnail = this._thumbnailConfig;
+        }
+        else {
+            // Always fetch fresh CMS config (getCMSConfig() is already cached with version checking)
+            const cmsConfig = await getCMSConfig();
+            this._thumbnail = cmsConfig.media.images.thumbnail;
+        }
+        return this._thumbnail;
+    }
+    async build() {
+        /**
+         * Make sure to resolve and cache the thumbnail config
+         */
+        await this.getThumbnail();
+    }
     exportForClient() {
+        if (this._thumbnail === undefined) {
+            throw new Error('PhotoField.build() must be called before exportForClient()');
+        }
         return {
             ...super.exportForClient(),
-            thumbnail: this.thumbnail,
+            thumbnail: this._thumbnail,
             // watermark: this.watermark,
             // blurPlaceholder: this.blurPlaceholder,
             size: this.size,
@@ -148,8 +174,10 @@ export class PhotoField extends FileField {
             /**
              * If .photos, and 'sectionName' folders don't exist, create them
              */
-            const photosFolder = path.join(this.uploadsFolder, '.photos', this._folder);
-            const thumbsFolder = path.join(this.uploadsFolder, '.thumbs', this._folder);
+            const thumbnail = await this.getThumbnail();
+            const uploadsFolder = (await getCMSConfig()).media.upload.path;
+            const photosFolder = path.join(uploadsFolder, '.photos', this._folder);
+            const thumbsFolder = path.join(uploadsFolder, '.thumbs', this._folder);
             if (!fs.existsSync(photosFolder)) {
                 fs.mkdirSync(photosFolder, { recursive: true });
             }
@@ -168,12 +196,10 @@ export class PhotoField extends FileField {
                     fit: 'cover',
                 })
                     .webp()
-                    .toFile(path.join(this.uploadsFolder, '.photos', this._folder, this.value));
+                    .toFile(path.join(uploadsFolder, '.photos', this._folder, this.value));
             }
             else {
-                await this._sharpImage
-                    .clone()
-                    .toFile(path.join(this.uploadsFolder, '.photos', this._folder, this.value));
+                await this._sharpImage.clone().toFile(path.join(uploadsFolder, '.photos', this._folder, this.value));
             }
             /**
              * Also, write a thumbnail
@@ -181,14 +207,14 @@ export class PhotoField extends FileField {
             await this._sharpImage
                 .clone()
                 .resize({
-                width: this.thumbnail.width,
-                height: this.thumbnail.height,
-                fit: this.thumbnail.crop ? 'cover' : 'contain',
+                width: thumbnail.width,
+                height: thumbnail.height,
+                fit: thumbnail.crop ? 'cover' : 'contain',
             })
                 .webp({
-                quality: this.thumbnail.quality || 80,
+                quality: thumbnail.quality ?? 80,
             })
-                .toFile(path.join(this.uploadsFolder, '.thumbs', this._folder, this.value));
+                .toFile(path.join(uploadsFolder, '.thumbs', this._folder, this.value));
         }
         catch (error) {
             throw new Error(`${this.label}: Error writing file to disk  ${error.message}`);
@@ -207,7 +233,8 @@ export class PhotoField extends FileField {
             throw new Error(`${this.label}: Folder is not set. Make sure to set the folder before writing the file to disk`);
         }
         try {
-            const pathToFile = path.join(this.uploadsFolder, '.photos', this._folder, this.value);
+            const uploadsFolder = (await getCMSConfig()).media.upload.path;
+            const pathToFile = path.join(uploadsFolder, '.photos', this._folder, this.value);
             await fs.promises.unlink(pathToFile);
         }
         catch (error) {

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

@@ -95,7 +95,6 @@ export declare class RichTextField extends Field<'rich_text', Config> {
     readonly allowImageUploads: z.infer<typeof allowImageUploadsSchema> | false;
     readonly sanitize: boolean;
     private _inlinePhotos;
-    readonly uploadsFolder: string;
     constructor(config: BaseFieldConfig<Config>);
     /**
      * Get the value of the field

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

@@ -1 +1 @@
-{"version":3,"file":"richText.d.ts","sourceRoot":"","sources":["../../../src/core/fields/richText.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAE,KAAK,EAAyB,MAAM,YAAY,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAcxB,QAAA,MAAM,uBAAuB;IACzB;;;;;OAKG;;;;;;;;;;;;;;;;;;IAgBH;;OAEG;;;;;;;;kBAGL,CAAA;AAkCF,QAAA,MAAM,YAAY;;;;;;;QA5Dd;;;;;WAKG;;;;;;;;;;;;;;;;;;QAgBH;;WAEG;;;;;;;;;;;;;;;kCAwCL,CAAA;AAEF,KAAK,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAA;AAE1C,qBAAa,aAAc,SAAQ,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC;IACzD,gBAAyB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAkB;IAC/D,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IACtC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IACtC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,UAAU,EAAE,OAAO,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,GAAG,KAAK,CAAA;IAC3E,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;IAE1B,OAAO,CAAC,aAAa,CAIb;IAER,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAmC;gBAErD,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC;IAsB3C;;OAEG;IACH,QAAQ,IAAI,MAAM;IAIF,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAY/B;;OAEG;IACH,OAAO,CAAC,aAAa;IAYrB,aAAa;IAWb;;OAEG;IACH,mBAAmB;IAuBb,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IA2C3D;;OAEG;IACG,oBAAoB;IA0BJ,UAAU,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YAYnG,yBAAyB;CA2D1C;AAED,MAAM,MAAM,yBAAyB,GAAG,UAAU,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,CAAA;AAWpF,QAAA,MAAM,aAAa;;;;;;;QA7Uf;;;;;WAKG;;;;;;;;;;;;;;;;;;QAgBH;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kCAyTL,CAAA;AAEF,QAAA,MAAM,yBAAyB;;;;;;;QAlV3B;;;;;WAKG;;;;;;;;;;;;;;;;;;QAgBH;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAoUN,CAAA;AAED;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAA;AAE3E;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,GAAG,mBAAmB,CAmBvF"}
+{"version":3,"file":"richText.d.ts","sourceRoot":"","sources":["../../../src/core/fields/richText.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAE,KAAK,EAAyB,MAAM,YAAY,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAcxB,QAAA,MAAM,uBAAuB;IACzB;;;;;OAKG;;;;;;;;;;;;;;;;;;IAgBH;;OAEG;;;;;;;;kBAGL,CAAA;AAkCF,QAAA,MAAM,YAAY;;;;;;;QA5Dd;;;;;WAKG;;;;;;;;;;;;;;;;;;QAgBH;;WAEG;;;;;;;;;;;;;;;kCAwCL,CAAA;AAEF,KAAK,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAA;AAE1C,qBAAa,aAAc,SAAQ,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC;IACzD,gBAAyB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAkB;IAC/D,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IACtC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IACtC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,UAAU,EAAE,OAAO,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,GAAG,KAAK,CAAA;IAC3E,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;IAE1B,OAAO,CAAC,aAAa,CAIb;gBAEI,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC;IAsB3C;;OAEG;IACH,QAAQ,IAAI,MAAM;IAIF,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAY/B;;OAEG;IACH,OAAO,CAAC,aAAa;IAYrB,aAAa;IAWb;;OAEG;IACH,mBAAmB;IAuBb,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IA4C3D;;OAEG;IACG,oBAAoB;IA0BJ,UAAU,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YAYnG,yBAAyB;CA4D1C;AAED,MAAM,MAAM,yBAAyB,GAAG,UAAU,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,CAAA;AAWpF,QAAA,MAAM,aAAa;;;;;;;QA7Uf;;;;;WAKG;;;;;;;;;;;;;;;;;;QAgBH;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kCAyTL,CAAA;AAEF,QAAA,MAAM,yBAAyB;;;;;;;QAlV3B;;;;;WAKG;;;;;;;;;;;;;;;;;;QAgBH;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAoUN,CAAA;AAED;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAA;AAE3E;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,GAAG,mBAAmB,CAmBvF"}

package/dist/core/fields/richText.js

@@ -82,7 +82,6 @@ export class RichTextField extends Field {
     allowImageUploads;
     sanitize;
     _inlinePhotos = [];
-    uploadsFolder = getCMSConfig().media.upload.path;
     constructor(config) {
         super(config, 'rich_text');
         this.maxLength = config.maxLength;
@@ -178,7 +177,8 @@ export class RichTextField extends Field {
         /**
          * If .photos, and 'sectionName' folders don't exist, create them
          */
-        const photosFolder = path.join(this.uploadsFolder, '.photos', sectionName);
+        const uploadsFolder = (await getCMSConfig()).media.upload.path;
+        const photosFolder = path.join(uploadsFolder, '.photos', sectionName);
         if (!fs.existsSync(photosFolder)) {
             fs.mkdirSync(photosFolder, { recursive: true });
         }
@@ -195,7 +195,7 @@ export class RichTextField extends Field {
             const image = sharp(buffer);
             await image
                 .toFormat(this.allowImageUploads.format ?? 'webp')
-                .toFile(path.join(this.uploadsFolder, '.photos', sectionName, photo.name));
+                .toFile(path.join(uploadsFolder, '.photos', sectionName, photo.name));
             /**
              * Insert the image into the database
              */
@@ -285,7 +285,8 @@ export class RichTextField extends Field {
                  * Delete the photo from disk
                  */
                 try {
-                    await fs.promises.unlink(path.join(this.uploadsFolder, '.photos', sectionName, tablePhoto.name));
+                    const uploadsFolder = (await getCMSConfig()).media.upload.path;
+                    await fs.promises.unlink(path.join(uploadsFolder, '.photos', sectionName, tablePhoto.name));
                 }
                 catch (error) {
                     console.log(`${this.label}: Error deleting file from disk`);

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

@@ -40,7 +40,6 @@ export declare class VideoField extends FileField<'video', Config> {
     private _buffer;
     private _folder;
     private _allowedExtensions;
-    readonly uploadsFolder: string;
     constructor(config: BaseFieldConfig<Config>, file?: File);
     exportForClient(): {
         maxFileSize: {

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

@@ -1 +1 @@
-{"version":3,"file":"video.d.ts","sourceRoot":"","sources":["../../../src/core/fields/video.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAIhD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,QAAA,MAAM,YAAY;IACd;;OAEG;;;;;;;;IAQH;;;OAGG;;;;;;kBAKL,CAAA;AAEF,KAAK,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAA;AAE1C,qBAAa,UAAW,SAAQ,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IACtD,gBAAyB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAe;IAC5D,QAAQ,CAAC,WAAW,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAA;KAAE,CAAA;IACzD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,CAAA;IAE7B;;;OAGG;IACH,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,kBAAkB,CAAU;IACpC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAmC;gBACrD,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,IAAI;IA6BxC,eAAe;;kBA1CD,MAAM;kBAAQ,IAAI,GAAG,IAAI;;;;;;;;;;;;;IAmDjD,iBAAiB,CAAC,EACpB,WAAW,EACX,MAAM,EACN,aAAiB,GACpB,EAAE;QACC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;QACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;QACvB,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAClC,GAAG,OAAO,CAAC,UAAU,CAAC;IAevB;;OAEG;IACG,WAAW;IAiCK,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKzC,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAczD;;OAEG;IACH,QAAQ,IAAI,MAAM;IAIX,WAAW,CAAC,KAAK,EAAE,MAAM;IAIvB,QAAQ,CAAC,KAAK,EAAE,GAAG;IAQnB,OAAO,CAAC,IAAI,EAAE,IAAI;IAK3B,aAAa;IAYb;;OAEG;IACG,oBAAoB;CAoD7B;AAED,MAAM,MAAM,sBAAsB,GAAG,UAAU,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAA;AAE9E,QAAA,MAAM,aAAa;IAxPf;;OAEG;;;;;;;;IAQH;;;OAGG;;;;;;;;;;;;;kBA8OL,CAAA;AAEF,QAAA,MAAM,sBAAsB;;;IA7PxB;;OAEG;;;;;;;;IAQH;;;OAGG;;;;;;;;;;;;;kBAoPL,CAAA;AAEF;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAA;AAErE;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,GAAG,gBAAgB,CAmBjF"}
+{"version":3,"file":"video.d.ts","sourceRoot":"","sources":["../../../src/core/fields/video.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAIhD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,QAAA,MAAM,YAAY;IACd;;OAEG;;;;;;;;IAQH;;;OAGG;;;;;;kBAKL,CAAA;AAEF,KAAK,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAA;AAE1C,qBAAa,UAAW,SAAQ,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IACtD,gBAAyB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAe;IAC5D,QAAQ,CAAC,WAAW,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAA;KAAE,CAAA;IACzD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,CAAA;IAE7B;;;OAGG;IACH,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,kBAAkB,CAAU;gBACxB,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,IAAI;IA6BxC,eAAe;;kBAzCD,MAAM;kBAAQ,IAAI,GAAG,IAAI;;;;;;;;;;;;;IAkDjD,iBAAiB,CAAC,EACpB,WAAW,EACX,MAAM,EACN,aAAiB,GACpB,EAAE;QACC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;QACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;QACvB,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAClC,GAAG,OAAO,CAAC,UAAU,CAAC;IAevB;;OAEG;IACG,WAAW;IA+BK,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKzC,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAezD;;OAEG;IACH,QAAQ,IAAI,MAAM;IAIX,WAAW,CAAC,KAAK,EAAE,MAAM;IAIvB,QAAQ,CAAC,KAAK,EAAE,GAAG;IAQnB,OAAO,CAAC,IAAI,EAAE,IAAI;IAK3B,aAAa;IAYb;;OAEG;IACG,oBAAoB;CAoD7B;AAED,MAAM,MAAM,sBAAsB,GAAG,UAAU,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAA;AAE9E,QAAA,MAAM,aAAa;IAtPf;;OAEG;;;;;;;;IAQH;;;OAGG;;;;;;;;;;;;;kBA4OL,CAAA;AAEF,QAAA,MAAM,sBAAsB;;;IA3PxB;;OAEG;;;;;;;;IAQH;;;OAGG;;;;;;;;;;;;;kBAkPL,CAAA;AAEF;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAA;AAErE;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,GAAG,gBAAgB,CAmBjF"}

package/dist/core/fields/video.js

@@ -39,7 +39,6 @@ export class VideoField extends FileField {
     _buffer;
     _folder;
     _allowedExtensions;
-    uploadsFolder = getCMSConfig().media.upload.path;
     constructor(config, file) {
         super(config, 'video');
         this._file = file;
@@ -104,14 +103,15 @@ export class VideoField extends FileField {
             /**
              * If .videos, and 'sectionName' folders don't exist, create them
              */
-            const vdieosFolder = path.join(this.uploadsFolder, '.videos', this._folder);
+            const uploadsFolder = (await getCMSConfig()).media.upload.path;
+            const vdieosFolder = path.join(uploadsFolder, '.videos', this._folder);
             if (!fs.existsSync(vdieosFolder)) {
                 fs.mkdirSync(vdieosFolder, { recursive: true });
             }
             /**
              * Write the file to disk
              */
-            await fs.promises.writeFile(path.join(this.uploadsFolder, '.videos', this._folder, this.value), this._buffer);
+            await fs.promises.writeFile(path.join(uploadsFolder, '.videos', this._folder, this.value), this._buffer);
         }
         catch (error) {
             throw new Error(`${this.label}: Error writing file to disk ${error.message}`);
@@ -126,7 +126,8 @@ export class VideoField extends FileField {
             throw new Error(`${this.label}: Folder is not set. Make sure to set the folder before writing the file to disk`);
         }
         try {
-            const pathToFile = path.join(this.uploadsFolder, '.videos', this._folder, this.value);
+            const uploadsFolder = (await getCMSConfig()).media.upload.path;
+            const pathToFile = path.join(uploadsFolder, '.videos', this._folder, this.value);
             await fs.promises.unlink(pathToFile);
         }
         catch (error) {

package/dist/core/sections/section.d.ts

@@ -123,21 +123,8 @@ export declare abstract class Section<TExtraSectionConfig extends object = objec
     order: number;
     icon: string | undefined;
     readonly: boolean;
-    gallery?: {
-        db: {
-            tableName: string;
-            referenceIdentifierField: string;
-            photoNameField: string;
-            metaField: string;
-        };
-        watermark?: boolean;
-        thumbnail?: {
-            width: number;
-            height: number;
-            crop: boolean;
-            quality: number;
-        };
-    };
+    private _gallery?;
+    private readonly _galleryConfig?;
     private _fields;
     private readonly _fieldGroupConfigs;
     private readonly _hasFieldGroups;
@@ -183,6 +170,21 @@ export declare abstract class Section<TExtraSectionConfig extends object = objec
      * Value is cached during construction for optimal performance.
      */
     private get hasFieldGroups();
+    getGallery(): Promise<{
+        db: {
+            tableName: string;
+            referenceIdentifierField: string;
+            photoNameField: string;
+            metaField: string;
+        };
+        watermark?: boolean;
+        thumbnail?: {
+            width: number;
+            height: number;
+            crop: boolean;
+            quality: number;
+        };
+    } | undefined>;
     private buildFieldGroups;
     buildFields(): void;
     /**

package/dist/core/sections/section.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"section.d.ts","sourceRoot":"","sources":["../../../src/core/sections/section.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEhF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAErD,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAE5E,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAKxB,eAAO,MAAM,iBAAiB,uCAA0B,CAAA;AACxD,eAAO,MAAM,sBAAsB,iDAA+B,CAAA;AAIlE,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAmEnC,CAAA;AAEF;;;;GAIG;AACH,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAa1C,CAAA;AAEF,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAKtE;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC7B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACxB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,OAAO,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,KAAK,GAAG;IAChB,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,kBAAkB,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;CAClE,CAAA;AAED,8BAAsB,OAAO,CAAC,mBAAmB,SAAS,MAAM,GAAG,MAAM;IACrE,MAAM,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,EAAE,MAAM,CAAY;IAChD,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG,QAAQ,GAAG,UAAU,CAAA;IAC3D,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;IACxB,QAAQ,UAAQ;IAChB,OAAO,CAAC,EAAE;QACN,EAAE,EAAE;YACA,SAAS,EAAE,MAAM,CAAA;YACjB,wBAAwB,EAAE,MAAM,CAAA;YAChC,cAAc,EAAE,MAAM,CAAA;YACtB,SAAS,EAAE,MAAM,CAAA;SACpB,CAAA;QACD,SAAS,CAAC,EAAE,OAAO,CAAA;QACnB,SAAS,CAAC,EAAE;YACR,KAAK,EAAE,MAAM,CAAA;YACb,MAAM,EAAE,MAAM,CAAA;YACd,IAAI,EAAE,OAAO,CAAA;YACb,OAAO,EAAE,MAAM,CAAA;SAClB,CAAA;KACJ,CAAA;IACD,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA4C;IAC/E,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,YAAY,CAAsC;IAC1D,SAAS,CAAC,aAAa,EAAE,WAAW,EAAE,GAAG,SAAS,CAAA;IAElD;;;OAGG;IACH,IAAI,YAAY,IAAI,WAAW,EAAE,CAEhC;IAED,IAAI,WAAW,IAAI,UAAU,EAAE,CAE9B;IAED,IAAI,MAAM,IAAI,KAAK,EAAE,CAYpB;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,EAExB;IAED,QAAQ,CAAC,EAAE,EAAE;QACT,KAAK,EAAE,MAAM,CAAA;QACb,UAAU,EAAE,qBAAqB,GAAG,eAAe,CAAA;QACnD,YAAY,CAAC,EAAE,WAAW,CAAA;QAC1B,UAAU,EAAE,WAAW,EAAE,CAAA;QACzB,WAAW,CAAC,EAAE;YAAE,OAAO,EAAE,WAAW,EAAE,CAAC;YAAC,cAAc,EAAE,WAAW,EAAE,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE,CAAA;QACvF,QAAQ,CAAC,EAAE;YAAE,OAAO,EAAE,WAAW,EAAE,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,EAAE,CAAA;QACtD,KAAK,CAAC,EAAE;YAAE,OAAO,EAAE,WAAW,EAAE,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,EAAE,CAAA;QACnD,MAAM,EAAE;YAAE,OAAO,EAAE,WAAW,EAAE,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,EAAE,CAAA;KACtD,CAAA;IACD,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAA;IACnB,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,SAAS,CAAA;IAChC,KAAK,CAAC,EAAE,KAAK,CAAA;gBAED,MAAM,EAAE,kBAAkB,CAAC,mBAAmB,CAAC;IAmF3D;;;OAGG;IACH,OAAO,KAAK,cAAc,GAEzB;IAED,OAAO,CAAC,gBAAgB;IAwBjB,WAAW,IAAI,IAAI;IAyB1B;;;;;;OAMG;IACH,OAAO,CAAC,YAAY;CAUvB;AAED,MAAM,MAAM,kBAAkB,CAAC,mBAAmB,SAAS,MAAM,GAAG,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,GAClH,mBAAmB,CAAA;AAEvB;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,kBAAkB,EAClE,OAAO,EAAE,CAAC,GACX,CAAC,GAAG;IAAE,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG;QAAE,UAAU,EAAE,WAAW,CAAA;KAAE,CAAA;CAAE,CAwBnD;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,kBAAkB,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAmBhF;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IAAC,WAAW,EAAE,gBAAgB,EAAE,CAAA;CAAE,GAAG;IAC7G,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,WAAW,EAAE,gBAAgB,EAAE,CAAA;CAClC,CAYA"}
+{"version":3,"file":"section.d.ts","sourceRoot":"","sources":["../../../src/core/sections/section.ts"],"names":[],"mappings":"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"}

package/dist/core/sections/section.js

@@ -3,7 +3,6 @@ import { numberField } from '../fields/index.js';
 import chalk from 'chalk';
 import * as z from 'zod';
 import { getCMSConfig } from '../config/config-loader.js';
-const cmsConfig = getCMSConfig();
 export const fieldConfigSchema = z.custom();
 export const FieldGroupConfigSchema = z.custom();
 const variantSchema = z.custom();
@@ -97,7 +96,8 @@ export class Section {
     order;
     icon;
     readonly = false;
-    gallery;
+    _gallery;
+    _galleryConfig;
     _fields = undefined;
     _fieldGroupConfigs = undefined;
     _hasFieldGroups;
@@ -141,15 +141,15 @@ export class Section {
          * Resolve gallery config
          */
         if (config.gallery) {
-            this.gallery = {
+            this._galleryConfig = {
                 db: {
                     tableName: config.gallery.db.tableName,
                     referenceIdentifierField: config.gallery.db.identifierField ?? 'reference_id',
                     photoNameField: config.gallery.db.photoNameField ?? 'photo',
                     metaField: config.gallery.db.metaField ?? 'meta',
                 },
-                watermark: config.gallery.watermark ?? cmsConfig.media.images.watermark,
-                thumbnail: config.gallery.thumbnail ?? cmsConfig.media.images.thumbnail,
+                watermark: config.gallery.watermark,
+                thumbnail: config.gallery.thumbnail,
             };
         }
         /**
@@ -215,6 +215,29 @@ export class Section {
     get hasFieldGroups() {
         return this._hasFieldGroups;
     }
+    async getGallery() {
+        if (!this._gallery) {
+            if (this._galleryConfig) {
+                const cmsConfig = await getCMSConfig();
+                this._gallery = {
+                    db: {
+                        tableName: this._galleryConfig.db.tableName,
+                        referenceIdentifierField: this._galleryConfig.db.referenceIdentifierField,
+                        photoNameField: this._galleryConfig.db.photoNameField,
+                        metaField: this._galleryConfig.db.metaField,
+                    },
+                    watermark: this._galleryConfig.watermark ?? cmsConfig.media.images.watermark,
+                    thumbnail: {
+                        width: this._galleryConfig.thumbnail?.width ?? cmsConfig.media.images.thumbnail.width,
+                        height: this._galleryConfig.thumbnail?.height ?? cmsConfig.media.images.thumbnail.height,
+                        crop: this._galleryConfig.thumbnail?.crop ?? cmsConfig.media.images.thumbnail.crop,
+                        quality: this._galleryConfig.thumbnail?.quality ?? cmsConfig.media.images.thumbnail.quality,
+                    },
+                };
+            }
+        }
+        return this._gallery;
+    }
     buildFieldGroups() {
         const configs = this._fieldGroupConfigs;
         if (!configs?.length)

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

@@ -1 +1 @@
-{"version":3,"file":"submit.d.ts","sourceRoot":"","sources":["../../../src/core/submit/submit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAGtC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,EAAE,UAAU,EAAM,MAAM,YAAY,CAAA;AAG3C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEtC,KAAK,eAAe,GAAG;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,IAAI,CAAA;IACV,QAAQ,EAAE,QAAQ,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;CACtB,CAAA;AAED,8BAAsB,MAAM;IACxB,MAAM,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,EAAE,MAAM,CAAW;IAC/C,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAA;IAC7B,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAY;IAC1D,SAAS,CAAC,MAAM,EAAE,OAAO,CAAQ;IACjC,SAAS,CAAC,aAAa,EAAE,MAAM,CAAK;IACpC,OAAO,CAAC,QAAQ,CAAwB;IACxC,SAAS,CAAC,WAAW,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAA;IAC5B,SAAS,CAAC,YAAY,EAAG,OAAO,CAAA;IAChC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAQ;IACpC,SAAS,CAAC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAK;IACrD,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,CAAK;IAE9B;;OAEG;gBACS,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,eAAe;IAOvE;;;OAGG;cACa,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAanD;;OAEG;YACW,YAAY;IAM1B;;OAEG;IACU,UAAU,CAAC,YAAY,GAAE,GAAG,GAAG,GAAS;IAIrD;;;;;OAKG;YACW,qBAAqB;IA4BnC;;;;OAIG;YACW,UAAU;IAoDxB;;;;OAIG;cACa,kBAAkB;IAMlC;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAElD;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAqB7B;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa,IAAI,GAAG,GAAG,SAAS;IAEnD;;;;OAIG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK;IAIpC;;;;OAIG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK;IAqBpC,SAAS,CAAC,uBAAuB,CAAC,KAAK,EAAE,KAAK;IAM9C,SAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK;IAUxC;;;;OAIG;cACa,WAAW,CAAC,KAAK,EAAE,KAAK;cAoDxB,YAAY;IAU5B;;;;OAIG;YACW,YAAY;IA6B1B;;OAEG;IACU,MAAM;YAsEL,aAAa;IAiF3B,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED,IAAI,OAAO,IAAI,MAAM,EAAE,GAAG,IAAI,CAE7B;IAED,OAAO,CAAC,SAAS;CAMpB"}
+{"version":3,"file":"submit.d.ts","sourceRoot":"","sources":["../../../src/core/submit/submit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAGtC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,EAAE,UAAU,EAAM,MAAM,YAAY,CAAA;AAG3C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEtC,KAAK,eAAe,GAAG;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,IAAI,CAAA;IACV,QAAQ,EAAE,QAAQ,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;CACtB,CAAA;AAED,8BAAsB,MAAM;IACxB,MAAM,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,EAAE,MAAM,CAAW;IAC/C,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAA;IAC7B,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAY;IAC1D,SAAS,CAAC,MAAM,EAAE,OAAO,CAAQ;IACjC,SAAS,CAAC,aAAa,EAAE,MAAM,CAAK;IACpC,OAAO,CAAC,QAAQ,CAAwB;IACxC,SAAS,CAAC,WAAW,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAA;IAC5B,SAAS,CAAC,YAAY,EAAG,OAAO,CAAA;IAChC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAQ;IACpC,SAAS,CAAC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAK;IACrD,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,CAAK;IAE9B;;OAEG;gBACS,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,eAAe;IAOvE;;;OAGG;cACa,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAanD;;OAEG;YACW,YAAY;IAM1B;;OAEG;IACU,UAAU,CAAC,YAAY,GAAE,GAAG,GAAG,GAAS;IAIrD;;;;;OAKG;YACW,qBAAqB;IA4BnC;;;;OAIG;YACW,UAAU;IAoDxB;;;;OAIG;cACa,kBAAkB;IAMlC;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAElD;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAqB7B;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa,IAAI,GAAG,GAAG,SAAS;IAEnD;;;;OAIG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK;IAIpC;;;;OAIG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK;IAqBpC,SAAS,CAAC,uBAAuB,CAAC,KAAK,EAAE,KAAK;IAM9C,SAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK;IAUxC;;;;OAIG;cACa,WAAW,CAAC,KAAK,EAAE,KAAK;cAoDxB,YAAY;IAU5B;;;;OAIG;YACW,YAAY;IA6B1B;;OAEG;IACU,MAAM;YAsEL,aAAa;IAkF3B,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED,IAAI,OAAO,IAAI,MAAM,EAAE,GAAG,IAAI,CAE7B;IAED,OAAO,CAAC,SAAS;CAMpB"}

package/dist/core/submit/submit.js

@@ -387,21 +387,22 @@ export class Submit {
         return true;
     }
     async handleGallery() {
-        if (!this._sectionInfo.gallery ||
-            !this._sectionInfo.gallery.db ||
-            !this._sectionInfo.gallery.db.tableName ||
-            !this._sectionInfo.gallery.db.referenceIdentifierField ||
-            !this._sectionInfo.gallery.db.metaField) {
+        const gallery = await this._sectionInfo.getGallery();
+        if (!gallery ||
+            !gallery.db ||
+            !gallery.db.tableName ||
+            !gallery.db.referenceIdentifierField ||
+            !gallery.db.metaField) {
             /**
              * The gallery table is not set up correctly, add it to the notices array
              */
             this.addNotice('Gallery table is not set up correctly, gallery photos were not saved.');
             return;
         }
-        const columns = await MysqlTableChecker.getColumns(this._sectionInfo.gallery.db.tableName);
-        if (!columns.includes(this._sectionInfo.gallery.db.referenceIdentifierField) ||
-            !columns.includes(this._sectionInfo.gallery.db.metaField) ||
-            !columns.includes(this._sectionInfo.gallery.db.photoNameField)) {
+        const columns = await MysqlTableChecker.getColumns(gallery.db.tableName);
+        if (!columns.includes(gallery.db.referenceIdentifierField) ||
+            !columns.includes(gallery.db.metaField) ||
+            !columns.includes(gallery.db.photoNameField)) {
             /**
              * The gallery table is not set up correctly, add it to the notices array
              */
@@ -425,8 +426,8 @@ export class Submit {
                 required: false,
                 order: 0,
                 fileType: ['jpg', 'jpeg', 'png'],
-                watermark: this._sectionInfo.gallery.watermark,
-                thumbnail: this._sectionInfo.gallery.thumbnail,
+                watermark: gallery.watermark,
+                thumbnail: gallery.thumbnail,
             });
             /**
              * Set the value of the photo field
@@ -445,7 +446,7 @@ export class Submit {
                  * Prepare the sql statement to insert the photo into the gallery table
                  */
                 const sqlChunks = [];
-                sqlChunks.push(sql `INSERT INTO \`${sql.raw(this._sectionInfo.gallery.db.tableName)}\` (\`${sql.raw(this._sectionInfo.gallery.db.referenceIdentifierField)}\`, \`${sql.raw(this._sectionInfo.gallery.db.photoNameField)}\`, \`created_by\`) VALUES (${this._itemId}, ${photoField.getValue()}, ${this.user.name})`);
+                sqlChunks.push(sql `INSERT INTO \`${sql.raw(gallery.db.tableName)}\` (\`${sql.raw(gallery.db.referenceIdentifierField)}\`, \`${sql.raw(gallery.db.photoNameField)}\`, \`created_by\`) VALUES (${this._itemId}, ${photoField.getValue()}, ${this.user.name})`);
                 const sqlQuery = sql.join(sqlChunks);
                 /**
                  * Execute the sql query

package/dist/translations/dictionaries/ar.json

@@ -177,6 +177,7 @@
     "no_file_selected": "لم يتم اختيار ملف",
     "start_typing": "ابدأ الكتابة",
     "add_new": "إضافة",
+    "new": "إضافة",
     "approve": "الموافقة على",
     "add": "إضافة",
     "add_new_item": "إضافة عنصر جديد",

package/dist/translations/dictionaries/en.json

@@ -177,6 +177,7 @@
     "no_file_selected": "No file selected",
     "start_typing": "Start typing",
     "add_new": "Add New",
+    "new": "New",
     "approve": "Approve",
     "add": "Add",
     "add_new_item": "Add New Item",

package/dist/translations/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/translations/index.ts"],"names":[],"mappings":"AAGA,iBAAS,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,SAAO,GAAG,MAAM,CAanD;AAED,eAAe,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/translations/index.ts"],"names":[],"mappings":"AAGA,iBAAS,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,SAAO,GAAG,MAAM,CAWnD;AAED,eAAe,SAAS,CAAA"}

package/dist/translations/index.js

@@ -3,13 +3,11 @@ import enStrings from './dictionaries/en.json';
 function getString(key, lang = 'en') {
     const dict = lang === 'en' ? enStrings : arStrings;
     // @ts-expect-error key is string
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const text = dict[key];
     if (!text) {
-        console.warn(`Key not found: ${key}`);
+        console.warn(`Translation key not found: ${key}`);
         return key;
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return text;
 }
 export default getString;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextjs-cms",
-  "version": "0.5.56",
+  "version": "0.5.58",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
@@ -18,6 +18,10 @@
       "types": "./dist/api/lib/serverActions.d.ts",
       "default": "./dist/api/lib/serverActions.js"
     },
+    "./api/trpc/server": {
+      "types": "./dist/api/trpc/server.d.ts",
+      "default": "./dist/api/trpc/server.js"
+    },
     "./auth": {
       "types": "./dist/auth/index.d.ts",
       "default": "./dist/auth/index.js"
@@ -105,22 +109,27 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@trpc/server": "^11.4.2",
-    "axios": "^1.8.4",
+    "@trpc/client": "^11.8.1",
+    "@trpc/next": "^11.8.1",
+    "@trpc/react-query": "^11.8.1",
+    "@trpc/server": "^11.8.1",
+    "axios": "^1.13.2",
     "bcrypt": "^6.0.0",
     "chalk": "^5.4.1",
     "chokidar": "3.6.0",
     "dayjs": "^1.11.19",
     "dotenv": "^17.2.3",
-    "drizzle-orm": "^0.44.6",
+    "drizzle-orm": "^0.45.1",
+    "esbuild": "0.27.2",
     "esbuild-register": "^3.6.0",
-    "glob": "^11.0.3",
+    "glob": "^10.4.5",
     "isomorphic-dompurify": "^2.21.0",
+    "jiti": "^2.6.1",
     "jose": "^6.0.11",
     "jsonwebtoken": "^9.0.2",
     "lodash-es": "^4.17.21",
     "mysql2": "^3.12.0",
-    "next": "^15.5.5",
+    "next": "^16.1.1",
     "react": "19.0.0",
     "react-dom": "19.0.0",
     "superjson": "^2.2.2",
@@ -135,15 +144,15 @@
     "@types/react-dom": "^19.0.0",
     "@types/through2": "^2.0.41",
     "dotenv-cli": "^7.4.4",
-    "drizzle-kit": "^0.31.5",
+    "drizzle-kit": "^0.31.8",
     "eslint": "^9.12.0",
     "nanoid": "^5.1.5",
     "prettier": "^3.3.3",
     "tsx": "^4.20.6",
     "typescript": "^5.9.2",
     "@lzcms/eslint-config": "0.3.0",
-    "@lzcms/tsconfig": "0.1.0",
-    "@lzcms/prettier-config": "0.1.0"
+    "@lzcms/prettier-config": "0.1.0",
+    "@lzcms/tsconfig": "0.1.0"
   },
   "license": "MIT",
   "keywords": [