tinacms 0.0.0-c45ac5d-20241213020122 → 0.0.0-c6915ea-20250421012527

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/AuthCallback.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default function AuthCallback({ clientId, identityApiUrl, }: {
+    clientId: string;
+    identityApiUrl: string;
+}): React.JSX.Element;

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/auth/authenticate.d.ts

@@ -7,4 +7,4 @@ export type TokenObject = {
     access_token?: string;
     refresh_token?: string;
 };
-export declare const authenticate: (clientId: string, frontendUrl: string) => Promise<TokenObject>;
+export declare const authenticate: (clientId: string, frontendUrl: string, oauth2?: boolean) => Promise<TokenObject>;

package/dist/client.d.ts

@@ -1,4 +1 @@
-/**
-
-*/
-export * from './unifiedClient';
+export * from "../src/client"

package/dist/client.js

@@ -1,8 +1,16 @@
 (function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports) : typeof define === "function" && define.amd ? define(["exports"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.tinacms = {}));
-})(this, function(exports2) {
+  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 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,
@@ -26,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);
@@ -53,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,
@@ -61,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 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")}`
+        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;
@@ -129,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}`
+            );
+          }
+        }
       }
     };
   };

package/dist/client.mjs

@@ -1,4 +1,13 @@
+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,
@@ -20,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);
@@ -49,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,
@@ -57,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 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")}`
+      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;

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;

package/dist/index.d.ts

@@ -1,61 +1 @@
-/**
-
-*/
-export * from './internalClient';
-export * from './auth';
-export * from './utils';
-export * from './tina-cms';
-export { useDocumentCreatorPlugin } from './hooks/use-content-creator';
-export { TinaAdmin } from './admin';
-export { RouteMappingPlugin } from './admin/plugins/route-mapping';
-export { TinaAdminApi } from './admin/api';
-export { ErrorDialog } from './admin/components/ErrorDialog';
-export * from './toolkit';
-export { Form } from './toolkit/forms/form';
-export { MdxFieldPluginExtendible } from '@tinacms/toolkit';
-import { TinaCMSProvider2, DocumentCreatorCallback } from './tina-cms';
-import type { TinaCMSProviderDefaultProps } from './types/cms';
-export type { TinaCMSProviderDefaultProps };
-export default TinaCMSProvider2;
-import { MediaStore, TinaCMS } from '@tinacms/toolkit';
-import { formifyCallback } from './hooks/use-graphql-forms';
-export { NAMER, resolveField } from '@tinacms/schema-tools';
-export type { LoginScreenProps, LoginStrategy } from '@tinacms/schema-tools';
-import { TinaSchema, TinaField, Config, Schema, Collection, Template } from '@tinacms/schema-tools';
-export type { Config, Schema, Collection, Template, TinaField, TinaSchema };
-/**
- * @deprecated use `TinaField` instead
- */
-export type TinaFieldEnriched = TinaField;
-/**
- * @deprecated use `TinaField` instead
- */
-export type SchemaField = TinaField;
-/**
- * @deprecated use `Template` instead
- */
-export type TinaTemplate = Template;
-/**
- * @deprecated use `Template` instead
- */
-export type TinaCloudTemplatebase = Template;
-/**
- * @deprecated use `Collection` instead
- */
-export type TinaCloudCollectionCollection = Collection;
-/**
- * @deprecated use `Collection` instead
- */
-export type TinaCollection = Collection;
-/**
- * @deprecated use `Schema` instead
- */
-export type TinaCloudSchema = Schema;
-export declare const defineSchema: (config: Schema) => Schema<false>;
-export declare const defineLegacyConfig: (config: Omit<TinaCMSProviderDefaultProps, "children">) => Omit<TinaCMSProviderDefaultProps, "children">;
-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>;
-export declare const defineConfig: (config: Config<(cms: TinaCMS) => TinaCMS, formifyCallback, DocumentCreatorCallback, MediaStoreClass>) => Config<(cms: TinaCMS) => TinaCMS, formifyCallback, import("./hooks/use-content-creator").DocumentCreatorArgs, MediaStoreClass, undefined>;
-export { tinaTableTemplate } from './table';
+export * from "../src/index"