tinacms 0.0.0-bcdf830-20241023064032 → 0.0.0-bdd3bb8-20250121101941

package/dist/admin/types.d.ts

@@ -25,6 +25,9 @@ export interface DocumentNode {
 }
 export interface DocumentForm {
     _values: Object;
+    _sys?: {
+        hasReferences?: boolean;
+    };
 }
 export interface DocumentSys {
     _sys: {

package/dist/cache/node-cache.d.ts

@@ -1,2 +1,3 @@
 import type { Cache } from './index';
+export declare const makeCacheDir: (dir: string, fs: any, path: any, os: any) => Promise<string>;
 export declare const NodeCache: (dir: string) => Promise<Cache>;

package/dist/client.js

@@ -1,10 +1,7 @@
 (function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("fetch-ponyfill")) : typeof define === "function" && define.amd ? define(["exports", "fetch-ponyfill"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.tinacms = {}, global.NOOP));
-})(this, function(exports2, fetchPonyfill) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("async-lock")) : typeof define === "function" && define.amd ? define(["exports", "async-lock"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.tinacms = {}, global.NOOP));
+})(this, function(exports2, AsyncLock) {
   "use strict";
-  const { fetch: fetchPonyfillFN, Headers: HeadersPonyfill } = fetchPonyfill();
-  const fetchDefined = typeof fetch === "undefined" ? fetchPonyfillFN : fetch;
-  const HeadersDefined = typeof Headers === "undefined" ? HeadersPonyfill : Headers;
   const TINA_HOST = "content.tinajs.io";
   class TinaClient {
     constructor({
@@ -29,6 +26,7 @@
         if (this.cacheDir && typeof window === "undefined" && typeof require !== "undefined") {
           const { NodeCache: NodeCache2 } = await Promise.resolve().then(() => nodeCache);
           this.cache = await NodeCache2(this.cacheDir);
+          this.cacheLock = new AsyncLock();
         }
       } catch (e) {
         console.error(e);
@@ -39,7 +37,7 @@
       var _a;
       await this.init();
       const errorPolicyDefined = errorPolicy || this.errorPolicy;
-      const headers = new HeadersDefined();
+      const headers = new Headers();
       if (this.readonlyToken) {
         headers.append("X-API-KEY", this.readonlyToken);
       }
@@ -65,57 +63,68 @@
         ...providedFetchOptions
       };
       let key = "";
+      let result;
       if (this.cache) {
         key = this.cache.makeKey(bodyString);
-        const value = await this.cache.get(key);
-        if (value) {
-          return value;
-        }
-      }
-      const res = await fetchDefined(url, optionsObject);
-      if (!res.ok) {
-        let additionalInfo = "";
-        if (res.status === 401) {
-          additionalInfo = "Please check that your client ID, URL and read only token are configured properly.";
-        }
-        throw new Error(
-          `Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/errors/faq/`
-        );
-      }
-      const json = await res.json();
-      if (json.errors && errorPolicyDefined === "throw") {
-        throw new Error(
-          `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
-        Errors: 
-	${json.errors.map((error) => error.message).join("\n")}`
+        await this.cacheLock.acquire(key, async () => {
+          result = await this.cache.get(key);
+          if (!result) {
+            result = await requestFromServer(
+              url,
+              args.query,
+              optionsObject,
+              errorPolicyDefined
+            );
+            await this.cache.set(key, result);
+          }
+        });
+      } else {
+        result = await requestFromServer(
+          url,
+          args.query,
+          optionsObject,
+          errorPolicyDefined
         );
       }
-      const result = {
-        data: json == null ? void 0 : json.data,
-        errors: (json == null ? void 0 : json.errors) || null,
-        query: args.query
-      };
-      if (this.cache) {
-        await this.cache.set(key, result);
-      }
       return result;
     }
   }
+  async function requestFromServer(url, query, optionsObject, errorPolicyDefined) {
+    const res = await fetch(url, optionsObject);
+    if (!res.ok) {
+      let additionalInfo = "";
+      if (res.status === 401) {
+        additionalInfo = "Please check that your client ID, URL and read only token are configured properly.";
+      }
+      throw new Error(
+        `Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/errors/faq/`
+      );
+    }
+    const json = await res.json();
+    if (json.errors && errorPolicyDefined === "throw") {
+      throw new Error(
+        `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
+      Errors: 
+	${json.errors.map((error) => error.message).join("\n")}`
+      );
+    }
+    const result = {
+      data: json == null ? void 0 : json.data,
+      errors: (json == null ? void 0 : json.errors) || null,
+      query
+    };
+    return result;
+  }
   function createClient(args) {
     const client = new TinaClient(args);
     return client;
   }
-  const makeCacheDir = async (dir, fs) => {
-    const path = require("node:path");
-    const os = require("node:os");
-    if (typeof dir !== "string" || !dir.trim()) {
-      throw new Error("Invalid directory path");
-    }
-    console.log("Path sep", path.sep);
-    const pathParts = dir.split(path.sep);
+  const makeCacheDir = async (dir, fs, path, os) => {
+    const pathParts = dir.split(path.sep).filter(Boolean);
     const cacheHash = pathParts[pathParts.length - 1];
+    const rootUser = pathParts[0];
     let cacheDir = dir;
-    if (!fs.existsSync(dir)) {
+    if (!fs.existsSync(path.join(path.sep, rootUser))) {
       cacheDir = path.join(os.tmpdir(), cacheHash);
     }
     try {
@@ -127,37 +136,52 @@
   };
   const NodeCache = async (dir) => {
     const fs = require("node:fs");
-    console.log("fs", JSON.stringify(fs));
+    const path = require("node:path");
+    const os = require("node:os");
     const { createHash } = require("node:crypto");
-    const cacheDir = await makeCacheDir(dir, fs);
+    const cacheDir = await makeCacheDir(dir, fs, path, os);
     return {
       makeKey: (key) => {
         const input = key && key instanceof Object ? JSON.stringify(key) : key || "";
         return createHash("sha256").update(input).digest("hex");
       },
       get: async (key) => {
+        let readValue;
+        const cacheFilename = `${cacheDir}/${key}`;
         try {
-          const data = await fs.promises.readFile(`${cacheDir}/${key}`, "utf-8");
-          return JSON.parse(data);
+          const data = await fs.promises.readFile(cacheFilename, "utf-8");
+          readValue = JSON.parse(data);
         } catch (e) {
-          if (e.code === "ENOENT") {
-            return void 0;
+          if (e.code !== "ENOENT") {
+            console.error(
+              `Failed to read cache file to ${cacheFilename}: ${e.message}`
+            );
           }
-          throw e;
         }
+        return readValue;
       },
       set: async (key, value) => {
-        await fs.promises.writeFile(
-          `${cacheDir}/${key}`,
-          JSON.stringify(value),
-          "utf-8"
-        );
+        const cacheFilename = `${cacheDir}/${key}`;
+        try {
+          await fs.promises.writeFile(cacheFilename, JSON.stringify(value), {
+            encoding: "utf-8",
+            flag: "wx"
+            // Don't overwrite existing caches
+          });
+        } catch (e) {
+          if (e.code !== "EEXIST") {
+            console.error(
+              `Failed to write cache file to ${cacheFilename}: ${e.message}`
+            );
+          }
+        }
       }
     };
   };
   const nodeCache = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
-    NodeCache
+    NodeCache,
+    makeCacheDir
   }, Symbol.toStringTag, { value: "Module" }));
   exports2.TINA_HOST = TINA_HOST;
   exports2.TinaClient = TinaClient;

package/dist/client.mjs

@@ -1,7 +1,4 @@
-import fetchPonyfill from "fetch-ponyfill";
-const { fetch: fetchPonyfillFN, Headers: HeadersPonyfill } = fetchPonyfill();
-const fetchDefined = typeof fetch === "undefined" ? fetchPonyfillFN : fetch;
-const HeadersDefined = typeof Headers === "undefined" ? HeadersPonyfill : Headers;
+import AsyncLock from "async-lock";
 const TINA_HOST = "content.tinajs.io";
 class TinaClient {
   constructor({
@@ -24,8 +21,9 @@ class TinaClient {
     }
     try {
       if (this.cacheDir && typeof window === "undefined" && typeof require !== "undefined") {
-        const { NodeCache } = await import("./node-cache-eefc24a7.mjs");
+        const { NodeCache } = await import("./node-cache-5e8db9f0.mjs");
         this.cache = await NodeCache(this.cacheDir);
+        this.cacheLock = new AsyncLock();
       }
     } catch (e) {
       console.error(e);
@@ -36,7 +34,7 @@ class TinaClient {
     var _a;
     await this.init();
     const errorPolicyDefined = errorPolicy || this.errorPolicy;
-    const headers = new HeadersDefined();
+    const headers = new Headers();
     if (this.readonlyToken) {
       headers.append("X-API-KEY", this.readonlyToken);
     }
@@ -62,42 +60,58 @@ class TinaClient {
       ...providedFetchOptions
     };
     let key = "";
+    let result;
     if (this.cache) {
       key = this.cache.makeKey(bodyString);
-      const value = await this.cache.get(key);
-      if (value) {
-        return value;
-      }
-    }
-    const res = await fetchDefined(url, optionsObject);
-    if (!res.ok) {
-      let additionalInfo = "";
-      if (res.status === 401) {
-        additionalInfo = "Please check that your client ID, URL and read only token are configured properly.";
-      }
-      throw new Error(
-        `Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/errors/faq/`
+      await this.cacheLock.acquire(key, async () => {
+        result = await this.cache.get(key);
+        if (!result) {
+          result = await requestFromServer(
+            url,
+            args.query,
+            optionsObject,
+            errorPolicyDefined
+          );
+          await this.cache.set(key, result);
+        }
+      });
+    } else {
+      result = await requestFromServer(
+        url,
+        args.query,
+        optionsObject,
+        errorPolicyDefined
       );
     }
-    const json = await res.json();
-    if (json.errors && errorPolicyDefined === "throw") {
-      throw new Error(
-        `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
-        Errors: 
-	${json.errors.map((error) => error.message).join("\n")}`
-      );
-    }
-    const result = {
-      data: json == null ? void 0 : json.data,
-      errors: (json == null ? void 0 : json.errors) || null,
-      query: args.query
-    };
-    if (this.cache) {
-      await this.cache.set(key, result);
-    }
     return result;
   }
 }
+async function requestFromServer(url, query, optionsObject, errorPolicyDefined) {
+  const res = await fetch(url, optionsObject);
+  if (!res.ok) {
+    let additionalInfo = "";
+    if (res.status === 401) {
+      additionalInfo = "Please check that your client ID, URL and read only token are configured properly.";
+    }
+    throw new Error(
+      `Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/errors/faq/`
+    );
+  }
+  const json = await res.json();
+  if (json.errors && errorPolicyDefined === "throw") {
+    throw new Error(
+      `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
+      Errors: 
+	${json.errors.map((error) => error.message).join("\n")}`
+    );
+  }
+  const result = {
+    data: json == null ? void 0 : json.data,
+    errors: (json == null ? void 0 : json.errors) || null,
+    query
+  };
+  return result;
+}
 function createClient(args) {
   const client = new TinaClient(args);
   return client;

package/dist/index.d.ts

@@ -53,7 +53,7 @@ export type TinaCollection = Collection;
 export type TinaCloudSchema = Schema;
 export declare const defineSchema: (config: Schema) => Schema<false>;
 export declare const defineLegacyConfig: (config: Omit<TinaCMSProviderDefaultProps, "children">) => Omit<TinaCMSProviderDefaultProps, "children">;
-interface MediaStoreClass {
+export interface MediaStoreClass {
     new (...args: any[]): MediaStore;
 }
 export declare const defineStaticConfig: (config: Config<(cms: TinaCMS) => TinaCMS, formifyCallback, DocumentCreatorCallback, MediaStoreClass>) => Config<(cms: TinaCMS) => TinaCMS, formifyCallback, import("./hooks/use-content-creator").DocumentCreatorArgs, MediaStoreClass, undefined>;