nextjs-cms 0.7.2 → 0.7.3

package/dist/core/fields/photo.js

@@ -16,41 +16,61 @@ const backgroundSchema = z
     b: z.number().min(0).max(255).describe('Blue channel (0-255)'),
     alpha: z.number().min(0).max(1).describe('Alpha channel (0-1)'),
 })
-    .describe('Background color for image padding (used when crop is false)');
-const sizeSchema = z.strictObject({
+    .describe('Background color for image padding (used with fit: contain)');
+/**
+ * Size schema — discriminated union of three variants:
+ * - strict: true — user must upload exact dimensions, no server resize
+ * - fit: 'cover' — accept any dimensions, crop to fill (sharp fit: cover)
+ * - fit: 'contain' — accept any dimensions, pad with background (sharp fit: contain)
+ */
+const strictSizeSchema = z.strictObject({
     width: z.number().describe('Image width in pixels'),
     height: z.number().describe('Image height in pixels'),
-    /**
-     * @true The image will not have dimensions constraints,
-     * and will be cropped to fit the specified dimensions
-     *
-     * @false The user will be forced to upload an image with the specified dimensions
-     *
-     * @example
-     * size: {
-     *   width: 1200,
-     *   height: 450,
-     *   crop: true, // No constraints
-     *   }
-     */
-    crop: z.boolean().describe('Whether to crop the image to fit dimensions'),
-    /**
-     * Background color for padding when crop is false.
-     * Falls back to CMS config media.images.background if not provided.
-     */
-    background: backgroundSchema.optional().describe('Background color for padding when not cropping'),
+    strict: z.literal(true).describe('Require exact upload dimensions, no server resize'),
+    quality: z.number().min(1).max(100).optional().describe('Output quality (1-100)'),
+});
+const coverSizeSchema = z.strictObject({
+    width: z.number().describe('Image width in pixels'),
+    height: z.number().describe('Image height in pixels'),
+    fit: z.literal('cover').describe('Crop to fill dimensions (sharp fit: cover)'),
+    quality: z.number().min(1).max(100).optional().describe('Output quality (1-100)'),
 });
-const thumbnailSchema = z.strictObject({
-    width: z.number().describe('Thumbnail width in pixels'),
-    height: z.number().describe('Thumbnail height in pixels'),
-    crop: z.boolean().describe('Whether to crop the thumbnail'),
-    quality: z.number().optional().describe('Thumbnail quality (0-100)'),
+const containSizeSchema = z.strictObject({
+    width: z.number().describe('Image width in pixels'),
+    height: z.number().describe('Image height in pixels'),
+    fit: z.literal('contain').describe('Pad with background to fill dimensions (sharp fit: contain)'),
+    quality: z.number().min(1).max(100).optional().describe('Output quality (1-100)'),
     /**
-     * Background color for padding when crop is false.
+     * Background color for padding.
      * Falls back to CMS config media.images.background if not provided.
      */
-    background: backgroundSchema.optional().describe('Background color for padding when not cropping'),
+    background: backgroundSchema.optional().describe('Background color for padding'),
 });
+const sizeSchema = z.union([strictSizeSchema, z.discriminatedUnion('fit', [coverSizeSchema, containSizeSchema])]);
+/**
+ * Thumbnail schema — discriminated union:
+ * - fit: 'cover' — crop thumbnail to fill
+ * - fit: 'contain' — pad thumbnail with background
+ */
+const thumbnailSchema = z.discriminatedUnion('fit', [
+    z.strictObject({
+        width: z.number().describe('Thumbnail width in pixels'),
+        height: z.number().describe('Thumbnail height in pixels'),
+        fit: z.literal('cover').describe('Crop thumbnail to fill'),
+        quality: z.number().min(1).max(100).optional().describe('Thumbnail quality (1-100)'),
+    }),
+    z.strictObject({
+        width: z.number().describe('Thumbnail width in pixels'),
+        height: z.number().describe('Thumbnail height in pixels'),
+        fit: z.literal('contain').describe('Pad thumbnail with background'),
+        quality: z.number().min(1).max(100).optional().describe('Thumbnail quality (1-100)'),
+        /**
+         * Background color for padding.
+         * Falls back to CMS config media.images.background if not provided.
+         */
+        background: backgroundSchema.optional().describe('Background color for padding'),
+    }),
+]);
 const maxFileSizeSchema = z.strictObject({
     size: z.number().describe('Maximum file size'),
     unit: z.enum(['kb', 'mb']).describe('Size unit'),
@@ -152,9 +172,13 @@ export class PhotoField extends FileField {
             this._thumbnail = this._thumbnailConfig;
         }
         else {
-            // Always fetch fresh CMS config (getCMSConfig() is already cached with version checking)
+            // Fetch CMS config and construct a ThumbnailConfig from it
             const cmsConfig = await getCMSConfig();
-            this._thumbnail = cmsConfig.media.images.thumbnail;
+            const t = cmsConfig.media.images.thumbnail;
+            const fit = t.fit ?? 'contain';
+            this._thumbnail = fit === 'contain'
+                ? { width: t.width, height: t.height, fit: 'contain', quality: t.quality }
+                : { width: t.width, height: t.height, fit: 'cover', quality: t.quality };
         }
         return this._thumbnail;
     }
@@ -206,55 +230,53 @@ export class PhotoField extends FileField {
                 fs.mkdirSync(thumbsFolder, { recursive: true });
             }
             /**
-             * Check if the image needs to be resized and write the file to disk
-             * - crop: true  -> fit: 'cover' (crops to fill dimensions)
-             * - crop: false -> fit: 'contain' with background (preserves all content, adds padding)
+             * Write the main image to disk
+             * - strict: true  -> no resize, just convert to webp
+             * - fit: 'cover'  -> crop to fill dimensions
+             * - fit: 'contain' -> pad with background to fill dimensions
              */
+            const cmsImageQuality = cmsConfig.media.images.image.quality ?? 80;
             if (this.size) {
-                if (this.size.crop) {
-                    // Crop mode: use 'cover' to fill dimensions by cropping excess
+                const quality = this.size.quality ?? cmsImageQuality;
+                const outputPath = path.join(uploadsFolder, '.photos', this._folder, this.value);
+                if ('strict' in this.size) {
+                    // Strict mode: exact dimensions already validated, just convert to webp
+                    await this._sharpImage.clone().webp({ quality }).toFile(outputPath);
+                }
+                else if (this.size.fit === 'cover') {
                     await this._sharpImage
                         .clone()
-                        .resize({
-                        width: this.size.width,
-                        height: this.size.height,
-                        fit: 'cover',
-                    })
-                        .webp()
-                        .toFile(path.join(uploadsFolder, '.photos', this._folder, this.value));
+                        .resize({ width: this.size.width, height: this.size.height, fit: 'cover' })
+                        .webp({ quality })
+                        .toFile(outputPath);
                 }
                 else {
-                    // Contain mode: preserve all content with background padding
-                    // Use field-level background, fall back to CMS config background
+                    // contain: pad with background
+                    const background = this.size.background ?? cmsBackground;
                     await this._sharpImage
                         .clone()
-                        .resize({
-                        width: this.size.width,
-                        height: this.size.height,
-                        fit: 'contain',
-                        background: this.size.background ?? cmsBackground,
-                    })
-                        .webp()
-                        .toFile(path.join(uploadsFolder, '.photos', this._folder, this.value));
+                        .resize({ width: this.size.width, height: this.size.height, fit: 'contain', background })
+                        .webp({ quality })
+                        .toFile(outputPath);
                 }
             }
             else {
                 await this._sharpImage.clone().toFile(path.join(uploadsFolder, '.photos', this._folder, this.value));
             }
             /**
-             * Also, write a thumbnail
-             * Use CMS config background for padding when crop is false
+             * Write a thumbnail
              */
+            const thumbBackground = ('background' in thumbnail ? thumbnail.background : undefined) ?? cmsBackground;
             await this._sharpImage
                 .clone()
                 .resize({
                 width: thumbnail.width,
                 height: thumbnail.height,
-                fit: thumbnail.crop ? 'cover' : 'contain',
-                background: thumbnail.background ?? cmsBackground,
+                fit: thumbnail.fit,
+                ...(thumbnail.fit === 'contain' ? { background: thumbBackground } : {}),
             })
                 .webp({
-                quality: thumbnail.quality ?? 80,
+                quality: thumbnail.quality ?? cmsImageQuality,
             })
                 .toFile(path.join(uploadsFolder, '.thumbs', this._folder, this.value));
         }
@@ -416,22 +438,11 @@ export class PhotoField extends FileField {
             throw new Error(getString('fileCorrupted', this.locale));
         }
         /**
-         * Check the size
+         * Check the size — only enforce exact dimensions when strict mode is set
          */
-        if (this.size) {
-            /**
-             * Check if the image does not need to be cropped (dimensions are constrained)
-             */
-            if (!this.size.crop) {
-                /**
-                 * Just resize the image?
-                 */
-                /**
-                 * Check if the size matches the required size
-                 */
-                if (metadata.width !== this.size.width || metadata.height !== this.size.height) {
-                    throw new Error(getString('imageDimensionMismatchDetailed', this.locale, { field: this.getLocalizedLabel(), actual: `${metadata.width}x${metadata.height}`, required: `${this.size.width}x${this.size.height}` }));
-                }
+        if (this.size && 'strict' in this.size) {
+            if (metadata.width !== this.size.width || metadata.height !== this.size.height) {
+                throw new Error(getString('imageDimensionMismatchDetailed', this.locale, { field: this.getLocalizedLabel(), actual: `${metadata.width}x${metadata.height}`, required: `${this.size.width}x${this.size.height}` }));
             }
         }
         /**

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

@@ -31,10 +31,10 @@ declare const allowImageUploadsSchema: z.ZodObject<{
      */
     omitExtension: z.ZodOptional<z.ZodBoolean>;
     format: z.ZodOptional<z.ZodEnum<{
-        webp: "webp";
-        jpg: "jpg";
         jpeg: "jpeg";
+        jpg: "jpg";
         png: "png";
+        webp: "webp";
     }>>;
 }, z.core.$strict>;
 declare const configSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
@@ -72,10 +72,10 @@ declare const configSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
          */
         omitExtension: z.ZodOptional<z.ZodBoolean>;
         format: z.ZodOptional<z.ZodEnum<{
-            webp: "webp";
-            jpg: "jpg";
             jpeg: "jpeg";
+            jpg: "jpg";
             png: "png";
+            webp: "webp";
         }>>;
     }, z.core.$strict>>;
 }, z.core.$strict>, z.ZodObject<{
@@ -118,7 +118,7 @@ export declare class RichTextField extends Field<'rich_text', Config> {
             } | undefined;
             handleMethod?: "base64" | "tempSave" | undefined;
             omitExtension?: boolean | undefined;
-            format?: "webp" | "jpg" | "jpeg" | "png" | undefined;
+            format?: "jpeg" | "jpg" | "png" | "webp" | undefined;
         };
         sanitize: boolean;
         type: "rich_text";
@@ -186,10 +186,10 @@ declare const optionsSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
          */
         omitExtension: z.ZodOptional<z.ZodBoolean>;
         format: z.ZodOptional<z.ZodEnum<{
-            webp: "webp";
-            jpg: "jpg";
             jpeg: "jpeg";
+            jpg: "jpg";
             png: "png";
+            webp: "webp";
         }>>;
     }, z.core.$strict>>;
     name: z.ZodString;
@@ -248,10 +248,10 @@ declare const richTextFieldConfigSchema: z.ZodIntersection<z.ZodDiscriminatedUni
          */
         omitExtension: z.ZodOptional<z.ZodBoolean>;
         format: z.ZodOptional<z.ZodEnum<{
-            webp: "webp";
-            jpg: "jpg";
             jpeg: "jpeg";
+            jpg: "jpg";
             png: "png";
+            webp: "webp";
         }>>;
     }, z.core.$strict>>;
     name: z.ZodString;

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

@@ -346,8 +346,8 @@ declare const selectFieldConfigSchema: z.ZodIntersection<z.ZodUnion<readonly [z.
 }, z.core.$strict>]>, z.ZodObject<{
     type: z.ZodLiteral<"select">;
     optionsType: z.ZodEnum<{
-        section: "section";
         db: "db";
+        section: "section";
         static: "static";
     }>;
     build: z.ZodFunction<z.core.$ZodFunctionArgs, z.ZodCustom<SelectField, SelectField>>;

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

@@ -118,7 +118,9 @@ declare const optionsSchema: z.ZodObject<{
      */
     allowRecursiveDelete: z.ZodOptional<z.ZodBoolean>;
     fields: z.ZodUnion<[z.ZodArray<z.ZodCustom<FieldConfig, FieldConfig>>, z.ZodArray<z.ZodCustom<FieldGroupConfig, FieldGroupConfig>>]>;
+    readonly: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
     name: z.ZodString;
+    order: z.ZodNumber;
     db: z.ZodObject<{
         table: z.ZodString;
         identifier: z.ZodOptional<z.ZodCustom<FieldConfig, FieldConfig>>;
@@ -142,8 +144,6 @@ declare const optionsSchema: z.ZodObject<{
             name: z.ZodOptional<z.ZodString>;
         }, z.core.$strict>>>;
     }, z.core.$strict>;
-    readonly: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
-    order: z.ZodNumber;
     icon: z.ZodOptional<z.ZodString>;
     gallery: z.ZodOptional<z.ZodObject<{
         db: z.ZodObject<{
@@ -156,7 +156,10 @@ declare const optionsSchema: z.ZodObject<{
         thumbnail: z.ZodOptional<z.ZodObject<{
             width: z.ZodNumber;
             height: z.ZodNumber;
-            crop: z.ZodBoolean;
+            fit: z.ZodEnum<{
+                cover: "cover";
+                contain: "contain";
+            }>;
             quality: z.ZodNumber;
         }, z.core.$strict>>;
     }, z.core.$strict>>;
@@ -215,7 +218,9 @@ export declare const categorySectionConfigSchema: z.ZodObject<{
      * @default false
      */
     allowRecursiveDelete: z.ZodOptional<z.ZodBoolean>;
+    readonly: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
     name: z.ZodString;
+    order: z.ZodNumber;
     db: z.ZodObject<{
         table: z.ZodString;
         identifier: z.ZodOptional<z.ZodCustom<FieldConfig, FieldConfig>>;
@@ -239,8 +244,6 @@ export declare const categorySectionConfigSchema: z.ZodObject<{
             name: z.ZodOptional<z.ZodString>;
         }, z.core.$strict>>>;
     }, z.core.$strict>;
-    readonly: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
-    order: z.ZodNumber;
     icon: z.ZodOptional<z.ZodString>;
     gallery: z.ZodOptional<z.ZodObject<{
         db: z.ZodObject<{
@@ -253,7 +256,10 @@ export declare const categorySectionConfigSchema: z.ZodObject<{
         thumbnail: z.ZodOptional<z.ZodObject<{
             width: z.ZodNumber;
             height: z.ZodNumber;
-            crop: z.ZodBoolean;
+            fit: z.ZodEnum<{
+                cover: "cover";
+                contain: "contain";
+            }>;
             quality: z.ZodNumber;
         }, z.core.$strict>>;
     }, z.core.$strict>>;

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

@@ -1 +1 @@
-{"version":3,"file":"category.d.ts","sourceRoot":"","sources":["../../../src/core/sections/category.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAChE,OAAO,EACH,OAAO,EAKV,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAA;AAEzE,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAqBd;;;;OAIG;;IAEH;;;;;OAKG;;kBAGL,CAAA;AAEF,KAAK,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAA;AAE1C,qBAAa,eAAgB,SAAQ,OAAO,CAAC,MAAM,CAAC;IAChD,gBAAyB,CAAC,UAAU,CAAC,qBAAoB;IACzD,SAAkB,IAAI,cAAa;IACnC,SAAkB,KAAK,EAAE;QACrB,OAAO,EAAE,eAAe,CAAA;QACxB,QAAQ,EAAE,eAAe,CAAA;QACzB,MAAM,EAAE,eAAe,CAAA;KAC1B,CAAA;IACD,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAA;IACtC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAI;IAC1B,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAA;gBAE1B,MAAM,EAAE,kBAAkB,CAAC,MAAM,CAAC;CA2CjD;AAED,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA3Ef;;;;OAIG;;IAEH;;;;;OAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAmEL,CAAA;AAOF,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IArFpC;;;;OAIG;;IAEH;;;;;OAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAkFL,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAA;AAElE;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAA;AAE/E;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,qBAAqB,CAmDtF"}
+{"version":3,"file":"category.d.ts","sourceRoot":"","sources":["../../../src/core/sections/category.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAChE,OAAO,EACH,OAAO,EAKV,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAA;AAEzE,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAqBd;;;;OAIG;;IAEH;;;;;OAKG;;kBAGL,CAAA;AAEF,KAAK,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAA;AAE1C,qBAAa,eAAgB,SAAQ,OAAO,CAAC,MAAM,CAAC;IAChD,gBAAyB,CAAC,UAAU,CAAC,qBAAoB;IACzD,SAAkB,IAAI,cAAa;IACnC,SAAkB,KAAK,EAAE;QACrB,OAAO,EAAE,eAAe,CAAA;QACxB,QAAQ,EAAE,eAAe,CAAA;QACzB,MAAM,EAAE,eAAe,CAAA;KAC1B,CAAA;IACD,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAA;IACtC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAI;IAC1B,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAA;gBAE1B,MAAM,EAAE,kBAAkB,CAAC,MAAM,CAAC;CA2CjD;AAED,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA3Ef;;;;OAIG;;IAEH;;;;;OAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAmEL,CAAA;AAOF,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IArFpC;;;;OAIG;;IAEH;;;;;OAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAkFL,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAA;AAElE;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAA;AAE/E;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,qBAAqB,CAmDtF"}