includio-cms 0.0.21 → 0.0.23

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

@@ -4,9 +4,9 @@ export declare const getEntries: import("@sveltejs/kit").RemoteQueryFunction<{
         slug?: string | undefined;
         status?: "draft" | "published" | "archived" | undefined;
         type?: "collection" | "singleton" | undefined;
+        ids?: string[] | undefined;
         dataValues?: Record<string, unknown> | undefined;
         dataLike?: Record<string, unknown> | undefined;
-        ids?: string[] | undefined;
     } | undefined;
 }, import("../../types/entries.js").Entry[]>;
 export declare const createNewEntry: import("@sveltejs/kit").RemoteQueryFunction<{

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

@@ -1,7 +1,6 @@
-import { resolveMediaFields } from '../../fields/resolveImageFields.js';
 import z from 'zod';
 import { getCMS } from '../../../cms.js';
-import { getEntryTranslation } from '../utils/getEntryTranslation.js';
+import { populateEntryData } from '../../fields/populateEntry.js';
 // Helper function to transform string values to localized objects
 function transformDataValuesToLocalized(dataValues, defaultLanguage) {
     const result = {};
@@ -83,10 +82,9 @@ export const getEntry = async (data, options = {}) => {
         return null;
     }
     const config = getCMS().getBySlug(entry.slug);
-    const translatedEntry = getEntryTranslation(entry, language);
     return {
         ...entry,
-        data: await resolveMediaFields(translatedEntry.data, config.fields),
+        data: await populateEntryData(entry.data, config.fields, language),
         populated: true
     };
 };
@@ -118,10 +116,9 @@ export const getEntries = async (data, options = {}) => {
     const entries = await getRawEntries(transformedData);
     return Promise.all(entries.map(async (entry) => {
         const config = getCMS().getBySlug(entry.slug);
-        const translatedEntry = getEntryTranslation(entry, language);
         return {
             ...entry,
-            data: await resolveMediaFields(translatedEntry.data, config.fields),
+            data: await populateEntryData(entry.data, config.fields, language),
             populated: true
         };
     }));
@@ -141,10 +138,9 @@ export const getCollectionEntries = async (slug, options = {}) => {
     }
     const entries = await getRawCollectionEntries(slug);
     const language = options.language || getCMS().languages[0];
-    const translatedEntries = entries.map((entry) => getEntryTranslation(entry, language));
-    return Promise.all(translatedEntries.map(async (row) => ({
+    return Promise.all(entries.map(async (row) => ({
         ...row,
-        data: await resolveMediaFields(row.data, config.fields),
+        data: await populateEntryData(row.data, config.fields, language),
         populated: true
     })));
 };

package/dist/core/server/entries/utils/getEntryTranslation.d.ts

@@ -1,2 +1 @@
-import type { RawEntry } from '../../../../types/entries.js';
-export declare function getEntryTranslation(entry: RawEntry, language: string): RawEntry;
+export declare function translateObject(obj: unknown, language: string): unknown;

package/dist/core/server/entries/utils/getEntryTranslation.js

@@ -1,24 +1,18 @@
-export function getEntryTranslation(entry, language) {
-    function translate(obj) {
-        if (Array.isArray(obj)) {
-            return obj.map(translate);
+export function translateObject(obj, language) {
+    if (Array.isArray(obj)) {
+        return obj.map((item) => translateObject(item, language));
+    }
+    if (obj && typeof obj === 'object') {
+        // Jeśli obiekt zawiera klucz języka, zwracamy tłumaczenie
+        if (language in obj) {
+            return obj[language];
         }
-        if (obj && typeof obj === 'object') {
-            // Jeśli obiekt zawiera klucz języka, zwracamy tłumaczenie
-            if (language in obj) {
-                return obj[language];
-            }
-            // W przeciwnym razie rekurencyjnie przechodzimy przez wszystkie pola
-            const result = {};
-            for (const key in obj) {
-                result[key] = translate(obj[key]);
-            }
-            return result;
+        // W przeciwnym razie rekurencyjnie przechodzimy przez wszystkie pola
+        const result = {};
+        for (const key in obj) {
+            result[key] = translateObject(obj[key], language);
         }
-        return obj;
+        return result;
     }
-    return {
-        ...entry,
-        data: translate(entry.data)
-    };
+    return obj;
 }

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

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

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

@@ -0,0 +1,9 @@
+import { translateObject } from '../entries/utils/getEntryTranslation.js';
+import { resolveMediaFields } from './resolveImageFields.js';
+import { resolveUrlFields } from './resolveUrlFields.js';
+export async function populateEntryData(data, fields, language) {
+    let populatedData = translateObject(data, language);
+    populatedData = await resolveMediaFields(populatedData, fields);
+    populatedData = await resolveUrlFields(populatedData, fields, language);
+    return populatedData;
+}

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

@@ -0,0 +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[], language: string): Promise<PopulatedEntryData>;

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

@@ -0,0 +1,103 @@
+import { getCMS } from '../../cms.js';
+import { translateObject } from '../entries/utils/getEntryTranslation.js';
+export async function resolveUrlFields(data, fields, language) {
+    const entriesIds = [];
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const collectIds = (value, fields) => {
+        for (const field of fields) {
+            const val = value?.[field.slug];
+            if (val == null)
+                continue;
+            switch (field.type) {
+                case 'url': {
+                    if (typeof val === 'object' &&
+                        val !== null &&
+                        'id' in val &&
+                        typeof val.id === 'string') {
+                        entriesIds.push(val.id);
+                    }
+                    break;
+                }
+                case 'object':
+                    collectIds(val.data, field.fields);
+                    break;
+                case 'array':
+                    if (Array.isArray(val)) {
+                        val.forEach((item) => {
+                            // Find the object definition for this item based on its slug
+                            const objectDef = field.of.find((objDef) => objDef.slug === item.slug);
+                            if (objectDef) {
+                                collectIds(item.data, objectDef.fields);
+                            }
+                        });
+                    }
+                    break;
+            }
+        }
+    };
+    collectIds(data, fields);
+    if (entriesIds.length === 0)
+        return data;
+    const entries = (await getCMS().databaseAdapter.getEntries({
+        data: {
+            ids: entriesIds
+        }
+    }));
+    const entriesMap = Object.fromEntries(entries.map((m) => [m.id, m]));
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const resolveValues = (value, fields) => {
+        // Start with a copy of all original data to preserve non-field properties
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const result = { ...value };
+        for (const field of fields) {
+            const val = value?.[field.slug];
+            if (val == null) {
+                result[field.slug] = val;
+                continue;
+            }
+            switch (field.type) {
+                case 'url': {
+                    if (typeof val === 'object' &&
+                        val !== null &&
+                        'id' in val &&
+                        typeof val.id === 'string') {
+                        result[field.slug] = entriesMap[val.id].data.seo?.slug ?? val;
+                    }
+                    if (typeof val === 'object' &&
+                        val !== null &&
+                        'url' in val &&
+                        typeof val.url === 'object' &&
+                        val.url !== null) {
+                        result[field.slug] = translateObject(val.url, language);
+                    }
+                    break;
+                }
+                case 'object':
+                    result[field.slug] = {
+                        ...val,
+                        data: resolveValues(val.data, field.fields)
+                    };
+                    break;
+                case 'array':
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    result[field.slug] = val.map((item) => {
+                        // Find the object definition for this item based on its slug
+                        const objectDef = field.of.find((objDef) => objDef.slug === item.slug);
+                        if (objectDef) {
+                            return {
+                                ...item,
+                                data: resolveValues(item.data, objectDef.fields)
+                            };
+                        }
+                        // If no matching object definition found, return item unchanged
+                        return item;
+                    });
+                    break;
+                default:
+                    result[field.slug] = val;
+            }
+        }
+        return result;
+    };
+    return resolveValues(data, fields);
+}

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

@@ -40,9 +40,9 @@ function getFieldTypeAsString(field) {
             return 'string';
         case 'seo':
             return `{
-				slug: string;
-				title: string;
-				description: string;
+				slug?: string;
+				title?: string;
+				description?: string;
 			}`;
         case 'url':
             return 'string';

package/dist/sveltekit/components/seo.svelte

@@ -0,0 +1,18 @@
+<script lang="ts">
+	type Props = {
+		title?: string;
+		description?: string;
+	};
+
+	let { title, description }: Props = $props();
+</script>
+
+<svelte:head>
+	{#if title}
+		<title>{title}</title>
+		<meta name="title" content={title} />
+	{/if}
+	{#if description}
+		<meta name="description" content={description} />
+	{/if}
+</svelte:head>

package/dist/sveltekit/components/seo.svelte.d.ts

@@ -0,0 +1,7 @@
+type Props = {
+    title?: string;
+    description?: string;
+};
+declare const Seo: import("svelte").Component<Props, {}, "">;
+type Seo = ReturnType<typeof Seo>;
+export default Seo;

package/package.json

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