@tinacms/cli 0.56.5 → 0.58.0

package/CHANGELOG.md

@@ -1,5 +1,52 @@
 # tinacms-cli
 
+## 0.58.0
+
+### Minor Changes
+
+- fa7a0419f: Adds experimental support for a data layer between file-based content and the GraphQL API. This allows documents to be indexed so the CMS can behave more like a traditional CMS, with the ability enforce foreign reference constraints and filtering/pagination capabilities.
+- 8c14f29ef: Updated cli to include a new option, `--noSDK`. When this flag is present it will not generate the SDK.
+
+### Patch Changes
+
+- 9c5f888a3: Modifies `tinacms init` for `TinaAdmin`-ready page
+- Updated dependencies [eb5fbfac7]
+- Updated dependencies [fa7a0419f]
+- Updated dependencies [47d126029]
+  - @tinacms/graphql@0.58.0
+
+## 0.57.2
+
+### Patch Changes
+
+- edb2f4011: Trim path property on collections during compilation
+- Updated dependencies [edb2f4011]
+  - @tinacms/graphql@0.57.2
+
+## 0.57.1
+
+### Patch Changes
+
+- 50710e1d0: Add no-check for Typescript-generated file
+- c78d981e6: Reset entire **generated** folder on re-compile
+- Updated dependencies [60729f60c]
+  - @tinacms/graphql@0.57.1
+
+## 0.57.0
+
+### Minor Changes
+
+- d1ed404ba: Add support for auto-generated SDK for type-safe data fetching
+
+### Patch Changes
+
+- 138ceb8c4: Clean up dependencies
+- Updated dependencies [138ceb8c4]
+- Updated dependencies [577d6a5ad]
+- Updated dependencies [ed277e3bd]
+- Updated dependencies [d1ed404ba]
+  - @tinacms/graphql@0.57.0
+
 ## 0.56.5
 
 ### Patch Changes

package/dist/cmds/compile/index.d.ts

@@ -11,5 +11,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import type { TinaCloudSchema } from '@tinacms/graphql';
+export declare const resetGeneratedFolder: () => Promise<void>;
 export declare const compile: (_ctx: any, _next: any) => Promise<void>;
 export declare const defineSchema: (config: TinaCloudSchema) => TinaCloudSchema;

package/dist/cmds/init/setup-files/index.d.ts

@@ -10,8 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-export declare const adminPage = "import { useEffect } from \"react\";\nimport { useRouter } from \"next/router\";\nimport { useEditState } from \"tinacms/dist/edit-state\";\n\nconst GoToEditPage = () => {\n  const { setEdit } = useEditState();\n  const router = useRouter();\n  useEffect(() => {\n    setEdit(true);\n    router.back();\n  }, []);\n  return <div>Entering edit mode..</div>;\n};\n\nexport default GoToEditPage;\n";
-export declare const exitAdminPage = "import { useEffect } from \"react\";\nimport { useRouter } from \"next/router\";\nimport { useEditState } from \"tinacms/dist/edit-state\";\n\nconst GoToEditPage = () => {\n  const { setEdit } = useEditState();\n  const router = useRouter();\n  useEffect(() => {\n    setEdit(false);\n    router.back();\n  }, []);\n  return <div>Exiting edit mode..</div>;;\n};\n\nexport default GoToEditPage;\n";
+export declare const adminPage = "import { TinaAdmin } from 'tinacms';\nexport default TinaAdmin;\n";
 export declare const blogPost = "---\ntitle: Vote For Pedro\n---\n# Welcome to the blog.\n\n> To edit this site head over to the [` /\n  admin`](/admin) route. Then click the pencil icon in the bottom lefthand corner to start editing \uD83E\uDD99. \n\n\n# Dixi gaude Arethusa\n\n## Oscula mihi\n\nLorem markdownum numerabilis armentorum platanus, cultros coniunx sibi per\nsilvas, nostris clausit sequemur diverso scopulosque. Fecit tum alta sed non\nfalcato murmura, geminas donata Amyntore, quoque Nox. Invitam inquit, modo\nnocte; ut ignis faciemque manes in imagine sinistra ut mucrone non ramos\nsepulcro supplex. Crescentesque populos motura, fit cumque. Verumque est; retro\nsibi tristia bracchia Aetola telae caruerunt et.\n\n\n## Mutato fefellimus sit demisit aut alterius sollicito\n\nPhaethonteos vestes quem involvite iuvenca; furiali anne: sati totumque,\n**corpora** cum rapacibus nunc! Nervis repetatne, miserabile doleas, deprensum\nhunc, fluctus Threicio, ad urbes, magicaeque, quid. Per credensque series adicis\npoteram [quidem](#)! Iam uni mensas victrix\nvittas ut flumina Satyri adulter; bellum iacet domitae repercusso truncis urnis\nmille rigidi sub taurum.\n\n\n";
 export declare const nextPostPage: () => string;
 export declare const AppJsContent: (extraImports?: string) => string;

package/dist/cmds/start-server/index.d.ts

@@ -13,8 +13,9 @@ limitations under the License.
 interface Options {
     port?: number;
     command?: string;
-    experimental?: boolean;
+    experimentalData?: boolean;
     noWatch?: boolean;
+    noSDK: boolean;
 }
-export declare function startServer(_ctx: any, _next: any, { port, command, experimental, noWatch }: Options): Promise<void>;
+export declare function startServer(_ctx: any, _next: any, { port, command, noWatch, experimentalData, noSDK }: Options): Promise<void>;
 export {};

package/dist/cmds/start-server/server.d.ts

@@ -12,5 +12,5 @@ limitations under the License.
 */
 /// <reference types="node" />
 import http from 'http';
-declare const gqlServer: () => Promise<http.Server>;
+declare const gqlServer: (database: any) => Promise<http.Server>;
 export default gqlServer;

package/dist/codegen/index.d.ts

@@ -11,4 +11,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import { GraphQLSchema } from 'graphql';
-export declare const generateTypes: (schema: GraphQLSchema) => Promise<string>;
+export declare const generateTypes: (schema: GraphQLSchema, queryPathGlob?: string, fragDocPath?: string, options?: {
+    noSDK: boolean;
+}) => Promise<string>;

package/dist/codegen/plugin.d.ts

@@ -0,0 +1,17 @@
+/**
+Copyright 2021 Forestry.io Holdings, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+import type { PluginFunction } from '@graphql-codegen/plugin-helpers';
+export declare const AddGeneratedClientFunc: PluginFunction;
+export declare const AddGeneratedClient: {
+    plugin: PluginFunction<any, import("@graphql-codegen/plugin-helpers").Types.PluginOutput>;
+};

package/dist/codegen/sdkPlugin/config.d.ts

@@ -0,0 +1,24 @@
+/**
+Copyright 2021 Forestry.io Holdings, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+import { RawClientSideBasePluginConfig } from '@graphql-codegen/visitor-plugin-common';
+/**
+ * This plugin generate a generic SDK (without any Requester implemented), allow you to easily customize the way you fetch your data, without loosing the strongly-typed integration.
+ */
+export interface RawGenericSdkPluginConfig extends RawClientSideBasePluginConfig {
+    /**
+     * usingObservableFrom: "import Observable from 'zen-observable';"
+     * OR
+     * usingObservableFrom: "import { Observable } from 'rxjs';"
+     */
+    usingObservableFrom?: string;
+}

package/dist/codegen/sdkPlugin/index.d.ts

@@ -0,0 +1,27 @@
+/**
+Copyright 2021 Forestry.io Holdings, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+/**
+ * PLEASE READ THIS:
+ *
+ * This plugin is directly copied from https://github.com/dotansimha/graphql-code-generator/tree/master/packages/plugins/typescript/generic-sdk
+ *
+ * The reason this was needed is because we had to modified the return type of the SDK client. We need to return {data, variables, query}. While the other one just returned the data.
+ *
+ * This is the same as the above link and may need to be updated time to time. (for example if we want to support GQL v16). There is only one line that differs from the original. (This is shown)
+ */
+import { PluginFunction, PluginValidateFn } from '@graphql-codegen/plugin-helpers';
+import { RawGenericSdkPluginConfig } from './config';
+import { GenericSdkVisitor } from './visitor';
+export declare const plugin: PluginFunction<RawGenericSdkPluginConfig>;
+export declare const validate: PluginValidateFn<any>;
+export { GenericSdkVisitor };

package/dist/codegen/sdkPlugin/visitor.d.ts

@@ -0,0 +1,24 @@
+/**
+Copyright 2021 Forestry.io Holdings, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+import { ClientSideBasePluginConfig, ClientSideBaseVisitor, LoadedFragment } from '@graphql-codegen/visitor-plugin-common';
+import { GraphQLSchema, OperationDefinitionNode } from 'graphql';
+import { RawGenericSdkPluginConfig } from './config';
+export interface GenericSdkPluginConfig extends ClientSideBasePluginConfig {
+    usingObservableFrom: string;
+}
+export declare class GenericSdkVisitor extends ClientSideBaseVisitor<RawGenericSdkPluginConfig, GenericSdkPluginConfig> {
+    private _operationsToInclude;
+    constructor(schema: GraphQLSchema, fragments: LoadedFragment[], rawConfig: RawGenericSdkPluginConfig);
+    protected buildOperation(node: OperationDefinitionNode, documentVariableName: string, operationType: string, operationResultType: string, operationVariablesTypes: string): string;
+    get sdkContent(): string;
+}

package/dist/index.js

@@ -25,22 +25,21 @@ var __toModule = (module2) => {
   return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/server.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/start-server/server.ts
 var server_exports = {};
 __export(server_exports, {
   default: () => server_default
 });
-var import_path2, import_cors, import_http, import_express, import_altair_express_middleware, import_body_parser, GITHUB_ACCESS_TOKEN, gqlServer, server_default;
+var import_cors, import_http, import_express, import_altair_express_middleware, import_body_parser, GITHUB_ACCESS_TOKEN, gqlServer, server_default;
 var init_server = __esm({
-  "pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/server.ts"() {
-    import_path2 = __toModule(require("path"));
+  "pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/start-server/server.ts"() {
     import_cors = __toModule(require("cors"));
     import_http = __toModule(require("http"));
     import_express = __toModule(require("express"));
     import_altair_express_middleware = __toModule(require("altair-express-middleware"));
     import_body_parser = __toModule(require("body-parser"));
     GITHUB_ACCESS_TOKEN = process.env.GITHUB_PERSONAL_ACCESS_TOKEN;
-    gqlServer = async () => {
+    gqlServer = async (database) => {
       const gqlPackage = require("@tinacms/graphql");
       const app = (0, import_express.default)();
       const server = import_http.default.createServer(app);
@@ -63,11 +62,10 @@ var init_server = __esm({
         }
       }`
       }));
-      const rootPath = import_path2.default.join(process.cwd());
       app.post("/graphql", async (req, res) => {
         const { query, variables } = req.body;
-        const result = await gqlPackage.gql({
-          rootPath,
+        const result = await gqlPackage.resolve({
+          database,
           query,
           variables
         });
@@ -109,18 +107,18 @@ var init_server = __esm({
   }
 });
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/index.ts
 __export(exports, {
   defineSchema: () => defineSchema,
   init: () => init
 });
 var commander = __toModule(require("commander"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/package.json
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/package.json
 var name = "@tinacms/cli";
-var version = "0.56.5";
+var version = "0.57.2";
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/utils/theme.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/utils/theme.ts
 var import_chalk = __toModule(require("chalk"));
 var successText = import_chalk.default.bold.green;
 var dangerText = import_chalk.default.bold.red;
@@ -131,7 +129,7 @@ var logText = import_chalk.default.italic.gray;
 var warnText = import_chalk.default.yellowBright.bgBlack;
 var CONFIRMATION_TEXT = import_chalk.default.dim("enter to confirm");
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/middleware.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/middleware.ts
 var chain = async (cmds, options) => {
   const ctx = {};
   const next = async (middlewareIndex) => {
@@ -150,10 +148,10 @@ var chain = async (cmds, options) => {
   }
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/logger/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/logger/index.ts
 var import_log4js = __toModule(require("log4js"));
 var logger = import_log4js.default.getLogger();
 import_log4js.default.configure({
@@ -164,36 +162,190 @@ import_log4js.default.configure({
 });
 logger.level = "info";
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
 async function attachSchema(ctx, next, options) {
   logger.info(logText("Building schema..."));
   const rootPath = process.cwd();
-  const schema = await (0, import_graphql.buildSchema)(rootPath);
+  const bridge = new import_graphql.FilesystemBridge(rootPath);
+  const store = new import_graphql.FilesystemStore({ rootPath });
+  const database = await (0, import_graphql.createDatabase)({ store, bridge });
+  const schema = await (0, import_graphql.buildSchema)(rootPath, database);
   ctx.schema = schema;
   next();
 }
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/codegen/index.ts
-var import_graphql2 = __toModule(require("graphql"));
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/codegen/index.ts
+var import_graphql5 = __toModule(require("graphql"));
 var import_core = __toModule(require("@graphql-codegen/core"));
 var import_typescript = __toModule(require("@graphql-codegen/typescript"));
 var import_typescript_operations = __toModule(require("@graphql-codegen/typescript-operations"));
-var generateTypes = async (schema) => {
+
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/codegen/plugin.ts
+var AddGeneratedClientFunc = (_schema, _documents, _config, _info) => {
+  return `
+// TinaSDK generated code
+import { getStaticPropsForTina } from 'tinacms'
+const requester: (doc: any, vars?: any, options?: any) => Promise<any> = async (
+  doc,
+  vars,
+  _options
+) => {
+  // const data = await tinaClient.request(doc, { variables: vars }); 
+  const res = await await getStaticPropsForTina({query: doc, variables: vars})
+  return res
+};
+
+/**
+ * @experimental this class can be used but may change in the future
+ **/
+export const ExperimentalGetTinaClient = ()=>getSdk(requester)
+`;
+};
+var AddGeneratedClient = {
+  plugin: AddGeneratedClientFunc
+};
+
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/codegen/sdkPlugin/index.ts
+var import_graphql3 = __toModule(require("graphql"));
+var import_graphql4 = __toModule(require("graphql"));
+var import_path = __toModule(require("path"));
+
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/codegen/sdkPlugin/visitor.ts
+var import_visitor_plugin_common = __toModule(require("@graphql-codegen/visitor-plugin-common"));
+var import_auto_bind = __toModule(require("auto-bind"));
+var import_graphql2 = __toModule(require("graphql"));
+var GenericSdkVisitor = class extends import_visitor_plugin_common.ClientSideBaseVisitor {
+  constructor(schema, fragments, rawConfig) {
+    super(schema, fragments, rawConfig, {
+      usingObservableFrom: rawConfig.usingObservableFrom
+    });
+    this._operationsToInclude = [];
+    (0, import_auto_bind.default)(this);
+    if (this.config.usingObservableFrom) {
+      this._additionalImports.push(this.config.usingObservableFrom);
+    }
+    if (this.config.documentMode !== import_visitor_plugin_common.DocumentMode.string) {
+    }
+  }
+  buildOperation(node, documentVariableName, operationType, operationResultType, operationVariablesTypes) {
+    if (node.name == null) {
+      throw new Error("Plugin 'generic-sdk' cannot generate SDK for unnamed operation.\n\n" + (0, import_graphql2.print)(node));
+    } else {
+      this._operationsToInclude.push({
+        node,
+        documentVariableName,
+        operationType,
+        operationResultType: `{data: ${operationResultType}, variables: ${operationVariablesTypes}, query: string}`,
+        operationVariablesTypes
+      });
+    }
+    return null;
+  }
+  get sdkContent() {
+    const usingObservable = !!this.config.usingObservableFrom;
+    const allPossibleActions = this._operationsToInclude.map((o) => {
+      const optionalVariables = !o.node.variableDefinitions || o.node.variableDefinitions.length === 0 || o.node.variableDefinitions.every((v) => v.type.kind !== import_graphql2.Kind.NON_NULL_TYPE || v.defaultValue);
+      const returnType = usingObservable && o.operationType === "Subscription" ? "Observable" : "Promise";
+      return `${o.node.name.value}(variables${optionalVariables ? "?" : ""}: ${o.operationVariablesTypes}, options?: C): ${returnType}<${o.operationResultType}> {
+    return requester<${o.operationResultType}, ${o.operationVariablesTypes}>(${o.documentVariableName}, variables, options);
+  }`;
+    }).map((s) => (0, import_visitor_plugin_common.indentMultiline)(s, 2));
+    return `export type Requester<C= {}> = <R, V>(doc: ${this.config.documentMode === import_visitor_plugin_common.DocumentMode.string ? "string" : "DocumentNode"}, vars?: V, options?: C) => ${usingObservable ? "Promise<R> & Observable<R>" : "Promise<R>"}
+  export function getSdk<C>(requester: Requester<C>) {
+    return {
+  ${allPossibleActions.join(",\n")}
+    };
+  }
+  export type Sdk = ReturnType<typeof getSdk>;`;
+  }
+};
+
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/codegen/sdkPlugin/index.ts
+var plugin = (schema, documents, config) => {
+  const allAst = (0, import_graphql4.concatAST)(documents.reduce((prev, v) => {
+    return [...prev, v.document];
+  }, []));
+  const allFragments = [
+    ...allAst.definitions.filter((d) => d.kind === import_graphql4.Kind.FRAGMENT_DEFINITION).map((fragmentDef) => ({
+      node: fragmentDef,
+      name: fragmentDef.name.value,
+      onType: fragmentDef.typeCondition.name.value,
+      isExternal: false
+    })),
+    ...config.externalFragments || []
+  ];
+  const visitor = new GenericSdkVisitor(schema, allFragments, config);
+  const visitorResult = (0, import_graphql3.visit)(allAst, { leave: visitor });
+  return {
+    prepend: visitor.getImports(),
+    content: [
+      visitor.fragments,
+      ...visitorResult.definitions.filter((t) => typeof t === "string"),
+      visitor.sdkContent
+    ].join("\n")
+  };
+};
+
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/codegen/index.ts
+var import_load = __toModule(require("@graphql-tools/load"));
+var import_graphql_file_loader = __toModule(require("@graphql-tools/graphql-file-loader"));
+var generateTypes = async (schema, queryPathGlob = process.cwd(), fragDocPath = process.cwd(), options = { noSDK: false }) => {
   logger.info("Generating types...");
   try {
+    let docs = [];
+    let fragDocs = [];
+    try {
+      if (!options.noSDK) {
+        docs = await (0, import_load.loadDocuments)(queryPathGlob, {
+          loaders: [new import_graphql_file_loader.GraphQLFileLoader()]
+        });
+      }
+    } catch (e) {
+      let showErrorMessage = true;
+      const message = e.message || "";
+      if (message.includes("Unable to find any GraphQL type definitions for the following pointers:")) {
+        showErrorMessage = false;
+      }
+      if (showErrorMessage) {
+        console.error(e);
+      }
+    }
+    try {
+      if (!options.noSDK) {
+        fragDocs = await (0, import_load.loadDocuments)(fragDocPath, {
+          loaders: [new import_graphql_file_loader.GraphQLFileLoader()]
+        });
+      }
+    } catch (error) {
+      console.error(error);
+    }
     const res = await (0, import_core.codegen)({
-      filename: process.cwd() + "/.forestry/autoschema.gql",
-      schema: (0, import_graphql2.parse)((0, import_graphql2.printSchema)(schema)),
-      documents: [],
+      filename: process.cwd(),
+      schema: (0, import_graphql5.parse)((0, import_graphql5.printSchema)(schema)),
+      documents: [...docs, ...fragDocs],
       config: {},
-      plugins: [{ typescript: {} }, { typescriptOperations: {} }],
+      plugins: [
+        { typescript: {} },
+        { typescriptOperations: {} },
+        {
+          typescriptSdk: {
+            gqlImport: "tinacms#gql",
+            documentNodeImport: "tinacms#DocumentNode"
+          }
+        },
+        { AddGeneratedClient: {} }
+      ],
       pluginMap: {
         typescript: {
           plugin: import_typescript.plugin
         },
         typescriptOperations: {
           plugin: import_typescript_operations.plugin
-        }
+        },
+        typescriptSdk: {
+          plugin
+        },
+        AddGeneratedClient
       }
     });
     return res;
@@ -202,17 +354,20 @@ var generateTypes = async (schema) => {
   }
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/genTypes.ts
-var import_graphql3 = __toModule(require("graphql"));
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/query-gen/genTypes.ts
+var import_graphql6 = __toModule(require("graphql"));
 var import_fs_extra = __toModule(require("fs-extra"));
 async function genTypes({ schema }, next, options) {
-  const typescriptTypes = await generateTypes(schema);
   const typesPath = process.cwd() + "/.tina/__generated__/types.ts";
-  await import_fs_extra.default.outputFile(typesPath, `// DO NOT MODIFY THIS FILE. This file is automatically generated by Tina
+  const fragPath = process.cwd() + "/.tina/__generated__/*.{graphql,gql}";
+  const queryPathGlob = process.cwd() + "/.tina/queries/**/*.{graphql,gql}";
+  const typescriptTypes = await generateTypes(schema, queryPathGlob, fragPath, options);
+  await import_fs_extra.default.outputFile(typesPath, `//@ts-nocheck
+// DO NOT MODIFY THIS FILE. This file is automatically generated by Tina
 ${typescriptTypes}
 `);
   logger.info(`Typescript types => ${successText(typesPath)}`);
-  const schemaString = await (0, import_graphql3.printSchema)(schema);
+  const schemaString = await (0, import_graphql6.printSchema)(schema);
   const schemaPath = process.cwd() + "/.tina/__generated__/schema.gql";
   await import_fs_extra.default.outputFile(schemaPath, `# DO NOT MODIFY THIS FILE. This file is automatically generated by Tina
 ${schemaString}
@@ -225,19 +380,19 @@ schema {
   next();
 }
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
 var import_child_process = __toModule(require("child_process"));
 var import_path3 = __toModule(require("path"));
-var import_graphql4 = __toModule(require("@tinacms/graphql"));
+var import_graphql7 = __toModule(require("@tinacms/graphql"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/compile/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/compile/index.ts
 var import_fast_glob = __toModule(require("fast-glob"));
 var import_normalize_path = __toModule(require("normalize-path"));
-var import_path = __toModule(require("path"));
+var import_path2 = __toModule(require("path"));
 var import_fs_extra2 = __toModule(require("fs-extra"));
 var ts = __toModule(require("typescript"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/compile/defaultSchema.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/compile/defaultSchema.ts
 var defaultSchema = `
 import { defineSchema } from "@tinacms/cli";
 
@@ -268,44 +423,54 @@ export default defineSchema({
 });
 `;
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/compile/index.ts
-var tinaPath = import_path.default.join(process.cwd(), ".tina");
-var tinaTempPath = import_path.default.join(process.cwd(), ".tina", "__generated__", "temp");
-var tinaConfigPath = import_path.default.join(process.cwd(), ".tina", "__generated__", "config");
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/compile/index.ts
+var tinaPath = import_path2.default.join(process.cwd(), ".tina");
+var tinaGeneratedPath = import_path2.default.join(tinaPath, "__generated__");
+var tinaTempPath = import_path2.default.join(tinaGeneratedPath, "temp");
+var tinaConfigPath = import_path2.default.join(tinaGeneratedPath, "config");
+var resetGeneratedFolder = async () => {
+  try {
+    await import_fs_extra2.default.rmdir(tinaGeneratedPath, {
+      recursive: true
+    });
+  } catch (e) {
+    console.log(e);
+  }
+  await import_fs_extra2.default.mkdir(tinaGeneratedPath);
+  await import_fs_extra2.default.outputFile(import_path2.default.join(tinaGeneratedPath, ".gitignore"), "db");
+};
 var compile = async (_ctx, _next) => {
   logger.info(logText("Compiling..."));
-  if (!import_fs_extra2.default.existsSync(tinaPath) || !import_fs_extra2.default.existsSync(import_path.default.join(tinaPath, "schema.ts"))) {
+  if (!import_fs_extra2.default.existsSync(tinaPath) || !import_fs_extra2.default.existsSync(import_path2.default.join(tinaPath, "schema.ts"))) {
     logger.info(dangerText(`
       .tina/schema.ts not found, Creating one for you...
       See Documentation: https://tina.io/docs/tina-cloud/cli/#getting-started"
       `));
-    const file = import_path.default.join(tinaPath, "schema.ts");
+    const file = import_path2.default.join(tinaPath, "schema.ts");
     await import_fs_extra2.default.ensureFile(file);
     await import_fs_extra2.default.writeFile(file, defaultSchema);
   }
-  await import_fs_extra2.default.remove(tinaTempPath);
-  await import_fs_extra2.default.remove(tinaConfigPath);
   await transpile2(tinaPath, tinaTempPath);
   Object.keys(require.cache).map((key) => {
     if (key.startsWith(tinaTempPath)) {
       delete require.cache[require.resolve(key)];
     }
   });
-  const schemaFunc = require(import_path.default.join(tinaTempPath, "schema.js"));
+  const schemaFunc = require(import_path2.default.join(tinaTempPath, "schema.js"));
   const schemaObject = schemaFunc.default;
-  await import_fs_extra2.default.outputFile(import_path.default.join(tinaConfigPath, "schema.json"), JSON.stringify(schemaObject, null, 2));
+  await import_fs_extra2.default.outputFile(import_path2.default.join(tinaConfigPath, "schema.json"), JSON.stringify(schemaObject, null, 2));
   await import_fs_extra2.default.remove(tinaTempPath);
 };
 var transpile2 = async (projectDir, tempDir) => {
   logger.info(logText("Transpiling..."));
   const posixProjectDir = (0, import_normalize_path.default)(projectDir);
   const posixTempDir = (0, import_normalize_path.default)(tempDir);
-  return Promise.all(import_fast_glob.default.sync(import_path.default.join(projectDir, "**", "*.ts").replace(/\\/g, "/"), {
+  return Promise.all(import_fast_glob.default.sync(import_path2.default.join(projectDir, "**", "*.ts").replace(/\\/g, "/"), {
     ignore: [
-      import_path.default.join(projectDir, "__generated__", "**", "*.ts").replace(/\\/g, "/")
+      import_path2.default.join(projectDir, "__generated__", "**", "*.ts").replace(/\\/g, "/")
     ]
   }).map(async function(file) {
-    const fullPath = import_path.default.resolve(file);
+    const fullPath = import_path2.default.resolve(file);
     const contents = await import_fs_extra2.default.readFileSync(fullPath).toString();
     const newContent = ts.transpile(contents);
     const newPath = file.replace(posixProjectDir, posixTempDir).replace(".ts", ".js");
@@ -317,10 +482,18 @@ var defineSchema = (config) => {
   return config;
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
 var import_chokidar = __toModule(require("chokidar"));
 var gqlPackageFile = require.resolve("@tinacms/graphql");
-async function startServer(_ctx, _next, { port = 4001, command, experimental, noWatch }) {
+async function startServer(_ctx, _next, { port = 4001, command, noWatch, experimentalData, noSDK }) {
+  const rootPath = process.cwd();
+  if (!process.env.CI && !noWatch) {
+    await resetGeneratedFolder();
+  }
+  const bridge = new import_graphql7.FilesystemBridge(rootPath);
+  const store = experimentalData ? new import_graphql7.LevelStore(rootPath) : new import_graphql7.FilesystemStore({ rootPath });
+  const shouldBuild = bridge.supportsBuilding();
+  const database = await (0, import_graphql7.createDatabase)({ store, bridge });
   const startSubprocess = () => {
     if (typeof command === "string") {
       const commands = command.split(" ");
@@ -343,38 +516,42 @@ stack: ${code.stack || "No stack was provided"}`);
       });
     }
   };
-  const rootPath = process.cwd();
   let ready = false;
   if (!noWatch && !process.env.CI) {
-    import_chokidar.default.watch(`${rootPath}/**/*.ts`, {
+    import_chokidar.default.watch([`${rootPath}/**/*.{ts,gql,graphql}`], {
       ignored: `${import_path3.default.resolve(rootPath)}/.tina/__generated__/**/*`
     }).on("ready", async () => {
       console.log("Generating Tina config");
       try {
-        await build();
+        if (shouldBuild) {
+          await build(noSDK);
+        }
         ready = true;
         startSubprocess();
       } catch (e) {
         logger.info(dangerText(`${e.message}`));
+        console.log(e);
         process.exit(0);
       }
     }).on("all", async () => {
       if (ready) {
         logger.info("Tina change detected, regenerating config");
         try {
-          await build();
+          if (shouldBuild) {
+            await build(noSDK);
+          }
         } catch (e) {
-          logger.info(dangerText("Compilation failed with errors. Server has not been restarted.") + `see error below 
+          logger.info(dangerText("Compilation failed with errors. Server has not been restarted.") + ` see error below 
  ${e.message}`);
         }
       }
     });
   }
-  const build = async () => {
+  const build = async (noSDK2) => {
     await compile(null, null);
-    const schema = await (0, import_graphql4.buildSchema)(rootPath);
+    const schema = await (0, import_graphql7.buildSchema)(rootPath, database);
     await genTypes({ schema }, () => {
-    }, {});
+    }, { noSDK: noSDK2 });
   };
   const state = {
     server: null,
@@ -383,7 +560,7 @@ stack: ${code.stack || "No stack was provided"}`);
   let isReady = false;
   const start = async () => {
     const s = (init_server(), server_exports);
-    state.server = await s.default(experimental);
+    state.server = await s.default(database);
     state.server.listen(port, () => {
       logger.info(`Started Filesystem GraphQL server on port: ${port}`);
       logger.info(`Visit the playground at http://localhost:${port}/altair/`);
@@ -431,44 +608,15 @@ stack: ${code.stack || "No stack was provided"}`);
   }
 }
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/init/index.ts
 var import_fs_extra3 = __toModule(require("fs-extra"));
 var import_path4 = __toModule(require("path"));
 var import_progress = __toModule(require("progress"));
 var import_prompts = __toModule(require("prompts"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/setup-files/index.ts
-var adminPage = `import { useEffect } from "react";
-import { useRouter } from "next/router";
-import { useEditState } from "tinacms/dist/edit-state";
-
-const GoToEditPage = () => {
-  const { setEdit } = useEditState();
-  const router = useRouter();
-  useEffect(() => {
-    setEdit(true);
-    router.back();
-  }, []);
-  return <div>Entering edit mode..</div>;
-};
-
-export default GoToEditPage;
-`;
-var exitAdminPage = `import { useEffect } from "react";
-import { useRouter } from "next/router";
-import { useEditState } from "tinacms/dist/edit-state";
-
-const GoToEditPage = () => {
-  const { setEdit } = useEditState();
-  const router = useRouter();
-  useEffect(() => {
-    setEdit(false);
-    router.back();
-  }, []);
-  return <div>Exiting edit mode..</div>;;
-};
-
-export default GoToEditPage;
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/init/setup-files/index.ts
+var adminPage = `import { TinaAdmin } from 'tinacms';
+export default TinaAdmin;
 `;
 var blogPost = `---
 title: Vote For Pedro
@@ -773,7 +921,6 @@ const App = ({ Component, pageProps }) => {
           <TinaCMS
             clientId={process.env.NEXT_PUBLIC_TINA_CLIENT_ID}
             branch={process.env.NEXT_PUBLIC_EDIT_BRANCH}
-            organization={process.env.NEXT_PUBLIC_ORGANIZATION_NAME}
             isLocalClient={Boolean(
               Number(process.env.NEXT_PUBLIC_USE_LOCAL_CLIENT ?? true)
             )}
@@ -792,7 +939,7 @@ const App = ({ Component, pageProps }) => {
 export default App
 `;
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/init/index.ts
 var import_chalk2 = __toModule(require("chalk"));
 function execShellCommand(cmd) {
   const exec = require("child_process").exec;
@@ -885,52 +1032,13 @@ async function tinaSetup(ctx, next, options) {
     }
   }, null, 2);
   (0, import_fs_extra3.writeFileSync)(packagePath, newPack);
-  const adminPath = import_path4.default.join(pagesPath, "admin.tsx");
-  const adminPathJS = import_path4.default.join(pagesPath, "admin.js");
-  if (!import_fs_extra3.default.existsSync(adminPath) && !import_fs_extra3.default.existsSync(adminPathJS)) {
-    import_fs_extra3.default.writeFileSync(adminPathJS, adminPage);
-  } else {
-    const extension = import_fs_extra3.default.existsSync(adminPath) ? ".tsx" : "js";
-    const override = await (0, import_prompts.default)({
-      name: "override",
-      type: "confirm",
-      message: `Whoops... looks like you already have an admin${extension} do you want to override it?`
-    });
-    if (override.override) {
-      import_fs_extra3.default.writeFileSync(import_path4.default.join(pagesPath, "admin" + extension), adminPage);
-    } else {
-      const res = await (0, import_prompts.default)({
-        name: "name",
-        type: "text",
-        message: warnText("What would you like the route to be named that enters edit mode?: ")
-      });
-      const adminName = res.name || "admin";
-      import_fs_extra3.default.writeFileSync(import_path4.default.join(pagesPath, adminName + extension), adminPage);
-    }
-  }
-  const exitAdminPath = import_path4.default.join(pagesPath, "exit-admin.tsx");
-  const exitAdminPathJS = import_path4.default.join(pagesPath, "exit-admin.js");
-  if (!import_fs_extra3.default.existsSync(exitAdminPath) && !import_fs_extra3.default.existsSync(exitAdminPathJS)) {
-    import_fs_extra3.default.writeFileSync(exitAdminPathJS, exitAdminPage);
-  } else {
-    const extension = import_fs_extra3.default.existsSync(exitAdminPath) ? ".tsx" : "js";
-    const override = await (0, import_prompts.default)({
-      name: "override",
-      type: "confirm",
-      message: `Whoops... looks like you already have an exit-admin${extension} do you want to override it?`
-    });
-    if (override.override) {
-      import_fs_extra3.default.writeFileSync(import_path4.default.join(pagesPath, "exit-admin" + extension), exitAdminPage);
-    } else {
-      const res = await (0, import_prompts.default)({
-        name: "name",
-        type: "text",
-        message: warnText("What would you like the route to be named that exits edit mode?: ")
-      });
-      const adminName = res.name || "exit-admin";
-      import_fs_extra3.default.writeFileSync(import_path4.default.join(pagesPath, adminName + extension), exitAdminPage);
-    }
+  const adminPath = import_path4.default.join(pagesPath, "admin", "[[...tina]].js");
+  if (import_fs_extra3.default.pathExistsSync(import_path4.default.join(pagesPath, "admin"))) {
+    logger.warn(`Unable to add /pages/admin/[[...tina]].js, this path already exists.
+	Learn more about toggling edit-mode at https://tina.io/docs/tinacms-context/#manually-toggling-edit-mode`);
+    return next();
   }
+  (0, import_fs_extra3.outputFileSync)(adminPath, adminPage);
   next();
 }
 async function successMessage(ctx, next, options) {
@@ -942,7 +1050,7 @@ Enjoy Tina \u{1F999} !
   next();
 }
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/baseCmds.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/baseCmds.ts
 var CMD_GEN_TYPES = "schema:types";
 var CMD_START_SERVER = "server:start";
 var CMD_COMPILE_MODELS = "schema:compile";
@@ -951,40 +1059,50 @@ var startServerPortOption = {
   name: "--port <port>",
   description: "Specify a port to run the server on. (default 4001)"
 };
+var experimentalDatalayer = {
+  name: "--experimentalData",
+  description: "Build the server with additional data querying capabilities"
+};
 var subCommand = {
   name: "-c, --command <command>",
   description: "The sub-command to run"
 };
-var experimentalCommand = {
-  name: "--experimental",
-  description: "Run the unstable version of this service"
-};
 var noWatchOption = {
   name: "--noWatch",
   description: "Don't regenerate config on file changes"
 };
+var noSDKCodegenOption = {
+  name: "--noSDK",
+  description: "Don't generate the generated client SDK"
+};
 var baseCmds = [
   {
     command: CMD_START_SERVER,
     description: "Start Filesystem Graphql Server",
-    options: [startServerPortOption, subCommand, experimentalCommand, noWatchOption],
+    options: [
+      startServerPortOption,
+      subCommand,
+      experimentalDatalayer,
+      noWatchOption,
+      noSDKCodegenOption
+    ],
     action: (options) => chain([startServer], options)
   },
   {
     command: CMD_COMPILE_MODELS,
     description: "Compile schema into static files for the server",
-    options: [experimentalCommand],
+    options: [experimentalDatalayer],
     action: (options) => chain([compile], options)
   },
   {
     command: CMD_GEN_TYPES,
     description: "Generate a GraphQL query for your site's schema, (and optionally Typescript types)",
-    options: [experimentalCommand],
+    options: [experimentalDatalayer, noSDKCodegenOption],
     action: (options) => chain([attachSchema, genTypes], options)
   },
   {
     command: INIT,
-    options: [experimentalCommand],
+    options: [experimentalDatalayer],
     description: "Add Tina Cloud to an existing project",
     action: (options) => chain([
       initTina,
@@ -1001,7 +1119,7 @@ var baseCmds = [
   }
 ];
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/index.ts
 var program = new commander.Command(name);
 var registerCommands = (commands, noHelp = false) => {
   commands.forEach((command, i) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.56.5",
+  "version": "0.58.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -21,7 +21,7 @@
     ]
   },
   "devDependencies": {
-    "@tinacms/scripts": "0.50.3",
+    "@tinacms/scripts": "0.50.4",
     "@types/clear": "0.1.0",
     "@types/cors": "2.8.5",
     "@types/express": "^4.17.7",
@@ -38,24 +38,28 @@
     "@types/progress": "^2.0.3",
     "@types/prompts": "^2.0.13",
     "@types/yup": "^0.29.11",
-    "jest": "^27.0.6",
-    "ts-jest": "^26.5.3"
+    "jest": "^27.0.6"
   },
   "scripts": {
-    "build": "yarn tsup src/index.ts --format cjs --dts",
-    "watch": "yarn tsup src/index.ts --watch --format cjs --dts",
+    "build": "echo \"Run `yarn build` from the root of the repository instead\"",
     "test": "jest --passWithNoTests",
     "types": "yarn tsc",
     "test-watch": "jest  --passWithNoTests --watch",
     "generate:schema": "yarn node scripts/generateSchema.js"
   },
   "dependencies": {
-    "@graphql-codegen/core": "^1.17.0",
-    "@graphql-codegen/typescript": "^1.17.0",
-    "@graphql-codegen/typescript-operations": "^1.17.0",
-    "@tinacms/graphql": "0.56.1",
+    "@graphql-codegen/core": "^2.1.0",
+    "@graphql-codegen/plugin-helpers": "latest",
+    "@graphql-codegen/typescript": "^2.2.2",
+    "@graphql-codegen/typescript-generic-sdk": "^2.1.4",
+    "@graphql-codegen/typescript-operations": "^2.1.4",
+    "@graphql-codegen/visitor-plugin-common": "^2.4.0",
+    "@graphql-tools/graphql-file-loader": "^7.2.0",
+    "@graphql-tools/load": "^7.3.2",
+    "@tinacms/graphql": "0.58.0",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",
+    "auto-bind": "^4.0.0",
     "axios": "0.19.0",
     "body-parser": "^1.19.0",
     "chalk": "^2.4.2",
@@ -74,7 +78,6 @@
     "normalize-path": "^3.0.0",
     "progress": "^2.0.3",
     "prompts": "^2.4.1",
-    "tsup": "4.6.1",
     "typescript": "^4.3.5",
     "yup": "^0.32.9"
   },