@sleekcms/client 1.0.1 → 2.1.0

package/index.mjs

@@ -1,8 +1,5 @@
 // src/lib.ts
 import * as jmespath from "jmespath";
-function isDevToken(token) {
-  return token.startsWith("dev-");
-}
 function getBaseUrl(token, devEnv) {
   let [env, siteId, ...rest] = token.split("-");
   if (devEnv === "production") return `https://${env}.sleekcms.com/${siteId}`;
@@ -14,52 +11,59 @@ function applyJmes(data, query) {
   if (!query) return data;
   return jmespath.search(data, query);
 }
-function createFetchSiteContent(options) {
-  const { siteToken, env = "latest", mock, devEnv = "production" } = options;
-  const dev = isDevToken(siteToken);
-  let cacheMode = !!options.cache || !!mock && dev;
-  let cachedContent = null;
-  return async function fetchSiteContent(searchQuery) {
-    if (!siteToken) {
-      throw new Error("[SleekCMS] siteToken is required");
-    }
-    if (cachedContent) {
-      return applyJmes(cachedContent, searchQuery);
-    }
-    const baseUrl = getBaseUrl(siteToken, devEnv).replace(/\/$/, "");
-    const url = new URL(`${baseUrl}/${env}`);
-    if (searchQuery && !cacheMode && !cachedContent) {
-      url.searchParams.set("search", searchQuery);
-    }
-    if (mock && dev) {
-      url.searchParams.set("mock", "true");
-    }
-    const res = await fetch(url.toString(), {
-      method: "GET",
+function getUrl({ siteToken, env, search: search2, lang, devEnv = "production" }) {
+  const baseUrl = getBaseUrl(siteToken, devEnv).replace(/\/$/, "");
+  const url = new URL(`${baseUrl}/${env}`);
+  if (search2) url.searchParams.append("search", search2);
+  if (lang) url.searchParams.append("lang", lang);
+  return url.toString();
+}
+async function fetchEnvTag({ siteToken, env }) {
+  const url = getUrl({ siteToken, env });
+  try {
+    let res = await fetch(url, {
+      method: "POST",
       headers: {
         "Content-Type": "application/json",
         Authorization: siteToken
       }
     });
-    if (!res.ok) {
-      let message = res.statusText;
-      try {
-        const data2 = await res.json();
-        if (data2 && data2.message) message = data2.message;
-      } catch {
+    if (res.ok) {
+      let data = await res.json();
+      if (data.tag) {
+        return data.tag;
       }
-      throw new Error(`[SleekCMS] Request failed (${res.status}): ${message}`);
     }
-    const data = await res.json();
-    if (!searchQuery) {
-      cachedContent = data;
-      cacheMode = true;
+  } catch (e) {
+    console.error("[SleekCMS] Unable to resolve env tag.");
+  }
+  return env;
+}
+async function fetchSiteContent(options) {
+  const { siteToken, env = "latest", cdn = false, search: search2, lang } = options;
+  let url = getUrl({ siteToken, env, search: search2, lang });
+  if (cdn && !search2) {
+    let tag = await fetchEnvTag({ siteToken, env });
+    url = getUrl({ siteToken, env: tag, search: search2, lang });
+  }
+  const res = await fetch(url, {
+    method: "GET",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: siteToken
+    }
+  });
+  if (!res.ok) {
+    let message = res.statusText;
+    try {
+      const data = await res.json();
+      if (data && data.message) message = data.message;
+    } catch {
     }
-    return data;
-  };
+    throw new Error(`[SleekCMS] Request failed (${res.status}): ${message}`);
+  }
+  return await res.json();
 }
-
-// src/index.ts
 function extractSlugs(pages, path) {
   const slugs = [];
   const pagesList = pages ?? [];
@@ -78,121 +82,136 @@ function filterPagesByPath(pages, path) {
     return pth.startsWith(path);
   });
 }
-function createClient(options) {
-  const fetchSiteContent = createFetchSiteContent(options);
-  async function getContent(query) {
-    return await fetchSiteContent(query);
+
+// src/index.ts
+async function createClient(options) {
+  const data = await fetchSiteContent(options);
+  function getContent(query) {
+    return applyJmes(data, query);
   }
-  async function getPages(path, query) {
+  function getPages(path) {
     if (!path) {
       throw new Error("[SleekCMS] path is required for getPages");
     }
-    const data = await fetchSiteContent();
-    const filtered = filterPagesByPath(data.pages, path);
-    return applyJmes(filtered, query);
+    return filterPagesByPath(data.pages, path);
   }
-  async function getPage(path) {
+  function getPage(path) {
     if (!path) {
       throw new Error("[SleekCMS] path is required for getPage");
     }
-    const data = await fetchSiteContent();
     const pages = data.pages ?? [];
     const page = pages.find((p) => {
       const pth = typeof p._path === "string" ? p._path : "";
       return pth === path;
     });
-    if (!page) {
-      throw new Error(`[SleekCMS] Page not found: ${path}`);
+    return page ?? null;
+  }
+  function getEntry(handle) {
+    if (!handle) {
+      throw new Error("[SleekCMS] handle is required for getEntry");
     }
-    return page;
+    const entries = data.entries ?? {};
+    const entry = entries[handle] ?? null;
+    return entry;
   }
-  async function getSlugs(path) {
+  function getSlugs(path) {
     if (!path) {
       throw new Error("[SleekCMS] path is required for getSlugs");
     }
-    const data = await fetchSiteContent();
     return extractSlugs(data.pages, path);
   }
-  async function getImages() {
-    const data = await fetchSiteContent();
-    return data.images ?? {};
-  }
-  async function getImage(name) {
-    if (!name) return void 0;
-    const data = await fetchSiteContent();
-    return data.images ? data.images[name] : void 0;
+  function getImage(name) {
+    if (!name) return null;
+    return data.images ? data.images[name] : null;
   }
-  async function getList(name) {
-    if (!name) return void 0;
-    const data = await fetchSiteContent();
+  function getList(name) {
+    if (!name) return null;
     const lists = data.lists ?? {};
     const list = lists[name];
-    return Array.isArray(list) ? list : void 0;
+    return Array.isArray(list) ? list : null;
   }
   return {
     getContent,
     getPages,
     getPage,
+    getEntry,
     getSlugs,
-    getImages,
     getImage,
     getList
   };
 }
-async function createSyncClient(options) {
-  const fetchSiteContent = createFetchSiteContent(options);
-  const data = await fetchSiteContent();
-  function getContent(query) {
-    return applyJmes(data, query);
-  }
-  function getPages(path, query) {
-    if (!path) {
-      throw new Error("[SleekCMS] path is required for getPages");
+function createAsyncClient({ siteToken, env = "latest", cdn, lang }) {
+  let syncClient = null;
+  let tag = null;
+  let cache = {};
+  async function getContent(search2) {
+    if (cdn && !tag) tag = await fetchEnvTag({ siteToken, env });
+    if (!search2 && !syncClient) {
+      syncClient = await createClient({ siteToken, env: tag ?? env, cdn, lang });
+      cache = {};
     }
-    const filtered = filterPagesByPath(data.pages, path);
-    return applyJmes(filtered, query);
+    if (syncClient) return syncClient.getContent(search2);
+    if (!search2) return null;
+    if (!cache[search2]) cache[search2] = await fetchSiteContent({ siteToken, env: tag ?? env, search: search2, lang });
+    return cache[search2] ?? null;
   }
-  function getPage(path) {
-    if (!path) {
-      throw new Error("[SleekCMS] path is required for getPage");
-    }
-    const pages = data.pages ?? [];
-    const page = pages.find((p) => {
+  async function getPages(path) {
+    if (cdn && !tag) tag = await fetchEnvTag({ siteToken, env });
+    if (syncClient) return syncClient.getPages(path);
+    if (!cache.pages) cache.pages = await fetchSiteContent({ siteToken, env: tag ?? env, search: "pages", lang });
+    if (!path) return cache.pages;
+    else return filterPagesByPath(cache.pages, path);
+  }
+  async function getPage(path) {
+    var _a;
+    if (cdn && !tag) tag = await fetchEnvTag({ siteToken, env });
+    if (syncClient) return syncClient.getPage(path);
+    if (!cache.pages) cache.pages = await fetchSiteContent({ siteToken, env: tag ?? env, search: "pages", lang });
+    const page = (_a = cache.pages) == null ? void 0 : _a.find((p) => {
       const pth = typeof p._path === "string" ? p._path : "";
       return pth === path;
     });
     return page ?? null;
   }
-  function getSlugs(path) {
-    if (!path) {
-      throw new Error("[SleekCMS] path is required for getSlugs");
+  async function getEntry(handle) {
+    if (cdn && !tag) tag = await fetchEnvTag({ siteToken, env });
+    if (syncClient) return syncClient.getEntry(handle);
+    let search2 = `entries.${handle}`;
+    if (cache[search2] === void 0) {
+      cache[search2] = await fetchSiteContent({ siteToken, env: tag ?? env, search: search2, lang });
     }
-    return extractSlugs(data.pages, path);
+    return cache[search2];
   }
-  function getImages() {
-    return data.images ?? {};
+  async function getSlugs(path) {
+    if (cdn && !tag) tag = await fetchEnvTag({ siteToken, env });
+    if (syncClient) return syncClient.getSlugs(path);
+    if (!cache.pages) cache.pages = await fetchSiteContent({ siteToken, env: tag ?? env, search: "pages", lang });
+    return extractSlugs(cache.pages, path);
   }
-  function getImage(name) {
-    if (!name) return void 0;
-    return data.images ? data.images[name] : void 0;
+  async function getImage(name) {
+    if (cdn && !tag) tag = await fetchEnvTag({ siteToken, env });
+    if (syncClient) return syncClient.getImage(name);
+    if (!cache.images) cache.images = await fetchSiteContent({ siteToken, env: tag ?? env, search: "images", lang });
+    return cache.images ? cache.images[name] : null;
   }
-  function getList(name) {
-    if (!name) return void 0;
-    const lists = data.lists ?? {};
-    const list = lists[name];
-    return Array.isArray(list) ? list : void 0;
+  async function getList(name) {
+    if (cdn && !tag) tag = await fetchEnvTag({ siteToken, env });
+    if (syncClient) return syncClient.getList(name);
+    if (!cache.lists) cache.lists = await fetchSiteContent({ siteToken, env: tag ?? env, search: "lists", lang });
+    const list = cache.lists[name];
+    return Array.isArray(list) ? list : null;
   }
   return {
     getContent,
     getPages,
     getPage,
+    getEntry,
     getSlugs,
-    getImages,
     getImage,
     getList
   };
 }
 export {
-  createClient,
-  createSyncClient
+  createAsyncClient,
+  createClient
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sleekcms/client",
-  "version": "1.0.1",
+  "version": "2.1.0",
   "description": "Official SleekCMS content client for Node 18+ and browser",
   "type": "module",
   "main": "index.cjs",