@cmssy/next 1.0.0 → 2.1.0

package/dist/index.cjs

@@ -221,11 +221,12 @@ function createCmssyPage(config, blocks, options) {
     workspaceSlug: config.workspaceSlug
   };
   const client$1 = react.createCmssyClient(clientConfig);
+  const fixedPath = options?.path?.split("/").map((segment) => segment.trim()).filter(Boolean);
   return async function CmssyCatchAllPage({
     params,
     searchParams
   }) {
-    const { path } = await params;
+    const path = fixedPath ?? (params ? (await params).path ?? void 0 : void 0);
     const { isEnabled } = await headers.draftMode();
     const query = searchParams ? await searchParams : {};
     const editMode = isEnabled || hasEditFlag(query[EDIT_QUERY_PARAM]);
@@ -1095,15 +1096,23 @@ var CART_FIELDS = `
   subtotal
   currency
   discountedTotal
+  tax
+  totalGross
+  pricesIncludeTax
+  shippingTotal
+  taxSummary { rateId name rate base amount }
+  shippingMethod { id label price etaLabel }
+  availableShippingMethods { id label price etaLabel }
   appliedDiscount { code type value computedAmount }
   items {
     id
     recordId
     quantity
     variantSelections
+    unitPrice
     currentPrice
     priceMismatch
-    snapshot { name price currency imageUrl sku }
+    snapshot { name price currency imageUrl sku tiers { minQty price } }
   }
 `;
 var CART_QUERY = `query Cart($workspaceId: ID!) { cart { get(workspaceId: $workspaceId) { ${CART_FIELDS} } } }`;
@@ -1113,14 +1122,45 @@ var REMOVE_ITEM = `mutation RemoveCartItem($workspaceId: ID!, $itemId: ID!) { ca
 var CLEAR_CART = `mutation ClearCart($workspaceId: ID!) { cart { clear(workspaceId: $workspaceId) { ${CART_FIELDS} } } }`;
 var APPLY_DISCOUNT = `mutation ApplyDiscount($workspaceId: ID!, $code: String!) { cart { applyDiscount(workspaceId: $workspaceId, code: $code) { ${CART_FIELDS} } } }`;
 var REMOVE_DISCOUNT = `mutation RemoveDiscount($workspaceId: ID!) { cart { removeDiscount(workspaceId: $workspaceId) { ${CART_FIELDS} } } }`;
+var SET_SHIPPING_METHOD = `mutation SetShippingMethod($workspaceId: ID!, $shippingMethodId: String) {
+  cart { setShippingMethod(workspaceId: $workspaceId, shippingMethodId: $shippingMethodId) { ${CART_FIELDS} } }
+}`;
+var MERGE_CART = `mutation MergeCart($workspaceId: ID!) { cart { merge(workspaceId: $workspaceId) { ${CART_FIELDS} } } }`;
 var CHECKOUT = `mutation Checkout($input: CheckoutInput!) {
-  cart { checkout(input: $input) { id status subtotal total currency customerEmail } }
+  cart {
+    checkout(input: $input) {
+      id
+      orderNumber
+      status
+      subtotal
+      discount
+      appliedDiscount { code type value amount }
+      tax
+      total
+      currency
+      customerEmail
+      accessToken
+      poNumber
+      customerNote
+      shippingTotal
+      pricesIncludeTax
+      shippingMethod { id label price }
+      shippingAddress { name company line1 line2 postalCode city region country phone vatId }
+      taxSummary { rateId name rate base amount }
+      items { name sku quantity price listPrice tierMinQty currency taxRate taxAmount }
+    }
+  }
 }`;
 var PRODUCT = `query Product($workspaceId: String!, $modelSlug: String!, $filter: JSON) {
   public {
     model {
       records(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, limit: 1) {
-        items { id data variants { id sku price inventory selectedOptions { name value } } }
+        items {
+          id
+          data
+          priceTiers { minQty price }
+          variants { id sku price inventory tiers { minQty price } selectedOptions { name value } }
+        }
       }
     }
   }
@@ -1236,14 +1276,38 @@ async function backendRemoveDiscount(config, ctx) {
   );
   return data.cart.removeDiscount;
 }
-async function backendCheckout(config, ctx, customerEmail) {
+async function backendSetShippingMethod(config, ctx, shippingMethodId) {
+  const workspaceId = await workspaceIdFor2(config);
+  const data = await request(
+    config,
+    ctx,
+    workspaceId,
+    SET_SHIPPING_METHOD,
+    { workspaceId, shippingMethodId },
+    "set shipping method"
+  );
+  return data.cart.setShippingMethod;
+}
+async function backendMergeCart(config, ctx) {
+  const workspaceId = await workspaceIdFor2(config);
+  const data = await request(
+    config,
+    ctx,
+    workspaceId,
+    MERGE_CART,
+    { workspaceId },
+    "merge cart"
+  );
+  return data.cart.merge;
+}
+async function backendCheckout(config, ctx, input) {
   const workspaceId = await workspaceIdFor2(config);
   const data = await request(
     config,
     ctx,
     workspaceId,
     CHECKOUT,
-    { input: { workspaceId, customerEmail } },
+    { input: { workspaceId, ...input } },
     "checkout"
   );
   return data.cart.checkout;
@@ -1312,6 +1376,49 @@ function plainObject2(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return {};
   return value;
 }
+function optionalStr(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : null;
+}
+var ADDRESS_REQUIRED = [
+  "name",
+  "line1",
+  "postalCode",
+  "city",
+  "country"
+];
+var CmssyAddressError = class extends Error {
+  constructor(missing) {
+    super(
+      `cmssy: shippingAddress is missing required field(s): ${missing.join(
+        ", "
+      )}. Expected { name, line1, postalCode, city, country } (plus optional company, line2, region, phone, vatId).`
+    );
+    this.missing = missing;
+    this.name = "CmssyAddressError";
+  }
+  missing;
+};
+function shippingAddress(value) {
+  if (value === void 0 || value === null) return null;
+  if (typeof value !== "object" || Array.isArray(value)) {
+    throw new CmssyAddressError([...ADDRESS_REQUIRED]);
+  }
+  const raw = value;
+  const missing = ADDRESS_REQUIRED.filter((key) => !optionalStr(raw[key]));
+  if (missing.length > 0) throw new CmssyAddressError(missing);
+  return {
+    name: optionalStr(raw.name),
+    company: optionalStr(raw.company),
+    line1: optionalStr(raw.line1),
+    line2: optionalStr(raw.line2),
+    postalCode: optionalStr(raw.postalCode),
+    city: optionalStr(raw.city),
+    region: optionalStr(raw.region),
+    country: optionalStr(raw.country),
+    phone: optionalStr(raw.phone),
+    vatId: optionalStr(raw.vatId)
+  };
+}
 function createCmssyCartRoute(config) {
   async function ensureCartToken() {
     const jar = await headers.cookies();
@@ -1385,12 +1492,23 @@ function createCmssyCartRoute(config) {
             });
           case "remove-discount":
             return json2({ cart: await backendRemoveDiscount(config, ctx) });
+          case "set-shipping":
+            return json2({
+              cart: await backendSetShippingMethod(
+                config,
+                ctx,
+                optionalStr(body.shippingMethodId)
+              )
+            });
+          case "merge":
+            return json2({ cart: await backendMergeCart(config, ctx) });
           case "checkout": {
-            const order = await backendCheckout(
-              config,
-              ctx,
-              str2(body.customerEmail)
-            );
+            const order = await backendCheckout(config, ctx, {
+              customerEmail: str2(body.customerEmail),
+              poNumber: optionalStr(body.poNumber),
+              customerNote: optionalStr(body.customerNote),
+              shippingAddress: shippingAddress(body.shippingAddress)
+            });
             await clearCartToken();
             return json2({ order });
           }
@@ -1407,6 +1525,9 @@ function createCmssyCartRoute(config) {
             return json2({ message: "Not found." }, 404);
         }
       } catch (err) {
+        if (err instanceof CmssyAddressError) {
+          return json2({ message: err.message, missing: err.missing }, 400);
+        }
         return json2(
           {
             message: err instanceof Error ? err.message : "Commerce request failed"
@@ -1466,11 +1587,18 @@ function createCmssyAuthMiddleware(config) {
     return refreshed;
   };
 }
-var PRODUCTS_QUERY = `query Products($workspaceId: String!, $modelSlug: String!, $filter: JSON, $limit: Int) {
+var PRODUCTS_QUERY = `query Products($workspaceId: String!, $modelSlug: String!, $filter: JSON, $limit: Int, $offset: Int, $sort: String) {
   public {
     model {
-      records(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, limit: $limit) {
-        items { id data variants { id sku price inventory selectedOptions { name value } } }
+      records(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, limit: $limit, offset: $offset, sort: $sort) {
+        total
+        hasMore
+        items {
+          id
+          data
+          priceTiers { minQty price }
+          variants { id sku price inventory tiers { minQty price } selectedOptions { name value } }
+        }
       }
     }
   }
@@ -1484,25 +1612,29 @@ async function fetchProducts(config, options) {
       workspaceId,
       modelSlug: options.modelSlug,
       filter: options.filter ?? {},
-      limit: options.limit ?? 50
+      limit: options.limit ?? 50,
+      offset: options.offset ?? 0,
+      sort: options.sort ?? null
     },
     { headers: { "x-workspace-id": workspaceId } },
     "products query"
   );
-  return data.public.model.records.items;
+  return data.public.model.records;
 }
 async function fetchProduct(config, options) {
-  const products = await fetchProducts(config, {
+  const page = await fetchProducts(config, {
     modelSlug: options.modelSlug,
     filter: { [options.slugField ?? "slug"]: options.slug },
     limit: 1
   });
-  return products[0] ?? null;
+  return page.items[0] ?? null;
 }
 var ORDER_FIELDS = `
   id
   status
   subtotal
+  discount
+  appliedDiscount { code type value amount }
   tax
   total
   pricesIncludeTax
@@ -1524,9 +1656,47 @@ var ORDER_FIELDS = `
   paidAt
   fulfilledAt
   createdAt
-  items { name price currency quantity sku }
+  orderNumber
+  poNumber
+  customerNote
+  shippingTotal
+  shippingMethod { id label price }
+  shippingAddress { name company line1 line2 postalCode city region country phone vatId }
+  items { name price listPrice tierMinQty currency quantity sku }
   payments { amount reference provider at }
 `;
+var PUBLIC_ORDER_FIELDS = `
+  id
+  orderNumber
+  status
+  paymentStatus
+  fulfillmentStatus
+  subtotal
+  discount
+  appliedDiscount { code type value amount }
+  tax
+  total
+  pricesIncludeTax
+  taxSummary { rateId name rate base amount }
+  currency
+  customerEmail
+  poNumber
+  customerNote
+  shippingTotal
+  shippingMethod { id label price }
+  shippingAddress { name company line1 line2 postalCode city region country phone vatId }
+  amountPaid
+  balanceDue
+  refundedAmount
+  trackingNumber
+  trackingCarrier
+  invoiceNumber
+  invoiceUrl
+  paidAt
+  fulfilledAt
+  createdAt
+  items { name price listPrice tierMinQty currency quantity sku taxRate taxAmount }
+`;
 var MY_ORDERS = `query MyOrders($workspaceId: ID!, $skip: Int, $limit: Int) {
   account {
     orders(workspaceId: $workspaceId, skip: $skip, limit: $limit) {
@@ -1541,6 +1711,15 @@ var MY_ORDER = `query MyOrder($workspaceId: ID!, $id: ID!) {
     order(workspaceId: $workspaceId, id: $id) { ${ORDER_FIELDS} }
   }
 }`;
+var PUBLIC_ORDER_BY_TOKEN = `query PublicOrder($workspaceId: ID!, $orderId: ID!, $accessToken: String!) {
+  public {
+    order {
+      byToken(workspaceId: $workspaceId, orderId: $orderId, accessToken: $accessToken) {
+        ${PUBLIC_ORDER_FIELDS}
+      }
+    }
+  }
+}`;
 var workspaceIdCache3 = /* @__PURE__ */ new Map();
 function workspaceIdFor3(config) {
   const key = `${react.resolveApiUrl(config.apiUrl)}::${config.workspaceSlug}`;
@@ -1581,8 +1760,26 @@ async function backendMyOrder(config, accessToken, id) {
   );
   return data.account.order;
 }
+async function backendOrderByToken(config, options) {
+  const workspaceId = await workspaceIdFor3(config);
+  const data = await react.graphqlRequest(
+    config,
+    PUBLIC_ORDER_BY_TOKEN,
+    {
+      workspaceId,
+      orderId: options.orderId,
+      accessToken: options.accessToken
+    },
+    { headers: { "x-workspace-id": workspaceId } },
+    "public order lookup"
+  );
+  return data.public.order.byToken;
+}
 
-// src/create-orders-route.ts
+// src/order-server.ts
+async function fetchOrderByToken(config, options) {
+  return backendOrderByToken(config, options);
+}
 var DEFAULT_LIMIT = 20;
 var MAX_LIMIT = 100;
 function json3(body, status = 200) {
@@ -1730,6 +1927,7 @@ exports.createCmssyRobots = createCmssyRobots;
 exports.createCmssySitemap = createCmssySitemap;
 exports.createDraftRoute = createDraftRoute;
 exports.defineCmssyConfig = defineCmssyConfig;
+exports.fetchOrderByToken = fetchOrderByToken;
 exports.fetchProduct = fetchProduct;
 exports.fetchProducts = fetchProducts;
 exports.getCmssyAccessToken = getCmssyAccessToken;

package/dist/index.d.cts

@@ -80,13 +80,14 @@ interface CmssyEditorProps {
 }
 interface CreateCmssyPageOptions {
     editor?: ComponentType<CmssyEditorProps>;
+    path?: string;
 }
 interface CatchAllParams {
     path?: string[];
 }
 type SearchParams = Record<string, string | string[] | undefined>;
 interface CatchAllProps {
-    params: Promise<CatchAllParams>;
+    params?: Promise<CatchAllParams>;
     searchParams?: Promise<SearchParams>;
 }
 declare function createCmssyPage(config: CmssyNextConfig, blocks: BlockDefinition[], options?: CreateCmssyPageOptions): ({ params, searchParams, }: CatchAllProps) => Promise<react_jsx_runtime.JSX.Element>;
@@ -289,8 +290,15 @@ interface FetchProductsOptions {
     modelSlug: string;
     filter?: Record<string, unknown>;
     limit?: number;
+    offset?: number;
+    sort?: string;
 }
-declare function fetchProducts(config: CmssyNextConfig, options: FetchProductsOptions): Promise<CmssyProduct[]>;
+interface CmssyProductPage {
+    items: CmssyProduct[];
+    total: number;
+    hasMore: boolean;
+}
+declare function fetchProducts(config: CmssyNextConfig, options: FetchProductsOptions): Promise<CmssyProductPage>;
 interface FetchProductOptions {
     modelSlug: string;
     slug: string;
@@ -298,6 +306,12 @@ interface FetchProductOptions {
 }
 declare function fetchProduct(config: CmssyNextConfig, options: FetchProductOptions): Promise<CmssyProduct | null>;
 
+interface FetchOrderByTokenOptions {
+    orderId: string;
+    accessToken: string;
+}
+declare function fetchOrderByToken(config: CmssyNextConfig, options: FetchOrderByTokenOptions): Promise<CmssyOrder>;
+
 interface CmssyOrdersRouteHandlers {
     GET(request: Request): Promise<Response>;
 }
@@ -371,4 +385,4 @@ declare class CmssyWebhookError extends Error {
  */
 declare function verifyCmssyWebhook(options: VerifyCmssyWebhookOptions): CmssyWebhookEvent;
 
-export { type BuildCmssyMetadataOptions, CMSSY_CART_COOKIE, CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CMSSY_SESSION_COOKIE, type CmssyAuthConfig, type CmssyAuthMiddleware, type CmssyAuthRouteHandlers, type CmssyCartRouteHandlers, type CmssyCspOptions, type CmssyDraftRouteConfig, type CmssyEditorProps, type CmssyEnvConfig, type CmssyNextConfig, type CmssyOrdersRouteHandlers, type CmssySessionPayload, type CmssySessionUser, CmssyWebhookError, type CmssyWebhookEvent, type CmssyWebhookOrder, type CreateCmssyNotFoundOptions, type CreateCmssyPageOptions, type CreateCmssyRobotsOptions, type CreateCmssySitemapOptions, DEFAULT_CMSSY_EDITOR_ORIGINS, type FetchProductOptions, type FetchProductsOptions, type MyOrdersResult, SESSION_MAX_AGE_SECONDS, type SessionCookieOptions, type VerifyCmssyWebhookOptions, applyCmssyCsp, assertAuthConfig, buildCmssyMetadata, cmssyCspHeaders, createCmssyAuthMiddleware, createCmssyAuthRoute, createCmssyCartRoute, createCmssyLocaleMiddleware, createCmssyNotFound, createCmssyOrdersRoute, createCmssyPage, createCmssyRobots, createCmssySitemap, createDraftRoute, defineCmssyConfig, fetchProduct, fetchProducts, getCmssyAccessToken, getCmssyLocale, getCmssyUser, isAccessExpired, isCmssyEditMode, isCmssyEditRequest, localeForPathname, openSession, resolveEditorOrigin, resolveLocaleFromPathname, sealSession, sessionCookieOptions, splitCmssyLocale, verifyCmssyWebhook };
+export { type BuildCmssyMetadataOptions, CMSSY_CART_COOKIE, CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CMSSY_SESSION_COOKIE, type CmssyAuthConfig, type CmssyAuthMiddleware, type CmssyAuthRouteHandlers, type CmssyCartRouteHandlers, type CmssyCspOptions, type CmssyDraftRouteConfig, type CmssyEditorProps, type CmssyEnvConfig, type CmssyNextConfig, type CmssyOrdersRouteHandlers, type CmssyProductPage, type CmssySessionPayload, type CmssySessionUser, CmssyWebhookError, type CmssyWebhookEvent, type CmssyWebhookOrder, type CreateCmssyNotFoundOptions, type CreateCmssyPageOptions, type CreateCmssyRobotsOptions, type CreateCmssySitemapOptions, DEFAULT_CMSSY_EDITOR_ORIGINS, type FetchOrderByTokenOptions, type FetchProductOptions, type FetchProductsOptions, type MyOrdersResult, SESSION_MAX_AGE_SECONDS, type SessionCookieOptions, type VerifyCmssyWebhookOptions, applyCmssyCsp, assertAuthConfig, buildCmssyMetadata, cmssyCspHeaders, createCmssyAuthMiddleware, createCmssyAuthRoute, createCmssyCartRoute, createCmssyLocaleMiddleware, createCmssyNotFound, createCmssyOrdersRoute, createCmssyPage, createCmssyRobots, createCmssySitemap, createDraftRoute, defineCmssyConfig, fetchOrderByToken, fetchProduct, fetchProducts, getCmssyAccessToken, getCmssyLocale, getCmssyUser, isAccessExpired, isCmssyEditMode, isCmssyEditRequest, localeForPathname, openSession, resolveEditorOrigin, resolveLocaleFromPathname, sealSession, sessionCookieOptions, splitCmssyLocale, verifyCmssyWebhook };

package/dist/index.d.ts

@@ -80,13 +80,14 @@ interface CmssyEditorProps {
 }
 interface CreateCmssyPageOptions {
     editor?: ComponentType<CmssyEditorProps>;
+    path?: string;
 }
 interface CatchAllParams {
     path?: string[];
 }
 type SearchParams = Record<string, string | string[] | undefined>;
 interface CatchAllProps {
-    params: Promise<CatchAllParams>;
+    params?: Promise<CatchAllParams>;
     searchParams?: Promise<SearchParams>;
 }
 declare function createCmssyPage(config: CmssyNextConfig, blocks: BlockDefinition[], options?: CreateCmssyPageOptions): ({ params, searchParams, }: CatchAllProps) => Promise<react_jsx_runtime.JSX.Element>;
@@ -289,8 +290,15 @@ interface FetchProductsOptions {
     modelSlug: string;
     filter?: Record<string, unknown>;
     limit?: number;
+    offset?: number;
+    sort?: string;
 }
-declare function fetchProducts(config: CmssyNextConfig, options: FetchProductsOptions): Promise<CmssyProduct[]>;
+interface CmssyProductPage {
+    items: CmssyProduct[];
+    total: number;
+    hasMore: boolean;
+}
+declare function fetchProducts(config: CmssyNextConfig, options: FetchProductsOptions): Promise<CmssyProductPage>;
 interface FetchProductOptions {
     modelSlug: string;
     slug: string;
@@ -298,6 +306,12 @@ interface FetchProductOptions {
 }
 declare function fetchProduct(config: CmssyNextConfig, options: FetchProductOptions): Promise<CmssyProduct | null>;
 
+interface FetchOrderByTokenOptions {
+    orderId: string;
+    accessToken: string;
+}
+declare function fetchOrderByToken(config: CmssyNextConfig, options: FetchOrderByTokenOptions): Promise<CmssyOrder>;
+
 interface CmssyOrdersRouteHandlers {
     GET(request: Request): Promise<Response>;
 }
@@ -371,4 +385,4 @@ declare class CmssyWebhookError extends Error {
  */
 declare function verifyCmssyWebhook(options: VerifyCmssyWebhookOptions): CmssyWebhookEvent;
 
-export { type BuildCmssyMetadataOptions, CMSSY_CART_COOKIE, CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CMSSY_SESSION_COOKIE, type CmssyAuthConfig, type CmssyAuthMiddleware, type CmssyAuthRouteHandlers, type CmssyCartRouteHandlers, type CmssyCspOptions, type CmssyDraftRouteConfig, type CmssyEditorProps, type CmssyEnvConfig, type CmssyNextConfig, type CmssyOrdersRouteHandlers, type CmssySessionPayload, type CmssySessionUser, CmssyWebhookError, type CmssyWebhookEvent, type CmssyWebhookOrder, type CreateCmssyNotFoundOptions, type CreateCmssyPageOptions, type CreateCmssyRobotsOptions, type CreateCmssySitemapOptions, DEFAULT_CMSSY_EDITOR_ORIGINS, type FetchProductOptions, type FetchProductsOptions, type MyOrdersResult, SESSION_MAX_AGE_SECONDS, type SessionCookieOptions, type VerifyCmssyWebhookOptions, applyCmssyCsp, assertAuthConfig, buildCmssyMetadata, cmssyCspHeaders, createCmssyAuthMiddleware, createCmssyAuthRoute, createCmssyCartRoute, createCmssyLocaleMiddleware, createCmssyNotFound, createCmssyOrdersRoute, createCmssyPage, createCmssyRobots, createCmssySitemap, createDraftRoute, defineCmssyConfig, fetchProduct, fetchProducts, getCmssyAccessToken, getCmssyLocale, getCmssyUser, isAccessExpired, isCmssyEditMode, isCmssyEditRequest, localeForPathname, openSession, resolveEditorOrigin, resolveLocaleFromPathname, sealSession, sessionCookieOptions, splitCmssyLocale, verifyCmssyWebhook };
+export { type BuildCmssyMetadataOptions, CMSSY_CART_COOKIE, CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CMSSY_SESSION_COOKIE, type CmssyAuthConfig, type CmssyAuthMiddleware, type CmssyAuthRouteHandlers, type CmssyCartRouteHandlers, type CmssyCspOptions, type CmssyDraftRouteConfig, type CmssyEditorProps, type CmssyEnvConfig, type CmssyNextConfig, type CmssyOrdersRouteHandlers, type CmssyProductPage, type CmssySessionPayload, type CmssySessionUser, CmssyWebhookError, type CmssyWebhookEvent, type CmssyWebhookOrder, type CreateCmssyNotFoundOptions, type CreateCmssyPageOptions, type CreateCmssyRobotsOptions, type CreateCmssySitemapOptions, DEFAULT_CMSSY_EDITOR_ORIGINS, type FetchOrderByTokenOptions, type FetchProductOptions, type FetchProductsOptions, type MyOrdersResult, SESSION_MAX_AGE_SECONDS, type SessionCookieOptions, type VerifyCmssyWebhookOptions, applyCmssyCsp, assertAuthConfig, buildCmssyMetadata, cmssyCspHeaders, createCmssyAuthMiddleware, createCmssyAuthRoute, createCmssyCartRoute, createCmssyLocaleMiddleware, createCmssyNotFound, createCmssyOrdersRoute, createCmssyPage, createCmssyRobots, createCmssySitemap, createDraftRoute, defineCmssyConfig, fetchOrderByToken, fetchProduct, fetchProducts, getCmssyAccessToken, getCmssyLocale, getCmssyUser, isAccessExpired, isCmssyEditMode, isCmssyEditRequest, localeForPathname, openSession, resolveEditorOrigin, resolveLocaleFromPathname, sealSession, sessionCookieOptions, splitCmssyLocale, verifyCmssyWebhook };

package/dist/index.js

@@ -220,11 +220,12 @@ function createCmssyPage(config, blocks, options) {
     workspaceSlug: config.workspaceSlug
   };
   const client = createCmssyClient(clientConfig);
+  const fixedPath = options?.path?.split("/").map((segment) => segment.trim()).filter(Boolean);
   return async function CmssyCatchAllPage({
     params,
     searchParams
   }) {
-    const { path } = await params;
+    const path = fixedPath ?? (params ? (await params).path ?? void 0 : void 0);
     const { isEnabled } = await draftMode();
     const query = searchParams ? await searchParams : {};
     const editMode = isEnabled || hasEditFlag(query[EDIT_QUERY_PARAM]);
@@ -1094,15 +1095,23 @@ var CART_FIELDS = `
   subtotal
   currency
   discountedTotal
+  tax
+  totalGross
+  pricesIncludeTax
+  shippingTotal
+  taxSummary { rateId name rate base amount }
+  shippingMethod { id label price etaLabel }
+  availableShippingMethods { id label price etaLabel }
   appliedDiscount { code type value computedAmount }
   items {
     id
     recordId
     quantity
     variantSelections
+    unitPrice
     currentPrice
     priceMismatch
-    snapshot { name price currency imageUrl sku }
+    snapshot { name price currency imageUrl sku tiers { minQty price } }
   }
 `;
 var CART_QUERY = `query Cart($workspaceId: ID!) { cart { get(workspaceId: $workspaceId) { ${CART_FIELDS} } } }`;
@@ -1112,14 +1121,45 @@ var REMOVE_ITEM = `mutation RemoveCartItem($workspaceId: ID!, $itemId: ID!) { ca
 var CLEAR_CART = `mutation ClearCart($workspaceId: ID!) { cart { clear(workspaceId: $workspaceId) { ${CART_FIELDS} } } }`;
 var APPLY_DISCOUNT = `mutation ApplyDiscount($workspaceId: ID!, $code: String!) { cart { applyDiscount(workspaceId: $workspaceId, code: $code) { ${CART_FIELDS} } } }`;
 var REMOVE_DISCOUNT = `mutation RemoveDiscount($workspaceId: ID!) { cart { removeDiscount(workspaceId: $workspaceId) { ${CART_FIELDS} } } }`;
+var SET_SHIPPING_METHOD = `mutation SetShippingMethod($workspaceId: ID!, $shippingMethodId: String) {
+  cart { setShippingMethod(workspaceId: $workspaceId, shippingMethodId: $shippingMethodId) { ${CART_FIELDS} } }
+}`;
+var MERGE_CART = `mutation MergeCart($workspaceId: ID!) { cart { merge(workspaceId: $workspaceId) { ${CART_FIELDS} } } }`;
 var CHECKOUT = `mutation Checkout($input: CheckoutInput!) {
-  cart { checkout(input: $input) { id status subtotal total currency customerEmail } }
+  cart {
+    checkout(input: $input) {
+      id
+      orderNumber
+      status
+      subtotal
+      discount
+      appliedDiscount { code type value amount }
+      tax
+      total
+      currency
+      customerEmail
+      accessToken
+      poNumber
+      customerNote
+      shippingTotal
+      pricesIncludeTax
+      shippingMethod { id label price }
+      shippingAddress { name company line1 line2 postalCode city region country phone vatId }
+      taxSummary { rateId name rate base amount }
+      items { name sku quantity price listPrice tierMinQty currency taxRate taxAmount }
+    }
+  }
 }`;
 var PRODUCT = `query Product($workspaceId: String!, $modelSlug: String!, $filter: JSON) {
   public {
     model {
       records(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, limit: 1) {
-        items { id data variants { id sku price inventory selectedOptions { name value } } }
+        items {
+          id
+          data
+          priceTiers { minQty price }
+          variants { id sku price inventory tiers { minQty price } selectedOptions { name value } }
+        }
       }
     }
   }
@@ -1235,14 +1275,38 @@ async function backendRemoveDiscount(config, ctx) {
   );
   return data.cart.removeDiscount;
 }
-async function backendCheckout(config, ctx, customerEmail) {
+async function backendSetShippingMethod(config, ctx, shippingMethodId) {
+  const workspaceId = await workspaceIdFor2(config);
+  const data = await request(
+    config,
+    ctx,
+    workspaceId,
+    SET_SHIPPING_METHOD,
+    { workspaceId, shippingMethodId },
+    "set shipping method"
+  );
+  return data.cart.setShippingMethod;
+}
+async function backendMergeCart(config, ctx) {
+  const workspaceId = await workspaceIdFor2(config);
+  const data = await request(
+    config,
+    ctx,
+    workspaceId,
+    MERGE_CART,
+    { workspaceId },
+    "merge cart"
+  );
+  return data.cart.merge;
+}
+async function backendCheckout(config, ctx, input) {
   const workspaceId = await workspaceIdFor2(config);
   const data = await request(
     config,
     ctx,
     workspaceId,
     CHECKOUT,
-    { input: { workspaceId, customerEmail } },
+    { input: { workspaceId, ...input } },
     "checkout"
   );
   return data.cart.checkout;
@@ -1311,6 +1375,49 @@ function plainObject2(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return {};
   return value;
 }
+function optionalStr(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : null;
+}
+var ADDRESS_REQUIRED = [
+  "name",
+  "line1",
+  "postalCode",
+  "city",
+  "country"
+];
+var CmssyAddressError = class extends Error {
+  constructor(missing) {
+    super(
+      `cmssy: shippingAddress is missing required field(s): ${missing.join(
+        ", "
+      )}. Expected { name, line1, postalCode, city, country } (plus optional company, line2, region, phone, vatId).`
+    );
+    this.missing = missing;
+    this.name = "CmssyAddressError";
+  }
+  missing;
+};
+function shippingAddress(value) {
+  if (value === void 0 || value === null) return null;
+  if (typeof value !== "object" || Array.isArray(value)) {
+    throw new CmssyAddressError([...ADDRESS_REQUIRED]);
+  }
+  const raw = value;
+  const missing = ADDRESS_REQUIRED.filter((key) => !optionalStr(raw[key]));
+  if (missing.length > 0) throw new CmssyAddressError(missing);
+  return {
+    name: optionalStr(raw.name),
+    company: optionalStr(raw.company),
+    line1: optionalStr(raw.line1),
+    line2: optionalStr(raw.line2),
+    postalCode: optionalStr(raw.postalCode),
+    city: optionalStr(raw.city),
+    region: optionalStr(raw.region),
+    country: optionalStr(raw.country),
+    phone: optionalStr(raw.phone),
+    vatId: optionalStr(raw.vatId)
+  };
+}
 function createCmssyCartRoute(config) {
   async function ensureCartToken() {
     const jar = await cookies();
@@ -1384,12 +1491,23 @@ function createCmssyCartRoute(config) {
             });
           case "remove-discount":
             return json2({ cart: await backendRemoveDiscount(config, ctx) });
+          case "set-shipping":
+            return json2({
+              cart: await backendSetShippingMethod(
+                config,
+                ctx,
+                optionalStr(body.shippingMethodId)
+              )
+            });
+          case "merge":
+            return json2({ cart: await backendMergeCart(config, ctx) });
           case "checkout": {
-            const order = await backendCheckout(
-              config,
-              ctx,
-              str2(body.customerEmail)
-            );
+            const order = await backendCheckout(config, ctx, {
+              customerEmail: str2(body.customerEmail),
+              poNumber: optionalStr(body.poNumber),
+              customerNote: optionalStr(body.customerNote),
+              shippingAddress: shippingAddress(body.shippingAddress)
+            });
             await clearCartToken();
             return json2({ order });
           }
@@ -1406,6 +1524,9 @@ function createCmssyCartRoute(config) {
             return json2({ message: "Not found." }, 404);
         }
       } catch (err) {
+        if (err instanceof CmssyAddressError) {
+          return json2({ message: err.message, missing: err.missing }, 400);
+        }
         return json2(
           {
             message: err instanceof Error ? err.message : "Commerce request failed"
@@ -1465,11 +1586,18 @@ function createCmssyAuthMiddleware(config) {
     return refreshed;
   };
 }
-var PRODUCTS_QUERY = `query Products($workspaceId: String!, $modelSlug: String!, $filter: JSON, $limit: Int) {
+var PRODUCTS_QUERY = `query Products($workspaceId: String!, $modelSlug: String!, $filter: JSON, $limit: Int, $offset: Int, $sort: String) {
   public {
     model {
-      records(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, limit: $limit) {
-        items { id data variants { id sku price inventory selectedOptions { name value } } }
+      records(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, limit: $limit, offset: $offset, sort: $sort) {
+        total
+        hasMore
+        items {
+          id
+          data
+          priceTiers { minQty price }
+          variants { id sku price inventory tiers { minQty price } selectedOptions { name value } }
+        }
       }
     }
   }
@@ -1483,25 +1611,29 @@ async function fetchProducts(config, options) {
       workspaceId,
       modelSlug: options.modelSlug,
       filter: options.filter ?? {},
-      limit: options.limit ?? 50
+      limit: options.limit ?? 50,
+      offset: options.offset ?? 0,
+      sort: options.sort ?? null
     },
     { headers: { "x-workspace-id": workspaceId } },
     "products query"
   );
-  return data.public.model.records.items;
+  return data.public.model.records;
 }
 async function fetchProduct(config, options) {
-  const products = await fetchProducts(config, {
+  const page = await fetchProducts(config, {
     modelSlug: options.modelSlug,
     filter: { [options.slugField ?? "slug"]: options.slug },
     limit: 1
   });
-  return products[0] ?? null;
+  return page.items[0] ?? null;
 }
 var ORDER_FIELDS = `
   id
   status
   subtotal
+  discount
+  appliedDiscount { code type value amount }
   tax
   total
   pricesIncludeTax
@@ -1523,9 +1655,47 @@ var ORDER_FIELDS = `
   paidAt
   fulfilledAt
   createdAt
-  items { name price currency quantity sku }
+  orderNumber
+  poNumber
+  customerNote
+  shippingTotal
+  shippingMethod { id label price }
+  shippingAddress { name company line1 line2 postalCode city region country phone vatId }
+  items { name price listPrice tierMinQty currency quantity sku }
   payments { amount reference provider at }
 `;
+var PUBLIC_ORDER_FIELDS = `
+  id
+  orderNumber
+  status
+  paymentStatus
+  fulfillmentStatus
+  subtotal
+  discount
+  appliedDiscount { code type value amount }
+  tax
+  total
+  pricesIncludeTax
+  taxSummary { rateId name rate base amount }
+  currency
+  customerEmail
+  poNumber
+  customerNote
+  shippingTotal
+  shippingMethod { id label price }
+  shippingAddress { name company line1 line2 postalCode city region country phone vatId }
+  amountPaid
+  balanceDue
+  refundedAmount
+  trackingNumber
+  trackingCarrier
+  invoiceNumber
+  invoiceUrl
+  paidAt
+  fulfilledAt
+  createdAt
+  items { name price listPrice tierMinQty currency quantity sku taxRate taxAmount }
+`;
 var MY_ORDERS = `query MyOrders($workspaceId: ID!, $skip: Int, $limit: Int) {
   account {
     orders(workspaceId: $workspaceId, skip: $skip, limit: $limit) {
@@ -1540,6 +1710,15 @@ var MY_ORDER = `query MyOrder($workspaceId: ID!, $id: ID!) {
     order(workspaceId: $workspaceId, id: $id) { ${ORDER_FIELDS} }
   }
 }`;
+var PUBLIC_ORDER_BY_TOKEN = `query PublicOrder($workspaceId: ID!, $orderId: ID!, $accessToken: String!) {
+  public {
+    order {
+      byToken(workspaceId: $workspaceId, orderId: $orderId, accessToken: $accessToken) {
+        ${PUBLIC_ORDER_FIELDS}
+      }
+    }
+  }
+}`;
 var workspaceIdCache3 = /* @__PURE__ */ new Map();
 function workspaceIdFor3(config) {
   const key = `${resolveApiUrl(config.apiUrl)}::${config.workspaceSlug}`;
@@ -1580,8 +1759,26 @@ async function backendMyOrder(config, accessToken, id) {
   );
   return data.account.order;
 }
+async function backendOrderByToken(config, options) {
+  const workspaceId = await workspaceIdFor3(config);
+  const data = await graphqlRequest(
+    config,
+    PUBLIC_ORDER_BY_TOKEN,
+    {
+      workspaceId,
+      orderId: options.orderId,
+      accessToken: options.accessToken
+    },
+    { headers: { "x-workspace-id": workspaceId } },
+    "public order lookup"
+  );
+  return data.public.order.byToken;
+}
 
-// src/create-orders-route.ts
+// src/order-server.ts
+async function fetchOrderByToken(config, options) {
+  return backendOrderByToken(config, options);
+}
 var DEFAULT_LIMIT = 20;
 var MAX_LIMIT = 100;
 function json3(body, status = 200) {
@@ -1695,4 +1892,4 @@ function verifyCmssyWebhook(options) {
   return parsed;
 }
 
-export { CMSSY_CART_COOKIE, CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CMSSY_SESSION_COOKIE, CmssyWebhookError, DEFAULT_CMSSY_EDITOR_ORIGINS, SESSION_MAX_AGE_SECONDS, applyCmssyCsp, assertAuthConfig, buildCmssyMetadata, cmssyCspHeaders, createCmssyAuthMiddleware, createCmssyAuthRoute, createCmssyCartRoute, createCmssyLocaleMiddleware, createCmssyNotFound, createCmssyOrdersRoute, createCmssyPage, createCmssyRobots, createCmssySitemap, createDraftRoute, defineCmssyConfig, fetchProduct, fetchProducts, getCmssyAccessToken, getCmssyLocale, getCmssyUser, isAccessExpired, isCmssyEditMode, isCmssyEditRequest, localeForPathname, openSession, resolveEditorOrigin, resolveLocaleFromPathname, sealSession, sessionCookieOptions, splitCmssyLocale, verifyCmssyWebhook };
+export { CMSSY_CART_COOKIE, CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CMSSY_SESSION_COOKIE, CmssyWebhookError, DEFAULT_CMSSY_EDITOR_ORIGINS, SESSION_MAX_AGE_SECONDS, applyCmssyCsp, assertAuthConfig, buildCmssyMetadata, cmssyCspHeaders, createCmssyAuthMiddleware, createCmssyAuthRoute, createCmssyCartRoute, createCmssyLocaleMiddleware, createCmssyNotFound, createCmssyOrdersRoute, createCmssyPage, createCmssyRobots, createCmssySitemap, createDraftRoute, defineCmssyConfig, fetchOrderByToken, fetchProduct, fetchProducts, getCmssyAccessToken, getCmssyLocale, getCmssyUser, isAccessExpired, isCmssyEditMode, isCmssyEditRequest, localeForPathname, openSession, resolveEditorOrigin, resolveLocaleFromPathname, sealSession, sessionCookieOptions, splitCmssyLocale, verifyCmssyWebhook };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/next",
-  "version": "1.0.0",
+  "version": "2.1.0",
   "description": "Next.js App Router bindings for cmssy headless sites (createCmssyPage + draft preview)",
   "keywords": [
     "cmssy",
@@ -41,7 +41,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "@cmssy/react": "^1.0.0",
+    "@cmssy/react": "^2.1.0",
     "next": ">=15",
     "react": "^18.2.0 || ^19.0.0",
     "react-dom": "^18.2.0 || ^19.0.0"
@@ -55,7 +55,7 @@
     "tsup": "^8.3.0",
     "typescript": "^5.6.0",
     "vitest": "^2.1.0",
-    "@cmssy/react": "1.0.0"
+    "@cmssy/react": "2.1.0"
   },
   "dependencies": {
     "jose": "^6.2.3"