tinacms 1.2.1 → 1.3.0

package/dist/internalClient/index.d.ts

@@ -1,11 +1,8 @@
-/**
-
-*/
 import { TokenObject } from '../auth/authenticate';
 import { BranchData, EventBus } from '@tinacms/toolkit';
 import { DocumentNode, GraphQLSchema } from 'graphql';
 import gql from 'graphql-tag';
-import { TinaSchema, TinaCloudSchema } from '@tinacms/schema-tools';
+import { TinaSchema, Schema } from '@tinacms/schema-tools';
 export declare type OnLoginFunc = (args: {
     token: TokenObject;
 }) => Promise<void>;
@@ -16,7 +13,7 @@ export declare type TinaIOConfig = {
     contentApiUrlOverride?: string;
 };
 interface ServerOptions {
-    schema?: TinaCloudSchema<false>;
+    schema?: Schema;
     clientId: string;
     branch: string;
     customContentApiUrl?: string;
@@ -24,6 +21,90 @@ interface ServerOptions {
     tinaioConfig?: TinaIOConfig;
     tokenStorage?: 'MEMORY' | 'LOCAL_STORAGE' | 'CUSTOM';
 }
+/**
+ * The function you pass to `asyncPoll` should return a promise
+ * that resolves with object that satisfies this interface.
+ *
+ * The `done` property indicates to the async poller whether to
+ * continue polling or not.
+ *
+ * When done is `true` that means you've got what you need
+ * and the poller will resolve with `data`.
+ *
+ * When done is `false` taht means you don't have what you need
+ * and the poller will continue polling.
+ */
+export interface AsyncData<T> {
+    done: boolean;
+    data?: T;
+}
+/**
+ * Your custom function you provide to the async poller should
+ * satisfy this interface. Your function returns a promise that
+ * resolves with `AsyncData` to indicate to the poller whether
+ * you have what you need or we should continue polling.
+ */
+export interface AsyncFunction<T> extends Function {
+    (): PromiseLike<AsyncData<T>>;
+}
+/**
+* How to repeatedly call an async function until get a desired result.
+*
+* Inspired by the following gist:
+* https://gist.github.com/twmbx/2321921670c7e95f6fad164fbdf3170e#gistcomment-3053587
+* https://davidwalsh.name/javascript-polling
+*
+* Usage:
+  asyncPoll(
+      async (): Promise<AsyncData<any>> => {
+          try {
+              const result = await getYourAsyncResult();
+              if (result.isWhatYouWant) {
+                  return Promise.resolve({
+                      done: true,
+                      data: result,
+                  });
+              } else {
+                  return Promise.resolve({
+                      done: false
+                  });
+              }
+          } catch (err) {
+              return Promise.reject(err);
+          }
+      },
+      500,    // interval
+      15000,  // timeout
+  );
+*/
+export declare function asyncPoll<T>(
+/**
+ * Function to call periodically until it resolves or rejects.
+ *
+ * It should resolve as soon as possible indicating if it found
+ * what it was looking for or not. If not then it will be reinvoked
+ * after the `pollInterval` if we haven't timed out.
+ *
+ * Rejections will stop the polling and be propagated.
+ */
+fn: AsyncFunction<T>, 
+/**
+ * Milliseconds to wait before attempting to resolve the promise again.
+ * The promise won't be called concurrently. This is the wait period
+ * after the promise has resolved/rejected before trying again for a
+ * successful resolve so long as we haven't timed out.
+ *
+ * Default 5 seconds.
+ */
+pollInterval?: number, 
+/**
+ * Max time to keep polling to receive a successful resolved response.
+ * If the promise never resolves before the timeout then this method
+ * rejects with a timeout error.
+ *
+ * Default 30 seconds.
+ */
+pollTimeout?: number): Promise<T>;
 export declare class Client {
     onLogin?: OnLoginFunc;
     onLogout?: () => Promise<void>;
@@ -74,10 +155,6 @@ export declare class Client {
      * }
      */
     getOptimizedQuery: (documentNode: DocumentNode) => Promise<DocumentNode>;
-    requestWithForm<ReturnType>(query: (gqlTag: typeof gql) => DocumentNode, { variables, useUnstableFormify, }: {
-        variables: any;
-        useUnstableFormify?: boolean;
-    }): Promise<ReturnType>;
     request<ReturnType>(query: ((gqlTag: typeof gql) => DocumentNode) | string, { variables }: {
         variables: object;
     }): Promise<ReturnType>;
@@ -121,14 +198,34 @@ export declare class Client {
         delinquencyDate: number;
         billingState: 'current' | 'late' | 'delinquent';
     }>;
-    listBranches(): Promise<any>;
+    waitForIndexStatus({ ref }: {
+        ref: string;
+    }): Promise<any>;
+    getIndexStatus({ ref }: {
+        ref: string;
+    }): Promise<{
+        status?: "unknown" | "complete" | "failed" | "inprogress";
+        timestamp?: number;
+    }>;
+    listBranches(): Promise<{
+        indexStatus: {
+            status?: "unknown" | "complete" | "failed" | "inprogress";
+            timestamp?: number;
+        };
+        name?: string;
+        protected?: boolean;
+        commit?: {
+            url?: string;
+            sha?: string;
+        };
+    }[]>;
     createBranch({ baseBranch, branchName }: BranchData): Promise<string>;
 }
 export declare const DEFAULT_LOCAL_TINA_GQL_SERVER_URL = "http://localhost:4001/graphql";
 export declare class LocalClient extends Client {
     constructor(props?: {
         customContentApiUrl?: string;
-        schema?: TinaCloudSchema<false>;
+        schema?: Schema;
     } & Omit<ServerOptions, 'clientId' | 'branch'>);
     get isLocalMode(): boolean;
     logout(): Promise<void>;

package/dist/style.css

@@ -375,6 +375,15 @@
   margin-left: auto;
   margin-right: auto;
 }
+.tina-tailwind .mb-6 {
+  margin-bottom: 24px;
+}
+.tina-tailwind .mr-1 {
+  margin-right: 4px;
+}
+.tina-tailwind .mb-8 {
+  margin-bottom: 32px;
+}
 .tina-tailwind .-ml-px {
   margin-left: -1px;
 }
@@ -408,18 +417,12 @@
 .tina-tailwind .mr-1\.5 {
   margin-right: 6px;
 }
-.tina-tailwind .mr-1 {
-  margin-right: 4px;
-}
 .tina-tailwind .block {
   display: block;
 }
 .tina-tailwind .inline-block {
   display: inline-block;
 }
-.tina-tailwind .inline {
-  display: inline;
-}
 .tina-tailwind .flex {
   display: flex;
 }
@@ -462,6 +465,12 @@
 .tina-tailwind .w-10 {
   width: 40px;
 }
+.tina-tailwind .w-12 {
+  width: 48px;
+}
+.tina-tailwind .w-7 {
+  width: 28px;
+}
 .tina-tailwind .w-auto {
   width: auto;
 }
@@ -657,6 +666,10 @@
   --tw-bg-opacity: 1;
   background-color: rgb(255 255 255 / var(--tw-bg-opacity));
 }
+.tina-tailwind .bg-gray-100 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(237 236 243 / var(--tw-bg-opacity));
+}
 .tina-tailwind .bg-gray-50 {
   --tw-bg-opacity: 1;
   background-color: rgb(246 246 249 / var(--tw-bg-opacity));
@@ -699,6 +712,9 @@
 .tina-tailwind .to-black {
   --tw-gradient-to: #000;
 }
+.tina-tailwind .fill-current {
+  fill: currentColor;
+}
 .tina-tailwind .px-4 {
   padding-left: 16px;
   padding-right: 16px;
@@ -793,14 +809,18 @@
   font-size: 16px;
   line-height: 1.5;
 }
-.tina-tailwind .text-sm {
-  font-size: 14px;
-  line-height: 1.43;
+.tina-tailwind .text-4xl {
+  font-size: 36px;
+  line-height: 1.1;
 }
 .tina-tailwind .text-xl {
   font-size: 20px;
   line-height: 1.4;
 }
+.tina-tailwind .text-sm {
+  font-size: 14px;
+  line-height: 1.43;
+}
 .tina-tailwind .text-md {
   font-size: 16px;
   line-height: 1.5;
@@ -841,6 +861,14 @@
   --tw-text-opacity: 1;
   color: rgb(67 62 82 / var(--tw-text-opacity));
 }
+.tina-tailwind .text-red-500 {
+  --tw-text-opacity: 1;
+  color: rgb(239 68 68 / var(--tw-text-opacity));
+}
+.tina-tailwind .text-red-400 {
+  --tw-text-opacity: 1;
+  color: rgb(248 113 113 / var(--tw-text-opacity));
+}
 .tina-tailwind .text-blue-600 {
   --tw-text-opacity: 1;
   color: rgb(5 116 228 / var(--tw-text-opacity));
@@ -876,13 +904,12 @@
   --tw-text-opacity: 1;
   color: rgb(37 35 54 / var(--tw-text-opacity));
 }
-.tina-tailwind .text-red-500 {
-  --tw-text-opacity: 1;
-  color: rgb(239 68 68 / var(--tw-text-opacity));
-}
 .tina-tailwind .underline {
   text-decoration-line: underline;
 }
+.tina-tailwind .opacity-70 {
+  opacity: .7;
+}
 .tina-tailwind .opacity-100 {
   opacity: 1;
 }
@@ -901,9 +928,6 @@
 .tina-tailwind .opacity-50 {
   opacity: .5;
 }
-.tina-tailwind .opacity-70 {
-  opacity: .7;
-}
 .tina-tailwind .shadow-lg {
   --tw-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
   --tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color);

package/dist/tina-cms.d.ts

@@ -2,7 +2,6 @@
 
 */
 /// <reference types="react" />
-import type { formifyCallback } from './hooks/use-graphql-forms';
 import { useDocumentCreatorPlugin } from './hooks/use-content-creator';
 import { TinaCMSProviderDefaultProps } from './types/cms';
 /**
@@ -12,10 +11,6 @@ import { TinaCMSProviderDefaultProps } from './types/cms';
  */
 export declare const TinaCMSProvider2: ({ query, documentCreatorCallback, formifyCallback, schema, ...props }: TinaCMSProviderDefaultProps) => JSX.Element;
 export declare type DocumentCreatorCallback = Parameters<typeof useDocumentCreatorPlugin>[0];
-export declare const TinaDataProvider: ({ children, formifyCallback, }: {
-    children: any;
-    formifyCallback: formifyCallback;
-}) => JSX.Element;
 /**
  * @deprecated v0.62.0: Use `staticRequest` and a "try catch" block instead. see https://tina.io/docs/features/data-fetching/#querying-tina-content-in-nextjs for more details
  *

package/dist/types/cms.d.ts

@@ -3,7 +3,7 @@
 */
 /// <reference types="react" />
 import type { TinaCMS } from '@tinacms/toolkit';
-import type { TinaCloudSchema, TinaCloudSchemaConfig } from '@tinacms/schema-tools';
+import type { Schema, Config } from '@tinacms/schema-tools';
 import type { TinaCloudMediaStoreClass } from '../auth';
 import type { useDocumentCreatorPlugin } from '../hooks/use-content-creator';
 import type { formifyCallback } from '../hooks/use-graphql-forms';
@@ -30,7 +30,7 @@ interface BaseProviderProps {
     /** TinaCMS media store instance */
     mediaStore?: TinaCloudMediaStoreClass | (() => Promise<TinaCloudMediaStoreClass>);
     tinaioConfig?: TinaIOConfig;
-    schema?: TinaCloudSchema<false>;
+    schema?: Schema;
 }
 declare type QueryProviderProps = {
     /** Your React page component */
@@ -51,5 +51,5 @@ declare type QueryProviderProps = {
     /** The `data` from getStaticProps */
     data?: never;
 };
-export declare type TinaCMSProviderDefaultProps = QueryProviderProps & APIProviderProps & BaseProviderProps & TinaCloudSchemaConfig;
+export declare type TinaCMSProviderDefaultProps = QueryProviderProps & APIProviderProps & BaseProviderProps & Config;
 export {};

package/dist/utils/index.d.ts

@@ -4,7 +4,7 @@
 import { Client } from '../internalClient';
 import type { TinaIOConfig } from '../internalClient';
 import * as yup from 'yup';
-import { TinaCloudSchema } from '@tinacms/schema-tools';
+import { Schema } from '@tinacms/schema-tools';
 export interface CreateClientProps {
     clientId?: string;
     isLocalClient?: boolean;
@@ -12,7 +12,7 @@ export interface CreateClientProps {
     owner?: string;
     repo?: string;
     branch?: string;
-    schema?: TinaCloudSchema<false>;
+    schema?: Schema;
     apiUrl?: string;
 }
 export declare const createClient: ({ clientId, isLocalClient, branch, tinaioConfig, schema, apiUrl, }: CreateClientProps) => Client;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {
@@ -51,13 +51,14 @@
   "typings": "dist/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
+    "@graphql-inspector/core": "^4.0.0",
     "@graphql-tools/relay-operation-optimizer": "^6.4.1",
     "@headlessui/react": "^1.5.0",
     "@heroicons/react": "^1.0.4",
     "@react-hook/window-size": "^3.0.7",
-    "@tinacms/schema-tools": "1.3.1",
+    "@tinacms/schema-tools": "1.3.3",
     "@tinacms/sharedctx": "1.0.1",
-    "@tinacms/toolkit": "1.3.3",
+    "@tinacms/toolkit": "1.4.0",
     "crypto-js": "^4.0.0",
     "encoding": "0.1.13",
     "fetch-ponyfill": "^7.1.0",
@@ -68,7 +69,8 @@
     "prism-react-renderer": "^1.3.5",
     "react-icons": "^4.3.1",
     "react-router-dom": "6",
-    "yup": "^0.32.0"
+    "yup": "^0.32.0",
+    "zod": "^3.14.3"
   },
   "devDependencies": {
     "@graphql-tools/utils": "^8.6.1",
@@ -76,7 +78,7 @@
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^7.0.2",
     "@testing-library/user-event": "^12.7.0",
-    "@tinacms/scripts": "1.0.2",
+    "@tinacms/scripts": "1.0.3",
     "@types/jest": "^27.0.1",
     "@types/lodash": "^4.14.169",
     "@types/node": "^14.0.13",

package/dist/hooks/formify/formify-utils.d.ts

@@ -1,81 +0,0 @@
-/**
-
-*/
-import * as G from 'graphql';
-import type { BlueprintPath } from './types';
-/**
- *
- * This check ensures that at type is a Document, but only one
- * that can be "formified". When using `Node` or `Document`, those
- * query fields should not have forms generated since they can't contain
- * fields.
- *
- * ```graphql
- * # Can be formified
- * {
- *   getPostDocument(relativePath: "") {
- *     data {
- *       title
- *     }
- *   }
- * }
- * ```
- *
- * ```graphql
- * # cannot be formified, even though it is a document field
- * {
- *   getPostDocument(relativePath: "") {
- *     ...on Document {
- *       id
- *     }
- *   }
- * }
- * ```
- */
-export declare const isFormifiableDocument: (t: G.GraphQLOutputType) => boolean;
-export declare const isScalarType: (t: G.GraphQLOutputType) => boolean;
-export declare const isConnectionField: (t: G.GraphQLOutputType) => boolean;
-/**
- * Selects the appropriate field from a GraphQLObject based on the selection's name
- */
-export declare const getObjectField: (object: G.GraphQLOutputType, selectionNode: G.FieldNode) => G.GraphQLField<any, any, {
-    [key: string]: any;
-}>;
-/**
- * Selects the appropriate type from a union based on the selection's typeCondition
- *
- * ```graphql
- * post {
- *    # would return PostDocument
- *   ...on PostDocument { ... }
- * }
- * ```
- */
-export declare const getSelectedUnionType: (unionType: G.GraphQLOutputType, selectionNode: G.InlineFragmentNode) => any;
-/**
- * Checks if the given type is a list type. Even though
- * this function is built-in to GraphQL it doesn't handle
- * the scenario where the list type is wrapped in a non-null
- * type, so the extra check here is needed.
- */
-export declare function isListType(type: unknown): boolean;
-/**
- *
- * Throws an error if the provided type is not a GraphQLUnionType
- */
-export declare function ensureOperationDefinition(type: G.DefinitionNode): asserts type is G.OperationDefinitionNode;
-/**
- * Generates the name and alias information for a given field node
- * and appends it to a shallow copy of the path provided
- */
-export declare function buildPath({ fieldNode, type, parentTypename, path, }: {
-    fieldNode: G.FieldNode;
-    type: G.GraphQLOutputType;
-    parentTypename?: string;
-    path?: BlueprintPath[];
-}): BlueprintPath[];
-export declare const metaFields: G.SelectionNode[];
-export declare const getRelativeBlueprint: (path: BlueprintPath[]) => string;
-export declare const isSysField: (fieldNode: G.FieldNode) => boolean;
-export declare const getBlueprintId: (path: BlueprintPath[]) => string;
-export declare const getFieldAliasForBlueprint: (path: BlueprintPath[]) => string;

package/dist/hooks/formify/formify.d.ts

@@ -1,13 +0,0 @@
-/**
-
-*/
-import * as G from 'graphql';
-import type { DocumentBlueprint } from './types';
-export declare const formify: ({ schema, query, getOptimizedQuery, }: {
-    schema: G.GraphQLSchema;
-    query: string;
-    getOptimizedQuery: (query: G.DocumentNode) => Promise<G.DocumentNode>;
-}) => Promise<{
-    formifiedQuery: G.DocumentNode;
-    blueprints: DocumentBlueprint[];
-}>;

package/dist/hooks/formify/index.d.ts

@@ -1,16 +0,0 @@
-/**
-
-*/
-import type { TinaCMS } from '@tinacms/toolkit';
-import { formify } from './formify';
-import { onSubmitArgs } from '../use-graphql-forms';
-import type { OnChangeEvent, State } from './types';
-export { formify };
-export declare const useFormify: ({ query, cms, variables, onSubmit, formify: formifyFunc, eventList, }: {
-    query?: string;
-    cms: TinaCMS;
-    variables: object;
-    onSubmit?: (args: onSubmitArgs) => void;
-    formify: any;
-    eventList?: OnChangeEvent[];
-}) => State;

package/dist/hooks/formify/reducer.d.ts

@@ -1,18 +0,0 @@
-/**
-
-*/
-import { FormNode, State, Action, OnChangeEvent } from './types';
-export declare function reducer(state: State, action: Action): State;
-export declare const buildChangeSet: (event: OnChangeEvent, formNode: FormNode) => {
-    fieldDefinition: {
-        name: string;
-        type: "string" | "object" | "reference";
-        list?: boolean;
-        parentTypename: string;
-    };
-    name: string;
-    formId: string;
-    mutationType: import("./types").ChangeMutation | import("./types").ReferenceChangeMutation | import("./types").InsertMutation | import("./types").MoveMutation | import("./types").RemoveMutation | import("./types").ResetMutation | import("./types").GlobalMutation;
-    value: unknown;
-    formNode: FormNode;
-};

package/dist/hooks/formify/spec/runner.d.ts

@@ -1,4 +0,0 @@
-/**
-
-*/
-export declare const testRunner: (query: any, events: any, dirname: any, expectNoChange?: boolean) => Promise<void>;

package/dist/hooks/formify/spec/schema.d.ts

@@ -1,3 +0,0 @@
-declare const schema: any;
-export declare const tinaConfig: import("@tinacms/schema-tools/dist/types").Config<(cms: import("@tinacms/toolkit/dist/tina-cms").TinaCMS) => import("@tinacms/toolkit/dist/tina-cms").TinaCMS, import("../../use-graphql-forms").formifyCallback, import("../../use-content-creator").DocumentCreatorArgs, undefined>;
-export default schema;

package/dist/hooks/formify/spec/util.d.ts

@@ -1,16 +0,0 @@
-/**
-
-*/
-import { TinaCMS } from '@tinacms/toolkit';
-import 'isomorphic-fetch';
-/**
- * We're just mocking the tina api so we can mimic the real-world getSchema
- */
-declare const cms: TinaCMS;
-export declare const printOutput: (event: any, previous: any, after: any) => string;
-export { printState } from '../util';
-export declare function sleep(ms: any): Promise<unknown>;
-export { cms };
-export declare const sequential: <A, B>(items: A[], callback: (args: A, idx: number) => Promise<B>) => Promise<B[]>;
-export declare const buildFileOutput: (dirname: any) => string;
-export declare const buildMarkdownOutput: (dirname: any, counter: any) => string;