nextjs-cms 0.9.41 → 0.10.0

package/dist/core/config/config-loader.d.ts.map

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

package/dist/core/config/config-loader.js

@@ -1,12 +1,11 @@
+import chalk from 'chalk';
+import * as z from 'zod';
+import { setConfigDicts } from '../../translations/dict-store.js';
+import { watermarkConfigSchema } from '../helpers/index.js';
+import { getConfigImportVersion, loadConfigModule } from './loader.js';
 if (typeof window !== 'undefined') {
     throw new Error('This module can only run on the server');
 }
-// import 'server-only'
-// import chalk from 'chalk'
-import * as z from 'zod';
-import { loadConfigModule, getConfigImportVersion } from './loader.js';
-import { setConfigDicts } from '../../translations/dict-store.js';
-import chalk from 'chalk';
 /** Locale codes for which we ship dictionaries in core. */
 export const AVAILABLE_I18N_LANGUAGES = ['en'];
 // 1. Define config schema
@@ -135,9 +134,10 @@ const cmsConfigSchema = z.object({
             })
                 .optional(),
             /**
-             * Global images watermark configuration
+             * Global images watermark configuration.
+             * `false` = off; object = watermark asset + defaults. See core/helpers/watermark.
              */
-            watermark: z.boolean().optional(),
+            watermark: watermarkConfigSchema.optional(),
         })
             .optional(),
     })
@@ -315,11 +315,7 @@ function isPluginConfigWithOverrides(input) {
     return typeof input === 'object' && input !== null && 'plugin' in input;
 }
 function isPluginDescriptor(input) {
-    return (typeof input === 'object' &&
-        input !== null &&
-        'package' in input &&
-        'title' in input &&
-        !('plugin' in input));
+    return typeof input === 'object' && input !== null && 'package' in input && 'title' in input && !('plugin' in input);
 }
 function normalizePluginConfigInputs(plugins) {
     return plugins?.map((entry) => {

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

@@ -1,6 +1,8 @@
+import sharp from 'sharp';
+import * as z from 'zod';
+import type { ResolvedWatermark, WatermarkConfig, WatermarkPosition } from '../helpers/index.js';
 import type { BaseFieldConfig } from './field.js';
 import { entityKind } from '../helpers/index.js';
-import * as z from 'zod';
 import { FileField } from './fileField.js';
 declare const sizeSchema: z.ZodUnion<readonly [z.ZodObject<{
     width: z.ZodNumber;
@@ -29,9 +31,43 @@ declare const sizeSchema: z.ZodUnion<readonly [z.ZodObject<{
     }, z.core.$strict>>;
 }, z.core.$strict>], "fit">]>;
 type SizeConfig = z.infer<typeof sizeSchema>;
+/**
+ * Watermark position → sharp gravity. Kept here (server-only) with the rest of the sharp logic;
+ * the pure config schema lives in core/helpers/watermark.
+ */
+export declare const positionToGravity: Record<WatermarkPosition, string>;
+/**
+ * Load and validate a watermark image once, caching by path. Fail-fast: throws a clear
+ * error if the file cannot be read or decoded.
+ */
+export declare function loadWatermarkSource(imagePath: string): Promise<Buffer>;
+/**
+ * Build a sharp composite overlay for a resolved watermark against a base image of `outputWidth`.
+ * Resizes the mark to `size * outputWidth`, applies opacity, and (for non-tiled marks with a
+ * margin) pads a transparent border so `gravity` insets the mark from the edge/corner.
+ */
+export declare function buildOverlay(watermark: ResolvedWatermark, outputWidth: number): Promise<sharp.OverlayOptions>;
 declare const configSchema: z.ZodObject<{
-    /** Whether to add watermark to images */
-    watermark: z.ZodOptional<z.ZodNullable<z.ZodBoolean>>;
+    /** Watermark config: false = off, or a watermark object. See core/helpers/watermark. */
+    watermark: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<false>, z.ZodObject<{
+        imagePath: z.ZodString;
+        position: z.ZodOptional<z.ZodEnum<{
+            "top-left": "top-left";
+            top: "top";
+            "top-right": "top-right";
+            left: "left";
+            center: "center";
+            right: "right";
+            "bottom-left": "bottom-left";
+            bottom: "bottom";
+            "bottom-right": "bottom-right";
+        }>>;
+        size: z.ZodOptional<z.ZodNumber>;
+        opacity: z.ZodOptional<z.ZodNumber>;
+        margin: z.ZodOptional<z.ZodNumber>;
+        tile: z.ZodOptional<z.ZodBoolean>;
+        applyToThumbnail: z.ZodOptional<z.ZodBoolean>;
+    }, z.core.$strict>]>>;
     blurPlaceholder: z.ZodOptional<z.ZodNullable<z.ZodBoolean>>;
     size: z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
         width: z.ZodNumber;
@@ -118,7 +154,7 @@ declare const configSchema: z.ZodObject<{
 type Config = z.infer<typeof configSchema>;
 export declare class PhotoField extends FileField<'photo', Config> {
     static readonly [entityKind]: string;
-    readonly watermark: boolean | null | undefined;
+    readonly watermark: WatermarkConfig | undefined;
     readonly blurPlaceholder: boolean | null | undefined;
     readonly size: SizeConfig | undefined;
     readonly maxFileSize: {
@@ -225,8 +261,26 @@ export declare class PhotoField extends FileField<'photo', Config> {
 }
 export type PhotoFieldClientConfig = ReturnType<PhotoField['exportForClient']>;
 declare const optionsSchema: z.ZodObject<{
-    /** Whether to add watermark to images */
-    watermark: z.ZodOptional<z.ZodNullable<z.ZodBoolean>>;
+    /** Watermark config: false = off, or a watermark object. See core/helpers/watermark. */
+    watermark: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<false>, z.ZodObject<{
+        imagePath: z.ZodString;
+        position: z.ZodOptional<z.ZodEnum<{
+            "top-left": "top-left";
+            top: "top";
+            "top-right": "top-right";
+            left: "left";
+            center: "center";
+            right: "right";
+            "bottom-left": "bottom-left";
+            bottom: "bottom";
+            "bottom-right": "bottom-right";
+        }>>;
+        size: z.ZodOptional<z.ZodNumber>;
+        opacity: z.ZodOptional<z.ZodNumber>;
+        margin: z.ZodOptional<z.ZodNumber>;
+        tile: z.ZodOptional<z.ZodBoolean>;
+        applyToThumbnail: z.ZodOptional<z.ZodBoolean>;
+    }, z.core.$strict>]>>;
     blurPlaceholder: z.ZodOptional<z.ZodNullable<z.ZodBoolean>>;
     size: z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
         width: z.ZodNumber;
@@ -321,8 +375,26 @@ declare const optionsSchema: z.ZodObject<{
 declare const photoFieldConfigSchema: z.ZodObject<{
     type: z.ZodLiteral<"photo">;
     build: z.ZodFunction<z.core.$ZodFunctionArgs, z.ZodCustom<PhotoField, PhotoField>>;
-    /** Whether to add watermark to images */
-    watermark: z.ZodOptional<z.ZodNullable<z.ZodBoolean>>;
+    /** Watermark config: false = off, or a watermark object. See core/helpers/watermark. */
+    watermark: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<false>, z.ZodObject<{
+        imagePath: z.ZodString;
+        position: z.ZodOptional<z.ZodEnum<{
+            "top-left": "top-left";
+            top: "top";
+            "top-right": "top-right";
+            left: "left";
+            center: "center";
+            right: "right";
+            "bottom-left": "bottom-left";
+            bottom: "bottom";
+            "bottom-right": "bottom-right";
+        }>>;
+        size: z.ZodOptional<z.ZodNumber>;
+        opacity: z.ZodOptional<z.ZodNumber>;
+        margin: z.ZodOptional<z.ZodNumber>;
+        tile: z.ZodOptional<z.ZodBoolean>;
+        applyToThumbnail: z.ZodOptional<z.ZodBoolean>;
+    }, z.core.$strict>]>>;
     blurPlaceholder: z.ZodOptional<z.ZodNullable<z.ZodBoolean>>;
     size: z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
         width: z.ZodNumber;

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

@@ -1 +1 @@
-{"version":3,"file":"photo.d.ts","sourceRoot":"","sources":["../../../src/core/fields/photo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAKxB,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AA8C1C,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;IAPZ;;;OAGG;;;;;;;6BAI0G,CAAA;AAEjH,KAAK,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAA;AAkC5C,QAAA,MAAM,YAAY;IACd,yCAAyC;;;;;;;;;;;;;;;;;;QA5CzC;;;WAGG;;;;;;;;;;;;;;;;;;QAyBC;;;WAGG;;;;;;;;IAkBP;;;;;;;OAOG;;;;;;;;IAEH;;;;;;;OAOG;;;;;;;IAEH;;;OAGG;;kBAEL,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,SAAS,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAA;IAC9C,QAAQ,CAAC,eAAe,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAA;IACpD,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,CAAA;IACrC,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;IAC7B,OAAO,CAAC,UAAU,CAAyC;IAC3D,yFAAyF;IACzF,OAAO,CAAC,gBAAgB,CAAyC;IACjE,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAA;IAEjC;;;OAGG;IACH,OAAO,CAAC,KAAK,CAA8B;IAC3C,OAAO,CAAC,WAAW,CAAqC;IACxD,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,kBAAkB,CAAU;gBAExB,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,IAAI;IAoCxD;;;;OAIG;YACW,YAAY;IAkBX,KAAK;IAOJ,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAnFD,MAAM;kBAAQ,IAAI,GAAG,IAAI;;;;;;;;;;;;;;IAmGvD;;OAEG;IACG,WAAW;IAiFK,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMzC,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAcnC,mBAAmB,CAAC,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOpG;;OAEG;IACH,QAAQ,IAAI,MAAM;IAIX,WAAW,CAAC,KAAK,EAAE,MAAM;IAIvB,QAAQ,CAAC,KAAK,EAAE,GAAG;IAQ5B,OAAO,CAAC,IAAI,EAAE,IAAI;IAKlB,aAAa;IAab;;OAEG;IACG,oBAAoB;CA6J7B;AAED,MAAM,MAAM,sBAAsB,GAAG,UAAU,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAA;AAE9E,QAAA,MAAM,aAAa;IAhcf,yCAAyC;;;;;;;;;;;;;;;;;;QA5CzC;;;WAGG;;;;;;;;;;;;;;;;;;QAyBC;;;WAGG;;;;;;;;IAkBP;;;;;;;OAOG;;;;;;;;IAEH;;;;;;;OAOG;;;;;;;IAEH;;;OAGG;;;;;;;;;;kBAyaL,CAAA;AAEF,QAAA,MAAM,sBAAsB;;;IArcxB,yCAAyC;;;;;;;;;;;;;;;;;;QA5CzC;;;WAGG;;;;;;;;;;;;;;;;;;QAyBC;;;WAGG;;;;;;;;IAkBP;;;;;;;OAOG;;;;;;;;IAEH;;;;;;;OAOG;;;;;;;IAEH;;;OAGG;;;;;;;;;;kBA+aL,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":"photo.d.ts","sourceRoot":"","sources":["../../../src/core/fields/photo.ts"],"names":[],"mappings":"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"}

package/dist/core/fields/photo.js

@@ -1,22 +1,14 @@
-import { baseFieldConfigSchema } from './field.js';
-import { entityKind } from '../helpers/index.js';
-import * as z from 'zod';
-import sharp from 'sharp';
-import path from 'path';
 import fs from 'fs';
+import path from 'path';
 import { customAlphabet } from 'nanoid';
-import { FileField } from './fileField.js';
+import sharp from 'sharp';
+import * as z from 'zod';
+import getString from '../../translations/index.js';
 import { humanReadableFileSize } from '../../utils/index.js';
 import { getCMSConfig } from '../config/index.js';
-import getString from '../../translations/index.js';
-const backgroundSchema = z
-    .strictObject({
-    r: z.number().min(0).max(255).describe('Red channel (0-255)'),
-    g: z.number().min(0).max(255).describe('Green channel (0-255)'),
-    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 with fit: contain)');
+import { backgroundSchema, entityKind, resolveWatermark, watermarkConfigSchema } from '../helpers/index.js';
+import { baseFieldConfigSchema } from './field.js';
+import { FileField } from './fileField.js';
 /**
  * Size schema — discriminated union of three variants:
  * - strict: true — user must upload exact dimensions, no server resize
@@ -75,9 +67,85 @@ const maxFileSizeSchema = z.strictObject({
     size: z.number().describe('Maximum file size'),
     unit: z.enum(['kb', 'mb']).describe('Size unit'),
 });
+/**
+ * Watermark position → sharp gravity. Kept here (server-only) with the rest of the sharp logic;
+ * the pure config schema lives in core/helpers/watermark.
+ */
+export const positionToGravity = {
+    'top-left': 'northwest',
+    top: 'north',
+    'top-right': 'northeast',
+    left: 'west',
+    center: 'centre',
+    right: 'east',
+    'bottom-left': 'southwest',
+    bottom: 'south',
+    'bottom-right': 'southeast',
+};
+/** Cache of validated watermark source buffers, keyed by resolved absolute path. */
+const watermarkSourceCache = new Map();
+/**
+ * Load and validate a watermark image once, caching by path. Fail-fast: throws a clear
+ * error if the file cannot be read or decoded.
+ */
+export function loadWatermarkSource(imagePath) {
+    const resolved = path.isAbsolute(imagePath) ? imagePath : path.join(process.cwd(), imagePath);
+    let cached = watermarkSourceCache.get(resolved);
+    if (!cached) {
+        cached = (async () => {
+            try {
+                const buffer = await fs.promises.readFile(resolved);
+                await sharp(buffer).metadata();
+                return buffer;
+            }
+            catch (error) {
+                watermarkSourceCache.delete(resolved);
+                throw new Error(`Watermark image could not be loaded: ${resolved} (${error.message})`);
+            }
+        })();
+        watermarkSourceCache.set(resolved, cached);
+    }
+    return cached;
+}
+/**
+ * Build a sharp composite overlay for a resolved watermark against a base image of `outputWidth`.
+ * Resizes the mark to `size * outputWidth`, applies opacity, and (for non-tiled marks with a
+ * margin) pads a transparent border so `gravity` insets the mark from the edge/corner.
+ */
+export async function buildOverlay(watermark, outputWidth) {
+    const source = await loadWatermarkSource(watermark.imagePath);
+    const targetWidth = Math.max(1, Math.round(watermark.size * outputWidth));
+    let overlay = sharp(source).resize({ width: targetWidth });
+    // Apply opacity via the dest-in alpha trick: multiply the mark's alpha by `opacity`.
+    if (watermark.opacity < 1) {
+        overlay = overlay.ensureAlpha().composite([
+            {
+                input: Buffer.from([255, 255, 255, Math.round(watermark.opacity * 255)]),
+                raw: { width: 1, height: 1, channels: 4 },
+                tile: true,
+                blend: 'dest-in',
+            },
+        ]);
+    }
+    // Inset from edge/corner: pad the mark with a transparent margin, then let gravity place it flush.
+    if (!watermark.tile && watermark.margin > 0) {
+        overlay = overlay.extend({
+            top: watermark.margin,
+            bottom: watermark.margin,
+            left: watermark.margin,
+            right: watermark.margin,
+            background: { r: 0, g: 0, b: 0, alpha: 0 },
+        });
+    }
+    return {
+        input: await overlay.png().toBuffer(),
+        gravity: positionToGravity[watermark.position],
+        tile: watermark.tile,
+    };
+}
 const configSchema = z.strictObject({
-    /** Whether to add watermark to images */
-    watermark: z.boolean().nullable().optional(),
+    /** Watermark config: false = off, or a watermark object. See core/helpers/watermark. */
+    watermark: watermarkConfigSchema.optional(),
     blurPlaceholder: z.boolean().nullable().optional(),
     size: sizeSchema.optional(),
     thumbnail: thumbnailSchema.optional(),
@@ -237,45 +305,66 @@ export class PhotoField extends FileField {
              * - fit: 'contain' -> pad with background to fill dimensions
              */
             const cmsImageQuality = cmsConfig.media.images.image.quality ?? 80;
+            /**
+             * Resolve the watermark once (field overrides gallery-resolved value overrides global).
+             * The overlay is sized against the final output width so it scales with the image.
+             */
+            const resolvedWatermark = resolveWatermark(this.watermark, cmsConfig.media.images.watermark);
+            const mainOutputWidth = this.size
+                ? this.size.width
+                : ((await this._sharpImage.clone().metadata()).width ?? 0);
+            const mainOverlay = resolvedWatermark && mainOutputWidth > 0 ? await buildOverlay(resolvedWatermark, mainOutputWidth) : null;
             if (this.size) {
                 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);
+                    let pipeline = this._sharpImage.clone();
+                    if (mainOverlay)
+                        pipeline = pipeline.composite([mainOverlay]);
+                    await pipeline.webp({ quality }).toFile(outputPath);
                 }
                 else if (this.size.fit === 'cover') {
-                    await this._sharpImage
+                    let pipeline = this._sharpImage
                         .clone()
-                        .resize({ width: this.size.width, height: this.size.height, fit: 'cover' })
-                        .webp({ quality })
-                        .toFile(outputPath);
+                        .resize({ width: this.size.width, height: this.size.height, fit: 'cover' });
+                    if (mainOverlay)
+                        pipeline = pipeline.composite([mainOverlay]);
+                    await pipeline.webp({ quality }).toFile(outputPath);
                 }
                 else {
                     // contain: pad with background
                     const background = this.size.background ?? cmsBackground;
-                    await this._sharpImage
+                    let pipeline = this._sharpImage
                         .clone()
-                        .resize({ width: this.size.width, height: this.size.height, fit: 'contain', background })
-                        .webp({ quality })
-                        .toFile(outputPath);
+                        .resize({ width: this.size.width, height: this.size.height, fit: 'contain', background });
+                    if (mainOverlay)
+                        pipeline = pipeline.composite([mainOverlay]);
+                    await pipeline.webp({ quality }).toFile(outputPath);
                 }
             }
             else {
-                await this._sharpImage.clone().toFile(path.join(uploadsFolder, '.photos', this._folder, this.value));
+                let pipeline = this._sharpImage.clone();
+                if (mainOverlay)
+                    pipeline = pipeline.composite([mainOverlay]);
+                await pipeline.toFile(path.join(uploadsFolder, '.photos', this._folder, this.value));
             }
             /**
              * Write a thumbnail
              */
             const thumbBackground = ('background' in thumbnail ? thumbnail.background : undefined) ?? cmsBackground;
-            await this._sharpImage
-                .clone()
-                .resize({
+            const thumbOverlay = resolvedWatermark && resolvedWatermark.applyToThumbnail
+                ? await buildOverlay(resolvedWatermark, thumbnail.width)
+                : null;
+            let thumbPipeline = this._sharpImage.clone().resize({
                 width: thumbnail.width,
                 height: thumbnail.height,
                 fit: thumbnail.fit,
                 ...(thumbnail.fit === 'contain' ? { background: thumbBackground } : {}),
-            })
+            });
+            if (thumbOverlay)
+                thumbPipeline = thumbPipeline.composite([thumbOverlay]);
+            await thumbPipeline
                 .webp({
                 quality: thumbnail.quality ?? cmsImageQuality,
             })