@riverbankcms/sdk 0.89.1 → 0.90.1

package/dist/server/index.mjs

@@ -6486,19 +6486,23 @@ function normalizeDashboardOrigin(input) {
 }
 function deriveCmsApiUrlFromDashboardUrl(input) {
   const origin = normalizeDashboardOrigin(input);
-  return origin ? `${origin}/api` : "";
+  return origin ? normalizeCmsApiBaseUrl(`${origin}/api`) : "";
+}
+function normalizeCmsApiBaseUrl(input) {
+  return input.trim().replace(/\/+$/, "").replace(/(?:\/api)+$/i, "/api");
 }
 function getCmsApiUrl() {
   if (typeof window !== "undefined") {
-    return "/api";
+    return normalizeCmsApiBaseUrl("/api");
   }
   const internalUrl = process.env.CMS_API_URL;
   if (internalUrl) {
-    return internalUrl.replace(/\/$/, "");
+    return normalizeCmsApiBaseUrl(internalUrl);
   }
   const dashboardUrl = process.env.NEXT_PUBLIC_DASHBOARD_URL;
   if (dashboardUrl) {
-    return deriveCmsApiUrlFromDashboardUrl(dashboardUrl);
+    const apiUrl = deriveCmsApiUrlFromDashboardUrl(dashboardUrl);
+    if (apiUrl) return apiUrl;
   }
   throw new Error(
     "CMS_API_URL or NEXT_PUBLIC_DASHBOARD_URL is not configured. Set NEXT_PUBLIC_DASHBOARD_URL to your dashboard URL (e.g., http://localhost:4000)"
@@ -6607,6 +6611,27 @@ function serializeQueryValue(value) {
   if (value instanceof Date) return value.toISOString();
   return null;
 }
+function normalizeHeaders(source) {
+  const normalized = {};
+  if (!source) return normalized;
+  new Headers(source).forEach((value, key) => {
+    normalized[key] = value;
+  });
+  return normalized;
+}
+function buildRequestHeaders(input) {
+  const headers = {
+    ...normalizeHeaders(input.optionsHeaders),
+    ...normalizeHeaders(input.authHeaders)
+  };
+  if (input.sdkVersion) {
+    headers["x-sdk-version"] = input.sdkVersion;
+  }
+  if (input.includeJsonContentType) {
+    headers["Content-Type"] = "application/json";
+  }
+  return headers;
+}
 function serializePathParam(endpoint, key, value) {
   if (typeof value === "string") {
     return value;
@@ -6742,104 +6767,20 @@ function createRawCMSClient(headers = {}, baseUrl) {
     params,
     options = {}
   }) => {
-    const resolvedBaseUrl = baseUrl ?? resolveApiBaseUrl();
-    let url = buildEndpointURL(resolvedBaseUrl, endpoint);
-    const originalPath = API_ENDPOINTS[endpoint].path;
-    const unusedParams = {};
-    if (params) {
-      Object.entries(params).forEach(([key, value]) => {
-        const bracePlaceholder = `{${key}}`;
-        const colonPlaceholder = `:${key}`;
-        if (originalPath.includes(bracePlaceholder) || originalPath.includes(colonPlaceholder)) {
-          const stringValue = serializePathParam(endpoint, key, value);
-          url = url.replace(bracePlaceholder, stringValue);
-          url = url.replace(colonPlaceholder, stringValue);
-        } else {
-          unusedParams[key] = value;
-        }
-      });
-    }
-    const unresolvedPathParams = [
-      ...url.match(/\{[^}]+\}/g) ?? [],
-      ...url.match(/(^|\/):([A-Za-z][A-Za-z0-9_]*)\b/g) ?? []
-    ];
-    if (unresolvedPathParams.length > 0) {
-      const missingParams = Array.from(
-        new Set(
-          unresolvedPathParams.map((token) => {
-            if (token.startsWith("{") && token.endsWith("}")) {
-              return token.slice(1, -1);
-            }
-            return token.replace(/^\//, "").slice(1);
-          })
-        )
-      );
-      throw new Error(
-        `Missing required path params for endpoint ${String(endpoint)}: ${missingParams.join(", ")}`
-      );
-    }
-    const endpointConfig = API_ENDPOINTS[endpoint];
-    const method = endpointConfig.method;
-    const isGetOrHead = method === "GET" || method === "HEAD";
-    const queryParams = new URLSearchParams();
-    Object.entries(unusedParams).forEach(([key, value]) => {
-      appendQueryParam(queryParams, key, value);
+    const plan = buildApiRequestPlan({
+      endpoint,
+      body,
+      params,
+      options,
+      headers,
+      baseUrl: normalizeCmsApiBaseUrl(baseUrl ?? resolveApiBaseUrl()),
+      sdkVersion
     });
-    if (isGetOrHead && typeof body === "object" && body !== null && !isFormDataBody(body)) {
-      Object.entries(body).forEach(([key, value]) => {
-        appendQueryParam(queryParams, key, value);
-      });
-    }
-    const queryString = queryParams.toString();
-    if (queryString) {
-      url += (url.includes("?") ? "&" : "?") + queryString;
-    }
-    const formDataBody = isFormDataBody(body) ? body : void 0;
-    const optionsNext = options?.next;
-    const nextOptions = { ...optionsNext ?? {} };
-    const cacheIsNoStore = options?.cache === "no-store";
-    if (cacheIsNoStore) {
-      delete nextOptions.revalidate;
-    } else if (isGetOrHead && nextOptions.revalidate === void 0 && "revalidate" in endpointConfig && typeof endpointConfig.revalidate === "number") {
-      nextOptions.revalidate = endpointConfig.revalidate;
-    }
-    if ("tags" in endpointConfig && Array.isArray(endpointConfig.tags)) {
-      const processedTags = endpointConfig.tags.map((tag) => {
-        let processedTag = tag;
-        if (params) {
-          Object.entries(params).forEach(([key, value]) => {
-            processedTag = processedTag.replace(`{${key}}`, String(value));
-          });
-        }
-        return /\{[^}]+\}/.test(processedTag) ? null : processedTag;
-      }).filter((tag) => tag !== null);
-      nextOptions.tags = Array.from(/* @__PURE__ */ new Set([...nextOptions.tags ?? [], ...processedTags]));
-    }
-    const requestInit = {
-      method,
-      ...options,
-      // Include credentials for same-origin requests (sends cookies for auth)
-      credentials: "same-origin",
-      // Don't include body for GET/HEAD requests
-      // FormData is pre-narrowed via isFormDataBody() above
-      body: isGetOrHead || body == null ? void 0 : formDataBody ?? JSON.stringify(body),
-      headers: {
-        ...options.headers,
-        ...headers,
-        // Include SDK version if set
-        ...sdkVersion && { "x-sdk-version": sdkVersion },
-        // Don't set Content-Type for GET/HEAD requests without body
-        ...isGetOrHead ? {} : formDataBody ? {} : { "Content-Type": "application/json" }
-      },
-      // Add Next.js caching options
-      next: Object.keys(nextOptions).length > 0 ? nextOptions : void 0
-    };
-    const fetchPromise = fetch(url, requestInit);
-    if (!isGetOrHead && "tags" in endpointConfig && Array.isArray(endpointConfig.tags)) {
-      const tags = endpointConfig.tags.map((tag) => tag);
+    const fetchPromise = fetch(plan.url, plan.init);
+    if (plan.cacheInvalidationTags) {
       return fetchPromise.then((response) => {
         if (response.ok) {
-          invalidateCacheTags(tags, params);
+          invalidateCacheTags(plan.cacheInvalidationTags, params);
         }
         return response;
       });
@@ -6847,6 +6788,100 @@ function createRawCMSClient(headers = {}, baseUrl) {
     return fetchPromise;
   };
 }
+function buildApiRequestPlan(input) {
+  const { endpoint, body, params, headers = {}, baseUrl } = input;
+  const options = input.options ?? {};
+  let url = buildEndpointURL(baseUrl, endpoint);
+  const originalPath = API_ENDPOINTS[endpoint].path;
+  const unusedParams = {};
+  if (params) {
+    Object.entries(params).forEach(([key, value]) => {
+      const bracePlaceholder = `{${key}}`;
+      const colonPlaceholder = `:${key}`;
+      if (originalPath.includes(bracePlaceholder) || originalPath.includes(colonPlaceholder)) {
+        const stringValue = serializePathParam(endpoint, key, value);
+        url = url.replace(bracePlaceholder, stringValue);
+        url = url.replace(colonPlaceholder, stringValue);
+      } else {
+        unusedParams[key] = value;
+      }
+    });
+  }
+  const unresolvedPathParams = [
+    ...url.match(/\{[^}]+\}/g) ?? [],
+    ...url.match(/(^|\/):([A-Za-z][A-Za-z0-9_]*)\b/g) ?? []
+  ];
+  if (unresolvedPathParams.length > 0) {
+    const missingParams = Array.from(
+      new Set(
+        unresolvedPathParams.map((token) => {
+          if (token.startsWith("{") && token.endsWith("}")) {
+            return token.slice(1, -1);
+          }
+          return token.replace(/^\//, "").slice(1);
+        })
+      )
+    );
+    throw new Error(
+      `Missing required path params for endpoint ${String(endpoint)}: ${missingParams.join(", ")}`
+    );
+  }
+  const endpointConfig = API_ENDPOINTS[endpoint];
+  const method = endpointConfig.method;
+  const isGetOrHead = method === "GET" || method === "HEAD";
+  const queryParams = new URLSearchParams();
+  Object.entries(unusedParams).forEach(([key, value]) => {
+    appendQueryParam(queryParams, key, value);
+  });
+  if (isGetOrHead && typeof body === "object" && body !== null && !isFormDataBody(body)) {
+    Object.entries(body).forEach(([key, value]) => {
+      appendQueryParam(queryParams, key, value);
+    });
+  }
+  const queryString = queryParams.toString();
+  if (queryString) {
+    url += (url.includes("?") ? "&" : "?") + queryString;
+  }
+  const formDataBody = isFormDataBody(body) ? body : void 0;
+  const optionsNext = options?.next;
+  const nextOptions = { ...optionsNext ?? {} };
+  const cacheIsNoStore = options?.cache === "no-store";
+  if (cacheIsNoStore) {
+    delete nextOptions.revalidate;
+  } else if (isGetOrHead && nextOptions.revalidate === void 0 && "revalidate" in endpointConfig && typeof endpointConfig.revalidate === "number") {
+    nextOptions.revalidate = endpointConfig.revalidate;
+  }
+  if ("tags" in endpointConfig && Array.isArray(endpointConfig.tags)) {
+    const processedTags = endpointConfig.tags.map((tag) => {
+      let processedTag = tag;
+      if (params) {
+        Object.entries(params).forEach(([key, value]) => {
+          processedTag = processedTag.replace(`{${key}}`, String(value));
+        });
+      }
+      return /\{[^}]+\}/.test(processedTag) ? null : processedTag;
+    }).filter((tag) => tag !== null);
+    nextOptions.tags = Array.from(/* @__PURE__ */ new Set([...nextOptions.tags ?? [], ...processedTags]));
+  }
+  const init = {
+    method,
+    ...options,
+    credentials: "same-origin",
+    body: isGetOrHead || body == null ? void 0 : formDataBody ?? JSON.stringify(body),
+    headers: buildRequestHeaders({
+      optionsHeaders: options.headers,
+      authHeaders: headers,
+      sdkVersion: input.sdkVersion,
+      includeJsonContentType: !isGetOrHead && !formDataBody
+    }),
+    ...Object.keys(nextOptions).length > 0 ? { next: nextOptions } : {}
+  };
+  return {
+    url,
+    init,
+    ...!isGetOrHead && "tags" in endpointConfig && Array.isArray(endpointConfig.tags) ? { cacheInvalidationTags: endpointConfig.tags.map((tag) => tag) } : {}
+  };
+}
 function createParsedClient(rawClient) {
   return async (params) => {
     const response = await rawClient(params);
@@ -7027,7 +7062,7 @@ var SimpleCache = class {
 };
 
 // src/version.ts
-var SDK_VERSION = "0.89.1";
+var SDK_VERSION = "0.90.1";
 
 // src/client/error.ts
 var RiverbankApiError = class _RiverbankApiError extends Error {

package/dist/server/navigation.mjs

@@ -6,10 +6,7 @@ function normalizeRenderStage(stage) {
   return stage === "preview" ? "preview" : "published";
 }
 function isRouteVisibleInStage(routeEntry, stageInput) {
-  const stage = normalizeRenderStage(stageInput);
-  if (stage === "preview" || !isRouteRecord(routeEntry)) {
-    return true;
-  }
+  if (normalizeRenderStage(stageInput) === "preview" || !isRouteRecord(routeEntry)) return true;
   const status = routeEntry.status;
   return !(typeof status === "string" && status !== "published");
 }
@@ -18,52 +15,45 @@ function extractRouteHref(candidate, stageInput = "published") {
     const trimmed = candidate.trim();
     return trimmed.length > 0 ? trimmed : null;
   }
-  if (!isRouteRecord(candidate)) {
-    return null;
-  }
-  const stage = normalizeRenderStage(stageInput);
-  const fields = stage === "preview" ? ["draftPath", "path", "href", "url"] : ["path", "href", "url"];
+  if (!isRouteRecord(candidate)) return null;
+  const fields = normalizeRenderStage(stageInput) === "preview" ? [
+    "draftPath",
+    "path",
+    "href",
+    "url"
+  ] : [
+    "path",
+    "href",
+    "url"
+  ];
   for (const field of fields) {
     const value = candidate[field];
-    if (typeof value === "string" && value.trim().length > 0) {
-      return value.trim();
-    }
+    if (typeof value === "string" && value.trim().length > 0) return value.trim();
   }
   return null;
 }
 function extractRouteUpdatedAt(candidate) {
-  if (!isRouteRecord(candidate)) {
-    return null;
-  }
-  const fields = [
+  if (!isRouteRecord(candidate)) return null;
+  for (const field of [
     "updatedAt",
     "updated_at",
     "publishedAt",
     "published_at",
     "modifiedAt",
     "modified_at"
-  ];
-  for (const field of fields) {
+  ]) {
     const value = candidate[field];
-    if (typeof value === "string" && value.length > 0) {
-      return value;
-    }
+    if (typeof value === "string" && value.length > 0) return value;
   }
   return null;
 }
 function resolveRouteTargetForStage(routeIdValue, routes, stageInput) {
   const routeId = typeof routeIdValue === "string" ? routeIdValue : null;
-  if (!routeId || !routes) {
-    return null;
-  }
+  if (!routeId || !routes) return null;
   const routeEntry = routes[routeId];
-  if (!isRouteVisibleInStage(routeEntry, stageInput)) {
-    return null;
-  }
+  if (!isRouteVisibleInStage(routeEntry, stageInput)) return null;
   const href = extractRouteHref(routeEntry, stageInput);
-  if (!href) {
-    return null;
-  }
+  if (!href) return null;
   return {
     routeId,
     href,