@xiwebdesign/xicms-core 8.16.0 → 8.17.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/XiCMSProvider.d.ts +2 -0
- package/dist/XiCMSProvider.js +8 -1
- package/dist/XiCMSProvider.js.map +1 -1
- package/dist/admin/lib/veldTaal.js +1 -0
- package/dist/admin/lib/veldTaal.js.map +1 -1
- package/dist/admin/pages/PageEditor.js +2 -2
- package/dist/admin/pages/PageEditor.js.map +1 -1
- package/dist/admin/settings/BedrijfInstellingen.js +14 -2
- package/dist/admin/settings/BedrijfInstellingen.js.map +1 -1
- package/dist/admin/visual/VisualEditor.js +4 -4
- package/dist/admin/visual/VisualEditor.js.map +1 -1
- package/dist/blocks/BlockRenderer.js +49 -3
- package/dist/blocks/BlockRenderer.js.map +1 -1
- package/dist/blocks/builtins/CardsRender.js +2 -1
- package/dist/blocks/builtins/CardsRender.js.map +1 -1
- package/dist/blocks/builtins/PriceListRender.js +3 -1
- package/dist/blocks/builtins/PriceListRender.js.map +1 -1
- package/dist/blocks/registry.js +10 -1
- package/dist/blocks/registry.js.map +1 -1
- package/dist/components/site/SiteHeader.js +4 -1
- package/dist/components/site/SiteHeader.js.map +1 -1
- package/dist/components/site/paginaPad.d.ts +13 -0
- package/dist/components/site/paginaPad.js +15 -0
- package/dist/components/site/paginaPad.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/modules/blokModule.d.ts +14 -0
- package/dist/modules/blokModule.js +64 -0
- package/dist/modules/blokModule.js.map +1 -0
- package/dist/schema/blocks.d.ts +18 -0
- package/dist/schema/blocks.js +8 -1
- package/dist/schema/blocks.js.map +1 -1
- package/dist/schema/herstel.d.ts +50 -0
- package/dist/schema/herstel.js +58 -0
- package/dist/schema/herstel.js.map +1 -0
- package/dist/schema/index.d.ts +1 -0
- package/dist/schema/index.js +1 -0
- package/dist/schema/index.js.map +1 -1
- package/dist/schema/settings.d.ts +15 -0
- package/dist/schema/settings.js +8 -2
- package/dist/schema/settings.js.map +1 -1
- package/dist/schema/siteConfig.d.ts +5 -0
- package/dist/server/cached.js +1 -0
- package/dist/server/cached.js.map +1 -1
- package/dist/server/pages.js +3 -6
- package/dist/server/pages.js.map +1 -1
- package/dist/server/shop.js +5 -12
- package/dist/server/shop.js.map +1 -1
- package/dist/styles.css +68 -9
- package/dist/version.js +1 -1
- package/package.json +8 -2
package/dist/server/shop.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/server/shop.ts"],"sourcesContent":["import \"server-only\";\n\nimport { cache } from \"react\";\nimport type { Metadata } from \"next\";\n\nimport { getAdminDb } from \"../firebase/admin\";\nimport { cachedRead } from \"./cached\";\nimport {\n ProductSchema,\n ShopCategorySchema,\n productPriceCents,\n saneerProductDoc,\n type Product,\n type ShopCategory,\n} from \"../schema/shop\";\n\n/**\n * Server-readers voor de shop (5.6) — zelfde contract als server/pages.ts: Admin SDK als die\n * er is, anders keyless Firestore-REST met de publieke web-apiKey (de rules staan publieke\n * reads op actieve producten/categorieën toe). Reads zijn per-request gededupt via cache();\n * route-level ISR (`revalidate`) dempt de kosten tussen requests.\n *\n * Gebruik in de klantsite (catch-all):\n * const blockData = { shop: await getShopPageData(siteId, path, searchParams) };\n * <PublishedPage page={page} siteId={siteId} blockData={blockData} />\n */\n\nexport type ServerProduct = Product & { id: string };\nexport type ServerShopCategory = ShopCategory & { id: string };\n\n// Gedeelde vorm met de blocks (useBlockData(\"shop\")) — één bron van waarheid.\nexport type { ShopPageData } from \"../modules/shop/types\";\nimport type { ShopPageData } from \"../modules/shop/types\";\n\nfunction parseProduct(id: string, data: unknown): ServerProduct | null {\n // Null-velden strippen vóór de validatie: zie saneerProductDoc — zonder dit verdween een\n // actief product stil van de live winkel terwijl het in /beheer gewoon zichtbaar was.\n const res = ProductSchema.safeParse(saneerProductDoc(data));\n if (!res.success) {\n console.warn(`[xicms] product \"${id}\" faalt schema-validatie en wordt overgeslagen:`, res.error.issues[0]);\n return null;\n }\n return { id, ...res.data };\n}\n\nfunction parseCategory(id: string, data: unknown): ServerShopCategory | null {\n const res = ShopCategorySchema.safeParse(data);\n if (!res.success) {\n console.warn(`[xicms] categorie \"${id}\" faalt schema-validatie en wordt overgeslagen:`, res.error.issues[0]);\n return null;\n }\n return { id, ...res.data };\n}\n\n/* ── keyless REST (zelfde aanpak als server/pages.ts) ────────────────────── */\n\ntype FsValue = Record<string, unknown>;\nfunction decode(v: FsValue): unknown {\n if (v == null) return null;\n if (\"stringValue\" in v) return v.stringValue;\n if (\"integerValue\" in v) return Number(v.integerValue);\n if (\"doubleValue\" in v) return v.doubleValue;\n if (\"booleanValue\" in v) return v.booleanValue;\n if (\"nullValue\" in v) return null;\n if (\"timestampValue\" in v) return v.timestampValue;\n if (\"arrayValue\" in v) return (((v.arrayValue as FsValue)?.values as FsValue[]) ?? []).map(decode);\n if (\"mapValue\" in v) return decodeFields(((v.mapValue as FsValue)?.fields as Record<string, FsValue>) ?? {});\n return null;\n}\nfunction decodeFields(fields: Record<string, FsValue>): Record<string, unknown> {\n return Object.fromEntries(Object.entries(fields).map(([k, x]) => [k, decode(x)]));\n}\n\ninterface RestDoc {\n id: string;\n data: Record<string, unknown>;\n}\n\nasync function restQuery(\n siteId: string,\n collectionId: string,\n filters: { fieldPath: string; value: string }[],\n limit?: number,\n): Promise<RestDoc[]> {\n const apiKey = process.env.NEXT_PUBLIC_FIREBASE_API_KEY;\n const projectId = process.env.NEXT_PUBLIC_FIREBASE_PROJECT_ID;\n if (!apiKey || !projectId) throw new Error(\"Firebase REST-config ontbreekt (apiKey/projectId)\");\n const url = `https://firestore.googleapis.com/v1/projects/${projectId}/databases/(default)/documents/sites/${siteId}:runQuery?key=${apiKey}`;\n const fieldFilters = filters.map((f) => ({\n fieldFilter: { field: { fieldPath: f.fieldPath }, op: \"EQUAL\", value: { stringValue: f.value } },\n }));\n const where =\n fieldFilters.length === 0\n ? undefined\n : fieldFilters.length === 1\n ? fieldFilters[0]\n : { compositeFilter: { op: \"AND\", filters: fieldFilters } };\n const structuredQuery: Record<string, unknown> = { from: [{ collectionId }] };\n if (where) structuredQuery.where = where;\n if (limit) structuredQuery.limit = limit;\n try {\n const res = await fetch(url, {\n method: \"POST\",\n headers: { \"Content-Type\": \"application/json\" },\n body: JSON.stringify({ structuredQuery }),\n // Zelfde vangnet-logica als pages.ts: de tag is het normale pad, de timer dekt een\n // gemiste revalidate-push. Shop-content wijzigt zelden; elke 5 minuten opnieuw tellen was\n // pure verspilling.\n next: { revalidate: Number(process.env.XICMS_ISR_FALLBACK) || 3600, tags: [`xicms:${siteId}:${collectionId}`] },\n });\n if (!res.ok) throw new Error(`Firestore REST-query (shop) ${res.status}`);\n const rows = (await res.json()) as { document?: { name: string; fields: Record<string, FsValue> } }[];\n return rows\n .filter((r) => r.document)\n .map((r) => ({ id: r.document!.name.split(\"/\").pop()!, data: decodeFields(r.document!.fields ?? {}) }));\n } catch (err) {\n // Door naar de aanroeper: uitkomsten worden gecached, fouten niet (zie server/cached.ts).\n throw err instanceof Error ? err : new Error(String(err));\n }\n}\n\n/* ── Readers ─────────────────────────────────────────────────────────────── */\n\nasync function getActiveProductsUncached(siteId: string): Promise<ServerProduct[]> {\n const adb = getAdminDb();\n let docs: RestDoc[];\n if (adb) {\n try {\n const snap = await adb.collection(`sites/${siteId}/products`).where(\"status\", \"==\", \"active\").limit(500).get();\n docs = snap.docs.map((d) => ({ id: d.id, data: d.data() }));\n } catch (e) {\n // Gooien, niet [] — een lege uitkomst zou door de servercache een uur worden vastgehouden.\n throw new Error(`Admin-read producten mislukt: ${(e as Error)?.message ?? e}`);\n }\n } else {\n docs = await restQuery(siteId, \"products\", [{ fieldPath: \"status\", value: \"active\" }], 500);\n }\n return docs\n .map((d) => parseProduct(d.id, d.data))\n .filter((p): p is ServerProduct => p !== null)\n .sort((a, b) => (a.order ?? 0) - (b.order ?? 0) || a.name.localeCompare(b.name, \"nl\"));\n}\n\nasync function getShopCategoriesUncached(siteId: string): Promise<ServerShopCategory[]> {\n const adb = getAdminDb();\n let docs: RestDoc[];\n if (adb) {\n try {\n const snap = await adb.collection(`sites/${siteId}/shopCategories`).limit(100).get();\n docs = snap.docs.map((d) => ({ id: d.id, data: d.data() }));\n } catch (e) {\n throw new Error(`Admin-read categorieën mislukt: ${(e as Error)?.message ?? e}`);\n }\n } else {\n docs = await restQuery(siteId, \"shopCategories\", [], 100);\n }\n return docs\n .map((d) => parseCategory(d.id, d.data))\n .filter((c): c is ServerShopCategory => c !== null && c.visible !== false)\n .sort((a, b) => (a.order ?? 0) - (b.order ?? 0));\n}\n\nasync function getProductBySlugUncached(siteId: string, slug: string): Promise<ServerProduct | null> {\n if (!slug) return null;\n const adb = getAdminDb();\n let docs: RestDoc[];\n if (adb) {\n try {\n const snap = await adb\n .collection(`sites/${siteId}/products`)\n .where(\"status\", \"==\", \"active\")\n .where(\"slug\", \"==\", slug)\n .limit(1)\n .get();\n docs = snap.docs.map((d) => ({ id: d.id, data: d.data() }));\n } catch (e) {\n throw new Error(`Admin-read product mislukt: ${(e as Error)?.message ?? e}`);\n }\n } else {\n docs = await restQuery(\n siteId,\n \"products\",\n [\n { fieldPath: \"status\", value: \"active\" },\n { fieldPath: \"slug\", value: slug },\n ],\n 1,\n );\n }\n const d = docs[0];\n return d ? parseProduct(d.id, d.data) : null;\n}\n\n/**\n * Tagged servercache (zie server/cached.ts) om élk leespad (Admin én REST): de `products`-ping van\n * `saveProduct`/`deleteProduct` maakt dit binnen seconden vers; tot die tijd kost een render nul\n * Firestore-reads. React `cache()` blijft eromheen voor de per-request-dedup (metadata + render).\n */\nexport const getActiveProducts = cache((siteId: string) =>\n cachedRead([\"xicms\", \"shop\", \"products\", siteId], [`xicms:${siteId}:products`], () => getActiveProductsUncached(siteId)),\n);\nexport const getShopCategories = cache((siteId: string) =>\n cachedRead([\"xicms\", \"shop\", \"categories\", siteId], [`xicms:${siteId}:shopCategories`], () => getShopCategoriesUncached(siteId)),\n);\nexport const getProductBySlug = cache((siteId: string, slug: string) =>\n cachedRead([\"xicms\", \"shop\", \"product\", siteId, slug], [`xicms:${siteId}:products`], () => getProductBySlugUncached(siteId, slug)),\n);\n\n/**\n * Verzamelt de shop-startdata voor één pagina. `searchParams.p` (detailpagina) bepaalt of er\n * ook een enkel product geladen wordt. Geef het resultaat door als\n * `<PublishedPage blockData={{ shop: data }}>`.\n */\nexport async function getShopPageData(\n siteId: string,\n searchParams?: { p?: string | string[]; [k: string]: unknown },\n): Promise<ShopPageData> {\n const slugParam = searchParams?.p;\n const slug = Array.isArray(slugParam) ? slugParam[0] : slugParam;\n const [products, categories, product] = await Promise.all([\n getActiveProducts(siteId),\n getShopCategories(siteId),\n slug ? getProductBySlug(siteId, slug) : Promise.resolve(undefined),\n ]);\n const data: ShopPageData = { products, categories };\n if (slug !== undefined) data.product = product ?? null;\n return data;\n}\n\n/* ── SEO ─────────────────────────────────────────────────────────────────── */\n\n/** Metadata voor een productdetailpagina (title/description/OG-beeld). */\nexport function buildProductMetadata(\n product: ServerProduct | null,\n site: { name: string; domain?: string },\n): Metadata {\n if (!product) return { title: `Product — ${site.name}` };\n const description = (product.description || `${product.name} — ${site.name}`)\n .replace(/\\s+/g, \" \")\n .slice(0, 300);\n const image = product.images?.[0];\n return {\n title: `${product.name} — ${site.name}`,\n description,\n openGraph: {\n title: product.name,\n description,\n type: \"website\",\n ...(image ? { images: [{ url: image }] } : {}),\n },\n };\n}\n\n/** schema.org Product/Offer-JSON-LD met echte prijs en beschikbaarheid. */\nexport function buildProductJsonLd(\n product: ServerProduct,\n site: { name: string; domain?: string },\n currency = \"EUR\",\n): Record<string, unknown> {\n const soldOut =\n product.trackStock === true &&\n (product.options ?? []).length === 0 &&\n product.stock !== undefined &&\n product.stock <= 0;\n return {\n \"@context\": \"https://schema.org\",\n \"@type\": \"Product\",\n name: product.name,\n ...(product.description ? { description: product.description.slice(0, 500) } : {}),\n ...(product.images?.length ? { image: product.images } : {}),\n offers: {\n \"@type\": \"Offer\",\n price: (productPriceCents(product) / 100).toFixed(2),\n priceCurrency: currency,\n availability: soldOut ? \"https://schema.org/OutOfStock\" : \"https://schema.org/InStock\",\n ...(site.domain ? { url: `https://${site.domain}/product?p=${encodeURIComponent(product.slug)}` } : {}),\n },\n brand: { \"@type\": \"Brand\", name: site.name },\n };\n}\n"],"mappings":"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","names":["d"]}
|
|
1
|
+
{"version":3,"sources":["../../src/server/shop.ts"],"sourcesContent":["import \"server-only\";\n\nimport { cache } from \"react\";\nimport type { Metadata } from \"next\";\n\nimport { getAdminDb } from \"../firebase/admin\";\nimport { cachedRead } from \"./cached\";\nimport { leesMetHerstel } from \"../schema/herstel\";\nimport {\n ProductSchema,\n ShopCategorySchema,\n productPriceCents,\n saneerProductDoc,\n type Product,\n type ShopCategory,\n} from \"../schema/shop\";\n\n/**\n * Server-readers voor de shop (5.6) — zelfde contract als server/pages.ts: Admin SDK als die\n * er is, anders keyless Firestore-REST met de publieke web-apiKey (de rules staan publieke\n * reads op actieve producten/categorieën toe). Reads zijn per-request gededupt via cache();\n * route-level ISR (`revalidate`) dempt de kosten tussen requests.\n *\n * Gebruik in de klantsite (catch-all):\n * const blockData = { shop: await getShopPageData(siteId, path, searchParams) };\n * <PublishedPage page={page} siteId={siteId} blockData={blockData} />\n */\n\nexport type ServerProduct = Product & { id: string };\nexport type ServerShopCategory = ShopCategory & { id: string };\n\n// Gedeelde vorm met de blocks (useBlockData(\"shop\")) — één bron van waarheid.\nexport type { ShopPageData } from \"../modules/shop/types\";\nimport type { ShopPageData } from \"../modules/shop/types\";\n\nfunction parseProduct(id: string, data: unknown): ServerProduct | null {\n // Null-velden strippen vóór de validatie: zie saneerProductDoc — zonder dit verdween een\n // actief product stil van de live winkel terwijl het in /beheer gewoon zichtbaar was.\n // 8.17: + mild herstel (te lange velden inkorten), zie schema/herstel.ts.\n const product = leesMetHerstel(ProductSchema, saneerProductDoc(data), \"product\", id);\n return product ? { id, ...product } : null;\n}\n\nfunction parseCategory(id: string, data: unknown): ServerShopCategory | null {\n const categorie = leesMetHerstel(ShopCategorySchema, data, \"categorie\", id);\n return categorie ? { id, ...categorie } : null;\n}\n\n/* ── keyless REST (zelfde aanpak als server/pages.ts) ────────────────────── */\n\ntype FsValue = Record<string, unknown>;\nfunction decode(v: FsValue): unknown {\n if (v == null) return null;\n if (\"stringValue\" in v) return v.stringValue;\n if (\"integerValue\" in v) return Number(v.integerValue);\n if (\"doubleValue\" in v) return v.doubleValue;\n if (\"booleanValue\" in v) return v.booleanValue;\n if (\"nullValue\" in v) return null;\n if (\"timestampValue\" in v) return v.timestampValue;\n if (\"arrayValue\" in v) return (((v.arrayValue as FsValue)?.values as FsValue[]) ?? []).map(decode);\n if (\"mapValue\" in v) return decodeFields(((v.mapValue as FsValue)?.fields as Record<string, FsValue>) ?? {});\n return null;\n}\nfunction decodeFields(fields: Record<string, FsValue>): Record<string, unknown> {\n return Object.fromEntries(Object.entries(fields).map(([k, x]) => [k, decode(x)]));\n}\n\ninterface RestDoc {\n id: string;\n data: Record<string, unknown>;\n}\n\nasync function restQuery(\n siteId: string,\n collectionId: string,\n filters: { fieldPath: string; value: string }[],\n limit?: number,\n): Promise<RestDoc[]> {\n const apiKey = process.env.NEXT_PUBLIC_FIREBASE_API_KEY;\n const projectId = process.env.NEXT_PUBLIC_FIREBASE_PROJECT_ID;\n if (!apiKey || !projectId) throw new Error(\"Firebase REST-config ontbreekt (apiKey/projectId)\");\n const url = `https://firestore.googleapis.com/v1/projects/${projectId}/databases/(default)/documents/sites/${siteId}:runQuery?key=${apiKey}`;\n const fieldFilters = filters.map((f) => ({\n fieldFilter: { field: { fieldPath: f.fieldPath }, op: \"EQUAL\", value: { stringValue: f.value } },\n }));\n const where =\n fieldFilters.length === 0\n ? undefined\n : fieldFilters.length === 1\n ? fieldFilters[0]\n : { compositeFilter: { op: \"AND\", filters: fieldFilters } };\n const structuredQuery: Record<string, unknown> = { from: [{ collectionId }] };\n if (where) structuredQuery.where = where;\n if (limit) structuredQuery.limit = limit;\n try {\n const res = await fetch(url, {\n method: \"POST\",\n headers: { \"Content-Type\": \"application/json\" },\n body: JSON.stringify({ structuredQuery }),\n // Zelfde vangnet-logica als pages.ts: de tag is het normale pad, de timer dekt een\n // gemiste revalidate-push. Shop-content wijzigt zelden; elke 5 minuten opnieuw tellen was\n // pure verspilling.\n next: { revalidate: Number(process.env.XICMS_ISR_FALLBACK) || 3600, tags: [`xicms:${siteId}:${collectionId}`] },\n });\n if (!res.ok) throw new Error(`Firestore REST-query (shop) ${res.status}`);\n const rows = (await res.json()) as { document?: { name: string; fields: Record<string, FsValue> } }[];\n return rows\n .filter((r) => r.document)\n .map((r) => ({ id: r.document!.name.split(\"/\").pop()!, data: decodeFields(r.document!.fields ?? {}) }));\n } catch (err) {\n // Door naar de aanroeper: uitkomsten worden gecached, fouten niet (zie server/cached.ts).\n throw err instanceof Error ? err : new Error(String(err));\n }\n}\n\n/* ── Readers ─────────────────────────────────────────────────────────────── */\n\nasync function getActiveProductsUncached(siteId: string): Promise<ServerProduct[]> {\n const adb = getAdminDb();\n let docs: RestDoc[];\n if (adb) {\n try {\n const snap = await adb.collection(`sites/${siteId}/products`).where(\"status\", \"==\", \"active\").limit(500).get();\n docs = snap.docs.map((d) => ({ id: d.id, data: d.data() }));\n } catch (e) {\n // Gooien, niet [] — een lege uitkomst zou door de servercache een uur worden vastgehouden.\n throw new Error(`Admin-read producten mislukt: ${(e as Error)?.message ?? e}`);\n }\n } else {\n docs = await restQuery(siteId, \"products\", [{ fieldPath: \"status\", value: \"active\" }], 500);\n }\n return docs\n .map((d) => parseProduct(d.id, d.data))\n .filter((p): p is ServerProduct => p !== null)\n .sort((a, b) => (a.order ?? 0) - (b.order ?? 0) || a.name.localeCompare(b.name, \"nl\"));\n}\n\nasync function getShopCategoriesUncached(siteId: string): Promise<ServerShopCategory[]> {\n const adb = getAdminDb();\n let docs: RestDoc[];\n if (adb) {\n try {\n const snap = await adb.collection(`sites/${siteId}/shopCategories`).limit(100).get();\n docs = snap.docs.map((d) => ({ id: d.id, data: d.data() }));\n } catch (e) {\n throw new Error(`Admin-read categorieën mislukt: ${(e as Error)?.message ?? e}`);\n }\n } else {\n docs = await restQuery(siteId, \"shopCategories\", [], 100);\n }\n return docs\n .map((d) => parseCategory(d.id, d.data))\n .filter((c): c is ServerShopCategory => c !== null && c.visible !== false)\n .sort((a, b) => (a.order ?? 0) - (b.order ?? 0));\n}\n\nasync function getProductBySlugUncached(siteId: string, slug: string): Promise<ServerProduct | null> {\n if (!slug) return null;\n const adb = getAdminDb();\n let docs: RestDoc[];\n if (adb) {\n try {\n const snap = await adb\n .collection(`sites/${siteId}/products`)\n .where(\"status\", \"==\", \"active\")\n .where(\"slug\", \"==\", slug)\n .limit(1)\n .get();\n docs = snap.docs.map((d) => ({ id: d.id, data: d.data() }));\n } catch (e) {\n throw new Error(`Admin-read product mislukt: ${(e as Error)?.message ?? e}`);\n }\n } else {\n docs = await restQuery(\n siteId,\n \"products\",\n [\n { fieldPath: \"status\", value: \"active\" },\n { fieldPath: \"slug\", value: slug },\n ],\n 1,\n );\n }\n const d = docs[0];\n return d ? parseProduct(d.id, d.data) : null;\n}\n\n/**\n * Tagged servercache (zie server/cached.ts) om élk leespad (Admin én REST): de `products`-ping van\n * `saveProduct`/`deleteProduct` maakt dit binnen seconden vers; tot die tijd kost een render nul\n * Firestore-reads. React `cache()` blijft eromheen voor de per-request-dedup (metadata + render).\n */\nexport const getActiveProducts = cache((siteId: string) =>\n cachedRead([\"xicms\", \"shop\", \"products\", siteId], [`xicms:${siteId}:products`], () => getActiveProductsUncached(siteId)),\n);\nexport const getShopCategories = cache((siteId: string) =>\n cachedRead([\"xicms\", \"shop\", \"categories\", siteId], [`xicms:${siteId}:shopCategories`], () => getShopCategoriesUncached(siteId)),\n);\nexport const getProductBySlug = cache((siteId: string, slug: string) =>\n cachedRead([\"xicms\", \"shop\", \"product\", siteId, slug], [`xicms:${siteId}:products`], () => getProductBySlugUncached(siteId, slug)),\n);\n\n/**\n * Verzamelt de shop-startdata voor één pagina. `searchParams.p` (detailpagina) bepaalt of er\n * ook een enkel product geladen wordt. Geef het resultaat door als\n * `<PublishedPage blockData={{ shop: data }}>`.\n */\nexport async function getShopPageData(\n siteId: string,\n searchParams?: { p?: string | string[]; [k: string]: unknown },\n): Promise<ShopPageData> {\n const slugParam = searchParams?.p;\n const slug = Array.isArray(slugParam) ? slugParam[0] : slugParam;\n const [products, categories, product] = await Promise.all([\n getActiveProducts(siteId),\n getShopCategories(siteId),\n slug ? getProductBySlug(siteId, slug) : Promise.resolve(undefined),\n ]);\n const data: ShopPageData = { products, categories };\n if (slug !== undefined) data.product = product ?? null;\n return data;\n}\n\n/* ── SEO ─────────────────────────────────────────────────────────────────── */\n\n/** Metadata voor een productdetailpagina (title/description/OG-beeld). */\nexport function buildProductMetadata(\n product: ServerProduct | null,\n site: { name: string; domain?: string },\n): Metadata {\n if (!product) return { title: `Product — ${site.name}` };\n const description = (product.description || `${product.name} — ${site.name}`)\n .replace(/\\s+/g, \" \")\n .slice(0, 300);\n const image = product.images?.[0];\n return {\n title: `${product.name} — ${site.name}`,\n description,\n openGraph: {\n title: product.name,\n description,\n type: \"website\",\n ...(image ? { images: [{ url: image }] } : {}),\n },\n };\n}\n\n/** schema.org Product/Offer-JSON-LD met echte prijs en beschikbaarheid. */\nexport function buildProductJsonLd(\n product: ServerProduct,\n site: { name: string; domain?: string },\n currency = \"EUR\",\n): Record<string, unknown> {\n const soldOut =\n product.trackStock === true &&\n (product.options ?? []).length === 0 &&\n product.stock !== undefined &&\n product.stock <= 0;\n return {\n \"@context\": \"https://schema.org\",\n \"@type\": \"Product\",\n name: product.name,\n ...(product.description ? { description: product.description.slice(0, 500) } : {}),\n ...(product.images?.length ? { image: product.images } : {}),\n offers: {\n \"@type\": \"Offer\",\n price: (productPriceCents(product) / 100).toFixed(2),\n priceCurrency: currency,\n availability: soldOut ? \"https://schema.org/OutOfStock\" : \"https://schema.org/InStock\",\n ...(site.domain ? { url: `https://${site.domain}/product?p=${encodeURIComponent(product.slug)}` } : {}),\n },\n brand: { \"@type\": \"Brand\", name: site.name },\n };\n}\n"],"mappings":"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","names":["d"]}
|
package/dist/styles.css
CHANGED
|
@@ -961,6 +961,17 @@
|
|
|
961
961
|
overflow: hidden;
|
|
962
962
|
isolation: isolate;
|
|
963
963
|
}
|
|
964
|
+
/* 8.17: een hero met een beeld als achtergrond is een vlak — dan hoort de tekst niet tegen de rand.
|
|
965
|
+
Over de volle breedte valt de tekst op dezelfde lijn als de rest van de pagina (zoals een gekleurd
|
|
966
|
+
vlak over de volle breedte, zie .xicms-block--bg.xicms-block--full). */
|
|
967
|
+
.xicms-hero[data-media="cover"] {
|
|
968
|
+
padding-left: clamp(1.25rem, 4vw, 3.5rem);
|
|
969
|
+
padding-right: clamp(1.25rem, 4vw, 3.5rem);
|
|
970
|
+
}
|
|
971
|
+
.xicms-block--full > .xicms-hero {
|
|
972
|
+
padding-left: max(var(--xicms-container-pad), calc((100vw - var(--xicms-container-max)) / 2 + var(--xicms-container-pad)));
|
|
973
|
+
padding-right: max(var(--xicms-container-pad), calc((100vw - var(--xicms-container-max)) / 2 + var(--xicms-container-pad)));
|
|
974
|
+
}
|
|
964
975
|
.xicms-hero[data-align="center"] {
|
|
965
976
|
text-align: center;
|
|
966
977
|
align-items: center;
|
|
@@ -2648,7 +2659,13 @@
|
|
|
2648
2659
|
grid-items voorkomt dat foto's rechts uit de kaart lopen (grid-items krimpen standaard niet onder
|
|
2649
2660
|
hun content). Een site die 1 kolom wil, zet dit per-site terug in z'n eigen globals.css. */
|
|
2650
2661
|
@media (max-width: 639px) {
|
|
2651
|
-
.
|
|
2662
|
+
/* 8.17: kaarten met beeld of langere tekst één kolom (zie CardsRender `mobiel`), tekst links. */
|
|
2663
|
+
.xicms-cards.xicms-cards--mobiel-1 .astryx-grid {
|
|
2664
|
+
grid-template-columns: 1fr !important;
|
|
2665
|
+
gap: 1rem;
|
|
2666
|
+
}
|
|
2667
|
+
.xicms-cards.xicms-cards--mobiel-1 .xicms-cards__card { text-align: left; }
|
|
2668
|
+
.xicms-cards--mobiel-2 .astryx-grid,
|
|
2652
2669
|
.xicms-pricing .astryx-grid,
|
|
2653
2670
|
.xicms-testimonials .astryx-grid,
|
|
2654
2671
|
.xicms-counters .astryx-grid {
|
|
@@ -2664,8 +2681,8 @@
|
|
|
2664
2681
|
.xicms-cards img {
|
|
2665
2682
|
max-width: 100%;
|
|
2666
2683
|
}
|
|
2667
|
-
.xicms-cards__card { text-align: center; }
|
|
2668
|
-
.xicms-cards__icon { margin-inline: auto; }
|
|
2684
|
+
.xicms-cards--mobiel-2 .xicms-cards__card { text-align: center; }
|
|
2685
|
+
.xicms-cards--mobiel-2 .xicms-cards__icon { margin-inline: auto; }
|
|
2669
2686
|
}
|
|
2670
2687
|
|
|
2671
2688
|
/* ════════════════════ Downloads ════════════════════ */
|
|
@@ -3657,12 +3674,15 @@
|
|
|
3657
3674
|
::view-transition-new(*) { animation: none !important; }
|
|
3658
3675
|
}
|
|
3659
3676
|
|
|
3660
|
-
/* 8.
|
|
3677
|
+
/* 8.17: dezelfde lijn als .xicms-block--container en de kop (buitenmaat = container-max, inhoud
|
|
3678
|
+
= container-max min 2× container-pad). Tot 8.16 stond de inhoud hier 1× container-pad verder
|
|
3679
|
+
naar buiten dan de kop erboven.
|
|
3680
|
+
8.10: een gekleurd vlak over de volle breedte houdt zijn inhoud op containerbreedte — anders raakt
|
|
3661
3681
|
de tekst de rand van het scherm. Links in een donker vlak volgen de tekstkleur (de merkkleur is
|
|
3662
3682
|
daar vaak onleesbaar). */
|
|
3663
3683
|
.xicms-block--bg.xicms-block--full {
|
|
3664
|
-
padding-left: max(var(--xicms-container-pad), calc((100vw - var(--xicms-container-max)) / 2));
|
|
3665
|
-
padding-right: max(var(--xicms-container-pad), calc((100vw - var(--xicms-container-max)) / 2));
|
|
3684
|
+
padding-left: max(var(--xicms-container-pad), calc((100vw - var(--xicms-container-max)) / 2 + var(--xicms-container-pad)));
|
|
3685
|
+
padding-right: max(var(--xicms-container-pad), calc((100vw - var(--xicms-container-max)) / 2 + var(--xicms-container-pad)));
|
|
3666
3686
|
}
|
|
3667
3687
|
.xicms-block--bg-donker .xicms-richtext a,
|
|
3668
3688
|
.xicms-block--bg-donker :where(p, li) > a {
|
|
@@ -4054,16 +4074,31 @@
|
|
|
4054
4074
|
}
|
|
4055
4075
|
|
|
4056
4076
|
/* ── 8.13: SiteHeader ──────────────────────────────────────────────────────────────────────── */
|
|
4077
|
+
/* 8.17: kleuren via --xicms-header-bg/-fg — herstijlen is één variabele zetten, niet vechten met de
|
|
4078
|
+
specificiteit van .is-sticky. data-stijl="donker"|"merk" komt uit Instellingen → Kop. */
|
|
4057
4079
|
.xicms-header {
|
|
4080
|
+
--xicms-header-bg: var(--xicms-bg, #fff);
|
|
4081
|
+
--xicms-header-fg: inherit;
|
|
4058
4082
|
position: relative;
|
|
4059
4083
|
z-index: 40;
|
|
4060
|
-
background: var(--xicms-bg
|
|
4084
|
+
background: var(--xicms-header-bg);
|
|
4085
|
+
color: var(--xicms-header-fg);
|
|
4061
4086
|
border-bottom: 1px solid var(--xicms-border, rgba(0, 0, 0, 0.08));
|
|
4062
4087
|
}
|
|
4088
|
+
.xicms-header[data-stijl="donker"] {
|
|
4089
|
+
--xicms-header-bg: var(--xicms-fg, #0f172a);
|
|
4090
|
+
--xicms-header-fg: #fff;
|
|
4091
|
+
border-bottom-color: transparent;
|
|
4092
|
+
}
|
|
4093
|
+
.xicms-header[data-stijl="merk"] {
|
|
4094
|
+
--xicms-header-bg: var(--xicms-primary, #4f46e5);
|
|
4095
|
+
--xicms-header-fg: var(--xicms-on-primary, #fff);
|
|
4096
|
+
border-bottom-color: transparent;
|
|
4097
|
+
}
|
|
4063
4098
|
.xicms-header.is-sticky {
|
|
4064
4099
|
position: sticky;
|
|
4065
4100
|
top: var(--xicms-topbar, 0px);
|
|
4066
|
-
background: color-mix(in srgb, var(--xicms-bg
|
|
4101
|
+
background: color-mix(in srgb, var(--xicms-header-bg) 92%, transparent);
|
|
4067
4102
|
-webkit-backdrop-filter: saturate(1.4) blur(10px);
|
|
4068
4103
|
backdrop-filter: saturate(1.4) blur(10px);
|
|
4069
4104
|
}
|
|
@@ -4085,12 +4120,18 @@
|
|
|
4085
4120
|
font-weight: 700;
|
|
4086
4121
|
text-decoration: none;
|
|
4087
4122
|
}
|
|
4123
|
+
/* 8.17: het logo volgt de ingestelde hoogte (geen vaste breedtegrens van 220px meer — een breed
|
|
4124
|
+
woordmerk werd daardoor geknepen) en schaalt op de telefoon terug. */
|
|
4088
4125
|
.xicms-header__merk img {
|
|
4089
4126
|
display: block;
|
|
4127
|
+
height: var(--xicms-logo-h, 40px);
|
|
4090
4128
|
width: auto;
|
|
4091
|
-
max-width:
|
|
4129
|
+
max-width: min(var(--xicms-logo-max, 480px), 55vw);
|
|
4092
4130
|
object-fit: contain;
|
|
4093
4131
|
}
|
|
4132
|
+
@media (max-width: 900px) {
|
|
4133
|
+
.xicms-header__merk img { height: min(var(--xicms-logo-h, 40px), 56px); max-width: 62vw; }
|
|
4134
|
+
}
|
|
4094
4135
|
.xicms-header__nav {
|
|
4095
4136
|
display: flex;
|
|
4096
4137
|
flex: 1;
|
|
@@ -4286,6 +4327,24 @@
|
|
|
4286
4327
|
.xicms-prijslijst__regel:last-child {
|
|
4287
4328
|
border-bottom: 0;
|
|
4288
4329
|
}
|
|
4330
|
+
/* 8.17: regel met foto (menukaart met beeld): foto links, naam/prijs/omschrijving ernaast. */
|
|
4331
|
+
.xicms-prijslijst__regel.heeft-foto {
|
|
4332
|
+
display: grid;
|
|
4333
|
+
grid-template-columns: 4.75rem 1fr;
|
|
4334
|
+
grid-template-areas: "foto lijn" "foto details";
|
|
4335
|
+
column-gap: 1rem;
|
|
4336
|
+
align-items: start;
|
|
4337
|
+
}
|
|
4338
|
+
.xicms-prijslijst__regel.heeft-foto .xicms-prijslijst__lijn { grid-area: lijn; }
|
|
4339
|
+
.xicms-prijslijst__regel.heeft-foto .xicms-prijslijst__details { grid-area: details; }
|
|
4340
|
+
.xicms-prijslijst__foto {
|
|
4341
|
+
grid-area: foto;
|
|
4342
|
+
width: 4.75rem;
|
|
4343
|
+
height: 4.75rem;
|
|
4344
|
+
border-radius: var(--xicms-radius, 12px);
|
|
4345
|
+
object-fit: cover;
|
|
4346
|
+
background: color-mix(in srgb, currentColor 6%, transparent);
|
|
4347
|
+
}
|
|
4289
4348
|
.xicms-prijslijst__regel.is-uitgelicht .xicms-prijslijst__naam::after {
|
|
4290
4349
|
content: " ★";
|
|
4291
4350
|
color: var(--xicms-primary);
|
package/dist/version.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
const CORE_VERSION = true ? "8.
|
|
1
|
+
const CORE_VERSION = true ? "8.17.0" : "0.0.0-dev";
|
|
2
2
|
const CORE_PACKAGE = "@xiwebdesign/xicms-core";
|
|
3
3
|
function isNieuwer(beschikbaar, huidig) {
|
|
4
4
|
const delen = (v) => v.split("-")[0].split(".").map((n) => Number.parseInt(n, 10) || 0);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xiwebdesign/xicms-core",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.17.0",
|
|
4
4
|
"description": "XiCMS engine: gestructureerde content, pagina's, draft/publish, admin (TipTap+Radix), SEO en beveiliging voor klantsites.",
|
|
5
5
|
"license": "UNLICENSED",
|
|
6
6
|
"repository": {
|
|
@@ -18,7 +18,13 @@
|
|
|
18
18
|
},
|
|
19
19
|
"./schema": {
|
|
20
20
|
"types": "./dist/schema/index.d.ts",
|
|
21
|
-
"import": "./dist/schema/index.js"
|
|
21
|
+
"import": "./dist/schema/index.js",
|
|
22
|
+
"default": "./dist/schema/index.js"
|
|
23
|
+
},
|
|
24
|
+
"./schema/shop": {
|
|
25
|
+
"types": "./dist/schema/shop.d.ts",
|
|
26
|
+
"import": "./dist/schema/shop.js",
|
|
27
|
+
"default": "./dist/schema/shop.js"
|
|
22
28
|
},
|
|
23
29
|
"./blocks": {
|
|
24
30
|
"types": "./dist/blocks/index.d.ts",
|