@alpaca-headless/alpaca-headless 1.0.3584 → 1.0.3586

package/dist/route-data/resolve-route.js

@@ -3,13 +3,13 @@ import { apiPostObject } from "../services/api";
 if (!globalThis.alpacaRouteDataCache) {
     globalThis.alpacaRouteDataCache = {};
 }
-const fetchRouteData = async (path, host, mode, itemId, language, version, options, apiConfig, siteName) => {
+const fetchRouteData = async ({ path, host, mode, itemId, language, version, options, apiConfig, editRev, siteName }) => {
     var _a;
-    if (mode === "edit" || mode === "preview") {
+    if ((mode === "edit" || mode === "preview") && !editRev) {
         return await doFetchRouteData(path, host, mode, itemId, language, version, options, apiConfig, siteName);
     }
     const cache = globalThis.alpacaRouteDataCache;
-    const cacheKey = itemId + language + version + siteName + path + host;
+    const cacheKey = itemId + language + version + siteName + path + host + editRev;
     if (cacheKey && ((_a = cache[cacheKey]) === null || _a === void 0 ? void 0 : _a.expiresOn) > new Date()) {
         Object.keys(cache).forEach((key) => {
             if (cache[key].expiresOn < new Date()) {
@@ -76,7 +76,17 @@ const doFetchRouteData = async (path, host, mode, itemId, language, version, opt
     };
 };
 export async function getPage({ itemId, language, version, siteName, renderOptions, renderings, compileRendering, mode, apiConfig, }) {
-    const result = await fetchRouteData("", "", mode || "normal", itemId, language, version, renderOptions, apiConfig, siteName);
+    const result = await fetchRouteData({
+        path: "",
+        host: "",
+        mode: mode || "normal",
+        itemId,
+        language,
+        version,
+        options: renderOptions,
+        apiConfig,
+        siteName
+    });
     return await createRouteData(result, renderings, renderOptions, mode, apiConfig, compileRendering);
 }
 async function createRouteData(result, renderings, renderOptions, mode, apiConfig, compileRendering) {
@@ -104,7 +114,17 @@ async function createRouteData(result, renderings, renderOptions, mode, apiConfi
 export async function resolveRoute({ path, searchParams, host, renderOptions, renderings, compileRendering, apiConfig, }) {
     var _a;
     const mode = searchParams["mode"] || "normal";
-    const result = await fetchRouteData(Array.isArray(path) ? (_a = path === null || path === void 0 ? void 0 : path.join("/")) !== null && _a !== void 0 ? _a : "/" : (path || "/"), host, mode, searchParams["itemid"] || searchParams["itemId"], searchParams["lang"], parseInt(searchParams["version"]), renderOptions, apiConfig, searchParams["edit_rev"]);
+    const result = await fetchRouteData({
+        path: Array.isArray(path) ? (_a = path === null || path === void 0 ? void 0 : path.join("/")) !== null && _a !== void 0 ? _a : "/" : (path || "/"),
+        host,
+        mode,
+        itemId: searchParams["itemid"] || searchParams["itemId"],
+        language: searchParams["lang"],
+        version: parseInt(searchParams["version"]),
+        options: renderOptions,
+        apiConfig,
+        editRev: searchParams["edit_rev"],
+    });
     return await createRouteData(result, renderings, renderOptions, mode, apiConfig, compileRendering);
 }
 export const loadPartialLayout = async (itemId, language, version, component, placeholderKey, options, siteName, mode) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alpaca-headless/alpaca-headless",
-  "version": "1.0.3584",
+  "version": "1.0.3586",
   "type": "module",
   "description": "Alpaca Headless",
   "main": "dist/index.js",

package/src/route-data/resolve-route.ts

@@ -30,18 +30,32 @@ if (!globalThis.alpacaRouteDataCache) {
 }
 
 const fetchRouteData = async (
-  path: string,
-  host: string,
-  mode: string,
-  itemId: string,
-  language: string,
-  version: number,
-  options: RenderOptions,
-  apiConfig?: ApiConfig,  
-  siteName?: string
+  {
+  path,
+  host,
+  mode,
+  itemId,
+  language,
+  version,
+  options,
+  apiConfig,   
+  editRev,
+  siteName
+  } : {
+    path: string,
+    host: string,
+    mode: string,
+    itemId: string,
+    language: string,
+    version: number,
+    options: RenderOptions,
+    apiConfig?: ApiConfig,   
+    siteName?: string,
+    editRev?: string
+  }
 ): Promise<Result> => {
 
-  if(mode === "edit" || mode === "preview") {
+  if((mode === "edit" || mode === "preview") && !editRev) {
     return await doFetchRouteData(
       path,
       host,
@@ -55,9 +69,10 @@ const fetchRouteData = async (
     );
   }
 
+ 
   const cache = globalThis.alpacaRouteDataCache;
   
-  const cacheKey = itemId + language + version + siteName + path + host;
+  const cacheKey = itemId + language + version + siteName + path + host + editRev;
     
   if (cacheKey && cache[cacheKey]?.expiresOn > new Date()) {
     Object.keys(cache).forEach((key) => {
@@ -196,17 +211,17 @@ export async function getPage({
   mode,
   apiConfig,
 }: GetPageParams): Promise<RouteData> {
-  const result = await fetchRouteData(
-    "",
-    "",
-    mode || "normal",
+  const result = await fetchRouteData({
+    path: "",
+    host: "",
+    mode: mode || "normal",
     itemId,
     language,
     version,
-    renderOptions,
+    options: renderOptions,
     apiConfig,    
     siteName
-  );
+  });
 
   return await createRouteData(
     result,
@@ -290,17 +305,17 @@ export async function resolveRoute({
   apiConfig,
 }: ResolveRouteParams): Promise<RouteData> {
   const mode = searchParams["mode"] || "normal";
-  const result = await fetchRouteData(
-    Array.isArray(path) ? path?.join("/") ?? "/" : ((path || "/") as string),
+  const result = await fetchRouteData({
+    path: Array.isArray(path) ? path?.join("/") ?? "/" : ((path || "/") as string),
     host,
     mode,
-    searchParams["itemid"] || searchParams["itemId"],
-    searchParams["lang"],
-    parseInt(searchParams["version"]),
-    renderOptions,
+    itemId: searchParams["itemid"] || searchParams["itemId"],
+    language: searchParams["lang"],
+    version: parseInt(searchParams["version"]),
+    options: renderOptions,
     apiConfig,
-    searchParams["edit_rev"]
-  );
+    editRev: searchParams["edit_rev"],    
+  });
 
   return await createRouteData(
     result,