includio-cms 0.26.0 → 0.28.0

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

@@ -8,6 +8,9 @@ export declare const getShopConfig: import("@sveltejs/kit").RemoteQueryFunction<
         id: string;
         label: import("../../shop/types.js").I18nText;
     }[];
+    variantAttributes: Record<string, import("../../shop/types.js").VariantAttribute>;
+    variantLabel: import("../../shop/types.js").VariantLabelConfig | null;
+    variantExpiry: import("../../shop/types.js").VariantExpiryConfig | null;
 } | null>;
 export declare const listShopProductEntries: import("@sveltejs/kit").RemoteQueryFunction<void, import("../../shop/server/shop-data.js").ShopEntryListItem[]>;
 export declare const getShopDataForEntry: import("@sveltejs/kit").RemoteQueryFunction<string, import("../../shop/server/shop-data.js").ShopDataWithVariants | null>;
@@ -18,6 +21,18 @@ export declare const upsertShopDataForEntry: import("@sveltejs/kit").RemoteComma
         vatRate: number;
         isActive?: boolean | undefined;
         sortOrder?: number | null | undefined;
+        paymentPolicy?: {
+            type: "full";
+        } | {
+            type: "deposit";
+            depositAmount: {
+                type: "percent";
+                value: number;
+            } | {
+                type: "amount";
+                value: number;
+            };
+        } | null | undefined;
     };
     variants?: {
         id?: string | undefined;
@@ -25,7 +40,7 @@ export declare const upsertShopDataForEntry: import("@sveltejs/kit").RemoteComma
         name?: Record<string, string> | null | undefined;
         priceDelta?: number | undefined;
         stock?: number | null | undefined;
-        attributes?: Record<string, string> | null | undefined;
+        attributes?: Record<string, unknown> | null | undefined;
     }[] | undefined;
 }, Promise<import("../../shop/server/shop-data.js").ShopDataWithVariants>>;
 export declare const deleteShopDataForEntry: import("@sveltejs/kit").RemoteCommand<string, Promise<{
@@ -84,17 +99,26 @@ export declare const listOrdersAdmin: import("@sveltejs/kit").RemoteQueryFunctio
 } | undefined, {
     items: {
         number: string;
+        currency: string;
+        consents: {
+            id: string;
+            accepted: boolean;
+            label: string;
+        }[] | null;
         id: string;
         status: import("../../shop/types.js").OrderStatus;
         createdAt: Date;
         updatedAt: Date;
         language: string | null;
         carrierType: string | null;
-        currency: string;
         customerEmail: string;
         customerName: string | null;
         customerPhone: string | null;
+        customerNip: string | null;
+        customerCompanyName: string | null;
         shippingAddress: Record<string, string> | null;
+        billingAddress: Record<string, string> | null;
+        invoiceRequested: boolean;
         totalNet: number;
         totalGross: number;
         vatAmount: number;
@@ -108,13 +132,10 @@ export declare const listOrdersAdmin: import("@sveltejs/kit").RemoteQueryFunctio
         shipmentCreatedAt: Date | null;
         paymentMethod: string | null;
         paymentProviderRef: string | null;
-        consents: {
-            id: string;
-            accepted: boolean;
-            label: string;
-        }[] | null;
         notes: string | null;
         accessToken: string;
+        partialPayment: import("../../shop/types.js").PartialPayment | null;
+        balanceOwed: boolean;
     }[];
     total: number;
     limit: number;
@@ -123,17 +144,26 @@ export declare const listOrdersAdmin: import("@sveltejs/kit").RemoteQueryFunctio
 export declare const getOrderForAdmin: import("@sveltejs/kit").RemoteQueryFunction<string, {
     order: {
         number: string;
+        currency: string;
+        consents: {
+            id: string;
+            accepted: boolean;
+            label: string;
+        }[] | null;
         id: string;
         status: import("../../shop/types.js").OrderStatus;
         createdAt: Date;
         updatedAt: Date;
         language: string | null;
         carrierType: string | null;
-        currency: string;
         customerEmail: string;
         customerName: string | null;
         customerPhone: string | null;
+        customerNip: string | null;
+        customerCompanyName: string | null;
         shippingAddress: Record<string, string> | null;
+        billingAddress: Record<string, string> | null;
+        invoiceRequested: boolean;
         totalNet: number;
         totalGross: number;
         vatAmount: number;
@@ -147,13 +177,10 @@ export declare const getOrderForAdmin: import("@sveltejs/kit").RemoteQueryFuncti
         shipmentCreatedAt: Date | null;
         paymentMethod: string | null;
         paymentProviderRef: string | null;
-        consents: {
-            id: string;
-            accepted: boolean;
-            label: string;
-        }[] | null;
         notes: string | null;
         accessToken: string;
+        partialPayment: import("../../shop/types.js").PartialPayment | null;
+        balanceOwed: boolean;
     };
     items: {
         id: string;
@@ -182,17 +209,26 @@ export declare const updateOrderStatusCmd: import("@sveltejs/kit").RemoteCommand
     note?: string | undefined;
 }, Promise<{
     number: string;
+    currency: string;
+    consents: {
+        id: string;
+        accepted: boolean;
+        label: string;
+    }[] | null;
     id: string;
     status: import("../../shop/types.js").OrderStatus;
     createdAt: Date;
     updatedAt: Date;
     language: string | null;
     carrierType: string | null;
-    currency: string;
     customerEmail: string;
     customerName: string | null;
     customerPhone: string | null;
+    customerNip: string | null;
+    customerCompanyName: string | null;
     shippingAddress: Record<string, string> | null;
+    billingAddress: Record<string, string> | null;
+    invoiceRequested: boolean;
     totalNet: number;
     totalGross: number;
     vatAmount: number;
@@ -206,13 +242,10 @@ export declare const updateOrderStatusCmd: import("@sveltejs/kit").RemoteCommand
     shipmentCreatedAt: Date | null;
     paymentMethod: string | null;
     paymentProviderRef: string | null;
-    consents: {
-        id: string;
-        accepted: boolean;
-        label: string;
-    }[] | null;
     notes: string | null;
     accessToken: string;
+    partialPayment: import("../../shop/types.js").PartialPayment | null;
+    balanceOwed: boolean;
 }>>;
 export declare const resendOrderEmailCmd: import("@sveltejs/kit").RemoteCommand<{
     orderId: string;
@@ -253,15 +286,15 @@ export declare const listShopableCollections: import("@sveltejs/kit").RemoteQuer
 }[]>;
 export declare const getOrderRefundsAdmin: import("@sveltejs/kit").RemoteQueryFunction<string, {
     refunds: {
+        amount: number;
+        currency: string;
         id: string;
         status: import("../../db-postgres/schema/shop/index.js").ShopRefundStatus;
         createdAt: Date;
         updatedAt: Date;
-        currency: string;
         orderId: string;
         provider: string;
         providerRef: string | null;
-        amount: number;
         paymentId: string | null;
         reason: string | null;
         createdBy: string | null;
@@ -277,6 +310,8 @@ export declare const refundOrderCmd: import("@sveltejs/kit").RemoteCommand<{
     orderId: string;
     amount?: number | undefined;
     reason?: string | undefined;
+    kind?: "full" | "deposit" | "balance" | undefined;
+    releaseStock?: boolean | undefined;
 }, Promise<{
     refund: import("../../shop/server/refund.js").ShopRefundRow;
     remainingRefundable: number;
@@ -286,9 +321,66 @@ export declare const refundOrderCmd: import("@sveltejs/kit").RemoteCommand<{
     error?: undefined;
 } | {
     success: false;
-    code: "order_not_found" | "order_not_paid" | "no_provider_ref" | "unknown_provider" | "refund_unsupported" | "invalid_amount" | "amount_exceeds_remaining" | "provider_error";
+    code: "order_not_found" | "order_not_paid" | "no_provider_ref" | "unknown_provider" | "refund_unsupported" | "invalid_amount" | "amount_exceeds_remaining" | "provider_error" | "no_payment_kind";
     error: string;
 }>>;
+export declare const getOrderInvoiceAdmin: import("@sveltejs/kit").RemoteQueryFunction<string, {
+    invoice: {
+        number: string | null;
+        raw: unknown;
+        id: string;
+        status: import("../../db-postgres/schema/shop/index.js").ShopInvoiceStatus;
+        createdAt: Date;
+        updatedAt: Date;
+        orderId: string;
+        provider: string;
+        kind: string;
+        externalId: string | null;
+        pdfUrl: string | null;
+        attempts: number;
+        nextRetryAt: Date | null;
+        lastError: string | null;
+    } | null;
+    invoicingEnabled: boolean;
+}>;
+export declare const issueInvoiceCmd: import("@sveltejs/kit").RemoteCommand<{
+    orderId: string;
+    force?: boolean | undefined;
+}, Promise<{
+    success: true;
+    invoice: {
+        number: string | null;
+        raw: unknown;
+        id: string;
+        status: import("../../db-postgres/schema/shop/index.js").ShopInvoiceStatus;
+        createdAt: Date;
+        updatedAt: Date;
+        orderId: string;
+        provider: string;
+        kind: string;
+        externalId: string | null;
+        pdfUrl: string | null;
+        attempts: number;
+        nextRetryAt: Date | null;
+        lastError: string | null;
+    } | null;
+    error?: undefined;
+} | {
+    success: false;
+    error: string;
+    invoice?: undefined;
+}>>;
+export declare const generateBalanceLinkForOrder: import("@sveltejs/kit").RemoteCommand<string, Promise<{
+    success: false;
+    error: string;
+    url?: undefined;
+    balanceAmount?: undefined;
+} | {
+    success: true;
+    url: string;
+    balanceAmount: number;
+    error?: undefined;
+}>>;
 export declare const listCouponsAdmin: import("@sveltejs/kit").RemoteQueryFunction<void, {
     id: string;
     code: string;
@@ -317,7 +409,7 @@ export declare const getCouponAdmin: import("@sveltejs/kit").RemoteQueryFunction
 }>;
 export declare const createCouponCmd: import("@sveltejs/kit").RemoteCommand<{
     code: string;
-    type: "fixed" | "percent";
+    type: "percent" | "fixed";
     value: number;
     minOrderAmount?: number | null | undefined;
     maxUses?: number | null | undefined;
@@ -340,7 +432,7 @@ export declare const updateCouponCmd: import("@sveltejs/kit").RemoteCommand<{
     id: string;
     input: {
         code?: string | undefined;
-        type?: "fixed" | "percent" | undefined;
+        type?: "percent" | "fixed" | undefined;
         value?: number | undefined;
         minOrderAmount?: number | null | undefined;
         maxUses?: number | null | undefined;

package/dist/admin/remote/shop.remote.js

@@ -6,6 +6,7 @@ import { createShippingMethod, deleteShippingMethod, getShippingMethod, listShip
 import { countOrders, getOrderById, getOrderItems, getOrderStatusHistory, listOrders, updateOrderStatus } from '../../shop/server/orders.js';
 import { cancelShipmentForOrder, createShipmentForOrder } from '../../shop/server/shipments.js';
 import { sendOrderStatusEmail } from '../../shop/server/email.js';
+import { getInvoiceByOrderId, issueInvoiceForOrder } from '../../shop/server/invoices.js';
 import { getRefundedAmount, listRefunds, refundOrder, RefundError } from '../../shop/server/refund.js';
 import { getShopDb } from '../../shop/server/db.js';
 import { shopCouponsTable } from '../../db-postgres/schema/shop/index.js';
@@ -24,7 +25,10 @@ export const getShopConfig = query(async () => {
         vatRates: shop.vatRates,
         features: shop.features,
         languages: getCMS().languages,
-        paymentMethods: shop.payment.map((p) => ({ id: p.id, label: p.label }))
+        paymentMethods: shop.payment.map((p) => ({ id: p.id, label: p.label })),
+        variantAttributes: shop.variantAttributes,
+        variantLabel: shop.variantLabel,
+        variantExpiry: shop.variantExpiry
     };
 });
 export const listShopProductEntries = query(async () => {
@@ -35,11 +39,20 @@ export const getShopDataForEntry = query(z.string(), async (entryId) => {
     requireAuth();
     return getShopDataByEntry(entryId);
 });
+const depositAmountSchema = z.discriminatedUnion('type', [
+    z.object({ type: z.literal('percent'), value: z.number().positive().max(100) }),
+    z.object({ type: z.literal('amount'), value: z.number().int().positive() })
+]);
+const paymentPolicySchema = z.discriminatedUnion('type', [
+    z.object({ type: z.literal('full') }),
+    z.object({ type: z.literal('deposit'), depositAmount: depositAmountSchema })
+]);
 const shopDataInputSchema = z.object({
     basePrice: z.number().nonnegative().max(1e9), // PLN (≤6dp)
     vatRate: z.number().int().min(0).max(100),
     isActive: z.boolean().optional(),
-    sortOrder: z.number().int().nullable().optional()
+    sortOrder: z.number().int().nullable().optional(),
+    paymentPolicy: paymentPolicySchema.nullable().optional()
 });
 const variantInputSchema = z.object({
     id: z.string().optional(),
@@ -47,7 +60,9 @@ const variantInputSchema = z.object({
     name: z.record(z.string(), z.string()).nullable().optional(),
     priceDelta: z.number().optional(), // PLN
     stock: z.number().int().nullable().optional(),
-    attributes: z.record(z.string(), z.string()).nullable().optional()
+    // unknown — variantAttributes can be string|number|boolean|datetime;
+    // validateVariantAttributes (server) enforces the typed shape from shop config.
+    attributes: z.record(z.string(), z.unknown()).nullable().optional()
 });
 export const upsertShopDataForEntry = command(z.object({
     entryId: z.string(),
@@ -223,11 +238,20 @@ export const getOrderRefundsAdmin = query(z.string(), async (orderId) => {
 export const refundOrderCmd = command(z.object({
     orderId: z.string(),
     amount: z.number().int().positive().optional(),
-    reason: z.string().max(500).optional()
-}), async ({ orderId, amount, reason }) => {
+    reason: z.string().max(500).optional(),
+    kind: z.enum(['full', 'deposit', 'balance']).optional(),
+    releaseStock: z.boolean().optional()
+}), async ({ orderId, amount, reason, kind, releaseStock }) => {
     requireAuth();
     try {
-        const result = await refundOrder({ orderId, amount, reason, createdBy: 'admin' });
+        const result = await refundOrder({
+            orderId,
+            amount,
+            reason,
+            kind,
+            releaseStock,
+            createdBy: 'admin'
+        });
         return { success: true, ...result };
     }
     catch (err) {
@@ -238,6 +262,55 @@ export const refundOrderCmd = command(z.object({
         return { success: false, code: 'provider_error', error: message };
     }
 });
+export const getOrderInvoiceAdmin = query(z.string(), async (orderId) => {
+    requireAuth();
+    const invoice = await getInvoiceByOrderId(orderId);
+    const invoicingEnabled = !!getCMS().shopConfig?.invoicing;
+    return { invoice, invoicingEnabled };
+});
+export const issueInvoiceCmd = command(z.object({ orderId: z.string(), force: z.boolean().optional() }), async ({ orderId, force }) => {
+    requireAuth();
+    try {
+        const invoice = await issueInvoiceForOrder(orderId, { force });
+        return { success: true, invoice };
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : 'Invoice issuance failed';
+        return { success: false, error: message };
+    }
+});
+export const generateBalanceLinkForOrder = command(z.string(), async (orderId) => {
+    requireAuth();
+    const { generateBalanceToken, requireBalanceTokenSecret } = await import('../../shop/server/balance-payment.js');
+    const { getOrderById } = await import('../../shop/server/orders.js');
+    const order = await getOrderById(orderId);
+    if (!order)
+        return { success: false, error: 'Order not found' };
+    if (!order.balanceOwed) {
+        return { success: false, error: 'Order has no outstanding balance' };
+    }
+    let secret;
+    try {
+        secret = requireBalanceTokenSecret();
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : 'Token secret not configured';
+        return { success: false, error: message };
+    }
+    const token = generateBalanceToken(order.id, secret);
+    // Mirror orderViewUrl template — build the customer-facing URL by
+    // extending the configured base with the balance path + token.
+    const cms = (await import('../../core/cms.js')).getCMS();
+    const orderViewUrl = cms.shopConfig?.orderViewUrl ?? '/shop/order/{orderNumber}?token={accessToken}';
+    const base = orderViewUrl
+        .replace('{orderNumber}', encodeURIComponent(order.number))
+        .replace('{orderId}', encodeURIComponent(order.id))
+        .replace('{accessToken}', encodeURIComponent(order.accessToken))
+        .replace('{language}', encodeURIComponent(order.language ?? ''));
+    const sep = base.includes('?') ? '&' : '?';
+    const url = `${base}${sep}balance=1&balanceToken=${encodeURIComponent(token)}`;
+    return { success: true, url, balanceAmount: order.partialPayment?.balanceAmount ?? 0 };
+});
 // Coupons ────────────────────────────────────────────────────────────────────
 const couponInputSchema = z.object({
     code: z.string().min(1).max(64),

package/dist/admin/state/icon-sets.svelte.d.ts

@@ -0,0 +1,9 @@
+import type { IconSetPlugin } from '../../types/plugins.js';
+export declare function setIconSets(sets: Map<string, IconSetPlugin>): void;
+export declare function getIconSets(): Map<string, IconSetPlugin>;
+/**
+ * Resolve a single icon set: explicit `slug` (from {@link IconField.set}) takes
+ * precedence; otherwise returns the first registered set (predictable order
+ * matches Map insertion). Returns `null` when none are registered.
+ */
+export declare function resolveIconSet(slug?: string): IconSetPlugin | null;

package/dist/admin/state/icon-sets.svelte.js

@@ -0,0 +1,20 @@
+import { getContext, setContext } from 'svelte';
+const contextKey = Symbol('iconSets');
+export function setIconSets(sets) {
+    setContext(contextKey, sets);
+}
+export function getIconSets() {
+    return getContext(contextKey) ?? new Map();
+}
+/**
+ * Resolve a single icon set: explicit `slug` (from {@link IconField.set}) takes
+ * precedence; otherwise returns the first registered set (predictable order
+ * matches Map insertion). Returns `null` when none are registered.
+ */
+export function resolveIconSet(slug) {
+    const sets = getIconSets();
+    if (slug)
+        return sets.get(slug) ?? null;
+    const first = sets.values().next();
+    return first.done ? null : first.value;
+}

package/dist/cli/scaffold/admin.js

@@ -329,7 +329,7 @@ export const { POST } = createRetryPaymentHandler();
         {
             path: 'admin/api/[...path]/+server.ts',
             content: `${GENERATED_COMMENT_TS}
-import { createAdminApiHandler } from 'includio-cms/admin/api/handler';
+import { createAdminApiHandler } from 'includio-cms/sveltekit/server';
 
 export const { GET, POST, PATCH, PUT, DELETE } = createAdminApiHandler();
 `
@@ -337,7 +337,7 @@ export const { GET, POST, PATCH, PUT, DELETE } = createAdminApiHandler();
         {
             path: 'admin/api/rest/[...restPath]/+server.ts',
             content: `${GENERATED_COMMENT_TS}
-import { createRestApiHandler } from 'includio-cms/admin/api/rest/handler';
+import { createRestApiHandler } from 'includio-cms/sveltekit/server';
 
 export const { GET, POST, PUT, DELETE } = createRestApiHandler();
 `

package/dist/components/ui/checkbox/checkbox.svelte

@@ -17,7 +17,7 @@
 	bind:ref
 	data-slot="checkbox"
 	class={cn(
-		"border-input dark:bg-input/30 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground dark:data-[state=checked]:bg-primary data-[state=checked]:border-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive shadow-xs peer flex size-6 shrink-0 items-center justify-center rounded-[4px] border outline-none transition-shadow focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
+		"border-input dark:bg-input/30 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground dark:data-[state=checked]:bg-primary data-[state=checked]:border-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive shadow-xs peer relative flex size-4 shrink-0 items-center justify-center rounded-[4px] border outline-none transition-shadow focus-visible:ring-[3px] after:absolute after:-inset-1 after:content-[''] disabled:cursor-not-allowed disabled:opacity-50",
 		className
 	)}
 	bind:checked
@@ -27,9 +27,9 @@
 	{#snippet children({ checked, indeterminate })}
 		<div data-slot="checkbox-indicator" class="text-current transition-none">
 			{#if checked}
-				<CheckIcon class="size-4" />
+				<CheckIcon class="size-3.5" />
 			{:else if indeterminate}
-				<MinusIcon class="size-4" />
+				<MinusIcon class="size-3.5" />
 			{/if}
 		</div>
 	{/snippet}

package/dist/core/cms.d.ts

@@ -4,7 +4,7 @@ import type { ApiKeyConfig, AuthConfig, CMSConfig, ICMS, MediaConfig, Typography
 import type { CollectionConfigWithType } from '../types/collections.js';
 import type { Language } from '../types/languages.js';
 import type { SingleConfigWithType } from '../types/singles.js';
-import type { CustomFieldDefinition, PluginConfig } from '../types/plugins.js';
+import type { CustomFieldDefinition, IconSetPlugin, Plugin } from '../types/plugins.js';
 import type { FormConfig } from '../types/forms.js';
 import type { AIAdapter } from '../types/adapters/ai.js';
 import type { EmailAdapter } from '../types/adapters/email.js';
@@ -28,8 +28,17 @@ export declare class CMS implements ICMS {
     sidebarHelp: boolean;
     shopConfig: ResolvedShopConfig | null;
     cmpConfig: ResolvedCmpConfig | null;
-    plugins: PluginConfig[];
+    /**
+     * Resolves once the shop's variant-attribute GIN indexes have been applied
+     * by `initCMS()`. `null` when the CMS is configured without a shop. Tests
+     * can `await` this to gate on init completion; production callers don't
+     * need to — index application is idempotent and non-blocking.
+     * @internal
+     */
+    shopInitPromise: Promise<void> | null;
+    plugins: Plugin[];
     customFields: Map<string, CustomFieldDefinition>;
+    iconSets: Map<string, IconSetPlugin>;
     apiKeys: ApiKeyConfig[];
     constructor(config: CMSConfig);
     private validateFieldSlugs;

package/dist/core/cms.js

@@ -1,9 +1,11 @@
+import { isIconSetPlugin } from '../types/plugins.js';
 import { setSchemaGetCMS } from './fields/fieldSchemaToTs.js';
 import { betterAuth } from 'better-auth';
 import { drizzleAdapter } from 'better-auth/adapters/drizzle';
 import { admin } from 'better-auth/plugins';
 import { resetPasswordEmailTemplate } from '../admin/email/reset-password-template.js';
 import * as authSchema from '../server/db/schema/auth-schema.js';
+import { applyVariantAttributeIndexes } from '../shop/server/init.js';
 export class CMS {
     config;
     databaseAdapter;
@@ -21,8 +23,17 @@ export class CMS {
     sidebarHelp;
     shopConfig;
     cmpConfig;
+    /**
+     * Resolves once the shop's variant-attribute GIN indexes have been applied
+     * by `initCMS()`. `null` when the CMS is configured without a shop. Tests
+     * can `await` this to gate on init completion; production callers don't
+     * need to — index application is idempotent and non-blocking.
+     * @internal
+     */
+    shopInitPromise = null;
     plugins = [];
     customFields = new Map();
+    iconSets = new Map();
     apiKeys = [];
     constructor(config) {
         this.config = config;
@@ -64,6 +75,13 @@ export class CMS {
         if (config.plugins) {
             this.plugins = config.plugins;
             for (const plugin of this.plugins) {
+                if (isIconSetPlugin(plugin)) {
+                    if (this.iconSets.has(plugin.slug)) {
+                        throw new Error(`Duplicate icon-set plugin slug: "${plugin.slug}"`);
+                    }
+                    this.iconSets.set(plugin.slug, plugin);
+                    continue;
+                }
                 for (const def of plugin.fields ?? []) {
                     if (this.customFields.has(def.fieldType)) {
                         throw new Error(`Duplicate custom field type: "${def.fieldType}" (plugin: "${plugin.slug}")`);
@@ -157,6 +175,17 @@ export function initCMS(config) {
     import('./server/media/operations/backgroundMaintenance.js')
         .then((m) => m.startBackgroundMaintenance())
         .catch((e) => console.warn('[cms] Failed to start background maintenance:', e));
+    // Apply shop variantAttribute GIN indexes (idempotent CREATE INDEX IF NOT EXISTS).
+    // Pass shop + drizzle explicitly so the dynamic import doesn't depend on a
+    // shared CMS singleton (vitest can give the dynamic module a fresh instance).
+    if (cms.shopConfig) {
+        const drizzle = cms.databaseAdapter._drizzle;
+        if (drizzle) {
+            cms.shopInitPromise = applyVariantAttributeIndexes(cms.shopConfig, drizzle).catch((e) => {
+                console.warn('[shop] Failed to apply variant attribute indexes:', e);
+            });
+        }
+    }
     return cms;
 }
 /**

package/dist/core/fields/fieldSchemaToTs.js

@@ -444,6 +444,13 @@ export function generateZodSchemaFromField(field, languages, options = {
                 localizedDefault.text = emptyLangMap;
             return localizedSchema.optional().default(localizedDefault);
         }
+        case 'icon': {
+            // Value is a plain string key referencing an icon registered by an
+            // IconSetPlugin. Validation matches `slug` field semantics.
+            if (field.required)
+                return z.string().min(1, { message: msg.required });
+            return z.string().optional().default('');
+        }
         case 'custom': {
             const customDef = getCustomFieldDef(field.fieldType);
             if (!customDef)

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

@@ -1,6 +1,8 @@
 import type { Field } from '../../../types/fields.js';
 import type { CustomFieldDefinition } from '../../../types/plugins.js';
+import type { VariantAttribute } from '../../../shop/types.js';
 export declare function setGeneratorCustomFields(customFields: Map<string, CustomFieldDefinition>): void;
+export declare function setGeneratorShopVariantAttributes(attrs: Record<string, VariantAttribute>): void;
 export declare function generateTsTypeFromFields(fields: Field[]): string;
 export declare function generateFlatTsTypeFromFields(fields: Field[]): string;
 export interface InlineBlockTypeDef {

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

@@ -1,12 +1,44 @@
 import { toPascalCase, quoteKey } from './utils.js';
 import { buildSeoTsType } from '../../fields/seoFieldDescriptor.js';
 let _customFields = new Map();
+let _shopVariantAttributes = {};
 function isGuaranteed(f) {
     return !!(f.required || f.type === 'seo' || f.defaultValue !== undefined);
 }
 export function setGeneratorCustomFields(customFields) {
     _customFields = customFields;
 }
+export function setGeneratorShopVariantAttributes(attrs) {
+    _shopVariantAttributes = attrs;
+}
+function variantAttributeTsType(attr) {
+    switch (attr.type) {
+        case 'text':
+        case 'datetime':
+        case 'image':
+        case 'entry':
+        case 'slug':
+            return 'string';
+        case 'number':
+            return 'number';
+        case 'boolean':
+            return 'boolean';
+        case 'select':
+            return attr.options.map((o) => `'${o.value}'`).join(' | ');
+    }
+}
+function buildShopAttributesType() {
+    const entries = Object.entries(_shopVariantAttributes);
+    if (entries.length === 0)
+        return 'Record<string, string> | null';
+    const fields = entries
+        .map(([key, attr]) => {
+        const opt = attr.required ? '' : '?';
+        return `${quoteKey(key)}${opt}: ${variantAttributeTsType(attr)}`;
+    })
+        .join('; ');
+    return `{ ${fields} }`;
+}
 function getFieldTypeAsString(field) {
     switch (field.type) {
         case 'text':
@@ -68,6 +100,7 @@ function getFieldTypeAsString(field) {
                     return 'UrlFieldData[]';
             }
         case 'slug':
+        case 'icon':
             return 'string';
         case 'seo':
             return buildSeoTsType();
@@ -82,7 +115,7 @@ function getFieldTypeAsString(field) {
 					name: Record<string, string> | null;
 					priceDelta: number;
 					stock: number | null;
-					attributes: Record<string, string> | null;
+					attributes: ${buildShopAttributesType()};
 				}>;
 			} | null`;
         case 'url': {