@weaverse/next 0.1.0-alpha.2 → 0.1.0-alpha.20

package/dist/index.mjs

@@ -1,20 +1,108 @@
-import { buildWeaverseNextRequestInfo, generateDataFromSchema } from './chunk-SS6QUKYY.mjs';
-export { buildWeaverseNextRequestInfo, runWeaverseComponentLoaders } from './chunk-SS6QUKYY.mjs';
-import { WeaverseRoot, Weaverse, WeaverseItemStore } from '@weaverse/react';
+import { buildWeaverseNextRequestInfo, DEFAULT_REVALIDATE_ENDPOINT, revalidateWeaverseNextItem, generateDataFromSchema } from './chunk-LH6AAEIK.mjs';
+export { DEFAULT_REVALIDATE_ENDPOINT, buildWeaverseNextRequestInfo, buildWeaverseNextRevalidateRouteContext, formatWeaverseNextSeoMetadata, generateDataFromSchema, getWeaverseNextSeoMetadata, revalidateWeaverseNextItem, runWeaverseComponentLoaders } from './chunk-LH6AAEIK.mjs';
+import { WeaverseRoot, Weaverse, WeaverseItemStore, useSafeExternalStore } from '@weaverse/react';
 export { isBrowser, isIframe, useChildInstances, useItemInstance, useParentInstance, useWeaverse } from '@weaverse/react';
 import { createSchema } from '@weaverse/schema';
-export { createSchema } from '@weaverse/schema';
+export * from '@weaverse/schema';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
-import { createContext, memo, useContext, useMemo, useRef, useEffect, useSyncExternalStore } from 'react';
+import { createContext, memo, useContext, useMemo, useEffect, useLayoutEffect, useRef, useSyncExternalStore } from 'react';
 import { useRouter } from 'next/navigation';
 
+function flattenItemData(update) {
+  let { data, ...rest } = update;
+  if (!(data && typeof data === "object" && !Array.isArray(data))) {
+    return rest;
+  }
+  return { ...data, ...rest };
+}
+var deferredItemUpdates = null;
+function collectDeferredItemUpdates(create) {
+  let previousQueue = deferredItemUpdates;
+  let queue = /* @__PURE__ */ new Set();
+  deferredItemUpdates = queue;
+  try {
+    return [create(), [...queue]];
+  } finally {
+    deferredItemUpdates = previousQueue;
+  }
+}
 var WeaverseNextItem = class extends WeaverseItemStore {
+  /**
+   * Cached merged snapshot (base `_store` + translations). Reset whenever the
+   * `_store` ref or the item's translation entry ref changes, so
+   * `useSyncExternalStore` sees a stable object between unrelated re-renders.
+   */
+  _cachedSnapshot = null;
+  _snapshotStoreRef = null;
+  _snapshotTranslationRef = null;
+  /** Create an item store from serialized component data and its runtime. */
   constructor(initialData, weaverse) {
     super(initialData, weaverse);
-    let { data, ...rest } = initialData;
     let schemaData = generateDataFromSchema(this.Element?.schema);
-    Object.assign(this._store, schemaData, data, rest);
+    Object.assign(this._store, schemaData, flattenItemData(initialData));
   }
+  /**
+   * Flatten nested `data` on updates exactly like the constructor does. Core's
+   * `initProject()` calls `setData(item)` when a new runtime serves a page
+   * whose item instances already exist (e.g. locale/client navigation).
+   *
+   * A complete serialized item (it carries `id` and `type`; core's
+   * `initProject()` always passes one) replaces the store the way the
+   * constructor builds it: the schema defaults of the item's own `type` — the
+   * Builder can replace a section in place, keeping its id — then the item's
+   * settings. A payload omits a setting — or the whole optional `data` — when
+   * its value equals the schema default, so merging into the previous store
+   * would keep the previous locale's value visible. Partial updates still
+   * merge. Either way the `_store` ref changes, which invalidates the memoized
+   * snapshot below. The subscriber emit is queued instead of fired when a
+   * render-phase deferral is active (see `collectDeferredItemUpdates`).
+   */
+  setData = (update) => {
+    if ("id" in update && "type" in update) {
+      let { data, type } = update;
+      let schema = this.weaverse.elementRegistry.get(type)?.schema;
+      this._store = {
+        ...generateDataFromSchema(schema),
+        ...data === void 0 ? {} : { data },
+        ...flattenItemData(update)
+      };
+    } else {
+      this.data = flattenItemData(update);
+    }
+    if (deferredItemUpdates) {
+      deferredItemUpdates.add(this);
+    } else {
+      this.triggerUpdate();
+    }
+    return this.data;
+  };
+  /**
+   * Overlay item-level translations onto the base store when the runtime is in
+   * translation mode. Mirrors Hydrogen's `WeaverseHydrogenItem.getSnapShot()`:
+   * memoized by `_store` ref + translation entry ref so the returned object is
+   * referentially stable, and a fast path that returns the base store untouched
+   * when the item has no translations.
+   */
+  getSnapShot = () => {
+    let base = this._store;
+    let translations = this.weaverse.translationMap[this._id];
+    if (!translations) {
+      return base;
+    }
+    if (this._cachedSnapshot && this._snapshotStoreRef === base && this._snapshotTranslationRef === translations) {
+      return this._cachedSnapshot;
+    }
+    let merged = { ...base };
+    for (let [key, entry] of Object.entries(translations)) {
+      if (entry.translatedValue !== void 0) {
+        merged[key] = entry.translatedValue;
+      }
+    }
+    this._cachedSnapshot = merged;
+    this._snapshotStoreRef = base;
+    this._snapshotTranslationRef = translations;
+    return merged;
+  };
 };
 function ensureNextItemConstructor() {
   if (!Weaverse.ItemConstructor || Weaverse.ItemConstructor === WeaverseItemStore || Weaverse.ItemConstructor === WeaverseNextItem) {
@@ -139,30 +227,264 @@ function createWeaverseNextThemeSettingsStore(options = {}) {
   };
   return store;
 }
+function getNestedKey(obj, path, fallback) {
+  let keys = path.split(".");
+  let current = obj;
+  for (let key of keys) {
+    if (current == null || typeof current !== "object") {
+      return fallback;
+    }
+    current = current[key];
+  }
+  if (typeof current === "string") {
+    return current;
+  }
+  return fallback;
+}
+function interpolate(template, variables) {
+  if (!variables) {
+    return template;
+  }
+  return template.replace(/\{\{(\w+)\}\}/g, (match, key) => {
+    let value = variables[key];
+    return value === void 0 ? match : String(value);
+  });
+}
+var TranslationContext = createContext(null);
+TranslationContext.displayName = "WeaverseNextTranslationContext";
+function createTranslate(sources) {
+  let { staticContent, merchantOverrides, designOverrides, externalT } = sources;
+  return (key, variables) => {
+    if (externalT) {
+      let external = externalT(key, variables);
+      if (external && external !== key) {
+        return external;
+      }
+    }
+    let design = designOverrides && Object.hasOwn(designOverrides, key) ? designOverrides[key] : void 0;
+    let override = merchantOverrides ? getNestedKey(merchantOverrides, key) : void 0;
+    let staticValue = getNestedKey(staticContent, key);
+    let raw = design ?? override ?? staticValue ?? key;
+    return interpolate(raw, variables);
+  };
+}
+var EMPTY = {};
+var NOOP_SUBSCRIBE = () => () => {
+};
+var NOOP_SNAPSHOT = () => EMPTY;
+function TranslationProvider({
+  staticContent,
+  merchantOverrides,
+  t: externalT,
+  translationStore,
+  themeTextStore,
+  children
+}) {
+  let store = translationStore ?? themeTextStore ?? null;
+  let designOverrides = useSafeExternalStore(
+    store?.subscribe ?? NOOP_SUBSCRIBE,
+    store?.getSnapshot ?? NOOP_SNAPSHOT,
+    store?.getServerSnapshot ?? NOOP_SNAPSHOT
+  );
+  let value = useMemo(
+    () => ({
+      t: createTranslate({
+        staticContent,
+        merchantOverrides,
+        designOverrides,
+        externalT
+      }),
+      translationStore: store,
+      // Deprecated alias — same instance, kept for backward compatibility.
+      themeTextStore: store,
+      merchantOverrides: merchantOverrides ?? null
+    }),
+    [staticContent, merchantOverrides, designOverrides, externalT, store]
+  );
+  return /* @__PURE__ */ jsx(TranslationContext.Provider, { value, children });
+}
+function useTranslation() {
+  let ctx = useContext(TranslationContext);
+  if (!ctx) {
+    throw new Error(
+      "useTranslation must be used within <TranslationProvider>. Wrap your app with <WeaverseNextRootProvider>."
+    );
+  }
+  return ctx;
+}
+var ThemeTextProvider = TranslationProvider;
+var useThemeText = useTranslation;
+
+// src/translation-store.ts
+var TranslationStore = class {
+  /** Current flat translation overrides keyed by dot path. */
+  overrides = {};
+  listeners = /* @__PURE__ */ new Set();
+  /** Replace every override and notify subscribers. */
+  setOverrides = (overrides) => {
+    this.overrides = { ...overrides };
+    this.emit();
+  };
+  /** Merge changed overrides into the current values and notify subscribers. */
+  updateOverrides = (newOverrides) => {
+    this.overrides = { ...this.overrides, ...newOverrides };
+    this.emit();
+  };
+  /** Return the current client-side override snapshot. */
+  getSnapshot = () => this.overrides;
+  /** Return the override snapshot used during server rendering. */
+  getServerSnapshot = () => this.overrides;
+  /** Subscribe to override changes and return an unsubscribe function. */
+  subscribe = (callback) => {
+    this.listeners.add(callback);
+    return () => {
+      this.listeners.delete(callback);
+    };
+  };
+  emit = () => {
+    for (const listener of Array.from(this.listeners)) {
+      try {
+        listener();
+      } catch (error) {
+        console.error("TranslationStore: Listener error", error);
+      }
+    }
+  };
+};
+var ThemeTextStore = TranslationStore;
+var WeaverseNextRootContext = createContext(null);
+function WeaverseNextRootProvider(props) {
+  let {
+    children,
+    initialThemeSettings,
+    merchantOverrides,
+    staticContent,
+    t,
+    themeSchema,
+    publicEnv
+  } = props;
+  let storeRef = useRef(null);
+  if (!storeRef.current) {
+    storeRef.current = createWeaverseNextThemeSettingsStore({
+      publicEnv,
+      schema: themeSchema,
+      settings: initialThemeSettings
+    });
+  }
+  let themeSettingsStore = storeRef.current;
+  let translationStoreRef = useRef(null);
+  if (!translationStoreRef.current) {
+    translationStoreRef.current = new TranslationStore();
+  }
+  let translationStore = translationStoreRef.current;
+  let appliedThemeSettingsRef = useRef(initialThemeSettings);
+  useEffect(() => {
+    if (initialThemeSettings && appliedThemeSettingsRef.current !== initialThemeSettings) {
+      themeSettingsStore.updateThemeSettings(initialThemeSettings);
+      appliedThemeSettingsRef.current = initialThemeSettings;
+    }
+  }, [initialThemeSettings, themeSettingsStore]);
+  let resolvedStaticContent = staticContent ?? getSchemaStaticContent(themeSchema);
+  let rootContextValue = useMemo(
+    () => ({
+      merchantOverrides,
+      staticContent: resolvedStaticContent,
+      themeSettingsStore,
+      translationStore
+    }),
+    [
+      merchantOverrides,
+      resolvedStaticContent,
+      themeSettingsStore,
+      translationStore
+    ]
+  );
+  let contextValue = useMemo(
+    () => ({
+      merchantOverrides,
+      themeSettings: themeSettingsStore.getSnapshot(),
+      themeSettingsStore,
+      translationStore
+    }),
+    [merchantOverrides, themeSettingsStore, translationStore]
+  );
+  return /* @__PURE__ */ jsx(WeaverseNextRootContext.Provider, { value: rootContextValue, children: /* @__PURE__ */ jsx(WeaverseNextContext.Provider, { value: contextValue, children: /* @__PURE__ */ jsx(
+    TranslationProvider,
+    {
+      merchantOverrides,
+      staticContent: resolvedStaticContent,
+      t,
+      translationStore,
+      children
+    }
+  ) }) });
+}
 var EMPTY_THEME_SETTINGS = {};
+var EMPTY_STATIC_CONTENT = {};
+function getSchemaStaticContent(schema) {
+  let i18n = schema?.i18n;
+  return i18n?.staticContent ?? EMPTY_STATIC_CONTENT;
+}
 var WeaverseNextContext = createContext(null);
 function WeaverseNextProvider(props) {
   let { children, client, rootData, pageData, commerce, themeSettings } = props;
+  let rootContext = useContext(WeaverseNextRootContext);
   let themeSettingsValue = themeSettings ?? client?.themeSettings ?? EMPTY_THEME_SETTINGS;
-  let themeSettingsStore = useMemo(
-    () => createWeaverseNextThemeSettingsStore({
+  let ownTranslationStoreRef = useRef(null);
+  if (!(rootContext || ownTranslationStoreRef.current)) {
+    ownTranslationStoreRef.current = new TranslationStore();
+  }
+  let translationStore = rootContext?.translationStore ?? ownTranslationStoreRef.current;
+  let staticContent = props.staticContent ?? rootContext?.staticContent ?? getSchemaStaticContent(client?.themeSchema);
+  let merchantOverrides = props.merchantOverrides ?? rootContext?.merchantOverrides;
+  let ownThemeSettingsStore = useMemo(() => {
+    if (rootContext) {
+      return null;
+    }
+    return createWeaverseNextThemeSettingsStore({
       schema: client?.themeSchema,
       settings: themeSettingsValue
-    }),
-    [client?.themeSchema, themeSettingsValue]
-  );
+    });
+  }, [rootContext, client?.themeSchema, themeSettingsValue]);
+  let themeSettingsStore = rootContext?.themeSettingsStore ?? ownThemeSettingsStore;
+  let mergedIntoRootRef = useRef(void 0);
+  useEffect(() => {
+    if (rootContext && themeSettingsValue !== EMPTY_THEME_SETTINGS && mergedIntoRootRef.current !== themeSettingsValue) {
+      rootContext.themeSettingsStore.updateThemeSettings(themeSettingsValue);
+      mergedIntoRootRef.current = themeSettingsValue;
+    }
+  }, [rootContext, themeSettingsValue]);
   let value = useMemo(
     () => ({
       client,
       rootData,
       pageData,
       commerce: commerce ?? client?.commerce,
+      merchantOverrides,
       themeSettings: themeSettingsStore.getSnapshot(),
-      themeSettingsStore
+      themeSettingsStore,
+      translationStore
     }),
-    [client, rootData, pageData, commerce, themeSettingsStore]
+    [
+      client,
+      rootData,
+      pageData,
+      commerce,
+      merchantOverrides,
+      themeSettingsStore,
+      translationStore
+    ]
   );
-  return /* @__PURE__ */ jsx(WeaverseNextContext.Provider, { value, children });
+  return /* @__PURE__ */ jsx(WeaverseNextContext.Provider, { value, children: /* @__PURE__ */ jsx(
+    TranslationProvider,
+    {
+      merchantOverrides,
+      staticContent,
+      t: props.t,
+      translationStore,
+      children
+    }
+  ) });
 }
 
 // src/hooks.ts
@@ -203,6 +525,12 @@ function getConfigString(configs, key) {
   let value = configs?.[key];
   return typeof value === "string" ? value : void 0;
 }
+function resolveModeFlag(config, key) {
+  return config.client?.requestContext?.[key] === true || config.data.configs?.[key] === true;
+}
+function resolveSectionType(config) {
+  return config.client?.requestContext?.sectionType || getConfigString(config.data.configs, "sectionType") || void 0;
+}
 function getRecordString(record, key) {
   let value = record?.[key];
   return typeof value === "string" ? value : void 0;
@@ -239,38 +567,87 @@ function registerRuntime(runtime) {
   runtimeWindow.__weaverses[runtime.pageId] = runtime;
   runtimeWindow.__weaverse = runtime;
 }
+function rebindPageItemsToRuntime(runtime) {
+  let items = runtime.data?.items;
+  if (!items) {
+    return;
+  }
+  for (let { id } of items) {
+    let instance = runtime.itemInstances.get(id);
+    if (instance && instance.weaverse !== runtime) {
+      instance.weaverse = runtime;
+    }
+  }
+}
 var WeaverseNextRuntime = class extends Weaverse {
+  /** Stable ID of the page owned by this runtime. */
   pageId;
+  /** Mutable callbacks and stores consumed by the Studio bridge. */
   internal;
+  /** Path, query, and locale metadata for Studio navigation. */
   requestInfo;
+  /** Whether this runtime renders a component preview. */
   isPreviewMode;
+  /** Whether this runtime renders a saved revision. */
   isRevisionPreview;
+  /** Component type rendered in section preview mode. */
   sectionType;
+  // ─── Item-level translation sidecar (design mode only) ─────────────
+  /**
+   * Translation map received from Builder in design mode, keyed by item ID.
+   * `WeaverseNextItem.getSnapShot()` overlays these onto the data handed to
+   * components, so translations render without mutating the base `_store`.
+   */
   translationMap = {};
-  translationLocale = "";
-  translationLanguageId = "";
+  /** Locale associated with the item-level translation sidecar. */
+  translationLocale = String();
+  /** Weaverse language ID used when saving translation changes. */
+  translationLanguageId = String();
+  /**
+   * Fresh page data captured while React was rendering. Runtime reuse happens
+   * inside the renderer's render phase (`useMemo`), where applying it through
+   * `setProjectData()` would emit item updates to `useSyncExternalStore`
+   * subscribers mid-render. The renderer applies it post-commit via
+   * `flushRenderPhaseUpdates()`. Never set on design-mode runtimes — the live
+   * Studio tree owns the page data there.
+   */
+  pendingProjectData;
+  /**
+   * Reused item instances whose data was refreshed while this runtime was
+   * constructed during render (core `initProject()` calls `setData()` on
+   * them). Their data is already fresh; only the subscriber notification was
+   * deferred to `flushRenderPhaseUpdates()`.
+   */
+  pendingItemUpdates = [];
+  /** Create a browser runtime from a loaded page and its request context. */
   constructor(config) {
     let { client, data } = config;
     let page = getRenderablePage(data);
     let configs = data.configs;
     let requestContext = client?.requestContext;
+    let isDesignMode = resolveModeFlag(config, "isDesignMode");
+    let isPreviewMode = resolveModeFlag(config, "isPreviewMode");
+    let isRevisionPreview = resolveModeFlag(config, "isRevisionPreview");
+    let sectionType = resolveSectionType(config);
     let projectId = resolveProjectId(client, data, page.id);
     ensureNextItemConstructor();
     super({
       projectId,
       data: page,
-      isDesignMode: requestContext?.isDesignMode ?? false,
+      isDesignMode,
       weaverseHost: getConfigString(configs, "weaverseHost"),
       weaverseVersion: getConfigString(configs, "weaverseVersion")
     });
     this.pageId = page.id;
     this.dataContext = resolveDataContext(config);
     this.requestInfo = buildWeaverseNextRequestInfo(requestContext);
-    this.isDesignMode = requestContext?.isDesignMode ?? false;
-    this.isPreviewMode = requestContext?.isPreviewMode ?? false;
-    this.isRevisionPreview = requestContext?.isRevisionPreview ?? false;
-    this.sectionType = requestContext?.sectionType;
+    this.isDesignMode = isDesignMode;
+    this.isPreviewMode = isPreviewMode;
+    this.isRevisionPreview = isRevisionPreview;
+    this.sectionType = sectionType;
+    let translationStore = config.translationStore ?? new TranslationStore();
     this.internal = {
+      merchantOverrides: config.merchantOverrides,
       navigate: config.navigate,
       pageAssignment: data.pageAssignment,
       project: data.project,
@@ -278,17 +655,119 @@ var WeaverseNextRuntime = class extends Weaverse {
       themeSettingsStore: config.themeSettingsStore ?? createWeaverseNextThemeSettingsStore({
         schema: client?.themeSchema,
         settings: client?.themeSettings
-      })
+      }),
+      translationStore,
+      themeTextStore: translationStore
     };
+    this.extractTranslationSidecar();
   }
-  extractTranslationSidecar = () => void 0;
+  /**
+   * Pull `translationMap` / `translationLocale` / `translationLanguageId` off
+   * the current page data (Builder attaches them in design mode). Unlike
+   * Hydrogen, this also clears the sidecar to defaults when the new page data
+   * carries none, so a reused runtime / project-data swap can't leave a stale
+   * map overlaying the fresh tree.
+   */
+  extractTranslationSidecar = () => {
+    let pageData = this.data;
+    let translationMap = pageData?.translationMap;
+    if (translationMap) {
+      this.translationMap = translationMap;
+      this.translationLocale = pageData?.translationLocale || "";
+      this.translationLanguageId = pageData?.translationLanguageId || "";
+    } else {
+      this.translationMap = {};
+      this.translationLocale = "";
+      this.translationLanguageId = "";
+    }
+  };
+  /**
+   * Replace the translation sidecar (Builder pushes this when translation data
+   * arrives or the active language changes) and refresh every item so their
+   * merged snapshots recompute.
+   */
   setTranslationSidecar = (map = {}, locale = "", languageId = "") => {
     this.translationMap = map;
     this.translationLocale = locale;
     this.translationLanguageId = languageId;
+    this.refreshAllItems();
+  };
+  /**
+   * Update a single translatable field for one item. Assigns a new per-item
+   * entry object so `WeaverseNextItem.getSnapShot()`'s translation-ref cache
+   * invalidates, then triggers only that item's subscribers.
+   */
+  updateTranslation = (itemId, key, originalValue, translatedValue) => {
+    if (!this.translationMap[itemId]) {
+      this.translationMap[itemId] = {};
+    }
+    this.translationMap[itemId] = {
+      ...this.translationMap[itemId],
+      [key]: { originalValue, translatedValue }
+    };
+    let instance = this.itemInstances.get(itemId);
+    if (instance) {
+      instance.triggerUpdate();
+    }
+  };
+  /**
+   * Collect translation changes for the save flow. Returns `undefined` unless
+   * both the locale and language ID are set and at least one entry exists;
+   * each entry key is namespaced as `data.<field>` to match Builder.
+   */
+  getTranslationChanges = () => {
+    let languageId = this.translationLanguageId;
+    if (!(this.translationLocale && languageId)) {
+      return;
+    }
+    let entries = [];
+    for (let [itemId, fields] of Object.entries(this.translationMap)) {
+      for (let [key, entry] of Object.entries(fields)) {
+        entries.push({
+          itemId,
+          key: `data.${key}`,
+          originalValue: entry.originalValue,
+          translatedValue: entry.translatedValue
+        });
+      }
+    }
+    if (entries.length === 0) {
+      return;
+    }
+    return { languageId, entries };
+  };
+  /**
+   * Re-extract the translation sidecar whenever project data is replaced (route
+   * change / non-design reuse), before rebuilding item stores. Takes the
+   * renderable page shape (`rootId` resolved) that `getRenderablePage()` and
+   * the reuse branch pass in.
+   */
+  setProjectData = (data) => {
+    this.data = data;
+    this.extractTranslationSidecar();
+    this.initProject();
+  };
+  /**
+   * Apply updates deferred off the render phase: swap in any pending page data
+   * captured on runtime reuse, then notify items whose data was refreshed
+   * during construction. The renderer calls this from a layout effect right
+   * after commit, so subscribers re-render before paint (no content flash) and
+   * without React's setState-in-render warning.
+   */
+  flushRenderPhaseUpdates = () => {
+    let pendingData = this.pendingProjectData;
+    if (pendingData) {
+      this.pendingProjectData = void 0;
+      this.setProjectData(pendingData);
+    }
+    let pendingItems = this.pendingItemUpdates;
+    if (pendingItems.length > 0) {
+      this.pendingItemUpdates = [];
+      for (let item of pendingItems) {
+        item.triggerUpdate();
+      }
+    }
   };
-  updateTranslation = () => void 0;
-  getTranslationChanges = () => void 0;
 };
 function createWeaverseNextRuntime(config) {
   let requestInfo = buildWeaverseNextRequestInfo(config.client?.requestContext);
@@ -297,19 +776,26 @@ function createWeaverseNextRuntime(config) {
   let existing = runtimeWindow?.__weaverses?.[page.id];
   let requestKey = getRuntimeKey(page.id, requestInfo);
   if (existing?.__weaverseNextRequestKey === requestKey) {
-    let nextIsDesignMode = config.client?.requestContext?.isDesignMode ?? false;
-    if (!(existing.isDesignMode || nextIsDesignMode)) {
-      existing.setProjectData(page);
+    let configs = config.data.configs;
+    let nextIsDesignMode = resolveModeFlag(config, "isDesignMode");
+    let nextIsPreviewMode = resolveModeFlag(config, "isPreviewMode");
+    let nextIsRevisionPreview = resolveModeFlag(config, "isRevisionPreview");
+    let nextSectionType = resolveSectionType(config);
+    if (existing.isDesignMode || nextIsDesignMode) {
+      existing.pendingProjectData = void 0;
+    } else {
+      existing.pendingProjectData = page;
     }
+    existing.__weaverseNextLatestData = page;
     existing.dataContext = resolveDataContext(config);
     existing.requestInfo = requestInfo;
     existing.projectId = resolveProjectId(config.client, config.data, page.id);
     existing.isDesignMode = nextIsDesignMode;
-    existing.isPreviewMode = config.client?.requestContext?.isPreviewMode ?? false;
-    existing.isRevisionPreview = config.client?.requestContext?.isRevisionPreview ?? false;
-    existing.sectionType = config.client?.requestContext?.sectionType;
-    existing.weaverseHost = getConfigString(config.data.configs, "weaverseHost") ?? existing.weaverseHost;
-    existing.weaverseVersion = getConfigString(config.data.configs, "weaverseVersion") ?? existing.weaverseVersion;
+    existing.isPreviewMode = nextIsPreviewMode;
+    existing.isRevisionPreview = nextIsRevisionPreview;
+    existing.sectionType = nextSectionType;
+    existing.weaverseHost = getConfigString(configs, "weaverseHost") ?? existing.weaverseHost;
+    existing.weaverseVersion = getConfigString(configs, "weaverseVersion") ?? existing.weaverseVersion;
     existing.internal.pageAssignment = config.data.pageAssignment;
     existing.internal.project = config.data.project;
     if (config.navigate) {
@@ -321,11 +807,21 @@ function createWeaverseNextRuntime(config) {
     if (config.themeSettingsStore) {
       existing.internal.themeSettingsStore = config.themeSettingsStore;
     }
+    if (config.translationStore) {
+      existing.internal.translationStore = config.translationStore;
+      existing.internal.themeTextStore = config.translationStore;
+    }
+    existing.internal.merchantOverrides = config.merchantOverrides;
     registerRuntime(existing);
     return existing;
   }
-  let runtime = new WeaverseNextRuntime(config);
+  let [runtime, refreshedItems] = collectDeferredItemUpdates(
+    () => new WeaverseNextRuntime(config)
+  );
+  runtime.pendingItemUpdates = refreshedItems;
+  rebindPageItemsToRuntime(runtime);
   runtime.__weaverseNextRequestKey = requestKey;
+  runtime.__weaverseNextLatestData = page;
   registerRuntime(runtime);
   return runtime;
 }
@@ -338,13 +834,16 @@ function bindWeaverseNextStudioRuntime(runtime) {
     return false;
   }
   let boundRuntime = runtime;
-  if (!boundRuntime.__weaverseNextStudioBound) {
+  let activeRuntime = studio.weaverse;
+  let activeRequestInfo = activeRuntime?.requestInfo;
+  let isActiveUrl = !activeRequestInfo || activeRequestInfo.pathname === runtime.requestInfo.pathname && activeRequestInfo.search === runtime.requestInfo.search;
+  if (!(boundRuntime.__weaverseNextStudioBound && isActiveUrl)) {
     studio.init?.(runtime);
     boundRuntime.__weaverseNextStudioBound = true;
     return true;
   }
   studio.refreshStudio?.({
-    data: runtime.data,
+    data: boundRuntime.__weaverseNextLatestData ?? runtime.data,
     pageId: runtime.pageId,
     requestInfo: runtime.requestInfo
   });
@@ -353,7 +852,7 @@ function bindWeaverseNextStudioRuntime(runtime) {
 var STUDIO_BIND_RETRY_INTERVAL_MS = 50;
 var STUDIO_BIND_MAX_ATTEMPTS = 100;
 function WeaverseNextStudioBridge(props) {
-  let { runtime, navigate, revalidate } = props;
+  let { runtime, navigate, revalidate, revalidateItem } = props;
   let lastRuntimeRef = useRef(runtime);
   let lastRuntimeDataRef = useRef(runtime.data);
   let lastRequestInfoRef = useRef(runtime.requestInfo);
@@ -364,6 +863,9 @@ function WeaverseNextStudioBridge(props) {
     if (revalidate) {
       runtime.internal.revalidate = revalidate;
     }
+    if (revalidateItem) {
+      runtime.internal.revalidateItem = revalidateItem;
+    }
     if (bindWeaverseNextStudioRuntime(runtime) || !runtime.isDesignMode) {
       return;
     }
@@ -375,7 +877,7 @@ function WeaverseNextStudioBridge(props) {
       }
     }, STUDIO_BIND_RETRY_INTERVAL_MS);
     return () => window.clearInterval(interval);
-  }, [runtime, navigate, revalidate]);
+  }, [runtime, navigate, revalidate, revalidateItem]);
   useEffect(() => {
     if (lastRuntimeRef.current !== runtime) {
       lastRuntimeRef.current = runtime;
@@ -428,18 +930,29 @@ function useWeaverseNextStudioInternals(options) {
   return ref.current.internals;
 }
 function WeaverseNextStudio(props) {
-  let { runtime, replace } = props;
+  let { runtime, replace, revalidateEndpoint } = props;
   let { navigate, revalidate } = useWeaverseNextStudioInternals({ replace });
+  let endpoint = revalidateEndpoint ?? DEFAULT_REVALIDATE_ENDPOINT;
+  let revalidateItemRef = useRef(null);
+  if (revalidateItemRef.current?.endpoint !== endpoint || revalidateItemRef.current.runtime !== runtime) {
+    revalidateItemRef.current = {
+      endpoint,
+      revalidateItem: (draftItem) => revalidateWeaverseNextItem(runtime, draftItem, endpoint),
+      runtime
+    };
+  }
   return /* @__PURE__ */ jsx(
     WeaverseNextStudioBridge,
     {
       navigate,
       revalidate,
+      revalidateItem: revalidateItemRef.current.revalidateItem,
       runtime
     }
   );
 }
 var EMPTY_DATA_CONTEXT = {};
+var useIsomorphicLayoutEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
 function getRenderablePage2(data) {
   let page = data?.page;
   if (!page) {
@@ -462,9 +975,22 @@ var WeaverseNextRenderer = memo(function WeaverseNextRendererComponent(props) {
       client,
       data: { ...data, page },
       dataContext,
-      themeSettingsStore: context?.themeSettingsStore
+      merchantOverrides: context?.merchantOverrides,
+      themeSettingsStore: context?.themeSettingsStore,
+      translationStore: context?.translationStore
     });
-  }, [client, page, data, dataContext, context?.themeSettingsStore]);
+  }, [
+    client,
+    page,
+    data,
+    dataContext,
+    context?.merchantOverrides,
+    context?.themeSettingsStore,
+    context?.translationStore
+  ]);
+  useIsomorphicLayoutEffect(() => {
+    weaverse?.flushRenderPhaseUpdates();
+  }, [weaverse]);
   if (!weaverse) {
     return null;
   }
@@ -537,10 +1063,9 @@ function resolveWeaverseNextStudioScriptSrc(context, options = {}) {
   if (!isTrustedStudioOrigin(origin, storefrontHostname)) {
     return null;
   }
-  let framework = options.framework ?? "hydrogen";
-  let bundle = isDesignMode ? "index.js" : "preview.js";
+  let bundle = isPreviewMode || isRevisionPreview ? "preview.js" : "index.js";
   let version = last(searchParams, "weaverseVersion");
-  let url = `${origin}/static/studio/${framework}/${bundle}`;
+  let url = `${origin}/static/studio/next/${bundle}`;
   return version ? `${url}?v=${encodeURIComponent(version)}` : url;
 }
 
@@ -564,25 +1089,30 @@ function loadScript(src) {
   document.head.appendChild(script);
   loadedScriptSrcs.add(src);
 }
+function loadWeaverseNextStudioScript(context, options = {}) {
+  let resolvedContext = context;
+  if (!resolvedContext && typeof window !== "undefined") {
+    resolvedContext = {
+      searchParams: new URLSearchParams(window.location.search),
+      url: window.location.href
+    };
+  }
+  let src = resolveWeaverseNextStudioScriptSrc(resolvedContext, {
+    storefrontHostname: options.storefrontHostname ?? (typeof window === "undefined" ? void 0 : window.location.hostname)
+  });
+  if (src) {
+    loadScript(src);
+  }
+}
 function WeaverseNextStudioConnect(props) {
   useEffect(() => {
-    let context = props.context;
-    if (!context && typeof window !== "undefined") {
-      context = {
-        searchParams: new URLSearchParams(window.location.search),
-        url: window.location.href
-      };
-    }
-    let src = resolveWeaverseNextStudioScriptSrc(context, {
-      storefrontHostname: props.storefrontHostname ?? (typeof window === "undefined" ? void 0 : window.location.hostname)
+    loadWeaverseNextStudioScript(props.context, {
+      storefrontHostname: props.storefrontHostname
     });
-    if (src) {
-      loadScript(src);
-    }
   }, [props.context, props.storefrontHostname]);
   return null;
 }
 
-export { WeaverseNextProvider, WeaverseNextRenderer, WeaverseNextRuntime, WeaverseNextStudio, WeaverseNextStudioBridge, WeaverseNextStudioConnect, bindWeaverseNextStudioRuntime, createWeaverseNextClient, createWeaverseNextRuntime, createWeaverseNextStudioInternals, createWeaverseNextThemeSettingsStore, resolveWeaverseNextStudioScriptSrc, useThemeSettings, useWeaverseCommerce, useWeaverseNextStudioInternals, useWeaversePageData, useWeaverseRootData };
+export { ThemeTextProvider, ThemeTextStore, TranslationProvider, TranslationStore, WeaverseNextProvider, WeaverseNextRenderer, WeaverseNextRootProvider, WeaverseNextRuntime, WeaverseNextStudio, WeaverseNextStudioBridge, WeaverseNextStudioConnect, bindWeaverseNextStudioRuntime, createTranslate, createWeaverseNextClient, createWeaverseNextRuntime, createWeaverseNextStudioInternals, createWeaverseNextThemeSettingsStore, getNestedKey, interpolate, loadWeaverseNextStudioScript, resolveWeaverseNextStudioScriptSrc, useThemeSettings, useThemeText, useTranslation, useWeaverseCommerce, useWeaverseNextStudioInternals, useWeaversePageData, useWeaverseRootData };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map