@tinacms/cli 0.61.9 → 0.61.10

package/dist/buildTina/attachPath.d.ts

@@ -11,3 +11,4 @@
  limitations under the License.
  */
 export declare const attachPath: (ctx: any, next: () => void, _options: any) => Promise<void>;
+export declare const isProjectTs: (rootPath: string) => Promise<boolean>;

package/dist/buildTina/index.d.ts

@@ -10,24 +10,17 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  */
-import { Bridge, Database } from '@tinacms/graphql';
-import { Store } from '@tinacms/datalayer';
-interface BuildOptions {
-    ctx: any;
-    database: Database;
-    store: Store;
-    bridge: Bridge;
-    /** In some cases (like audit) there's no need to build the SPA */
-    buildFrontend?: boolean;
-    noWatch?: boolean;
-    isomorphicGitBridge?: boolean;
+import { Database } from '@tinacms/graphql';
+import { DocumentNode } from 'graphql';
+interface ClientGenOptions {
+    noSDK?: boolean;
+    local?: boolean;
     verbose?: boolean;
+}
+interface BuildOptions {
     dev?: boolean;
-    local?: boolean;
-    noSDK?: boolean;
-    beforeBuild?: () => Promise<any>;
-    afterBuild?: () => Promise<any>;
-    skipIndex?: boolean;
+    verbose?: boolean;
+    rootPath?: string;
 }
 interface BuildSetupOptions {
     isomorphicGitBridge?: boolean;
@@ -38,7 +31,32 @@ export declare const buildSetupCmdServerStart: (ctx: any, next: () => void, opts
 export declare const buildSetupCmdAudit: (ctx: any, next: () => void, options: {
     clean: boolean;
 }) => Promise<void>;
-export declare const buildCmdBuild: (ctx: any, next: () => void, options: Omit<BuildOptions & BuildSetupOptions, 'bridge' | 'database' | 'store'>) => Promise<void>;
-export declare const auditCmdBuild: (ctx: any, next: () => void, options: Omit<BuildOptions & BuildSetupOptions, 'bridge' | 'database' | 'store'>) => Promise<void>;
-export declare const build: ({ noWatch, ctx, bridge, database, store, beforeBuild, afterBuild, dev, local, verbose, buildFrontend, noSDK, skipIndex, }: BuildOptions) => Promise<void>;
+export declare const buildCmdBuild: (ctx: {
+    builder: ConfigBuilder;
+    rootPath: string;
+    usingTs: boolean;
+}, next: () => void, options: Omit<BuildOptions & BuildSetupOptions & ClientGenOptions, 'bridge' | 'database' | 'store'>) => Promise<void>;
+export declare const auditCmdBuild: (ctx: {
+    builder: ConfigBuilder;
+    rootPath: string;
+    database: Database;
+}, next: () => void, options: Omit<BuildOptions & BuildSetupOptions, 'bridge' | 'database' | 'store'>) => Promise<void>;
+export declare class ConfigBuilder {
+    private database;
+    constructor(database: Database);
+    build({ dev, verbose, rootPath }: BuildOptions): Promise<{
+        schema: any;
+        graphQLSchema: DocumentNode;
+        tinaSchema: any;
+    }>;
+    genTypedClient({ usingTs, compiledSchema, noSDK, verbose, local, }: ClientGenOptions & {
+        usingTs: boolean;
+        compiledSchema: any;
+    }): Promise<void>;
+}
+export declare const buildAdmin: ({ schema, local, rootPath, }: {
+    schema: any;
+    local: boolean;
+    rootPath: string;
+}) => Promise<void>;
 export {};

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

@@ -10,4 +10,4 @@ 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 defaultSchema = "\nimport { defineSchema, defineConfig } from 'tinacms'\nimport { client } from './__generated__/client'\n\n\nconst branch =\n  process.env.NEXT_PUBLIC_TINA_BRANCH ||\n  process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_REF ||\n  process.env.HEAD ||\n  'main'\nconst schema = defineSchema({\n  // See https://tina.io/docs/tina-cloud/connecting-site/ for more information about this config\n  config: {\n    token: '<Your Read Only Token>', // generated on app.tina.io,\n    clientId: '<Your Client ID>', // generated on app.tina.io\n    branch,\n  },\n  collections: [\n    {\n      label: 'Blog Posts',\n      name: 'post',\n      path: 'content/posts',\n      format: 'mdx',\n      fields: [\n        {\n          type: 'string',\n          label: 'Title',\n          name: 'title',\n        },\n        {\n          type: 'rich-text',\n          label: 'Blog Post Body',\n          name: 'body',\n          isBody: true,\n          templates: [\n            {\n              name: 'PageSection',\n              label: 'Page Section',\n              fields: [\n                {\n                  type: 'string',\n                  name: 'heading',\n                  label: 'Heading',\n                },\n                {\n                  type: 'string',\n                  name: 'content',\n                  label: 'Content',\n                  ui: {\n                    component: 'textarea',\n                  },\n                },\n              ],\n            },\n          ],\n        },\n      ],\n    },\n  ],\n})\n\nexport default schema\n\n// Your tina config\n\nexport const tinaConfig = defineConfig({\n  client,\n  schema,\n  cmsCallback: (cms) => {\n    //  add your CMS callback code here (if you want)\n\n    // The Route Mapper\n    /**\n     * 1. Import `tinacms` and `RouteMappingPlugin`\n     **/\n    import('tinacms').then(({ RouteMappingPlugin }) => {\n      /**\n       * 2. Define the `RouteMappingPlugin` see https://tina.io/docs/tinacms-context/#the-routemappingplugin for more details\n       **/\n      const RouteMapping = new RouteMappingPlugin((collection, document) => {\n        return undefined\n      })\n      /**\n       * 3. Add the `RouteMappingPlugin` to the `cms`.\n       **/\n      cms.plugins.add(RouteMapping)\n    })\n\n    return cms\n  },\n})\n\n";
+export declare const defaultSchema = "\nimport { defineSchema, defineConfig } from 'tinacms'\nimport { client } from './__generated__/client'\n\n\nconst branch =\n  process.env.NEXT_PUBLIC_TINA_BRANCH ||\n  process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_REF ||\n  process.env.HEAD ||\n  'main'\nconst schema = defineSchema({\n  // See https://tina.io/docs/tina-cloud/connecting-site/ for more information about this config\n  config: {\n    token: '<Your Read Only Token>', // generated on app.tina.io,\n    clientId: '<Your Client ID>', // generated on app.tina.io\n    branch,\n  },\n  collections: [\n    {\n      label: 'Blog Posts',\n      name: 'post',\n      path: 'content/posts',\n      format: 'mdx',\n      ui: {\n        router: ({ document }) => {\n          // This can be used to add contextual editing to your site. See https://tina.io/docs/tinacms-context/#accessing-contextual-editing-from-the-cms for more information.\n          return `/demo/blog/${document._sys.filename}`\n        },\n      },\n      fields: [\n        {\n          type: 'string',\n          label: 'Title',\n          name: 'title',\n        },\n        {\n          type: 'rich-text',\n          label: 'Blog Post Body',\n          name: 'body',\n          isBody: true,\n          templates: [\n            {\n              name: 'PageSection',\n              label: 'Page Section',\n              fields: [\n                {\n                  type: 'string',\n                  name: 'heading',\n                  label: 'Heading',\n                },\n                {\n                  type: 'string',\n                  name: 'content',\n                  label: 'Content',\n                  ui: {\n                    component: 'textarea',\n                  },\n                },\n              ],\n            },\n          ],\n        },\n      ],\n    },\n  ],\n})\n\nexport default schema\n\n// Your tina config\n\nexport const tinaConfig = defineConfig({\n  client,\n  schema,\n})\n\n";

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

@@ -20,14 +20,16 @@ export declare const compileClient: (ctx: any, next: any, options: {
     verbose?: boolean;
     dev?: boolean;
 }) => Promise<any>;
-export declare const compileFile: (ctx: any, _next: any, options: {
+export declare const compileFile: (options: {
     schemaFileType?: string;
     verbose?: boolean;
     dev?: boolean;
+    rootPath: string;
 }, fileName: string) => Promise<{}>;
-export declare const compileSchema: (ctx: any, _next: any, options: {
+export declare const compileSchema: (options: {
     schemaFileType?: string;
     verbose?: boolean;
     dev?: boolean;
-}) => Promise<void>;
+    rootPath;
+}) => Promise<any>;
 export declare const defineSchema: (config: TinaCloudSchema) => TinaCloudSchema;

package/dist/cmds/query-gen/index.d.ts

@@ -10,5 +10,4 @@ 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 * from './attachSchema';
 export * from './genTypes';

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

@@ -10,12 +10,12 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  */
+import type { Bridge, Database } from '@tinacms/graphql';
+import { ConfigBuilder } from '../../buildTina';
 interface Options {
     port?: number;
     command?: string;
     watchFolders?: string[];
-    experimentalData?: boolean;
-    isomorphicGitBridge?: boolean;
     noWatch?: boolean;
     noSDK: boolean;
     noTelemetry: boolean;
@@ -23,5 +23,11 @@ interface Options {
     dev?: boolean;
     local: boolean;
 }
-export declare function startServer(ctx: any, next: any, { port, noWatch, isomorphicGitBridge, noSDK, noTelemetry, watchFolders, verbose, dev, local, }: Options): Promise<void>;
+export declare function startServer(ctx: {
+    builder: ConfigBuilder;
+    rootPath: string;
+    database: Database;
+    bridge: Bridge;
+    usingTs: boolean;
+}, next: any, { port, noWatch, noSDK, noTelemetry, watchFolders, verbose, dev, }: Options): Promise<void>;
 export {};

package/dist/index.js

@@ -70,11 +70,11 @@ var init_utils = __esm({
 });
 
 // src/server/models/media.ts
-var import_fs_extra7, import_path9, MediaModel;
+var import_fs_extra8, import_path10, MediaModel;
 var init_media = __esm({
   "src/server/models/media.ts"() {
-    import_fs_extra7 = __toModule(require("fs-extra"));
-    import_path9 = __toModule(require("path"));
+    import_fs_extra8 = __toModule(require("fs-extra"));
+    import_path10 = __toModule(require("path"));
     init_utils();
     MediaModel = class {
       constructor({ publicFolder, mediaRoot }) {
@@ -83,12 +83,12 @@ var init_media = __esm({
       }
       async listMedia(args) {
         try {
-          const folderPath = (0, import_path9.join)(this.publicFolder, this.mediaRoot, args.searchPath);
+          const folderPath = (0, import_path10.join)(this.publicFolder, this.mediaRoot, args.searchPath);
           const searchPath = parseMediaFolder(args.searchPath);
-          const filesStr = await import_fs_extra7.default.readdir(folderPath);
+          const filesStr = await import_fs_extra8.default.readdir(folderPath);
           const filesProm = filesStr.map(async (file) => {
-            const filePath = (0, import_path9.join)(folderPath, file);
-            const stat = await import_fs_extra7.default.stat(filePath);
+            const filePath = (0, import_path10.join)(folderPath, file);
+            const stat = await import_fs_extra8.default.stat(filePath);
             let src = `/${file}`;
             const isFile = stat.isFile();
             if (!isFile) {
@@ -144,9 +144,9 @@ var init_media = __esm({
       }
       async deleteMedia(args) {
         try {
-          const file = (0, import_path9.join)(this.publicFolder, this.mediaRoot, args.searchPath);
-          await import_fs_extra7.default.stat(file);
-          await import_fs_extra7.default.remove(file);
+          const file = (0, import_path10.join)(this.publicFolder, this.mediaRoot, args.searchPath);
+          await import_fs_extra8.default.stat(file);
+          await import_fs_extra8.default.remove(file);
           return { ok: true };
         } catch (error) {
           console.error(error);
@@ -158,15 +158,15 @@ var init_media = __esm({
 });
 
 // src/server/routes/index.ts
-var import_express, import_path10, import_multer, createMediaRouter;
+var import_express, import_path11, import_multer, createMediaRouter;
 var init_routes = __esm({
   "src/server/routes/index.ts"() {
     import_express = __toModule(require("express"));
-    import_path10 = __toModule(require("path"));
+    import_path11 = __toModule(require("path"));
     import_multer = __toModule(require("multer"));
     init_media();
     createMediaRouter = (config) => {
-      const mediaFolder = (0, import_path10.join)(process.cwd(), config.publicFolder, config.mediaRoot);
+      const mediaFolder = (0, import_path11.join)(process.cwd(), config.publicFolder, config.mediaRoot);
       const storage = import_multer.default.diskStorage({
         destination: function(req, file, cb) {
           cb(null, mediaFolder);
@@ -293,7 +293,7 @@ var commander = __toModule(require("commander"));
 
 // package.json
 var name = "@tinacms/cli";
-var version = "0.61.9";
+var version = "0.61.10";
 
 // src/cmds/audit/audit.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
@@ -992,7 +992,7 @@ async function tinaSetup(_ctx, next, _options) {
   }
   if (!import_fs_extra.default.existsSync(TinaProviderPath) && !import_fs_extra.default.existsSync(TinaDynamicProvider)) {
     import_fs_extra.default.mkdirpSync(componentFolder);
-    import_fs_extra.default.writeFileSync(TinaProviderPath, TinaProvider.replace(/'\.\.\/schema\.ts'/, `'../schema.${_ctx.schemaFileType || "ts"}'`));
+    import_fs_extra.default.writeFileSync(TinaProviderPath, TinaProvider.replace(/'\.\.\/schema\.ts'/, `'../schema.${_ctx.usingTs ? "ts" : "js"}'`));
     import_fs_extra.default.writeFileSync(TinaDynamicProvider, TinaProviderDynamic);
   }
   logger.level = "info";
@@ -1085,6 +1085,9 @@ var chain = async (cmds, options) => {
       await cmds[middlewareIndex](ctx, () => next(middlewareIndex + 1), options || {});
     } catch (err) {
       console.error(`  ${dangerText(err)}`);
+      if (err.stack) {
+        console.log(err.stack);
+      }
       process.exit(1);
     }
   };
@@ -1163,6 +1166,12 @@ const schema = defineSchema({
       name: 'post',
       path: 'content/posts',
       format: 'mdx',
+      ui: {
+        router: ({ document }) => {
+          // This can be used to add contextual editing to your site. See https://tina.io/docs/tinacms-context/#accessing-contextual-editing-from-the-cms for more information.
+          return \`/demo/blog/\${document._sys.filename}\`
+        },
+      },
       fields: [
         {
           type: 'string',
@@ -1208,28 +1217,6 @@ export default schema
 export const tinaConfig = defineConfig({
   client,
   schema,
-  cmsCallback: (cms) => {
-    //  add your CMS callback code here (if you want)
-
-    // The Route Mapper
-    /**
-     * 1. Import \`tinacms\` and \`RouteMappingPlugin\`
-     **/
-    import('tinacms').then(({ RouteMappingPlugin }) => {
-      /**
-       * 2. Define the \`RouteMappingPlugin\` see https://tina.io/docs/tinacms-context/#the-routemappingplugin for more details
-       **/
-      const RouteMapping = new RouteMappingPlugin((collection, document) => {
-        return undefined
-      })
-      /**
-       * 3. Add the \`RouteMappingPlugin\` to the \`cms\`.
-       **/
-      cms.plugins.add(RouteMapping)
-    })
-
-    return cms
-  },
 })
 
 `;
@@ -1369,8 +1356,8 @@ var compileClient = async (ctx, next, options) => {
   }
   return next();
 };
-var compileFile = async (ctx, _next, options, fileName) => {
-  const root2 = ctx.rootPath;
+var compileFile = async (options, fileName) => {
+  const root2 = options.rootPath;
   if (!root2) {
     throw new Error("ctx.rootPath has not been attached");
   }
@@ -1391,9 +1378,6 @@ var compileFile = async (ctx, _next, options, fileName) => {
   if (!schemaFileType2) {
     throw new Error(`Requested schema file type '${requestedSchemaFileType}' is not valid. Supported schema file types: 'ts, js, tsx, jsx'`);
   }
-  if (ctx) {
-    ctx.schemaFileType = schemaFileType2;
-  }
   let schemaExists = true;
   try {
     getPath({
@@ -1451,14 +1435,14 @@ var compileFile = async (ctx, _next, options, fileName) => {
   }
   return returnObject;
 };
-var compileSchema = async (ctx, _next, options) => {
-  const root2 = ctx.rootPath;
+var compileSchema = async (options) => {
+  const root2 = options.rootPath;
   const tinaPath = import_path4.default.join(root2, ".tina");
   const tinaGeneratedPath = import_path4.default.join(tinaPath, "__generated__");
   const tinaConfigPath = import_path4.default.join(tinaGeneratedPath, "config");
-  let schema = await compileFile(ctx, _next, options, "schema");
+  let schema = await compileFile(options, "schema");
   try {
-    const config = await compileFile(ctx, _next, options, "config");
+    const config = await compileFile(options, "config");
     const configCopy = _.cloneDeep(config);
     delete configCopy.schema;
     if (config == null ? void 0 : config.schema) {
@@ -1466,8 +1450,8 @@ var compileSchema = async (ctx, _next, options) => {
     }
   } catch (e) {
   }
-  ctx.schema = schema;
   await import_fs_extra3.default.outputFile(import_path4.default.join(tinaConfigPath, `schema.json`), JSON.stringify(schema, null, 2));
+  return schema;
 };
 var transpile = async (inputFile, outputFile, tempDir, verbose, define, packageJSONFilePath) => {
   if (verbose)
@@ -1537,29 +1521,36 @@ var loaders = {
 };
 
 // src/cmds/start-server/index.ts
-var import_path11 = __toModule(require("path"));
+var import_path12 = __toModule(require("path"));
 var import_chalk6 = __toModule(require("chalk"));
 var import_chokidar = __toModule(require("chokidar"));
 var import_metrics3 = __toModule(require("@tinacms/metrics"));
 
-// src/buildTina/index.ts
-var import_async_retry = __toModule(require("async-retry"));
-var import_fs_extra6 = __toModule(require("fs-extra"));
-var import_graphql10 = __toModule(require("@tinacms/graphql"));
-var import_datalayer2 = __toModule(require("@tinacms/datalayer"));
-var import_path8 = __toModule(require("path"));
+// src/cmds/start-server/lock.ts
+var AsyncLock = class {
+  constructor() {
+    this.disable = () => {
+    };
+    this.promise = Promise.resolve();
+  }
+  enable() {
+    this.promise = new Promise((resolve2) => this.disable = resolve2);
+  }
+};
 
-// src/cmds/query-gen/attachSchema.ts
-var import_graphql4 = __toModule(require("@tinacms/graphql"));
+// src/buildTina/index.ts
+var import_fs_extra7 = __toModule(require("fs-extra"));
+var import_graphql9 = __toModule(require("@tinacms/graphql"));
 var import_datalayer = __toModule(require("@tinacms/datalayer"));
+var import_path9 = __toModule(require("path"));
 
 // src/cmds/query-gen/genTypes.ts
-var import_graphql9 = __toModule(require("graphql"));
+var import_graphql8 = __toModule(require("graphql"));
 var import_fs_extra4 = __toModule(require("fs-extra"));
 var import_path6 = __toModule(require("path"));
 
 // src/codegen/index.ts
-var import_graphql8 = __toModule(require("graphql"));
+var import_graphql7 = __toModule(require("graphql"));
 
 // src/codegen/plugin.ts
 var AddGeneratedClientFunc = (_schema, _documents, _config, _info) => {
@@ -1611,14 +1602,14 @@ var import_typescript_operations = __toModule(require("@graphql-codegen/typescri
 var import_typescript = __toModule(require("@graphql-codegen/typescript"));
 
 // src/codegen/sdkPlugin/index.ts
+var import_graphql5 = __toModule(require("graphql"));
 var import_graphql6 = __toModule(require("graphql"));
-var import_graphql7 = __toModule(require("graphql"));
 var import_path5 = __toModule(require("path"));
 
 // 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_graphql5 = __toModule(require("graphql"));
+var import_graphql4 = __toModule(require("graphql"));
 var GenericSdkVisitor = class extends import_visitor_plugin_common.ClientSideBaseVisitor {
   constructor(schema, fragments, rawConfig) {
     super(schema, fragments, rawConfig, {
@@ -1634,7 +1625,7 @@ var GenericSdkVisitor = class extends import_visitor_plugin_common.ClientSideBas
   }
   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_graphql5.print)(node));
+      throw new Error("Plugin 'generic-sdk' cannot generate SDK for unnamed operation.\n\n" + (0, import_graphql4.print)(node));
     } else {
       this._operationsToInclude.push({
         node,
@@ -1649,7 +1640,7 @@ var GenericSdkVisitor = class extends import_visitor_plugin_common.ClientSideBas
   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_graphql5.Kind.NON_NULL_TYPE || v.defaultValue);
+      const optionalVariables = !o.node.variableDefinitions || o.node.variableDefinitions.length === 0 || o.node.variableDefinitions.every((v) => v.type.kind !== import_graphql4.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);
@@ -1667,11 +1658,11 @@ var GenericSdkVisitor = class extends import_visitor_plugin_common.ClientSideBas
 
 // src/codegen/sdkPlugin/index.ts
 var plugin = (schema, documents, config) => {
-  const allAst = (0, import_graphql7.concatAST)(documents.reduce((prev, v) => {
+  const allAst = (0, import_graphql6.concatAST)(documents.reduce((prev, v) => {
     return [...prev, v.document];
   }, []));
   const allFragments = [
-    ...allAst.definitions.filter((d) => d.kind === import_graphql7.Kind.FRAGMENT_DEFINITION).map((fragmentDef) => ({
+    ...allAst.definitions.filter((d) => d.kind === import_graphql6.Kind.FRAGMENT_DEFINITION).map((fragmentDef) => ({
       node: fragmentDef,
       name: fragmentDef.name.value,
       onType: fragmentDef.typeCondition.name.value,
@@ -1680,7 +1671,7 @@ var plugin = (schema, documents, config) => {
     ...config.externalFragments || []
   ];
   const visitor = new GenericSdkVisitor(schema, allFragments, config);
-  const visitorResult = (0, import_graphql6.visit)(allAst, { leave: visitor });
+  const visitorResult = (0, import_graphql5.visit)(allAst, { leave: visitor });
   return {
     content: [
       visitor.fragments,
@@ -1697,64 +1688,53 @@ var generateTypes = async (schema, queryPathGlob = process.cwd(), fragDocPath =
 }) => {
   if (options.verbose)
     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);
+  let docs = [];
+  let fragDocs = [];
+  if (!options.noSDK) {
+    docs = await loadGraphQLDocuments(queryPathGlob);
+    fragDocs = await loadGraphQLDocuments(fragDocPath);
+  }
+  const res = await (0, import_core.codegen)({
+    filename: process.cwd(),
+    schema: (0, import_graphql7.parse)((0, import_graphql7.printSchema)(schema)),
+    documents: [...docs, ...fragDocs],
+    config: {},
+    plugins: [
+      { typescript: {} },
+      { typescriptOperations: {} },
+      {
+        typescriptSdk: {}
+      },
+      { AddGeneratedClient: {} }
+    ],
+    pluginMap: {
+      typescript: {
+        plugin: import_typescript.plugin
+      },
+      typescriptOperations: {
+        plugin: import_typescript_operations.plugin
+      },
+      typescriptSdk: {
+        plugin
+      },
+      AddGeneratedClient
     }
-    const res = await (0, import_core.codegen)({
-      filename: process.cwd(),
-      schema: (0, import_graphql8.parse)((0, import_graphql8.printSchema)(schema)),
-      documents: [...docs, ...fragDocs],
-      config: {},
-      plugins: [
-        { typescript: {} },
-        { typescriptOperations: {} },
-        {
-          typescriptSdk: {}
-        },
-        { AddGeneratedClient: {} }
-      ],
-      pluginMap: {
-        typescript: {
-          plugin: import_typescript.plugin
-        },
-        typescriptOperations: {
-          plugin: import_typescript_operations.plugin
-        },
-        typescriptSdk: {
-          plugin
-        },
-        AddGeneratedClient
-      }
+  });
+  return res;
+};
+var loadGraphQLDocuments = async (globPath) => {
+  let result = [];
+  try {
+    result = await (0, import_load.loadDocuments)(globPath, {
+      loaders: [new import_graphql_file_loader.GraphQLFileLoader()]
     });
-    return res;
   } catch (e) {
-    console.error(e);
+    if ((e.message || "").includes("Unable to find any GraphQL type definitions for the following pointers:")) {
+    } else {
+      throw e;
+    }
   }
+  return result;
 };
 
 // src/cmds/query-gen/genTypes.ts
@@ -1815,7 +1795,7 @@ async function genTypes({ schema, usingTs }, next, options) {
     const jsCode = await (0, import_esbuild2.transform)(code, { loader: "ts" });
     await import_fs_extra4.default.outputFile(typesJSPath, jsCode.code);
   }
-  const schemaString = await (0, import_graphql9.printSchema)(schema);
+  const schemaString = await (0, import_graphql8.printSchema)(schema);
   const schemaPath = process.cwd() + "/.tina/__generated__/schema.gql";
   await import_fs_extra4.default.outputFile(schemaPath, `# DO NOT MODIFY THIS FILE. This file is automatically generated by Tina
 ${schemaString}
@@ -1919,161 +1899,156 @@ async function spin({
   return res;
 }
 
+// src/buildTina/attachPath.ts
+var import_fs_extra6 = __toModule(require("fs-extra"));
+var import_path8 = __toModule(require("path"));
+var attachPath = async (ctx, next, _options) => {
+  ctx.rootPath = process.cwd();
+  ctx.usingTs = await isProjectTs(ctx.rootPath);
+  next();
+};
+var isProjectTs = async (rootPath2) => {
+  const tinaPath = import_path8.default.join(rootPath2, ".tina");
+  return await (0, import_fs_extra6.pathExists)(import_path8.default.join(tinaPath, "schema.ts")) || await (0, import_fs_extra6.pathExists)(import_path8.default.join(tinaPath, "schema.tsx"));
+};
+
 // src/buildTina/index.ts
 var buildSetupCmdBuild = async (ctx, next, opts) => {
   const rootPath2 = ctx.rootPath;
-  const { bridge, database, store } = await buildSetup(__spreadProps(__spreadValues({}, opts), {
+  const { bridge, database } = await buildSetup(__spreadProps(__spreadValues({}, opts), {
     rootPath: rootPath2,
     useMemoryStore: true
   }));
   ctx.bridge = bridge;
   ctx.database = database;
-  ctx.store = store;
+  ctx.builder = new ConfigBuilder(database);
   next();
 };
 var buildSetupCmdServerStart = async (ctx, next, opts) => {
   const rootPath2 = ctx.rootPath;
-  const { bridge, database, store } = await buildSetup(__spreadProps(__spreadValues({}, opts), {
+  const { bridge, database } = await buildSetup(__spreadProps(__spreadValues({}, opts), {
     rootPath: rootPath2,
     useMemoryStore: false
   }));
   ctx.bridge = bridge;
   ctx.database = database;
-  ctx.store = store;
+  ctx.builder = new ConfigBuilder(database);
   next();
 };
 var buildSetupCmdAudit = async (ctx, next, options) => {
   const rootPath2 = ctx.rootPath;
-  const bridge = options.clean ? new import_datalayer2.FilesystemBridge(rootPath2) : new import_datalayer2.AuditFileSystemBridge(rootPath2);
-  const store = new import_datalayer2.LevelStore(rootPath2, false);
-  const database = await (0, import_graphql10.createDatabase)({ store, bridge });
+  const bridge = options.clean ? new import_datalayer.FilesystemBridge(rootPath2) : new import_datalayer.AuditFileSystemBridge(rootPath2);
+  const store = new import_datalayer.LevelStore(rootPath2, false);
+  const database = await (0, import_graphql9.createDatabase)({ store, bridge });
   ctx.bridge = bridge;
   ctx.database = database;
-  ctx.store = store;
+  ctx.builder = new ConfigBuilder(database);
   next();
 };
 var buildSetup = async ({
   isomorphicGitBridge: isomorphicGitBridge2,
-  experimentalData,
   rootPath: rootPath2,
   useMemoryStore
 }) => {
-  const fsBridge = new import_datalayer2.FilesystemBridge(rootPath2);
+  const fsBridge = new import_datalayer.FilesystemBridge(rootPath2);
   const isomorphicOptions = isomorphicGitBridge2 && await makeIsomorphicOptions(fsBridge);
-  const bridge = isomorphicGitBridge2 ? new import_datalayer2.IsomorphicBridge(rootPath2, isomorphicOptions) : fsBridge;
-  const store = new import_datalayer2.LevelStore(rootPath2, useMemoryStore);
-  const database = await (0, import_graphql10.createDatabase)({ store, bridge });
+  const bridge = isomorphicGitBridge2 ? new import_datalayer.IsomorphicBridge(rootPath2, isomorphicOptions) : fsBridge;
+  const store = new import_datalayer.LevelStore(rootPath2, useMemoryStore);
+  const database = await (0, import_graphql9.createDatabase)({ store, bridge });
   return { database, bridge, store };
 };
 var buildCmdBuild = async (ctx, next, options) => {
-  const bridge = ctx.bridge;
-  const database = ctx.database;
-  const store = ctx.store;
-  await build2(__spreadProps(__spreadValues({}, options), {
-    bridge,
-    database,
-    store,
-    ctx,
-    skipIndex: true
-  }));
+  const { schema } = await ctx.builder.build(__spreadValues({
+    rootPath: ctx.rootPath
+  }, options));
+  await ctx.builder.genTypedClient({
+    compiledSchema: schema,
+    local: options.local,
+    noSDK: options.noSDK,
+    verbose: options.verbose,
+    usingTs: ctx.usingTs
+  });
+  await buildAdmin({
+    local: options.local,
+    rootPath: ctx.rootPath,
+    schema
+  });
   next();
 };
 var auditCmdBuild = async (ctx, next, options) => {
-  const bridge = ctx.bridge;
-  const database = ctx.database;
-  const store = ctx.store;
-  await build2(__spreadProps(__spreadValues({}, options), {
-    local: true,
-    verbose: true,
-    bridge,
-    database,
-    store,
-    buildFrontend: false,
-    ctx
+  const { graphQLSchema, tinaSchema } = await ctx.builder.build(__spreadProps(__spreadValues({
+    rootPath: ctx.rootPath
+  }, options), {
+    verbose: true
   }));
+  await ctx.database.indexContent({ graphQLSchema, tinaSchema });
   next();
 };
-var build2 = async ({
-  noWatch,
-  ctx,
-  bridge,
-  database,
-  store,
-  beforeBuild,
-  afterBuild,
-  dev,
-  local,
-  verbose,
-  buildFrontend = true,
-  noSDK,
-  skipIndex
-}) => {
-  var _a, _b;
-  const rootPath2 = ctx.rootPath;
-  if (!rootPath2) {
-    throw new Error("Root path has not been attached");
-  }
-  const tinaGeneratedPath = import_path8.default.join(rootPath2, ".tina", "__generated__");
-  database.clearCache();
-  if (beforeBuild) {
-    await beforeBuild();
+var ConfigBuilder = class {
+  constructor(database) {
+    this.database = database;
   }
-  try {
-    await import_fs_extra6.default.mkdirp(tinaGeneratedPath);
-    await store.close();
+  async build({ dev, verbose, rootPath: rootPath2 }) {
+    const usingTs = await isProjectTs(rootPath2);
+    if (!rootPath2) {
+      throw new Error("Root path has not been attached");
+    }
+    const tinaGeneratedPath = import_path9.default.join(rootPath2, ".tina", "__generated__");
+    this.database.clearCache();
+    await import_fs_extra7.default.mkdirp(tinaGeneratedPath);
+    await this.database.store.close();
     await resetGeneratedFolder({
       tinaGeneratedPath,
-      usingTs: ctx.usingTs
+      usingTs
     });
-    await store.open();
-    const cliFlags = [];
-    cliFlags.push("experimentalData");
-    cliFlags.push("isomorphicGitBridge");
-    const database2 = await (0, import_graphql10.createDatabase)({ store, bridge });
-    await compileSchema(ctx, null, { verbose, dev });
-    const schema = await (0, import_async_retry.default)(async () => await (0, import_graphql10.buildSchema)(rootPath2, database2, cliFlags, skipIndex));
-    await genTypes({ schema, usingTs: ctx.usingTs }, () => {
+    await this.database.store.open();
+    const compiledSchema = await compileSchema({
+      verbose,
+      dev,
+      rootPath: rootPath2
+    });
+    const { graphQLSchema, tinaSchema } = await (0, import_graphql9.buildSchema)(rootPath2, this.database, ["experimentalData", "isomorphicGitBridge"]);
+    return { schema: compiledSchema, graphQLSchema, tinaSchema };
+  }
+  async genTypedClient({
+    usingTs,
+    compiledSchema,
+    noSDK,
+    verbose,
+    local
+  }) {
+    const astSchema = await (0, import_graphql9.getASTSchema)(this.database);
+    await genTypes({ schema: astSchema, usingTs }, () => {
     }, {
       noSDK,
       verbose
     });
-    await genClient({ tinaSchema: ctx.schema, usingTs: ctx.usingTs }, () => {
+    await genClient({ tinaSchema: compiledSchema, usingTs }, () => {
     }, {
       local
     });
-    if (buildFrontend && ((_b = (_a = ctx.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.build)) {
-      await spin({
-        text: "Building static site",
-        waitFor: async () => {
-          var _a2, _b2, _c, _d, _e, _f;
-          await (0, import_app.viteBuild)({
-            local,
-            rootPath: rootPath2,
-            outputFolder: (_c = (_b2 = (_a2 = ctx.schema) == null ? void 0 : _a2.config) == null ? void 0 : _b2.build) == null ? void 0 : _c.outputFolder,
-            publicFolder: (_f = (_e = (_d = ctx.schema) == null ? void 0 : _d.config) == null ? void 0 : _e.build) == null ? void 0 : _f.publicFolder
-          });
-        }
-      });
-      console.log("\nDone building static site");
-    }
-  } catch (error) {
-    throw error;
-  } finally {
-    if (afterBuild) {
-      await afterBuild();
-    }
   }
 };
-
-// src/cmds/start-server/lock.ts
-var AsyncLock = class {
-  constructor() {
-    this.disable = () => {
-    };
-    this.promise = Promise.resolve();
-  }
-  enable() {
-    this.promise = new Promise((resolve2) => this.disable = resolve2);
+var buildAdmin = async ({
+  schema,
+  local,
+  rootPath: rootPath2
+}) => {
+  var _a;
+  if ((_a = schema == null ? void 0 : schema.config) == null ? void 0 : _a.build) {
+    await spin({
+      text: "Building static site",
+      waitFor: async () => {
+        var _a2, _b, _c, _d;
+        await (0, import_app.viteBuild)({
+          local,
+          rootPath: rootPath2,
+          outputFolder: (_b = (_a2 = schema == null ? void 0 : schema.config) == null ? void 0 : _a2.build) == null ? void 0 : _b.outputFolder,
+          publicFolder: (_d = (_c = schema == null ? void 0 : schema.config) == null ? void 0 : _c.build) == null ? void 0 : _d.publicFolder
+        });
+      }
+    });
+    console.log("\nDone building static site");
   }
 };
 
@@ -2084,13 +2059,11 @@ var gqlPackageFile = require.resolve("@tinacms/graphql");
 async function startServer(ctx, next, {
   port = 4001,
   noWatch,
-  isomorphicGitBridge: isomorphicGitBridge2,
   noSDK,
   noTelemetry,
   watchFolders,
   verbose,
-  dev,
-  local
+  dev
 }) {
   buildLock.disable();
   reBuildLock.disable();
@@ -2103,7 +2076,6 @@ async function startServer(ctx, next, {
   });
   const bridge = ctx.bridge;
   const database = ctx.database;
-  const store = ctx.store;
   const shouldBuild = bridge.supportsBuilding();
   let ready = false;
   const state = {
@@ -2166,7 +2138,34 @@ or`);
       });
     });
   };
-  const foldersToWatch = (watchFolders || []).map((x) => import_path11.default.join(rootPath2, x));
+  const build2 = async () => {
+    try {
+      await beforeBuild();
+      const { schema, graphQLSchema, tinaSchema } = await ctx.builder.build({
+        rootPath: ctx.rootPath,
+        dev,
+        verbose
+      });
+      await ctx.builder.genTypedClient({
+        compiledSchema: schema,
+        local: true,
+        noSDK,
+        verbose,
+        usingTs: ctx.usingTs
+      });
+      await ctx.database.indexContent({ graphQLSchema, tinaSchema });
+      await buildAdmin({
+        local: true,
+        rootPath: ctx.rootPath,
+        schema
+      });
+    } catch (error) {
+      throw error;
+    } finally {
+      await afterBuild();
+    }
+  };
+  const foldersToWatch = (watchFolders || []).map((x) => import_path12.default.join(rootPath2, x));
   if (!noWatch && !process.env.CI) {
     import_chokidar.default.watch([
       ...foldersToWatch,
@@ -2176,27 +2175,14 @@ or`);
       ignored: [
         "**/node_modules/**/*",
         "**/.next/**/*",
-        `${import_path11.default.resolve(rootPath2)}/.tina/__generated__/**/*`
+        `${import_path12.default.resolve(rootPath2)}/.tina/__generated__/**/*`
       ]
     }).on("ready", async () => {
       if (verbose)
         console.log("Generating Tina config");
       try {
         if (shouldBuild) {
-          await build2({
-            bridge,
-            ctx,
-            database,
-            store,
-            dev,
-            isomorphicGitBridge: isomorphicGitBridge2,
-            local: true,
-            noSDK,
-            noWatch,
-            verbose,
-            beforeBuild,
-            afterBuild
-          });
+          await build2();
         }
         ready = true;
         isReady = true;
@@ -2214,20 +2200,7 @@ or`);
         logger.info("Tina change detected, regenerating config");
         try {
           if (shouldBuild) {
-            await build2({
-              bridge,
-              ctx,
-              database,
-              store,
-              dev,
-              isomorphicGitBridge: isomorphicGitBridge2,
-              local: true,
-              noSDK,
-              noWatch,
-              verbose,
-              beforeBuild,
-              afterBuild
-            });
+            await build2();
           }
           if (isReady) {
             await restart();
@@ -2250,20 +2223,7 @@ or`);
       logger.info("Detected CI environment, omitting watch commands...");
     }
     if (shouldBuild) {
-      await build2({
-        bridge,
-        ctx,
-        database,
-        store,
-        dev,
-        isomorphicGitBridge: isomorphicGitBridge2,
-        local: true,
-        noSDK,
-        noWatch,
-        verbose,
-        beforeBuild,
-        afterBuild
-      });
+      await build2();
     }
     await start();
     next();
@@ -2369,16 +2329,6 @@ stack: ${code.stack || "No stack was provided"}`);
   }
 };
 
-// src/buildTina/attachPath.ts
-var import_fs_extra8 = __toModule(require("fs-extra"));
-var import_path12 = __toModule(require("path"));
-var attachPath = async (ctx, next, _options) => {
-  ctx.rootPath = process.cwd();
-  const tinaPath = import_path12.default.join(ctx.rootPath, ".tina");
-  ctx.usingTs = await (0, import_fs_extra8.pathExists)(import_path12.default.join(tinaPath, "schema.ts")) || await (0, import_fs_extra8.pathExists)(import_path12.default.join(tinaPath, "schema.tsx"));
-  next();
-};
-
 // src/cmds/baseCmds.ts
 var CMD_START_SERVER = "server:start";
 var CMD_DEV = "dev";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.61.9",
+  "version": "0.61.10",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -52,15 +52,14 @@
     "@graphql-codegen/visitor-plugin-common": "^2.4.0",
     "@graphql-tools/graphql-file-loader": "^7.2.0",
     "@graphql-tools/load": "^7.3.2",
-    "@tinacms/app": "0.0.9",
+    "@tinacms/app": "0.0.10",
     "@tinacms/datalayer": "0.2.3",
-    "@tinacms/graphql": "0.63.5",
+    "@tinacms/graphql": "0.63.6",
     "@tinacms/metrics": "0.0.3",
-    "@tinacms/schema-tools": "0.1.0",
+    "@tinacms/schema-tools": "0.1.1",
     "add": "^2.0.6",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",
-    "async-retry": "^1.3.3",
     "auto-bind": "^4.0.0",
     "axios": "0.21.2",
     "body-parser": "^1.19.0",

package/dist/cmds/query-gen/attachSchema.d.ts

@@ -1,13 +0,0 @@
-/**
-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.
-*/
-export declare function attachSchema(ctx: any, next: () => void, options: any): Promise<void>;