includio-cms 0.24.1 → 0.26.0

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

@@ -1,50 +1,21 @@
 import { getCMS } from '../../cms.js';
-const DEFAULT_SLUG_PATH = 'seo.slug';
-/**
- * Get the dot-path to the slug field for a given collection/single slug.
- * Falls back to 'seo.slug' if no slugField is configured.
- */
+import { getSlugFromEntryData, resolveSlugPath, applyPathTemplate } from '../../fields/slugPath.js';
+export { getSlugFromEntryData } from '../../fields/slugPath.js';
+/** Get dot-path to slug field for a collection. Falls back to 'seo.slug'. */
 export function getEntrySlugPath(configSlug) {
     try {
-        const config = getCMS().getBySlug(configSlug);
-        return config.slugField || DEFAULT_SLUG_PATH;
+        return resolveSlugPath(getCMS().getBySlug(configSlug).slugField);
     }
     catch {
-        return DEFAULT_SLUG_PATH;
+        return resolveSlugPath(undefined);
     }
 }
-/**
- * Traverse a dot-path in entry data and return the slug value.
- * Handles both plain strings and localized objects { lang: string }.
- */
-export function getSlugFromEntryData(data, slugPath, language) {
-    const parts = slugPath.split('.');
-    let current = data;
-    for (const part of parts) {
-        if (current == null || typeof current !== 'object')
-            return undefined;
-        current = current[part];
-    }
-    if (typeof current === 'string')
-        return current;
-    if (language && current != null && typeof current === 'object') {
-        return current[language];
-    }
-    return undefined;
-}
-/**
- * Build full entry path using collection's pathTemplate.
- * If no template configured, returns the raw slug.
- */
+/** Build full entry path using collection's pathTemplate. */
 export function getEntryPath(configSlug, slug) {
     try {
-        const config = getCMS().getBySlug(configSlug);
-        if (config.pathTemplate) {
-            return config.pathTemplate.replace('{slug}', slug);
-        }
+        return applyPathTemplate(getCMS().getBySlug(configSlug).pathTemplate, slug);
     }
     catch {
-        // Config not found — fall through
+        return applyPathTemplate(undefined, slug);
     }
-    return slug;
 }

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

@@ -1,4 +1,5 @@
-import { toPascalCase } from './utils.js';
+import { toPascalCase, quoteKey } from './utils.js';
+import { buildSeoTsType } from '../../fields/seoFieldDescriptor.js';
 let _customFields = new Map();
 function isGuaranteed(f) {
     return !!(f.required || f.type === 'seo' || f.defaultValue !== undefined);
@@ -43,7 +44,7 @@ function getFieldTypeAsString(field) {
         case 'object':
             return `{
 				slug: '${field.slug}';
-				data: {${field.fields.map((f) => `  ${f.slug}${isGuaranteed(f) ? '' : '?'}: ${getFieldTypeAsString(f)}`).join(';\n')}};
+				data: {${field.fields.map((f) => `  ${quoteKey(f.slug)}${isGuaranteed(f) ? '' : '?'}: ${getFieldTypeAsString(f)}`).join(';\n')}};
 			}`;
         case 'blocks':
             return `
@@ -52,7 +53,7 @@ function getFieldTypeAsString(field) {
                 .map((f) => `
 				{
 					slug: '${f.slug}';
-					data: {${f.fields.map((f) => `  ${f.slug}${isGuaranteed(f) ? '' : '?'}: ${getFieldTypeAsString(f)}`).join(';\n')}};
+					data: {${f.fields.map((f) => `  ${quoteKey(f.slug)}${isGuaranteed(f) ? '' : '?'}: ${getFieldTypeAsString(f)}`).join(';\n')}};
 				}
 			`)
                 .join(' | ')}
@@ -69,15 +70,7 @@ function getFieldTypeAsString(field) {
         case 'slug':
             return 'string';
         case 'seo':
-            return `{
-				slug: string;
-				canonicalUrl?: string;
-				title: string;
-				description?: string;
-				ogImage?: string;
-				keywords?: string;
-				customCode?: string;
-			}`;
+            return buildSeoTsType();
         case 'shop':
             return `{
 				basePrice: number;
@@ -110,12 +103,12 @@ function getFieldTypeAsString(field) {
 }
 export function generateTsTypeFromFields(fields) {
     return `{
-    ${fields.map((f) => `  ${f.slug}${isGuaranteed(f) ? '' : '?'}: ${getFieldTypeAsString(f)}`).join(';\n')};
+    ${fields.map((f) => `  ${quoteKey(f.slug)}${isGuaranteed(f) ? '' : '?'}: ${getFieldTypeAsString(f)}`).join(';\n')};
   }`;
 }
 export function generateFlatTsTypeFromFields(fields) {
     return `{
-    ${fields.map((f) => `  ${f.slug}${isGuaranteed(f) ? '' : '?'}: ${getFlatFieldTypeAsString(f)}`).join(';\n')};
+    ${fields.map((f) => `  ${quoteKey(f.slug)}${isGuaranteed(f) ? '' : '?'}: ${getFlatFieldTypeAsString(f)}`).join(';\n')};
   }`;
 }
 function getFlatFieldTypeAsString(field) {
@@ -133,7 +126,7 @@ function getFlatFieldTypeAsString(field) {
         case 'object':
             return `{
 				_slug: '${field.slug}';
-				${field.fields.map((f) => `${f.slug}${isGuaranteed(f) ? '' : '?'}: ${getFlatFieldTypeAsString(f)}`).join(';\n')};
+				${field.fields.map((f) => `${quoteKey(f.slug)}${isGuaranteed(f) ? '' : '?'}: ${getFlatFieldTypeAsString(f)}`).join(';\n')};
 			}`;
         case 'blocks':
             return `
@@ -142,7 +135,7 @@ function getFlatFieldTypeAsString(field) {
                 .map((f) => `
 				{
 					_slug: '${f.slug}';
-					${f.fields.map((f) => `${f.slug}${isGuaranteed(f) ? '' : '?'}: ${getFlatFieldTypeAsString(f)}`).join(';\n')};
+					${f.fields.map((f) => `${quoteKey(f.slug)}${isGuaranteed(f) ? '' : '?'}: ${getFlatFieldTypeAsString(f)}`).join(';\n')};
 				}
 			`)
                 .join(' | ')}
@@ -153,6 +146,6 @@ function getFlatFieldTypeAsString(field) {
 }
 export function generateInlineBlockTypeString(block) {
     return `{
-    ${block.fields.map((f) => `  ${f.slug}${isGuaranteed(f) ? '' : '?'}: ${getFlatFieldTypeAsString(f)}`).join(';\n')};
+    ${block.fields.map((f) => `  ${quoteKey(f.slug)}${isGuaranteed(f) ? '' : '?'}: ${getFlatFieldTypeAsString(f)}`).join(';\n')};
   }`;
 }

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

@@ -1,3 +1,4 @@
+import { quoteKey } from './utils.js';
 function getFormFieldTypeAsString(field) {
     switch (field.type) {
         case 'text':
@@ -15,6 +16,6 @@ function getFormFieldTypeAsString(field) {
 }
 export function generateTsTypeFromFormFields(fields) {
     return `{
-    ${fields.map((f) => `  ${f.slug}: ${getFormFieldTypeAsString(f)}`).join(';\n')};
+    ${fields.map((f) => `  ${quoteKey(f.slug)}: ${getFormFieldTypeAsString(f)}`).join(';\n')};
   }`;
 }

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

@@ -3,7 +3,7 @@ import { join } from 'node:path';
 import { generateTsTypeFromFields, generateFlatTsTypeFromFields, generateInlineBlockTypeString, setGeneratorCustomFields } from './fields.js';
 import { generateTsTypeFromFormFields } from './formFields.js';
 import { generateZodSchemaStringFromFormFieldsAsString } from './formFieldSchemaToString.js';
-import { toPascalCase } from './utils.js';
+import { toPascalCase, quoteKey } from './utils.js';
 import { getFieldsFromConfig } from '../../fields/layoutUtils.js';
 function createCmsRuntimeDir() {
     const cmsDir = join(process.cwd(), 'src/lib/cms/runtime');
@@ -54,7 +54,7 @@ function generateTypesStringForRecords(type, records) {
 		export type ${recordTypeString}EntryMap = {
 			${records
         .map((single) => {
-        const key = single.slug.includes('-') ? `'${single.slug}'` : single.slug;
+        const key = quoteKey(single.slug);
         return `${key}: ${toPascalCase(single.slug)}`;
     })
         .join(';\n')}
@@ -82,7 +82,7 @@ function generateTypesStringForForms(records) {
 		export type ${recordTypeString}EntryMap = {
 			${records
         .map((single) => {
-        const key = single.slug.includes('-') ? `'${single.slug}'` : single.slug;
+        const key = quoteKey(single.slug);
         return `${key}: ${toPascalCase(single.slug)}`;
     })
         .join(';\n')}
@@ -163,7 +163,7 @@ function generateTypes(config) {
                     const mapName = toPascalCase(record.slug) + toPascalCase(field.slug) + 'BlockDataMap';
                     code += `\nexport type ${mapName} = {\n`;
                     for (const block of cf.inlineBlocks) {
-                        const key = block.slug.includes('-') ? `'${block.slug}'` : block.slug;
+                        const key = quoteKey(block.slug);
                         code += `  ${key}: ${toPascalCase(block.slug)}BlockData;\n`;
                     }
                     code += `};\n`;

package/dist/core/server/generator/utils.d.ts

@@ -1 +1,2 @@
 export declare function toPascalCase(slug: string): string;
+export declare function quoteKey(slug: string): string;

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

@@ -4,3 +4,7 @@ export function toPascalCase(slug) {
         .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
         .join('');
 }
+const JS_IDENT_RE = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
+export function quoteKey(slug) {
+    return JS_IDENT_RE.test(slug) ? slug : `'${slug}'`;
+}

package/dist/paraglide/messages/_index.d.ts

@@ -1,36 +1,3 @@
-export function hello_world(inputs: {
-    name: NonNullable<unknown>;
-}, options?: {
-    locale?: "en" | "pl";
-}): string;
-/**
-* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
-*
-* - Changing this function will be over-written by the next build.
-*
-* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
-* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
-*
-* @param {{}} inputs
-* @param {{ locale?: "en" | "pl" }} options
-* @returns {string}
-*/
-declare function login_hello(inputs?: {}, options?: {
-    locale?: "en" | "pl";
-}): string;
-/**
-* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
-*
-* - Changing this function will be over-written by the next build.
-*
-* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
-* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
-*
-* @param {{}} inputs
-* @param {{ locale?: "en" | "pl" }} options
-* @returns {string}
-*/
-declare function login_please_login(inputs?: {}, options?: {
-    locale?: "en" | "pl";
-}): string;
-export { login_hello as login.hello, login_please_login as login.please_login };
+export * from "./hello_world.js";
+export * from "./login_hello.js";
+export * from "./login_please_login.js";

package/dist/paraglide/messages/_index.js

@@ -1,72 +1,4 @@
 /* eslint-disable */
-import { getLocale, trackMessageCall, experimentalMiddlewareLocaleSplitting, isServer } from "../runtime.js"
-import * as en from "./en.js"
-import * as pl from "./pl.js"
-/**
-* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
-*
-* - Changing this function will be over-written by the next build.
-*
-* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
-* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
-* 
-* @param {{ name: NonNullable<unknown> }} inputs
-* @param {{ locale?: "en" | "pl" }} options
-* @returns {string}
-*/
-/* @__NO_SIDE_EFFECTS__ */
-export const hello_world = (inputs, options = {}) => {
-	if (experimentalMiddlewareLocaleSplitting && isServer === false) {
-		return /** @type {any} */ (globalThis).__paraglide_ssr.hello_world(inputs) 
-	}
-	const locale = options.locale ?? getLocale()
-	trackMessageCall("hello_world", locale)
-	if (locale === "en") return en.hello_world(inputs)
-	return pl.hello_world(inputs)
-};
-/**
-* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
-*
-* - Changing this function will be over-written by the next build.
-*
-* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
-* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
-* 
-* @param {{}} inputs
-* @param {{ locale?: "en" | "pl" }} options
-* @returns {string}
-*/
-/* @__NO_SIDE_EFFECTS__ */
-const login_hello = (inputs = {}, options = {}) => {
-	if (experimentalMiddlewareLocaleSplitting && isServer === false) {
-		return /** @type {any} */ (globalThis).__paraglide_ssr.login_hello(inputs) 
-	}
-	const locale = options.locale ?? getLocale()
-	trackMessageCall("login_hello", locale)
-	if (locale === "en") return en.login_hello(inputs)
-	return pl.login_hello(inputs)
-};
-export { login_hello as "login.hello" }
-/**
-* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
-*
-* - Changing this function will be over-written by the next build.
-*
-* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
-* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
-* 
-* @param {{}} inputs
-* @param {{ locale?: "en" | "pl" }} options
-* @returns {string}
-*/
-/* @__NO_SIDE_EFFECTS__ */
-const login_please_login = (inputs = {}, options = {}) => {
-	if (experimentalMiddlewareLocaleSplitting && isServer === false) {
-		return /** @type {any} */ (globalThis).__paraglide_ssr.login_please_login(inputs) 
-	}
-	const locale = options.locale ?? getLocale()
-	trackMessageCall("login_please_login", locale)
-	if (locale === "en") return en.login_please_login(inputs)
-	return pl.login_please_login(inputs)
-};
-export { login_please_login as "login.please_login" }
+export * from './hello_world.js'
+export * from './login_hello.js'
+export * from './login_please_login.js'

package/dist/paraglide/messages/hello_world.d.ts

@@ -0,0 +1,5 @@
+export function hello_world(inputs: {
+    name: NonNullable<unknown>;
+}, options?: {
+    locale?: "en" | "pl";
+}): string;

package/dist/paraglide/messages/hello_world.js

@@ -0,0 +1,33 @@
+/* eslint-disable */
+import { getLocale, trackMessageCall, experimentalMiddlewareLocaleSplitting, isServer } from '../runtime.js';
+
+const en_hello_world = /** @type {(inputs: { name: NonNullable<unknown> }) => string} */ (i) => {
+	return `Hello, ${i.name} from en!`
+};
+
+const pl_hello_world = /** @type {(inputs: { name: NonNullable<unknown> }) => string} */ (i) => {
+	return `Hello, ${i.name} from pl!`
+};
+
+/**
+* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
+*
+* - Changing this function will be over-written by the next build.
+*
+* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
+* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
+* 
+* @param {{ name: NonNullable<unknown> }} inputs
+* @param {{ locale?: "en" | "pl" }} options
+* @returns {string}
+*/
+/* @__NO_SIDE_EFFECTS__ */
+export const hello_world = (inputs, options = {}) => {
+	if (experimentalMiddlewareLocaleSplitting && isServer === false) {
+		return /** @type {any} */ (globalThis).__paraglide_ssr.hello_world(inputs) 
+	}
+	const locale = options.locale ?? getLocale()
+	trackMessageCall("hello_world", locale)
+	if (locale === "en") return en_hello_world(inputs)
+	return pl_hello_world(inputs)
+};

package/dist/paraglide/messages/login_hello.d.ts

@@ -0,0 +1,16 @@
+export { login_hello as login.hello };
+/**
+* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
+*
+* - Changing this function will be over-written by the next build.
+*
+* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
+* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
+*
+* @param {{}} inputs
+* @param {{ locale?: "en" | "pl" }} options
+* @returns {string}
+*/
+declare function login_hello(inputs?: {}, options?: {
+    locale?: "en" | "pl";
+}): string;

package/dist/paraglide/messages/login_hello.js

@@ -0,0 +1,34 @@
+/* eslint-disable */
+import { getLocale, trackMessageCall, experimentalMiddlewareLocaleSplitting, isServer } from '../runtime.js';
+
+const en_login_hello = /** @type {(inputs: {}) => string} */ () => {
+	return `Welcome back`
+};
+
+const pl_login_hello = /** @type {(inputs: {}) => string} */ () => {
+	return `Witaj ponownie`
+};
+
+/**
+* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
+*
+* - Changing this function will be over-written by the next build.
+*
+* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
+* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
+* 
+* @param {{}} inputs
+* @param {{ locale?: "en" | "pl" }} options
+* @returns {string}
+*/
+/* @__NO_SIDE_EFFECTS__ */
+const login_hello = (inputs = {}, options = {}) => {
+	if (experimentalMiddlewareLocaleSplitting && isServer === false) {
+		return /** @type {any} */ (globalThis).__paraglide_ssr.login_hello(inputs) 
+	}
+	const locale = options.locale ?? getLocale()
+	trackMessageCall("login_hello", locale)
+	if (locale === "en") return en_login_hello(inputs)
+	return pl_login_hello(inputs)
+};
+export { login_hello as "login.hello" }

package/dist/paraglide/messages/login_please_login.d.ts

@@ -0,0 +1,16 @@
+export { login_please_login as login.please_login };
+/**
+* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
+*
+* - Changing this function will be over-written by the next build.
+*
+* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
+* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
+*
+* @param {{}} inputs
+* @param {{ locale?: "en" | "pl" }} options
+* @returns {string}
+*/
+declare function login_please_login(inputs?: {}, options?: {
+    locale?: "en" | "pl";
+}): string;

package/dist/paraglide/messages/login_please_login.js

@@ -0,0 +1,34 @@
+/* eslint-disable */
+import { getLocale, trackMessageCall, experimentalMiddlewareLocaleSplitting, isServer } from '../runtime.js';
+
+const en_login_please_login = /** @type {(inputs: {}) => string} */ () => {
+	return `Login to your account`
+};
+
+const pl_login_please_login = /** @type {(inputs: {}) => string} */ () => {
+	return `Zaloguj się na swoje konto`
+};
+
+/**
+* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
+*
+* - Changing this function will be over-written by the next build.
+*
+* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
+* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
+* 
+* @param {{}} inputs
+* @param {{ locale?: "en" | "pl" }} options
+* @returns {string}
+*/
+/* @__NO_SIDE_EFFECTS__ */
+const login_please_login = (inputs = {}, options = {}) => {
+	if (experimentalMiddlewareLocaleSplitting && isServer === false) {
+		return /** @type {any} */ (globalThis).__paraglide_ssr.login_please_login(inputs) 
+	}
+	const locale = options.locale ?? getLocale()
+	trackMessageCall("login_please_login", locale)
+	if (locale === "en") return en_login_please_login(inputs)
+	return pl_login_please_login(inputs)
+};
+export { login_please_login as "login.please_login" }

package/dist/shop/server/orders.d.ts

@@ -54,3 +54,4 @@ export interface ListOrdersOptions {
     offset?: number;
 }
 export declare function listOrders(opts?: ListOrdersOptions): Promise<OrderRow[]>;
+export declare function countOrders(opts?: Omit<ListOrdersOptions, 'limit' | 'offset'>): Promise<number>;

package/dist/shop/server/orders.js

@@ -417,3 +417,17 @@ export async function listOrders(opts = {}) {
         .limit(opts.limit ?? 100)
         .offset(opts.offset ?? 0);
 }
+export async function countOrders(opts = {}) {
+    const db = getShopDb();
+    const conditions = [];
+    if (opts.status)
+        conditions.push(eq(shopOrdersTable.status, opts.status));
+    if (opts.email)
+        conditions.push(eq(shopOrdersTable.customerEmail, opts.email));
+    const where = conditions.length > 0 ? and(...conditions) : undefined;
+    const [row] = await db
+        .select({ count: sql `count(*)::int` })
+        .from(shopOrdersTable)
+        .where(where);
+    return row?.count ?? 0;
+}

package/dist/shop/server/shop-data.d.ts

@@ -51,6 +51,8 @@ export interface ShopEntryListItem {
     updatedAt: Date;
     publishedData: Record<string, unknown> | null;
     draftData: Record<string, unknown> | null;
+    publishedByLang: Record<string, Record<string, unknown>>;
+    draftByLang: Record<string, Record<string, unknown>>;
     published: boolean;
 }
 export declare function listShopEntries(opts?: ListShopEntriesOptions): Promise<ShopEntryListItem[]>;

package/dist/shop/server/shop-data.js

@@ -172,8 +172,21 @@ export async function listShopEntries(opts = {}) {
         const variants = allVariants.filter((v) => v.productId === r.shopId);
         const stocks = variants.map((v) => v.stock).filter((s) => s != null);
         const versions = allVersions.filter((v) => v.entryId === r.entryId);
-        const published = versions.find((v) => v.publishedAt != null);
-        const draft = versions.find((v) => v.publishedAt == null);
+        const publishedByLang = {};
+        const draftByLang = {};
+        for (const v of versions) {
+            const data = v.data;
+            if (v.publishedAt != null) {
+                if (!publishedByLang[v.lang])
+                    publishedByLang[v.lang] = data;
+            }
+            else {
+                if (!draftByLang[v.lang])
+                    draftByLang[v.lang] = data;
+            }
+        }
+        const firstPublished = versions.find((v) => v.publishedAt != null);
+        const firstDraft = versions.find((v) => v.publishedAt == null);
         return {
             entryId: r.entryId,
             collectionSlug: r.collectionSlug,
@@ -185,9 +198,11 @@ export async function listShopEntries(opts = {}) {
             totalStock: stocks.length > 0 ? stocks.reduce((a, b) => a + b, 0) : null,
             createdAt: r.createdAt,
             updatedAt: r.updatedAt,
-            publishedData: published?.data ?? null,
-            draftData: draft?.data ?? null,
-            published: published != null
+            publishedData: firstPublished?.data ?? null,
+            draftData: firstDraft?.data ?? null,
+            publishedByLang,
+            draftByLang,
+            published: firstPublished != null
         };
     });
 }

package/dist/sveltekit/server/handle.js

@@ -7,6 +7,7 @@ import { building } from '$app/environment';
 import { csrfGuard } from '../../server/security/csrf.js';
 import { rateLimitGuard } from '../../server/security/rate-limit.js';
 import { buildCspHeader } from '../../server/security/csp.js';
+import { baseLocale, extractLocaleFromRequest, isLocale } from '../../paraglide/runtime.js';
 const adminGuard = async ({ event, resolve }) => {
     const { user, session } = event.locals;
     // Secure the admin routes
@@ -60,6 +61,21 @@ const handleAuth = async ({ event, resolve }) => {
     }
     return svelteKitHandler({ event, resolve, auth, building });
 };
+const paraglideLang = async ({ event, resolve }) => {
+    let locale = baseLocale;
+    try {
+        const detected = extractLocaleFromRequest(event.request);
+        if (detected && isLocale(detected)) {
+            locale = detected;
+        }
+    }
+    catch {
+        // fall back to baseLocale
+    }
+    return resolve(event, {
+        transformPageChunk: ({ html }) => html.replace('%paraglide.lang%', locale)
+    });
+};
 const detectBrowserContext = async ({ event, resolve }) => {
     const ua = event.request.headers.get('user-agent') ?? '';
     const isSafari = /Safari/i.test(ua) && !/(?:Chrome|Chromium|Edg)/i.test(ua);
@@ -90,6 +106,7 @@ export function includioCMS(cmsConfig) {
     generateRuntime(cmsConfig); // Generate runtime code based on the CMS config
     initCMS(cmsConfig);
     const handles = [];
+    handles.push(paraglideLang);
     handles.push(detectBrowserContext);
     handles.push(csrfGuard);
     if (cmsConfig.auth) {

package/dist/types/cms.schema.js

@@ -6,9 +6,9 @@ const localizedSchema = z.union([z.string(), z.record(z.string(), z.string())]);
 /* -------------------------------------------------------------------------- */
 /*                                  Slug                                       */
 /* -------------------------------------------------------------------------- */
-const SLUG_RE = /^[a-z][a-z0-9-]*$/;
+const SLUG_RE = /^[a-z][a-zA-Z0-9-]*$/;
 const slugSchema = z.string().regex(SLUG_RE, {
-    message: 'must be lowercase letters/digits/hyphens, starting with a letter'
+    message: 'must start with a lowercase letter; letters, digits, hyphens allowed'
 });
 /* -------------------------------------------------------------------------- */
 /*                                Languages                                    */
@@ -82,6 +82,8 @@ const fieldSchema = z.lazy(() => z.discriminatedUnion('type', [
         minLength: z.number().int().nonnegative().optional(),
         maxLength: z.number().int().positive().optional(),
         pattern: z.string().optional(),
+        patternError: localizedSchema.optional(),
+        patternHint: localizedSchema.optional(),
         multiline: z.boolean().optional()
     })
         .passthrough(),