@weaverse/next 0.1.0-alpha.18 → 0.1.0-alpha.19

package/dist/server.js

@@ -150,6 +150,82 @@ function getWeaverseNextConfigs(context, options = {}) {
   };
 }
 
+// src/request-info.ts
+function toUrl2(value) {
+  return typeof value === "string" ? new URL(value, "http://localhost") : value;
+}
+function getSearchParamsFromContext(context) {
+  if (context?.searchParams) {
+    return new URLSearchParams(context.searchParams);
+  }
+  if (context?.url) {
+    let url = toUrl2(context.url);
+    return new URLSearchParams(url.searchParams);
+  }
+  return new URLSearchParams();
+}
+function withPathPrefix(pathname, i18n) {
+  let raw = typeof i18n?.pathPrefix === "string" ? i18n.pathPrefix : "";
+  let segments = raw.split("/").filter(Boolean);
+  let prefix = segments.length > 0 ? `/${segments.join("/")}` : "";
+  if (prefix === "" || pathname === prefix || pathname.startsWith(`${prefix}/`)) {
+    return pathname;
+  }
+  return pathname === "/" ? prefix : `${prefix}${pathname}`;
+}
+function getPathnameFromContext(context) {
+  if (context?.pathname) {
+    return withPathPrefix(context.pathname, context.i18n);
+  }
+  if (context?.url) {
+    let url = toUrl2(context.url);
+    return withPathPrefix(url.pathname || "/", context.i18n);
+  }
+  return "/";
+}
+function coerceQueryValue(value) {
+  if (value === "true") {
+    return true;
+  }
+  if (value === "false") {
+    return false;
+  }
+  return value;
+}
+function toQueryRecord(searchParams) {
+  let queries = {};
+  for (let [key, value] of searchParams.entries()) {
+    queries[key] = coerceQueryValue(value);
+  }
+  return queries;
+}
+var TRANSIENT_STUDIO_PARAMS = /* @__PURE__ */ new Set([
+  "weaverseDraftItem",
+  // Legacy name from the original design-mode draft-item spike. Keep it out of
+  // runtime requestInfo too, in case an older Builder bundle is in front of a
+  // newer Next storefront.
+  "__weaverseDraftItem"
+]);
+function getRequestInfoSearchParams(context) {
+  let searchParams = new URLSearchParams(getSearchParamsFromContext(context));
+  for (let key of TRANSIENT_STUDIO_PARAMS) {
+    searchParams.delete(key);
+  }
+  return searchParams;
+}
+function buildWeaverseNextRequestInfo(context) {
+  let searchParams = getRequestInfoSearchParams(context);
+  let search = searchParams.toString();
+  return {
+    pathname: getPathnameFromContext(context),
+    search: search ? `?${search}` : "",
+    queries: toQueryRecord(searchParams),
+    ...context?.i18n ? { i18n: context.i18n } : {},
+    ...context?.pageType ? { pageType: context.pageType } : {},
+    ...context?.handle ? { handle: context.handle } : {}
+  };
+}
+
 // src/server/normalize-page-url.ts
 var KEPT_PARAM_RE = /^(?:__revisionId|__weaverseDraftItem|isDesignMode|weaverse)/;
 var DATA_SUFFIX = ".data";
@@ -175,9 +251,16 @@ function normalizeNextPageUrl(url) {
 }
 function resolveRequestUrl(context) {
   if (context?.url) {
-    return typeof context.url === "string" ? context.url : context.url.toString();
+    let raw = String(context.url);
+    let url = new URL(raw, "http://localhost");
+    let pathname2 = withPathPrefix(url.pathname, context.i18n);
+    if (pathname2 === url.pathname) {
+      return raw;
+    }
+    url.pathname = pathname2;
+    return url.toString();
   }
-  let pathname = context?.pathname || "/";
+  let pathname = withPathPrefix(context?.pathname || "/", context?.i18n);
   let search = context?.searchParams ? new URLSearchParams(context.searchParams).toString() : "";
   return `http://localhost${pathname}${search ? `?${search}` : ""}`;
 }
@@ -512,73 +595,6 @@ async function runWeaverseComponentLoaders(args) {
   return data;
 }
 
-// src/request-info.ts
-function toUrl2(value) {
-  return typeof value === "string" ? new URL(value, "http://localhost") : value;
-}
-function getSearchParamsFromContext(context) {
-  if (context?.searchParams) {
-    return new URLSearchParams(context.searchParams);
-  }
-  if (context?.url) {
-    let url = toUrl2(context.url);
-    return new URLSearchParams(url.searchParams);
-  }
-  return new URLSearchParams();
-}
-function getPathnameFromContext(context) {
-  if (context?.pathname) {
-    return context.pathname;
-  }
-  if (context?.url) {
-    let url = toUrl2(context.url);
-    return url.pathname || "/";
-  }
-  return "/";
-}
-function coerceQueryValue(value) {
-  if (value === "true") {
-    return true;
-  }
-  if (value === "false") {
-    return false;
-  }
-  return value;
-}
-function toQueryRecord(searchParams) {
-  let queries = {};
-  for (let [key, value] of searchParams.entries()) {
-    queries[key] = coerceQueryValue(value);
-  }
-  return queries;
-}
-var TRANSIENT_STUDIO_PARAMS = /* @__PURE__ */ new Set([
-  "weaverseDraftItem",
-  // Legacy name from the original design-mode draft-item spike. Keep it out of
-  // runtime requestInfo too, in case an older Builder bundle is in front of a
-  // newer Next storefront.
-  "__weaverseDraftItem"
-]);
-function getRequestInfoSearchParams(context) {
-  let searchParams = new URLSearchParams(getSearchParamsFromContext(context));
-  for (let key of TRANSIENT_STUDIO_PARAMS) {
-    searchParams.delete(key);
-  }
-  return searchParams;
-}
-function buildWeaverseNextRequestInfo(context) {
-  let searchParams = getRequestInfoSearchParams(context);
-  let search = searchParams.toString();
-  return {
-    pathname: getPathnameFromContext(context),
-    search: search ? `?${search}` : "",
-    queries: toQueryRecord(searchParams),
-    ...context?.i18n ? { i18n: context.i18n } : {},
-    ...context?.pageType ? { pageType: context.pageType } : {},
-    ...context?.handle ? { handle: context.handle } : {}
-  };
-}
-
 // src/server/server-client.ts
 var DEFAULT_FETCH_TIMEOUT_MS = 1e4;
 var RANDOM_ID_RADIX = 36;