@decocms/apps-wake 7.72.0 → 8.1.0-next.1

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@decocms/apps-wake",
-  "version": "7.72.0",
+  "version": "8.1.0-next.1",
   "type": "module",
-  "description": "Deco commerce app: Wake Commerce integration",
+  "description": "Thin Wake Commerce Storefront API client for Deco sites",
   "repository": {
     "type": "git",
     "url": "https://github.com/decocms/blocks.git",
@@ -10,45 +10,24 @@
   },
   "files": [
     "src",
-    "tsconfig.json"
+    "!src/**/*.test.ts",
+    "!src/**/__tests__"
   ],
   "main": "./src/index.ts",
   "exports": {
     ".": "./src/index.ts",
-    "./mod": "./src/mod.ts",
-    "./client": "./src/client.ts",
-    "./commerceLoaders": "./src/commerceLoaders.ts",
-    "./loaders/*": "./src/loaders/*.ts",
-    "./actions/*": "./src/actions/*.ts",
-    "./actions/cart/*": "./src/actions/cart/*.ts",
-    "./actions/newsletter/*": "./src/actions/newsletter/*.ts",
-    "./actions/review/*": "./src/actions/review/*.ts",
-    "./actions/wishlist/*": "./src/actions/wishlist/*.ts",
-    "./handlers/*": "./src/handlers/*.ts",
-    "./hooks": "./src/hooks/index.ts",
-    "./hooks/*": "./src/hooks/*.ts",
-    "./utils/*": "./src/utils/*.ts",
-    "./registry": "./src/registry.ts"
+    "./storefront": "./src/storefront.ts",
+    "./storefront/types": "./src/storefrontTypes.ts"
   },
   "scripts": {
     "build": "tsc",
     "test": "vitest run --root ../.. packages/apps-wake/",
-    "typecheck": "tsc --noEmit",
-    "lint:unused": "knip"
+    "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@decocms/blocks": "7.72.0",
-    "@decocms/apps-commerce": "7.72.0",
-    "@decocms/tanstack": "7.72.0"
-  },
-  "peerDependencies": {
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0"
+    "@decocms/blocks": "8.1.0-next.1"
   },
   "devDependencies": {
-    "@types/react": "^19.0.0",
-    "@types/react-dom": "^19.0.0",
-    "knip": "^5.86.0",
     "typescript": "^5.9.0"
   },
   "publishConfig": {

package/src/index.ts

@@ -1,58 +1,11 @@
-// App contract
+// The thin Wake client (see /next/upstream-clients). Operations are in
+// `@decocms/apps-wake/storefront`, their types in `.../storefront/types`.
 
-// Cart actions
-export { default as addItem } from "./actions/cart/addItem";
-export { type CartItem, default as addItems } from "./actions/cart/addItems";
-export { default as updateItemQuantity } from "./actions/cart/updateItemQuantity";
-// Client & Config
-export type { WakeConfig } from "./client";
+export type { UserAuthenticate } from "./utils/client";
 export {
-  configureWake,
-  getBaseUrl,
-  getCheckoutUrl,
-  getWakeClient,
-  getWakeConfig,
-  initWakeFromBlocks,
-  setWakeFetch,
-} from "./client";
-// Commerce loaders factory (cached, CMS-registerable map)
-export {
-  type CommerceLoaderFn,
-  createWakeCommerceLoaders,
-  type WakeCommerceLoadersOptions,
-} from "./commerceLoaders";
-// Cart / user / wishlist
-export { default as cartLoader } from "./loaders/cart";
-// Shop / partners
-export { default as partnersLoader } from "./loaders/partners";
-// Product loaders
-export { default as productDetailsPageLoader } from "./loaders/productDetailsPage";
-export { default as productListLoader } from "./loaders/productList";
-export { default as productListingPageLoader } from "./loaders/productListingPage";
-export type { WakeProxyRoute } from "./loaders/proxy";
-export { default as proxyLoader } from "./loaders/proxy";
-export { default as recommendationsLoader } from "./loaders/recommendations";
-export { default as shopLoader } from "./loaders/shop";
-export { default as suggestionLoader } from "./loaders/suggestion";
-export { default as userLoader } from "./loaders/user";
-export { default as wishlistLoader } from "./loaders/wishlist";
-export { configure, type Props, type WakeState } from "./mod";
-// Registry
-export { WAKE_REGISTRY_ENTRY } from "./registry";
-
-// Cookie utils
-export { getCartCookie, setCartCookie, setClientCookie } from "./utils/cart";
-export { getCookies, setCookie } from "./utils/cookies";
-// GraphQL client + fetch instrumentation
-export { extractGraphqlOperationName } from "./utils/graphqlOperationName";
-export { type CreateWakeFetchOptions, createWakeFetch } from "./utils/instrumentedFetch";
-export { wakeOperationRouter } from "./utils/operationRouter";
-export { getPartnerCookie } from "./utils/partner";
-// Transform helpers
-export {
-  parseSlug,
-  toBreadcrumbList,
-  toFilters,
-  toProduct,
-} from "./utils/transform";
-export { getUserCookie } from "./utils/user";
+  createWakeClient,
+  type WakeClient,
+  type WakeClientConfig,
+  type WakeClientOptions,
+  WakeError,
+} from "./wakeClient";

package/src/storefront.ts

@@ -0,0 +1,13 @@
+/**
+ * `@decocms/apps-wake/storefront`: Wake's Storefront GraphQL operations, to
+ * pass to `createWakeClient`'s `graphql`. Their generated request and response
+ * types are in `@decocms/apps-wake/storefront/types`:
+ *
+ * ```ts
+ * import { GetProduct } from "@decocms/apps-wake/storefront";
+ * import type { GetProductQuery, GetProductQueryVariables } from "@decocms/apps-wake/storefront/types";
+ *
+ * const data = await wake.graphql<GetProductQuery, GetProductQueryVariables>(GetProduct, { productId: 1 });
+ * ```
+ */
+export * from "./utils/graphql/queries";

package/src/storefrontTypes.ts

@@ -0,0 +1,6 @@
+/**
+ * `@decocms/apps-wake/storefront/types`: types generated from Wake's
+ * Storefront GraphQL schema, one `<Operation>Query`/`<Operation>Mutation` and
+ * `...Variables` pair per operation in `@decocms/apps-wake/storefront`.
+ */
+export type * from "./utils/graphql/storefront.graphql.gen";

package/src/utils/gql.ts

@@ -0,0 +1,23 @@
+/**
+ * GraphQL document helpers used by the client (`../wakeClient.ts`). Pure: no I/O, no framework imports.
+ */
+
+/**
+ * Tagged-template helper that composes a GraphQL document string.
+ * Kept identical to the Deno `gql` so `graphql/queries.ts` (which defines
+ * `{ fragments, query }` objects) works verbatim.
+ */
+export function gql(strings: TemplateStringsArray, ...values: unknown[]): string {
+  return strings.reduce((acc, str, i) => acc + str + (values[i] ?? ""), "");
+}
+
+/** A Wake storefront operation: its document plus the fragments it spreads. */
+export interface QueryDefinition {
+  fragments?: string[];
+  query: string;
+}
+
+export function buildQuery(def: QueryDefinition): string {
+  const fragments = def.fragments?.join("\n") ?? "";
+  return fragments ? `${fragments}\n${def.query}` : def.query;
+}

package/src/utils/graphql/queries.ts

@@ -1,4 +1,4 @@
-import { gql } from "../graphql";
+import { gql } from "../gql";
 
 const Checkout = gql`
 fragment Checkout on Checkout {

package/src/wakeClient.ts

@@ -0,0 +1,104 @@
+/**
+ * The Wake client: a thin, typed client for Wake's Storefront GraphQL API and
+ * the one checkout REST call a storefront needs, over the framework's
+ * instrumented fetch (provider "wake"). See /next/upstream-clients.
+ *
+ * Configuration comes in as arguments; the site reads its environment where
+ * it creates the client. Converters, hooks, cart/session flows, caching and
+ * proxying belong to the site (platform templates), not here.
+ */
+import { createInstrumentedFetch } from "@decocms/blocks/fetch";
+import type { UserAuthenticate } from "./utils/client";
+import { buildQuery, type QueryDefinition } from "./utils/gql";
+import { extractGraphqlOperationName } from "./utils/graphqlOperationName";
+
+const WAKE_STOREFRONT_ENDPOINT = "https://storefront-api.fbits.net/graphql";
+
+export interface WakeClientConfig {
+  /** Wake Storefront API token, sent as `TCS-Access-Token`. */
+  storefrontToken: string;
+  /** Storefront GraphQL endpoint; defaults to Wake's multi-tenant endpoint. */
+  storefrontEndpoint?: string;
+  /** Checkout origin, e.g. `https://checkout.example.com`. Required by `getLogin`. */
+  checkoutUrl?: string;
+}
+
+export interface WakeClientOptions {
+  /** The fetch underneath, e.g. a fake in tests. Defaults to `globalThis.fetch`. */
+  fetch?: Parameters<typeof createInstrumentedFetch>[0]["fetch"];
+}
+
+/** Thrown on a non-2xx response or a GraphQL `errors` payload. Never carries bodies or tokens. */
+export class WakeError extends Error {
+  constructor(
+    readonly operation: string,
+    readonly status: number,
+    /** How many GraphQL errors the response carried (0 for an HTTP failure). */
+    readonly graphqlErrors = 0,
+  ) {
+    super(
+      graphqlErrors > 0
+        ? `wake ${operation} returned ${graphqlErrors} GraphQL error(s)`
+        : `wake ${operation} failed with HTTP ${status}`,
+    );
+    this.name = "WakeError";
+  }
+}
+
+export type WakeClient = ReturnType<typeof createWakeClient>;
+
+export function createWakeClient(config: WakeClientConfig, options: WakeClientOptions = {}) {
+  const request = createInstrumentedFetch({ provider: "wake", fetch: options.fetch });
+  const endpoint = config.storefrontEndpoint || WAKE_STOREFRONT_ENDPOINT;
+  const checkoutUrl = config.checkoutUrl;
+
+  return {
+    /**
+     * Run a Storefront GraphQL operation (see `@decocms/apps-wake/storefront`).
+     * The operation label is the document's operation name. `headers` adds
+     * per-call headers, such as `X-Forwarded-For` or a customer access token;
+     * they never override the token or the content type.
+     */
+    async graphql<TData, TVariables = Record<string, unknown>>(
+      document: string | QueryDefinition,
+      variables?: TVariables,
+      init: { headers?: Record<string, string> } = {},
+    ): Promise<TData> {
+      const query = typeof document === "string" ? document : buildQuery(document);
+      const operation = extractGraphqlOperationName(query) ?? "graphql";
+      const headers = new Headers(init.headers);
+      headers.set("content-type", "application/json");
+      headers.set("tcs-access-token", config.storefrontToken);
+      const response = await request(endpoint, {
+        operation,
+        method: "POST",
+        headers,
+        body: JSON.stringify({ query, variables }),
+      });
+      if (!response.ok) throw new WakeError(operation, response.status);
+      const body = (await response.json()) as { data?: TData; errors?: unknown[] };
+      if (body.errors?.length) throw new WakeError(operation, response.status, body.errors.length);
+      if (body.data === undefined) throw new WakeError(operation, response.status);
+      return body.data;
+    },
+
+    /**
+     * `GET /api/Login/Get` on the checkout: exchanges the shopper's checkout
+     * cookies (the `fbits-login` cookie) for their account, or `null` when
+     * they aren't signed in (401, 403 or 404). Any other failure, such as
+     * a 429, throws a `WakeError`.
+     */
+    async getLogin(cookie: string): Promise<UserAuthenticate | null> {
+      if (!checkoutUrl) throw new Error("wake getLogin: set checkoutUrl");
+      const response = await request(new URL("/api/Login/Get", checkoutUrl), {
+        operation: "getLogin",
+        headers: { cookie },
+      });
+      if (response.status === 401 || response.status === 403 || response.status === 404) {
+        return null; // not signed in
+      }
+      if (!response.ok) throw new WakeError("getLogin", response.status);
+      return (await response.json()) as UserAuthenticate | null;
+    },
+  };
+}

package/src/actions/cart/addCoupon.ts

@@ -1,43 +0,0 @@
-import { getWakeClient } from "../../client";
-import { getCartCookie, setCartCookie } from "../../utils/cart";
-import { AddCoupon } from "../../utils/graphql/queries";
-import type {
-  AddCouponMutation,
-  CheckoutFragment,
-} from "../../utils/graphql/storefront.graphql.gen";
-import { HttpError } from "../../utils/httpError";
-import {
-  currentRequestHeaders,
-  currentResponseHeaders,
-  forwardedHeaders,
-} from "../../utils/requestCtx";
-
-export interface Props {
-  coupon: string;
-}
-
-const action = async (props: Props): Promise<Partial<CheckoutFragment>> => {
-  const storefront = getWakeClient();
-  const cartId = getCartCookie(currentRequestHeaders());
-  const headers = forwardedHeaders();
-
-  if (!cartId) {
-    throw new HttpError(400, "Missing cart cookie");
-  }
-
-  const data = await storefront.query<AddCouponMutation>(
-    AddCoupon,
-    { checkoutId: cartId, ...props },
-    headers,
-  );
-
-  const checkoutId = data.checkout?.checkoutId;
-
-  if (checkoutId && cartId !== checkoutId) {
-    setCartCookie(currentResponseHeaders(), checkoutId);
-  }
-
-  return data.checkout ?? {};
-};
-
-export default action;

package/src/actions/cart/addItem.ts

@@ -1,10 +0,0 @@
-import type { CheckoutFragment } from "../../utils/graphql/storefront.graphql.gen";
-import addItems, { type CartItem as Props } from "./addItems";
-
-export type { CartItem as Props } from "./addItems";
-
-const action = async (props: Props): Promise<Partial<CheckoutFragment>> => {
-  return await addItems({ products: [props] });
-};
-
-export default action;

package/src/actions/cart/addItems.ts

@@ -1,50 +0,0 @@
-import { getWakeClient } from "../../client";
-import { getCartCookie, setCartCookie } from "../../utils/cart";
-import { AddItemToCart } from "../../utils/graphql/queries";
-import type {
-  AddItemToCartMutation,
-  CheckoutFragment,
-} from "../../utils/graphql/storefront.graphql.gen";
-import { HttpError } from "../../utils/httpError";
-import {
-  currentRequestHeaders,
-  currentResponseHeaders,
-  forwardedHeaders,
-} from "../../utils/requestCtx";
-
-export interface CartItem {
-  productVariantId: number;
-  quantity: number;
-  customization?: { customizationId: number; value: string }[];
-  subscription?: { subscriptionGroupId: number; recurringTypeId: number };
-}
-
-export interface Props {
-  products: CartItem[];
-}
-
-const action = async (props: Props): Promise<Partial<CheckoutFragment>> => {
-  const storefront = getWakeClient();
-  const cartId = getCartCookie(currentRequestHeaders());
-  const headers = forwardedHeaders();
-
-  if (!cartId) {
-    throw new HttpError(400, "Missing cart cookie");
-  }
-
-  const data = await storefront.query<AddItemToCartMutation>(
-    AddItemToCart,
-    { input: { id: cartId, products: props.products } },
-    headers,
-  );
-
-  const checkoutId = data.checkout?.checkoutId;
-
-  if (checkoutId && cartId !== checkoutId) {
-    setCartCookie(currentResponseHeaders(), checkoutId);
-  }
-
-  return data.checkout ?? {};
-};
-
-export default action;

package/src/actions/cart/addKit.ts

@@ -1,53 +0,0 @@
-import { getWakeClient } from "../../client";
-import { getCartCookie, setCartCookie } from "../../utils/cart";
-import { AddKit } from "../../utils/graphql/queries";
-import type { AddKitMutation, CheckoutFragment } from "../../utils/graphql/storefront.graphql.gen";
-import { HttpError } from "../../utils/httpError";
-import {
-  currentRequestHeaders,
-  currentResponseHeaders,
-  forwardedHeaders,
-} from "../../utils/requestCtx";
-
-export interface KitItemVariant {
-  productVariantId: number;
-  quantity: number;
-}
-
-export interface KitItem {
-  productId: number;
-  variants: KitItemVariant[];
-}
-
-export interface Props {
-  products: KitItem[];
-  quantity: number;
-  kitId: number;
-}
-
-const action = async (props: Props): Promise<Partial<CheckoutFragment>> => {
-  const storefront = getWakeClient();
-  const cartId = getCartCookie(currentRequestHeaders());
-  const headers = forwardedHeaders();
-  const { quantity, kitId, products } = props;
-
-  if (!cartId) {
-    throw new HttpError(400, "Missing cart cookie");
-  }
-
-  const data = await storefront.query<AddKitMutation>(
-    AddKit,
-    { input: { id: cartId, quantity, kitId, products } },
-    headers,
-  );
-
-  const checkoutId = data.checkout?.checkoutId;
-
-  if (checkoutId && cartId !== checkoutId) {
-    setCartCookie(currentResponseHeaders(), checkoutId);
-  }
-
-  return data.checkout ?? {};
-};
-
-export default action;

package/src/actions/cart/partnerAssociate.ts

@@ -1,48 +0,0 @@
-import { getWakeClient } from "../../client";
-import { getCartCookie, setCartCookie } from "../../utils/cart";
-import { CheckoutPartnerAssociate } from "../../utils/graphql/queries";
-import type {
-  CheckoutFragment,
-  CheckoutPartnerAssociateMutation,
-} from "../../utils/graphql/storefront.graphql.gen";
-import { HttpError } from "../../utils/httpError";
-import { setPartnerCookie } from "../../utils/partner";
-import {
-  currentRequestHeaders,
-  currentResponseHeaders,
-  forwardedHeaders,
-} from "../../utils/requestCtx";
-
-export interface Props {
-  partnerAccessToken: string;
-}
-
-const action = async (props: Props): Promise<Partial<CheckoutFragment>> => {
-  const storefront = getWakeClient();
-  const cartId = getCartCookie(currentRequestHeaders());
-  const headers = forwardedHeaders();
-  const { partnerAccessToken } = props;
-
-  if (!cartId) {
-    throw new HttpError(400, "Missing cart cookie");
-  }
-
-  const data = await storefront.query<CheckoutPartnerAssociateMutation>(
-    CheckoutPartnerAssociate,
-    { checkoutId: cartId, partnerAccessToken },
-    headers,
-  );
-
-  const checkoutId = data.checkout?.checkoutId;
-  const responseHeaders = currentResponseHeaders();
-
-  if (checkoutId && cartId !== checkoutId) {
-    setCartCookie(responseHeaders, checkoutId);
-  }
-
-  setPartnerCookie(responseHeaders, partnerAccessToken);
-
-  return data.checkout ?? {};
-};
-
-export default action;

package/src/actions/cart/partnerDisassociate.ts

@@ -1,43 +0,0 @@
-import { getWakeClient } from "../../client";
-import { getCartCookie, setCartCookie } from "../../utils/cart";
-import { CheckoutPartnerDisassociate } from "../../utils/graphql/queries";
-import type {
-  CheckoutFragment,
-  CheckoutPartnerDisassociateMutation,
-} from "../../utils/graphql/storefront.graphql.gen";
-import { HttpError } from "../../utils/httpError";
-import { deletePartnerCookie } from "../../utils/partner";
-import {
-  currentRequestHeaders,
-  currentResponseHeaders,
-  forwardedHeaders,
-} from "../../utils/requestCtx";
-
-const action = async (): Promise<Partial<CheckoutFragment>> => {
-  const storefront = getWakeClient();
-  const cartId = getCartCookie(currentRequestHeaders());
-  const headers = forwardedHeaders();
-
-  if (!cartId) {
-    throw new HttpError(400, "Missing cart cookie");
-  }
-
-  const data = await storefront.query<CheckoutPartnerDisassociateMutation>(
-    CheckoutPartnerDisassociate,
-    { checkoutId: cartId },
-    headers,
-  );
-
-  const checkoutId = data.checkout?.checkoutId;
-  const responseHeaders = currentResponseHeaders();
-
-  if (checkoutId && cartId !== checkoutId) {
-    setCartCookie(responseHeaders, checkoutId);
-  }
-
-  deletePartnerCookie(responseHeaders);
-
-  return data.checkout ?? {};
-};
-
-export default action;

package/src/actions/cart/removeCoupon.ts

@@ -1,39 +0,0 @@
-import { getWakeClient } from "../../client";
-import { getCartCookie, setCartCookie } from "../../utils/cart";
-import { RemoveCoupon } from "../../utils/graphql/queries";
-import type {
-  CheckoutFragment,
-  RemoveCouponMutation,
-} from "../../utils/graphql/storefront.graphql.gen";
-import { HttpError } from "../../utils/httpError";
-import {
-  currentRequestHeaders,
-  currentResponseHeaders,
-  forwardedHeaders,
-} from "../../utils/requestCtx";
-
-const action = async (): Promise<Partial<CheckoutFragment>> => {
-  const storefront = getWakeClient();
-  const cartId = getCartCookie(currentRequestHeaders());
-  const headers = forwardedHeaders();
-
-  if (!cartId) {
-    throw new HttpError(400, "Missing cart cookie");
-  }
-
-  const data = await storefront.query<RemoveCouponMutation>(
-    RemoveCoupon,
-    { checkoutId: cartId },
-    headers,
-  );
-
-  const checkoutId = data.checkout?.checkoutId;
-
-  if (checkoutId && cartId !== checkoutId) {
-    setCartCookie(currentResponseHeaders(), checkoutId);
-  }
-
-  return data.checkout ?? {};
-};
-
-export default action;

package/src/actions/cart/removeKit.ts

@@ -1,56 +0,0 @@
-import { getWakeClient } from "../../client";
-import { getCartCookie, setCartCookie } from "../../utils/cart";
-import { RemoveKit } from "../../utils/graphql/queries";
-import type {
-  CheckoutFragment,
-  RemoveKitMutation,
-} from "../../utils/graphql/storefront.graphql.gen";
-import { HttpError } from "../../utils/httpError";
-import {
-  currentRequestHeaders,
-  currentResponseHeaders,
-  forwardedHeaders,
-} from "../../utils/requestCtx";
-
-export interface KitItemVariant {
-  productVariantId: number;
-  quantity: number;
-}
-
-export interface KitItem {
-  productId: number;
-  variants: KitItemVariant[];
-}
-
-export interface Props {
-  products: KitItem[];
-  quantity: number;
-  kitId: number;
-}
-
-const action = async (props: Props): Promise<Partial<CheckoutFragment>> => {
-  const storefront = getWakeClient();
-  const cartId = getCartCookie(currentRequestHeaders());
-  const headers = forwardedHeaders();
-  const { quantity, kitId, products } = props;
-
-  if (!cartId) {
-    throw new HttpError(400, "Missing cart cookie");
-  }
-
-  const data = await storefront.query<RemoveKitMutation>(
-    RemoveKit,
-    { input: { id: cartId, quantity, kitId, products } },
-    headers,
-  );
-
-  const checkoutId = data.checkout?.checkoutId;
-
-  if (checkoutId && cartId !== checkoutId) {
-    setCartCookie(currentResponseHeaders(), checkoutId);
-  }
-
-  return data.checkout ?? {};
-};
-
-export default action;