includio-cms 0.7.2 → 0.13.1

package/dist/admin/api/rest/routes/schema.js

@@ -10,9 +10,161 @@ function serializeField(field) {
 function serializeFields(fields) {
     return fields.map(serializeField);
 }
+function localize(value, languages) {
+    const obj = {};
+    for (const lang of languages) {
+        obj[lang] = value;
+    }
+    return obj;
+}
+function generateFieldTemplate(field, languages) {
+    const wrap = (v, hint) => {
+        if (field.localized) {
+            return { value: localize(v, languages), hint: `${hint} (localized)` };
+        }
+        return { value: v, hint };
+    };
+    switch (field.type) {
+        case 'text':
+        case 'slug':
+            return wrap('', 'string');
+        case 'content':
+            return wrap({ type: 'doc', content: [] }, 'ProseMirror JSON document');
+        case 'number':
+            return wrap(0, 'number');
+        case 'boolean':
+            return { value: false, hint: 'boolean' };
+        case 'date':
+            return wrap('2024-01-01', 'ISO date string');
+        case 'datetime':
+            return wrap('2024-01-01T00:00:00Z', 'ISO datetime string');
+        case 'file':
+            if (field.multiple) {
+                return { value: ['<media-uuid-from-upload>'], hint: 'array of media UUIDs from POST /upload' };
+            }
+            return { value: '<media-uuid-from-upload>', hint: 'media UUID from POST /upload' };
+        case 'media':
+            if (field.multiple) {
+                return { value: ['<media-uuid-from-upload>'], hint: 'array of media UUIDs (image or video)' };
+            }
+            return { value: '<media-uuid-from-upload>', hint: 'media UUID (image or video) from POST /upload' };
+        case 'select': {
+            const sf = field;
+            const opts = sf.options.map((o) => o.value);
+            if (sf.multiple) {
+                return { value: opts.length ? [opts[0]] : [], hint: `array of: ${opts.join(' | ')}` };
+            }
+            return { value: opts[0] ?? '', hint: `one of: ${opts.join(' | ')}` };
+        }
+        case 'radio': {
+            const rf = field;
+            const opts = rf.options.map((o) => o.value);
+            return { value: opts[0] ?? '', hint: `one of: ${opts.join(' | ')}` };
+        }
+        case 'checkboxes': {
+            const cf = field;
+            const opts = cf.options.map((o) => o.value);
+            return { value: opts.length ? [opts[0]] : [], hint: `array of: ${opts.join(' | ')}` };
+        }
+        case 'relation': {
+            const rf = field;
+            if (rf.multiple) {
+                return { value: ['<entry-uuid>'], hint: `array of ${rf.collection} entry UUIDs` };
+            }
+            return { value: '<entry-uuid>', hint: `${rf.collection} entry UUID` };
+        }
+        case 'object': {
+            const of = field;
+            const { template, meta } = generateTemplate(of.fields, languages);
+            return { value: template, hint: `object — ${JSON.stringify(meta)}` };
+        }
+        case 'blocks': {
+            const bf = field;
+            const blocks = bf.of.map((block) => {
+                const { template } = generateTemplate(block.fields, languages);
+                return { _slug: block.slug, ...template };
+            });
+            return { value: blocks, hint: 'array of block objects with _slug' };
+        }
+        case 'array': {
+            const af = field;
+            const examples = { text: '', number: 0, url: { url: { [languages[0]]: '' } } };
+            return { value: [examples[af.of] ?? ''], hint: `array of ${af.of}` };
+        }
+        case 'seo':
+            return {
+                value: {
+                    slug: localize('', languages),
+                    title: localize('', languages),
+                    description: localize('', languages),
+                    ogImage: '',
+                    keywords: localize('', languages),
+                    canonicalUrl: localize('', languages),
+                    customCode: localize('', languages)
+                },
+                hint: 'SEO data — slug/title required, ogImage = media UUID or empty'
+            };
+        case 'url':
+            return {
+                value: {
+                    url: localize('', languages),
+                    text: localize('', languages),
+                    newTab: false
+                },
+                hint: 'URL field with optional text and newTab'
+            };
+        case 'custom':
+            return { value: null, hint: 'custom field — check plugin docs' };
+        default:
+            return { value: null, hint: 'unknown field type' };
+    }
+}
+export function generateTemplate(fields, languages) {
+    const template = {};
+    const meta = {};
+    for (const field of fields) {
+        const { value, hint } = generateFieldTemplate(field, languages);
+        template[field.slug] = value;
+        meta[field.slug] = hint;
+    }
+    return { template, meta };
+}
 export async function GET(event) {
     const cms = getCMS();
     const path = event.params.restPath || '';
+    // GET /schema/collections/:slug/template
+    const templateMatch = path.match(/^collections\/([^/]+)\/template$/);
+    if (templateMatch) {
+        const slug = templateMatch[1];
+        const collection = cms.collections[slug];
+        if (!collection) {
+            return json({ error: `Collection "${slug}" not found` }, { status: 404 });
+        }
+        const fields = getFieldsFromConfig(collection);
+        const { template, meta } = generateTemplate(fields, cms.languages);
+        return json({
+            data: template,
+            publish: true,
+            _meta: meta,
+            _notes: 'POST this to /collections/' + slug + ' — set publish:true to auto-publish'
+        });
+    }
+    // GET /schema/singletons/:slug/template
+    const singletonTemplateMatch = path.match(/^singletons\/([^/]+)\/template$/);
+    if (singletonTemplateMatch) {
+        const slug = singletonTemplateMatch[1];
+        const single = cms.singles[slug];
+        if (!single) {
+            return json({ error: `Singleton "${slug}" not found` }, { status: 404 });
+        }
+        const fields = getFieldsFromConfig(single);
+        const { template, meta } = generateTemplate(fields, cms.languages);
+        return json({
+            data: template,
+            _meta: meta,
+            _notes: 'PUT this to /singletons/' + slug
+        });
+    }
     // GET /schema/collections/:slug
     const collectionMatch = path.match(/^collections\/([^/]+)$/);
     if (collectionMatch) {

package/dist/admin/api/rest/routes/singletons.d.ts

@@ -1,3 +1,3 @@
 import { type RequestEvent } from '@sveltejs/kit';
-export declare function GET(_event: RequestEvent, slug: string): Promise<Response>;
+export declare function GET(event: RequestEvent, slug: string): Promise<Response>;
 export declare function PUT(event: RequestEvent, slug: string): Promise<Response>;

package/dist/admin/api/rest/routes/singletons.js

@@ -3,11 +3,12 @@ import { getCMS } from '../../../../core/cms.js';
 import { getRawEntries } from '../../../../core/server/entries/operations/get.js';
 import { createEntry } from '../../../../core/server/entries/operations/create.js';
 import { upsertDraftVersion } from '../../../../core/server/entries/operations/update.js';
-export async function GET(_event, slug) {
+export async function GET(event, slug) {
     const cms = getCMS();
     if (!cms.singles[slug]) {
         return json({ error: `Singleton "${slug}" not found` }, { status: 404 });
     }
+    const lang = event.url.searchParams.get('lang') || cms.languages[0] || 'en';
     const entries = await getRawEntries({ slug });
     const entry = entries[0];
     if (!entry) {
@@ -24,11 +25,10 @@ export async function GET(_event, slug) {
         type: entry.type,
         createdAt: entry.createdAt,
         updatedAt: entry.updatedAt,
-        publishedAt: entry.publishedAt,
-        draftData: entry.draftVersion?.data ?? null,
-        publishedData: entry.publishedVersion?.data ?? null,
-        draftVersionId: entry.draftVersion?.id ?? null,
-        publishedVersionId: entry.publishedVersion?.id ?? null
+        draftData: entry.draftVersions[lang]?.data ?? null,
+        publishedData: entry.publishedVersions[lang]?.data ?? null,
+        draftVersionId: entry.draftVersions[lang]?.id ?? null,
+        publishedVersionId: entry.publishedVersions[lang]?.id ?? null
     });
 }
 export async function PUT(event, slug) {
@@ -36,6 +36,7 @@ export async function PUT(event, slug) {
     if (!cms.singles[slug]) {
         return json({ error: `Singleton "${slug}" not found` }, { status: 404 });
     }
+    const lang = event.url.searchParams.get('lang') || cms.languages[0] || 'en';
     const body = await event.request.json().catch(() => null);
     if (!body?.data || typeof body.data !== 'object') {
         return json({ error: 'Request body must contain "data" object' }, { status: 400 });
@@ -51,7 +52,7 @@ export async function PUT(event, slug) {
             return json({ error: 'Failed to create singleton entry' }, { status: 500 });
         }
     }
-    const version = await upsertDraftVersion(entry.id, body.data, { skipValidation: true });
+    const version = await upsertDraftVersion(entry.id, body.data, lang, { skipValidation: true });
     return json({
         id: entry.id,
         versionId: version.id,

package/dist/admin/api/rest/routes/upload.d.ts

@@ -0,0 +1,2 @@
+import { type RequestEvent } from '@sveltejs/kit';
+export declare function POST(event: RequestEvent): Promise<Response>;

package/dist/admin/api/rest/routes/upload.js

@@ -0,0 +1,28 @@
+import { json } from '@sveltejs/kit';
+import { uploadFile } from '../../../../core/server/media/operations/uploadFile.js';
+import { getCMS } from '../../../../core/cms.js';
+const MAX_UPLOAD_SIZE = 50 * 1024 * 1024; // 50MB
+export async function POST(event) {
+    const form = await event.request.formData();
+    const file = form.get('file');
+    const tagIdsRaw = form.get('tagIds');
+    if (!file || file.size === 0) {
+        return json({ error: 'No file provided' }, { status: 400 });
+    }
+    if (file.size > MAX_UPLOAD_SIZE) {
+        return json({ error: 'File too large (max 50MB)' }, { status: 413 });
+    }
+    const dbFile = await uploadFile(file);
+    if (tagIdsRaw) {
+        try {
+            const tagIds = JSON.parse(tagIdsRaw);
+            if (Array.isArray(tagIds) && tagIds.length > 0) {
+                await getCMS().databaseAdapter.setMediaFileTags(dbFile.id, tagIds);
+            }
+        }
+        catch {
+            // ignore invalid tagIds JSON
+        }
+    }
+    return json(dbFile, { status: 201 });
+}

package/dist/admin/api/upload.js

@@ -1,11 +1,13 @@
 import { requireAuth } from '../remote/middleware/auth.js';
 import { uploadFile } from '../../core/server/media/operations/uploadFile.js';
+import { getCMS } from '../../core/cms.js';
 import { json } from '@sveltejs/kit';
 const MAX_UPLOAD_SIZE = 50 * 1024 * 1024; // 50MB
 export const POST = async ({ request }) => {
     requireAuth();
     const form = await request.formData();
     const file = form.get('file');
+    const tagIdsRaw = form.get('tagIds');
     if (!file || file.size === 0) {
         return new Response('No file', { status: 400 });
     }
@@ -13,5 +15,16 @@ export const POST = async ({ request }) => {
         return new Response('File too large', { status: 413 });
     }
     const dbFile = await uploadFile(file);
+    if (tagIdsRaw) {
+        try {
+            const tagIds = JSON.parse(tagIdsRaw);
+            if (Array.isArray(tagIds) && tagIds.length > 0) {
+                await getCMS().databaseAdapter.setMediaFileTags(dbFile.id, tagIds);
+            }
+        }
+        catch {
+            // ignore invalid tagIds JSON
+        }
+    }
     return json(dbFile);
 };

package/dist/admin/client/collection/collection-entries.svelte

@@ -378,8 +378,20 @@
 		pendingDeleteId = null;
 	}
 
+	function getVersionData(entry: RawEntry): Record<string, unknown> | undefined {
+		const lang = contentLanguage.current;
+		const draft = entry.draftVersions[lang];
+		const published = entry.publishedVersions[lang];
+		if (draft?.data) return draft.data as Record<string, unknown>;
+		if (published?.data) return published.data as Record<string, unknown>;
+		// Fallback: any lang
+		for (const v of Object.values(entry.draftVersions)) if (v?.data) return v.data as Record<string, unknown>;
+		for (const v of Object.values(entry.publishedVersions)) if (v?.data) return v.data as Record<string, unknown>;
+		return undefined;
+	}
+
 	function getSearchText(entry: RawEntry): string {
-		const data = entry.draftVersion?.data || entry.publishedVersion?.data;
+		const data = getVersionData(entry);
 		if (!data) return '';
 		return extractTextValues(data).join(' ').toLowerCase();
 	}
@@ -404,7 +416,7 @@
 
 	function extractSlug(entry: RawEntry): string | undefined {
 		if (!seoField) return undefined;
-		const data = entry.draftVersion?.data || entry.publishedVersion?.data;
+		const data = getVersionData(entry);
 		if (!data) return undefined;
 		const seoData = data[seoField.slug];
 		if (seoData && typeof seoData === 'object' && 'slug' in seoData) {
@@ -414,13 +426,15 @@
 	}
 
 	function countA11yWarnings(entry: RawEntry): number {
-		const data = entry.draftVersion?.data || entry.publishedVersion?.data;
+		const data = getVersionData(entry);
 		if (!data) return 0;
 		const a11yLang = interfaceLanguage.current === 'pl' ? a11yLangPl : a11yLangEn;
 		const issues = validateA11y(data as Record<string, unknown>, collection.fields, a11yLang);
 		return issues.filter((i) => i.type === 'warning').length;
 	}
 
+	const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
 	async function fetchRelationLabels(entries: RawEntry[]): Promise<Record<string, string>> {
 		if (relationListFields.length === 0) return {};
 
@@ -429,14 +443,21 @@
 			uuidsByCollection.set(field.collection, new Set());
 		}
 		for (const entry of entries) {
-			const data = entry.publishedVersion?.data || entry.draftVersion?.data;
-			if (!data) continue;
-			for (const field of relationListFields) {
-				const raw = (data as Record<string, unknown>)[field.slug];
-				if (!raw) continue;
-				const set = uuidsByCollection.get(field.collection)!;
-				if (typeof raw === 'string') set.add(raw);
-				if (Array.isArray(raw)) raw.forEach((v) => typeof v === 'string' && set.add(v));
+			// Collect UUIDs from all version sources (draft + published) to match mapEntryToRow
+			const lang = contentLanguage.current;
+			const dataSources = [
+				entry.publishedVersions[lang]?.data,
+				entry.draftVersions[lang]?.data,
+				getVersionData(entry)
+			].filter(Boolean) as Record<string, unknown>[];
+			for (const data of dataSources) {
+				for (const field of relationListFields) {
+					const raw = data[field.slug];
+					if (!raw) continue;
+					const set = uuidsByCollection.get(field.collection)!;
+					if (typeof raw === 'string' && UUID_RE.test(raw)) set.add(raw);
+					if (Array.isArray(raw)) raw.forEach((v) => typeof v === 'string' && UUID_RE.test(v) && set.add(v));
+				}
 			}
 		}
 
@@ -454,9 +475,10 @@
 	}
 
 	function mapEntryToRow(entry: RawEntry, lookup: Record<string, string> = {}): CollectionDataTableRow {
-		const data = entry.draftVersion?.data || entry.publishedVersion?.data || {};
+		const data = getVersionData(entry) || {};
 		// For custom columns, prefer published data (complete) over draft (may be partial)
-		const columnData = entry.publishedVersion?.data || entry.draftVersion?.data || {};
+		const lang = contentLanguage.current;
+		const columnData = entry.publishedVersions[lang]?.data || entry.draftVersions[lang]?.data || data;
 		const customData: Record<string, unknown> = {};
 		if (collection.listColumns) {
 			for (const fieldSlug of collection.listColumns) {

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

@@ -28,8 +28,6 @@
 	import { createHybridContext } from './hybrid/hybrid-context.svelte.js';
 	import { onMount } from 'svelte';
 	import { get } from 'svelte/store';
-	import { computeTranslationStatus } from '../../utils/translationStatus.js';
-
 	const contentLanguage = getContentLanguage();
 	const remotes = getRemotes();
 	const interfaceLanguage = useInterfaceLanguage();
@@ -142,10 +140,11 @@
 	let { collection } = entry;
 	const isArchived = $derived(!!entry.archivedAt);
 
-	// Create form once at component level
+	// Create form once at component level — localized: false since data is flat single-language
 	const collectionSchema = generateZodSchemaFromFields(
 		getFieldsFromConfig(collection),
-		contentLanguage.all
+		contentLanguage.all,
+		{ localized: false }
 	);
 	const form = superForm(defaults(editingEntry.data, zod4(collectionSchema)), {
 		validators: zod4Client(collectionSchema),
@@ -166,15 +165,6 @@
 
 	const AUTOSAVE_DELAY = 30000; // 30 seconds
 
-	// Reactive translation status — must live here where we can subscribe to form.form store
-	const formStore = form.form;
-	const collectionFields = getFieldsFromConfig(collection);
-	const translationStatus = $derived.by(() => {
-		if (contentLanguage.all.length <= 1) return null;
-		const data = $formStore;
-		return computeTranslationStatus(data, collectionFields, contentLanguage.all);
-	});
-
 	function scheduleAutosave() {
 		if (isArchived) return;
 		if (autosaveTimer) {
@@ -195,15 +185,18 @@
 
 		saveStatus = 'saving';
 		try {
+			const currentLang = contentLanguage.current;
 			const result = await remotes.updateEntryVersionCommand({
 				entryId: entry.id,
+				lang: currentLang,
 				data: currentFormData,
 				type: 'draft'
 			});
 			lastSavedData = currentData;
 			saveStatus = 'saved';
 			// If we're editing the published version and saved a draft, track it for the banner
-			if (entry.publishedVersion && editingEntry.id === entry.publishedVersion.id && result?.id) {
+			const publishedVersion = entry.publishedVersions[currentLang];
+			if (publishedVersion && editingEntry.id === publishedVersion.id && result?.id) {
 				savedDraftVersionId = result.id;
 			}
 			// Reset to idle after 3s
@@ -270,6 +263,7 @@
 			try {
 				await remotes.updateEntryVersionCommand({
 					entryId: entry.id,
+					lang: contentLanguage.current,
 					data: get(form.form),
 					type
 				});
@@ -298,6 +292,7 @@
 			try {
 				await remotes.updateEntryVersionCommand({
 					entryId: entry.id,
+					lang: contentLanguage.current,
 					data: validatedForm.data,
 					type,
 					scheduledAt
@@ -501,21 +496,25 @@
 		}
 	});
 
+	// Per-language version lookups
+	const currentPublishedVersion = $derived(entry.publishedVersions[contentLanguage.current]);
+	const currentDraftVersion = $derived(entry.draftVersions[contentLanguage.current]);
+
 	// Banner: viewing published version + a separate draft exists
 	const showDraftBanner = $derived(
-		entry.publishedVersion != null &&
-			editingEntry.id === entry.publishedVersion.id &&
-			entry.draftVersion != null &&
-			entry.draftVersion.id !== entry.publishedVersion.id &&
-			entry.draftVersion.createdAt > entry.publishedVersion.createdAt
+		currentPublishedVersion != null &&
+			editingEntry.id === currentPublishedVersion.id &&
+			currentDraftVersion != null &&
+			currentDraftVersion.id !== currentPublishedVersion.id &&
+			currentDraftVersion.createdAt > currentPublishedVersion.createdAt
 	);
 
 	// Banner: viewing draft + a published version exists
 	const showPublishedBanner = $derived(
-		entry.publishedVersion != null && editingEntry.id !== entry.publishedVersion.id
+		currentPublishedVersion != null && editingEntry.id !== currentPublishedVersion.id
 	);
 
-	const draftVersionId = $derived(entry.draftVersion?.id ?? savedDraftVersionId);
+	const draftVersionId = $derived(currentDraftVersion?.id ?? savedDraftVersionId);
 
 	const scrollToIssue = (fieldSlug: string) => {
 		const fieldEl = document.querySelector(`[data-field-path="${fieldSlug}"]`);
@@ -554,7 +553,6 @@
 		fields={getFieldsFromConfig(collection)}
 		getFormData={() => get(form.form)}
 		onScrollToIssue={scrollToIssue}
-		{translationStatus}
 	/>
 
 	{#if validationErrors.length > 0}
@@ -620,7 +618,7 @@
 			<button
 				type="button"
 				class="font-semibold text-[var(--primary)] hover:underline"
-				onclick={() => goto(`?version=${entry.publishedVersion!.id}`)}
+				onclick={() => goto(`?version=${currentPublishedVersion!.id}`)}
 			>
 				{lang[interfaceLanguage.current].switchToPublished}
 			</button>

package/dist/admin/client/entry/header/a11y-validator.js

@@ -198,7 +198,7 @@ function tryExtractDoc(val) {
 function extractDocs(data, fields) {
     const result = [];
     for (const field of fields) {
-        if (field.type !== 'content' && field.type !== 'richtext')
+        if (field.type !== 'content')
             continue;
         const val = data[field.slug];
         const docs = tryExtractDoc(val);
@@ -212,7 +212,7 @@ function extractDocs(data, fields) {
 function extractDocsForLang(data, fields, language) {
     const result = [];
     for (const field of fields) {
-        if (field.type !== 'content' && field.type !== 'richtext')
+        if (field.type !== 'content')
             continue;
         const val = data[field.slug];
         if (!val || typeof val !== 'object')