includio-cms 0.7.2 → 0.13.0

package/dist/admin/components/tiptap/InlineBlockNodeView.svelte

@@ -26,114 +26,44 @@
 
 	const SKIP_TYPES: Set<FieldType> = new Set(['slug', 'seo']);
 
+	/** Ensure blockData has default values for all fields (no per-lang wrapping — data is flat) */
 	function normalizeBlockData(
 		data: Record<string, unknown>,
-		fields: Field[],
-		langs: string[]
+		fields: Field[]
 	): Record<string, unknown> {
 		const result = { ...data };
 		for (const f of fields) {
 			const key = f.slug;
-			if (['text', 'richtext', 'content'].includes(f.type)) {
-				const val = result[key];
-				const needsWrap =
-					val == null ||
-					typeof val !== 'object' ||
-					(f.type === 'content' && 'type' in (val as Record<string, unknown>));
-				if (needsWrap) {
-					const fallback = val ?? (f.type === 'content' ? null : '');
-					result[key] = Object.fromEntries(langs.map((l) => [l, fallback]));
-				}
+			if (['text', 'richtext'].includes(f.type)) {
+				if (result[key] == null) result[key] = '';
+			} else if (f.type === 'content') {
+				// Leave as-is (null or doc)
 			} else if (f.type === 'url') {
 				const v = result[key] as Record<string, unknown> | undefined;
 				if (!v || typeof v !== 'object') {
-					result[key] = { id: '', url: {} };
-				} else if (!('url' in v) || v.url == null) {
-					result[key] = { ...v, url: {} };
-				} else if (typeof v.url === 'string') {
-					const urlStr = v.url as string;
-					const textStr = typeof v.text === 'string' ? v.text : '';
-					result[key] = {
-						...v,
-						url: Object.fromEntries(langs.map((l) => [l, urlStr])),
-						text: Object.fromEntries(langs.map((l) => [l, textStr]))
-					};
+					result[key] = { id: '', url: '' };
+				} else {
+					if (typeof v.url !== 'string') v.url = '';
 				}
 				const urlField = f as import('../../../types/fields.js').UrlField;
 				const d = result[key] as Record<string, unknown>;
-				if (urlField.text && !d.text) d.text = {};
+				if (urlField.text && d.text == null) d.text = '';
 				if (urlField.newTab && d.newTab === undefined) d.newTab = false;
 				if (urlField.rel && d.rel === undefined) d.rel = '';
 			} else if (f.type === 'blocks') {
 				const bf = f as BlocksField;
 				if (Array.isArray(result[key])) {
-					result[key] = (result[key] as any[]).map((item) => ({
-						...item,
-						data: normalizeBlockData(
-							item.data ?? {},
-							bf.of.find((d: ObjectField) => d.slug === item.slug)?.fields ?? [],
-							langs
-						)
-					}));
-				}
-			} else if (f.type === 'object') {
-				const of_ = f as ObjectField;
-				if (result[key] && typeof result[key] === 'object' && 'data' in (result[key] as object)) {
-					const obj = result[key] as Record<string, unknown>;
-					result[key] = { ...obj, data: normalizeBlockData(obj.data as Record<string, unknown>, of_.fields, langs) };
-				}
-			}
-		}
-		return result;
-	}
-
-	function denormalizeBlockData(
-		data: Record<string, unknown>,
-		fields: Field[],
-		currentLang: string
-	): Record<string, unknown> {
-		const result = { ...data };
-		for (const f of fields) {
-			const key = f.slug;
-			const val = result[key];
-			if (['text', 'richtext', 'content'].includes(f.type)) {
-				if (val && typeof val === 'object' && !Array.isArray(val)) {
-					result[key] = (val as Record<string, unknown>)[currentLang] ?? (f.type === 'content' ? null : '');
-				}
-			} else if (f.type === 'url' && val && typeof val === 'object') {
-				const v = val as Record<string, unknown>;
-				const flat: Record<string, unknown> = {};
-				if (v.id !== undefined) flat.id = v.id;
-				flat.url =
-					v.url && typeof v.url === 'object'
-						? (v.url as Record<string, string>)[currentLang] ?? ''
-						: v.url ?? '';
-				if ('text' in v) {
-					flat.text =
-						v.text && typeof v.text === 'object'
-							? (v.text as Record<string, string>)[currentLang] ?? ''
-							: v.text ?? '';
-				}
-				if (v.newTab !== undefined) flat.newTab = v.newTab;
-				if (v.rel !== undefined) flat.rel = v.rel;
-				result[key] = flat;
-			} else if (f.type === 'blocks') {
-				const bf = f as BlocksField;
-				if (Array.isArray(val)) {
-					result[key] = (val as any[]).map((item) => ({
-						...item,
-						data: denormalizeBlockData(
-							item.data ?? {},
-							bf.of.find((d: ObjectField) => d.slug === item.slug)?.fields ?? [],
-							currentLang
+					result[key] = (result[key] as any[]).map((item) =>
+						normalizeBlockData(
+							item,
+							bf.of.find((d: ObjectField) => d.slug === item._slug)?.fields ?? []
 						)
-					}));
+					);
 				}
 			} else if (f.type === 'object') {
 				const of_ = f as ObjectField;
-				if (val && typeof val === 'object' && 'data' in (val as object)) {
-					const obj = val as Record<string, unknown>;
-					result[key] = { ...obj, data: denormalizeBlockData(obj.data as Record<string, unknown>, of_.fields, currentLang) };
+				if (result[key] && typeof result[key] === 'object') {
+					result[key] = normalizeBlockData(result[key] as Record<string, unknown>, of_.fields);
 				}
 			}
 		}
@@ -145,7 +75,7 @@
 	);
 
 	const blockDef = $derived(inlineBlocks.find((b) => b.slug === node.attrs.blockType));
-	const blockLabel = $derived(blockDef?.label ? (Object.values(blockDef.label)[0] ?? blockDef.slug) : node.attrs.blockType);
+	const blockLabel = $derived(blockDef?.label ? (typeof blockDef.label === 'string' ? blockDef.label : Object.values(blockDef.label)[0] ?? blockDef.slug) : node.attrs.blockType);
 	const supportedFields = $derived(blockDef?.fields.filter((f) => !SKIP_TYPES.has(f.type)) ?? []);
 
 	function parseBlockData(raw: unknown): Record<string, unknown> {
@@ -156,9 +86,8 @@
 		return {};
 	}
 
-	const langs = contentLanguage.all;
 	const allFields = blockDef?.fields ?? [];
-	const standaloneForm = createStandaloneForm(normalizeBlockData(parseBlockData(node.attrs.blockData), allFields, langs));
+	const standaloneForm = createStandaloneForm(normalizeBlockData(parseBlockData(node.attrs.blockData), allFields));
 	const formStore = standaloneForm.form;
 
 	// Track last JSON we wrote to PM to avoid re-parsing our own writes
@@ -169,8 +98,7 @@
 	const unsubscribe = formStore.subscribe((data) => {
 		if (debounceTimer) clearTimeout(debounceTimer);
 		debounceTimer = setTimeout(() => {
-			const denormalized = denormalizeBlockData(data, allFields, contentLanguage.current);
-			const json = JSON.stringify(denormalized);
+			const json = JSON.stringify(data);
 			if (json !== lastWrittenJson) {
 				lastWrittenJson = json;
 				updateAttributes({ blockData: json });
@@ -188,7 +116,7 @@
 		const raw = node.attrs.blockData;
 		const rawJson = typeof raw === 'string' ? raw : JSON.stringify(raw);
 		if (rawJson !== lastWrittenJson) {
-			formStore.set(normalizeBlockData(parseBlockData(raw), allFields, langs));
+			formStore.set(normalizeBlockData(parseBlockData(raw), allFields));
 		}
 	});
 

package/dist/admin/components/tiptap/inline-block-node.js

@@ -25,7 +25,6 @@ function getFieldDefault(field) {
         return field.defaultValue;
     switch (field.type) {
         case 'text':
-        case 'richtext':
         case 'date':
         case 'datetime':
             return '';
@@ -40,7 +39,6 @@ function getFieldDefault(field) {
             return [];
         case 'url':
             return { url: '' };
-        case 'image':
         case 'file':
         case 'media':
         case 'relation':
@@ -119,8 +117,11 @@ export const InlineBlockNode = Node.create({
         };
     },
     addNodeView() {
-        return SvelteNodeViewRenderer(InlineBlockNodeView, {
-            context: this.options.context
-        });
+        const Component = InlineBlockNodeView;
+        const baseContext = this.options.context;
+        return (props) => {
+            const context = baseContext ? new Map(baseContext) : undefined;
+            return SvelteNodeViewRenderer(Component, { context })(props);
+        };
     }
 });

package/dist/admin/components/tiptap/link-dialog.svelte

@@ -22,11 +22,10 @@
 		onOpenChange?: (open: boolean) => void;
 	};
 
-	type EntryWithSeo = Entry & {
-		data: {
-			seo?: SeoFieldData;
-			[key: string]: unknown;
-		};
+	type EntryWithSeo = {
+		_id: string;
+		_slug: string;
+		seo?: SeoFieldData;
 	};
 
 	let { open = $bindable(false), editor, onOpenChange }: Props = $props();
@@ -102,16 +101,16 @@
 			]) as [EntryWithSeo[], EntryWithSeo[]];
 			const combined = [...slugResults, ...titleResults];
 			const deduped = combined.filter(
-				(entry, index, self) => index === self.findIndex((e) => e.id === entry.id)
+				(entry, index, self) => index === self.findIndex((e) => e._id === entry._id)
 			);
 			suggestions = deduped.slice(0, 5);
 		}, 300);
 	}
 
 	function selectEntry(entry: EntryWithSeo) {
-		entryId = entry.id;
+		entryId = entry._id;
 		linkedEntry = entry;
-		url = entry.data.seo?.slug || url;
+		url = entry.seo?.slug || url;
 		suggestions = [];
 	}
 
@@ -184,8 +183,8 @@
 					onclick={unlinkEntry}
 				>
 					<LinkIcon class="text-muted-foreground h-4 w-4 shrink-0" />
-					<span class="truncate font-medium">{linkedEntry.data.seo?.title || linkedEntry.id}</span>
-					<span class="text-muted-foreground truncate text-xs">{linkedEntry.data.seo?.slug}</span>
+					<span class="truncate font-medium">{linkedEntry.seo?.title || linkedEntry._id}</span>
+					<span class="text-muted-foreground truncate text-xs">{linkedEntry.seo?.slug}</span>
 					<X class="ml-auto h-3.5 w-3.5 shrink-0 opacity-50" />
 				</button>
 			{/if}
@@ -210,7 +209,7 @@
 								>
 									<Item.Content>
 										<Item.Title>
-											{suggestion.data.seo?.title || 'Bez tytułu'} ({suggestion.data.seo?.slug})
+											{suggestion.seo?.title || 'Bez tytułu'} ({suggestion.seo?.slug})
 										</Item.Title>
 									</Item.Content>
 								</Item.Root>

package/dist/admin/components/tiptap/slash-command.js

@@ -66,7 +66,7 @@ function getStandardItems(editor) {
 function getInlineBlockItems(inlineBlocks, editor) {
     return inlineBlocks.map((block) => ({
         id: `block-${block.slug}`,
-        label: block.label ? Object.values(block.label)[0] : block.slug,
+        label: block.label ? (typeof block.label === 'string' ? block.label : Object.values(block.label)[0]) : block.slug,
         group: 'Bloki',
         action: () => {
             editor.commands.insertInlineBlock({ blockType: block.slug });

package/dist/admin/remote/entry.remote.d.ts

@@ -56,18 +56,15 @@ export declare const getRawEntry: import("@sveltejs/kit").RemoteQueryFunction<{
 export declare const getEntryForEntryPage: import("@sveltejs/kit").RemoteQueryFunction<string, RawEntry>;
 export declare const updateEntryVersionCommand: import("@sveltejs/kit").RemoteCommand<{
     entryId: string;
+    lang: string;
     data: Record<string, unknown>;
     type: "draft" | "published-now" | "published-scheduled" | "cancel-published";
     scheduledAt?: Date | undefined;
-}, Promise<void | import("../../types/entries.js").DbEntryVersion>>;
+}, Promise<import("../../types/entries.js").DbEntryVersion | undefined>>;
 export declare const updateEntryCommand: import("@sveltejs/kit").RemoteCommand<{
     id: string;
     data: {
-        availableLocales?: string[] | undefined;
         archivedAt?: Date | null | undefined;
-        publishedAt?: Date | null | undefined;
-        publishedVersionId?: string | null | undefined;
-        publishedBy?: string | null | undefined;
         sortOrder?: number | null | undefined;
     };
 }, Promise<import("../../types/entries.js").DbEntry>>;

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

@@ -2,7 +2,7 @@ import { command, query } from '$app/server';
 import { createEntry as createEntryOperation, createEntrySchema, createEntryVersion } from '../../core/server/entries/operations/create.js';
 import { getRawEntries as getRawEntriesOperation, countRawEntries as countRawEntriesOperation, getRawEntry as getRawEntryOperation, getRawEntryOrThrow, getDbEntry, getDbEntryOrThrow, getEntries as getEntriesOperation, getEntry as getEntryOperation, getEntryVersion as getEntryVersionOperation, getEntryLabels as getEntryLabelsOperation } from '../../core/server/entries/operations/get.js';
 import { getCMS } from '../../core/cms.js';
-import { pruneOldDraftVersions, unpublishEntry, upsertDraftVersion, updateEntry, updateEntrySchema, updateEntryVersionCommandTypes } from '../../core/server/entries/operations/update.js';
+import { pruneOldDraftVersions, unpublishEntryLang, upsertDraftVersion, updateEntry, updateEntrySchema, updateEntryVersionCommandTypes } from '../../core/server/entries/operations/update.js';
 import z from 'zod';
 import { requireAuth } from './middleware/auth.js';
 import { entryStatuses } from '../../types/entries.js';
@@ -101,6 +101,7 @@ export const getEntryForEntryPage = query(z.string(), async (id) => {
 });
 const updateEntryVersionCommandSchema = z.object({
     entryId: z.string().uuid(),
+    lang: z.string(),
     data: z.record(z.string(), z.unknown()),
     type: z.enum(updateEntryVersionCommandTypes),
     scheduledAt: z.date().optional()
@@ -110,49 +111,39 @@ export const updateEntryVersionCommand = command(updateEntryVersionCommandSchema
     let result;
     switch (input.type) {
         case 'draft':
-            result = await upsertDraftVersion(input.entryId, input.data, { skipValidation: true });
+            result = await upsertDraftVersion(input.entryId, input.data, input.lang, { skipValidation: true });
             break;
         case 'published-now': {
-            const existingEntry = await getDbEntryOrThrow({ id: input.entryId });
-            // Dual-write: still set version.publishedAt for backward compat
+            // Create a new published version for this language
             result = await createEntryVersion({
-                ...input,
+                entryId: input.entryId,
+                lang: input.lang,
+                data: input.data,
                 publishedAt: new Date(),
                 publishedBy: user.id
             });
-            // Update entry-level publish state
-            await updateEntry(input.entryId, {
-                publishedVersionId: result.id,
-                publishedBy: user.id,
-                publishedAt: existingEntry.publishedAt ?? new Date()
-            });
             break;
         }
         case 'published-scheduled': {
             if (!input.scheduledAt) {
                 throw new Error('scheduledAt is required for scheduled publishing');
             }
-            // Dual-write: still set version.publishedAt for backward compat
             result = await createEntryVersion({
-                ...input,
+                entryId: input.entryId,
+                lang: input.lang,
+                data: input.data,
                 publishedAt: input.scheduledAt,
                 publishedBy: user.id
             });
-            // Update entry-level publish state
-            await updateEntry(input.entryId, {
-                publishedVersionId: result.id,
-                publishedBy: user.id,
-                publishedAt: input.scheduledAt
-            });
             break;
         }
         case 'cancel-published':
-            result = await unpublishEntry(input.entryId);
+            await unpublishEntryLang(input.entryId, input.lang);
             break;
     }
     // Prune old draft versions only after publish/schedule (drafts upsert in-place)
     if (input.type !== 'draft') {
-        await pruneOldDraftVersions(input.entryId);
+        await pruneOldDraftVersions(input.entryId, input.lang);
         // Refresh cached entry so UI reactively updates (status badge, version history)
         await getEntryForEntryPage(input.entryId).refresh();
     }
@@ -216,8 +207,9 @@ export const getRecentEntries = query(z.number().default(6), async (limit) => {
         let label = null;
         if (config && config.type === 'collection' && config.entryAdminTitle && latestVersion) {
             const titleData = latestVersion.data[config.entryAdminTitle];
-            if (titleData && typeof titleData === 'object') {
-                label = String(Object.values(titleData)[0] || '');
+            // Data is flat — titleData is the string directly
+            if (typeof titleData === 'string') {
+                label = titleData || '';
             }
         }
         if (config && config.type === 'single' && config.label) {
@@ -237,9 +229,11 @@ export const getRecentEntries = query(z.number().default(6), async (limit) => {
                 collectionLabel = config.label;
             }
         }
-        const status = entry.publishedVersionId
+        const hasPublished = Object.values(entry.publishedVersions).some((v) => v != null);
+        const hasScheduled = Object.values(entry.scheduledVersions).some((v) => v != null);
+        const status = hasPublished
             ? 'published'
-            : entry.scheduledVersion
+            : hasScheduled
                 ? 'scheduled'
                 : 'draft';
         return {
@@ -262,8 +256,9 @@ export const getRecentActivity = query(z.number().default(10), async (limit) =>
             let label = null;
             if (config && config.type === 'collection' && config.entryAdminTitle) {
                 const titleData = latestVersion.data[config.entryAdminTitle];
-                if (titleData && typeof titleData === 'object') {
-                    label = String(Object.values(titleData)[0] || '');
+                // Data is flat — titleData is the string directly
+                if (typeof titleData === 'string') {
+                    label = titleData || null;
                 }
             }
             if (config && config.type === 'single' && config.label) {

package/dist/admin/remote/media.remote.d.ts

@@ -14,8 +14,23 @@ export declare const getMediaFiles: import("@sveltejs/kit").RemoteQueryFunction<
         tagIds?: string[] | undefined;
         mimeTypes?: string[] | undefined;
         search?: string | undefined;
+        untagged?: boolean | undefined;
+        limit?: number | undefined;
+        offset?: number | undefined;
     };
 }, import("../../types/media.js").MediaFile[]>;
+export declare const countMediaFiles: import("@sveltejs/kit").RemoteQueryFunction<{
+    data: {
+        tagIds?: string[] | undefined;
+        mimeTypes?: string[] | undefined;
+        search?: string | undefined;
+        untagged?: boolean | undefined;
+    };
+}, number>;
+export declare const getMediaTagsWithCounts: import("@sveltejs/kit").RemoteQueryFunction<void, {
+    tag: import("../../types/media.js").MediaTag;
+    count: number;
+}[]>;
 export declare const getFileById: import("@sveltejs/kit").RemoteQueryFunction<string, import("../../types/media.js").MediaFile | null>;
 export declare const deleteMediaFile: import("@sveltejs/kit").RemoteCommand<string, Promise<void>>;
 export declare const bulkDeleteMediaFiles: import("@sveltejs/kit").RemoteCommand<{

package/dist/admin/remote/media.remote.js

@@ -2,7 +2,7 @@ import { command, query } from '$app/server';
 import { setAlt, renameMediaFile as renameMediaFileOperation, updateMediaAccessibility as updateMediaAccessibilityOp } from '../../core/server/media/operations/updateFile.js';
 import z from 'zod';
 import { deleteMediaFile as deleteMediaFileFn, bulkDeleteMediaFiles as bulkDeleteMediaFilesFn } from '../../core/server/media/operations/deleteMediaFile.js';
-import { getFile, getFiles } from '../../core/server/media/operations/getFiles.js';
+import { getFile, getFiles, countFiles, getMediaTagsWithCounts as getMediaTagsWithCountsFn } from '../../core/server/media/operations/getFiles.js';
 import { getMediaTags as getMediaTagsFn, createMediaTag as createMediaTagFn, updateMediaTag as updateMediaTagFn, deleteMediaTag as deleteMediaTagFn, setMediaFileTags as setMediaFileTagsFn, bulkSetMediaFileTags as bulkSetMediaFileTagsFn } from '../../core/server/media/operations/tags.js';
 import { requireAuth } from './middleware/auth.js';
 const setMediaFileAltSchema = z.object({
@@ -34,11 +34,27 @@ export const getMediaFiles = query(z.object({
         ids: z.array(z.string().uuid()).optional(),
         tagIds: z.array(z.string().uuid()).optional(),
         mimeTypes: z.array(z.string()).optional(),
-        search: z.string().optional()
+        search: z.string().optional(),
+        untagged: z.boolean().optional(),
+        limit: z.number().int().positive().optional(),
+        offset: z.number().int().nonnegative().optional()
     })
 }), async (data) => {
     return getFiles(data);
 });
+export const countMediaFiles = query(z.object({
+    data: z.object({
+        tagIds: z.array(z.string().uuid()).optional(),
+        mimeTypes: z.array(z.string()).optional(),
+        search: z.string().optional(),
+        untagged: z.boolean().optional()
+    })
+}), async (data) => {
+    return countFiles(data);
+});
+export const getMediaTagsWithCounts = query(async () => {
+    return getMediaTagsWithCountsFn();
+});
 export const getFileById = query(z.string().uuid(), async (id) => {
     return getFile(id);
 });

package/dist/admin/remote/preview.remote.js

@@ -10,5 +10,7 @@ const schema = z.object({
 });
 export const populatePreviewData = command(schema, async ({ data, slug, language }) => {
     const config = getCMS().getBySlug(slug);
-    return populateEntryData(data, getFieldsFromConfig(config), language);
+    const fields = getFieldsFromConfig(config);
+    const populated = await populateEntryData(data, fields, language);
+    return populated;
 });

package/dist/admin/utils/entryLabel.js

@@ -1,19 +1,22 @@
 import { getAtPath } from './objectPath.js';
 export function getRawCollectionEntryLabel(entry, config, language) {
-    if (entry.publishedVersion) {
+    const publishedVersion = entry.publishedVersions[language];
+    if (publishedVersion) {
+        // Data is flat — entryAdminTitle value is directly a string
         return config.entryAdminTitle
-            ? getAtPath(entry.publishedVersion.data, config.entryAdminTitle)?.[language] || entry.id
+            ? String(publishedVersion.data[config.entryAdminTitle] || entry.id)
             : entry.id;
     }
-    if (entry.draftVersion) {
+    const draftVersion = entry.draftVersions[language];
+    if (draftVersion) {
         return config.entryAdminTitle
-            ? getAtPath(entry.draftVersion.data, config.entryAdminTitle)?.[language] || entry.id
+            ? String(draftVersion.data[config.entryAdminTitle] || entry.id)
             : entry.id;
     }
     return entry.id;
 }
 export function getCollectionEntryLabel(entry, config) {
     return config.entryAdminTitle
-        ? getAtPath(entry.data, config.entryAdminTitle) || entry.id
-        : entry.id;
+        ? getAtPath(entry, config.entryAdminTitle) || entry._id
+        : entry._id;
 }

package/dist/admin/utils/translationStatus.js

@@ -13,7 +13,6 @@ function isFieldFilled(value, fieldType) {
         return false;
     switch (fieldType) {
         case 'text':
-        case 'richtext':
             return typeof value === 'string' && value.length > 0;
         case 'content': {
             if (typeof value !== 'object')
@@ -46,7 +45,7 @@ function collectLocalizedFields(fields) {
         if (field.localized === false)
             continue;
         const label = extractLabel(field.label, field.slug);
-        if (field.type === 'text' || field.type === 'richtext' || field.type === 'content') {
+        if (field.type === 'text' || field.type === 'content') {
             result.push({ slug: field.slug, label, type: field.type, required: !!field.required });
         }
     }

package/dist/cli/scaffold/admin.js

@@ -50,6 +50,16 @@ export * from 'includio-cms/admin/remote';
 </script>
 
 <AcceptInvitePage />
+`
+        },
+        {
+            path: 'admin/reset-password/+page.svelte',
+            content: `${GENERATED_COMMENT}
+<script lang="ts">
+	import { ResetPasswordPage } from 'includio-cms/admin/client';
+</script>
+
+<ResetPasswordPage />
 `
         },
         {
@@ -109,13 +119,25 @@ export * from 'includio-cms/admin/remote';
 `
         },
         {
-            path: 'admin/(afterLogin)/form-submissions/[submissionId]/+page.svelte',
+            path: 'admin/(afterLogin)/form-submissions/[id]/+page.server.ts',
+            content: `${GENERATED_COMMENT_TS}
+export async function load({ params }) {
+	return {
+		submissionId: params.id
+	};
+}
+`
+        },
+        {
+            path: 'admin/(afterLogin)/form-submissions/[id]/+page.svelte',
             content: `${GENERATED_COMMENT}
 <script lang="ts">
 	import { FormSubmissionPage } from 'includio-cms/admin/client';
+
+	let { data } = $props();
 </script>
 
-<FormSubmissionPage />
+<FormSubmissionPage {data} />
 `
         },
         {
@@ -138,6 +160,16 @@ export * from 'includio-cms/admin/remote';
 </script>
 
 <AccountPage />
+`
+        },
+        {
+            path: 'admin/(afterLogin)/maintenance/+page.svelte',
+            content: `${GENERATED_COMMENT}
+<script lang="ts">
+	import { MaintenancePage } from 'includio-cms/admin/client';
+</script>
+
+<MaintenancePage />
 `
         },
         {

package/dist/cms/runtime/api.d.ts

@@ -1,20 +1,24 @@
 import type { SingleEntryMap, SingleSlug, CollectionEntryMap, CollectionSlug, FormEntryMap, SiteLanguage } from './types';
-interface GetEntryQueryOptions<T extends {
-    data: Record<string, unknown>;
-}> {
+interface GetEntryOptions {
     id?: string;
     status?: 'draft' | 'published' | 'scheduled' | 'archived';
-    dataValues?: Partial<T['data']>;
-}
-interface GetEntryOptions {
-    /**
-     * Language code to fetch the entry in. Defaults to the first language in the CMS config.
-     */
+    dataValues?: Record<string, unknown>;
     language?: SiteLanguage;
 }
-export declare function getSingleEntry<K extends SingleSlug>(slug: K, data: GetEntryQueryOptions<SingleEntryMap[K]>, options: GetEntryOptions): Promise<SingleEntryMap[K] | null>;
-export declare function getCollectionEntry<K extends CollectionSlug>(slug: K, data: GetEntryQueryOptions<CollectionEntryMap[K]>, options: GetEntryOptions): Promise<CollectionEntryMap[K] | null>;
-export declare function getCollectionEntries<K extends CollectionSlug>(slug: K, options: GetEntryOptions): Promise<CollectionEntryMap[K][]>;
+interface GetEntriesOptions extends GetEntryOptions {
+    ids?: string[];
+    dataLike?: Record<string, unknown>;
+    orderBy?: {
+        column: 'createdAt' | 'updatedAt' | 'sortOrder';
+        direction: 'asc' | 'desc';
+    };
+    limit?: number;
+    offset?: number;
+}
+export declare function getSingleEntry<K extends SingleSlug>(slug: K, options?: GetEntryOptions): Promise<SingleEntryMap[K] | null>;
+export declare function getCollectionEntry<K extends CollectionSlug>(slug: K, options?: GetEntryOptions): Promise<CollectionEntryMap[K] | null>;
+export declare function getCollectionEntries<K extends CollectionSlug>(slug: K, options?: GetEntriesOptions): Promise<CollectionEntryMap[K][]>;
+export declare function countCollectionEntries<K extends CollectionSlug>(slug: K, options?: Omit<GetEntriesOptions, 'limit' | 'offset' | 'orderBy'>): Promise<number>;
 export interface SubmitFormOptions {
     ip?: string;
     userAgent?: string;

package/dist/cms/runtime/api.js

@@ -1,22 +1,23 @@
 // This file is auto-generated. Do not edit directly.
-import { getEntry, getEntries, createFormSubmission } from 'includio-cms/sveltekit/server';
-export async function getSingleEntry(slug, data, options) {
+import { getEntry, getEntries, countEntries, createFormSubmission } from 'includio-cms/sveltekit/server';
+export async function getSingleEntry(slug, options = {}) {
     return (await getEntry({
-        ...data,
         slug,
         ...options
     }));
 }
-export async function getCollectionEntry(slug, data, options) {
+export async function getCollectionEntry(slug, options = {}) {
     return (await getEntry({
-        ...data,
         slug,
         ...options
     }));
 }
-export async function getCollectionEntries(slug, options) {
+export async function getCollectionEntries(slug, options = {}) {
     return (await getEntries({ slug, ...options }));
 }
+export async function countCollectionEntries(slug, options = {}) {
+    return countEntries({ slug, ...options });
+}
 export async function submitForm(slug, data, options) {
     return createFormSubmission({ slug, data, ...options });
 }