@weaverse/hydrogen 5.12.1 → 5.13.1

package/dist/index.d.mts

@@ -131,6 +131,8 @@ declare function ThemeTextProvider({ staticContent, merchantOverrides, t: extern
  */
 declare function useThemeText(): ThemeTextValue;
 
+type WeaverseDataValue = WeaverseLoaderData | Promise<WeaverseLoaderData> | null;
+
 declare class WeaverseHydrogenItem extends WeaverseItemStore {
     weaverse: WeaverseHydrogen;
     /**
@@ -226,12 +228,22 @@ declare class WeaverseHydrogen extends Weaverse {
  * ```
  */
 declare function registerComponent(element: HydrogenElement): void;
-declare const WeaverseHydrogenRoot: React$1.MemoExoticComponent<({ components, errorComponent: ErrorComponent, }: {
+declare const WeaverseHydrogenRoot: React$1.MemoExoticComponent<({ components, data: dataProp, errorComponent: ErrorComponent, }: {
     components: HydrogenComponent[];
+    /**
+     * Optional explicit `weaverseData` payload. When provided, bypasses the
+     * automatic route-scoped resolution. Accepts a resolved value, a
+     * `Promise` (handled via `<Await>`), or `null` to suppress rendering.
+     *
+     * Recommended for nested layout + child route compositions where two
+     * `<WeaverseHydrogenRoot>` instances need to render different Weaverse
+     * pages on the same URL. See issue #451.
+     */
+    data?: WeaverseDataValue;
     errorComponent?: React.FC<{
         error: Error | unknown;
     }>;
-}) => react_jsx_runtime.JSX.Element>;
+}) => react_jsx_runtime.JSX.Element | null>;
 /**
  * Options for the `withWeaverse` HOC.
  */
@@ -431,6 +443,14 @@ declare class WeaverseClient {
      * @returns HydrogenPageData with single main component containing the message
      */
     generateFallbackPage: (message: string) => HydrogenPageData;
+    /**
+     * Fetch all published custom pages for sitemap generation.
+     * Paginates automatically, never throws, returns accumulated results on partial failure.
+     */
+    fetchCustomPages(opts?: {
+        locale?: string;
+        limit?: number;
+    }): Promise<CustomPageEntry[]>;
     /**
      * Load page data from Weaverse API with optional route-level project override.
      * Fetches page content, executes component loaders, and handles empty items fallback.
@@ -816,6 +836,14 @@ type ProjectIdValidationResult = {
     valid: boolean;
     error?: string;
 };
+interface CustomPageEntry {
+    changeFrequency?: 'daily' | 'weekly' | 'monthly';
+    handle: string;
+    lastModified: string;
+    locale: string | null;
+    path: string;
+    priority?: number;
+}
 /**
  * Type guards for response validation
  */
@@ -1127,4 +1155,4 @@ declare const IMAGES_PLACEHOLDERS: {
     product_18: string;
 };
 
-export { type CacheResponseValidator, type ComponentDataValue, type ComponentLoaderArgs, type CreateHydrogenSchemaOptions, type DirectFetchResponse, type FetchProjectPayload, type FetchProjectRequestBody, type HydrogenComponent, type HydrogenComponentData, type HydrogenComponentPresets, type HydrogenComponentProps, type HydrogenComponentSchema, type HydrogenElement, type HydrogenPageAssignment, type HydrogenPageData, type HydrogenProjectType, type HydrogenSchemaValidationResult, type HydrogenThemeSchema, type HydrogenThemeSettings, IMAGES_PLACEHOLDERS, type LoadPageParams, type ProjectIdValidationResult, type ProjectIdValue, type PublicEnv, type RouteLoaderArgs, type ThemeSettingsResponse, ThemeTextProvider, type ThemeTextProviderProps, ThemeTextStore, type ThemeTextValue, type TranslateFunction, type TranslationChanges, type TranslationEntry, type TranslationItemEntry, type TranslationMap, type TranslationMapEntry, type WeaverseArticle, type WeaverseBlog, WeaverseClient, type WeaverseClientArgs, type WeaverseCollection, type WeaverseDataContext, WeaverseError, WeaverseHydrogen, WeaverseHydrogenItem, type WeaverseHydrogenParams, WeaverseHydrogenRoot, type WeaverseI18n, type WeaverseInternal, type WeaverseLoaderData, type WeaverseLoaderRequestInfo, type WeaverseMetaObject, type WeaverseProduct, type WeaverseProjectConfigs, type WeaverseStudioQueries, type WithCacheFetchResponse, type WithWeaverseOptions, createWeaverseDataContext, defaultComponents, generateDataFromSchema, getNestedKey, getPreviewData, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, hasError, hasWeaverseStudio, interpolate, isFetchProjectPayload, isProjectIdFunction, isThemeSettingsResponse, isValidHydrogenSchema, isWithCacheFetchResponse, registerComponent, useThemeSettings, useThemeText, useWeaverseDataContext, withWeaverse };
+export { type CacheResponseValidator, type ComponentDataValue, type ComponentLoaderArgs, type CreateHydrogenSchemaOptions, type CustomPageEntry, type DirectFetchResponse, type FetchProjectPayload, type FetchProjectRequestBody, type HydrogenComponent, type HydrogenComponentData, type HydrogenComponentPresets, type HydrogenComponentProps, type HydrogenComponentSchema, type HydrogenElement, type HydrogenPageAssignment, type HydrogenPageData, type HydrogenProjectType, type HydrogenSchemaValidationResult, type HydrogenThemeSchema, type HydrogenThemeSettings, IMAGES_PLACEHOLDERS, type LoadPageParams, type ProjectIdValidationResult, type ProjectIdValue, type PublicEnv, type RouteLoaderArgs, type ThemeSettingsResponse, ThemeTextProvider, type ThemeTextProviderProps, ThemeTextStore, type ThemeTextValue, type TranslateFunction, type TranslationChanges, type TranslationEntry, type TranslationItemEntry, type TranslationMap, type TranslationMapEntry, type WeaverseArticle, type WeaverseBlog, WeaverseClient, type WeaverseClientArgs, type WeaverseCollection, type WeaverseDataContext, WeaverseError, WeaverseHydrogen, WeaverseHydrogenItem, type WeaverseHydrogenParams, WeaverseHydrogenRoot, type WeaverseI18n, type WeaverseInternal, type WeaverseLoaderData, type WeaverseLoaderRequestInfo, type WeaverseMetaObject, type WeaverseProduct, type WeaverseProjectConfigs, type WeaverseStudioQueries, type WithCacheFetchResponse, type WithWeaverseOptions, createWeaverseDataContext, defaultComponents, generateDataFromSchema, getNestedKey, getPreviewData, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, hasError, hasWeaverseStudio, interpolate, isFetchProjectPayload, isProjectIdFunction, isThemeSettingsResponse, isValidHydrogenSchema, isWithCacheFetchResponse, registerComponent, useThemeSettings, useThemeText, useWeaverseDataContext, withWeaverse };

package/dist/index.d.ts

@@ -131,6 +131,8 @@ declare function ThemeTextProvider({ staticContent, merchantOverrides, t: extern
  */
 declare function useThemeText(): ThemeTextValue;
 
+type WeaverseDataValue = WeaverseLoaderData | Promise<WeaverseLoaderData> | null;
+
 declare class WeaverseHydrogenItem extends WeaverseItemStore {
     weaverse: WeaverseHydrogen;
     /**
@@ -226,12 +228,22 @@ declare class WeaverseHydrogen extends Weaverse {
  * ```
  */
 declare function registerComponent(element: HydrogenElement): void;
-declare const WeaverseHydrogenRoot: React$1.MemoExoticComponent<({ components, errorComponent: ErrorComponent, }: {
+declare const WeaverseHydrogenRoot: React$1.MemoExoticComponent<({ components, data: dataProp, errorComponent: ErrorComponent, }: {
     components: HydrogenComponent[];
+    /**
+     * Optional explicit `weaverseData` payload. When provided, bypasses the
+     * automatic route-scoped resolution. Accepts a resolved value, a
+     * `Promise` (handled via `<Await>`), or `null` to suppress rendering.
+     *
+     * Recommended for nested layout + child route compositions where two
+     * `<WeaverseHydrogenRoot>` instances need to render different Weaverse
+     * pages on the same URL. See issue #451.
+     */
+    data?: WeaverseDataValue;
     errorComponent?: React.FC<{
         error: Error | unknown;
     }>;
-}) => react_jsx_runtime.JSX.Element>;
+}) => react_jsx_runtime.JSX.Element | null>;
 /**
  * Options for the `withWeaverse` HOC.
  */
@@ -431,6 +443,14 @@ declare class WeaverseClient {
      * @returns HydrogenPageData with single main component containing the message
      */
     generateFallbackPage: (message: string) => HydrogenPageData;
+    /**
+     * Fetch all published custom pages for sitemap generation.
+     * Paginates automatically, never throws, returns accumulated results on partial failure.
+     */
+    fetchCustomPages(opts?: {
+        locale?: string;
+        limit?: number;
+    }): Promise<CustomPageEntry[]>;
     /**
      * Load page data from Weaverse API with optional route-level project override.
      * Fetches page content, executes component loaders, and handles empty items fallback.
@@ -816,6 +836,14 @@ type ProjectIdValidationResult = {
     valid: boolean;
     error?: string;
 };
+interface CustomPageEntry {
+    changeFrequency?: 'daily' | 'weekly' | 'monthly';
+    handle: string;
+    lastModified: string;
+    locale: string | null;
+    path: string;
+    priority?: number;
+}
 /**
  * Type guards for response validation
  */
@@ -1127,4 +1155,4 @@ declare const IMAGES_PLACEHOLDERS: {
     product_18: string;
 };
 
-export { type CacheResponseValidator, type ComponentDataValue, type ComponentLoaderArgs, type CreateHydrogenSchemaOptions, type DirectFetchResponse, type FetchProjectPayload, type FetchProjectRequestBody, type HydrogenComponent, type HydrogenComponentData, type HydrogenComponentPresets, type HydrogenComponentProps, type HydrogenComponentSchema, type HydrogenElement, type HydrogenPageAssignment, type HydrogenPageData, type HydrogenProjectType, type HydrogenSchemaValidationResult, type HydrogenThemeSchema, type HydrogenThemeSettings, IMAGES_PLACEHOLDERS, type LoadPageParams, type ProjectIdValidationResult, type ProjectIdValue, type PublicEnv, type RouteLoaderArgs, type ThemeSettingsResponse, ThemeTextProvider, type ThemeTextProviderProps, ThemeTextStore, type ThemeTextValue, type TranslateFunction, type TranslationChanges, type TranslationEntry, type TranslationItemEntry, type TranslationMap, type TranslationMapEntry, type WeaverseArticle, type WeaverseBlog, WeaverseClient, type WeaverseClientArgs, type WeaverseCollection, type WeaverseDataContext, WeaverseError, WeaverseHydrogen, WeaverseHydrogenItem, type WeaverseHydrogenParams, WeaverseHydrogenRoot, type WeaverseI18n, type WeaverseInternal, type WeaverseLoaderData, type WeaverseLoaderRequestInfo, type WeaverseMetaObject, type WeaverseProduct, type WeaverseProjectConfigs, type WeaverseStudioQueries, type WithCacheFetchResponse, type WithWeaverseOptions, createWeaverseDataContext, defaultComponents, generateDataFromSchema, getNestedKey, getPreviewData, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, hasError, hasWeaverseStudio, interpolate, isFetchProjectPayload, isProjectIdFunction, isThemeSettingsResponse, isValidHydrogenSchema, isWithCacheFetchResponse, registerComponent, useThemeSettings, useThemeText, useWeaverseDataContext, withWeaverse };
+export { type CacheResponseValidator, type ComponentDataValue, type ComponentLoaderArgs, type CreateHydrogenSchemaOptions, type CustomPageEntry, type DirectFetchResponse, type FetchProjectPayload, type FetchProjectRequestBody, type HydrogenComponent, type HydrogenComponentData, type HydrogenComponentPresets, type HydrogenComponentProps, type HydrogenComponentSchema, type HydrogenElement, type HydrogenPageAssignment, type HydrogenPageData, type HydrogenProjectType, type HydrogenSchemaValidationResult, type HydrogenThemeSchema, type HydrogenThemeSettings, IMAGES_PLACEHOLDERS, type LoadPageParams, type ProjectIdValidationResult, type ProjectIdValue, type PublicEnv, type RouteLoaderArgs, type ThemeSettingsResponse, ThemeTextProvider, type ThemeTextProviderProps, ThemeTextStore, type ThemeTextValue, type TranslateFunction, type TranslationChanges, type TranslationEntry, type TranslationItemEntry, type TranslationMap, type TranslationMapEntry, type WeaverseArticle, type WeaverseBlog, WeaverseClient, type WeaverseClientArgs, type WeaverseCollection, type WeaverseDataContext, WeaverseError, WeaverseHydrogen, WeaverseHydrogenItem, type WeaverseHydrogenParams, WeaverseHydrogenRoot, type WeaverseI18n, type WeaverseInternal, type WeaverseLoaderData, type WeaverseLoaderRequestInfo, type WeaverseMetaObject, type WeaverseProduct, type WeaverseProjectConfigs, type WeaverseStudioQueries, type WithCacheFetchResponse, type WithWeaverseOptions, createWeaverseDataContext, defaultComponents, generateDataFromSchema, getNestedKey, getPreviewData, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, hasError, hasWeaverseStudio, interpolate, isFetchProjectPayload, isProjectIdFunction, isThemeSettingsResponse, isValidHydrogenSchema, isWithCacheFetchResponse, registerComponent, useThemeSettings, useThemeText, useWeaverseDataContext, withWeaverse };

package/dist/index.js

@@ -417,6 +417,29 @@ var ThemeTextStore = class {
     }
   };
 };
+
+// src/utils/pick-weaverse-data.ts
+function pickWeaverseData(dataProp, ownLoaderData, matches) {
+  if (dataProp !== void 0) {
+    return dataProp;
+  }
+  if (hasWeaverseData(ownLoaderData)) {
+    return ownLoaderData.weaverseData;
+  }
+  for (let i = matches.length - 1; i >= 0; i--) {
+    const loaderData = matches[i].loaderData;
+    if (hasWeaverseData(loaderData)) {
+      return loaderData.weaverseData;
+    }
+  }
+  return null;
+}
+function hasWeaverseData(value) {
+  if (typeof value !== "object" || value === null || !("weaverseData" in value)) {
+    return false;
+  }
+  return value.weaverseData !== void 0;
+}
 var ThemeSettingsStore = class {
   settings = {};
   schema;
@@ -709,7 +732,7 @@ var WeaverseHydrogen = class extends react.Weaverse {
     const entries = [];
     const languageId = this.translationLanguageId;
     if (!(this.translationLocale && languageId)) {
-      return void 0;
+      return;
     }
     for (const [itemId, fields] of Object.entries(this.translationMap)) {
       for (const [key, entry] of Object.entries(fields)) {
@@ -722,7 +745,7 @@ var WeaverseHydrogen = class extends react.Weaverse {
       }
     }
     if (entries.length === 0) {
-      return void 0;
+      return;
     }
     return { languageId, entries };
   };
@@ -786,20 +809,19 @@ function registerComponent(element) {
 var WeaverseHydrogenRoot = react$1.memo(
   ({
     components,
+    data: dataProp,
     errorComponent: ErrorComponent = ({ error }) => /* @__PURE__ */ jsxRuntime.jsx("div", { children: error instanceof Error ? error.message : "An unexpected error occurred" })
   }) => {
     const matches = reactRouter.useMatches();
     const enhancedDataContext = createWeaverseDataContext(matches);
-    const weaverseData = react$1.useMemo(() => {
-      for (let i = matches.length - 1; i >= 0; i--) {
-        const match = matches[i];
-        const loaderData = match.loaderData;
-        if (loaderData && "weaverseData" in loaderData) {
-          return loaderData.weaverseData;
-        }
-      }
+    const ownLoaderData = reactRouter.useLoaderData();
+    const weaverseData = react$1.useMemo(
+      () => pickWeaverseData(dataProp, ownLoaderData, matches),
+      [dataProp, ownLoaderData, matches]
+    );
+    if (dataProp === null) {
       return null;
-    }, [matches]);
+    }
     if (weaverseData) {
       if (weaverseData instanceof Promise) {
         return /* @__PURE__ */ jsxRuntime.jsx(reactErrorBoundary.ErrorBoundary, { fallbackRender: ErrorComponent, children: /* @__PURE__ */ jsxRuntime.jsx(react$1.Suspense, { children: /* @__PURE__ */ jsxRuntime.jsx(reactRouter.Await, { resolve: weaverseData, children: (resolvedData) => /* @__PURE__ */ jsxRuntime.jsx(
@@ -1355,7 +1377,7 @@ var WeaverseClient = class {
       const { projectId, weaverseHost } = this.configs;
       const i18n = this.storefront.i18n;
       if (!(projectId && weaverseHost)) {
-        return void 0;
+        return;
       }
       const language = (i18n?.language || "en").toLowerCase();
       const country = (i18n?.country || "us").toLowerCase();
@@ -1374,13 +1396,13 @@ var WeaverseClient = class {
       if (typeof overrides === "object" && overrides !== null) {
         return overrides;
       }
-      return void 0;
+      return;
     } catch (error) {
       console.warn(
         "Unable to load merchant overrides, using theme defaults:",
         this.extractErrorMessage(error)
       );
-      return void 0;
+      return;
     }
   };
   /**
@@ -1405,6 +1427,49 @@ var WeaverseClient = class {
       ]
     };
   };
+  /**
+   * Fetch all published custom pages for sitemap generation.
+   * Paginates automatically, never throws, returns accumulated results on partial failure.
+   */
+  async fetchCustomPages(opts) {
+    const { weaverseHost, projectId } = this.configs;
+    const entries = [];
+    const MAX_PAGES = 100;
+    let cursor = null;
+    for (let i = 0; i < MAX_PAGES; i++) {
+      const params = new URLSearchParams();
+      if (opts?.locale) {
+        params.set("locale", opts.locale);
+      }
+      if (opts?.limit) {
+        params.set("limit", String(opts.limit));
+      }
+      if (cursor) {
+        params.set("cursor", cursor);
+      }
+      const qs = params.toString();
+      const url = `${weaverseHost}/api/public/v1/projects/${projectId}/custom-pages${qs ? `?${qs}` : ""}`;
+      try {
+        const result = await this.fetchWithCache(url);
+        entries.push(...result.data || []);
+        if (!result.nextCursor) {
+          return entries;
+        }
+        cursor = result.nextCursor;
+      } catch (err) {
+        const status = err?.status;
+        const msg = err?.message || String(err);
+        console.warn(
+          entries.length === 0 ? `[Weaverse] Failed to fetch custom pages: ${msg}${status ? ` (HTTP ${status})` : ""}` : `[Weaverse] Custom pages pagination interrupted: ${msg}`
+        );
+        return entries;
+      }
+    }
+    console.warn(
+      "[Weaverse] Custom pages pagination cap reached (100 iterations)"
+    );
+    return entries;
+  }
   /**
    * Load page data from Weaverse API with optional route-level project override.
    * Fetches page content, executes component loaders, and handles empty items fallback.
@@ -1516,7 +1581,9 @@ var WeaverseClient = class {
         };
       }
       if (!page) {
-        page = this.generateFallbackPage("Please add new section to start.");
+        page = this.generateFallbackPage(
+          '<div style="text-align: center;">Please add new section to start.</div>'
+        );
       }
       if (page?.items?.length === 0) {
         page.items.push({