@decocms/blocks 7.11.1 → 7.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/blocks",
-  "version": "7.11.1",
+  "version": "7.11.2",
   "type": "module",
   "engines": {
     "node": ">=24"

package/src/cms/resolve.test.ts

@@ -306,6 +306,47 @@ describe("commerce loader auto-injects URL search params as props", () => {
   });
 });
 
+describe("commerce loader resolves legacy .ts-suffixed resolveType", () => {
+  beforeEach(() => clearCommerceLoaders());
+  afterEach(() => clearCommerceLoaders());
+
+  it("matches a manifest key (no extension) against a decofile .ts resolveType", async () => {
+    const calls: Array<Record<string, unknown>> = [];
+    // Split-package manifests register WITHOUT the file extension.
+    registerCommerceLoader("shopify/loaders/ProductDetailsPage", async (props) => {
+      calls.push({ ...props });
+      return null;
+    });
+
+    // Legacy (Fresh/Deno) decofile references it WITH the .ts extension.
+    await resolveValue(
+      { __resolveType: "shopify/loaders/ProductDetailsPage.ts", slug: "oversize-t-shirt-123" },
+      undefined,
+      { url: "https://store.com/products/oversize-t-shirt-123", path: "/products/oversize-t-shirt-123" },
+    );
+
+    expect(calls).toHaveLength(1);
+    expect(calls[0]).toMatchObject({ slug: "oversize-t-shirt-123" });
+  });
+
+  it("prefers an exact .ts registration over the stripped fallback", async () => {
+    const hits: string[] = [];
+    registerCommerceLoader("shopify/loaders/X", async () => {
+      hits.push("plain");
+      return null;
+    });
+    registerCommerceLoader("shopify/loaders/X.ts", async () => {
+      hits.push("dotts");
+      return null;
+    });
+    await resolveValue({ __resolveType: "shopify/loaders/X.ts" }, undefined, {
+      url: "https://s.com/",
+      path: "/",
+    });
+    expect(hits).toEqual(["dotts"]);
+  });
+});
+
 // ---------------------------------------------------------------------------
 // Async rendering: the admin (CMS Lazy ⚡ toggle) is the source of truth
 // ---------------------------------------------------------------------------

package/src/cms/resolve.ts

@@ -495,6 +495,19 @@ export function clearCommerceLoaders(): void {
   for (const key of Object.keys(commerceLoaders)) delete commerceLoaders[key];
 }
 
+/**
+ * Look up a commerce loader tolerant of a legacy `.ts`/`.tsx` resolveType
+ * suffix. Fresh/Deno decofiles reference app loaders with the file extension
+ * (`shopify/loaders/ProductDetailsPage.ts`), but the split-package app
+ * manifests register them WITHOUT it (`shopify/loaders/ProductDetailsPage`).
+ * Exact key wins (so an explicitly-registered `.ts` alias — e.g. a site's
+ * wrapped loader — still takes precedence); otherwise fall back to the
+ * extension-stripped key so existing content keeps resolving after a migration.
+ */
+export function getCommerceLoader(resolveType: string): CommerceLoader | undefined {
+  return commerceLoaders[resolveType] ?? commerceLoaders[resolveType.replace(/\.tsx?$/, "")];
+}
+
 // ---------------------------------------------------------------------------
 // Custom matchers
 // ---------------------------------------------------------------------------
@@ -832,7 +845,7 @@ async function internalResolve(value: unknown, rctx: ResolveContext): Promise<un
   }
 
   // Commerce loaders
-  const commerceLoader = commerceLoaders[resolveType];
+  const commerceLoader = getCommerceLoader(resolveType);
   if (commerceLoader) {
     const { __resolveType: _, ...loaderProps } = obj;
     const resolvedProps = await resolveProps(loaderProps, childCtx);
@@ -1186,7 +1199,7 @@ function resolvesToCommerceLoader(value: unknown, depth = 0): boolean {
   const rt = obj.__resolveType as string | undefined;
   if (!rt) return false;
 
-  if (commerceLoaders[rt]) return true;
+  if (getCommerceLoader(rt)) return true;
 
   if (rt === WELL_KNOWN_TYPES.LAZY) return resolvesToCommerceLoader(obj.section, depth + 1);
   if (rt === WELL_KNOWN_TYPES.DEFERRED) {