includio-cms 0.0.14 → 0.0.16

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

@@ -14,7 +14,7 @@
 
 	const collection = $derived(await remotes.getCollection(page.params.collection || ''));
 
-	const collectionEntriesQuery = $derived(remotes.getEntries(collection.slug));
+	const collectionEntriesQuery = $derived(remotes.getRawCollectionEntries(collection.slug));
 
 	async function onCreateEntry() {
 		const newEntry = await remotes.createNewEntry({ type: 'collection', slug: collection.slug });

package/dist/admin/components/fields/field-renderer.svelte

@@ -12,6 +12,8 @@
 	import RadioField from './radio-field.svelte';
 	import FileField from './file-field.svelte';
 	import NumberField from './number-field.svelte';
+	import SeoField from './seo-field.svelte';
+	import UrlField from './url-field.svelte';
 
 	type Props = {
 		objectFieldType?: 'default' | 'inline';
@@ -22,8 +24,8 @@
 
 	let { field, form, path, objectFieldType = 'default', ...props }: Props = $props();
 
-	const fieldsWithNoDescription: FieldType[] = ['boolean', 'object', 'array'];
-	const fieldsWithNoLabel: FieldType[] = ['boolean', 'object', 'array'];
+	const fieldsWithNoDescription: FieldType[] = ['boolean', 'object', 'array', 'seo'];
+	const fieldsWithNoLabel: FieldType[] = ['boolean', 'object', 'array', 'seo'];
 
 	const fieldsWithAlternativeDescription: FieldType[] = ['image', 'object', 'array'];
 
@@ -81,6 +83,10 @@
 						<BooleanField {field} {form} {path} {...props} />
 					{:else if field.type === 'number'}
 						<NumberField {field} {form} {path} {...props} />
+					{:else if field.type === 'seo'}
+						<SeoField {field} {form} {path} {...props} />
+					{:else if field.type === 'url'}
+						<UrlField {field} {form} {path} {...props} />
 					{:else}
 						<p>Nieobsługiwany typ pola: {field.type}</p>
 					{/if}

package/dist/admin/components/fields/fields-form.svelte

@@ -4,6 +4,7 @@
 	import { cn } from '../../../utils.js';
 	import FieldRenderer from './field-renderer.svelte';
 	import type { Field } from '../../../types/fields.js';
+	import SuperDebug from 'sveltekit-superforms';
 
 	type Props = {
 		form: SuperForm<Record<string, unknown>>;
@@ -14,9 +15,11 @@
 
 	let { form, fields, action = undefined, class: className = undefined }: Props = $props();
 
-	const { enhance } = form;
+	const { enhance, form: formData } = form;
 </script>
 
+<!-- <SuperDebug data={formData} /> -->
+
 <form method="POST" use:enhance {action} class={cn('space-y-4', className)}>
 	{#each fields as field}
 		<FieldRenderer {field} {form} path={field.slug} />

package/dist/admin/components/fields/seo-field.svelte

@@ -0,0 +1,72 @@
+<script lang="ts" module>
+	type T = Record<string, unknown>;
+</script>
+
+<script lang="ts" generics="T extends Record<string, unknown>">
+	import {
+		formFieldProxy,
+		type FormFieldProxy,
+		type FormPathLeaves,
+		type SuperForm
+	} from 'sveltekit-superforms';
+	import FieldRenderer from './field-renderer.svelte';
+	import { joinPath } from '../../utils/objectPath.js';
+	import type {
+		Field,
+		ObjectFieldData,
+		SeoField,
+		SeoFieldData,
+		TextField
+	} from '../../../types/fields.js';
+	// import { onMount } from 'svelte';
+	import * as Item from '../../../components/ui/item/index.js';
+
+	type Props = {
+		field: SeoField;
+		form: SuperForm<T>;
+		path: FormPathLeaves<T, SeoFieldData | undefined>;
+	};
+
+	let { field, form, path, ...props }: Props = $props();
+
+	// const { value } = formFieldProxy(form, path) satisfies FormFieldProxy<SeoFieldData | undefined>;
+
+	const slugField: TextField = {
+		type: 'text',
+		slug: 'slug',
+		label: 'Slug',
+		required: true
+	};
+
+	const titleField: TextField = {
+		type: 'text',
+		slug: 'title',
+		label: 'Title',
+		required: true
+	};
+
+	const descriptionField: TextField = {
+		type: 'text',
+		slug: 'description',
+		label: 'Description',
+		required: false,
+		multiline: true
+	};
+
+	const fields: Field[] = [slugField, titleField, descriptionField];
+</script>
+
+<Item.Root variant="outline">
+	<Item.Content>
+		<Item.Title class="mb-4 text-lg">SEO</Item.Title>
+		<div class="space-y-4">
+			{#each fields as f}
+				<FieldRenderer
+					field={f}
+					form={form as SuperForm<Record<string, unknown>>}
+					path={joinPath(path, f.slug)}
+				/>
+			{/each}
+		</div>
+	</Item.Content>
+</Item.Root>

package/dist/admin/components/fields/seo-field.svelte.d.ts

@@ -0,0 +1,30 @@
+import { type FormPathLeaves, type SuperForm } from 'sveltekit-superforms';
+import type { SeoField, SeoFieldData } from '../../../types/fields.js';
+declare function $$render<T extends Record<string, unknown>>(): {
+    props: {
+        field: SeoField;
+        form: SuperForm<T>;
+        path: FormPathLeaves<T, SeoFieldData | undefined>;
+    };
+    exports: {};
+    bindings: "";
+    slots: {};
+    events: {};
+};
+declare class __sveltets_Render<T extends Record<string, unknown>> {
+    props(): ReturnType<typeof $$render<T>>['props'];
+    events(): ReturnType<typeof $$render<T>>['events'];
+    slots(): ReturnType<typeof $$render<T>>['slots'];
+    bindings(): "";
+    exports(): {};
+}
+interface $$IsomorphicComponent {
+    new <T extends Record<string, unknown>>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<T>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<T>['props']>, ReturnType<__sveltets_Render<T>['events']>, ReturnType<__sveltets_Render<T>['slots']>> & {
+        $$bindings?: ReturnType<__sveltets_Render<T>['bindings']>;
+    } & ReturnType<__sveltets_Render<T>['exports']>;
+    <T extends Record<string, unknown>>(internal: unknown, props: ReturnType<__sveltets_Render<T>['props']> & {}): ReturnType<__sveltets_Render<T>['exports']>;
+    z_$$bindings?: ReturnType<__sveltets_Render<any>['bindings']>;
+}
+declare const SeoField: $$IsomorphicComponent;
+type SeoField<T extends Record<string, unknown>> = InstanceType<typeof SeoField<T>>;
+export default SeoField;

package/dist/admin/components/fields/text-field.svelte

@@ -6,6 +6,7 @@
 	import Input from '../../../components/ui/input/input.svelte';
 	import Textarea from '../../../components/ui/textarea/textarea.svelte';
 	import type { TextField } from '../../../types/fields.js';
+	import { onMount } from 'svelte';
 	import {
 		formFieldProxy,
 		type FormFieldProxy,

package/dist/admin/components/fields/url-field.svelte

@@ -0,0 +1,142 @@
+<script lang="ts" module>
+	type T = Record<string, unknown>;
+</script>
+
+<script lang="ts" generics="T extends Record<string, unknown>">
+	import Input from '../../../components/ui/input/input.svelte';
+	import type { SeoFieldData, TextField, UrlField, UrlFieldData } from '../../../types/fields.js';
+	import { onMount } from 'svelte';
+	import {
+		formFieldProxy,
+		type FormFieldProxy,
+		type FormPathLeaves,
+		type SuperForm
+	} from 'sveltekit-superforms';
+	import * as Popover from '../../../components/ui/popover/index.js';
+	import * as Item from '../../../components/ui/item/index.js';
+	import { getRemotes } from '../../../sveltekit/index.js';
+	import type { Entry } from '../../../types/entries.js';
+	import TextFieldWrapper from './text-field-wrapper.svelte';
+	import { joinPath } from '../../utils/objectPath.js';
+	import Button from '../../../components/ui/button/button.svelte';
+
+	const remotes = getRemotes();
+	const languages = await remotes.getLanguages();
+
+	type Props = {
+		field: UrlField;
+		form: SuperForm<T>;
+		path: FormPathLeaves<T, UrlFieldData | undefined>;
+	};
+
+	const textField: TextField = {
+		type: 'text',
+		slug: 'url'
+	};
+
+	let { field, form, path, ...props }: Props = $props();
+
+	const { value } = formFieldProxy(form, path) satisfies FormFieldProxy<UrlFieldData | undefined>;
+
+	let linkedEntry: Promise<(Entry & { data: { seo?: SeoFieldData } }) | null> | null = $derived(
+		$value && 'id' in $value && $value.id
+			? remotes.getEntry({
+					data: { id: $value.id }
+				})
+			: null
+	);
+
+	onMount(() => {
+		if ($value === undefined) {
+			$value = { url: {} };
+		}
+	});
+
+	let autocompleteSuggestions = $derived.by(async () => {
+		if ($value !== undefined && 'url' in $value) {
+			let suggestions: (Entry & { data: { seo?: SeoFieldData } })[] = [];
+
+			for (let i = 0; i < Object.values($value.url).length; i++) {
+				let url = Object.values($value.url)[i];
+
+				if (url.length > 2) {
+					let results = (await remotes.getEntries({
+						data: {
+							dataLike: {
+								seo: {
+									slug: url
+								}
+							}
+						}
+					})) as (Entry & { data: { seo?: SeoFieldData } })[];
+
+					suggestions = [...suggestions, ...results];
+
+					// Remove duplicates
+					suggestions = suggestions.filter(
+						(entry, index, self) => index === self.findIndex((e) => e.id === entry.id)
+					);
+
+					// Limit to 5 suggestions
+					suggestions = suggestions.slice(0, 5);
+				}
+			}
+
+			return suggestions;
+		}
+	});
+</script>
+
+{#if $value !== undefined}
+	{#if 'url' in $value}
+		<TextFieldWrapper
+			field={textField}
+			{form}
+			path={joinPath(path, textField.slug) as FormPathLeaves<T, string | undefined>}
+			{...props}
+		/>
+	{/if}
+	{#if 'id' in $value && linkedEntry !== undefined}
+		{#if linkedEntry}
+			{#await linkedEntry then entry}
+				{#if entry}
+					<Button
+						variant="outline"
+						onclick={() => {
+							$value = { url: Object.fromEntries(languages.map((lang) => [lang, ''])) };
+						}}
+					>
+						Linked to: {entry.data.seo?.title || 'No title'} ({entry.data.seo?.slug})
+					</Button>
+				{/if}
+			{/await}
+		{/if}
+	{/if}
+
+	{#if autocompleteSuggestions}
+		{#await autocompleteSuggestions then suggestions}
+			{#if suggestions && suggestions.length > 0}
+				<ul>
+					{#each suggestions as suggestion}
+						<li>
+							<Item.Root
+								variant="outline"
+								size="sm"
+								onclick={() => {
+									$value = { id: suggestion.id };
+								}}
+							>
+								<Item.Content>
+									<Item.Title
+										>{suggestion.data.seo?.title || 'No title'} ({suggestion.data.seo
+											?.slug})</Item.Title
+									>
+								</Item.Content>
+							</Item.Root>
+						</li>
+					{/each}
+				</ul>
+			{/if}
+		{/await}
+	{/if}
+{/if}

package/dist/admin/components/fields/url-field.svelte.d.ts

@@ -0,0 +1,30 @@
+import type { UrlField, UrlFieldData } from '../../../types/fields.js';
+import { type FormPathLeaves, type SuperForm } from 'sveltekit-superforms';
+declare function $$render<T extends Record<string, unknown>>(): Promise<{
+    props: {
+        field: UrlField;
+        form: SuperForm<T>;
+        path: FormPathLeaves<T, UrlFieldData | undefined>;
+    };
+    exports: {};
+    bindings: "";
+    slots: {};
+    events: {};
+}>;
+declare class __sveltets_Render<T extends Record<string, unknown>> {
+    props(): Awaited<ReturnType<typeof $$render<T>>>['props'];
+    events(): Awaited<ReturnType<typeof $$render<T>>>['events'];
+    slots(): Awaited<ReturnType<typeof $$render<T>>>['slots'];
+    bindings(): "";
+    exports(): Promise<{}>;
+}
+interface $$IsomorphicComponent {
+    new <T extends Record<string, unknown>>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<T>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<T>['props']>, ReturnType<__sveltets_Render<T>['events']>, ReturnType<__sveltets_Render<T>['slots']>> & {
+        $$bindings?: ReturnType<__sveltets_Render<T>['bindings']>;
+    } & ReturnType<__sveltets_Render<T>['exports']>;
+    <T extends Record<string, unknown>>(internal: unknown, props: ReturnType<__sveltets_Render<T>['props']> & {}): ReturnType<__sveltets_Render<T>['exports']>;
+    z_$$bindings?: ReturnType<__sveltets_Render<any>['bindings']>;
+}
+declare const UrlField: $$IsomorphicComponent;
+type UrlField<T extends Record<string, unknown>> = InstanceType<typeof UrlField<T>>;
+export default UrlField;

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

@@ -1,9 +1,28 @@
-export declare const getEntries: import("@sveltejs/kit").RemoteQueryFunction<string, import("../../types/entries.js").RawEntry[]>;
+export declare const getRawCollectionEntries: import("@sveltejs/kit").RemoteQueryFunction<string, import("../../types/entries.js").RawEntry[]>;
+export declare const getEntries: import("@sveltejs/kit").RemoteQueryFunction<{
+    data?: {
+        slug?: string | undefined;
+        status?: "draft" | "published" | "archived" | undefined;
+        type?: "collection" | "singleton" | 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<{
     slug: string;
     type: "collection" | "singleton";
     data?: Record<string, unknown> | undefined;
 }, import("../../types/entries.js").RawEntry>;
+export declare const getEntry: import("@sveltejs/kit").RemoteQueryFunction<{
+    data?: {
+        slug?: string | undefined;
+        status?: "draft" | "published" | "archived" | undefined;
+        id?: string | undefined;
+        type?: "collection" | "singleton" | undefined;
+        dataValues?: Record<string, unknown> | undefined;
+    } | undefined;
+}, import("../../types/entries.js").Entry | null>;
 export declare const getEntryById: import("@sveltejs/kit").RemoteQueryFunction<string, import("../../types/entries.js").RawEntry>;
 export declare const updateEntryCommand: import("@sveltejs/kit").RemoteCommand<{
     id: string;

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

@@ -1,11 +1,26 @@
 import { command, query } from '$app/server';
 import { createEntry } from '../../core/server/entries/operations/create.js';
 import { deleteEntry } from '../../core/server/entries/operations/delete.js';
-import { getRawCollectionEntries, getRawEntryById } from '../../core/server/entries/operations/get.js';
+import { getRawCollectionEntries as getRawCollectionEntriesOperation, getRawEntryById, getEntries as getEntriesOperation, getEntry as getEntryOperation } from '../../core/server/entries/operations/get.js';
 import { updateEntry } from '../../core/server/entries/operations/update.js';
 import z from 'zod';
-export const getEntries = query(z.string(), async (slug) => {
-    return getRawCollectionEntries(slug);
+export const getRawCollectionEntries = query(z.string(), async (slug) => {
+    return getRawCollectionEntriesOperation(slug);
+});
+export const getEntries = query(z.object({
+    data: z
+        .object({
+        ids: z.array(z.string().uuid()).optional(),
+        slug: z.string().optional(),
+        status: z.enum(['draft', 'published', 'archived']).optional(),
+        type: z.enum(['collection', 'singleton']).optional(),
+        dataValues: z.record(z.unknown()).optional(),
+        dataLike: z.record(z.unknown()).optional()
+    })
+        .optional()
+}), async (input) => {
+    // We return RawEntry[] here, transformation to populated Entry[] is done in the client
+    return getEntriesOperation(input);
 });
 const createEntrySchema = z.object({
     slug: z.string(),
@@ -15,6 +30,19 @@ const createEntrySchema = z.object({
 export const createNewEntry = query(createEntrySchema, async (input) => {
     return createEntry(input.type, input.slug, input.data || {});
 });
+export const getEntry = query(z.object({
+    data: z
+        .object({
+        id: z.string().uuid().optional(),
+        slug: z.string().optional(),
+        status: z.enum(['draft', 'published', 'archived']).optional(),
+        type: z.enum(['collection', 'singleton']).optional(),
+        dataValues: z.record(z.unknown()).optional()
+    })
+        .optional()
+}), async (input) => {
+    return getEntryOperation(input);
+});
 export const getEntryById = query(z.string(), async (id) => {
     return getRawEntryById(id);
 });

package/dist/components/ui/popover/index.d.ts

@@ -0,0 +1,6 @@
+import { Popover as PopoverPrimitive } from "bits-ui";
+import Content from "./popover-content.svelte";
+import Trigger from "./popover-trigger.svelte";
+declare const Root: import("svelte").Component<import("bits-ui").PopoverRootPropsWithoutHTML, {}, "open">;
+declare const Close: import("svelte").Component<PopoverPrimitive.CloseProps, {}, "ref">;
+export { Root, Content, Trigger, Close, Root as Popover, Content as PopoverContent, Trigger as PopoverTrigger, Close as PopoverClose, };

package/dist/components/ui/popover/index.js

@@ -0,0 +1,8 @@
+import { Popover as PopoverPrimitive } from "bits-ui";
+import Content from "./popover-content.svelte";
+import Trigger from "./popover-trigger.svelte";
+const Root = PopoverPrimitive.Root;
+const Close = PopoverPrimitive.Close;
+export { Root, Content, Trigger, Close, 
+//
+Root as Popover, Content as PopoverContent, Trigger as PopoverTrigger, Close as PopoverClose, };

package/dist/components/ui/popover/popover-content.svelte

@@ -0,0 +1,29 @@
+<script lang="ts">
+	import { cn } from "../../../utils.js";
+	import { Popover as PopoverPrimitive } from "bits-ui";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		sideOffset = 4,
+		align = "center",
+		portalProps,
+		...restProps
+	}: PopoverPrimitive.ContentProps & {
+		portalProps?: PopoverPrimitive.PortalProps;
+	} = $props();
+</script>
+
+<PopoverPrimitive.Portal {...portalProps}>
+	<PopoverPrimitive.Content
+		bind:ref
+		data-slot="popover-content"
+		{sideOffset}
+		{align}
+		class={cn(
+			"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-(--bits-popover-content-transform-origin) outline-hidden z-50 w-72 rounded-md border p-4 shadow-md",
+			className
+		)}
+		{...restProps}
+	/>
+</PopoverPrimitive.Portal>

package/dist/components/ui/popover/popover-content.svelte.d.ts

@@ -0,0 +1,7 @@
+import { Popover as PopoverPrimitive } from "bits-ui";
+type $$ComponentProps = PopoverPrimitive.ContentProps & {
+    portalProps?: PopoverPrimitive.PortalProps;
+};
+declare const PopoverContent: import("svelte").Component<$$ComponentProps, {}, "ref">;
+type PopoverContent = ReturnType<typeof PopoverContent>;
+export default PopoverContent;

package/dist/components/ui/popover/popover-trigger.svelte

@@ -0,0 +1,17 @@
+<script lang="ts">
+	import { cn } from "../../../utils.js";
+	import { Popover as PopoverPrimitive } from "bits-ui";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		...restProps
+	}: PopoverPrimitive.TriggerProps = $props();
+</script>
+
+<PopoverPrimitive.Trigger
+	bind:ref
+	data-slot="popover-trigger"
+	class={cn("", className)}
+	{...restProps}
+/>

package/dist/components/ui/popover/popover-trigger.svelte.d.ts

@@ -0,0 +1,4 @@
+import { Popover as PopoverPrimitive } from "bits-ui";
+declare const PopoverTrigger: import("svelte").Component<PopoverPrimitive.TriggerProps, {}, "ref">;
+type PopoverTrigger = ReturnType<typeof PopoverTrigger>;
+export default PopoverTrigger;

package/dist/components/ui/sidebar/sidebar-input.svelte.d.ts

@@ -2,7 +2,7 @@ declare const SidebarInput: import("svelte").Component<(Omit<import("svelte/elem
     type: "file";
     files?: FileList;
 } | {
-    type?: "number" | "image" | "text" | "date" | "radio" | "hidden" | "color" | "submit" | "reset" | "button" | (string & {}) | "search" | "checkbox" | "tel" | "url" | "email" | "time" | "datetime-local" | "month" | "password" | "range" | "week";
+    type?: "number" | "image" | "text" | "date" | "radio" | "url" | "hidden" | "color" | "submit" | "reset" | "button" | (string & {}) | "search" | "checkbox" | "tel" | "email" | "time" | "datetime-local" | "month" | "password" | "range" | "week";
     files?: undefined;
 })) & {
     ref?: HTMLElement | null | undefined;

package/dist/core/fields/fieldSchemaToTs.js

@@ -80,6 +80,22 @@ export function generateZodSchemaFromField(field, languages, options = {
                 schema = schema.min(1);
             return schema;
         }
+        case 'seo': {
+            return z.object({
+                slug: z.object(Object.fromEntries(languages.map((lang) => [lang, z.string()]))),
+                title: z.object(Object.fromEntries(languages.map((lang) => [lang, z.string()]))),
+                description: z.object(Object.fromEntries(languages.map((lang) => [lang, z.string()])))
+            });
+        }
+        case 'url': {
+            const urlWithoutRelationSchema = z.object({
+                url: z.object(Object.fromEntries(languages.map((lang) => [lang, z.string()])))
+            });
+            const urlWithRelationSchema = z.object({
+                id: z.string().uuid()
+            });
+            return z.union([urlWithoutRelationSchema, urlWithRelationSchema]);
+        }
         default:
             return z.any();
     }

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

@@ -1,10 +1,14 @@
 import type { Entry, RawEntry } from '../../../../types/entries.js';
-import type { GetEntryOptions } from '../../../../types/adapters.js';
+import type { GetEntriesOptions, GetEntryOptions } from '../../../../types/adapters.js';
 export declare const getRawEntryById: (id: string) => Promise<RawEntry>;
 export declare const getRawEntry: (options: GetEntryOptions) => Promise<RawEntry | null>;
+export declare const getRawEntries: (options: GetEntriesOptions) => Promise<RawEntry[]>;
 export declare const getEntry: (data: GetEntryOptions, options?: {
     language?: string;
 }) => Promise<Entry | null>;
+export declare const getEntries: (data: GetEntriesOptions, options?: {
+    language?: string;
+}) => Promise<Entry[]>;
 export declare const getRawCollectionEntries: (slug: string) => Promise<RawEntry[]>;
 export declare const getCollectionEntries: (slug: string, options?: {
     language?: string;

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

@@ -61,6 +61,9 @@ export const getRawEntryById = async (id) => {
 export const getRawEntry = async (options) => {
     return await getCMS().databaseAdapter.getEntry(options);
 };
+export const getRawEntries = async (options) => {
+    return await getCMS().databaseAdapter.getEntries(options);
+};
 export const getEntry = async (data, options = {}) => {
     const language = options.language || getCMS().languages[0];
     // Transform dataValues strings to localized objects if provided
@@ -87,6 +90,42 @@ export const getEntry = async (data, options = {}) => {
         populated: true
     };
 };
+export const getEntries = async (data, options = {}) => {
+    const language = options.language || getCMS().languages[0];
+    // Transform dataValues strings to localized objects if provided
+    let transformedData = data;
+    if (data.data?.dataValues) {
+        const localizedDataValues = transformDataValuesToLocalized(data.data.dataValues, language);
+        transformedData = {
+            ...data,
+            data: {
+                ...data.data,
+                dataValues: localizedDataValues
+            }
+        };
+    }
+    if (data.data?.dataLike) {
+        // Transform dataLike strings to localized objects if provided
+        const localizedDataLike = transformDataValuesToLocalized(data.data.dataLike, language);
+        transformedData = {
+            ...transformedData,
+            data: {
+                ...transformedData.data,
+                dataLike: localizedDataLike
+            }
+        };
+    }
+    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),
+            populated: true
+        };
+    }));
+};
 export const getRawCollectionEntries = async (slug) => {
     return getCMS().databaseAdapter.getEntries({
         data: {

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

@@ -38,6 +38,14 @@ function getFieldTypeAsString(field) {
 			)[]`;
         case 'slug':
             return 'string';
+        case 'seo':
+            return `{
+				slug: string;
+				title: string;
+				description: string;
+			}`;
+        case 'url':
+            return 'string';
         default:
             return 'any';
     }

package/dist/db-postgres/index.js

@@ -2,21 +2,18 @@ import { drizzle } from 'drizzle-orm/postgres-js';
 import postgres from 'postgres';
 import * as schema from './schema/index.js';
 import { eq, and, inArray, getTableColumns, sql, isNull } from 'drizzle-orm';
-// Helper function to build JSON path conditions
+// Helper function to build JSON path conditions (exact match)
 function buildJsonConditions(dataValue) {
     const conditions = [];
     function processValue(value, path = []) {
-        if (value === null || value === undefined) {
+        if (value === null || value === undefined)
             return;
-        }
         if (typeof value === 'object' && !Array.isArray(value) && value !== null) {
-            // Recursively process nested objects
             Object.entries(value).forEach(([key, nestedValue]) => {
                 processValue(nestedValue, [...path, key]);
             });
         }
         else {
-            // Create condition for primitive values
             const jsonPath = path.join(',');
             const condition = sql `${schema.entriesTable.data}#>>'{${sql.raw(jsonPath)}}' = ${String(value)}`;
             conditions.push(condition);
@@ -27,6 +24,28 @@ function buildJsonConditions(dataValue) {
     });
     return conditions;
 }
+// Helper function to build JSON path conditions (LIKE match)
+function buildJsonLikeConditions(dataLike) {
+    const conditions = [];
+    function processValue(value, path = []) {
+        if (value === null || value === undefined)
+            return;
+        if (typeof value === 'object' && !Array.isArray(value) && value !== null) {
+            Object.entries(value).forEach(([key, nestedValue]) => {
+                processValue(nestedValue, [...path, key]);
+            });
+        }
+        else {
+            const jsonPath = path.join(',');
+            const condition = sql `${schema.entriesTable.data}#>>'{${sql.raw(jsonPath)}}' LIKE ${`%${String(value)}%`}`;
+            conditions.push(condition);
+        }
+    }
+    Object.entries(dataLike).forEach(([key, value]) => {
+        processValue(value, [key]);
+    });
+    return conditions;
+}
 export function pg(config) {
     const client = postgres(config.databaseUrl);
     const db = drizzle(client, { schema });
@@ -85,11 +104,25 @@ export function pg(config) {
             })
                 .from(schema.entriesTable);
             if (options.data) {
-                query.where(and(options.data.type ? eq(schema.entriesTable.type, options.data.type) : undefined, options.data.slug ? eq(schema.entriesTable.slug, options.data.slug) : undefined, options.data.ids ? inArray(schema.entriesTable.id, options.data.ids) : undefined, options.data.status ? eq(schema.entriesTable.status, options.data.status) : undefined, 
-                // Do not include deleted entries
-                isNull(schema.entriesTable.deletedAt)));
-                if (options.data.ids) {
-                    query.where(inArray(schema.entriesTable.id, options.data.ids));
+                const baseConditions = [
+                    options.data.type ? eq(schema.entriesTable.type, options.data.type) : undefined,
+                    options.data.slug ? eq(schema.entriesTable.slug, options.data.slug) : undefined,
+                    options.data.ids ? inArray(schema.entriesTable.id, options.data.ids) : undefined,
+                    options.data.status ? eq(schema.entriesTable.status, options.data.status) : undefined,
+                    // Do not include deleted entries
+                    isNull(schema.entriesTable.deletedAt)
+                ].filter(Boolean);
+                // Add JSON data conditions if dataValue is provided
+                const jsonConditions = options.data.dataValues
+                    ? buildJsonConditions(options.data.dataValues)
+                    : [];
+                // Add JSON LIKE conditions if dataLike is provided
+                const jsonLikeConditions = options.data.dataLike
+                    ? buildJsonLikeConditions(options.data.dataLike)
+                    : [];
+                const allConditions = [...baseConditions, ...jsonConditions, ...jsonLikeConditions];
+                if (allConditions.length > 0) {
+                    query.where(and(...allConditions));
                 }
             }
             return (await query);

package/dist/types/adapters.d.ts

@@ -43,6 +43,8 @@ export interface GetEntriesOptions {
         slug?: string;
         status?: 'draft' | 'published' | 'archived';
         type?: 'collection' | 'singleton';
+        dataValues?: Record<string, unknown>;
+        dataLike?: Record<string, unknown>;
     };
 }
 export type GetEntries = (data: GetEntriesOptions) => Promise<RawEntry[]>;
@@ -53,6 +55,7 @@ export interface GetEntryOptions {
         status?: 'draft' | 'published' | 'archived';
         type?: 'collection' | 'singleton';
         dataValues?: Record<string, unknown>;
+        dataLike?: Record<string, unknown>;
     };
 }
 export type GetEntry = (data: GetEntryOptions) => Promise<RawEntry | null>;

package/dist/types/fields.d.ts

@@ -1,4 +1,4 @@
-export type FieldType = 'text' | 'richtext' | 'number' | 'boolean' | 'date' | 'datetime' | 'file' | 'image' | 'select' | 'radio' | 'checkboxes' | 'relation' | 'object' | 'array' | 'slug';
+export type FieldType = 'text' | 'richtext' | 'number' | 'boolean' | 'date' | 'datetime' | 'file' | 'image' | 'select' | 'radio' | 'checkboxes' | 'relation' | 'object' | 'array' | 'slug' | 'seo' | 'url';
 export interface BaseField {
     slug: string;
     label?: string;
@@ -117,4 +117,21 @@ export interface SlugField extends BaseField {
     pattern?: string;
     defaultValue?: string;
 }
-export type Field = TextField | RichtextField | NumberField | BooleanField | DateField | DateTimeField | FileField | ImageField | SelectField | RadioField | CheckboxesField | RelationField | ObjectField | ArrayField | SlugField;
+export interface SeoField extends BaseField {
+    type: 'seo';
+}
+export interface SeoFieldData {
+    slug: Record<string, string>;
+    title: Record<string, string>;
+    description: Record<string, string>;
+}
+export interface UrlField extends BaseField {
+    type: 'url';
+    placeholder?: string;
+}
+export type UrlFieldData = {
+    id: string;
+} | {
+    url: Record<string, string>;
+};
+export type Field = TextField | RichtextField | NumberField | BooleanField | DateField | DateTimeField | FileField | ImageField | SelectField | RadioField | CheckboxesField | RelationField | ObjectField | ArrayField | SlugField | SeoField | UrlField;

package/package.json

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