@weaverse/hydrogen 5.8.0 → 5.8.2

package/dist/index.d.mts

@@ -4,7 +4,8 @@ export { PositionInputValue, WeaverseImage, WeaverseVideo, isBrowser, isIframe,
 import { PageType, InspectorGroup, SchemaType, ComponentPresets, SchemaValidationResult } from '@weaverse/schema';
 export * from '@weaverse/schema';
 export { BasicInput, HeadingInput, InputType, InspectorGroup, PageType, SchemaValidationIssue, SchemaValidationResult } from '@weaverse/schema';
-import { createWithCache, I18nBase, HydrogenContext, HydrogenEnv } from '@shopify/hydrogen';
+import { createWithCache, CachingStrategy, I18nBase, HydrogenContext, HydrogenEnv } from '@shopify/hydrogen';
+export { CachingStrategy } from '@shopify/hydrogen';
 import { LoaderFunctionArgs, AppLoadContext } from '@shopify/remix-oxygen';
 import * as React$1 from 'react';
 import { ComponentType, JSX, ForwardRefExoticComponent } from 'react';
@@ -164,21 +165,14 @@ declare class WeaverseClient {
     private isLocalhost;
     private getApiUrl;
     fetchWithCache: <T = unknown>(url: string, options?: RequestInit & {
-        strategy?: AllCacheOptions;
+        strategy?: CachingStrategy;
     }) => Promise<T>;
-    loadThemeSettings: (strategy?: AllCacheOptions) => Promise<ThemeSettingsResponse>;
+    loadThemeSettings: (strategy?: CachingStrategy) => Promise<ThemeSettingsResponse>;
     generateFallbackPage: (message: string) => HydrogenPageData;
     loadPage: (params?: LoadPageParams) => Promise<WeaverseLoaderData | null>;
     execComponentLoader: (item: HydrogenComponentData) => Promise<HydrogenComponentData>;
 }
 
-type AllCacheOptions = {
-    mode?: 'must-revalidate' | 'no-cache' | 'no-store' | 'private' | 'public' | string;
-    maxAge?: number;
-    staleWhileRevalidate?: number;
-    sMaxAge?: number;
-    staleIfError?: number;
-};
 type ComponentLoaderArgs<T = any, _E = any> = {
     data: T;
     weaverse: WeaverseClient;
@@ -294,6 +288,11 @@ type HydrogenPageAssignment = {
     type: PageType;
     handle: string;
     locale: string;
+    meta?: {
+        inherited: boolean;
+        sourceProjectId: string;
+        depth: number;
+    };
 };
 type WeaverseLoaderData = {
     configs: Omit<WeaverseProjectConfigs, 'publicEnv'> & {
@@ -655,7 +654,7 @@ type LoadPageParams = {
      * - Long-lived cache for static pages (1 hour+)
      * - Short-lived cache for frequently updated content (5 minutes)
      */
-    strategy?: AllCacheOptions;
+    strategy?: CachingStrategy;
     /**
      * Optional project override for this specific page load.
      *
@@ -775,4 +774,4 @@ declare const IMAGES_PLACEHOLDERS: {
     product_18: string;
 };
 
-export { type AllCacheOptions, type CacheResponseValidator, 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, 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, createWeaverseDataContext, defaultComponents, generateDataFromSchema, getPreviewData, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, hasError, isFetchProjectPayload, isProjectIdFunction, isThemeSettingsResponse, isValidHydrogenSchema, isWithCacheFetchResponse, registerComponent, useThemeSettings, useWeaverseDataContext, withWeaverse };
+export { type CacheResponseValidator, 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, 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, createWeaverseDataContext, defaultComponents, generateDataFromSchema, getPreviewData, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, hasError, isFetchProjectPayload, isProjectIdFunction, isThemeSettingsResponse, isValidHydrogenSchema, isWithCacheFetchResponse, registerComponent, useThemeSettings, useWeaverseDataContext, withWeaverse };

package/dist/index.d.ts

@@ -4,7 +4,8 @@ export { PositionInputValue, WeaverseImage, WeaverseVideo, isBrowser, isIframe,
 import { PageType, InspectorGroup, SchemaType, ComponentPresets, SchemaValidationResult } from '@weaverse/schema';
 export * from '@weaverse/schema';
 export { BasicInput, HeadingInput, InputType, InspectorGroup, PageType, SchemaValidationIssue, SchemaValidationResult } from '@weaverse/schema';
-import { createWithCache, I18nBase, HydrogenContext, HydrogenEnv } from '@shopify/hydrogen';
+import { createWithCache, CachingStrategy, I18nBase, HydrogenContext, HydrogenEnv } from '@shopify/hydrogen';
+export { CachingStrategy } from '@shopify/hydrogen';
 import { LoaderFunctionArgs, AppLoadContext } from '@shopify/remix-oxygen';
 import * as React$1 from 'react';
 import { ComponentType, JSX, ForwardRefExoticComponent } from 'react';
@@ -164,21 +165,14 @@ declare class WeaverseClient {
     private isLocalhost;
     private getApiUrl;
     fetchWithCache: <T = unknown>(url: string, options?: RequestInit & {
-        strategy?: AllCacheOptions;
+        strategy?: CachingStrategy;
     }) => Promise<T>;
-    loadThemeSettings: (strategy?: AllCacheOptions) => Promise<ThemeSettingsResponse>;
+    loadThemeSettings: (strategy?: CachingStrategy) => Promise<ThemeSettingsResponse>;
     generateFallbackPage: (message: string) => HydrogenPageData;
     loadPage: (params?: LoadPageParams) => Promise<WeaverseLoaderData | null>;
     execComponentLoader: (item: HydrogenComponentData) => Promise<HydrogenComponentData>;
 }
 
-type AllCacheOptions = {
-    mode?: 'must-revalidate' | 'no-cache' | 'no-store' | 'private' | 'public' | string;
-    maxAge?: number;
-    staleWhileRevalidate?: number;
-    sMaxAge?: number;
-    staleIfError?: number;
-};
 type ComponentLoaderArgs<T = any, _E = any> = {
     data: T;
     weaverse: WeaverseClient;
@@ -294,6 +288,11 @@ type HydrogenPageAssignment = {
     type: PageType;
     handle: string;
     locale: string;
+    meta?: {
+        inherited: boolean;
+        sourceProjectId: string;
+        depth: number;
+    };
 };
 type WeaverseLoaderData = {
     configs: Omit<WeaverseProjectConfigs, 'publicEnv'> & {
@@ -655,7 +654,7 @@ type LoadPageParams = {
      * - Long-lived cache for static pages (1 hour+)
      * - Short-lived cache for frequently updated content (5 minutes)
      */
-    strategy?: AllCacheOptions;
+    strategy?: CachingStrategy;
     /**
      * Optional project override for this specific page load.
      *
@@ -775,4 +774,4 @@ declare const IMAGES_PLACEHOLDERS: {
     product_18: string;
 };
 
-export { type AllCacheOptions, type CacheResponseValidator, 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, 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, createWeaverseDataContext, defaultComponents, generateDataFromSchema, getPreviewData, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, hasError, isFetchProjectPayload, isProjectIdFunction, isThemeSettingsResponse, isValidHydrogenSchema, isWithCacheFetchResponse, registerComponent, useThemeSettings, useWeaverseDataContext, withWeaverse };
+export { type CacheResponseValidator, 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, 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, createWeaverseDataContext, defaultComponents, generateDataFromSchema, getPreviewData, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, hasError, isFetchProjectPayload, isProjectIdFunction, isThemeSettingsResponse, isValidHydrogenSchema, isWithCacheFetchResponse, registerComponent, useThemeSettings, useWeaverseDataContext, withWeaverse };

package/dist/index.js

@@ -354,15 +354,14 @@ function useStudio(weaverse) {
   usePixel(weaverse);
 }
 function usePixel(context) {
-  let { projectId, pageId, isDesignMode } = context;
+  let { projectId, pageId, isDesignMode, weaverseHost } = context;
   react$1.useEffect(() => {
     if (!(projectId && pageId) || isDesignMode) {
       return;
     }
-    let url = "https://edge-usage-tracking-worker.weaverse.workers.dev/api/public/px";
     let img = new Image();
     img.onload = () => img.remove();
-    img.src = `${url}?projectId=${projectId}&pageId=${pageId}`;
+    img.src = `${weaverseHost}/api/public/px?projectId=${projectId}&pageId=${pageId}`;
   }, []);
 }
 var WeaverseHydrogenItem = class extends react.WeaverseItemStore {
@@ -590,8 +589,11 @@ var WeaverseClient = class {
    * Throws WeaverseError if projectId cannot be resolved.
    */
   initializeConfigs(args) {
-    let baseConfigs = getWeaverseConfigs(args.request, args.env);
-    let resolvedProjectId = this.resolveProjectIdSync(
+    const baseConfigs = getWeaverseConfigs(
+      args.request,
+      args.env
+    );
+    const resolvedProjectId = this.resolveProjectIdSync(
       args.projectId,
       args.request,
       args.env,
@@ -690,7 +692,7 @@ var WeaverseClient = class {
         error: "Project ID cannot be empty"
       };
     }
-    let validPattern = /^[a-zA-Z0-9_-]+$/;
+    const validPattern = /^[a-zA-Z0-9_-]+$/;
     if (!validPattern.test(projectId)) {
       return {
         valid: false,
@@ -717,7 +719,7 @@ var WeaverseClient = class {
    * Used for design mode and preview mode overrides.
    */
   resolveFromQueryParams(request) {
-    let queries = getRequestQueries(request);
+    const queries = getRequestQueries(request);
     return queries.weaverseProjectId || null;
   }
   /**
@@ -735,7 +737,7 @@ var WeaverseClient = class {
       );
     }
     try {
-      let result = projectId();
+      const result = projectId();
       if (result instanceof Promise) {
         throw new WeaverseError(
           "Async projectId functions must be awaited before passing to WeaverseClient. Use: projectId: await getProjectAsync() instead of: projectId: getProjectAsync",
@@ -743,8 +745,8 @@ var WeaverseClient = class {
         );
       }
       if (result && result.trim() !== "") {
-        let trimmed = result.trim();
-        let validation = this.validateProjectId(trimmed);
+        const trimmed = result.trim();
+        const validation = this.validateProjectId(trimmed);
         if (validation.valid) {
           return trimmed;
         }
@@ -773,11 +775,11 @@ var WeaverseClient = class {
     if (typeof projectId !== "string") {
       return null;
     }
-    let trimmed = projectId.trim();
+    const trimmed = projectId.trim();
     if (trimmed === "") {
       return null;
     }
-    let validation = this.validateProjectId(trimmed);
+    const validation = this.validateProjectId(trimmed);
     if (validation.valid) {
       return trimmed;
     }
@@ -790,7 +792,7 @@ var WeaverseClient = class {
    * Priority 4: Resolve projectId from environment variables.
    */
   resolveFromEnvironment(baseConfigs, request, env) {
-    let configs = baseConfigs || getWeaverseConfigs(request, env);
+    const configs = baseConfigs || getWeaverseConfigs(request, env);
     if (configs.projectId && configs.projectId.trim() !== "") {
       return configs.projectId.trim();
     }
@@ -802,18 +804,18 @@ var WeaverseClient = class {
    * Includes 10-second timeout to prevent hanging requests.
    */
   directFetch = async (url, options = {}, timeoutMs = this.fetchTimeoutMs) => {
-    let controller = new AbortController();
-    let timeoutId = setTimeout(
+    const controller = new AbortController();
+    const timeoutId = setTimeout(
       () => controller.abort(),
       timeoutMs
     );
     try {
-      let response = await fetch(url, {
+      const response = await fetch(url, {
         ...options,
         signal: controller.signal
       });
       if (!response.ok) {
-        let errorText = await response.text();
+        const errorText = await response.text();
         throw new WeaverseError(
           `HTTP ${response.status}: ${response.statusText}`,
           "FETCH_ERROR",
@@ -821,7 +823,7 @@ var WeaverseClient = class {
           { url, errorText }
         );
       }
-      let data = await response.json();
+      const data = await response.json();
       return { data, response };
     } catch (err) {
       if (err instanceof WeaverseError) {
@@ -849,7 +851,7 @@ var WeaverseClient = class {
   };
   // Helper method to detect if request is from localhost
   isLocalhost() {
-    let hostname = this.parsedUrl.hostname;
+    const hostname = this.parsedUrl.hostname;
     return hostname === "localhost" || hostname === "127.0.0.1";
   }
   // Helper method for building API URLs consistently
@@ -861,7 +863,7 @@ var WeaverseClient = class {
     return `${weaverseHost}/api/public/${endpoint}`;
   }
   fetchWithCache = async (url, options = {}) => {
-    const strategy = options.strategy || this.storefront.CacheCustom(DEFAULT_CACHE_STRATEGY);
+    const strategy = options.strategy || hydrogen.CacheCustom(DEFAULT_CACHE_STRATEGY);
     const cacheKey = [
       "weaverse-fetch",
       url,
@@ -885,15 +887,15 @@ var WeaverseClient = class {
     return result.data;
   };
   loadThemeSettings = async (strategy) => {
-    let defaultThemeSettings = generateDataFromSchema(this.themeSchema);
+    const defaultThemeSettings = generateDataFromSchema(this.themeSchema);
     try {
-      let { configs } = this;
-      let { projectId, isDesignMode } = configs;
+      const { configs } = this;
+      const { projectId, isDesignMode } = configs;
       if (!projectId) {
         throw new Error("Missing Weaverse projectId!");
       }
-      let url = this.getApiUrl("project_configs");
-      let body = JSON.stringify({ isDesignMode, projectId });
+      const url = this.getApiUrl("project_configs");
+      const body = JSON.stringify({ isDesignMode, projectId });
       let data = await this.fetchWithCache(url, {
         method: "POST",
         strategy,
@@ -949,8 +951,8 @@ var WeaverseClient = class {
       }
       return data;
     } catch (error) {
-      let errorMessage = "Unable to load theme settings";
-      let errorDetails = this.extractErrorMessage(error);
+      const errorMessage = "Unable to load theme settings";
+      const errorDetails = this.extractErrorMessage(error);
       console.error(errorMessage, errorDetails);
       return {
         theme: defaultThemeSettings,
@@ -960,7 +962,7 @@ var WeaverseClient = class {
     }
   };
   generateFallbackPage = (message) => {
-    let rootId = crypto.randomUUID();
+    const rootId = crypto.randomUUID();
     return {
       id: `fallback_page_${Date.now()}`,
       rootId,
@@ -976,8 +978,8 @@ var WeaverseClient = class {
   };
   loadPage = async (params = {}) => {
     try {
-      let { request, storefront, basePageRequestBody, basePageConfigs } = this;
-      let {
+      const { request, storefront, basePageRequestBody, basePageConfigs } = this;
+      const {
         projectId: clientProjectId,
         weaverseHost,
         isPreviewMode,
@@ -990,7 +992,7 @@ var WeaverseClient = class {
           );
           return null;
         }
-        let validation = this.validateProjectId(params.projectId);
+        const validation = this.validateProjectId(params.projectId);
         if (!validation.valid) {
           console.error(
             `Route-level projectId validation failed: ${validation.error}`
@@ -998,22 +1000,22 @@ var WeaverseClient = class {
           return null;
         }
       }
-      let effectiveProjectId = params.projectId || clientProjectId;
+      const effectiveProjectId = params.projectId || clientProjectId;
       if (isPreviewMode) {
         return getPreviewData(sectionType || "", this.components, weaverseHost);
       }
       if (!effectiveProjectId) {
         throw new Error("Missing Weaverse projectId!");
       }
-      let { strategy, ...pageLoadParams } = params;
-      let body = {
+      const { strategy, ...pageLoadParams } = params;
+      const body = {
         ...basePageRequestBody,
         projectId: effectiveProjectId,
         // Use effective (potentially overridden) projectId
         params: pageLoadParams,
         url: request.url
       };
-      let reqInit = {
+      const reqInit = {
         method: "POST",
         body: JSON.stringify(body),
         headers: {
@@ -1022,14 +1024,15 @@ var WeaverseClient = class {
           "Accept-Encoding": "gzip, deflate, br"
         }
       };
-      let url = this.getApiUrl("project");
-      let projectData = await this.fetchWithCache(url, {
+      const url = this.getApiUrl("project");
+      const projectData = await this.fetchWithCache(url, {
         ...reqInit,
         strategy
       });
       if (hasError(projectData)) {
         throw new Error(projectData.error);
       }
+      console.log("projectData", projectData);
       let page;
       let project;
       let pageAssignment;
@@ -1042,7 +1045,7 @@ var WeaverseClient = class {
           "Invalid project data structure received from API, using fallback data",
           { projectId: effectiveProjectId }
         );
-        let responseData = projectData;
+        const responseData = projectData;
         page = responseData?.page;
         project = responseData?.project;
         pageAssignment = responseData?.pageAssignment;
@@ -1059,7 +1062,7 @@ var WeaverseClient = class {
         page = this.generateFallbackPage("Please add new section to start.");
       }
       if (page?.items) {
-        let items = page.items;
+        const items = page.items;
         page.items = await Promise.all(items.map(this.execComponentLoader));
       }
       return {
@@ -1077,8 +1080,8 @@ var WeaverseClient = class {
         }
       };
     } catch (error) {
-      let errorMessage = "\u274C Page load failed";
-      let errorContext = {
+      const errorMessage = "\u274C Page load failed";
+      const errorContext = {
         url: this.request.url,
         projectId: params.projectId || this.configs.projectId
       };
@@ -1105,9 +1108,9 @@ var WeaverseClient = class {
     }
   };
   execComponentLoader = async (item) => {
-    let { data = {}, type, id } = item;
-    let component = this.componentsByType.get(type);
-    let loader = component?.loader;
+    const { data = {}, type, id } = item;
+    const component = this.componentsByType.get(type);
+    const loader = component?.loader;
     if (typeof loader === "function" && component) {
       try {
         return {