includio-cms 0.34.1 → 0.36.0

package/dist/shop/template.d.ts

@@ -11,3 +11,23 @@
  * @public
  */
 export declare function interpolateTemplate(template: string, vars: Record<string, unknown>, locale: string): string;
+/**
+ * Render a multilingual shop-name template (`invoiceName` / `cartName`)
+ * against an entry's data and a precomputed variant label. Returns `null`
+ * when the template is absent or yields an empty string after trimming —
+ * callers fall back to legacy behavior.
+ *
+ * Variables: `{<slug>}` resolves to any top-level (dot-path) field on the
+ * entry's published data. The reserved `{variant}` returns the rendered
+ * variant label. I18n fields stored as `{ pl: '…', en: '…' }` are auto
+ * unwrapped to the active language.
+ *
+ * @public
+ */
+export declare function renderShopName(template: I18nTemplate | null | undefined, ctx: {
+    entryData: Record<string, unknown> | null | undefined;
+    variant: string;
+    language: string;
+}, locale: string): string | null;
+/** @public */
+export type I18nTemplate = Record<string, string>;

package/dist/shop/template.js

@@ -17,18 +17,95 @@ export function interpolateTemplate(template, vars, locale) {
     }
     return template.replace(/\{([^}]+)\}/g, (_match, body) => {
         const { key, filter, arg } = parsePlaceholder(body);
-        if (!(key in vars)) {
+        const lookup = resolveKey(vars, key, locale);
+        if (lookup === undefined) {
             console.warn(`[interpolateTemplate] Unknown key "${key}" in template: ${template}`);
             return '';
         }
-        const raw = vars[key];
-        if (raw === null || raw === undefined)
+        if (lookup === null)
             return '';
         if (!filter)
-            return String(raw);
-        return applyFilter(raw, filter, arg, locale);
+            return String(lookup);
+        return applyFilter(lookup, filter, arg, locale);
     });
 }
+/**
+ * Resolve a placeholder key against `vars`. Supports dot-path (`hero.title`)
+ * and auto-unwraps an `I18nText`-shaped record (`{ pl: '…', en: '…' }`) to
+ * the active locale (falls back to the first key when the exact locale is
+ * missing). Returns `undefined` when the path does not exist — caller treats
+ * that as "unknown key" and warns. Returns `null` when the path exists but
+ * the value is nullish; caller emits empty string.
+ *
+ * @internal
+ */
+function resolveKey(vars, key, locale) {
+    const parts = key.split('.');
+    let current = vars;
+    for (const part of parts) {
+        if (current === null || current === undefined)
+            return undefined;
+        if (typeof current !== 'object')
+            return undefined;
+        const obj = current;
+        if (!(part in obj))
+            return undefined;
+        current = obj[part];
+    }
+    return unwrapI18n(current, locale);
+}
+/** @internal */
+function unwrapI18n(value, locale) {
+    if (value === null || value === undefined)
+        return value;
+    if (typeof value !== 'object' || Array.isArray(value))
+        return value;
+    const obj = value;
+    const keys = Object.keys(obj);
+    if (keys.length === 0)
+        return value;
+    const allStrings = keys.every((k) => typeof obj[k] === 'string');
+    if (!allStrings)
+        return value;
+    if (locale in obj)
+        return obj[locale];
+    const baseLocale = locale.split('-')[0];
+    if (baseLocale in obj)
+        return obj[baseLocale];
+    return obj[keys[0]];
+}
+/**
+ * Render a multilingual shop-name template (`invoiceName` / `cartName`)
+ * against an entry's data and a precomputed variant label. Returns `null`
+ * when the template is absent or yields an empty string after trimming —
+ * callers fall back to legacy behavior.
+ *
+ * Variables: `{<slug>}` resolves to any top-level (dot-path) field on the
+ * entry's published data. The reserved `{variant}` returns the rendered
+ * variant label. I18n fields stored as `{ pl: '…', en: '…' }` are auto
+ * unwrapped to the active language.
+ *
+ * @public
+ */
+export function renderShopName(template, ctx, locale) {
+    if (!template)
+        return null;
+    const tpl = template[ctx.language] ?? template[ctx.language.split('-')[0]] ?? null;
+    if (!tpl)
+        return null;
+    const vars = {
+        ...(ctx.entryData ?? {}),
+        variant: ctx.variant
+    };
+    for (const match of tpl.matchAll(/\{([^}]+)\}/g)) {
+        const key = match[1].split('|')[0].trim();
+        const value = resolveKey(vars, key, locale);
+        if (value === undefined || value === null || value === '')
+            return null;
+    }
+    const rendered = interpolateTemplate(tpl, vars, locale).trim();
+    return rendered.length > 0 ? rendered : null;
+}
 /** @internal */
 function parsePlaceholder(body) {
     const [keyPart, filterPart] = body.split('|', 2);

package/dist/shop/templates/_partials/items.en.html

@@ -1,3 +1,13 @@
+{{#if hasParticipants}}
+<table style="width:100%;border-collapse:collapse;font-size:14px;margin-bottom:16px;">
+  <thead><tr style="background:#f4f2fa;"><th align="left" colspan="2" style="padding:8px;">Participants</th></tr></thead>
+  <tbody>
+    {{#each participants}}
+      <tr><td style="padding:6px 8px;border-bottom:1px solid #eee;width:24px;color:#5B4A9E;font-weight:700;text-align:right;">{{number}}.</td><td style="padding:6px 8px;border-bottom:1px solid #eee;font-weight:600;">{{firstName}} {{lastName}}</td></tr>
+    {{/each}}
+  </tbody>
+</table>
+{{/if}}
 <table style="width:100%;border-collapse:collapse;font-size:14px;">
   <thead><tr style="background:#f4f2fa;"><th align="left" style="padding:8px;">Item</th><th style="padding:8px;">Qty</th><th align="right" style="padding:8px;">Total</th></tr></thead>
   <tbody>

package/dist/shop/templates/_partials/items.pl.html

@@ -1,3 +1,13 @@
+{{#if hasParticipants}}
+<table style="width:100%;border-collapse:collapse;font-size:14px;margin-bottom:16px;">
+  <thead><tr style="background:#f4f2fa;"><th align="left" colspan="2" style="padding:8px;">Uczestnicy</th></tr></thead>
+  <tbody>
+    {{#each participants}}
+      <tr><td style="padding:6px 8px;border-bottom:1px solid #eee;width:24px;color:#5B4A9E;font-weight:700;text-align:right;">{{number}}.</td><td style="padding:6px 8px;border-bottom:1px solid #eee;font-weight:600;">{{firstName}} {{lastName}}</td></tr>
+    {{/each}}
+  </tbody>
+</table>
+{{/if}}
 <table style="width:100%;border-collapse:collapse;font-size:14px;">
   <thead><tr style="background:#f4f2fa;"><th align="left" style="padding:8px;">Pozycja</th><th style="padding:8px;">Ilość</th><th align="right" style="padding:8px;">Suma</th></tr></thead>
   <tbody>

package/dist/shop/types.d.ts

@@ -394,6 +394,28 @@ export interface ShopConfig {
      * @public
      */
     variantLabel?: VariantLabelConfig;
+    /**
+     * Multilingual template overriding the product name shown on invoices
+     * (Fakturownia etc.) and — unless `cartName` is set — also in cart and
+     * order views. Keys are language codes (`pl`, `en`, …). Placeholders use
+     * the same engine as `variantLabel`: `{slug}` resolves to a top-level
+     * field on the entry (dot-path supported, i18n-aware); the reserved
+     * `{variant}` resolves to the rendered `variantLabel`. Filters from
+     * {@link interpolateTemplate} (`|date`, `|currency`, `|uppercase`) apply.
+     * Omitted = legacy behavior (`product — variant`).
+     * @public
+     */
+    invoiceName?: I18nText;
+    /**
+     * Multilingual template overriding the product name shown in cart and
+     * storefront order views ONLY (invoice still uses `invoiceName` or
+     * legacy). Set this in addition to `invoiceName` when the cart needs a
+     * shorter / different copy than the invoice line. Same syntax as
+     * {@link ShopConfig.invoiceName}. Omitted = falls back to `invoiceName`,
+     * then to legacy `productTitle`.
+     * @public
+     */
+    cartName?: I18nText;
     /**
      * Opt-in storefront filter for time-bound variants (events, courses).
      * Omitted = no filtering (legacy behavior — every variant always listed).
@@ -434,7 +456,7 @@ export interface ShopConfig {
      */
     onOrderPaid?: (order: Order) => Promise<void> | void;
 }
-export interface ResolvedShopConfig extends Omit<ShopConfig, 'variantLabel' | 'variantExpiry' | 'invoicing'> {
+export interface ResolvedShopConfig extends Omit<ShopConfig, 'variantLabel' | 'variantExpiry' | 'invoicing' | 'invoiceName' | 'cartName'> {
     features: Required<ShopFeatures>;
     rateLimit: Required<ShopRateLimit>;
     carriers: CarrierAdapter[];
@@ -444,5 +466,7 @@ export interface ResolvedShopConfig extends Omit<ShopConfig, 'variantLabel' | 'v
     variantAttributes: Record<string, VariantAttribute>;
     variantLabel: VariantLabelConfig | null;
     variantExpiry: VariantExpiryConfig | null;
+    invoiceName: I18nText | null;
+    cartName: I18nText | null;
 }
 export {};

package/dist/updates/0.35.0/index.d.ts

@@ -0,0 +1,2 @@
+import type { CmsUpdate } from '../index.js';
+export declare const update: CmsUpdate;

package/dist/updates/0.35.0/index.js

@@ -0,0 +1,16 @@
+export const update = {
+    version: '0.35.0',
+    date: '2026-06-05',
+    description: 'Kupon `appliesTo` (netto/brutto), uczestnicy w `notes` (admin + email), Calendar+Popover w polach `date`/`datetime` (admin), `api.ts` bez `FormEntryMap` gdy projekt nie ma form. Additive only — domyślne zachowania bez zmian.',
+    features: [
+        '`shop_coupons` dostaje kolumnę `applies_to` (enum `net`/`gross`, default `net`). `calculateCouponDiscountNet()` (`$lib/shop/pricing.ts`) liczy zniżkę od brutto (konwersja do netto przez średnią ważoną VAT) gdy `appliesTo="gross"` — działa zarówno dla `percent`, jak i `fixed`. Storage rabatu w bazie nadal w netto (canonical). Domyślnie `net` — istniejące kupony zachowują obecne zachowanie.',
+        'Admin coupon form (`coupon-form.svelte`) zyskuje toggle „Rabat dotyczy: netto / brutto" wzorowany na `inputMode` w `shop-field.svelte` — z helper textem objaśniającym wpływ na cenę zamówienia.',
+        '`order.notes` jest teraz traktowane jako opcjonalny JSON (`{ org?, orgName?, participants?: Array<{firstName, lastName}> }`) w admin order detail (`shop-order-detail-page.svelte`) oraz w kontekście emaila (`items.pl.html`/`items.en.html` przez `email.ts`). Plain-text notatki nadal renderują się raw — JSON wykrywany przez `try/catch` parse + shape guard.',
+        'Admin pola `date` i `datetime` (`date-field.svelte`, `datetime-field.svelte`) używają `bits-ui` Calendar w `Popover` zamiast natywnych `<input type="date|datetime-local">` — kalendarz z dropdownem miesiąca/roku, dwa Selecty (godzina 00–23, minuta 00/15/30/45) dla datetime, locale `pl-PL`/`en-GB` z `interfaceLanguage`. Output bez zmian: ISO datetime (`datetime`) / `YYYY-MM-DDT00:00:00.000Z` (`date`).'
+    ],
+    fixes: [
+        '`generateAPI()` (`src/lib/core/server/generator/generator.ts`) nie wstrzykuje już importu `FormEntryMap` / `createFormSubmission` w wygenerowanym `api.ts`, gdy projekt nie ma zdefiniowanych form (`config.forms` puste). Wcześniej projekty bez form miały martwy import, który psuł type-check / build.'
+    ],
+    breakingChanges: [],
+    sql: `ALTER TABLE shop_coupons ADD COLUMN IF NOT EXISTS applies_to text NOT NULL DEFAULT 'net';`
+};

package/dist/updates/0.36.0/index.d.ts

@@ -0,0 +1,2 @@
+import type { CmsUpdate } from '../index.js';
+export declare const update: CmsUpdate;

package/dist/updates/0.36.0/index.js

@@ -0,0 +1,13 @@
+export const update = {
+    version: '0.36.0',
+    date: '2026-06-05',
+    description: '`defineShop({ invoiceName, cartName })` — opcjonalne multilingual template overriding produktowej nazwy w koszyku, podsumowaniu zamówienia i na fakturze. Reusuje engine od `variantLabel.template` (`{slug}`, `{slug|filter}`), z nowymi możliwościami: dot-path (`{hero.title}`) i auto-unwrap pól i18n. Reserved `{variant}` = wyrenderowany variantLabel. Order item `nameSnapshot` zyskuje opcjonalne pole `invoice` (zamrażane przy checkout). Additive — brak zmian default behavior.',
+    features: [
+        '`ShopConfig.invoiceName?: I18nText` i `ShopConfig.cartName?: I18nText` — template (per język) renderowany przy hydracji koszyka i tworzeniu zamówienia. Fallback chain: `cartName` (koszyk) → `invoiceName` (koszyk + faktura) → legacy `productTitle` / `product — variant`. `invoiceName` jest **full override** na fakturze — wariant NIE jest doklejany automatycznie, użyj `{variant}` w template.',
+        '`interpolateTemplate()` (`$lib/shop/template.ts`) zyskuje dot-path resolver (`{hero.title}`) oraz auto-unwrap pól i18n `{ pl: …, en: … }` do aktualnego języka (z fallbackiem `lang.split("-")[0]` → pierwszy klucz). Backwards-compatible: istniejące `{key}` (płaskie) działają bez zmian.',
+        '`renderShopName(template, ctx, locale)` (`$lib/shop/template.ts`) — public helper łączący resolverę I18nText template + budowę vars `{ ...entryData, variant }`. Używany wewnętrznie przez cart-hydrate; eksportowany dla customowych use case (np. own checkout flows).',
+        '`CartLine` zyskuje pole `invoiceTitle: string | null` — frozen invoice copy obok `productTitle` (cart copy). `orders.createOrderFromCart` snapshot-uje to do `nameSnapshot.invoice`. `buildInvoicePayload()` honoruje `nameSnapshot.invoice` — fallback do `product — variant` gdy brak.'
+    ],
+    fixes: [],
+    breakingChanges: []
+};

package/dist/updates/index.js

@@ -65,6 +65,8 @@ import { update as update0270 } from './0.27.0/index.js';
 import { update as update0280 } from './0.28.0/index.js';
 import { update as update0340 } from './0.34.0/index.js';
 import { update as update0341 } from './0.34.1/index.js';
+import { update as update0350 } from './0.35.0/index.js';
+import { update as update0360 } from './0.36.0/index.js';
 export const updates = [
     update0065,
     update0066,
@@ -132,7 +134,9 @@ export const updates = [
     update0270,
     update0280,
     update0340,
-    update0341
+    update0341,
+    update0350,
+    update0360
 ];
 export const getUpdatesFrom = (fromVersion) => {
     const fromParts = fromVersion.split('.').map(Number);

package/package.json

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

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

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

package/dist/paraglide/messages/hello_world.js

@@ -1,33 +0,0 @@
-/* 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

@@ -1,16 +0,0 @@
-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

@@ -1,34 +0,0 @@
-/* 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

@@ -1,16 +0,0 @@
-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

@@ -1,34 +0,0 @@
-/* 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" }