tinacms 0.0.0-b54b303-20241210232138 → 0.0.0-b67f55a-20250513032422

package/README.md

@@ -24,7 +24,7 @@ Test a TinaCMS starter site locally
 npx create-tina-app@latest
 ```
 
-Or try a [demo site](https://app.tina.io/quickstart) on Tina Cloud.
+Or try a [demo site](https://app.tina.io/quickstart) on TinaCloud.
 
 ## Documentation
 

package/dist/admin/api.d.ts

@@ -7,6 +7,7 @@ export interface FilterArgs {
     filterField: string;
     collection?: string;
     relativePath?: string;
+    relativePathWithoutExtension?: string;
     newRelativePath?: string;
     startsWith?: string;
     endsWith?: string;

package/dist/admin/components/GetCollection.d.ts

@@ -1,9 +1,9 @@
 /**
 
 */
-import React from 'react';
-import type { TinaCMS } from '@tinacms/toolkit';
 import type { Collection } from '@tinacms/schema-tools';
+import type { TinaCMS } from '@tinacms/toolkit';
+import React from 'react';
 import { FilterArgs } from '../api';
 import type { CollectionResponse } from '../types';
 export declare const useGetCollection: (cms: TinaCMS, collectionName: string, includeDocuments: boolean, folder: {

package/dist/auth/TinaCloudProvider.d.ts

@@ -1,5 +1,5 @@
+import { MediaStore, StaticMedia, TinaCMS } from '@tinacms/toolkit';
 import React from 'react';
-import { TinaCMS, MediaStore, StaticMedia } from '@tinacms/toolkit';
 import { Client, TinaIOConfig } from '../internalClient';
 import { CreateClientProps } from '../utils';
 export interface TinaCloudMediaStoreClass {

package/dist/client.js

@@ -1,11 +1,16 @@
 (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";
+  function replaceGithubPathSplit(url, replacement) {
+    const parts = url.split("github/");
+    if (parts.length > 1 && replacement) {
+      return parts[0] + "github/" + replacement;
+    } else {
+      return url;
+    }
+  }
   class TinaClient {
     constructor({
       token,
@@ -29,6 +34,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 +45,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);
       }
@@ -56,7 +62,6 @@
         query: args.query,
         variables: (args == null ? void 0 : args.variables) || {}
       });
-      const url = (args == null ? void 0 : args.url) || this.apiUrl;
       const optionsObject = {
         method: "POST",
         headers,
@@ -64,43 +69,61 @@
         redirect: "follow",
         ...providedFetchOptions
       };
+      const draftBranch = headers.get("x-branch");
+      const url = replaceGithubPathSplit((args == null ? void 0 : args.url) || this.apiUrl, draftBranch);
       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;
@@ -132,22 +155,35 @@
         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}`
+            );
+          }
+        }
       }
     };
   };
@@ -161,3 +197,4 @@
   exports2.createClient = createClient;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
 });
+//# sourceMappingURL=client.js.map

package/dist/client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.js","sources":["../src/unifiedClient/index.ts","../src/cache/node-cache.ts"],"sourcesContent":["import type { Config } from '@tinacms/schema-tools';\nimport AsyncLock from 'async-lock';\nimport type { GraphQLError } from 'graphql';\nimport type { Cache } from '../cache/index';\n\nexport const TINA_HOST = 'content.tinajs.io';\nexport interface TinaClientArgs<GenQueries = Record<string, unknown>> {\n  url: string;\n  token?: string;\n  queries: (client: TinaClient<GenQueries>) => GenQueries;\n  errorPolicy?: Config['client']['errorPolicy'];\n  cacheDir?: string;\n}\nexport type TinaClientRequestArgs = {\n  variables?: Record<string, any>;\n  query: string;\n  errorPolicy?: 'throw' | 'include';\n} & Partial<Omit<TinaClientArgs, 'queries'>>;\n\nexport type TinaClientURLParts = {\n  host: string;\n  clientId: string;\n  branch: string;\n  isLocalClient: boolean;\n};\n\n/**\n * Replaces the part of a URL after 'github/' with a specified replacement string.\n *\n * @param {string} url The original URL.\n * @param {string} replacement The string to replace the part after 'github/'.\n * @returns {string} The modified URL, or the original URL if 'github/' is not found.\n */\nfunction replaceGithubPathSplit(url: string, replacement: string) {\n  const parts = url.split('github/');\n  if (parts.length > 1 && replacement) {\n    return parts[0] + 'github/' + replacement;\n  } else {\n    return url;\n  }\n}\n\nexport class TinaClient<GenQueries> {\n  public apiUrl: string;\n  public readonlyToken?: string;\n  public queries: GenQueries;\n  public errorPolicy: Config['client']['errorPolicy'];\n  initialized = false;\n  cacheLock: AsyncLock | undefined;\n  cacheDir: string;\n  cache: Cache;\n\n  constructor({\n    token,\n    url,\n    queries,\n    errorPolicy,\n    cacheDir,\n  }: TinaClientArgs<GenQueries>) {\n    this.apiUrl = url;\n    this.readonlyToken = token?.trim();\n    this.queries = queries(this);\n    this.errorPolicy = errorPolicy || 'throw';\n    this.cacheDir = cacheDir || '';\n  }\n\n  async init() {\n    if (this.initialized) {\n      return;\n    }\n    try {\n      if (\n        this.cacheDir &&\n        typeof window === 'undefined' &&\n        typeof require !== 'undefined'\n      ) {\n        const { NodeCache } = await import('../cache/node-cache');\n        this.cache = await NodeCache(this.cacheDir);\n        this.cacheLock = new AsyncLock();\n      }\n    } catch (e) {\n      console.error(e);\n    }\n    this.initialized = true;\n  }\n\n  public async request<DataType extends Record<string, any> = any>(\n    { errorPolicy, ...args }: TinaClientRequestArgs,\n    options: { fetchOptions?: Parameters<typeof fetch>[1] }\n  ) {\n    await this.init();\n    const errorPolicyDefined = errorPolicy || this.errorPolicy;\n    const headers = new Headers();\n    if (this.readonlyToken) {\n      headers.append('X-API-KEY', this.readonlyToken);\n    }\n    headers.append('Content-Type', 'application/json');\n    if (options?.fetchOptions) {\n      if (options?.fetchOptions?.headers) {\n        Object.entries(options.fetchOptions.headers).forEach(([key, value]) => {\n          headers.append(key, value);\n        });\n      }\n    }\n    const { headers: _, ...providedFetchOptions } = options?.fetchOptions || {};\n\n    const bodyString = JSON.stringify({\n      query: args.query,\n      variables: args?.variables || {},\n    });\n\n    const optionsObject: Parameters<typeof fetch>[1] = {\n      method: 'POST',\n      headers,\n      body: bodyString,\n      redirect: 'follow',\n      ...providedFetchOptions,\n    };\n\n    // Look for the header and change to use this branch instead of the build time generated branch.\n    // This comes from the clients fetch options:\n    //client.queries.collection({},   {\n    //  fetchOptions: {\n    //    headers: {\n    //      'x-branch': cookieStore.get('x-branch')?.value,\n    //    },\n    //  },\n    //})\n    const draftBranch = headers.get('x-branch');\n    const url = replaceGithubPathSplit(args?.url || this.apiUrl, draftBranch);\n\n    let key = '';\n    let result: {\n      data: DataType;\n      errors: GraphQLError[] | null;\n      query: string;\n    };\n    if (this.cache) {\n      key = this.cache.makeKey(bodyString);\n      await this.cacheLock.acquire(key, async () => {\n        result = await this.cache.get(key);\n        if (!result) {\n          result = await requestFromServer<DataType>(\n            url,\n            args.query,\n            optionsObject,\n            errorPolicyDefined\n          );\n          await this.cache.set(key, result);\n        }\n      });\n    } else {\n      result = await requestFromServer<DataType>(\n        url,\n        args.query,\n        optionsObject,\n        errorPolicyDefined\n      );\n    }\n\n    return result;\n  }\n}\n\nasync function requestFromServer<DataType extends Record<string, any> = any>(\n  url: string,\n  query: string,\n  optionsObject: RequestInit,\n  errorPolicyDefined: 'throw' | 'include'\n) {\n  const res = await fetch(url, optionsObject);\n  if (!res.ok) {\n    let additionalInfo = '';\n    if (res.status === 401) {\n      additionalInfo =\n        'Please check that your client ID, URL and read only token are configured properly.';\n    }\n\n    throw new Error(\n      `Server responded with status code ${res.status}, ${res.statusText}. ${\n        additionalInfo ? additionalInfo : ''\n      } Please see our FAQ for more information: https://tina.io/docs/errors/faq/`\n    );\n  }\n  const json = await res.json();\n  if (json.errors && errorPolicyDefined === 'throw') {\n    throw new Error(\n      `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/\n      Errors: \\n\\t${json.errors.map((error) => error.message).join('\\n')}`\n    );\n  }\n  const result = {\n    data: json?.data as DataType,\n    errors: (json?.errors || null) as GraphQLError[] | null,\n    query,\n  };\n  return result;\n}\n\nexport function createClient<GenQueries>(args: TinaClientArgs<GenQueries>) {\n  const client = new TinaClient<ReturnType<typeof args.queries>>(args);\n  return client;\n}\n","import type { Cache } from './index';\n\n// Create the cache directory if it doesn't exist.\n// Returns the path of the cache directory.\nexport const makeCacheDir = async (\n  dir: string,\n  fs: any,\n  path: any,\n  os: any\n) => {\n  const pathParts = dir.split(path.sep).filter(Boolean);\n  const cacheHash = pathParts[pathParts.length - 1];\n  const rootUser = pathParts[0];\n  let cacheDir = dir;\n\n  // Check if the root directory exists. If not, create the cache in the tmp directory.\n  if (!fs.existsSync(path.join(path.sep, rootUser))) {\n    cacheDir = path.join(os.tmpdir(), cacheHash);\n  }\n\n  try {\n    fs.mkdirSync(cacheDir, { recursive: true });\n  } catch (error) {\n    throw new Error(`Failed to create cache directory: ${error.message}`);\n  }\n\n  return cacheDir;\n};\n\nexport const NodeCache = async (dir: string): Promise<Cache> => {\n  // TODO: These will need to be changed from using require to import when we eventually move to ESM\n  const fs = require('node:fs');\n  const path = require('node:path');\n  const os = require('node:os');\n\n  const { createHash } = require('node:crypto');\n  const cacheDir = await makeCacheDir(dir, fs, path, os);\n\n  return {\n    makeKey: (key: any) => {\n      const input =\n        key && key instanceof Object ? JSON.stringify(key) : key || '';\n      return createHash('sha256').update(input).digest('hex');\n    },\n    get: async (key: string) => {\n      let readValue: object | undefined;\n\n      const cacheFilename = `${cacheDir}/${key}`;\n      try {\n        const data = await fs.promises.readFile(cacheFilename, 'utf-8');\n        readValue = JSON.parse(data);\n      } catch (e) {\n        if (e.code !== 'ENOENT') {\n          console.error(\n            `Failed to read cache file to ${cacheFilename}: ${e.message}`\n          );\n        }\n      }\n\n      return readValue;\n    },\n    set: async (key: string, value: any) => {\n      const cacheFilename = `${cacheDir}/${key}`;\n      try {\n        await fs.promises.writeFile(cacheFilename, JSON.stringify(value), {\n          encoding: 'utf-8',\n          flag: 'wx', // Don't overwrite existing caches\n        });\n      } catch (e) {\n        if (e.code !== 'EEXIST') {\n          console.error(\n            `Failed to write cache file to ${cacheFilename}: ${e.message}`\n          );\n        }\n      }\n    },\n  };\n};\n"],"names":["NodeCache","key"],"mappings":"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"}

package/dist/client.mjs

@@ -1,8 +1,13 @@
-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";
+function replaceGithubPathSplit(url, replacement) {
+  const parts = url.split("github/");
+  if (parts.length > 1 && replacement) {
+    return parts[0] + "github/" + replacement;
+  } else {
+    return url;
+  }
+}
 class TinaClient {
   constructor({
     token,
@@ -24,8 +29,9 @@ class TinaClient {
     }
     try {
       if (this.cacheDir && typeof window === "undefined" && typeof require !== "undefined") {
-        const { NodeCache } = await import("./node-cache-4c336858.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 +42,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);
     }
@@ -53,7 +59,6 @@ class TinaClient {
       query: args.query,
       variables: (args == null ? void 0 : args.variables) || {}
     });
-    const url = (args == null ? void 0 : args.url) || this.apiUrl;
     const optionsObject = {
       method: "POST",
       headers,
@@ -61,43 +66,61 @@ class TinaClient {
       redirect: "follow",
       ...providedFetchOptions
     };
+    const draftBranch = headers.get("x-branch");
+    const url = replaceGithubPathSplit((args == null ? void 0 : args.url) || this.apiUrl, draftBranch);
     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;
@@ -107,3 +130,4 @@ export {
   TinaClient,
   createClient
 };
+//# sourceMappingURL=client.mjs.map

package/dist/client.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.mjs","sources":["../src/unifiedClient/index.ts"],"sourcesContent":["import type { Config } from '@tinacms/schema-tools';\nimport AsyncLock from 'async-lock';\nimport type { GraphQLError } from 'graphql';\nimport type { Cache } from '../cache/index';\n\nexport const TINA_HOST = 'content.tinajs.io';\nexport interface TinaClientArgs<GenQueries = Record<string, unknown>> {\n  url: string;\n  token?: string;\n  queries: (client: TinaClient<GenQueries>) => GenQueries;\n  errorPolicy?: Config['client']['errorPolicy'];\n  cacheDir?: string;\n}\nexport type TinaClientRequestArgs = {\n  variables?: Record<string, any>;\n  query: string;\n  errorPolicy?: 'throw' | 'include';\n} & Partial<Omit<TinaClientArgs, 'queries'>>;\n\nexport type TinaClientURLParts = {\n  host: string;\n  clientId: string;\n  branch: string;\n  isLocalClient: boolean;\n};\n\n/**\n * Replaces the part of a URL after 'github/' with a specified replacement string.\n *\n * @param {string} url The original URL.\n * @param {string} replacement The string to replace the part after 'github/'.\n * @returns {string} The modified URL, or the original URL if 'github/' is not found.\n */\nfunction replaceGithubPathSplit(url: string, replacement: string) {\n  const parts = url.split('github/');\n  if (parts.length > 1 && replacement) {\n    return parts[0] + 'github/' + replacement;\n  } else {\n    return url;\n  }\n}\n\nexport class TinaClient<GenQueries> {\n  public apiUrl: string;\n  public readonlyToken?: string;\n  public queries: GenQueries;\n  public errorPolicy: Config['client']['errorPolicy'];\n  initialized = false;\n  cacheLock: AsyncLock | undefined;\n  cacheDir: string;\n  cache: Cache;\n\n  constructor({\n    token,\n    url,\n    queries,\n    errorPolicy,\n    cacheDir,\n  }: TinaClientArgs<GenQueries>) {\n    this.apiUrl = url;\n    this.readonlyToken = token?.trim();\n    this.queries = queries(this);\n    this.errorPolicy = errorPolicy || 'throw';\n    this.cacheDir = cacheDir || '';\n  }\n\n  async init() {\n    if (this.initialized) {\n      return;\n    }\n    try {\n      if (\n        this.cacheDir &&\n        typeof window === 'undefined' &&\n        typeof require !== 'undefined'\n      ) {\n        const { NodeCache } = await import('../cache/node-cache');\n        this.cache = await NodeCache(this.cacheDir);\n        this.cacheLock = new AsyncLock();\n      }\n    } catch (e) {\n      console.error(e);\n    }\n    this.initialized = true;\n  }\n\n  public async request<DataType extends Record<string, any> = any>(\n    { errorPolicy, ...args }: TinaClientRequestArgs,\n    options: { fetchOptions?: Parameters<typeof fetch>[1] }\n  ) {\n    await this.init();\n    const errorPolicyDefined = errorPolicy || this.errorPolicy;\n    const headers = new Headers();\n    if (this.readonlyToken) {\n      headers.append('X-API-KEY', this.readonlyToken);\n    }\n    headers.append('Content-Type', 'application/json');\n    if (options?.fetchOptions) {\n      if (options?.fetchOptions?.headers) {\n        Object.entries(options.fetchOptions.headers).forEach(([key, value]) => {\n          headers.append(key, value);\n        });\n      }\n    }\n    const { headers: _, ...providedFetchOptions } = options?.fetchOptions || {};\n\n    const bodyString = JSON.stringify({\n      query: args.query,\n      variables: args?.variables || {},\n    });\n\n    const optionsObject: Parameters<typeof fetch>[1] = {\n      method: 'POST',\n      headers,\n      body: bodyString,\n      redirect: 'follow',\n      ...providedFetchOptions,\n    };\n\n    // Look for the header and change to use this branch instead of the build time generated branch.\n    // This comes from the clients fetch options:\n    //client.queries.collection({},   {\n    //  fetchOptions: {\n    //    headers: {\n    //      'x-branch': cookieStore.get('x-branch')?.value,\n    //    },\n    //  },\n    //})\n    const draftBranch = headers.get('x-branch');\n    const url = replaceGithubPathSplit(args?.url || this.apiUrl, draftBranch);\n\n    let key = '';\n    let result: {\n      data: DataType;\n      errors: GraphQLError[] | null;\n      query: string;\n    };\n    if (this.cache) {\n      key = this.cache.makeKey(bodyString);\n      await this.cacheLock.acquire(key, async () => {\n        result = await this.cache.get(key);\n        if (!result) {\n          result = await requestFromServer<DataType>(\n            url,\n            args.query,\n            optionsObject,\n            errorPolicyDefined\n          );\n          await this.cache.set(key, result);\n        }\n      });\n    } else {\n      result = await requestFromServer<DataType>(\n        url,\n        args.query,\n        optionsObject,\n        errorPolicyDefined\n      );\n    }\n\n    return result;\n  }\n}\n\nasync function requestFromServer<DataType extends Record<string, any> = any>(\n  url: string,\n  query: string,\n  optionsObject: RequestInit,\n  errorPolicyDefined: 'throw' | 'include'\n) {\n  const res = await fetch(url, optionsObject);\n  if (!res.ok) {\n    let additionalInfo = '';\n    if (res.status === 401) {\n      additionalInfo =\n        'Please check that your client ID, URL and read only token are configured properly.';\n    }\n\n    throw new Error(\n      `Server responded with status code ${res.status}, ${res.statusText}. ${\n        additionalInfo ? additionalInfo : ''\n      } Please see our FAQ for more information: https://tina.io/docs/errors/faq/`\n    );\n  }\n  const json = await res.json();\n  if (json.errors && errorPolicyDefined === 'throw') {\n    throw new Error(\n      `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/\n      Errors: \\n\\t${json.errors.map((error) => error.message).join('\\n')}`\n    );\n  }\n  const result = {\n    data: json?.data as DataType,\n    errors: (json?.errors || null) as GraphQLError[] | null,\n    query,\n  };\n  return result;\n}\n\nexport function createClient<GenQueries>(args: TinaClientArgs<GenQueries>) {\n  const client = new TinaClient<ReturnType<typeof args.queries>>(args);\n  return client;\n}\n"],"names":["key"],"mappings":"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"}

package/dist/hooks/create-page-plugin.d.ts

@@ -29,7 +29,7 @@ export type OnNewDocument = (args: {
     path: string;
 }) => void;
 export declare class ContentCreatorPlugin implements AddContentPlugin<FormShape> {
-    __type: 'content-creator';
+    __type: "content-creator";
     fields: AddContentPlugin<FormShape>['fields'];
     onNewDocument?: OnNewDocument;
     onChange: (values: any) => void;