includio-cms 0.0.60 → 0.0.62

package/dist/admin/client/entry/entry.svelte

@@ -29,6 +29,7 @@
 	import { createHybridContext } from './hybrid/hybrid-context.svelte.js';
 	import HybridLayout from './hybrid/hybrid-layout.svelte';
 	import { onMount } from 'svelte';
+	import { get } from 'svelte/store';
 
 	const contentLanguage = getContentLanguage();
 	const remotes = getRemotes();
@@ -130,10 +131,8 @@
 	}
 
 	async function performAutosave() {
-		const validatedForm = await form.validateForm();
-		if (!validatedForm.valid) return;
-
-		const currentData = JSON.stringify(validatedForm.data);
+		const currentFormData = get(form.form);
+		const currentData = JSON.stringify(currentFormData);
 		if (currentData === lastSavedData) {
 			saveStatus = 'saved';
 			return;
@@ -143,7 +142,7 @@
 		try {
 			await remotes.updateEntryVersionCommand({
 				entryId: entry.id,
-				data: validatedForm.data,
+				data: currentFormData,
 				type: 'draft'
 			});
 			lastSavedData = currentData;
@@ -185,6 +184,31 @@
 			autosaveTimer = null;
 		}
 
+		if (type === 'draft') {
+			// Drafts save without validation
+			const currentFormData = get(form.form);
+			saveStatus = 'saving';
+			try {
+				await remotes.updateEntryVersionCommand({
+					entryId: entry.id,
+					data: currentFormData,
+					type: 'draft'
+				});
+				lastSavedData = JSON.stringify(currentFormData);
+				saveStatus = 'saved';
+				toast.success(lang[interfaceLanguage.current].saveDraftToast);
+				previewToggle = !previewToggle;
+				setTimeout(() => {
+					if (saveStatus === 'saved') saveStatus = 'idle';
+				}, 3000);
+			} catch {
+				saveStatus = 'error';
+				toast.error(interfaceLanguage.current === 'pl' ? 'Błąd zapisu' : 'Save failed');
+			}
+			return;
+		}
+
+		// Publish requires validation
 		const validatedForm = await form.validateForm();
 
 		if (validatedForm.valid) {
@@ -203,9 +227,7 @@
 				const toastMsg =
 					type === 'published-now'
 						? lang[interfaceLanguage.current].publishToast
-						: type === 'published-scheduled'
-							? lang[interfaceLanguage.current].scheduledToast
-							: lang[interfaceLanguage.current].saveToast;
+						: lang[interfaceLanguage.current].scheduledToast;
 				toast.success(toastMsg);
 				previewToggle = !previewToggle;
 
@@ -220,8 +242,8 @@
 			const errors = flattenErrors(validatedForm.errors, collection.fields);
 			toast.error(
 				interfaceLanguage.current === 'pl'
-					? 'Nie można zapisać'
-					: 'Cannot save',
+					? 'Nie można opublikować'
+					: 'Cannot publish',
 				{
 					description: errors.slice(0, 3).join('\n') + (errors.length > 3 ? '\n...' : ''),
 					duration: 5000

package/dist/admin/remote/entry.remote.js

@@ -82,7 +82,7 @@ export const updateEntryVersionCommand = command(updateEntryVersionCommandSchema
     let result;
     switch (input.type) {
         case 'draft':
-            result = await createEntryVersion(input);
+            result = await createEntryVersion(input, { skipValidation: true });
             break;
         case 'published-now':
             result = await createEntryVersion({

package/dist/core/server/entries/operations/create.d.ts

@@ -8,4 +8,6 @@ export declare const createEntrySchema: z.ZodObject<{
     }>;
 }, z.z.core.$strip>;
 export declare const createEntry: (data: DbEntryInsert) => Promise<DbEntry>;
-export declare const createEntryVersion: (data: DbEntryVersionInsert) => Promise<DbEntryVersion>;
+export declare const createEntryVersion: (data: DbEntryVersionInsert, options?: {
+    skipValidation?: boolean;
+}) => Promise<DbEntryVersion>;

package/dist/core/server/entries/operations/create.js

@@ -22,20 +22,27 @@ export const createEntry = async (data) => {
     });
     return newDbEntry;
 };
-export const createEntryVersion = async (data) => {
+export const createEntryVersion = async (data, options) => {
     const { user } = requireAuth();
-    const entry = await getDbEntryOrThrow({ id: data.entryId });
-    const config = getCMS().getBySlug(entry.slug);
-    const languages = getCMS().languages;
-    const schema = generateZodSchemaFromFields(config.fields, languages);
-    const parsedData = schema.safeParse(data.data);
-    if (!parsedData.success) {
-        throw Error('Invalid data: ' + JSON.stringify(parsedData.error.flatten()));
+    let validatedData;
+    if (options?.skipValidation) {
+        validatedData = data.data;
+    }
+    else {
+        const entry = await getDbEntryOrThrow({ id: data.entryId });
+        const config = getCMS().getBySlug(entry.slug);
+        const languages = getCMS().languages;
+        const schema = generateZodSchemaFromFields(config.fields, languages);
+        const parsedData = schema.safeParse(data.data);
+        if (!parsedData.success) {
+            throw Error('Invalid data: ' + JSON.stringify(parsedData.error.flatten()));
+        }
+        validatedData = parsedData.data;
     }
     const newEntryVersion = await getCMS().databaseAdapter.createEntryVersion({
         ...data,
         createdBy: user.id,
-        data: parsedData.data
+        data: validatedData
     });
     return newEntryVersion;
 };

package/dist/core/server/entries/operations/get.js

@@ -89,6 +89,47 @@ export const getRawEntryOrThrow = async (options) => {
     }
     return entry;
 };
+function getNestedValue(obj, keys) {
+    let current = obj;
+    for (const key of keys) {
+        if (current === null || current === undefined || typeof current !== 'object')
+            return undefined;
+        current = current[key];
+    }
+    return current;
+}
+function matchesDataValues(data, filter, prefix = []) {
+    for (const [key, value] of Object.entries(filter)) {
+        const path = [...prefix, key];
+        if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
+            if (!matchesDataValues(data, value, path))
+                return false;
+        }
+        else {
+            const actual = getNestedValue(data, path);
+            if (actual !== value)
+                return false;
+        }
+    }
+    return true;
+}
+function matchesDataLike(data, filter, prefix = []) {
+    for (const [key, value] of Object.entries(filter)) {
+        const path = [...prefix, key];
+        if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
+            if (!matchesDataLike(data, value, path))
+                return false;
+        }
+        else if (typeof value === 'string') {
+            const actual = getNestedValue(data, path);
+            if (typeof actual !== 'string')
+                return false;
+            if (!actual.toLowerCase().includes(value.toLowerCase()))
+                return false;
+        }
+    }
+    return true;
+}
 export const getEntries = async (options = {}) => {
     const language = options.language || getCMS().languages[0];
     const status = options.status || 'published';
@@ -111,11 +152,9 @@ export const getEntries = async (options = {}) => {
     const entryIds = dbEntries.map((entry) => entry.id);
     // Build entries map for quick lookup
     const entriesMap = new Map(dbEntries.map((entry) => [entry.id, entry]));
-    // Get versions and keep only the latest per entry in a single pass
+    // Get versions WITHOUT dataValues/dataLike - filter after finding latest
     const dbEntryVersions = await getCMS().databaseAdapter.getEntryVersions({
         entryIds,
-        dataValues,
-        dataLike,
         status
     });
     // Group versions by entryId, keeping only the latest version for each entry
@@ -136,6 +175,21 @@ export const getEntries = async (options = {}) => {
             }
         }
     }
+    // Post-filter: apply dataValues/dataLike on latest versions only
+    if (dataValues) {
+        for (const [entryId, entry] of latestVersionsByEntry) {
+            if (!matchesDataValues(entry.version.data, dataValues)) {
+                latestVersionsByEntry.delete(entryId);
+            }
+        }
+    }
+    if (dataLike) {
+        for (const [entryId, entry] of latestVersionsByEntry) {
+            if (!matchesDataLike(entry.version.data, dataLike)) {
+                latestVersionsByEntry.delete(entryId);
+            }
+        }
+    }
     // Process entries in parallel
     const entries = await Promise.all(Array.from(latestVersionsByEntry.values()).map(async ({ version, dbEntry }) => {
         try {

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

@@ -4,7 +4,7 @@ import { resolveRelationFields } from './resolveRelationFields.js';
 import { resolveUrlFields } from './resolveUrlFields.js';
 export async function populateEntryData(data, fields, language) {
     let populatedData = await resolveRelationFields(data, fields, language);
-    populatedData = await resolveUrlFields(populatedData, fields);
+    populatedData = await resolveUrlFields(populatedData, fields, language);
     populatedData = await resolveMediaFields(populatedData, fields);
     populatedData = translateObject(populatedData, language);
     return populatedData;

package/dist/core/server/fields/resolveUrlFields.d.ts

@@ -1,3 +1,3 @@
 import type { EntryData, PopulatedEntryData } from '../../../types/entries.js';
 import type { Field } from '../../../types/fields.js';
-export declare function resolveUrlFields(data: EntryData, fields: Field[]): Promise<PopulatedEntryData>;
+export declare function resolveUrlFields(data: EntryData, fields: Field[], language: string): Promise<PopulatedEntryData>;

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

@@ -1,6 +1,6 @@
 import { urlFieldDataSchema, urlFieldDataWithRelationSchema } from '../../../schemas/field/url.js';
 import { getEntries } from '../entries/operations/get.js';
-export async function resolveUrlFields(data, fields) {
+export async function resolveUrlFields(data, fields, language) {
     const entriesIds = [];
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const collectIds = (value, fields) => {
@@ -36,7 +36,7 @@ export async function resolveUrlFields(data, fields) {
     collectIds(data, fields);
     if (entriesIds.length === 0)
         return data;
-    const entries = await getEntries({ ids: entriesIds });
+    const entries = await getEntries({ ids: entriesIds, language });
     const entriesMap = Object.fromEntries(entries.map((m) => [m.id, m]));
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const resolveValues = (value, fields) => {

package/dist/db-postgres/index.js

@@ -293,7 +293,17 @@ export function pg(config) {
                 query.where(and(options.data.folderId
                     ? eq(schema.mediaFilesTable.folderId, options.data.folderId)
                     : undefined, options.data.ids ? inArray(schema.mediaFilesTable.id, options.data.ids) : undefined, options.data.mimeTypes
-                    ? inArray(schema.mediaFilesTable.mimeType, options.data.mimeTypes)
+                    ? (() => {
+                        const exact = options.data.mimeTypes.filter((t) => !t.endsWith('/*'));
+                        const wildcards = options.data.mimeTypes
+                            .filter((t) => t.endsWith('/*'))
+                            .map((t) => ilike(schema.mediaFilesTable.mimeType, t.replace('*', '%')));
+                        const conditions = [
+                            ...(exact.length ? [inArray(schema.mediaFilesTable.mimeType, exact)] : []),
+                            ...wildcards
+                        ];
+                        return conditions.length ? or(...conditions) : undefined;
+                    })()
                     : undefined, searchCondition));
             }
             return await query.orderBy(desc(schema.mediaFilesTable.createdAt));

package/package.json

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