@nextblock-cms/ecom 0.21.2 → 0.22.0

package/README.md

@@ -1,43 +1,43 @@
-# @nextblock-cms/ecom
-
-The premium commerce module of [NextBlock](https://github.com/nextblock-cms/nextblock), the
-open-core CMS for Next.js and Supabase: products and variants, cart and checkout, orders,
-coupons, currencies, shipping zones, tax rates and invoices. Physical products are paid through
-Stripe and digital products through Freemius.
-
-NextBlock projects install it under the alias `@nextblock-cms/ecommerce`, and every import uses
-that name. Projects created with `npm create nextblock@latest` already have it:
-
-```json
-"@nextblock-cms/ecommerce": "npm:@nextblock-cms/ecom@latest"
-```
-
-It needs Next.js 16 and React 19 (peer dependencies), plus the NextBlock database schema that
-`@nextblock-cms/db` ships.
-
-## Licensing
-
-The source is public under AGPL-3.0-or-later, and the features are license-gated. A NextBlock
-project turns on its checkout API and commerce CMS screens only after an ecommerce license is
-active: start a trial or buy one in the CMS under **Settings → Packages**. The app checks it
-with `verifyPackageOnline('ecommerce')` from `@nextblock-cms/db/server`.
-
-## Entry points
-
-| Import | Use it from | What it holds |
-| :-- | :-- | :-- |
-| `@nextblock-cms/ecommerce` | client or server | Storefront and account components (`Cart`, `CartDrawer`, `Checkout`, `ProductGrid`, `ProductCard`, `FeaturedProduct`, `AddToCartButton`, `CurrencySwitcher`, …), the cart store, `CurrencyProvider`, and the CMS `ProductForm` |
-| `@nextblock-cms/ecommerce/server` | server only | Stripe checkout, webhooks and order sync, payment configuration, inventory, invoices, tax details and coupons |
-| `@nextblock-cms/ecommerce/<module>` | depends on the module | One compiled module, for example `@nextblock-cms/ecommerce/cart-store`, `/components/Cart` or `/server-actions/product-actions` |
-
-The package keeps each module's `'use client'` or `'use server'` directive, so the consuming
-Next.js build splits client and server code correctly.
-
-## Documentation
-
-- [Ecommerce capabilities](https://github.com/nextblock-cms/nextblock/blob/master/docs/02-ECOMMERCE-CAPABILITIES.md)
-- [Project overview](https://github.com/nextblock-cms/nextblock/blob/master/docs/01-PROJECT-OVERVIEW.md)
-
-## License
-
-AGPL-3.0-or-later.
+# @nextblock-cms/ecom
+
+The premium commerce module of [NextBlock](https://github.com/nextblock-cms/nextblock), the
+open-core CMS for Next.js and Supabase: products and variants, cart and checkout, orders,
+coupons, currencies, shipping zones, tax rates and invoices. Physical products are paid through
+Stripe and digital products through Freemius.
+
+NextBlock projects install it under the alias `@nextblock-cms/ecommerce`, and every import uses
+that name. Projects created with `npm create nextblock@latest` already have it:
+
+```json
+"@nextblock-cms/ecommerce": "npm:@nextblock-cms/ecom@latest"
+```
+
+It needs Next.js 16 and React 19 (peer dependencies), plus the NextBlock database schema that
+`@nextblock-cms/db` ships.
+
+## Licensing
+
+The source is public under AGPL-3.0-or-later, and the features are license-gated. A NextBlock
+project turns on its checkout API and commerce CMS screens only after an ecommerce license is
+active: start a trial or buy one in the CMS under **Settings → Packages**. The app checks it
+with `verifyPackageOnline('ecommerce')` from `@nextblock-cms/db/server`.
+
+## Entry points
+
+| Import | Use it from | What it holds |
+| :-- | :-- | :-- |
+| `@nextblock-cms/ecommerce` | client or server | Storefront and account components (`Cart`, `CartDrawer`, `Checkout`, `ProductGrid`, `ProductCard`, `FeaturedProduct`, `AddToCartButton`, `CurrencySwitcher`, …), the cart store, `CurrencyProvider`, and the CMS `ProductForm` |
+| `@nextblock-cms/ecommerce/server` | server only | Stripe checkout, webhooks and order sync, payment configuration, inventory, invoices, tax details and coupons |
+| `@nextblock-cms/ecommerce/<module>` | depends on the module | One compiled module, for example `@nextblock-cms/ecommerce/cart-store`, `/components/Cart` or `/server-actions/product-actions` |
+
+The package keeps each module's `'use client'` or `'use server'` directive, so the consuming
+Next.js build splits client and server code correctly.
+
+## Documentation
+
+- [Ecommerce capabilities](https://github.com/nextblock-cms/nextblock/blob/master/docs/02-ECOMMERCE-CAPABILITIES.md)
+- [Project overview](https://github.com/nextblock-cms/nextblock/blob/master/docs/01-PROJECT-OVERVIEW.md)
+
+## License
+
+AGPL-3.0-or-later.

package/lib/invoice-server.cjs

@@ -7,7 +7,7 @@ const e=require("./customer.cjs"),t=require("./invoice.cjs"),n=require("./order-
           width,
           height
         )
-      `;async function l(e){let{data:t}=await e.from(`site_settings`).select(`value`).eq(`key`,s).maybeSingle(),n=t?.value,r=typeof n==`string`&&n.length>0?n:null;if(r){let{data:t}=await e.from(`logos`).select(c).eq(`id`,r).maybeSingle();if(t)return t}let{data:i}=await e.from(`logos`).select(c).order(`created_at`,{ascending:!1}).limit(1).maybeSingle();return i??null}async function u(e){let n=a(e),[r,i]=await Promise.all([n.from(`site_settings`).select(`value`).eq(`key`,t.INVOICE_SETTINGS_KEY).maybeSingle(),l(n)]);return{settings:t.normalizeInvoiceSettings(r.data?.value??t.DEFAULT_INVOICE_SETTINGS),logo:o(i)}}async function d(e){let{data:t,error:n}=await a(e.client).rpc(`assign_order_invoice_metadata`,{p_order_id:e.orderId,p_paid_at:e.paidAt??null}).single();if(n)throw Error(n.message);return{invoiceNumber:t?.invoice_number??null,paidAt:t?.paid_at??null}}async function f(t,r){let i=a(r),{data:o,error:s}=await i.from(`orders`).select(`
+      `;async function l(e){let{data:t}=await e.from(`site_settings`).select(`value`).eq(`key`,s).maybeSingle(),n=t?.value,r=typeof n==`string`&&n.length>0?n:null;if(r){let{data:t}=await e.from(`logos`).select(c).eq(`id`,r).maybeSingle();if(t)return t}let{data:i}=await e.from(`logos`).select(c).order(`created_at`,{ascending:!1}).limit(1).maybeSingle();return i??null}async function u(e){let n=a(e),[r,i]=await Promise.all([n.from(`site_settings`).select(`value`).eq(`key`,t.INVOICE_SETTINGS_KEY).maybeSingle(),l(n)]);return{settings:t.normalizeInvoiceSettings(r.data?.value??t.DEFAULT_INVOICE_SETTINGS),logo:o(i)}}async function d(e){let{data:t,error:n}=await a(e.client).rpc(`assign_order_invoice_metadata`,{p_order_id:e.orderId,p_paid_at:e.paidAt??null}).single();if(n)throw Error(n.message);return{invoiceNumber:t?.invoice_number??null,paidAt:t?.paid_at??null}}async function f(t,i){let{data:o,error:s}=await a(i).from(`orders`).select(`
       id,
       invoice_number,
       paid_at,
@@ -30,4 +30,4 @@ const e=require("./customer.cjs"),t=require("./invoice.cjs"),n=require("./order-
         quantity,
         price_at_purchase
       )
-    `).eq(`id`,t).single();if(s||!o)throw Error(s?.message||`Order not found`);let c=(o.order_items||[]).map(e=>e.product_id).filter(Boolean),l=(o.order_items||[]).map(e=>e.variant_id).filter(Boolean),[u,d]=await Promise.all([c.length?i.from(`products`).select(`id, title, sku`).in(`id`,c):Promise.resolve({data:[],error:null}),l.length?i.from(`product_variants`).select(`id, sku`).in(`id`,l):Promise.resolve({data:[],error:null})]),f=new Map((u.data||[]).map(e=>[e.id,e])),p=new Map((d.data||[]).map(e=>[e.id,e])),m=(o.order_items||[]).map(e=>{let t=e.product_id?f.get(e.product_id):null,n=e.variant_id?p.get(e.variant_id):null,r=t?.title||`Product`,i=n?.sku?`SKU: ${n.sku}`:t?.sku?`SKU: ${t.sku}`:null;return{id:e.id,product_id:e.product_id??null,variant_id:e.variant_id??null,title:r,description:i,quantity:e.quantity,unit_amount:e.price_at_purchase,total_amount:e.price_at_purchase*e.quantity,sku:n?.sku??t?.sku??null}});return{id:o.id,invoice_number:o.invoice_number??null,paid_at:o.paid_at??null,created_at:o.created_at??null,currency:o.currency||`usd`,status:o.status,provider:o.provider??null,subtotal:typeof o.subtotal==`number`?o.subtotal:m.reduce((e,t)=>e+t.total_amount,0),shipping_total:typeof o.shipping_total==`number`?o.shipping_total:0,discount_total:typeof o.discount_total==`number`?o.discount_total:0,coupon_code:o.coupon_code??null,tax_total:typeof o.tax_total==`number`?o.tax_total:0,total:o.total,customer_details:e.normalizeOrderCustomerDetails(o.customer_details??{}),tax_details:n.normalizeOrderTaxDetails(o.tax_details),items:m}}async function p(e,t){let n=a(t),[r,i]=await Promise.all([f(e,n),u(n)]);return{order:r,settings:i.settings,logo:i.logo}}exports.assignInvoiceMetadata=d,exports.getInvoiceBrandingData=u,exports.getInvoiceOrder=f,exports.getInvoicePresentationData=p;
+    `).eq(`id`,t).single();if(s||!o)throw Error(s?.message||`Order not found`);let c=(o.order_items||[]).map(e=>e.product_id).filter(Boolean),l=(o.order_items||[]).map(e=>e.variant_id).filter(Boolean),u=(0,r.getServiceRoleSupabaseClient)(),[d,f]=await Promise.all([c.length?u.from(`products`).select(`id, title, sku`).in(`id`,c):Promise.resolve({data:[],error:null}),l.length?u.from(`product_variants`).select(`id, sku`).in(`id`,l):Promise.resolve({data:[],error:null})]),p=new Map((d.data||[]).map(e=>[e.id,e])),m=new Map((f.data||[]).map(e=>[e.id,e])),h=(o.order_items||[]).map(e=>{let t=e.product_id?p.get(e.product_id):null,n=e.variant_id?m.get(e.variant_id):null,r=t?.title||`Product`,i=n?.sku?`SKU: ${n.sku}`:t?.sku?`SKU: ${t.sku}`:null;return{id:e.id,product_id:e.product_id??null,variant_id:e.variant_id??null,title:r,description:i,quantity:e.quantity,unit_amount:e.price_at_purchase,total_amount:e.price_at_purchase*e.quantity,sku:n?.sku??t?.sku??null}});return{id:o.id,invoice_number:o.invoice_number??null,paid_at:o.paid_at??null,created_at:o.created_at??null,currency:o.currency||`usd`,status:o.status,provider:o.provider??null,subtotal:typeof o.subtotal==`number`?o.subtotal:h.reduce((e,t)=>e+t.total_amount,0),shipping_total:typeof o.shipping_total==`number`?o.shipping_total:0,discount_total:typeof o.discount_total==`number`?o.discount_total:0,coupon_code:o.coupon_code??null,tax_total:typeof o.tax_total==`number`?o.tax_total:0,total:o.total,customer_details:e.normalizeOrderCustomerDetails(o.customer_details??{}),tax_details:n.normalizeOrderTaxDetails(o.tax_details),items:h}}async function p(e,t){let n=a(t),[r,i]=await Promise.all([f(e,n),u(n)]);return{order:r,settings:i.settings,logo:i.logo}}exports.assignInvoiceMetadata=d,exports.getInvoiceBrandingData=u,exports.getInvoiceOrder=f,exports.getInvoicePresentationData=p;

package/lib/invoice-server.es.js

@@ -49,16 +49,16 @@ async function p(e) {
 	};
 }
 async function m(t, n) {
-	let r = s(n), { data: a, error: o } = await r.from("orders").select("\n      id,\n      invoice_number,\n      paid_at,\n      created_at,\n      currency,\n      status,\n      provider,\n      subtotal,\n      shipping_total,\n      discount_total,\n      coupon_code,\n      tax_total,\n      total,\n      customer_details,\n      tax_details,\n      order_items (\n        id,\n        product_id,\n        variant_id,\n        quantity,\n        price_at_purchase\n      )\n    ").eq("id", t).single();
-	if (o || !a) throw Error(o?.message || "Order not found");
-	let c = (a.order_items || []).map((e) => e.product_id).filter(Boolean), l = (a.order_items || []).map((e) => e.variant_id).filter(Boolean), [u, d] = await Promise.all([c.length ? r.from("products").select("id, title, sku").in("id", c) : Promise.resolve({
+	let { data: r, error: o } = await s(n).from("orders").select("\n      id,\n      invoice_number,\n      paid_at,\n      created_at,\n      currency,\n      status,\n      provider,\n      subtotal,\n      shipping_total,\n      discount_total,\n      coupon_code,\n      tax_total,\n      total,\n      customer_details,\n      tax_details,\n      order_items (\n        id,\n        product_id,\n        variant_id,\n        quantity,\n        price_at_purchase\n      )\n    ").eq("id", t).single();
+	if (o || !r) throw Error(o?.message || "Order not found");
+	let c = (r.order_items || []).map((e) => e.product_id).filter(Boolean), l = (r.order_items || []).map((e) => e.variant_id).filter(Boolean), u = a(), [d, f] = await Promise.all([c.length ? u.from("products").select("id, title, sku").in("id", c) : Promise.resolve({
 		data: [],
 		error: null
-	}), l.length ? r.from("product_variants").select("id, sku").in("id", l) : Promise.resolve({
+	}), l.length ? u.from("product_variants").select("id, sku").in("id", l) : Promise.resolve({
 		data: [],
 		error: null
-	})]), f = new Map((u.data || []).map((e) => [e.id, e])), p = new Map((d.data || []).map((e) => [e.id, e])), m = (a.order_items || []).map((e) => {
-		let t = e.product_id ? f.get(e.product_id) : null, n = e.variant_id ? p.get(e.variant_id) : null, r = t?.title || "Product", i = n?.sku ? `SKU: ${n.sku}` : t?.sku ? `SKU: ${t.sku}` : null;
+	})]), p = new Map((d.data || []).map((e) => [e.id, e])), m = new Map((f.data || []).map((e) => [e.id, e])), h = (r.order_items || []).map((e) => {
+		let t = e.product_id ? p.get(e.product_id) : null, n = e.variant_id ? m.get(e.variant_id) : null, r = t?.title || "Product", i = n?.sku ? `SKU: ${n.sku}` : t?.sku ? `SKU: ${t.sku}` : null;
 		return {
 			id: e.id,
 			product_id: e.product_id ?? null,
@@ -72,22 +72,22 @@ async function m(t, n) {
 		};
 	});
 	return {
-		id: a.id,
-		invoice_number: a.invoice_number ?? null,
-		paid_at: a.paid_at ?? null,
-		created_at: a.created_at ?? null,
-		currency: a.currency || "usd",
-		status: a.status,
-		provider: a.provider ?? null,
-		subtotal: typeof a.subtotal == "number" ? a.subtotal : m.reduce((e, t) => e + t.total_amount, 0),
-		shipping_total: typeof a.shipping_total == "number" ? a.shipping_total : 0,
-		discount_total: typeof a.discount_total == "number" ? a.discount_total : 0,
-		coupon_code: a.coupon_code ?? null,
-		tax_total: typeof a.tax_total == "number" ? a.tax_total : 0,
-		total: a.total,
-		customer_details: e(a.customer_details ?? {}),
-		tax_details: i(a.tax_details),
-		items: m
+		id: r.id,
+		invoice_number: r.invoice_number ?? null,
+		paid_at: r.paid_at ?? null,
+		created_at: r.created_at ?? null,
+		currency: r.currency || "usd",
+		status: r.status,
+		provider: r.provider ?? null,
+		subtotal: typeof r.subtotal == "number" ? r.subtotal : h.reduce((e, t) => e + t.total_amount, 0),
+		shipping_total: typeof r.shipping_total == "number" ? r.shipping_total : 0,
+		discount_total: typeof r.discount_total == "number" ? r.discount_total : 0,
+		coupon_code: r.coupon_code ?? null,
+		tax_total: typeof r.tax_total == "number" ? r.tax_total : 0,
+		total: r.total,
+		customer_details: e(r.customer_details ?? {}),
+		tax_details: i(r.tax_details),
+		items: h
 	};
 }
 async function h(e, t) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextblock-cms/ecom",
-  "version": "0.21.2",
+  "version": "0.22.0",
   "license": "AGPL-3.0-or-later",
   "publishConfig": {
     "access": "public"
@@ -12,9 +12,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@nextblock-cms/db": "^0.21.2",
-    "@nextblock-cms/ui": "^0.21.2",
-    "@nextblock-cms/utils": "^0.21.2",
+    "@nextblock-cms/db": "^0.22.0",
+    "@nextblock-cms/ui": "^0.22.0",
+    "@nextblock-cms/utils": "^0.22.0",
     "@freemius/checkout": "^1.5.1",
     "@freemius/sdk": "^0.5.0",
     "@hookform/resolvers": "^5.9.1",