includio-cms 0.0.37 → 0.0.38

package/dist/core/server/fields/resolveImageFields.js

@@ -1,7 +1,7 @@
 import { PUBLIC_URL } from '$env/static/public';
 import { getCMS } from '../../cms.js';
 import z from 'zod';
-import { getImageStyle } from '../media/styles/operations/getImageStyle.js';
+import { getImageStyles } from './utils/imageStyles.js';
 export async function resolveMediaFields(data, fields) {
     const mediaIds = [];
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -74,34 +74,26 @@ export async function resolveMediaFields(data, fields) {
             switch (field.type) {
                 case 'image': {
                     if (field.multiple && Array.isArray(val)) {
-                        result[field.slug] = val.map((id) => ({
-                            data: mediaMap[id] ?? null,
-                            styles: {}
+                        result[field.slug] = await Promise.all(val.map(async (id) => {
+                            const mediaFile = mediaMap[id];
+                            if (!mediaFile) {
+                                return { data: null, styles: {} };
+                            }
+                            return {
+                                data: mediaFile,
+                                styles: await getImageStyles(field, mediaFile)
+                            };
                         }));
                     }
                     else {
-                        if (field.styles) {
-                            const styles = await Promise.all(field.styles.map(async (style) => {
-                                const styleDbData = await getImageStyle(val, style);
-                                return [
-                                    style.name,
-                                    {
-                                        url: styleDbData.url,
-                                        media: style.media,
-                                        mimeType: style.format
-                                    }
-                                ];
-                            }));
-                            const finalVal = {
-                                data: mediaMap[val] ?? null,
-                                styles: Object.fromEntries(styles)
-                            };
-                            result[field.slug] = finalVal;
+                        const mediaFile = mediaMap[val];
+                        if (!mediaFile) {
+                            result[field.slug] = { data: null, styles: {} };
                             break;
                         }
                         const finalVal = {
-                            data: mediaMap[val] ?? null,
-                            styles: {}
+                            data: mediaFile,
+                            styles: await getImageStyles(field, mediaFile)
                         };
                         result[field.slug] = finalVal;
                         break;

package/dist/core/server/fields/utils/imageStyles.d.ts

@@ -0,0 +1,3 @@
+import type { ImageField } from '../../../../types/fields.js';
+import type { ImageStyle, MediaFile } from '../../../../types/media.js';
+export declare function getImageStyles(field: ImageField, val: MediaFile): Promise<Record<string, ImageStyle>>;

package/dist/core/server/fields/utils/imageStyles.js

@@ -0,0 +1,26 @@
+import { getImageStyle } from '../../media/styles/operations/getImageStyle.js';
+const defaultStyles = [
+    {
+        name: 'defaultWebp',
+        format: 'webp'
+    },
+    {
+        name: 'defaultAvif',
+        format: 'avif'
+    }
+];
+export async function getImageStyles(field, val) {
+    const stylesArr = [...(!val.url.endsWith('.svg') ? defaultStyles : []), ...(field.styles || [])];
+    const styles = await Promise.all(stylesArr.map(async (style) => {
+        const styleDbData = await getImageStyle(val.id, style);
+        return [
+            style.name,
+            {
+                url: styleDbData.url,
+                media: styleDbData.media,
+                mimeType: styleDbData.mimeType
+            }
+        ];
+    }));
+    return Object.fromEntries(styles);
+}

package/dist/core/server/media/styles/sharp/generateImageStyle.js

@@ -14,10 +14,14 @@ export async function generateImageStyle(mediaFileId, style) {
         throw new Error('Media file not found');
     }
     const imageBuffer = await file.arrayBuffer();
-    const outputBuffer = await sharp(Buffer.from(imageBuffer))
-        .resize(style.width, style.height)
-        .toFormat(style.format)
-        .toBuffer();
+    let sharpInstance = sharp(Buffer.from(imageBuffer));
+    if (style.width || style.height) {
+        sharpInstance = sharpInstance.resize(style.width, style.height);
+    }
+    if (style.format) {
+        sharpInstance = sharpInstance.toFormat(style.format);
+    }
+    const outputBuffer = await sharpInstance.toBuffer();
     return getCMS().filesAdapter.uploadFile(new File([new Uint8Array(outputBuffer)], `${mediaFileId}_${style.name}.${style.format}`, {
         type: `image/${style.format}`
     }));

package/dist/db-postgres/index.js

@@ -201,7 +201,7 @@ export function pg(config) {
             const [imageStyle] = await db
                 .select()
                 .from(schema.imageStylesTable)
-                .where(and(eq(schema.imageStylesTable.mediaFileId, mediaFileId), eq(schema.imageStylesTable.name, style.name), eq(schema.imageStylesTable.width, style.width), eq(schema.imageStylesTable.height, style.height)))
+                .where(and(eq(schema.imageStylesTable.mediaFileId, mediaFileId), eq(schema.imageStylesTable.name, style.name), style.width ? eq(schema.imageStylesTable.width, style.width) : undefined, style.height ? eq(schema.imageStylesTable.height, style.height) : undefined))
                 .limit(1);
             if (!imageStyle)
                 return null;

package/dist/db-postgres/schema/imageStyle.d.ts

@@ -77,7 +77,7 @@ export declare const imageStylesTable: import("drizzle-orm/pg-core/table", { wit
             columnType: "PgInteger";
             data: number;
             driverParam: string | number;
-            notNull: true;
+            notNull: false;
             hasDefault: false;
             isPrimaryKey: false;
             isAutoincrement: false;
@@ -94,7 +94,7 @@ export declare const imageStylesTable: import("drizzle-orm/pg-core/table", { wit
             columnType: "PgInteger";
             data: number;
             driverParam: string | number;
-            notNull: true;
+            notNull: false;
             hasDefault: false;
             isPrimaryKey: false;
             isAutoincrement: false;

package/dist/db-postgres/schema/imageStyle.js

@@ -4,8 +4,8 @@ export const imageStylesTable = pgTable('image_styles', {
     mediaFileId: uuid('media_file_id').notNull(),
     name: text('name').notNull(),
     url: text('url').notNull(),
-    width: integer('width').notNull(),
-    height: integer('height').notNull(),
+    width: integer('width'),
+    height: integer('height'),
     crop: boolean('crop').notNull().default(false),
     media: text('media'),
     mimeType: text('mime_type').notNull()

package/dist/types/fields.d.ts

@@ -1,3 +1,4 @@
+import type { FormatEnum } from 'sharp';
 import type { ImageStyle, MediaFile } from './media.js';
 export type FieldType = 'text' | 'richtext' | 'number' | 'boolean' | 'date' | 'datetime' | 'file' | 'image' | 'select' | 'radio' | 'checkboxes' | 'relation' | 'object' | 'array' | 'slug' | 'seo' | 'url';
 export interface BaseField {
@@ -67,9 +68,9 @@ export interface ImageField extends BaseField {
 }
 export interface ImageFieldStyle {
     name: string;
-    width: number;
-    height: number;
-    format?: 'jpeg' | 'png' | 'webp' | 'avif';
+    width?: number;
+    height?: number;
+    format?: keyof FormatEnum;
     media?: string;
     crop?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "includio-cms",
-	"version": "0.0.37",
+	"version": "0.0.38",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build && npm run prepack",