@deneb-ui/ui 2.0.110 → 2.0.112

package/dist/SiteDataProvider.d.ts

@@ -102,16 +102,7 @@ export declare const DenebDataProvider: typeof SiteDataProvider;
 export declare const useDenebData: typeof useSiteData;
 export declare const DenebDataContext: React.Context<SiteData | typeof UNINITIALIZED_SITE_DATA>;
 export type DenebData = SiteData;
-/**
- * Hook to retrieve products cleanly from SiteData, supporting both
- * top-level content.products and nested content.home.products.
- */
-/**
- * Universal Bidirectional Product Normalizer:
- * Ensures every product object has both canonical and alias keys simultaneously populated
- * with clean numbers and resolved image URLs, so any template component code works flawlessly
- * regardless of whether the developer wrote .title or .name, .cost or .price, .image or .imageUrl.
- */
+export declare function formatWeeklyHoursToString(value: unknown): string;
 export declare function normalizeProductItem(p: unknown): ProductItem;
 /**
  * Universal Service Normalizer

package/dist/SiteDataProvider.js

@@ -18,6 +18,7 @@ exports.contentNumber = contentNumber;
 exports.parseFieldPath = parseFieldPath;
 exports.getFieldStyle = getFieldStyle;
 exports.useFieldStyle = useFieldStyle;
+exports.formatWeeklyHoursToString = formatWeeklyHoursToString;
 exports.normalizeProductItem = normalizeProductItem;
 exports.normalizeServiceItem = normalizeServiceItem;
 exports.useProducts = useProducts;
@@ -356,9 +357,11 @@ function SiteDataProvider({ children, initialSiteData, fallbackSiteData, liveCat
                         }
                     }
                     if (live.shop.openingHours) {
+                        const hoursStr = formatWeeklyHoursToString(live.shop.openingHours);
+                        const liveText = hoursStr || (typeof live.shop.openingHours === "string" ? live.shop.openingHours : "");
                         nextContact.hours = live.shop.openingHours;
-                        nextContact.openingHours = live.shop.openingHours;
-                        nextCommon.openingHours = live.shop.openingHours;
+                        nextContact.openingHours = liveText;
+                        nextCommon.openingHours = liveText;
                         nextCommon.hours = live.shop.openingHours;
                         nextHome.businessHours = live.shop.openingHours;
                     }
@@ -718,6 +721,78 @@ exports.DenebDataContext = exports.SiteDataContext;
  * with clean numbers and resolved image URLs, so any template component code works flawlessly
  * regardless of whether the developer wrote .title or .name, .cost or .price, .image or .imageUrl.
  */
+function formatTime12(timeStr) {
+    if (!timeStr)
+        return "";
+    const clean = timeStr.trim();
+    if (/am|pm/i.test(clean))
+        return clean;
+    const [hourStr, minStr = "00"] = clean.split(":");
+    const hour = parseInt(hourStr, 10);
+    if (isNaN(hour))
+        return clean;
+    const ampm = hour >= 12 ? "PM" : "AM";
+    const formattedHour = hour % 12 === 0 ? 12 : hour % 12;
+    return `${formattedHour}:${minStr.padStart(2, "0")} ${ampm}`;
+}
+function formatWeeklyHoursToString(value) {
+    if (typeof value === "string")
+        return value.trim();
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return "";
+    const days = [
+        ["monday", "Mon"],
+        ["tuesday", "Tue"],
+        ["wednesday", "Wed"],
+        ["thursday", "Thu"],
+        ["friday", "Fri"],
+        ["saturday", "Sat"],
+        ["sunday", "Sun"],
+    ];
+    const entries = [];
+    const rec = value;
+    for (const [key, label] of days) {
+        const day = rec[key];
+        if (!day)
+            continue;
+        if (typeof day === "string") {
+            const trimmed = day.trim();
+            if (trimmed)
+                entries.push({ label, hours: trimmed });
+            continue;
+        }
+        if (day.closed === true) {
+            entries.push({ label, hours: "Closed" });
+            continue;
+        }
+        const open = typeof day.open === "string" ? formatTime12(day.open) : "";
+        const close = typeof day.close === "string" ? formatTime12(day.close) : "";
+        if (open && close) {
+            entries.push({ label, hours: `${open} – ${close}` });
+        }
+        else if (open) {
+            entries.push({ label, hours: `From ${open}` });
+        }
+    }
+    if (entries.length === 0)
+        return "";
+    const groups = [];
+    for (const entry of entries) {
+        const prev = groups[groups.length - 1];
+        if (prev && prev.hours === entry.hours) {
+            prev.last = entry.label;
+        }
+        else {
+            groups.push({ first: entry.label, last: entry.label, hours: entry.hours });
+        }
+    }
+    const activeGroups = groups.filter((g) => g.hours && g.hours !== "Closed");
+    if (activeGroups.length === 0)
+        return "Closed";
+    return activeGroups
+        .map((g) => (g.first === g.last ? `${g.first}: ${g.hours}` : `${g.first} – ${g.last}: ${g.hours}`))
+        .join(", ");
+}
 function normalizeProductItem(p) {
     if (!isRecord(p))
         return p;
@@ -791,7 +866,9 @@ function normalizeProductItem(p) {
         productName: (titleCandidate ?? nameCandidate),
         itemTitle: (titleCandidate ?? nameCandidate),
         minPrice: explicitMin !== undefined ? explicitMin : undefined,
+        priceMin: (explicitMin ?? p.priceMin) !== undefined ? (explicitMin ?? p.priceMin) : undefined,
         maxPrice: explicitMax !== undefined ? explicitMax : undefined,
+        priceMax: (explicitMax ?? p.priceMax) !== undefined ? (explicitMax ?? p.priceMax) : undefined,
         priceRange: explicitRange !== undefined ? explicitRange : undefined,
         isPriceRange: isRange,
         ...(numPrice !== undefined

package/dist/utils/urls.js

@@ -133,11 +133,26 @@ function isSafeExternalLink(url) {
  * `window.location` navigation only.
  */
 function withBasePath(value) {
-    const url = value?.trim() ?? '';
+    let url = value?.trim() ?? '';
     if (!url || /^(?:[a-z][a-z0-9+.-]*:|\/\/|#)/i.test(url))
         return url;
+    // Deduplicate any repeated generated-sites prefix segments
+    const generatedSitesMatch = url.match(/^(\/uploads\/generated-sites\/(?:template-preview|preview|live|candidate)\/[^/]+)/i);
+    if (generatedSitesMatch) {
+        const root = generatedSitesMatch[1];
+        let rest = url.slice(root.length);
+        while (rest.toLowerCase().startsWith(root.toLowerCase())) {
+            rest = rest.slice(root.length);
+        }
+        url = `${root}${rest}`;
+    }
     const basePath = (typeof process !== 'undefined' ? process.env?.NEXT_PUBLIC_SITE_BASE_PATH ?? '' : '').replace(/\/$/, '');
+    if (!basePath)
+        return url.startsWith('/') ? url : `/${url}`;
     const path = url.startsWith('/') ? url : `/${url}`;
+    if (path === basePath || path.startsWith(`${basePath}/`) || path.startsWith(`${basePath}?`)) {
+        return path;
+    }
     return `${basePath}${path}`;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deneb-ui/ui",
-  "version": "2.0.110",
+  "version": "2.0.112",
   "description": "Visual-first React component library for editable commerce storefronts. Built for Next.js and Fivora.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -50,7 +50,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@deneb-ui/core": "^2.0.110"
+    "@deneb-ui/core": "^2.0.112"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0",