@decocms/blocks 7.1.2 → 7.2.0

package/src/hooks/index.ts

@@ -2,3 +2,29 @@ export { isBelowFold, LazySection, type LazySectionProps } from "./LazySection";
 export { LiveControls } from "./LiveControls";
 export { SectionErrorBoundary } from "./SectionErrorFallback";
 export { default as RenderSection } from "./RenderSection";
+
+// Commerce UI primitives (moved from apps-start's commerce/components/).
+export {
+	default as Image,
+	registerImageCdnDomain,
+	getImageCdnDomain,
+	getOptimizedMediaUrl,
+	getSrcSet,
+	FACTORS,
+	type ImageProps,
+	type FitOptions,
+} from "./Image";
+export { Picture, Source, type PictureProps, type SourceProps } from "./Picture";
+export {
+	ProductJsonLd,
+	PLPJsonLd,
+	BreadcrumbJsonLd,
+	seoMetaTags,
+	type ProductJsonLdProps,
+	type PLPJsonLdProps,
+	type BreadcrumbJsonLdProps,
+	type SeoMetaProps,
+	type JsonLdProduct,
+	type JsonLdProductListingPage,
+	type JsonLdBreadcrumbList,
+} from "./JsonLd";

package/src/matchers/builtins.test.ts

@@ -1,9 +1,10 @@
-import { beforeEach, describe, expect, it } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { MatcherContext } from "../cms/resolve";
 import { evaluateMatcher } from "../cms/resolve";
 import { registerBuiltinMatchers } from "./builtins";
 
 const LOCATION_KEY = "website/matchers/location.ts";
+const DATE_KEY = "website/matchers/date.ts";
 
 beforeEach(() => {
   registerBuiltinMatchers();
@@ -249,3 +250,69 @@ describe("locationMatcher — data source fallbacks", () => {
     expect(match({ includeLocations: [{ regionCode: "RJ" }] }, ctx)).toBe(false);
   });
 });
+
+function matchDate(rule: Record<string, unknown>): boolean {
+  return evaluateMatcher({ ...rule, __resolveType: DATE_KEY }, {});
+}
+
+describe("dateMatcher — parity with deco-cx/apps website/matchers/date.ts", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-07-07T12:00:00Z"));
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  it("matches when neither start nor end is given (vacuously true)", () => {
+    expect(matchDate({})).toBe(true);
+  });
+
+  it("matches when now is after start and no end is given", () => {
+    expect(matchDate({ start: "2026-07-01T00:00:00Z" })).toBe(true);
+  });
+
+  it("does not match when now is before start", () => {
+    expect(matchDate({ start: "2026-08-01T00:00:00Z" })).toBe(false);
+  });
+
+  it("matches when now is before end and no start is given", () => {
+    expect(matchDate({ end: "2026-08-01T00:00:00Z" })).toBe(true);
+  });
+
+  it("does not match when now is after end", () => {
+    expect(matchDate({ end: "2026-06-01T00:00:00Z" })).toBe(false);
+  });
+
+  it("matches when now is strictly between start and end", () => {
+    expect(
+      matchDate({ start: "2026-07-01T00:00:00Z", end: "2026-07-31T00:00:00Z" }),
+    ).toBe(true);
+  });
+
+  it("does not match outside a [start, end] window in either direction", () => {
+    expect(
+      matchDate({ start: "2026-08-01T00:00:00Z", end: "2026-09-01T00:00:00Z" }),
+    ).toBe(false);
+    expect(
+      matchDate({ start: "2026-01-01T00:00:00Z", end: "2026-02-01T00:00:00Z" }),
+    ).toBe(false);
+  });
+
+  it("does not match at the exact start boundary instant (strict >, not >=)", () => {
+    expect(matchDate({ start: "2026-07-07T12:00:00Z" })).toBe(false);
+  });
+
+  it("does not match at the exact end boundary instant (strict <, not <=)", () => {
+    expect(matchDate({ end: "2026-07-07T12:00:00Z" })).toBe(false);
+  });
+
+  it("treats an invalid start date as non-matching (NaN comparison is always false)", () => {
+    expect(matchDate({ start: "not-a-date" })).toBe(false);
+  });
+
+  it("treats an invalid end date as non-matching", () => {
+    expect(matchDate({ end: "not-a-date" })).toBe(false);
+  });
+});

package/src/matchers/builtins.ts

@@ -3,7 +3,7 @@
  *
  * These augment the matchers already handled inline in resolve.ts
  * (always, never, device, random, utm) with the additional matchers
- * that deco supported: cookie, cron, host, pathname, queryString,
+ * that deco supported: cookie, cron, date, host, pathname, queryString,
  * location, userAgent, environment, multi, negate.
  *
  * Register these at startup:
@@ -61,6 +61,28 @@ function cronMatcher(rule: Record<string, unknown>, _ctx: MatcherContext): boole
   return true;
 }
 
+// -------------------------------------------------------------------------
+// Date matcher — parity with deco-cx/apps website/matchers/date.ts
+//
+// Unlike cronMatcher's inclusive [start, end] window (>=, <=), date.ts uses
+// strict inequalities: it matches only strictly *between* start and end, so
+// a request landing on the exact boundary instant does not match. Invalid
+// date strings produce NaN comparisons, which are always false — same
+// "reject silently" behavior as the original (no explicit isNaN check
+// needed to match upstream semantics).
+// -------------------------------------------------------------------------
+
+function dateMatcher(rule: Record<string, unknown>, _ctx: MatcherContext): boolean {
+  const start = rule.start as string | undefined;
+  const end = rule.end as string | undefined;
+
+  const now = new Date();
+  const afterStart = start ? now > new Date(start) : true;
+  const beforeEnd = end ? now < new Date(end) : true;
+
+  return afterStart && beforeEnd;
+}
+
 // -------------------------------------------------------------------------
 // Host matcher
 // -------------------------------------------------------------------------
@@ -425,7 +447,7 @@ function negateMatcher(rule: Record<string, unknown>, ctx: MatcherContext): bool
 export function registerBuiltinMatchers(): void {
   registerMatcher("website/matchers/cookie.ts", cookieMatcher);
   registerMatcher("website/matchers/cron.ts", cronMatcher);
-  registerMatcher("website/matchers/date.ts", cronMatcher);
+  registerMatcher("website/matchers/date.ts", dateMatcher);
   registerMatcher("website/matchers/host.ts", hostMatcher);
   registerMatcher("website/matchers/pathname.ts", pathnameMatcher);
   registerMatcher("website/matchers/queryString.ts", queryStringMatcher);