@decocms/apps-shopify 8.1.0-next.0 → 8.1.0-next.2

package/src/actions/cart/updateItems.ts

@@ -1,31 +0,0 @@
-import { getShopifyClient } from "../../client";
-import type { ShopifyCart } from "../../loaders/cart";
-import { getCartCookie, setCartCookie } from "../../utils/cart";
-import { UpdateItems } from "../../utils/storefront/queries";
-
-export interface UpdateItemsProps {
-	lines: Array<{ id: string; quantity: number }>;
-	requestHeaders: Headers;
-	responseHeaders?: Headers;
-}
-
-export default async function updateItems({
-	lines,
-	requestHeaders,
-	responseHeaders,
-}: UpdateItemsProps): Promise<ShopifyCart | null> {
-	const client = getShopifyClient();
-	const cartId = getCartCookie(requestHeaders);
-
-	if (!cartId) throw new Error("Missing cart cookie");
-
-	const data = await client.query<{
-		payload?: { cart?: ShopifyCart };
-	}>(UpdateItems, { cartId, lines });
-
-	if (responseHeaders) {
-		setCartCookie(responseHeaders, cartId);
-	}
-
-	return data.payload?.cart ?? null;
-}

package/src/actions/user/signIn.ts

@@ -1,40 +0,0 @@
-import { getShopifyClient } from "../../client";
-import { SignInWithEmailAndPassword } from "../../utils/storefront/queries";
-import { getUserCookie, setUserCookie } from "../../utils/user";
-
-export interface SignInProps {
-	email: string;
-	password: string;
-	requestHeaders: Headers;
-	responseHeaders?: Headers;
-}
-
-export interface SignInResult {
-	customerAccessTokenCreate: {
-		customerAccessToken?: { accessToken: string; expiresAt: string } | null;
-		customerUserErrors?: Array<{ code?: string; message: string }>;
-	};
-}
-
-export default async function signIn(props: SignInProps): Promise<SignInResult | null> {
-	const client = getShopifyClient();
-	const { email, password, requestHeaders, responseHeaders } = props;
-
-	const existingToken = getUserCookie(requestHeaders);
-	if (existingToken) return null;
-
-	try {
-		const data = await client.query<SignInResult>(SignInWithEmailAndPassword, { email, password });
-
-		if (data.customerAccessTokenCreate.customerAccessToken && responseHeaders) {
-			setUserCookie(
-				responseHeaders,
-				data.customerAccessTokenCreate.customerAccessToken.accessToken,
-			);
-		}
-
-		return data;
-	} catch {
-		return null;
-	}
-}

package/src/actions/user/signUp.ts

@@ -1,31 +0,0 @@
-import { getShopifyClient } from "../../client";
-import { RegisterAccount } from "../../utils/storefront/queries";
-
-export interface SignUpProps {
-	email: string;
-	password: string;
-	firstName?: string;
-	lastName?: string;
-	acceptsMarketing?: boolean;
-}
-
-export interface SignUpResult {
-	customerCreate: {
-		customer?: { id: string } | null;
-		customerUserErrors?: Array<{ code?: string; message: string }>;
-	};
-}
-
-export default async function signUp(props: SignUpProps): Promise<SignUpResult> {
-	const client = getShopifyClient();
-
-	const data = await client.query<SignUpResult>(RegisterAccount, {
-		email: props.email,
-		password: props.password,
-		firstName: props.firstName,
-		lastName: props.lastName,
-		acceptsMarketing: props.acceptsMarketing,
-	});
-
-	return data;
-}

package/src/init.ts

@@ -1,39 +0,0 @@
-import { configureShopify } from "./client";
-
-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;
-
-	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;
-}
-
-/**
- * Initialize Shopify from a blocks map (convenience wrapper).
- * Looks for the "deco-shopify" block and extracts credentials.
- */
-export function initShopifyFromBlocks(blocks: Record<string, unknown>) {
-	const shopifyBlock = blocks["deco-shopify"] as
-		| { storeName: string; storefrontAccessToken: string }
-		| undefined;
-	if (!shopifyBlock) {
-		console.warn("[Shopify] No deco-shopify block found.");
-		return;
-	}
-
-	initShopify({
-		storeName: shopifyBlock.storeName,
-		storefrontAccessToken: shopifyBlock.storefrontAccessToken,
-	});
-}

package/src/loaders/ProductDetailsPage.ts

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

package/src/loaders/ProductList.ts

@@ -1,102 +0,0 @@
-import type { Product } from "@decocms/apps-commerce/types";
-import { getShopifyClient } from "../client";
-import { ProductsByCollection, SearchProducts } from "../utils/storefront/queries";
-import { type ProductShopify, toProduct } from "../utils/transform";
-import type { Metafield } from "../utils/types";
-import {
-	type CollectionSortKeys,
-	type SearchSortKeys,
-	searchSortShopify,
-	sortShopify,
-} from "../utils/utils";
-
-export interface QueryProps {
-	query: string;
-	count: number;
-	sort?: SearchSortKeys;
-}
-
-export interface CollectionProps {
-	collection: string;
-	count: number;
-	sort?: CollectionSortKeys;
-}
-
-export interface FilterProps {
-	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[];
-};
-
-const isQueryList = (p: QueryProps | CollectionProps): p is QueryProps =>
-	"query" in p && typeof p.query === "string" && typeof p.count === "number";
-
-export default async function productListLoader(
-	expandedProps: Props,
-	url?: URL,
-): Promise<Product[] | null> {
-	const client = getShopifyClient();
-
-	const props = expandedProps.props ?? (expandedProps as unknown as Props["props"]);
-
-	const count = props.count ?? 12;
-	const metafields = expandedProps.metafields || [];
-	const sort = props.sort ?? "";
-
-	const filters: Record<string, unknown>[] = [];
-	for (const tag of expandedProps.filters?.tags ?? []) {
-		filters.push({ tag });
-	}
-	for (const productType of expandedProps.filters?.productTypes ?? []) {
-		filters.push({ productType });
-	}
-	for (const productVendor of expandedProps.filters?.productVendors ?? []) {
-		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 } });
-	for (const variantOption of expandedProps.filters?.variantOptions ?? []) {
-		filters.push({ variantOption });
-	}
-
-	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;
-	}
-
-	const baseUrl = url ?? new URL("https://localhost");
-
-	const products = shopifyProducts?.nodes.map((p) => toProduct(p, p.variants.nodes[0], baseUrl));
-
-	return products ?? [];
-}

package/src/loaders/ProductListingPage.ts

@@ -1,172 +0,0 @@
-import type { ProductListingPage } from "@decocms/apps-commerce/types";
-import { getShopifyClient } from "../client";
-import { ProductsByCollection, SearchProducts } from "../utils/storefront/queries";
-import { type ProductShopify, toFilter, toProduct } from "../utils/transform";
-import type { Metafield } from "../utils/types";
-import {
-	getFiltersByUrl,
-	searchSortOptions,
-	searchSortShopify,
-	sortOptions,
-	sortShopify,
-} from "../utils/utils";
-
-interface PageInfo {
-	hasNextPage: boolean;
-	hasPreviousPage: boolean;
-	endCursor?: string;
-	startCursor?: string;
-}
-
-interface FilterNode {
-	id: string;
-	label: string;
-	type: string;
-	values: Array<{ id: string; label: string; count: number; input: string }>;
-}
-
-interface ProductConnection {
-	nodes: ProductShopify[];
-	pageInfo: PageInfo;
-	filters?: FilterNode[];
-}
-
-export interface Props {
-	query?: string;
-	collectionName?: string;
-	count: number;
-	metafields?: Metafield[];
-	pageOffset?: number;
-	page?: number;
-	startCursor?: string;
-	endCursor?: string;
-	pageHref?: string;
-}
-
-export default async function productListingPageLoader(
-	props: Props,
-	url?: URL,
-): Promise<ProductListingPage | null> {
-	const pageUrl = url ?? new URL(props.pageHref || "https://localhost");
-	const client = getShopifyClient();
-
-	const count = props.count ?? 12;
-	const query = props.query || pageUrl.searchParams.get("q") || "";
-	const currentPageoffset = props.pageOffset ?? 1;
-	const pageParam = pageUrl.searchParams.get("page")
-		? Number(pageUrl.searchParams.get("page")) - currentPageoffset
-		: 0;
-	const page = props.page || pageParam;
-	const endCursor = props.endCursor || pageUrl.searchParams.get("endCursor") || "";
-	const startCursor = props.startCursor || pageUrl.searchParams.get("startCursor") || "";
-	const metafields = props.metafields || [];
-
-	const isSearch = Boolean(query);
-	let hasNextPage = false;
-	let hasPreviousPage = false;
-	let shopifyProducts: ProductConnection | undefined;
-	let shopifyFilters: FilterNode[] | undefined;
-	let records: number | undefined;
-	let collectionTitle: string | undefined;
-	let collectionDescription: string | undefined;
-
-	const sort = pageUrl.searchParams.get("sort") ?? "";
-
-	if (isSearch) {
-		const data = await client.query<{
-			search: ProductConnection & { totalCount?: number; productFilters?: FilterNode[] };
-		}>(SearchProducts, {
-			...(!endCursor && { first: count }),
-			...(endCursor && { last: count }),
-			...(startCursor && { after: startCursor }),
-			...(endCursor && { before: endCursor }),
-			query,
-			productFilters: getFiltersByUrl(pageUrl),
-			identifiers: metafields,
-			...searchSortShopify[sort],
-		});
-
-		shopifyProducts = data.search;
-		shopifyFilters = data.search?.productFilters;
-		records = data.search?.totalCount;
-		hasNextPage = Boolean(data.search?.pageInfo.hasNextPage);
-		hasPreviousPage = Boolean(data.search?.pageInfo.hasPreviousPage);
-	} else {
-		const pathname = props.collectionName || pageUrl.pathname.split("/")[1];
-
-		const data = await client.query<{
-			collection?: {
-				title?: string;
-				description?: string;
-				products: ProductConnection;
-			};
-		}>(ProductsByCollection, {
-			...(!endCursor && { first: count }),
-			...(endCursor && { last: count }),
-			...(startCursor && { after: startCursor }),
-			...(endCursor && { before: endCursor }),
-			identifiers: metafields,
-			handle: pathname,
-			filters: getFiltersByUrl(pageUrl),
-			...sortShopify[sort],
-		});
-
-		shopifyProducts = data.collection?.products;
-		shopifyFilters = data.collection?.products?.filters;
-		hasNextPage = Boolean(data.collection?.products.pageInfo.hasNextPage);
-		hasPreviousPage = Boolean(data.collection?.products.pageInfo.hasPreviousPage);
-		collectionTitle = data.collection?.title;
-		collectionDescription = data.collection?.description;
-	}
-
-	const products = shopifyProducts?.nodes?.map((p) => toProduct(p, p.variants.nodes[0], pageUrl));
-
-	const nextPage = new URLSearchParams(pageUrl.searchParams);
-	const previousPage = new URLSearchParams(pageUrl.searchParams);
-
-	if (hasNextPage) {
-		nextPage.set("page", (page + currentPageoffset + 1).toString());
-		nextPage.set("startCursor", shopifyProducts?.pageInfo.endCursor ?? "");
-		nextPage.delete("endCursor");
-	}
-
-	if (hasPreviousPage) {
-		previousPage.set("page", (page + currentPageoffset - 1).toString());
-		previousPage.set("endCursor", shopifyProducts?.pageInfo.startCursor ?? "");
-		previousPage.delete("startCursor");
-	}
-
-	const filters = shopifyFilters?.map((filter) => toFilter(filter, pageUrl));
-	const currentPage = page + currentPageoffset;
-
-	return {
-		"@type": "ProductListingPage",
-		breadcrumb: {
-			"@type": "BreadcrumbList",
-			itemListElement: [
-				{
-					"@type": "ListItem" as const,
-					name: isSearch ? query : pageUrl.pathname.split("/")[1],
-					item: isSearch ? pageUrl.href : pageUrl.pathname,
-					position: 2,
-				},
-			],
-			numberOfItems: 1,
-		},
-		filters: filters ?? [],
-		products: products ?? [],
-		pageInfo: {
-			nextPage: hasNextPage ? `?${nextPage}` : undefined,
-			previousPage: hasPreviousPage ? `?${previousPage}` : undefined,
-			currentPage,
-			records,
-			recordPerPage: count,
-		},
-		sortOptions: isSearch ? searchSortOptions : sortOptions,
-		seo: {
-			title: collectionTitle || "",
-			description: collectionDescription || "",
-			canonical: `${pageUrl.origin}${pageUrl.pathname}${page >= 1 ? `?page=${page}` : ""}`,
-		},
-	};
-}

package/src/loaders/RelatedProducts.ts

@@ -1,42 +0,0 @@
-import type { Product } from "@decocms/apps-commerce/types";
-import { getShopifyClient } from "../client";
-import { GetProduct, ProductRecommendations } from "../utils/storefront/queries";
-import { type ProductShopify, toProduct } from "../utils/transform";
-import type { Metafield } from "../utils/types";
-
-export interface Props {
-	slug: string;
-	count?: number;
-	metafields?: Metafield[];
-}
-
-export default async function relatedProductsLoader(
-	props: Props,
-	url?: URL,
-): Promise<Product[] | null> {
-	const client = getShopifyClient();
-	const { slug, count = 10, metafields = [] } = props;
-
-	const splitted = slug?.split("-") ?? [];
-	const maybeSkuId = Number(splitted[splitted.length - 1]);
-	const handle = splitted.slice(0, maybeSkuId ? -1 : undefined).join("-");
-
-	const productData = await client.query<{ product?: ProductShopify }>(GetProduct, {
-		handle,
-		identifiers: metafields,
-	});
-
-	if (!productData?.product) return [];
-
-	const data = await client.query<{
-		productRecommendations?: ProductShopify[];
-	}>(ProductRecommendations, { productId: productData.product.id, identifiers: metafields });
-
-	if (!data?.productRecommendations) return [];
-
-	const baseUrl = url ?? new URL("https://localhost");
-
-	return data.productRecommendations
-		.map((p) => toProduct(p, p.variants.nodes[0], baseUrl))
-		.slice(0, count);
-}

package/src/loaders/cart.ts

@@ -1,74 +0,0 @@
-import { getShopifyClient } from "../client";
-import { getCartCookie, setCartCookie } from "../utils/cart";
-import { CreateCart, GetCart } from "../utils/storefront/queries";
-
-export interface CartLine {
-	id: string;
-	quantity: number;
-	merchandise: {
-		id: string;
-		title: string;
-		image?: { url: string; altText?: string | null } | null;
-		product: { title: string; handle: string; onlineStoreUrl?: string | null };
-		price: { amount: string; currencyCode: string };
-	};
-	discountAllocations?: Array<{
-		code?: string;
-		discountedAmount?: { amount: string; currencyCode: string };
-	}>;
-	cost?: {
-		totalAmount: { amount: string; currencyCode: string };
-		subtotalAmount: { amount: string; currencyCode: string };
-		amountPerQuantity?: { amount: string; currencyCode: string };
-		compareAtAmountPerQuantity?: { amount: string; currencyCode: string } | null;
-	};
-}
-
-export interface ShopifyCart {
-	id: string;
-	checkoutUrl: string;
-	totalQuantity: number;
-	lines: { nodes: CartLine[] };
-	cost: {
-		totalTaxAmount?: { amount: string; currencyCode: string };
-		subtotalAmount: { amount: string; currencyCode: string };
-		totalAmount: { amount: string; currencyCode: string };
-		checkoutChargeAmount?: { amount: string; currencyCode: string };
-	};
-	discountCodes?: Array<{ applicable: boolean; code: string }>;
-	discountAllocations?: Array<{
-		discountedAmount: { amount: string; currencyCode: string };
-	}>;
-}
-
-export async function getCart(
-	requestHeaders: Headers,
-	responseHeaders?: Headers,
-): Promise<ShopifyCart | null> {
-	const client = getShopifyClient();
-	const maybeCartId = getCartCookie(requestHeaders);
-
-	const cartId =
-		maybeCartId ??
-		(await client
-			.query<{ payload?: { cart?: { id: string } } }>(CreateCart)
-			.then((data) => data.payload?.cart?.id));
-
-	if (!cartId) throw new Error("Missing cart id");
-
-	const cart = await client
-		.query<{ cart?: ShopifyCart }>(GetCart, { id: decodeURIComponent(cartId) })
-		.then((data) => data.cart ?? null);
-
-	if (responseHeaders) {
-		setCartCookie(responseHeaders, cartId);
-	}
-
-	return cart;
-}
-
-export async function createCart(): Promise<string | null> {
-	const client = getShopifyClient();
-	const data = await client.query<{ payload?: { cart?: { id: string } } }>(CreateCart);
-	return data?.payload?.cart?.id ?? null;
-}

package/src/loaders/shop.ts

@@ -1,35 +0,0 @@
-import { getShopifyClient } from "../client";
-import { GetShopInfo } from "../utils/storefront/queries";
-import type { Metafield } from "../utils/types";
-
-export interface Shop {
-	name: string;
-	description?: string;
-	privacyPolicy?: { title: string; body: string };
-	refundPolicy?: { title: string; body: string };
-	shippingPolicy?: { title: string; body: string };
-	subscriptionPolicy?: { title: string; body: string };
-	termsOfService?: { title: string; body: string };
-	metafields?: Array<{
-		description?: string | null;
-		key: string;
-		namespace: string;
-		type: string;
-		value: string;
-		reference?: { image?: { url: string } } | null;
-		references?: { edges: Array<{ node: { image?: { url: string } } }> } | null;
-	} | null>;
-}
-
-export interface Props {
-	metafields?: Metafield[];
-}
-
-export default async function shopLoader(props?: Props): Promise<Shop> {
-	const client = getShopifyClient();
-	const metafields = props?.metafields || [];
-
-	const data = await client.query<{ shop: Shop }>(GetShopInfo, { identifiers: metafields });
-
-	return data.shop;
-}

package/src/loaders/user.ts

@@ -1,39 +0,0 @@
-import { getShopifyClient } from "../client";
-import { FetchCustomerInfo } from "../utils/storefront/queries";
-import { getUserCookie } from "../utils/user";
-
-export interface ShopifyUser {
-	"@id": string;
-	email: string;
-	givenName: string;
-	familyName: string;
-}
-
-export default async function userLoader(requestHeaders: Headers): Promise<ShopifyUser | null> {
-	const client = getShopifyClient();
-	const customerAccessToken = getUserCookie(requestHeaders);
-
-	if (!customerAccessToken) return null;
-
-	try {
-		const data = await client.query<{
-			customer?: {
-				id: string;
-				email?: string | null;
-				firstName?: string | null;
-				lastName?: string | null;
-			};
-		}>(FetchCustomerInfo, { customerAccessToken });
-
-		if (!data.customer) return null;
-
-		return {
-			"@id": data.customer.id,
-			email: data.customer.email ?? "",
-			givenName: data.customer.firstName ?? "",
-			familyName: data.customer.lastName ?? "",
-		};
-	} catch {
-		return null;
-	}
-}

package/src/manifest.gen.ts

@@ -1,39 +0,0 @@
-// AUTO-GENERATED by scripts/generate-manifests.ts — DO NOT EDIT
-// This file is checked into source control and updated via: npm run generate:manifests
-
-import * as actions_cart_addItems from "./actions/cart/addItems";
-import * as actions_cart_updateCoupons from "./actions/cart/updateCoupons";
-import * as actions_cart_updateItems from "./actions/cart/updateItems";
-import * as actions_user_signIn from "./actions/user/signIn";
-import * as actions_user_signUp from "./actions/user/signUp";
-import * as loaders_cart from "./loaders/cart";
-import * as loaders_ProductDetailsPage from "./loaders/ProductDetailsPage";
-import * as loaders_ProductList from "./loaders/ProductList";
-import * as loaders_ProductListingPage from "./loaders/ProductListingPage";
-import * as loaders_RelatedProducts from "./loaders/RelatedProducts";
-import * as loaders_shop from "./loaders/shop";
-import * as loaders_user from "./loaders/user";
-
-const manifest = {
-	name: "shopify",
-	loaders: {
-		"shopify/loaders/ProductDetailsPage": loaders_ProductDetailsPage,
-		"shopify/loaders/ProductList": loaders_ProductList,
-		"shopify/loaders/ProductListingPage": loaders_ProductListingPage,
-		"shopify/loaders/RelatedProducts": loaders_RelatedProducts,
-		"shopify/loaders/cart": loaders_cart,
-		"shopify/loaders/shop": loaders_shop,
-		"shopify/loaders/user": loaders_user,
-	},
-	actions: {
-		"shopify/actions/cart/addItems": actions_cart_addItems,
-		"shopify/actions/cart/updateCoupons": actions_cart_updateCoupons,
-		"shopify/actions/cart/updateItems": actions_cart_updateItems,
-		"shopify/actions/user/signIn": actions_user_signIn,
-		"shopify/actions/user/signUp": actions_user_signUp,
-	},
-	sections: {},
-} as const;
-
-export type Manifest = typeof manifest;
-export default manifest;