@decocms/apps-vtex 7.66.4 → 7.66.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/apps-vtex",
-  "version": "7.66.4",
+  "version": "7.66.5",
   "type": "module",
   "description": "Deco commerce app: VTEX integration",
   "repository": {
@@ -51,10 +51,10 @@
     "lint:unused": "knip"
   },
   "dependencies": {
-    "@decocms/blocks": "7.66.4",
-    "@decocms/apps-commerce": "7.66.4",
-    "@decocms/apps-website": "7.66.4",
-    "@decocms/tanstack": "7.66.4"
+    "@decocms/blocks": "7.66.5",
+    "@decocms/apps-commerce": "7.66.5",
+    "@decocms/apps-website": "7.66.5",
+    "@decocms/tanstack": "7.66.5"
   },
   "peerDependencies": {
     "@tanstack/react-query": ">=5.0.0",

package/src/client.ts

@@ -206,6 +206,55 @@ export function vtexHost(environment: string = "vtexcommercestable", config?: Vt
 	return `${c.account}.${environment}.${domain}`;
 }
 
+/**
+ * Origin every product/SKU/breadcrumb URL in the schema.org payload is built
+ * from.
+ *
+ * Order matters, and the first branch is the whole point: a storefront answers
+ * on the host the shopper actually typed, and that is the host its canonical
+ * URLs, JSON-LD and sitemap entries have to name. deco-cx/apps got this from
+ * the request too (`vtex/loaders/intelligentSearch/productList.ts` passes
+ * `baseUrl: url`), and dropping it here is what made a migrated storefront
+ * publish structured data pointing somewhere else.
+ *
+ * `publicUrl` is only a fallback. It is the VTEX *checkout* host
+ * (`secure.<brand>.com`), which is a different site from the storefront, and
+ * it is stored with whatever shape the admin typed — commonly a full URL
+ * (`https://secure.example.com/`). Interpolating that into `https://${...}`
+ * produced `https://https://secure.example.com/`, which `new URL()` parses
+ * with host `https`, so every product ended up at `https://https/<slug>/p`.
+ * Normalising through `URL` removes that whole class of bug.
+ *
+ * Returns no trailing slash, so `new URL(path, baseUrl)` behaves the same for
+ * every branch.
+ */
+export function storefrontBaseUrl(config?: VtexConfig): string {
+	const c = config ?? getVtexConfig();
+
+	// 1. The host serving this request -- the storefront's own origin.
+	const request = RequestContext.current?.request;
+	if (request) {
+		try {
+			return new URL(request.url).origin;
+		} catch {
+			// Fall through: a synthetic Request may carry an unparseable url.
+		}
+	}
+
+	// 2. Configured public URL, normalised whether or not it carries a scheme.
+	if (c.publicUrl) {
+		const normalised = /^https?:\/\//i.test(c.publicUrl) ? c.publicUrl : `https://${c.publicUrl}`;
+		try {
+			return new URL(normalised).origin;
+		} catch {
+			// Fall through to the account host rather than publish a broken origin.
+		}
+	}
+
+	// 3. The account's VTEX host. Always well-formed; never the public brand.
+	return `https://${vtexHost("vtexcommercestable", c)}`;
+}
+
 function baseUrl(): string {
 	return `https://${vtexHost()}`;
 }

package/src/loaders/autocomplete.ts

@@ -4,7 +4,7 @@
  * Combines /autocomplete_suggestions/ and /product_search/ in parallel,
  * transforms IS products to schema.org via pickSku + toProduct.
  */
-import { getVtexConfig, intelligentSearch as vtexIS } from "../client";
+import { getVtexConfig, intelligentSearch as vtexIS, storefrontBaseUrl } from "../client";
 import { pickSku, toProduct as toSchemaProduct } from "../utils/transform";
 
 export interface AutocompleteProps {
@@ -40,9 +40,7 @@ export async function autocompleteSearch(props: AutocompleteProps): Promise<Auto
 		]);
 
 		const config = getVtexConfig();
-		const baseUrl = config.publicUrl
-			? `https://${config.publicUrl}`
-			: `https://${config.account}.vtexcommercestable.${config.domain ?? "com.br"}`;
+		const baseUrl = storefrontBaseUrl(config);
 
 		return {
 			searches: suggestionsData.searches ?? [],

package/src/loaders/intelligentSearch/productDetailsPage.ts

@@ -5,7 +5,7 @@
  */
 
 import type { ProductDetailsPage } from "@decocms/apps-commerce/types";
-import { getVtexConfig, vtexCachedFetch } from "../../client";
+import { getVtexConfig, storefrontBaseUrl, vtexCachedFetch } from "../../client";
 import PDPDefaultPath from "../paths/PDPDefaultPath";
 import { searchBySlug } from "../../utils/slugCache";
 import { pickSku, toProductPage } from "../../utils/transform";
@@ -74,9 +74,7 @@ export default async function vtexProductDetailsPage(
 		}
 
 		const product = products[0];
-		const baseUrl = config.publicUrl
-			? `https://${config.publicUrl}`
-			: `https://${config.account}.vtexcommercestable.${config.domain ?? "com.br"}`;
+		const baseUrl = storefrontBaseUrl(config);
 
 		const sku = pickSku(product, skuId);
 

package/src/loaders/intelligentSearch/productList.ts

@@ -7,7 +7,7 @@
  */
 
 import type { Product } from "@decocms/apps-commerce/types";
-import { getVtexConfig, intelligentSearch, toFacetPath } from "../../client";
+import { getVtexConfig, intelligentSearch, storefrontBaseUrl, toFacetPath } from "../../client";
 import { pickSku, sortProducts, toProductShelf } from "../../utils/transform";
 import type { Product as ProductVTEX } from "../../utils/types";
 
@@ -136,9 +136,7 @@ export default async function vtexProductListShelf(
 		const data = await intelligentSearch<{ products: ProductVTEX[] }>(endpoint, params);
 
 		const vtexProducts = data.products ?? [];
-		const baseUrl = config.publicUrl
-			? `https://${config.publicUrl}`
-			: `https://${config.account}.vtexcommercestable.${config.domain ?? "com.br"}`;
+		const baseUrl = storefrontBaseUrl(config);
 
 		let products = vtexProducts.map((p) => {
 			const fetchedSkus = ids ? new Set(ids) : null;

package/src/loaders/intelligentSearch/productListingPage.ts

@@ -4,6 +4,7 @@ import {
 	intelligentSearch,
 	type PageType,
 	pageTypesFromPath,
+	storefrontBaseUrl,
 	toFacetPath,
 } from "../../client";
 import { pickSku, toProduct } from "../../utils/transform";
@@ -441,9 +442,7 @@ export default async function vtexProductListingPage(props: PLPProps): Promise<a
 		const { products: vtexProducts, pagination, recordsFiltered } = productsResult;
 
 		// 3. Transform products using shared transform pipeline (same as deco-cx/apps)
-		const baseUrl = config.publicUrl
-			? `https://${config.publicUrl}`
-			: `https://${config.account}.vtexcommercestable.com.br`;
+		const baseUrl = storefrontBaseUrl(config);
 
 		const schemaProducts = (vtexProducts as ProductVTEX[]).map((p) => {
 			const sku = pickSku(p);

package/src/loaders/intelligentSearch/suggestions.ts

@@ -4,7 +4,7 @@
  */
 
 import type { Product, Suggestion } from "@decocms/apps-commerce/types";
-import { getVtexConfig, intelligentSearch } from "../../client";
+import { getVtexConfig, intelligentSearch, storefrontBaseUrl } from "../../client";
 import { pickSku, toProduct } from "../../utils/transform";
 import type { Product as ProductVTEX } from "../../utils/types";
 
@@ -29,9 +29,7 @@ export default async function vtexSuggestions(props: SuggestionsProps): Promise<
 		}));
 
 		const config = getVtexConfig();
-		const baseUrl = config.publicUrl
-			? `https://${config.publicUrl}`
-			: `https://${config.account}.vtexcommercestable.${config.domain ?? "com.br"}`;
+		const baseUrl = storefrontBaseUrl(config);
 
 		const products: Product[] = (data.products ?? []).slice(0, props.count ?? 4).map((p) => {
 			const sku = pickSku(p);

package/src/loaders/legacy/relatedProductsLoader.ts

@@ -8,7 +8,7 @@
  */
 
 import type { Product } from "@decocms/apps-commerce/types";
-import { getVtexConfig, vtexCachedFetch } from "../../client";
+import { getVtexConfig, storefrontBaseUrl, vtexCachedFetch } from "../../client";
 import { resolveProductIdBySlug } from "../../utils/slugCache";
 import { pickSku, toProduct } from "../../utils/transform";
 import type { LegacyProduct } from "../../utils/types";
@@ -58,9 +58,7 @@ export default async function vtexRelatedProducts(
 		if (!related?.length) return [];
 
 		const config = getVtexConfig();
-		const baseUrl = config.publicUrl
-			? `https://${config.publicUrl}`
-			: `https://${config.account}.vtexcommercestable.${config.domain ?? "com.br"}`;
+		const baseUrl = storefrontBaseUrl(config);
 
 		let result = related.slice(0, count).map((p) => {
 			const sku = pickSku(p);

package/src/loaders/productListFull.ts

@@ -7,7 +7,7 @@
  */
 
 import type { Product } from "@decocms/apps-commerce/types";
-import { getVtexConfig, intelligentSearch, toFacetPath } from "../client";
+import { getVtexConfig, intelligentSearch, storefrontBaseUrl, toFacetPath } from "../client";
 import { pickSku, sortProducts, toProduct } from "../utils/transform";
 import type { Product as ProductVTEX } from "../utils/types";
 
@@ -135,9 +135,7 @@ export default async function vtexProductList(props: ProductListProps): Promise<
 		const data = await intelligentSearch<{ products: ProductVTEX[] }>(endpoint, params);
 
 		const vtexProducts = data.products ?? [];
-		const baseUrl = config.publicUrl
-			? `https://${config.publicUrl}`
-			: `https://${config.account}.vtexcommercestable.${config.domain ?? "com.br"}`;
+		const baseUrl = storefrontBaseUrl(config);
 
 		let products = vtexProducts.map((p) => {
 			const fetchedSkus = ids ? new Set(ids) : null;

package/src/loaders/workflow/products.ts

@@ -4,7 +4,7 @@
  */
 
 import type { Product } from "@decocms/apps-commerce/types";
-import { getVtexConfig, intelligentSearch, toFacetPath } from "../../client";
+import { getVtexConfig, intelligentSearch, storefrontBaseUrl, toFacetPath } from "../../client";
 import { pickSku, toProduct } from "../../utils/transform";
 import type { Product as ProductVTEX } from "../../utils/types";
 
@@ -49,9 +49,7 @@ export default async function vtexWorkflowProducts(
 		const data = await intelligentSearch<{ products: ProductVTEX[] }>(endpoint, params);
 
 		const products = data.products ?? [];
-		const baseUrl = config.publicUrl
-			? `https://${config.publicUrl}`
-			: `https://${config.account}.vtexcommercestable.${config.domain ?? "com.br"}`;
+		const baseUrl = storefrontBaseUrl(config);
 
 		return products.map((p) => {
 			const sku = pickSku(p);

package/src/utils/__tests__/storefrontBaseUrl.test.ts

@@ -0,0 +1,61 @@
+import { RequestContext } from "@decocms/blocks/sdk/requestContext";
+import { beforeEach, describe, expect, it } from "vitest";
+
+import { configureVtex, storefrontBaseUrl } from "../../client";
+
+const ACCOUNT = { account: "examplestore" } as const;
+
+describe("storefrontBaseUrl", () => {
+	beforeEach(() => {
+		configureVtex({ ...ACCOUNT });
+	});
+
+	it("uses the origin of the request being served", () => {
+		configureVtex({ ...ACCOUNT, publicUrl: "https://secure.example.com/" });
+
+		const origin = RequestContext.run(new Request("https://www.example.com/camisas?page=2"), () =>
+			storefrontBaseUrl(),
+		);
+
+		expect(origin).toBe("https://www.example.com");
+	});
+
+	it("never returns the double-scheme origin a full publicUrl used to produce", () => {
+		// `https://${publicUrl}` on "https://secure.example.com/" parsed with
+		// host "https", so every product URL came out as https://https/<slug>/p.
+		configureVtex({ ...ACCOUNT, publicUrl: "https://secure.example.com/" });
+
+		const origin = storefrontBaseUrl();
+
+		expect(origin).toBe("https://secure.example.com");
+		expect(new URL("/camisa-paris/p", origin).href).toBe("https://secure.example.com/camisa-paris/p");
+	});
+
+	it("accepts a publicUrl stored without a scheme", () => {
+		configureVtex({ ...ACCOUNT, publicUrl: "secure.example.com" });
+
+		expect(storefrontBaseUrl()).toBe("https://secure.example.com");
+	});
+
+	it("falls back to the account host when publicUrl is absent", () => {
+		expect(storefrontBaseUrl()).toBe("https://examplestore.vtexcommercestable.com.br");
+	});
+
+	it("honours a configured domain in the account-host fallback", () => {
+		configureVtex({ ...ACCOUNT, domain: "com" });
+
+		expect(storefrontBaseUrl()).toBe("https://examplestore.vtexcommercestable.com");
+	});
+
+	it("falls back to the account host rather than publish an unparseable publicUrl", () => {
+		configureVtex({ ...ACCOUNT, publicUrl: "://" });
+
+		expect(storefrontBaseUrl()).toBe("https://examplestore.vtexcommercestable.com.br");
+	});
+
+	it("returns an origin with no trailing slash", () => {
+		configureVtex({ ...ACCOUNT, publicUrl: "https://secure.example.com/" });
+
+		expect(storefrontBaseUrl()).not.toMatch(/\/$/);
+	});
+});

package/src/utils/enrichment.ts

@@ -24,7 +24,7 @@
  */
 
 import type { Product, ProductLeaf } from "@decocms/apps-commerce/types";
-import { getVtexConfig, vtexFetch, vtexIOGraphQL } from "../client";
+import { getVtexConfig, storefrontBaseUrl, vtexFetch, vtexIOGraphQL } from "../client";
 import { listBrands } from "../loaders/brands";
 import { batch } from "./batch";
 import { withIsSimilarTo } from "./similars";
@@ -372,9 +372,7 @@ export function withKitItems(): ProductEnricher {
 		if (!productIDs.size) return products;
 
 		const config = getVtexConfig();
-		const baseUrl = config.publicUrl
-			? `https://${config.publicUrl}`
-			: `https://${config.account}.vtexcommercestable.${config.domain ?? "com.br"}`;
+		const baseUrl = storefrontBaseUrl(config);
 
 		const batches = batch([...productIDs], KIT_ITEMS_BATCH_SIZE);
 		const productsById = new Map<string, ProductLeaf>();
@@ -428,9 +426,7 @@ export function withVariants(): ProductEnricher {
 		if (!productIDs.size) return products;
 
 		const config = getVtexConfig();
-		const baseUrl = config.publicUrl
-			? `https://${config.publicUrl}`
-			: `https://${config.account}.vtexcommercestable.${config.domain ?? "com.br"}`;
+		const baseUrl = storefrontBaseUrl(config);
 
 		const batches = batch([...productIDs], VARIANTS_BATCH_SIZE);
 		const productsById = new Map<string, Product>();

package/src/utils/similars.ts

@@ -1,5 +1,5 @@
 import type { Product } from "@decocms/apps-commerce/types";
-import { getVtexConfig, vtexFetch } from "../client";
+import { getVtexConfig, storefrontBaseUrl, vtexFetch } from "../client";
 import { pickSku, toProduct } from "./transform";
 import type { LegacyProduct } from "./types";
 
@@ -18,9 +18,7 @@ export const withIsSimilarTo = async (product: Product): Promise<Product> => {
 		if (!rawSimilars?.length) return product;
 
 		const config = getVtexConfig();
-		const baseUrl = config.publicUrl
-			? `https://${config.publicUrl}`
-			: `https://${config.account}.vtexcommercestable.${config.domain ?? "com.br"}`;
+		const baseUrl = storefrontBaseUrl(config);
 
 		const similars = rawSimilars.map((p) => {
 			const sku = pickSku(p);