tinacms 1.5.0 → 1.5.2

package/dist/client.es.js

@@ -4,7 +4,7 @@ const TINA_HOST = "content.tinajs.io";
 class TinaClient {
   constructor({ token, url, queries }) {
     this.apiUrl = url;
-    this.readonlyToken = token;
+    this.readonlyToken = token == null ? void 0 : token.trim();
     this.queries = queries(this);
   }
   async request(args) {

package/dist/client.js

@@ -11,7 +11,7 @@
   class TinaClient {
     constructor({ token, url, queries }) {
       this.apiUrl = url;
-      this.readonlyToken = token;
+      this.readonlyToken = token == null ? void 0 : token.trim();
       this.queries = queries(this);
     }
     async request(args) {

package/dist/index.d.ts

@@ -17,7 +17,7 @@ export type { TinaCMSProviderDefaultProps };
 export default TinaCMSProvider2;
 import { MediaStore, TinaCMS } from '@tinacms/toolkit';
 import { formifyCallback } from './hooks/use-graphql-forms';
-export { NAMER, resolveForm } from '@tinacms/schema-tools';
+export { NAMER, resolveField } from '@tinacms/schema-tools';
 import { TinaSchema, TinaField, Config, Schema, Collection, Template } from '@tinacms/schema-tools';
 export type { Config, Schema, Collection, Template, TinaField, TinaSchema };
 /**

package/dist/index.es.js

@@ -5,7 +5,7 @@ export { MdxFieldPluginExtendible } from "@tinacms/toolkit";
 import { getIntrospectionQuery, buildClientSchema, print, parse, buildSchema } from "graphql";
 import gql$1 from "graphql-tag";
 import { TinaSchema, addNamespaceToSchema, parseURL, resolveForm, normalizePath, validateSchema } from "@tinacms/schema-tools";
-export { NAMER, resolveForm } from "@tinacms/schema-tools";
+export { NAMER, resolveField } from "@tinacms/schema-tools";
 import React, { useState, useCallback, useEffect, Fragment, useMemo } from "react";
 import * as yup from "yup";
 import { setEditing, useEditState } from "@tinacms/sharedctx";
@@ -3172,11 +3172,7 @@ const GetCollection = ({
     const allowDelete = (_f = (_e = (_d = collectionDefinition == null ? void 0 : collectionDefinition.ui) == null ? void 0 : _d.allowedActions) == null ? void 0 : _e.delete) != null ? _f : true;
     if (!allowCreate && !allowDelete && ((_h = (_g = collection.documents) == null ? void 0 : _g.edges) == null ? void 0 : _h.length) === 1) {
       const doc = collection.documents.edges[0].node;
-      const pathToDoc = doc._sys.breadcrumbs;
-      if (folder.fullyQualifiedName) {
-        pathToDoc.unshift("~");
-      }
-      navigate(`/${["collections", "edit", collectionName, ...pathToDoc].join("/")}`, { replace: true });
+      handleNavigate(navigate, cms, collection, collectionDefinition, doc);
     }
   }, [(collection == null ? void 0 : collection.name) || "", loading]);
   if (error) {
@@ -3347,7 +3343,7 @@ const CollectionListPage = () => {
       const admin = cms.api.admin;
       const pageInfo = collection.documents.pageInfo;
       const fields = (_a = collectionExtra.fields) == null ? void 0 : _a.filter((x) => ["string", "number", "datetime", "boolean"].includes(x.type));
-      const sortField = fields.find((field) => field.name === sortName);
+      const sortField = fields == null ? void 0 : fields.find((field) => field.name === sortName);
       const filterFields = (_b = collectionExtra.fields) == null ? void 0 : _b.filter((x) => {
         return ["string", "datetime", "boolean"].includes(x.type) && !x.list;
       });

package/dist/index.js

@@ -3187,11 +3187,7 @@ This will work when developing locally but NOT when deployed to production.
       const allowDelete = (_f = (_e = (_d = collectionDefinition == null ? void 0 : collectionDefinition.ui) == null ? void 0 : _d.allowedActions) == null ? void 0 : _e.delete) != null ? _f : true;
       if (!allowCreate && !allowDelete && ((_h = (_g = collection.documents) == null ? void 0 : _g.edges) == null ? void 0 : _h.length) === 1) {
         const doc = collection.documents.edges[0].node;
-        const pathToDoc = doc._sys.breadcrumbs;
-        if (folder.fullyQualifiedName) {
-          pathToDoc.unshift("~");
-        }
-        navigate(`/${["collections", "edit", collectionName, ...pathToDoc].join("/")}`, { replace: true });
+        handleNavigate(navigate, cms, collection, collectionDefinition, doc);
       }
     }, [(collection == null ? void 0 : collection.name) || "", loading]);
     if (error) {
@@ -3362,7 +3358,7 @@ This will work when developing locally but NOT when deployed to production.
         const admin = cms.api.admin;
         const pageInfo = collection.documents.pageInfo;
         const fields = (_a = collectionExtra.fields) == null ? void 0 : _a.filter((x) => ["string", "number", "datetime", "boolean"].includes(x.type));
-        const sortField = fields.find((field) => field.name === sortName);
+        const sortField = fields == null ? void 0 : fields.find((field) => field.name === sortName);
         const filterFields = (_b = collectionExtra.fields) == null ? void 0 : _b.filter((x) => {
           return ["string", "datetime", "boolean"].includes(x.type) && !x.list;
         });
@@ -4585,10 +4581,10 @@ This will work when developing locally but NOT when deployed to production.
       return schemaTools.NAMER;
     }
   });
-  Object.defineProperty(exports2, "resolveForm", {
+  Object.defineProperty(exports2, "resolveField", {
     enumerable: true,
     get: function() {
-      return schemaTools.resolveForm;
+      return schemaTools.resolveField;
     }
   });
   exports2.AuthWallInner = AuthWallInner;

package/dist/react.d.ts

@@ -8,6 +8,7 @@ export declare function useTina<T extends object>(props: {
     data: T;
 }): {
     data: T;
+    isClient: boolean;
 };
 export declare function useEditState(): {
     edit: boolean;
@@ -18,7 +19,7 @@ export declare function useEditState(): {
  * is working with.
  */
 export declare const tinaField: <T extends object & {
-    __meta__?: {
+    _tina_metadata?: {
         id: string;
         name?: string;
         fields: Record<string, string>;

package/dist/react.es.js

@@ -1,8 +1,10 @@
 import React from "react";
 function useTina(props) {
   const [data, setData] = React.useState(props.data);
+  const [isClient, setIsClient] = React.useState(false);
   const id = JSON.stringify({ query: props.query, variables: props.variables });
   React.useEffect(() => {
+    setIsClient(true);
     setData(props.data);
   }, [id]);
   React.useEffect(() => {
@@ -12,9 +14,11 @@ function useTina(props) {
         setData(event.data.data);
       }
     });
-    return () => parent.postMessage({ type: "close", id }, window.location.origin);
+    return () => {
+      parent.postMessage({ type: "close", id }, window.location.origin);
+    };
   }, [id]);
-  return { data };
+  return { data, isClient };
 }
 function useEditState() {
   const [edit, setEdit] = React.useState(false);
@@ -34,11 +38,11 @@ function useEditState() {
 const tinaField = (obj, field) => {
   var _a, _b, _c;
   if (!field) {
-    return `${(_a = obj.__meta__) == null ? void 0 : _a.id}#${(_b = obj.__meta__) == null ? void 0 : _b.name}`;
+    return `${(_a = obj._tina_metadata) == null ? void 0 : _a.id}#${(_b = obj._tina_metadata) == null ? void 0 : _b.name}`;
   }
-  if (obj == null ? void 0 : obj.__meta__) {
+  if (obj == null ? void 0 : obj._tina_metadata) {
     if (typeof field === "string") {
-      return `${(_c = obj.__meta__) == null ? void 0 : _c.id}#${obj.__meta__.fields[field]}`;
+      return `${(_c = obj._tina_metadata) == null ? void 0 : _c.id}#${obj._tina_metadata.fields[field]}`;
     }
   }
   return "";

package/dist/react.js

@@ -8,8 +8,10 @@
   var React__default = /* @__PURE__ */ _interopDefaultLegacy(React);
   function useTina(props) {
     const [data, setData] = React__default["default"].useState(props.data);
+    const [isClient, setIsClient] = React__default["default"].useState(false);
     const id = JSON.stringify({ query: props.query, variables: props.variables });
     React__default["default"].useEffect(() => {
+      setIsClient(true);
       setData(props.data);
     }, [id]);
     React__default["default"].useEffect(() => {
@@ -19,9 +21,11 @@
           setData(event.data.data);
         }
       });
-      return () => parent.postMessage({ type: "close", id }, window.location.origin);
+      return () => {
+        parent.postMessage({ type: "close", id }, window.location.origin);
+      };
     }, [id]);
-    return { data };
+    return { data, isClient };
   }
   function useEditState() {
     const [edit, setEdit] = React__default["default"].useState(false);
@@ -41,11 +45,11 @@
   const tinaField = (obj, field) => {
     var _a, _b, _c;
     if (!field) {
-      return `${(_a = obj.__meta__) == null ? void 0 : _a.id}#${(_b = obj.__meta__) == null ? void 0 : _b.name}`;
+      return `${(_a = obj._tina_metadata) == null ? void 0 : _a.id}#${(_b = obj._tina_metadata) == null ? void 0 : _b.name}`;
     }
-    if (obj == null ? void 0 : obj.__meta__) {
+    if (obj == null ? void 0 : obj._tina_metadata) {
       if (typeof field === "string") {
-        return `${(_c = obj.__meta__) == null ? void 0 : _c.id}#${obj.__meta__.fields[field]}`;
+        return `${(_c = obj._tina_metadata) == null ? void 0 : _c.id}#${obj._tina_metadata.fields[field]}`;
       }
     }
     return "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {
@@ -58,7 +58,7 @@
     "@react-hook/window-size": "^3.0.7",
     "@tinacms/schema-tools": "1.4.3",
     "@tinacms/sharedctx": "1.0.1",
-    "@tinacms/toolkit": "1.7.0",
+    "@tinacms/toolkit": "1.7.1",
     "crypto-js": "^4.0.0",
     "encoding": "0.1.13",
     "fetch-ponyfill": "^7.1.0",