@cmssy/react 0.18.0 → 2.0.0

package/README.md

@@ -39,7 +39,10 @@ the CMS at runtime.
 ```tsx
 import { fetchPage, CmssyServerPage } from "@cmssy/react";
 
-const page = await fetchPage({ org: "acme-org", workspaceSlug: "acme" }, pathSegments);
+const page = await fetchPage(
+  { org: "acme-org", workspaceSlug: "acme" },
+  pathSegments,
+);
 
 return <CmssyServerPage page={page} blocks={blocks} locale="en" />;
 ```
@@ -62,7 +65,11 @@ const cmssy = createCmssyClient({ org: "acme-org", workspaceSlug: "acme" });
 await cmssy.query(MY_QUERY, vars);
 
 // workspace-scoped (auto x-workspace-id header + $workspaceId var)
-const { publicModelRecords } = await cmssy.queryScoped(MODEL_RECORDS_QUERY, {
+const {
+  public: {
+    model: { records },
+  },
+} = await cmssy.queryScoped(MODEL_RECORDS_QUERY, {
   modelSlug: "posts",
 });
 ```

package/dist/client.cjs

@@ -1023,13 +1023,18 @@ function CmssyCommerceProvider({
     () => runCart("remove-discount", {}),
     [runCart]
   );
+  const setShippingMethod = react.useCallback(
+    (shippingMethodId) => runCart("set-shipping", { shippingMethodId }),
+    [runCart]
+  );
+  const merge = react.useCallback(() => runCart("merge", {}), [runCart]);
   const checkout = react.useCallback(
-    async (customerEmail) => {
+    async (input) => {
       const gen = ++generation.current;
       setError(null);
       try {
         const data = await post("checkout", {
-          customerEmail
+          ...input
         });
         if (gen === generation.current) setCart(null);
         return data.order;
@@ -1063,6 +1068,8 @@ function CmssyCommerceProvider({
       clearCart,
       applyDiscount,
       removeDiscount,
+      setShippingMethod,
+      merge,
       checkout,
       refresh,
       fetchProduct
@@ -1077,6 +1084,8 @@ function CmssyCommerceProvider({
       clearCart,
       applyDiscount,
       removeDiscount,
+      setShippingMethod,
+      merge,
       checkout,
       refresh,
       fetchProduct
@@ -1457,7 +1466,7 @@ function CheckoutComponent({ content }) {
     setBusy(true);
     setError(null);
     try {
-      setOrder(await checkout(email.trim()));
+      setOrder(await checkout({ customerEmail: email.trim() }));
     } catch (err) {
       setError(err instanceof Error ? err.message : "Checkout failed");
     } finally {
@@ -1558,6 +1567,46 @@ function useCmssyOrders(options = {}) {
   }, [load]);
   return { orders, total, hasMore, loading, error, refresh: load };
 }
+function useCmssyOrder(id, options = {}) {
+  const base = (options.basePath ?? "/api/cmssy/orders").replace(/\/+$/, "");
+  const [order, setOrder] = react.useState(null);
+  const [loading, setLoading] = react.useState(Boolean(id));
+  const [error, setError] = react.useState(null);
+  const load = react.useCallback(async () => {
+    if (!id) {
+      setOrder(null);
+      setLoading(false);
+      return;
+    }
+    setLoading(true);
+    setError(null);
+    try {
+      const qs = new URLSearchParams({ id });
+      const res = await fetch(`${base}?${qs.toString()}`, {
+        credentials: "same-origin",
+        cache: "no-store"
+      });
+      if (res.status === 401) {
+        setOrder(null);
+        return;
+      }
+      if (!res.ok) {
+        const body = await res.json().catch(() => ({}));
+        throw new Error(body.message ?? `Order request failed (${res.status})`);
+      }
+      const data = await res.json();
+      setOrder(data.order ?? null);
+    } catch (e) {
+      setError(e instanceof Error ? e.message : "Could not load the order");
+    } finally {
+      setLoading(false);
+    }
+  }, [base, id]);
+  react.useEffect(() => {
+    void load();
+  }, [load]);
+  return { order, loading, error, refresh: load };
+}
 
 exports.CmssyAuthProvider = CmssyAuthProvider;
 exports.CmssyCommerceProvider = CmssyCommerceProvider;
@@ -1575,6 +1624,7 @@ exports.productBlock = productBlock;
 exports.toMinorUnits = toMinorUnits;
 exports.useCart = useCart;
 exports.useCmssyLocale = useCmssyLocale;
+exports.useCmssyOrder = useCmssyOrder;
 exports.useCmssyOrders = useCmssyOrders;
 exports.useCmssyUser = useCmssyUser;
 exports.useEditBridge = useEditBridge;

package/dist/client.d.cts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { B as BlockSchema, a as BlockMeta, C as CmssyPageData, b as BlockDefinition, c as CmssyFormDefinition, d as CmssyLayoutGroup, e as CmssyLocaleContext, f as CmssyCart, g as CmssyOrder, h as CmssyProduct } from './commerce-queries-CxUeiT52.cjs';
-export { i as CmssyCartDiscount, j as CmssyCartItem, k as CmssyCartItemSnapshot, l as CmssyOrderItem, m as CmssyProductVariant } from './commerce-queries-CxUeiT52.cjs';
+import { B as BlockSchema, a as BlockMeta, C as CmssyPageData, b as BlockDefinition, c as CmssyFormDefinition, d as CmssyLayoutGroup, e as CmssyLocaleContext, f as CmssyAddress, g as CmssyCart, h as CmssyOrder, i as CmssyProduct } from './commerce-queries-fR6ZKQ3r.cjs';
+export { j as CmssyCartDiscount, k as CmssyCartItem, l as CmssyCartItemSnapshot, m as CmssyOrderItem, n as CmssyProductVariant } from './commerce-queries-fR6ZKQ3r.cjs';
 import { ReactNode } from 'react';
 import '@cmssy/types';
 
@@ -127,6 +127,12 @@ interface CmssyAddToCartOptions {
     variantSelections?: Record<string, string>;
     notes?: string;
 }
+interface CmssyCheckoutInput {
+    customerEmail: string;
+    poNumber?: string | null;
+    customerNote?: string | null;
+    shippingAddress?: CmssyAddress | null;
+}
 interface CmssyCommerceState {
     cart: CmssyCart | null;
     loading: boolean;
@@ -137,7 +143,9 @@ interface CmssyCommerceState {
     clearCart(): Promise<void>;
     applyDiscount(code: string): Promise<void>;
     removeDiscount(): Promise<void>;
-    checkout(customerEmail: string): Promise<CmssyOrder>;
+    setShippingMethod(shippingMethodId: string | null): Promise<void>;
+    merge(): Promise<void>;
+    checkout(input: CmssyCheckoutInput): Promise<CmssyOrder>;
     refresh(): Promise<void>;
     fetchProduct(modelSlug: string, filter: Record<string, unknown>): Promise<CmssyProduct | null>;
 }
@@ -168,10 +176,20 @@ interface UseCmssyOrdersOptions {
     limit?: number;
 }
 declare function useCmssyOrders(options?: UseCmssyOrdersOptions): CmssyOrdersState;
+interface CmssyOrderState {
+    order: CmssyOrder | null;
+    loading: boolean;
+    error: string | null;
+    refresh(): Promise<void>;
+}
+interface UseCmssyOrderOptions {
+    basePath?: string;
+}
+declare function useCmssyOrder(id: string | null | undefined, options?: UseCmssyOrderOptions): CmssyOrderState;
 
 declare function fractionDigits(currency: string): number;
 declare function fromMinorUnits(minor: number, currency: string): number;
 declare function toMinorUnits(amount: number, currency: string): number;
 declare function formatPrice(minor: number, currency: string | null | undefined): string;
 
-export { type CmssyAddToCartOptions, type CmssyAuthActionResult, CmssyAuthProvider, type CmssyAuthProviderProps, type CmssyAuthState, type CmssyAuthUser, CmssyCart, CmssyCommerceProvider, type CmssyCommerceProviderProps, type CmssyCommerceState, CmssyEditableLayout, type CmssyEditableLayoutProps, CmssyEditablePage, type CmssyEditablePageProps, CmssyLazyEditor, type CmssyLazyEditorProps, CmssyLazyLayout, type CmssyLazyLayoutProps, CmssyLocaleProvider, type CmssyLocaleProviderProps, CmssyOrder, type CmssyOrdersState, CmssyProduct, type EditBridgeConfig, type EditBridgeState, type PatchMap, type UseCmssyOrdersOptions, cartBlock, checkoutBlock, formatPrice, fractionDigits, fromMinorUnits, productBlock, toMinorUnits, useCart, useCmssyLocale, useCmssyOrders, useCmssyUser, useEditBridge };
+export { type CmssyAddToCartOptions, type CmssyAuthActionResult, CmssyAuthProvider, type CmssyAuthProviderProps, type CmssyAuthState, type CmssyAuthUser, CmssyCart, type CmssyCheckoutInput, CmssyCommerceProvider, type CmssyCommerceProviderProps, type CmssyCommerceState, CmssyEditableLayout, type CmssyEditableLayoutProps, CmssyEditablePage, type CmssyEditablePageProps, CmssyLazyEditor, type CmssyLazyEditorProps, CmssyLazyLayout, type CmssyLazyLayoutProps, CmssyLocaleProvider, type CmssyLocaleProviderProps, CmssyOrder, type CmssyOrderState, type CmssyOrdersState, CmssyProduct, type EditBridgeConfig, type EditBridgeState, type PatchMap, type UseCmssyOrderOptions, type UseCmssyOrdersOptions, cartBlock, checkoutBlock, formatPrice, fractionDigits, fromMinorUnits, productBlock, toMinorUnits, useCart, useCmssyLocale, useCmssyOrder, useCmssyOrders, useCmssyUser, useEditBridge };

package/dist/client.d.ts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { B as BlockSchema, a as BlockMeta, C as CmssyPageData, b as BlockDefinition, c as CmssyFormDefinition, d as CmssyLayoutGroup, e as CmssyLocaleContext, f as CmssyCart, g as CmssyOrder, h as CmssyProduct } from './commerce-queries-CxUeiT52.js';
-export { i as CmssyCartDiscount, j as CmssyCartItem, k as CmssyCartItemSnapshot, l as CmssyOrderItem, m as CmssyProductVariant } from './commerce-queries-CxUeiT52.js';
+import { B as BlockSchema, a as BlockMeta, C as CmssyPageData, b as BlockDefinition, c as CmssyFormDefinition, d as CmssyLayoutGroup, e as CmssyLocaleContext, f as CmssyAddress, g as CmssyCart, h as CmssyOrder, i as CmssyProduct } from './commerce-queries-fR6ZKQ3r.js';
+export { j as CmssyCartDiscount, k as CmssyCartItem, l as CmssyCartItemSnapshot, m as CmssyOrderItem, n as CmssyProductVariant } from './commerce-queries-fR6ZKQ3r.js';
 import { ReactNode } from 'react';
 import '@cmssy/types';
 
@@ -127,6 +127,12 @@ interface CmssyAddToCartOptions {
     variantSelections?: Record<string, string>;
     notes?: string;
 }
+interface CmssyCheckoutInput {
+    customerEmail: string;
+    poNumber?: string | null;
+    customerNote?: string | null;
+    shippingAddress?: CmssyAddress | null;
+}
 interface CmssyCommerceState {
     cart: CmssyCart | null;
     loading: boolean;
@@ -137,7 +143,9 @@ interface CmssyCommerceState {
     clearCart(): Promise<void>;
     applyDiscount(code: string): Promise<void>;
     removeDiscount(): Promise<void>;
-    checkout(customerEmail: string): Promise<CmssyOrder>;
+    setShippingMethod(shippingMethodId: string | null): Promise<void>;
+    merge(): Promise<void>;
+    checkout(input: CmssyCheckoutInput): Promise<CmssyOrder>;
     refresh(): Promise<void>;
     fetchProduct(modelSlug: string, filter: Record<string, unknown>): Promise<CmssyProduct | null>;
 }
@@ -168,10 +176,20 @@ interface UseCmssyOrdersOptions {
     limit?: number;
 }
 declare function useCmssyOrders(options?: UseCmssyOrdersOptions): CmssyOrdersState;
+interface CmssyOrderState {
+    order: CmssyOrder | null;
+    loading: boolean;
+    error: string | null;
+    refresh(): Promise<void>;
+}
+interface UseCmssyOrderOptions {
+    basePath?: string;
+}
+declare function useCmssyOrder(id: string | null | undefined, options?: UseCmssyOrderOptions): CmssyOrderState;
 
 declare function fractionDigits(currency: string): number;
 declare function fromMinorUnits(minor: number, currency: string): number;
 declare function toMinorUnits(amount: number, currency: string): number;
 declare function formatPrice(minor: number, currency: string | null | undefined): string;
 
-export { type CmssyAddToCartOptions, type CmssyAuthActionResult, CmssyAuthProvider, type CmssyAuthProviderProps, type CmssyAuthState, type CmssyAuthUser, CmssyCart, CmssyCommerceProvider, type CmssyCommerceProviderProps, type CmssyCommerceState, CmssyEditableLayout, type CmssyEditableLayoutProps, CmssyEditablePage, type CmssyEditablePageProps, CmssyLazyEditor, type CmssyLazyEditorProps, CmssyLazyLayout, type CmssyLazyLayoutProps, CmssyLocaleProvider, type CmssyLocaleProviderProps, CmssyOrder, type CmssyOrdersState, CmssyProduct, type EditBridgeConfig, type EditBridgeState, type PatchMap, type UseCmssyOrdersOptions, cartBlock, checkoutBlock, formatPrice, fractionDigits, fromMinorUnits, productBlock, toMinorUnits, useCart, useCmssyLocale, useCmssyOrders, useCmssyUser, useEditBridge };
+export { type CmssyAddToCartOptions, type CmssyAuthActionResult, CmssyAuthProvider, type CmssyAuthProviderProps, type CmssyAuthState, type CmssyAuthUser, CmssyCart, type CmssyCheckoutInput, CmssyCommerceProvider, type CmssyCommerceProviderProps, type CmssyCommerceState, CmssyEditableLayout, type CmssyEditableLayoutProps, CmssyEditablePage, type CmssyEditablePageProps, CmssyLazyEditor, type CmssyLazyEditorProps, CmssyLazyLayout, type CmssyLazyLayoutProps, CmssyLocaleProvider, type CmssyLocaleProviderProps, CmssyOrder, type CmssyOrderState, type CmssyOrdersState, CmssyProduct, type EditBridgeConfig, type EditBridgeState, type PatchMap, type UseCmssyOrderOptions, type UseCmssyOrdersOptions, cartBlock, checkoutBlock, formatPrice, fractionDigits, fromMinorUnits, productBlock, toMinorUnits, useCart, useCmssyLocale, useCmssyOrder, useCmssyOrders, useCmssyUser, useEditBridge };

package/dist/client.js

@@ -1021,13 +1021,18 @@ function CmssyCommerceProvider({
     () => runCart("remove-discount", {}),
     [runCart]
   );
+  const setShippingMethod = useCallback(
+    (shippingMethodId) => runCart("set-shipping", { shippingMethodId }),
+    [runCart]
+  );
+  const merge = useCallback(() => runCart("merge", {}), [runCart]);
   const checkout = useCallback(
-    async (customerEmail) => {
+    async (input) => {
       const gen = ++generation.current;
       setError(null);
       try {
         const data = await post("checkout", {
-          customerEmail
+          ...input
         });
         if (gen === generation.current) setCart(null);
         return data.order;
@@ -1061,6 +1066,8 @@ function CmssyCommerceProvider({
       clearCart,
       applyDiscount,
       removeDiscount,
+      setShippingMethod,
+      merge,
       checkout,
       refresh,
       fetchProduct
@@ -1075,6 +1082,8 @@ function CmssyCommerceProvider({
       clearCart,
       applyDiscount,
       removeDiscount,
+      setShippingMethod,
+      merge,
       checkout,
       refresh,
       fetchProduct
@@ -1455,7 +1464,7 @@ function CheckoutComponent({ content }) {
     setBusy(true);
     setError(null);
     try {
-      setOrder(await checkout(email.trim()));
+      setOrder(await checkout({ customerEmail: email.trim() }));
     } catch (err) {
       setError(err instanceof Error ? err.message : "Checkout failed");
     } finally {
@@ -1556,5 +1565,45 @@ function useCmssyOrders(options = {}) {
   }, [load]);
   return { orders, total, hasMore, loading, error, refresh: load };
 }
+function useCmssyOrder(id, options = {}) {
+  const base = (options.basePath ?? "/api/cmssy/orders").replace(/\/+$/, "");
+  const [order, setOrder] = useState(null);
+  const [loading, setLoading] = useState(Boolean(id));
+  const [error, setError] = useState(null);
+  const load = useCallback(async () => {
+    if (!id) {
+      setOrder(null);
+      setLoading(false);
+      return;
+    }
+    setLoading(true);
+    setError(null);
+    try {
+      const qs = new URLSearchParams({ id });
+      const res = await fetch(`${base}?${qs.toString()}`, {
+        credentials: "same-origin",
+        cache: "no-store"
+      });
+      if (res.status === 401) {
+        setOrder(null);
+        return;
+      }
+      if (!res.ok) {
+        const body = await res.json().catch(() => ({}));
+        throw new Error(body.message ?? `Order request failed (${res.status})`);
+      }
+      const data = await res.json();
+      setOrder(data.order ?? null);
+    } catch (e) {
+      setError(e instanceof Error ? e.message : "Could not load the order");
+    } finally {
+      setLoading(false);
+    }
+  }, [base, id]);
+  useEffect(() => {
+    void load();
+  }, [load]);
+  return { order, loading, error, refresh: load };
+}
 
-export { CmssyAuthProvider, CmssyCommerceProvider, CmssyEditableLayout, CmssyEditablePage, CmssyLazyEditor, CmssyLazyLayout, CmssyLocaleProvider, cartBlock, checkoutBlock, formatPrice, fractionDigits, fromMinorUnits, productBlock, toMinorUnits, useCart, useCmssyLocale, useCmssyOrders, useCmssyUser, useEditBridge };
+export { CmssyAuthProvider, CmssyCommerceProvider, CmssyEditableLayout, CmssyEditablePage, CmssyLazyEditor, CmssyLazyLayout, CmssyLocaleProvider, cartBlock, checkoutBlock, formatPrice, fractionDigits, fromMinorUnits, productBlock, toMinorUnits, useCart, useCmssyLocale, useCmssyOrder, useCmssyOrders, useCmssyUser, useEditBridge };

package/dist/{commerce-queries-CxUeiT52.d.cts → commerce-queries-fR6ZKQ3r.d.cts}

@@ -131,8 +131,8 @@ interface CmssyRecordList {
     total: number;
     hasMore: boolean;
 }
-declare const MODEL_DEFINITIONS_QUERY = "query PublicModelDefinitions($workspaceId: String!) {\n  publicModelDefinitions(workspaceId: $workspaceId) {\n    id name slug description icon color displayField recordCount\n  }\n}";
-declare const MODEL_RECORDS_QUERY = "query PublicModelRecords($workspaceId: String!, $modelSlug: String!, $filter: JSON, $sort: String, $limit: Int, $offset: Int, $populate: [String!]) {\n  publicModelRecords(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, sort: $sort, limit: $limit, offset: $offset, populate: $populate) {\n    items { id modelId data status createdAt updatedAt }\n    total\n    hasMore\n  }\n}";
+declare const MODEL_DEFINITIONS_QUERY = "query PublicModelDefinitions($workspaceId: String!) {\n  public {\n    model {\n      definitions(workspaceId: $workspaceId) {\n        id name slug description icon color displayField recordCount\n      }\n    }\n  }\n}";
+declare const MODEL_RECORDS_QUERY = "query PublicModelRecords($workspaceId: String!, $modelSlug: String!, $filter: JSON, $sort: String, $limit: Int, $offset: Int, $populate: [String!]) {\n  public {\n    model {\n      records(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, sort: $sort, limit: $limit, offset: $offset, populate: $populate) {\n        items { id modelId data status createdAt updatedAt }\n        total\n        hasMore\n      }\n    }\n  }\n}";
 interface CmssyFormField {
     id: string;
     name: string;
@@ -177,8 +177,8 @@ interface SubmitFormInput {
     data: Record<string, unknown>;
     website?: string;
 }
-declare const FORM_QUERY = "query PublicForm($formId: ID!) {\n  publicForm(formId: $formId) {\n    id\n    name\n    slug\n    description\n    fields {\n      id name fieldType label placeholder helpText\n      defaultValue width order showWhen requiredWhen\n      options { value label disabled }\n      validation { required minLength maxLength minValue maxValue pattern customMessage }\n    }\n    settings {\n      actionType submitButtonLabel successMessage errorMessage\n      redirectUrl requireLogin enableCaptcha\n    }\n  }\n}";
-declare const SUBMIT_FORM_MUTATION = "mutation SubmitForm($formId: ID!, $input: SubmitFormInput!) {\n  submitForm(formId: $formId, input: $input) {\n    success message submissionId redirectUrl accessToken customer\n  }\n}";
+declare const FORM_QUERY = "query PublicForm($formId: ID!) {\n  public {\n    form {\n      get(formId: $formId) {\n        id\n        name\n        slug\n        description\n        fields {\n          id name fieldType label placeholder helpText\n          defaultValue width order showWhen requiredWhen\n          options { value label disabled }\n          validation { required minLength maxLength minValue maxValue pattern customMessage }\n        }\n        settings {\n          actionType submitButtonLabel successMessage errorMessage\n          redirectUrl requireLogin enableCaptcha\n        }\n      }\n    }\n  }\n}";
+declare const SUBMIT_FORM_MUTATION = "mutation SubmitForm($formId: ID!, $input: SubmitFormInput!) {\n  public {\n    form {\n      submit(formId: $formId, input: $input) {\n        success message submissionId redirectUrl accessToken customer\n      }\n    }\n  }\n}";
 
 interface CmssyLocaleContext {
     current: string;
@@ -396,12 +396,17 @@ declare function blocksToMeta(blocks: BlockDefinition[], defaults?: {
     category?: string;
 }): Record<string, BlockMeta>;
 
+interface CmssyPriceTier {
+    minQty: number;
+    price: number;
+}
 interface CmssyCartItemSnapshot {
     name: string;
     price: number;
     currency: string;
     imageUrl: string | null;
     sku: string | null;
+    tiers: CmssyPriceTier[];
 }
 interface CmssyCartItem {
     id: string;
@@ -409,9 +414,35 @@ interface CmssyCartItem {
     quantity: number;
     variantSelections: Record<string, string> | null;
     snapshot: CmssyCartItemSnapshot;
+    unitPrice: number;
     currentPrice: number | null;
     priceMismatch: boolean;
 }
+interface CmssyShippingMethod {
+    id: string;
+    label: string;
+    price: number;
+    etaLabel: string | null;
+}
+interface CmssyTaxSummaryLine {
+    rateId: string | null;
+    name: string | null;
+    rate: number;
+    base: number;
+    amount: number;
+}
+interface CmssyAddress {
+    name: string;
+    company?: string | null;
+    line1: string;
+    line2?: string | null;
+    postalCode: string;
+    city: string;
+    region?: string | null;
+    country: string;
+    phone?: string | null;
+    vatId?: string | null;
+}
 interface CmssyCartDiscount {
     code: string;
     type: string;
@@ -427,6 +458,13 @@ interface CmssyCart {
     currency: string | null;
     appliedDiscount: CmssyCartDiscount | null;
     discountedTotal: number;
+    tax: number;
+    taxSummary: CmssyTaxSummaryLine[];
+    totalGross: number;
+    pricesIncludeTax: boolean;
+    shippingMethod: CmssyShippingMethod | null;
+    shippingTotal: number;
+    availableShippingMethods: CmssyShippingMethod[];
 }
 interface CmssyProductVariant {
     id: string;
@@ -437,15 +475,19 @@ interface CmssyProductVariant {
         name: string;
         value: string;
     }>;
+    tiers: CmssyPriceTier[];
 }
 interface CmssyProduct {
     id: string;
     data: Record<string, unknown>;
     variants: CmssyProductVariant[];
+    priceTiers: CmssyPriceTier[];
 }
 interface CmssyOrderItem {
     name: string;
     price: number;
+    listPrice?: number | null;
+    tierMinQty?: number | null;
     currency: string;
     quantity: number;
     sku: string | null;
@@ -456,13 +498,7 @@ interface CmssyOrderPayment {
     provider: string | null;
     at: string;
 }
-interface CmssyOrderTaxSummaryLine {
-    rateId: string | null;
-    name: string | null;
-    rate: number;
-    base: number;
-    amount: number;
-}
+type CmssyOrderTaxSummaryLine = CmssyTaxSummaryLine;
 interface CmssyOrder {
     id: string;
     status: string;
@@ -490,6 +526,17 @@ interface CmssyOrder {
     paidAt?: string | null;
     fulfilledAt?: string | null;
     createdAt?: string;
+    orderNumber?: number | null;
+    poNumber?: string | null;
+    customerNote?: string | null;
+    shippingAddress?: CmssyAddress | null;
+    shippingMethod?: {
+        id: string;
+        label: string;
+        price: number;
+    } | null;
+    shippingTotal?: number;
+    accessToken?: string | null;
 }
 
-export { SUBMIT_FORM_MUTATION as $, type AppToEditorMessage as A, type BlockSchema as B, type CmssyPageData as C, type CmssyFormField as D, type EditorToAppMessage as E, type FieldDefinition as F, type CmssyFormSettings as G, type CmssyFormSubmitResponse as H, type CmssyLocalizedValue as I, type CmssyModelDefinition as J, type CmssyModelRecord as K, type CmssyPageMeta as L, type CmssyPageSummary as M, type CmssyRecordList as N, DEFAULT_CMSSY_API_URL as O, FORM_QUERY as P, type FetchLikeResponse as Q, type RawBlock as R, type FetchPageOptions as S, MODEL_DEFINITIONS_QUERY as T, MODEL_RECORDS_QUERY as U, PROTOCOL_VERSION as V, type ParentReadyMessage as W, type PatchMessage as X, type RawLayoutBlock as Y, type ReadyMessage as Z, SITE_CONFIG_QUERY as _, type BlockMeta as a, type SelectMessage as a0, type SubmitFormInput as a1, blocksToMeta as a2, blocksToSchemas as a3, buildBlockContext as a4, buildBlockMap as a5, defineBlock as a6, fetchLayouts as a7, fetchPage as a8, fetchPageById as a9, fetchPageMeta as aa, fetchPages as ab, isProtocolCompatible as ac, normalizeSlug as ad, resolveApiUrl as ae, resolvePublicUrl as af, type BlockDefinition as b, type CmssyFormDefinition as c, type CmssyLayoutGroup as d, type CmssyLocaleContext as e, type CmssyCart as f, type CmssyOrder as g, type CmssyProduct as h, type CmssyCartDiscount as i, type CmssyCartItem as j, type CmssyCartItemSnapshot as k, type CmssyOrderItem as l, type CmssyProductVariant as m, type CmssyBlockAuthContext as n, type CmssyBlockWorkspace as o, type FetchLike as p, type CmssyClientConfig as q, type CmssySiteConfig as r, type BlockMap as s, type CmssyBlockContext as t, type BlockRect as u, type BoundsMessage as v, type BuildBlockContextExtra as w, type ClickMessage as x, type CmssyBlockMember as y, type CmssyBranding as z };
+export { type ParentReadyMessage as $, type AppToEditorMessage as A, type BlockSchema as B, type CmssyPageData as C, type CmssyBranding as D, type EditorToAppMessage as E, type FieldDefinition as F, type CmssyFormField as G, type CmssyFormSettings as H, type CmssyFormSubmitResponse as I, type CmssyLocalizedValue as J, type CmssyModelDefinition as K, type CmssyModelRecord as L, type CmssyOrderTaxSummaryLine as M, type CmssyPageMeta as N, type CmssyPageSummary as O, type CmssyPriceTier as P, type CmssyRecordList as Q, type RawBlock as R, type CmssyShippingMethod as S, type CmssyTaxSummaryLine as T, DEFAULT_CMSSY_API_URL as U, FORM_QUERY as V, type FetchLikeResponse as W, type FetchPageOptions as X, MODEL_DEFINITIONS_QUERY as Y, MODEL_RECORDS_QUERY as Z, PROTOCOL_VERSION as _, type BlockMeta as a, type PatchMessage as a0, type RawLayoutBlock as a1, type ReadyMessage as a2, SITE_CONFIG_QUERY as a3, SUBMIT_FORM_MUTATION as a4, type SelectMessage as a5, type SubmitFormInput as a6, blocksToMeta as a7, blocksToSchemas as a8, buildBlockContext as a9, buildBlockMap as aa, defineBlock as ab, fetchLayouts as ac, fetchPage as ad, fetchPageById as ae, fetchPageMeta as af, fetchPages as ag, isProtocolCompatible as ah, normalizeSlug as ai, resolveApiUrl as aj, resolvePublicUrl as ak, type BlockDefinition as b, type CmssyFormDefinition as c, type CmssyLayoutGroup as d, type CmssyLocaleContext as e, type CmssyAddress as f, type CmssyCart as g, type CmssyOrder as h, type CmssyProduct as i, type CmssyCartDiscount as j, type CmssyCartItem as k, type CmssyCartItemSnapshot as l, type CmssyOrderItem as m, type CmssyProductVariant as n, type CmssyBlockAuthContext as o, type CmssyBlockWorkspace as p, type FetchLike as q, type CmssyClientConfig as r, type CmssySiteConfig as s, type BlockMap as t, type CmssyBlockContext as u, type BlockRect as v, type BoundsMessage as w, type BuildBlockContextExtra as x, type ClickMessage as y, type CmssyBlockMember as z };

package/dist/{commerce-queries-CxUeiT52.d.ts → commerce-queries-fR6ZKQ3r.d.ts}

@@ -131,8 +131,8 @@ interface CmssyRecordList {
     total: number;
     hasMore: boolean;
 }
-declare const MODEL_DEFINITIONS_QUERY = "query PublicModelDefinitions($workspaceId: String!) {\n  publicModelDefinitions(workspaceId: $workspaceId) {\n    id name slug description icon color displayField recordCount\n  }\n}";
-declare const MODEL_RECORDS_QUERY = "query PublicModelRecords($workspaceId: String!, $modelSlug: String!, $filter: JSON, $sort: String, $limit: Int, $offset: Int, $populate: [String!]) {\n  publicModelRecords(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, sort: $sort, limit: $limit, offset: $offset, populate: $populate) {\n    items { id modelId data status createdAt updatedAt }\n    total\n    hasMore\n  }\n}";
+declare const MODEL_DEFINITIONS_QUERY = "query PublicModelDefinitions($workspaceId: String!) {\n  public {\n    model {\n      definitions(workspaceId: $workspaceId) {\n        id name slug description icon color displayField recordCount\n      }\n    }\n  }\n}";
+declare const MODEL_RECORDS_QUERY = "query PublicModelRecords($workspaceId: String!, $modelSlug: String!, $filter: JSON, $sort: String, $limit: Int, $offset: Int, $populate: [String!]) {\n  public {\n    model {\n      records(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, sort: $sort, limit: $limit, offset: $offset, populate: $populate) {\n        items { id modelId data status createdAt updatedAt }\n        total\n        hasMore\n      }\n    }\n  }\n}";
 interface CmssyFormField {
     id: string;
     name: string;
@@ -177,8 +177,8 @@ interface SubmitFormInput {
     data: Record<string, unknown>;
     website?: string;
 }
-declare const FORM_QUERY = "query PublicForm($formId: ID!) {\n  publicForm(formId: $formId) {\n    id\n    name\n    slug\n    description\n    fields {\n      id name fieldType label placeholder helpText\n      defaultValue width order showWhen requiredWhen\n      options { value label disabled }\n      validation { required minLength maxLength minValue maxValue pattern customMessage }\n    }\n    settings {\n      actionType submitButtonLabel successMessage errorMessage\n      redirectUrl requireLogin enableCaptcha\n    }\n  }\n}";
-declare const SUBMIT_FORM_MUTATION = "mutation SubmitForm($formId: ID!, $input: SubmitFormInput!) {\n  submitForm(formId: $formId, input: $input) {\n    success message submissionId redirectUrl accessToken customer\n  }\n}";
+declare const FORM_QUERY = "query PublicForm($formId: ID!) {\n  public {\n    form {\n      get(formId: $formId) {\n        id\n        name\n        slug\n        description\n        fields {\n          id name fieldType label placeholder helpText\n          defaultValue width order showWhen requiredWhen\n          options { value label disabled }\n          validation { required minLength maxLength minValue maxValue pattern customMessage }\n        }\n        settings {\n          actionType submitButtonLabel successMessage errorMessage\n          redirectUrl requireLogin enableCaptcha\n        }\n      }\n    }\n  }\n}";
+declare const SUBMIT_FORM_MUTATION = "mutation SubmitForm($formId: ID!, $input: SubmitFormInput!) {\n  public {\n    form {\n      submit(formId: $formId, input: $input) {\n        success message submissionId redirectUrl accessToken customer\n      }\n    }\n  }\n}";
 
 interface CmssyLocaleContext {
     current: string;
@@ -396,12 +396,17 @@ declare function blocksToMeta(blocks: BlockDefinition[], defaults?: {
     category?: string;
 }): Record<string, BlockMeta>;
 
+interface CmssyPriceTier {
+    minQty: number;
+    price: number;
+}
 interface CmssyCartItemSnapshot {
     name: string;
     price: number;
     currency: string;
     imageUrl: string | null;
     sku: string | null;
+    tiers: CmssyPriceTier[];
 }
 interface CmssyCartItem {
     id: string;
@@ -409,9 +414,35 @@ interface CmssyCartItem {
     quantity: number;
     variantSelections: Record<string, string> | null;
     snapshot: CmssyCartItemSnapshot;
+    unitPrice: number;
     currentPrice: number | null;
     priceMismatch: boolean;
 }
+interface CmssyShippingMethod {
+    id: string;
+    label: string;
+    price: number;
+    etaLabel: string | null;
+}
+interface CmssyTaxSummaryLine {
+    rateId: string | null;
+    name: string | null;
+    rate: number;
+    base: number;
+    amount: number;
+}
+interface CmssyAddress {
+    name: string;
+    company?: string | null;
+    line1: string;
+    line2?: string | null;
+    postalCode: string;
+    city: string;
+    region?: string | null;
+    country: string;
+    phone?: string | null;
+    vatId?: string | null;
+}
 interface CmssyCartDiscount {
     code: string;
     type: string;
@@ -427,6 +458,13 @@ interface CmssyCart {
     currency: string | null;
     appliedDiscount: CmssyCartDiscount | null;
     discountedTotal: number;
+    tax: number;
+    taxSummary: CmssyTaxSummaryLine[];
+    totalGross: number;
+    pricesIncludeTax: boolean;
+    shippingMethod: CmssyShippingMethod | null;
+    shippingTotal: number;
+    availableShippingMethods: CmssyShippingMethod[];
 }
 interface CmssyProductVariant {
     id: string;
@@ -437,15 +475,19 @@ interface CmssyProductVariant {
         name: string;
         value: string;
     }>;
+    tiers: CmssyPriceTier[];
 }
 interface CmssyProduct {
     id: string;
     data: Record<string, unknown>;
     variants: CmssyProductVariant[];
+    priceTiers: CmssyPriceTier[];
 }
 interface CmssyOrderItem {
     name: string;
     price: number;
+    listPrice?: number | null;
+    tierMinQty?: number | null;
     currency: string;
     quantity: number;
     sku: string | null;
@@ -456,13 +498,7 @@ interface CmssyOrderPayment {
     provider: string | null;
     at: string;
 }
-interface CmssyOrderTaxSummaryLine {
-    rateId: string | null;
-    name: string | null;
-    rate: number;
-    base: number;
-    amount: number;
-}
+type CmssyOrderTaxSummaryLine = CmssyTaxSummaryLine;
 interface CmssyOrder {
     id: string;
     status: string;
@@ -490,6 +526,17 @@ interface CmssyOrder {
     paidAt?: string | null;
     fulfilledAt?: string | null;
     createdAt?: string;
+    orderNumber?: number | null;
+    poNumber?: string | null;
+    customerNote?: string | null;
+    shippingAddress?: CmssyAddress | null;
+    shippingMethod?: {
+        id: string;
+        label: string;
+        price: number;
+    } | null;
+    shippingTotal?: number;
+    accessToken?: string | null;
 }
 
-export { SUBMIT_FORM_MUTATION as $, type AppToEditorMessage as A, type BlockSchema as B, type CmssyPageData as C, type CmssyFormField as D, type EditorToAppMessage as E, type FieldDefinition as F, type CmssyFormSettings as G, type CmssyFormSubmitResponse as H, type CmssyLocalizedValue as I, type CmssyModelDefinition as J, type CmssyModelRecord as K, type CmssyPageMeta as L, type CmssyPageSummary as M, type CmssyRecordList as N, DEFAULT_CMSSY_API_URL as O, FORM_QUERY as P, type FetchLikeResponse as Q, type RawBlock as R, type FetchPageOptions as S, MODEL_DEFINITIONS_QUERY as T, MODEL_RECORDS_QUERY as U, PROTOCOL_VERSION as V, type ParentReadyMessage as W, type PatchMessage as X, type RawLayoutBlock as Y, type ReadyMessage as Z, SITE_CONFIG_QUERY as _, type BlockMeta as a, type SelectMessage as a0, type SubmitFormInput as a1, blocksToMeta as a2, blocksToSchemas as a3, buildBlockContext as a4, buildBlockMap as a5, defineBlock as a6, fetchLayouts as a7, fetchPage as a8, fetchPageById as a9, fetchPageMeta as aa, fetchPages as ab, isProtocolCompatible as ac, normalizeSlug as ad, resolveApiUrl as ae, resolvePublicUrl as af, type BlockDefinition as b, type CmssyFormDefinition as c, type CmssyLayoutGroup as d, type CmssyLocaleContext as e, type CmssyCart as f, type CmssyOrder as g, type CmssyProduct as h, type CmssyCartDiscount as i, type CmssyCartItem as j, type CmssyCartItemSnapshot as k, type CmssyOrderItem as l, type CmssyProductVariant as m, type CmssyBlockAuthContext as n, type CmssyBlockWorkspace as o, type FetchLike as p, type CmssyClientConfig as q, type CmssySiteConfig as r, type BlockMap as s, type CmssyBlockContext as t, type BlockRect as u, type BoundsMessage as v, type BuildBlockContextExtra as w, type ClickMessage as x, type CmssyBlockMember as y, type CmssyBranding as z };
+export { type ParentReadyMessage as $, type AppToEditorMessage as A, type BlockSchema as B, type CmssyPageData as C, type CmssyBranding as D, type EditorToAppMessage as E, type FieldDefinition as F, type CmssyFormField as G, type CmssyFormSettings as H, type CmssyFormSubmitResponse as I, type CmssyLocalizedValue as J, type CmssyModelDefinition as K, type CmssyModelRecord as L, type CmssyOrderTaxSummaryLine as M, type CmssyPageMeta as N, type CmssyPageSummary as O, type CmssyPriceTier as P, type CmssyRecordList as Q, type RawBlock as R, type CmssyShippingMethod as S, type CmssyTaxSummaryLine as T, DEFAULT_CMSSY_API_URL as U, FORM_QUERY as V, type FetchLikeResponse as W, type FetchPageOptions as X, MODEL_DEFINITIONS_QUERY as Y, MODEL_RECORDS_QUERY as Z, PROTOCOL_VERSION as _, type BlockMeta as a, type PatchMessage as a0, type RawLayoutBlock as a1, type ReadyMessage as a2, SITE_CONFIG_QUERY as a3, SUBMIT_FORM_MUTATION as a4, type SelectMessage as a5, type SubmitFormInput as a6, blocksToMeta as a7, blocksToSchemas as a8, buildBlockContext as a9, buildBlockMap as aa, defineBlock as ab, fetchLayouts as ac, fetchPage as ad, fetchPageById as ae, fetchPageMeta as af, fetchPages as ag, isProtocolCompatible as ah, normalizeSlug as ai, resolveApiUrl as aj, resolvePublicUrl as ak, type BlockDefinition as b, type CmssyFormDefinition as c, type CmssyLayoutGroup as d, type CmssyLocaleContext as e, type CmssyAddress as f, type CmssyCart as g, type CmssyOrder as h, type CmssyProduct as i, type CmssyCartDiscount as j, type CmssyCartItem as k, type CmssyCartItemSnapshot as l, type CmssyOrderItem as m, type CmssyProductVariant as n, type CmssyBlockAuthContext as o, type CmssyBlockWorkspace as p, type FetchLike as q, type CmssyClientConfig as r, type CmssySiteConfig as s, type BlockMap as t, type CmssyBlockContext as u, type BlockRect as v, type BoundsMessage as w, type BuildBlockContextExtra as x, type ClickMessage as y, type CmssyBlockMember as z };

package/dist/index.cjs

@@ -678,38 +678,54 @@ var SITE_CONFIG_QUERY = `query PublicSiteConfig($workspaceSlug: String!) {
   }
 }`;
 var MODEL_DEFINITIONS_QUERY = `query PublicModelDefinitions($workspaceId: String!) {
-  publicModelDefinitions(workspaceId: $workspaceId) {
-    id name slug description icon color displayField recordCount
+  public {
+    model {
+      definitions(workspaceId: $workspaceId) {
+        id name slug description icon color displayField recordCount
+      }
+    }
   }
 }`;
 var MODEL_RECORDS_QUERY = `query PublicModelRecords($workspaceId: String!, $modelSlug: String!, $filter: JSON, $sort: String, $limit: Int, $offset: Int, $populate: [String!]) {
-  publicModelRecords(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, sort: $sort, limit: $limit, offset: $offset, populate: $populate) {
-    items { id modelId data status createdAt updatedAt }
-    total
-    hasMore
+  public {
+    model {
+      records(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, sort: $sort, limit: $limit, offset: $offset, populate: $populate) {
+        items { id modelId data status createdAt updatedAt }
+        total
+        hasMore
+      }
+    }
   }
 }`;
 var FORM_QUERY = `query PublicForm($formId: ID!) {
-  publicForm(formId: $formId) {
-    id
-    name
-    slug
-    description
-    fields {
-      id name fieldType label placeholder helpText
-      defaultValue width order showWhen requiredWhen
-      options { value label disabled }
-      validation { required minLength maxLength minValue maxValue pattern customMessage }
-    }
-    settings {
-      actionType submitButtonLabel successMessage errorMessage
-      redirectUrl requireLogin enableCaptcha
+  public {
+    form {
+      get(formId: $formId) {
+        id
+        name
+        slug
+        description
+        fields {
+          id name fieldType label placeholder helpText
+          defaultValue width order showWhen requiredWhen
+          options { value label disabled }
+          validation { required minLength maxLength minValue maxValue pattern customMessage }
+        }
+        settings {
+          actionType submitButtonLabel successMessage errorMessage
+          redirectUrl requireLogin enableCaptcha
+        }
+      }
     }
   }
 }`;
 var SUBMIT_FORM_MUTATION = `mutation SubmitForm($formId: ID!, $input: SubmitFormInput!) {
-  submitForm(formId: $formId, input: $input) {
-    success message submissionId redirectUrl accessToken customer
+  public {
+    form {
+      submit(formId: $formId, input: $input) {
+        success message submissionId redirectUrl accessToken customer
+      }
+    }
   }
 }`;
 
@@ -804,7 +820,7 @@ async function resolveForms(config, blocks, locale, defaultLocale, options) {
     ids.map(async (id) => {
       try {
         const data = await client.queryScoped(FORM_QUERY, { formId: id }, options);
-        return [id, data.publicForm];
+        return [id, data.public.form.get];
       } catch (err) {
         if (typeof console !== "undefined") {
           console.warn(`[cmssy] failed to resolve form ${id}`, err);

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { F as FieldDefinition, C as CmssyPageData, b as BlockDefinition, c as CmssyFormDefinition, n as CmssyBlockAuthContext, o as CmssyBlockWorkspace, d as CmssyLayoutGroup, E as EditorToAppMessage, A as AppToEditorMessage, p as FetchLike, q as CmssyClientConfig, r as CmssySiteConfig, R as RawBlock, e as CmssyLocaleContext, s as BlockMap, t as CmssyBlockContext } from './commerce-queries-CxUeiT52.cjs';
-export { a as BlockMeta, u as BlockRect, B as BlockSchema, v as BoundsMessage, w as BuildBlockContextExtra, x as ClickMessage, y as CmssyBlockMember, z as CmssyBranding, f as CmssyCart, i as CmssyCartDiscount, j as CmssyCartItem, k as CmssyCartItemSnapshot, D as CmssyFormField, G as CmssyFormSettings, H as CmssyFormSubmitResponse, I as CmssyLocalizedValue, J as CmssyModelDefinition, K as CmssyModelRecord, g as CmssyOrder, L as CmssyPageMeta, M as CmssyPageSummary, h as CmssyProduct, m as CmssyProductVariant, N as CmssyRecordList, O as DEFAULT_CMSSY_API_URL, P as FORM_QUERY, Q as FetchLikeResponse, S as FetchPageOptions, T as MODEL_DEFINITIONS_QUERY, U as MODEL_RECORDS_QUERY, V as PROTOCOL_VERSION, W as ParentReadyMessage, X as PatchMessage, Y as RawLayoutBlock, Z as ReadyMessage, _ as SITE_CONFIG_QUERY, $ as SUBMIT_FORM_MUTATION, a0 as SelectMessage, a1 as SubmitFormInput, a2 as blocksToMeta, a3 as blocksToSchemas, a4 as buildBlockContext, a5 as buildBlockMap, a6 as defineBlock, a7 as fetchLayouts, a8 as fetchPage, a9 as fetchPageById, aa as fetchPageMeta, ab as fetchPages, ac as isProtocolCompatible, ad as normalizeSlug, ae as resolveApiUrl, af as resolvePublicUrl } from './commerce-queries-CxUeiT52.cjs';
+import { F as FieldDefinition, C as CmssyPageData, b as BlockDefinition, c as CmssyFormDefinition, o as CmssyBlockAuthContext, p as CmssyBlockWorkspace, d as CmssyLayoutGroup, E as EditorToAppMessage, A as AppToEditorMessage, q as FetchLike, r as CmssyClientConfig, s as CmssySiteConfig, R as RawBlock, e as CmssyLocaleContext, t as BlockMap, u as CmssyBlockContext } from './commerce-queries-fR6ZKQ3r.cjs';
+export { a as BlockMeta, v as BlockRect, B as BlockSchema, w as BoundsMessage, x as BuildBlockContextExtra, y as ClickMessage, f as CmssyAddress, z as CmssyBlockMember, D as CmssyBranding, g as CmssyCart, j as CmssyCartDiscount, k as CmssyCartItem, l as CmssyCartItemSnapshot, G as CmssyFormField, H as CmssyFormSettings, I as CmssyFormSubmitResponse, J as CmssyLocalizedValue, K as CmssyModelDefinition, L as CmssyModelRecord, h as CmssyOrder, m as CmssyOrderItem, M as CmssyOrderTaxSummaryLine, N as CmssyPageMeta, O as CmssyPageSummary, P as CmssyPriceTier, i as CmssyProduct, n as CmssyProductVariant, Q as CmssyRecordList, S as CmssyShippingMethod, T as CmssyTaxSummaryLine, U as DEFAULT_CMSSY_API_URL, V as FORM_QUERY, W as FetchLikeResponse, X as FetchPageOptions, Y as MODEL_DEFINITIONS_QUERY, Z as MODEL_RECORDS_QUERY, _ as PROTOCOL_VERSION, $ as ParentReadyMessage, a0 as PatchMessage, a1 as RawLayoutBlock, a2 as ReadyMessage, a3 as SITE_CONFIG_QUERY, a4 as SUBMIT_FORM_MUTATION, a5 as SelectMessage, a6 as SubmitFormInput, a7 as blocksToMeta, a8 as blocksToSchemas, a9 as buildBlockContext, aa as buildBlockMap, ab as defineBlock, ac as fetchLayouts, ad as fetchPage, ae as fetchPageById, af as fetchPageMeta, ag as fetchPages, ah as isProtocolCompatible, ai as normalizeSlug, aj as resolveApiUrl, ak as resolvePublicUrl } from './commerce-queries-fR6ZKQ3r.cjs';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 export { FieldCondition, FieldConditionGroup, FieldConditionLogic, FieldType, evaluateFieldConditionGroup } from '@cmssy/types';
 import 'react';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { F as FieldDefinition, C as CmssyPageData, b as BlockDefinition, c as CmssyFormDefinition, n as CmssyBlockAuthContext, o as CmssyBlockWorkspace, d as CmssyLayoutGroup, E as EditorToAppMessage, A as AppToEditorMessage, p as FetchLike, q as CmssyClientConfig, r as CmssySiteConfig, R as RawBlock, e as CmssyLocaleContext, s as BlockMap, t as CmssyBlockContext } from './commerce-queries-CxUeiT52.js';
-export { a as BlockMeta, u as BlockRect, B as BlockSchema, v as BoundsMessage, w as BuildBlockContextExtra, x as ClickMessage, y as CmssyBlockMember, z as CmssyBranding, f as CmssyCart, i as CmssyCartDiscount, j as CmssyCartItem, k as CmssyCartItemSnapshot, D as CmssyFormField, G as CmssyFormSettings, H as CmssyFormSubmitResponse, I as CmssyLocalizedValue, J as CmssyModelDefinition, K as CmssyModelRecord, g as CmssyOrder, L as CmssyPageMeta, M as CmssyPageSummary, h as CmssyProduct, m as CmssyProductVariant, N as CmssyRecordList, O as DEFAULT_CMSSY_API_URL, P as FORM_QUERY, Q as FetchLikeResponse, S as FetchPageOptions, T as MODEL_DEFINITIONS_QUERY, U as MODEL_RECORDS_QUERY, V as PROTOCOL_VERSION, W as ParentReadyMessage, X as PatchMessage, Y as RawLayoutBlock, Z as ReadyMessage, _ as SITE_CONFIG_QUERY, $ as SUBMIT_FORM_MUTATION, a0 as SelectMessage, a1 as SubmitFormInput, a2 as blocksToMeta, a3 as blocksToSchemas, a4 as buildBlockContext, a5 as buildBlockMap, a6 as defineBlock, a7 as fetchLayouts, a8 as fetchPage, a9 as fetchPageById, aa as fetchPageMeta, ab as fetchPages, ac as isProtocolCompatible, ad as normalizeSlug, ae as resolveApiUrl, af as resolvePublicUrl } from './commerce-queries-CxUeiT52.js';
+import { F as FieldDefinition, C as CmssyPageData, b as BlockDefinition, c as CmssyFormDefinition, o as CmssyBlockAuthContext, p as CmssyBlockWorkspace, d as CmssyLayoutGroup, E as EditorToAppMessage, A as AppToEditorMessage, q as FetchLike, r as CmssyClientConfig, s as CmssySiteConfig, R as RawBlock, e as CmssyLocaleContext, t as BlockMap, u as CmssyBlockContext } from './commerce-queries-fR6ZKQ3r.js';
+export { a as BlockMeta, v as BlockRect, B as BlockSchema, w as BoundsMessage, x as BuildBlockContextExtra, y as ClickMessage, f as CmssyAddress, z as CmssyBlockMember, D as CmssyBranding, g as CmssyCart, j as CmssyCartDiscount, k as CmssyCartItem, l as CmssyCartItemSnapshot, G as CmssyFormField, H as CmssyFormSettings, I as CmssyFormSubmitResponse, J as CmssyLocalizedValue, K as CmssyModelDefinition, L as CmssyModelRecord, h as CmssyOrder, m as CmssyOrderItem, M as CmssyOrderTaxSummaryLine, N as CmssyPageMeta, O as CmssyPageSummary, P as CmssyPriceTier, i as CmssyProduct, n as CmssyProductVariant, Q as CmssyRecordList, S as CmssyShippingMethod, T as CmssyTaxSummaryLine, U as DEFAULT_CMSSY_API_URL, V as FORM_QUERY, W as FetchLikeResponse, X as FetchPageOptions, Y as MODEL_DEFINITIONS_QUERY, Z as MODEL_RECORDS_QUERY, _ as PROTOCOL_VERSION, $ as ParentReadyMessage, a0 as PatchMessage, a1 as RawLayoutBlock, a2 as ReadyMessage, a3 as SITE_CONFIG_QUERY, a4 as SUBMIT_FORM_MUTATION, a5 as SelectMessage, a6 as SubmitFormInput, a7 as blocksToMeta, a8 as blocksToSchemas, a9 as buildBlockContext, aa as buildBlockMap, ab as defineBlock, ac as fetchLayouts, ad as fetchPage, ae as fetchPageById, af as fetchPageMeta, ag as fetchPages, ah as isProtocolCompatible, ai as normalizeSlug, aj as resolveApiUrl, ak as resolvePublicUrl } from './commerce-queries-fR6ZKQ3r.js';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 export { FieldCondition, FieldConditionGroup, FieldConditionLogic, FieldType, evaluateFieldConditionGroup } from '@cmssy/types';
 import 'react';

package/dist/index.js

@@ -676,38 +676,54 @@ var SITE_CONFIG_QUERY = `query PublicSiteConfig($workspaceSlug: String!) {
   }
 }`;
 var MODEL_DEFINITIONS_QUERY = `query PublicModelDefinitions($workspaceId: String!) {
-  publicModelDefinitions(workspaceId: $workspaceId) {
-    id name slug description icon color displayField recordCount
+  public {
+    model {
+      definitions(workspaceId: $workspaceId) {
+        id name slug description icon color displayField recordCount
+      }
+    }
   }
 }`;
 var MODEL_RECORDS_QUERY = `query PublicModelRecords($workspaceId: String!, $modelSlug: String!, $filter: JSON, $sort: String, $limit: Int, $offset: Int, $populate: [String!]) {
-  publicModelRecords(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, sort: $sort, limit: $limit, offset: $offset, populate: $populate) {
-    items { id modelId data status createdAt updatedAt }
-    total
-    hasMore
+  public {
+    model {
+      records(workspaceId: $workspaceId, modelSlug: $modelSlug, filter: $filter, sort: $sort, limit: $limit, offset: $offset, populate: $populate) {
+        items { id modelId data status createdAt updatedAt }
+        total
+        hasMore
+      }
+    }
   }
 }`;
 var FORM_QUERY = `query PublicForm($formId: ID!) {
-  publicForm(formId: $formId) {
-    id
-    name
-    slug
-    description
-    fields {
-      id name fieldType label placeholder helpText
-      defaultValue width order showWhen requiredWhen
-      options { value label disabled }
-      validation { required minLength maxLength minValue maxValue pattern customMessage }
-    }
-    settings {
-      actionType submitButtonLabel successMessage errorMessage
-      redirectUrl requireLogin enableCaptcha
+  public {
+    form {
+      get(formId: $formId) {
+        id
+        name
+        slug
+        description
+        fields {
+          id name fieldType label placeholder helpText
+          defaultValue width order showWhen requiredWhen
+          options { value label disabled }
+          validation { required minLength maxLength minValue maxValue pattern customMessage }
+        }
+        settings {
+          actionType submitButtonLabel successMessage errorMessage
+          redirectUrl requireLogin enableCaptcha
+        }
+      }
     }
   }
 }`;
 var SUBMIT_FORM_MUTATION = `mutation SubmitForm($formId: ID!, $input: SubmitFormInput!) {
-  submitForm(formId: $formId, input: $input) {
-    success message submissionId redirectUrl accessToken customer
+  public {
+    form {
+      submit(formId: $formId, input: $input) {
+        success message submissionId redirectUrl accessToken customer
+      }
+    }
   }
 }`;
 
@@ -802,7 +818,7 @@ async function resolveForms(config, blocks, locale, defaultLocale, options) {
     ids.map(async (id) => {
       try {
         const data = await client.queryScoped(FORM_QUERY, { formId: id }, options);
-        return [id, data.publicForm];
+        return [id, data.public.form.get];
       } catch (err) {
         if (typeof console !== "undefined") {
           console.warn(`[cmssy] failed to resolve form ${id}`, err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/react",
-  "version": "0.18.0",
+  "version": "2.0.0",
   "description": "React blocks, renderers, data client and editor bridge for cmssy headless sites",
   "keywords": [
     "cmssy",