@decocms/apps 0.23.3 → 0.24.0

package/shopify/client.ts

@@ -1,9 +1,9 @@
 import { createGraphqlClient, type GraphQLClient } from "./utils/graphql";
 
 export interface ShopifyConfig {
-  storeName: string;
-  storefrontAccessToken: string;
-  publicUrl?: string;
+	storeName: string;
+	storefrontAccessToken: string;
+	publicUrl?: string;
 }
 
 let _client: GraphQLClient | null = null;
@@ -22,37 +22,37 @@ let _fetch: typeof fetch | undefined;
  * ```
  */
 export function setShopifyFetch(fetchFn: typeof fetch) {
-  _fetch = fetchFn;
-  if (_config) configureShopify(_config);
+	_fetch = fetchFn;
+	if (_config) configureShopify(_config);
 }
 
 export function configureShopify(config: ShopifyConfig) {
-  _config = config;
-  _client = createGraphqlClient(
-    `https://${config.storeName}.myshopify.com/api/2025-04/graphql.json`,
-    {
-      "X-Shopify-Storefront-Access-Token": config.storefrontAccessToken,
-    },
-    _fetch,
-  );
+	_config = config;
+	_client = createGraphqlClient(
+		`https://${config.storeName}.myshopify.com/api/2025-04/graphql.json`,
+		{
+			"X-Shopify-Storefront-Access-Token": config.storefrontAccessToken,
+		},
+		_fetch,
+	);
 }
 
 export function getShopifyClient(): GraphQLClient {
-  if (!_client || !_config) {
-    throw new Error(
-      "Shopify not configured. Call configureShopify() first or check deco-shopify.json block."
-    );
-  }
-  return _client;
+	if (!_client || !_config) {
+		throw new Error(
+			"Shopify not configured. Call configureShopify() first or check deco-shopify.json block.",
+		);
+	}
+	return _client;
 }
 
 export function getShopifyConfig(): ShopifyConfig {
-  if (!_config) {
-    throw new Error("Shopify not configured.");
-  }
-  return _config;
+	if (!_config) {
+		throw new Error("Shopify not configured.");
+	}
+	return _config;
 }
 
 export function getBaseUrl(): string {
-  return _config?.publicUrl || "";
+	return _config?.publicUrl || "";
 }

package/shopify/index.ts

@@ -1,32 +1,34 @@
 // Client & Config
-export { configureShopify, getShopifyClient, getShopifyConfig, getBaseUrl, setShopifyFetch } from "./client";
+
+export { default as addItems } from "./actions/cart/addItems";
+export { default as updateCoupons } from "./actions/cart/updateCoupons";
+export { default as updateItems } from "./actions/cart/updateItems";
+export { default as signIn } from "./actions/user/signIn";
+export { default as signUp } from "./actions/user/signUp";
 export type { ShopifyConfig } from "./client";
+export {
+	configureShopify,
+	getBaseUrl,
+	getShopifyClient,
+	getShopifyConfig,
+	setShopifyFetch,
+} from "./client";
 export { initShopify, initShopifyFromBlocks } from "./init";
-
+export type { CartLine, ShopifyCart } from "./loaders/cart";
+// Cart
+export { createCart, getCart } from "./loaders/cart";
+export { default as productDetailsPageLoader } from "./loaders/ProductDetailsPage";
 // Product Loaders
 export { default as productListLoader } from "./loaders/ProductList";
-export { default as productDetailsPageLoader } from "./loaders/ProductDetailsPage";
 export { default as productListingPageLoader } from "./loaders/ProductListingPage";
 export { default as relatedProductsLoader } from "./loaders/RelatedProducts";
-
-// Cart
-export { getCart, createCart } from "./loaders/cart";
-export type { ShopifyCart, CartLine } from "./loaders/cart";
-export { default as addItems } from "./actions/cart/addItems";
-export { default as updateItems } from "./actions/cart/updateItems";
-export { default as updateCoupons } from "./actions/cart/updateCoupons";
-
+export type { Shop } from "./loaders/shop";
 // Shop
 export { default as shopLoader } from "./loaders/shop";
-export type { Shop } from "./loaders/shop";
-
+export type { ShopifyUser } from "./loaders/user";
 // User
 export { default as userLoader } from "./loaders/user";
-export type { ShopifyUser } from "./loaders/user";
-export { default as signIn } from "./actions/user/signIn";
-export { default as signUp } from "./actions/user/signUp";
-
+export { getCartCookie, setCartCookie } from "./utils/cart";
 // Cookie utils
 export { getCookies, setCookie } from "./utils/cookies";
-export { getCartCookie, setCartCookie } from "./utils/cart";
 export { getUserCookie, setUserCookie } from "./utils/user";

package/shopify/init.ts

@@ -6,20 +6,17 @@ let initialized = false;
  * Initialize Shopify from raw block data.
  * The site is responsible for reading the blocks and passing the config here.
  */
-export function initShopify(config: {
-  storeName: string;
-  storefrontAccessToken: string;
-}) {
-  if (initialized) return;
+export function initShopify(config: { storeName: string; storefrontAccessToken: string }) {
+	if (initialized) return;
 
-  if (!config.storeName || !config.storefrontAccessToken) {
-    console.warn("[Shopify] Missing storeName or storefrontAccessToken.");
-    return;
-  }
+	if (!config.storeName || !config.storefrontAccessToken) {
+		console.warn("[Shopify] Missing storeName or storefrontAccessToken.");
+		return;
+	}
 
-  console.log(`[Shopify] Initializing: ${config.storeName}.myshopify.com`);
-  configureShopify(config);
-  initialized = true;
+	console.log(`[Shopify] Initializing: ${config.storeName}.myshopify.com`);
+	configureShopify(config);
+	initialized = true;
 }
 
 /**
@@ -27,14 +24,14 @@ export function initShopify(config: {
  * Looks for the "deco-shopify" block and extracts credentials.
  */
 export function initShopifyFromBlocks(blocks: Record<string, any>) {
-  const shopifyBlock = blocks["deco-shopify"];
-  if (!shopifyBlock) {
-    console.warn("[Shopify] No deco-shopify block found.");
-    return;
-  }
+	const shopifyBlock = blocks["deco-shopify"];
+	if (!shopifyBlock) {
+		console.warn("[Shopify] No deco-shopify block found.");
+		return;
+	}
 
-  initShopify({
-    storeName: shopifyBlock.storeName,
-    storefrontAccessToken: shopifyBlock.storefrontAccessToken,
-  });
+	initShopify({
+		storeName: shopifyBlock.storeName,
+		storefrontAccessToken: shopifyBlock.storefrontAccessToken,
+	});
 }

package/shopify/loaders/ProductDetailsPage.ts

@@ -1,35 +1,31 @@
 import type { ProductDetailsPage } from "../../commerce/types/commerce";
 import { getShopifyClient } from "../client";
 import { GetProduct } from "../utils/storefront/queries";
-import { toProductPage, type ProductShopify } from "../utils/transform";
+import { type ProductShopify, toProductPage } from "../utils/transform";
 import type { Metafield } from "../utils/types";
 
 export interface Props {
-  slug: string;
-  metafields?: Metafield[];
+	slug: string;
+	metafields?: Metafield[];
 }
 
 export default async function productDetailsPageLoader(
-  props: Props,
-  url?: URL,
+	props: Props,
+	url?: URL,
 ): Promise<ProductDetailsPage | null> {
-  const client = getShopifyClient();
-  const { slug, metafields = [] } = props;
+	const client = getShopifyClient();
+	const { slug, metafields = [] } = props;
 
-  const splitted = slug?.split("-") ?? [];
-  const maybeSkuId = Number(splitted[splitted.length - 1]);
-  const handle = splitted.slice(0, maybeSkuId ? -1 : undefined).join("-");
+	const splitted = slug?.split("-") ?? [];
+	const maybeSkuId = Number(splitted[splitted.length - 1]);
+	const handle = splitted.slice(0, maybeSkuId ? -1 : undefined).join("-");
 
-  const data = await client.query<{ product?: ProductShopify }>(
-    GetProduct,
-    { handle, identifiers: metafields },
-  );
+	const data = await client.query<{ product?: ProductShopify }>(GetProduct, {
+		handle,
+		identifiers: metafields,
+	});
 
-  if (!data?.product) return null;
+	if (!data?.product) return null;
 
-  return toProductPage(
-    data.product,
-    url ?? new URL("https://localhost"),
-    maybeSkuId || undefined,
-  );
+	return toProductPage(data.product, url ?? new URL("https://localhost"), maybeSkuId || undefined);
 }

package/shopify/loaders/ProductList.ts

@@ -1,101 +1,98 @@
 import type { Product } from "../../commerce/types/commerce";
 import { getShopifyClient } from "../client";
 import { ProductsByCollection, SearchProducts } from "../utils/storefront/queries";
-import { toProduct, type ProductShopify } from "../utils/transform";
+import { type ProductShopify, toProduct } from "../utils/transform";
 import type { Metafield } from "../utils/types";
 import {
-  type CollectionSortKeys,
-  type SearchSortKeys,
-  searchSortShopify,
-  sortShopify,
+	type CollectionSortKeys,
+	type SearchSortKeys,
+	searchSortShopify,
+	sortShopify,
 } from "../utils/utils";
 
 export interface QueryProps {
-  query: string;
-  count: number;
-  sort?: SearchSortKeys;
+	query: string;
+	count: number;
+	sort?: SearchSortKeys;
 }
 
 export interface CollectionProps {
-  collection: string;
-  count: number;
-  sort?: CollectionSortKeys;
+	collection: string;
+	count: number;
+	sort?: CollectionSortKeys;
 }
 
 export interface FilterProps {
-  tags?: string[];
-  productTypes?: string[];
-  productVendors?: string[];
-  priceMin?: number;
-  priceMax?: number;
-  variantOptions?: { name: string; value: string }[];
+	tags?: string[];
+	productTypes?: string[];
+	productVendors?: string[];
+	priceMin?: number;
+	priceMax?: number;
+	variantOptions?: { name: string; value: string }[];
 }
 
 export type Props = {
-  props: QueryProps | CollectionProps;
-  filters?: FilterProps;
-  metafields?: Metafield[];
+	props: QueryProps | CollectionProps;
+	filters?: FilterProps;
+	metafields?: Metafield[];
 };
 
 const isQueryList = (p: any): p is QueryProps =>
-  typeof p.query === "string" && typeof p.count === "number";
+	typeof p.query === "string" && typeof p.count === "number";
 
 export default async function productListLoader(
-  expandedProps: Props,
-  url?: URL,
+	expandedProps: Props,
+	url?: URL,
 ): Promise<Product[] | null> {
-  const client = getShopifyClient();
+	const client = getShopifyClient();
 
-  const props = expandedProps.props ??
-    (expandedProps as unknown as Props["props"]);
+	const props = expandedProps.props ?? (expandedProps as unknown as Props["props"]);
 
-  const count = props.count ?? 12;
-  const metafields = expandedProps.metafields || [];
-  const sort = props.sort ?? "";
+	const count = props.count ?? 12;
+	const metafields = expandedProps.metafields || [];
+	const sort = props.sort ?? "";
 
-  const filters: any[] = [];
-  expandedProps.filters?.tags?.forEach((tag) => filters.push({ tag }));
-  expandedProps.filters?.productTypes?.forEach((productType) => filters.push({ productType }));
-  expandedProps.filters?.productVendors?.forEach((productVendor) => filters.push({ productVendor }));
-  if (expandedProps.filters?.priceMin) filters.push({ price: { min: expandedProps.filters.priceMin } });
-  if (expandedProps.filters?.priceMax) filters.push({ price: { max: expandedProps.filters.priceMax } });
-  expandedProps.filters?.variantOptions?.forEach((variantOption) => filters.push({ variantOption }));
+	const filters: any[] = [];
+	expandedProps.filters?.tags?.forEach((tag) => filters.push({ tag }));
+	expandedProps.filters?.productTypes?.forEach((productType) => filters.push({ productType }));
+	expandedProps.filters?.productVendors?.forEach((productVendor) =>
+		filters.push({ productVendor }),
+	);
+	if (expandedProps.filters?.priceMin != null)
+		filters.push({ price: { min: expandedProps.filters.priceMin } });
+	if (expandedProps.filters?.priceMax != null)
+		filters.push({ price: { max: expandedProps.filters.priceMax } });
+	expandedProps.filters?.variantOptions?.forEach((variantOption) =>
+		filters.push({ variantOption }),
+	);
 
-  let shopifyProducts: { nodes: ProductShopify[] } | undefined;
+	let shopifyProducts: { nodes: ProductShopify[] } | undefined;
 
-  if (isQueryList(props)) {
-    const data = await client.query<{ search: { nodes: ProductShopify[] } }>(
-      SearchProducts,
-      {
-        first: count,
-        query: props.query,
-        productFilters: filters,
-        identifiers: metafields,
-        ...searchSortShopify[sort],
-      },
-    );
-    shopifyProducts = data.search;
-  } else {
-    const data = await client.query<{
-      collection?: { products: { nodes: ProductShopify[] } };
-    }>(
-      ProductsByCollection,
-      {
-        first: count,
-        handle: (props as CollectionProps).collection,
-        filters,
-        identifiers: metafields,
-        ...sortShopify[sort],
-      },
-    );
-    shopifyProducts = data.collection?.products;
-  }
+	if (isQueryList(props)) {
+		const data = await client.query<{ search: { nodes: ProductShopify[] } }>(SearchProducts, {
+			first: count,
+			query: props.query,
+			productFilters: filters,
+			identifiers: metafields,
+			...searchSortShopify[sort],
+		});
+		shopifyProducts = data.search;
+	} else {
+		const data = await client.query<{
+			collection?: { products: { nodes: ProductShopify[] } };
+		}>(ProductsByCollection, {
+			first: count,
+			handle: (props as CollectionProps).collection,
+			filters,
+			identifiers: metafields,
+			...sortShopify[sort],
+		});
+		shopifyProducts = data.collection?.products;
+	}
 
-  const baseUrl = url ?? new URL("https://localhost");
+	const baseUrl = url ?? new URL("https://localhost");
 
-  const products = shopifyProducts?.nodes.map((p) =>
-    toProduct(p, p.variants.nodes[0], baseUrl)
-  );
+	const products = shopifyProducts?.nodes.map((p) => toProduct(p, p.variants.nodes[0], baseUrl));
 
-  return products ?? [];
+	return products ?? [];
 }