includio-cms 0.7.2 → 0.13.0

package/dist/cms/runtime/remote.js

@@ -1,7 +1,7 @@
 // This file is auto-generated. Do not edit directly.
 import { command } from '$app/server';
 import { submitForm } from './api';
-import { contactFormSchema } from './schemas';
-export const submitContactCommand = command(contactFormSchema, async (data) => {
+import { ContactFormSchema } from './schemas';
+export const submitContactCommand = command(ContactFormSchema, async (data) => {
     await submitForm('contact', data);
 });

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

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-export declare const contactFormSchema: z.ZodObject<{
+export declare const ContactFormSchema: z.ZodObject<{
     name: z.ZodString;
     email: z.ZodString;
     phone: z.ZodString;

package/dist/cms/runtime/schemas.js

@@ -1,6 +1,6 @@
 // This file is auto-generated. Do not edit directly.
 import { z } from 'zod';
-export const contactFormSchema = z.object({
+export const ContactFormSchema = z.object({
     "name": z.string().min(1),
     "email": z.string().min(1).email(),
     "phone": z.string(),

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

@@ -1,135 +1,123 @@
-import type { ImageFieldData, StructuredContentDoc } from 'includio-cms/types';
+import type { FlatImageFieldData, FlatVideoFieldData, StructuredContentDoc } from 'includio-cms/types';
 export type SingleSlug = "settings" | "image-showcase";
 export interface Settings {
-    id: string;
-    slug: string;
-    data: {
-        siteName: string;
-        description?: string;
-        logo?: ImageFieldData | null;
-        favicon?: ImageFieldData | null;
-        socialLinks?: ({
-            slug: 'socialLink';
-            data: {
-                platform: string;
-                url: {
-                    url: string;
-                };
-            };
-        })[];
-        footerText?: string;
-        analyticsId?: string;
-        customHeadCode?: string;
-    };
-    publishedAt: Date | null;
+    _id: string;
+    _slug: string;
+    _type: string;
+    _publishedAt: Date | null;
+    siteName: string;
+    description?: string;
+    logo?: FlatImageFieldData | FlatVideoFieldData | null;
+    favicon?: FlatImageFieldData | FlatVideoFieldData | null;
+    socialLinks?: ({
+        _slug: 'socialLink';
+        platform: string;
+        url: {
+            url: string;
+        };
+    })[];
+    footerText?: string;
+    analyticsId?: string;
+    customHeadCode?: string;
 }
 export interface ImageShowcase {
-    id: string;
-    slug: string;
-    data: {
-        photo?: ImageFieldData | null;
-    };
-    publishedAt: Date | null;
+    _id: string;
+    _slug: string;
+    _type: string;
+    _publishedAt: Date | null;
+    photo?: FlatImageFieldData | FlatVideoFieldData | null;
 }
 export type SingleEntryMap = {
     settings: Settings;
+    'image-showcase': ImageShowcase;
 };
 export type CollectionSlug = "blog-post" | "project" | "array-test";
 export interface BlogPost {
-    id: string;
-    slug: string;
-    data: {
+    _id: string;
+    _slug: string;
+    _type: string;
+    _publishedAt: Date | null;
+    title: string;
+    slug?: string;
+    cover?: FlatImageFieldData | FlatVideoFieldData | null;
+    rating: number;
+    category?: string;
+    publishedAt?: string;
+    thumbnail?: FlatImageFieldData | FlatVideoFieldData | null;
+    content?: StructuredContentDoc;
+    tags?: string[];
+    seo: {
+        slug: string;
+        canonicalUrl?: string;
         title: string;
-        slug?: string;
-        cover?: ImageFieldData | null;
-        rating: number;
-        category?: string;
-        publishedAt?: string;
-        thumbnail?: ImageFieldData | null;
-        content?: StructuredContentDoc;
-        tags?: string[];
-        seo: {
-            slug: string;
-            canonicalUrl?: string;
-            title: string;
-            description?: string;
-            ogImage?: string;
-            keywords?: string;
-            customCode?: string;
-        };
-        test?: ({
-            slug: 'test-object';
-            data: {
-                dupa: string;
-            };
-        })[];
+        description?: string;
+        ogImage?: string;
+        keywords?: string;
+        customCode?: string;
     };
-    publishedAt: Date | null;
+    test?: ({
+        _slug: 'test-object';
+        dupa: string;
+    })[];
 }
 export interface Project {
-    id: string;
-    slug: string;
-    data: {
+    _id: string;
+    _slug: string;
+    _type: string;
+    _publishedAt: Date | null;
+    title: string;
+    description?: string;
+    status?: string;
+    startDate?: string;
+    url?: {
+        url: string;
+    };
+    image?: FlatImageFieldData | FlatVideoFieldData | null;
+    techStack?: ({
+        _slug: 'tech';
+        name: string;
+    })[];
+    seo: {
+        slug: string;
+        canonicalUrl?: string;
         title: string;
         description?: string;
-        status?: string;
-        startDate?: string;
-        url?: {
-            url: string;
-        };
-        image?: ImageFieldData | null;
-        techStack?: ({
-            slug: 'tech';
-            data: {
-                name: string;
-            };
-        })[];
-        seo: {
-            slug: string;
-            canonicalUrl?: string;
-            title: string;
-            description?: string;
-            ogImage?: string;
-            keywords?: string;
-            customCode?: string;
-        };
+        ogImage?: string;
+        keywords?: string;
+        customCode?: string;
     };
-    publishedAt: Date | null;
 }
 export interface ArrayTest {
-    id: string;
-    slug: string;
-    data: {
-        name: string;
-        tags?: string[];
-        localizedTags?: Record<string, string>[];
-        scores?: number[];
-        links?: UrlFieldData[];
-        unlimited?: string[];
-        content?: ({
-            slug: 'text-block';
-            data: {
-                heading: string;
-                body?: string;
-            };
-        } | {
-            slug: 'image-block';
-            data: {
-                image: ImageFieldData;
-                caption?: string;
-            };
-        })[];
-        highlights?: ({
-            slug: 'highlight';
-            data: {
-                title: string;
-                value?: number;
-            };
-        })[];
-    };
-    publishedAt: Date | null;
+    _id: string;
+    _slug: string;
+    _type: string;
+    _publishedAt: Date | null;
+    name: string;
+    tags?: string[];
+    localizedTags?: Record<string, string>[];
+    scores?: number[];
+    links?: UrlFieldData[];
+    unlimited?: string[];
+    content?: ({
+        _slug: 'text-block';
+        heading: string;
+        body?: StructuredContentDoc;
+    } | {
+        _slug: 'image-block';
+        image: FlatImageFieldData | FlatVideoFieldData;
+        caption?: string;
+    })[];
+    highlights?: ({
+        _slug: 'highlight';
+        title: string;
+        value?: number;
+    })[];
 }
-export type CollectionEntryMap = {};
+export type CollectionEntryMap = {
+    'blog-post': BlogPost;
+    project: Project;
+    'array-test': ArrayTest;
+};
 export type FormSlug = "contact";
 export interface Contact {
     data: {
@@ -145,4 +133,22 @@ export interface Contact {
 export type FormEntryMap = {
     contact: Contact;
 };
+export type CalloutBlockData = {
+    title?: string;
+    style?: string;
+};
+export type CtaBlockData = {
+    buttonText?: string;
+    url?: string;
+    variant?: string;
+};
+export type NoteBlockData = {
+    text?: string;
+    important?: boolean;
+};
+export type BlogPostContentBlockDataMap = {
+    callout: CalloutBlockData;
+    cta: CtaBlockData;
+    note: NoteBlockData;
+};
 export type SiteLanguage = "en" | "pl";

package/dist/cms/runtime/types.js

@@ -1,15 +1,3 @@
 // This file is auto-generated. Do not edit directly.
 ;
-;
-image - showcase;
-ImageShowcase;
-;
-;
-;
-blog - post;
-BlogPost;
-project: Project;
-array - test;
-ArrayTest;
-;
 export {};

package/dist/core/cms.d.ts

@@ -1,6 +1,6 @@
 import type { DatabaseAdapter } from '../types/adapters/db.js';
 import type { FilesAdapter } from '../types/adapters/files.js';
-import type { ApiKeyConfig, AuthConfig, CMSConfig, ICMS, MediaConfig } from '../types/cms.js';
+import type { ApiKeyConfig, AuthConfig, CMSConfig, ICMS, MediaConfig, TypographyConfig } from '../types/cms.js';
 import type { CollectionConfigWithType } from '../types/collections.js';
 import type { Language } from '../types/languages.js';
 import type { SingleConfigWithType } from '../types/singles.js';
@@ -22,10 +22,12 @@ export declare class CMS implements ICMS {
     forms: Record<string, FormConfig>;
     languages: Language[];
     mediaConfig: MediaConfig;
+    typographyConfig: TypographyConfig;
     plugins: PluginConfig[];
     customFields: Map<string, CustomFieldDefinition>;
     apiKeys: ApiKeyConfig[];
     constructor(config: CMSConfig);
+    private validateFieldSlugs;
     get auth(): ReturnType<typeof betterAuth>;
     getBySlug(slug: string): CollectionConfigWithType | SingleConfigWithType;
     getFormBySlug(slug: string): FormConfig;

package/dist/core/cms.js

@@ -17,6 +17,7 @@ export class CMS {
     forms;
     languages;
     mediaConfig;
+    typographyConfig;
     plugins = [];
     customFields = new Map();
     apiKeys = [];
@@ -28,6 +29,7 @@ export class CMS {
         this.authConfig = config.auth ?? null;
         this.aiAdapter = config.ai || null;
         this.mediaConfig = config.media || {};
+        this.typographyConfig = config.typography || {};
         this.collections = {};
         this.singles = {};
         this.forms = {};
@@ -61,8 +63,36 @@ export class CMS {
                 }
             }
         }
+        this.validateFieldSlugs();
         setSchemaGetCMS(() => this);
     }
+    validateFieldSlugs() {
+        const validateFields = (fields, context) => {
+            for (const field of fields) {
+                if (field.slug.startsWith('_')) {
+                    throw new Error(`Field slug "${field.slug}" in ${context} cannot start with "_" (reserved for meta fields)`);
+                }
+                if (field.type === 'object' || field.type === 'blocks') {
+                    const subFields = field.type === 'object' ? field.fields : field.of.flatMap((o) => o.fields);
+                    validateFields(subFields, context);
+                }
+                if (field.type === 'content' && field.inlineBlocks) {
+                    for (const block of field.inlineBlocks) {
+                        if (block.slug.startsWith('_')) {
+                            throw new Error(`Inline block slug "${block.slug}" in ${context} cannot start with "_" (reserved for meta fields)`);
+                        }
+                        validateFields(block.fields, `${context} > inline block "${block.slug}"`);
+                    }
+                }
+            }
+        };
+        for (const col of Object.values(this.collections)) {
+            validateFields(col.fields, `collection "${col.slug}"`);
+        }
+        for (const single of Object.values(this.singles)) {
+            validateFields(single.fields, `single "${single.slug}"`);
+        }
+    }
     get auth() {
         if (!this._betterAuth) {
             if (!this.authConfig) {

package/dist/core/fields/fieldSchemaToTs.js

@@ -42,14 +42,6 @@ export function generateZodSchemaFromField(field, languages, options = {
                 return schema;
             return z.object(Object.fromEntries(languages.map((lang) => [lang, schema])));
         }
-        case 'richtext': {
-            let schema = z.string();
-            if (field.required)
-                schema = schema.min(1, { message: 'Pole wymagane' });
-            if (!localized)
-                return schema;
-            return z.object(Object.fromEntries(languages.map((lang) => [lang, schema])));
-        }
         case 'content': {
             const markSchema = z.object({
                 type: z.string(),
@@ -140,7 +132,7 @@ export function generateZodSchemaFromField(field, languages, options = {
         case 'datetime':
             return z.string().datetime();
         case 'file':
-        case 'image': {
+        case 'media': {
             const singleSchema = field.required
                 ? z.string().uuid({ message: 'Pole wymagane' })
                 : z.string();
@@ -150,7 +142,10 @@ export function generateZodSchemaFromField(field, languages, options = {
         case 'radio': {
             const enumValues = field.options.map((o) => o.value);
             const enumObject = z.enum(enumValues);
-            return field.type === 'select' && field.multiple ? z.array(enumObject) : enumObject;
+            if (field.type === 'select' && field.multiple) {
+                return z.array(enumObject);
+            }
+            return field.required ? enumObject : enumObject.or(z.literal(''));
         }
         case 'checkboxes': {
             const checkValues = field.options.map((o) => JSON.stringify(o.value)).join(', ');
@@ -168,10 +163,9 @@ export function generateZodSchemaFromField(field, languages, options = {
                 parentRequired: field.required,
                 localized: options.localized
             });
-            const finalData = !field.required ? data.partial().optional() : data;
-            return z.object({
-                slug: z.literal(field.slug),
-                data: finalData
+            const base = !field.required ? data.partial() : data;
+            return base.extend({
+                _slug: z.literal(field.slug)
             });
         }
         case 'blocks': {
@@ -180,7 +174,7 @@ export function generateZodSchemaFromField(field, languages, options = {
                 localized: options.localized
             }));
             const itemSchema = schemas.length > 1
-                ? z.discriminatedUnion('slug', schemas)
+                ? z.discriminatedUnion('_slug', schemas)
                 : schemas[0];
             let schema = z.array(itemSchema);
             if (field.minItems !== undefined &&

package/dist/core/fields/formFieldSchemaToTs.js

@@ -38,6 +38,13 @@ export function generateZodSchemaFromFormField(field) {
             const values = field.options.map((o) => o.value);
             return z.enum(values);
         }
+        case 'file': {
+            const base = z.string();
+            if (field.required) {
+                return base.min(1, errorMsg || undefined);
+            }
+            return base.optional().default('');
+        }
         default:
             return z.any();
     }

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

@@ -11,13 +11,16 @@ export const createEntrySchema = z.object({
 });
 export const createEntry = async (data) => {
     const { user } = requireAuth();
-    const newDbEntry = await getCMS().databaseAdapter.createEntry({
+    const cms = getCMS();
+    const newDbEntry = await cms.databaseAdapter.createEntry({
         type: data.type,
         slug: data.slug
     });
-    // Create an initial draft version for the new entry
-    await getCMS().databaseAdapter.createEntryVersion({
+    // Create an initial draft version for default language only
+    const defaultLang = cms.languages[0];
+    await cms.databaseAdapter.createEntryVersion({
         entryId: newDbEntry.id,
+        lang: defaultLang,
         data: {},
         createdBy: user.id
     });
@@ -33,7 +36,10 @@ export const createEntryVersion = async (data, options) => {
         const entry = await getDbEntryOrThrow({ id: data.entryId });
         const config = getCMS().getBySlug(entry.slug);
         const languages = getCMS().languages;
-        const schema = generateZodSchemaFromFields(getFieldsFromConfig(config), languages);
+        // Validate with localized: false — data is flat single-language
+        const schema = generateZodSchemaFromFields(getFieldsFromConfig(config), languages, {
+            localized: false
+        });
         const parsedData = schema.safeParse(data.data);
         if (!parsedData.success) {
             throw Error('Invalid data: ' + JSON.stringify(parsedData.error.flatten()));

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

@@ -8,6 +8,7 @@ export declare const getRawEntries: (options: GetRawEntriesOptions) => Promise<R
 export declare const getRawEntry: (options: getRawEntryOptions) => Promise<RawEntry | null>;
 export declare const getRawEntryOrThrow: (options: getRawEntryOptions) => Promise<RawEntry>;
 export declare const getEntries: (options?: GetEntriesOptions) => Promise<Entry[]>;
+export declare const countEntries: (options: Omit<GetEntriesOptions, "limit" | "offset" | "orderBy">) => Promise<number>;
 export declare const getEntry: (options?: GetEntryOptions) => Promise<Entry | null>;
 export declare const getEntryOrThrow: (options?: GetEntryOptions) => Promise<Entry>;
 export declare const getEntryLabels: (options: {