@cmssy/next 0.18.0 → 2.0.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]);
@@ -691,32 +692,48 @@ function createCmssyLocaleMiddleware(config) {
   };
 }
 var LOGIN_MUTATION = `mutation SiteMemberLogin($input: SiteMemberLoginInput!) {
-  siteMemberLogin(input: $input) {
-    success message accessToken refreshToken accessTokenExpiresIn
+  siteMember {
+    login(input: $input) {
+      success message accessToken refreshToken accessTokenExpiresIn
+    }
   }
 }`;
 var REGISTER_MUTATION = `mutation SiteMemberRegister($input: SiteMemberRegisterInput!) {
-  siteMemberRegister(input: $input) { success message }
+  siteMember {
+    register(input: $input) { success message }
+  }
 }`;
 var REFRESH_MUTATION = `mutation SiteMemberRefresh($refreshToken: String!) {
-  siteMemberRefresh(refreshToken: $refreshToken) {
-    success message accessToken refreshToken accessTokenExpiresIn
+  siteMember {
+    refresh(refreshToken: $refreshToken) {
+      success message accessToken refreshToken accessTokenExpiresIn
+    }
   }
 }`;
 var LOGOUT_MUTATION = `mutation SiteMemberLogout($refreshToken: String!) {
-  siteMemberLogout(refreshToken: $refreshToken) { success message }
+  siteMember {
+    logout(refreshToken: $refreshToken) { success message }
+  }
 }`;
 var LOGOUT_EVERYWHERE_MUTATION = `mutation SiteMemberLogoutEverywhere {
-  siteMemberLogoutEverywhere { success message }
+  siteMember {
+    logoutEverywhere { success message }
+  }
 }`;
 var FORGOT_MUTATION = `mutation SiteMemberForgotPassword($modelSlug: String!, $identity: String!) {
-  siteMemberForgotPassword(modelSlug: $modelSlug, identity: $identity) { success message }
+  siteMember {
+    forgotPassword(modelSlug: $modelSlug, identity: $identity) { success message }
+  }
 }`;
 var RESET_MUTATION = `mutation SiteMemberResetPassword($token: String!, $newPassword: String!) {
-  siteMemberResetPassword(token: $token, newPassword: $newPassword) { success message }
+  siteMember {
+    resetPassword(token: $token, newPassword: $newPassword) { success message }
+  }
 }`;
 var VERIFY_MUTATION = `mutation SiteMemberVerifyEmail($token: String!) {
-  siteMemberVerifyEmail(token: $token) { success message }
+  siteMember {
+    verifyEmail(token: $token) { success message }
+  }
 }`;
 var workspaceIdCache = /* @__PURE__ */ new Map();
 function workspaceIdFor(config) {
@@ -782,7 +799,7 @@ async function backendSignIn(config, modelSlug, identity, password) {
     },
     "site member login"
   );
-  return data.siteMemberLogin;
+  return data.siteMember.login;
 }
 async function backendRegister(config, modelSlug, identity, password, fields) {
   const data = await authRequest(
@@ -793,7 +810,7 @@ async function backendRegister(config, modelSlug, identity, password, fields) {
     },
     "site member register"
   );
-  return data.siteMemberRegister;
+  return data.siteMember.register;
 }
 async function backendRefresh(config, refreshToken) {
   const data = await authRequest(
@@ -802,7 +819,7 @@ async function backendRefresh(config, refreshToken) {
     { refreshToken },
     "site member refresh"
   );
-  return data.siteMemberRefresh;
+  return data.siteMember.refresh;
 }
 async function backendSignOut(config, refreshToken) {
   try {
@@ -836,7 +853,7 @@ async function backendForgotPassword(config, modelSlug, identity) {
     { modelSlug, identity },
     "site member forgot password"
   );
-  return data.siteMemberForgotPassword;
+  return data.siteMember.forgotPassword;
 }
 async function backendResetPassword(config, token, newPassword) {
   const data = await authRequest(
@@ -845,7 +862,7 @@ async function backendResetPassword(config, token, newPassword) {
     { token, newPassword },
     "site member reset password"
   );
-  return data.siteMemberResetPassword;
+  return data.siteMember.resetPassword;
 }
 async function backendVerifyEmail(config, token) {
   const data = await authRequest(
@@ -854,7 +871,7 @@ async function backendVerifyEmail(config, token) {
     { token },
     "site member verify email"
   );
-  return data.siteMemberVerifyEmail;
+  return data.siteMember.verifyEmail;
 }
 
 // src/create-auth-route.ts
@@ -1079,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} } } }`;
@@ -1097,12 +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
+      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) {
-  publicModelRecords(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, limit: 1) {
-    items { id data variants { id sku price inventory selectedOptions { name value } } }
+  public {
+    model {
+      records(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, limit: 1) {
+        items {
+          id
+          data
+          priceTiers { minQty price }
+          variants { id sku price inventory tiers { minQty price } selectedOptions { name value } }
+        }
+      }
+    }
   }
 }`;
 var workspaceIdCache2 = /* @__PURE__ */ new Map();
@@ -1216,14 +1274,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;
@@ -1238,7 +1320,7 @@ async function backendProduct(config, ctx, modelSlug, filter) {
     { workspaceId, modelSlug, filter },
     "product query"
   );
-  return data.publicModelRecords.items[0] ?? null;
+  return data.public.model.records.items[0] ?? null;
 }
 
 // src/create-cart-route.ts
@@ -1292,6 +1374,31 @@ 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;
+}
+function shippingAddress(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+  const raw = value;
+  const name = optionalStr(raw.name);
+  const line1 = optionalStr(raw.line1);
+  const postalCode = optionalStr(raw.postalCode);
+  const city = optionalStr(raw.city);
+  const country = optionalStr(raw.country);
+  if (!name || !line1 || !postalCode || !city || !country) return null;
+  return {
+    name,
+    company: optionalStr(raw.company),
+    line1,
+    line2: optionalStr(raw.line2),
+    postalCode,
+    city,
+    region: optionalStr(raw.region),
+    country,
+    phone: optionalStr(raw.phone),
+    vatId: optionalStr(raw.vatId)
+  };
+}
 function createCmssyCartRoute(config) {
   async function ensureCartToken() {
     const jar = await headers.cookies();
@@ -1365,12 +1472,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 });
           }
@@ -1446,9 +1564,20 @@ function createCmssyAuthMiddleware(config) {
     return refreshed;
   };
 }
-var PRODUCTS_QUERY = `query Products($workspaceId: String!, $modelSlug: String!, $filter: JSON, $limit: Int) {
-  publicModelRecords(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, limit: $limit) {
-    items { id data variants { id sku price inventory selectedOptions { name value } } }
+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, offset: $offset, sort: $sort) {
+        total
+        hasMore
+        items {
+          id
+          data
+          priceTiers { minQty price }
+          variants { id sku price inventory tiers { minQty price } selectedOptions { name value } }
+        }
+      }
+    }
   }
 }`;
 async function fetchProducts(config, options) {
@@ -1460,20 +1589,22 @@ 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.publicModelRecords.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
@@ -1500,9 +1631,45 @@ 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
+  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) {
@@ -1517,6 +1684,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}`;
@@ -1557,8 +1733,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) {
@@ -1706,6 +1900,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]);
@@ -690,32 +691,48 @@ function createCmssyLocaleMiddleware(config) {
   };
 }
 var LOGIN_MUTATION = `mutation SiteMemberLogin($input: SiteMemberLoginInput!) {
-  siteMemberLogin(input: $input) {
-    success message accessToken refreshToken accessTokenExpiresIn
+  siteMember {
+    login(input: $input) {
+      success message accessToken refreshToken accessTokenExpiresIn
+    }
   }
 }`;
 var REGISTER_MUTATION = `mutation SiteMemberRegister($input: SiteMemberRegisterInput!) {
-  siteMemberRegister(input: $input) { success message }
+  siteMember {
+    register(input: $input) { success message }
+  }
 }`;
 var REFRESH_MUTATION = `mutation SiteMemberRefresh($refreshToken: String!) {
-  siteMemberRefresh(refreshToken: $refreshToken) {
-    success message accessToken refreshToken accessTokenExpiresIn
+  siteMember {
+    refresh(refreshToken: $refreshToken) {
+      success message accessToken refreshToken accessTokenExpiresIn
+    }
   }
 }`;
 var LOGOUT_MUTATION = `mutation SiteMemberLogout($refreshToken: String!) {
-  siteMemberLogout(refreshToken: $refreshToken) { success message }
+  siteMember {
+    logout(refreshToken: $refreshToken) { success message }
+  }
 }`;
 var LOGOUT_EVERYWHERE_MUTATION = `mutation SiteMemberLogoutEverywhere {
-  siteMemberLogoutEverywhere { success message }
+  siteMember {
+    logoutEverywhere { success message }
+  }
 }`;
 var FORGOT_MUTATION = `mutation SiteMemberForgotPassword($modelSlug: String!, $identity: String!) {
-  siteMemberForgotPassword(modelSlug: $modelSlug, identity: $identity) { success message }
+  siteMember {
+    forgotPassword(modelSlug: $modelSlug, identity: $identity) { success message }
+  }
 }`;
 var RESET_MUTATION = `mutation SiteMemberResetPassword($token: String!, $newPassword: String!) {
-  siteMemberResetPassword(token: $token, newPassword: $newPassword) { success message }
+  siteMember {
+    resetPassword(token: $token, newPassword: $newPassword) { success message }
+  }
 }`;
 var VERIFY_MUTATION = `mutation SiteMemberVerifyEmail($token: String!) {
-  siteMemberVerifyEmail(token: $token) { success message }
+  siteMember {
+    verifyEmail(token: $token) { success message }
+  }
 }`;
 var workspaceIdCache = /* @__PURE__ */ new Map();
 function workspaceIdFor(config) {
@@ -781,7 +798,7 @@ async function backendSignIn(config, modelSlug, identity, password) {
     },
     "site member login"
   );
-  return data.siteMemberLogin;
+  return data.siteMember.login;
 }
 async function backendRegister(config, modelSlug, identity, password, fields) {
   const data = await authRequest(
@@ -792,7 +809,7 @@ async function backendRegister(config, modelSlug, identity, password, fields) {
     },
     "site member register"
   );
-  return data.siteMemberRegister;
+  return data.siteMember.register;
 }
 async function backendRefresh(config, refreshToken) {
   const data = await authRequest(
@@ -801,7 +818,7 @@ async function backendRefresh(config, refreshToken) {
     { refreshToken },
     "site member refresh"
   );
-  return data.siteMemberRefresh;
+  return data.siteMember.refresh;
 }
 async function backendSignOut(config, refreshToken) {
   try {
@@ -835,7 +852,7 @@ async function backendForgotPassword(config, modelSlug, identity) {
     { modelSlug, identity },
     "site member forgot password"
   );
-  return data.siteMemberForgotPassword;
+  return data.siteMember.forgotPassword;
 }
 async function backendResetPassword(config, token, newPassword) {
   const data = await authRequest(
@@ -844,7 +861,7 @@ async function backendResetPassword(config, token, newPassword) {
     { token, newPassword },
     "site member reset password"
   );
-  return data.siteMemberResetPassword;
+  return data.siteMember.resetPassword;
 }
 async function backendVerifyEmail(config, token) {
   const data = await authRequest(
@@ -853,7 +870,7 @@ async function backendVerifyEmail(config, token) {
     { token },
     "site member verify email"
   );
-  return data.siteMemberVerifyEmail;
+  return data.siteMember.verifyEmail;
 }
 
 // src/create-auth-route.ts
@@ -1078,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} } } }`;
@@ -1096,12 +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
+      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) {
-  publicModelRecords(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, limit: 1) {
-    items { id data variants { id sku price inventory selectedOptions { name value } } }
+  public {
+    model {
+      records(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, limit: 1) {
+        items {
+          id
+          data
+          priceTiers { minQty price }
+          variants { id sku price inventory tiers { minQty price } selectedOptions { name value } }
+        }
+      }
+    }
   }
 }`;
 var workspaceIdCache2 = /* @__PURE__ */ new Map();
@@ -1215,14 +1273,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;
@@ -1237,7 +1319,7 @@ async function backendProduct(config, ctx, modelSlug, filter) {
     { workspaceId, modelSlug, filter },
     "product query"
   );
-  return data.publicModelRecords.items[0] ?? null;
+  return data.public.model.records.items[0] ?? null;
 }
 
 // src/create-cart-route.ts
@@ -1291,6 +1373,31 @@ 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;
+}
+function shippingAddress(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+  const raw = value;
+  const name = optionalStr(raw.name);
+  const line1 = optionalStr(raw.line1);
+  const postalCode = optionalStr(raw.postalCode);
+  const city = optionalStr(raw.city);
+  const country = optionalStr(raw.country);
+  if (!name || !line1 || !postalCode || !city || !country) return null;
+  return {
+    name,
+    company: optionalStr(raw.company),
+    line1,
+    line2: optionalStr(raw.line2),
+    postalCode,
+    city,
+    region: optionalStr(raw.region),
+    country,
+    phone: optionalStr(raw.phone),
+    vatId: optionalStr(raw.vatId)
+  };
+}
 function createCmssyCartRoute(config) {
   async function ensureCartToken() {
     const jar = await cookies();
@@ -1364,12 +1471,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 });
           }
@@ -1445,9 +1563,20 @@ function createCmssyAuthMiddleware(config) {
     return refreshed;
   };
 }
-var PRODUCTS_QUERY = `query Products($workspaceId: String!, $modelSlug: String!, $filter: JSON, $limit: Int) {
-  publicModelRecords(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, limit: $limit) {
-    items { id data variants { id sku price inventory selectedOptions { name value } } }
+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, offset: $offset, sort: $sort) {
+        total
+        hasMore
+        items {
+          id
+          data
+          priceTiers { minQty price }
+          variants { id sku price inventory tiers { minQty price } selectedOptions { name value } }
+        }
+      }
+    }
   }
 }`;
 async function fetchProducts(config, options) {
@@ -1459,20 +1588,22 @@ 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.publicModelRecords.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
@@ -1499,9 +1630,45 @@ 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
+  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) {
@@ -1516,6 +1683,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}`;
@@ -1556,8 +1732,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) {
@@ -1671,4 +1865,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": "0.18.0",
+  "version": "2.0.0",
   "description": "Next.js App Router bindings for cmssy headless sites (createCmssyPage + draft preview)",
   "keywords": [
     "cmssy",
@@ -41,7 +41,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "@cmssy/react": "^0.18.0",
+    "@cmssy/react": "^2.0.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": "0.18.0"
+    "@cmssy/react": "2.0.0"
   },
   "dependencies": {
     "jose": "^6.2.3"