@tinacms/cli 1.9.7 → 1.9.8

package/dist/index.js

@@ -35,7 +35,7 @@ module.exports = __toCommonJS(index_exports);
 var import_clipanion8 = require("clipanion");
 
 // package.json
-var version = "1.9.7";
+var version = "1.9.8";
 
 // src/next/commands/dev-command/index.ts
 var import_path5 = __toESM(require("path"));
@@ -587,13 +587,12 @@ var Codegen = class {
     return apiURL;
   }
   _createApiUrl() {
-    var _a, _b, _c, _d;
-    const branch = (_a = this.configManager.config) == null ? void 0 : _a.branch;
-    const clientId = (_b = this.configManager.config) == null ? void 0 : _b.clientId;
-    const token = (_c = this.configManager.config) == null ? void 0 : _c.token;
+    const branch = this.configManager.config?.branch;
+    const clientId = this.configManager.config?.clientId;
+    const token = this.configManager.config?.token;
     const fullVersion = this.configManager.getTinaGraphQLVersion();
     const version2 = `${fullVersion.major}.${fullVersion.minor}`;
-    const baseUrl = ((_d = this.configManager.config.tinaioConfig) == null ? void 0 : _d.contentApiUrlOverride) || `https://${TINA_HOST}`;
+    const baseUrl = this.configManager.config.tinaioConfig?.contentApiUrlOverride || `https://${TINA_HOST}`;
     if ((!branch || !clientId || !token) && !this.port && !this.configManager.config.contentApiUrlOverride) {
       const missing = [];
       if (!branch) missing.push("branch");
@@ -621,7 +620,6 @@ var Codegen = class {
     return this.apiURL;
   }
   async genDatabaseClient() {
-    var _a, _b;
     const authCollection = this.tinaSchema.getCollections().find((c) => c.isAuthCollection);
     let authFields = [];
     if (authCollection) {
@@ -632,7 +630,7 @@ var Codegen = class {
       if (usersFields.length > 1) {
         throw new Error("Only one user field is allowed");
       }
-      authFields = (_b = (_a = usersFields[0]) == null ? void 0 : _a.collectable) == null ? void 0 : _b.fields.map((f) => {
+      authFields = usersFields[0]?.collectable?.fields.map((f) => {
         if (f.type !== "password" && f.type !== "object") {
           if (f.uid) {
             return `id:${f.name}`;
@@ -710,9 +708,8 @@ export default databaseClient;
 `;
   }
   async genClient() {
-    var _a, _b, _c;
-    const token = (_a = this.configManager.config) == null ? void 0 : _a.token;
-    const errorPolicy = (_c = (_b = this.configManager.config) == null ? void 0 : _b.client) == null ? void 0 : _c.errorPolicy;
+    const token = this.configManager.config?.token;
+    const errorPolicy = this.configManager.config?.client?.errorPolicy;
     const apiURL = this.getApiURL();
     const clientString = `import { createClient } from "tinacms/dist/client";
 import { queries } from "./types";
@@ -811,11 +808,10 @@ var ConfigManager = class {
     return this.rootPath !== this.contentRootPath;
   }
   shouldSkipSDK() {
-    var _a;
     if (this.legacyNoSDK) {
       return this.legacyNoSDK;
     }
-    return ((_a = this.config.client) == null ? void 0 : _a.skip) || false;
+    return this.config.client?.skip || false;
   }
   async processConfig() {
     this.tinaFolderPath = await this.getTinaFolderPath(this.rootPath);
@@ -991,7 +987,7 @@ var ConfigManager = class {
       };
     }
     const generatedSchema = import_fs_extra2.default.readJSONSync(this.generatedSchemaJSONPath);
-    if (!generatedSchema || !(typeof (generatedSchema == null ? void 0 : generatedSchema.version) !== "undefined")) {
+    if (!generatedSchema || !(typeof generatedSchema?.version !== "undefined")) {
       throw new Error(
         `Can not find Tina GraphQL version in ${this.generatedSchemaJSONPath}`
       );
@@ -1168,7 +1164,7 @@ var createDBServer = (port) => {
     });
   });
   dbServer.once("error", (err) => {
-    if ((err == null ? void 0 : err.code) === "EADDRINUSE") {
+    if (err?.code === "EADDRINUSE") {
       throw new Error(
         `Tina Dev server is already in use. Datalayer server is busy on port ${port}`
       );
@@ -1319,7 +1315,6 @@ var BaseCommand = class extends import_clipanion.Command {
     const warnings = [];
     await spin({
       waitFor: async () => {
-        var _a, _b;
         const rootPath = configManager.rootPath;
         let sha;
         try {
@@ -1344,7 +1339,7 @@ var BaseCommand = class extends import_clipanion.Command {
           }
           for (const collection of tinaSchema.getCollections()) {
             pathFilter[collection.path] = {
-              matches: ((_a = collection.match) == null ? void 0 : _a.exclude) || ((_b = collection.match) == null ? void 0 : _b.include) ? tinaSchema.getMatches({ collection }) : void 0
+              matches: collection.match?.exclude || collection.match?.include ? tinaSchema.getMatches({ collection }) : void 0
             };
           }
           const { added, modified, deleted } = await (0, import_graphql8.getChangedFiles)({
@@ -1379,7 +1374,7 @@ var BaseCommand = class extends import_clipanion.Command {
         if (sha) {
           await database.setMetadata("lastSha", sha);
         }
-        if (res == null ? void 0 : res.warnings) {
+        if (res?.warnings) {
           warnings.push(...res.warnings);
         }
       },
@@ -1474,14 +1469,14 @@ var devHTML = (port) => `<!DOCTYPE html>
 var import_vite3 = require("vite");
 
 // src/next/vite/index.ts
-var import_node_path2 = __toESM(require("path"));
+var import_node_path2 = __toESM(require("node:path"));
 var import_plugin_react = __toESM(require("@vitejs/plugin-react"));
 var import_fs_extra4 = __toESM(require("fs-extra"));
 var import_normalize_path3 = __toESM(require("normalize-path"));
 var import_vite = require("vite");
 
 // src/next/vite/tailwind.ts
-var import_node_path = __toESM(require("path"));
+var import_node_path = __toESM(require("node:path"));
 var import_aspect_ratio = __toESM(require("@tailwindcss/aspect-ratio"));
 var import_container_queries = __toESM(require("@tailwindcss/container-queries"));
 var import_typography = __toESM(require("@tailwindcss/typography"));
@@ -1807,7 +1802,6 @@ var createConfig = async ({
   noWatch,
   rollupOptions
 }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
   const publicEnv = {};
   Object.keys(process.env).forEach((key) => {
     if (key.startsWith("TINA_PUBLIC_") || key.startsWith("NEXT_PUBLIC_") || key === "NODE_ENV" || key === "HEAD") {
@@ -1829,9 +1823,9 @@ var createConfig = async ({
     configManager.generatedFolderPath,
     "static-media.json"
   );
-  if ((_b = (_a = configManager.config.media) == null ? void 0 : _a.tina) == null ? void 0 : _b.static) {
+  if (configManager.config.media?.tina?.static) {
     const staticMedia = await listFilesRecursively({
-      directoryPath: ((_c = configManager.config.media.tina) == null ? void 0 : _c.mediaRoot) || "",
+      directoryPath: configManager.config.media.tina?.mediaRoot || "",
       config: configManager.config.media.tina,
       roothPath: configManager.rootPath
     });
@@ -1892,7 +1886,7 @@ var createConfig = async ({
       // Used by picomatch https://github.com/micromatch/picomatch/blob/master/lib/utils.js#L4
       "process.platform": `"${process.platform}"`,
       __API_URL__: `"${apiURL}"`,
-      __BASE_PATH__: `"${((_e = (_d = configManager.config) == null ? void 0 : _d.build) == null ? void 0 : _e.basePath) || ""}"`,
+      __BASE_PATH__: `"${configManager.config?.build?.basePath || ""}"`,
       __TINA_GRAPHQL_VERSION__: version2
     },
     logLevel: "error",
@@ -1904,7 +1898,7 @@ var createConfig = async ({
       include: ["react/jsx-runtime", "react/jsx-dev-runtime"]
     },
     server: {
-      host: (_h = (_g = (_f = configManager.config) == null ? void 0 : _f.build) == null ? void 0 : _g.host) != null ? _h : false,
+      host: configManager.config?.build?.host ?? false,
       watch: noWatch ? {
         ignored: ["**/*"]
       } : {
@@ -1918,7 +1912,7 @@ var createConfig = async ({
       }
     },
     build: {
-      sourcemap: true,
+      sourcemap: false,
       outDir: configManager.outputFolderPath,
       emptyOutDir: true,
       rollupOptions
@@ -1983,8 +1977,7 @@ var createMediaRouter = (config2) => {
   const handlePost = async function(req, res) {
     const bb = (0, import_busboy.default)({ headers: req.headers });
     bb.on("file", async (_name, file, _info) => {
-      var _a;
-      const fullPath = decodeURI((_a = req.url) == null ? void 0 : _a.slice("/media/upload/".length));
+      const fullPath = decodeURI(req.url?.slice("/media/upload/".length));
       const saveTo = import_path3.default.join(mediaFolder, ...fullPath.split("/"));
       await import_fs_extra5.default.ensureDir(import_path3.default.dirname(saveTo));
       file.pipe(import_fs_extra5.default.createWriteStream(saveTo));
@@ -2086,7 +2079,7 @@ var MediaModel = class {
       return {
         files: [],
         directories: [],
-        error: error == null ? void 0 : error.toString()
+        error: error?.toString()
       };
     }
   }
@@ -2103,7 +2096,7 @@ var MediaModel = class {
       return { ok: true };
     } catch (error) {
       console.error(error);
-      return { ok: false, message: error == null ? void 0 : error.toString() };
+      return { ok: false, message: error?.toString() };
     }
   }
 };
@@ -2181,13 +2174,12 @@ var devServerEndPointsPlugin = ({
       server.middlewares.use((0, import_cors.default)());
       server.middlewares.use(import_body_parser.default.json({ limit: "5mb" }));
       server.middlewares.use(async (req, res, next) => {
-        var _a;
-        const mediaPaths = (_a = configManager.config.media) == null ? void 0 : _a.tina;
+        const mediaPaths = configManager.config.media?.tina;
         const mediaRouter = createMediaRouter({
           rootPath: configManager.rootPath,
           apiURL,
-          publicFolder: parseMediaFolder((mediaPaths == null ? void 0 : mediaPaths.publicFolder) || ""),
-          mediaRoot: parseMediaFolder((mediaPaths == null ? void 0 : mediaPaths.mediaRoot) || "")
+          publicFolder: parseMediaFolder(mediaPaths?.publicFolder || ""),
+          mediaRoot: parseMediaFolder(mediaPaths?.mediaRoot || "")
         });
         const searchIndexRouter = createSearchIndexRouter({
           config: { apiURL, searchPath: "searchIndex" },
@@ -2260,7 +2252,7 @@ function viteTransformExtension({
     name: "vite-plugin-svgr",
     async transform(code, id) {
       if (filter(id)) {
-        const { transform: transform2 } = await Promise.resolve().then(() => __toESM(require("@svgr/core")));
+        const { transform: transform2 } = await import("@svgr/core");
         const svgCode = await import_fs.default.promises.readFile(
           id.replace(/\?.*$/, ""),
           "utf8"
@@ -2345,6 +2337,20 @@ var DevCommand = class extends BaseCommand {
     });
     this.indexingLock = new import_async_lock.default();
   }
+  static {
+    this.paths = [["dev"], ["server:start"]];
+  }
+  static {
+    // Prevent indexes and reads occurring at once
+    this.usage = import_clipanion2.Command.Usage({
+      category: `Commands`,
+      description: `Builds Tina and starts the dev server`,
+      examples: [
+        [`A basic example`, `$0 dev`],
+        [`A second example`, `$0 dev --rootPath`]
+      ]
+    });
+  }
   async catch(error) {
     logger.error("Error occured during tinacms dev");
     console.error(error);
@@ -2359,7 +2365,6 @@ var DevCommand = class extends BaseCommand {
     }
   }
   async execute() {
-    var _a, _b, _c, _d, _e, _f;
     const configManager = new ConfigManager({
       rootPath: this.rootPath,
       legacyNoSDK: this.noSDK
@@ -2467,19 +2472,19 @@ ${dangerText(e.message)}
       "index.html\nassets/"
     );
     const searchIndexClient = new import_search.LocalSearchIndexClient({
-      stopwordLanguages: (_b = (_a = configManager.config.search) == null ? void 0 : _a.tina) == null ? void 0 : _b.stopwordLanguages,
-      tokenSplitRegex: (_d = (_c = configManager.config.search) == null ? void 0 : _c.tina) == null ? void 0 : _d.tokenSplitRegex
+      stopwordLanguages: configManager.config.search?.tina?.stopwordLanguages,
+      tokenSplitRegex: configManager.config.search?.tina?.tokenSplitRegex
     });
     await searchIndexClient.onStartIndexing();
     const searchIndexer = new import_search.SearchIndexer({
-      batchSize: ((_e = configManager.config.search) == null ? void 0 : _e.indexBatchSize) || 100,
+      batchSize: configManager.config.search?.indexBatchSize || 100,
       bridge: new import_graphql10.FilesystemBridge(
         configManager.rootPath,
         configManager.contentRootPath
       ),
       schema: tinaSchema,
       client: searchIndexClient,
-      textIndexLength: ((_f = configManager.config.search) == null ? void 0 : _f.maxSearchIndexFieldLength) || 100
+      textIndexLength: configManager.config.search?.maxSearchIndexFieldLength || 100
     });
     if (configManager.config.search) {
       await spin({
@@ -2638,16 +2643,6 @@ ${dangerText(e.message)}
     import_chokidar.default.watch(configManager.userQueriesAndFragmentsGlob).on("add", executeCallback).on("change", executeCallback).on("unlink", executeCallback);
   }
 };
-DevCommand.paths = [["dev"], ["server:start"]];
-// Prevent indexes and reads occurring at once
-DevCommand.usage = import_clipanion2.Command.Usage({
-  category: `Commands`,
-  description: `Builds Tina and starts the dev server`,
-  examples: [
-    [`A basic example`, `$0 dev`],
-    [`A second example`, `$0 dev --rootPath`]
-  ]
-});
 
 // src/next/commands/build-command/index.ts
 var import_crypto = __toESM(require("crypto"));
@@ -2845,12 +2840,20 @@ var BuildCommand = class extends BaseCommand {
       description: "Disables the client build cache"
     });
   }
+  static {
+    this.paths = [["build"]];
+  }
+  static {
+    this.usage = import_clipanion3.Command.Usage({
+      category: `Commands`,
+      description: `Build the CMS and autogenerated modules for usage with TinaCloud`
+    });
+  }
   async catch(error) {
     console.error(error);
     process.exit(1);
   }
   async execute() {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
     logger.info("Starting Tina build");
     this.logDeprecationWarnings();
     const configManager = new ConfigManager({
@@ -2939,45 +2942,63 @@ ${dangerText(e.message)}
     }
     const skipCloudChecks = this.skipCloudChecks || configManager.hasSelfHostedConfig();
     if (!skipCloudChecks) {
-      const { hasUpstream, timestamp } = await this.checkClientInfo(
-        configManager,
-        codegen2.productionUrl,
-        this.previewBaseBranch
-      );
-      if (!hasUpstream && this.upstreamBranch) {
-        logger.warn(
-          `${dangerText(
-            `WARN: Upstream branch '${this.upstreamBranch}' specified but no upstream project was found.`
-          )}`
+      try {
+        const clientInfo = await this.checkClientInfo(
+          configManager,
+          codegen2.productionUrl,
+          this.previewBaseBranch
         );
+        if (clientInfo.detectedBotBranch) {
+          logger.warn(
+            `${warnText(
+              `WARN: Detected bot branch. Using schema/content from default branch '${clientInfo.defaultBranch}' instead of '${configManager.config.branch}'.`
+            )}`
+          );
+        }
+        if (!clientInfo.hasUpstream && this.upstreamBranch) {
+          logger.warn(
+            `${dangerText(
+              `WARN: Upstream branch '${this.upstreamBranch}' specified but no upstream project was found.`
+            )}`
+          );
+        }
+        if (clientInfo.hasUpstream || this.previewBaseBranch && this.previewName) {
+          await this.syncProject(configManager, codegen2.productionUrl, {
+            upstreamBranch: this.upstreamBranch,
+            previewBaseBranch: this.previewBaseBranch,
+            previewName: this.previewName
+          });
+        }
+        await waitForDB(
+          configManager.config,
+          codegen2.productionUrl,
+          this.previewName,
+          false
+        );
+        await this.checkGraphqlSchema(
+          configManager,
+          database,
+          codegen2.productionUrl,
+          clientInfo.timestamp
+        );
+        await this.checkTinaSchema(
+          configManager,
+          database,
+          codegen2.productionUrl,
+          this.previewName,
+          this.verbose,
+          clientInfo.timestamp
+        );
+      } catch (e) {
+        logger.error(`
+
+${dangerText(e.message)}
+`);
+        if (this.verbose) {
+          console.error(e);
+        }
+        process.exit(1);
       }
-      if (hasUpstream || this.previewBaseBranch && this.previewName) {
-        await this.syncProject(configManager, codegen2.productionUrl, {
-          upstreamBranch: this.upstreamBranch,
-          previewBaseBranch: this.previewBaseBranch,
-          previewName: this.previewName
-        });
-      }
-      await waitForDB(
-        configManager.config,
-        codegen2.productionUrl,
-        this.previewName,
-        false
-      );
-      await this.checkGraphqlSchema(
-        configManager,
-        database,
-        codegen2.productionUrl,
-        timestamp
-      );
-      await this.checkTinaSchema(
-        configManager,
-        database,
-        codegen2.productionUrl,
-        this.previewName,
-        this.verbose,
-        timestamp
-      );
     }
     await buildProductionSpa(configManager, database, codegen2.productionUrl);
     await import_fs_extra7.default.outputFile(
@@ -2986,9 +3007,9 @@ ${dangerText(e.message)}
     );
     if (configManager.config.search && !this.skipSearchIndex && !this.localOption) {
       let client;
-      const hasTinaSearch = Boolean((_b = (_a = configManager.config) == null ? void 0 : _a.search) == null ? void 0 : _b.tina);
+      const hasTinaSearch = Boolean(configManager.config?.search?.tina);
       if (hasTinaSearch) {
-        if (!((_c = configManager.config) == null ? void 0 : _c.branch)) {
+        if (!configManager.config?.branch) {
           logger.error(
             `${dangerText(
               `ERROR: Branch not configured in tina search configuration.`
@@ -2998,11 +3019,11 @@ ${dangerText(e.message)}
             "Branch not configured in tina search configuration."
           );
         }
-        if (!((_d = configManager.config) == null ? void 0 : _d.clientId)) {
+        if (!configManager.config?.clientId) {
           logger.error(`${dangerText(`ERROR: clientId not configured.`)}`);
           throw new Error("clientId not configured.");
         }
-        if (!((_g = (_f = (_e = configManager.config) == null ? void 0 : _e.search) == null ? void 0 : _f.tina) == null ? void 0 : _g.indexerToken)) {
+        if (!configManager.config?.search?.tina?.indexerToken) {
           logger.error(
             `${dangerText(
               `ERROR: indexerToken not configured in tina search configuration.`
@@ -3013,16 +3034,16 @@ ${dangerText(e.message)}
           );
         }
         client = new import_search2.TinaCMSSearchIndexClient({
-          apiUrl: `${((_h = configManager.config.tinaioConfig) == null ? void 0 : _h.contentApiUrlOverride) || "https://content.tinajs.io"}/searchIndex/${(_i = configManager.config) == null ? void 0 : _i.clientId}`,
-          branch: (_j = configManager.config) == null ? void 0 : _j.branch,
-          indexerToken: (_m = (_l = (_k = configManager.config) == null ? void 0 : _k.search) == null ? void 0 : _l.tina) == null ? void 0 : _m.indexerToken,
-          stopwordLanguages: (_p = (_o = (_n = configManager.config) == null ? void 0 : _n.search) == null ? void 0 : _o.tina) == null ? void 0 : _p.stopwordLanguages
+          apiUrl: `${configManager.config.tinaioConfig?.contentApiUrlOverride || "https://content.tinajs.io"}/searchIndex/${configManager.config?.clientId}`,
+          branch: configManager.config?.branch,
+          indexerToken: configManager.config?.search?.tina?.indexerToken,
+          stopwordLanguages: configManager.config?.search?.tina?.stopwordLanguages
         });
       } else {
-        client = (_r = (_q = configManager.config) == null ? void 0 : _q.search) == null ? void 0 : _r.searchClient;
+        client = configManager.config?.search?.searchClient;
       }
       const searchIndexer = new import_search2.SearchIndexer({
-        batchSize: ((_s = configManager.config.search) == null ? void 0 : _s.indexBatchSize) || 100,
+        batchSize: configManager.config.search?.indexBatchSize || 100,
         bridge: new import_graphql11.FilesystemBridge(
           configManager.rootPath,
           configManager.contentRootPath
@@ -3090,86 +3111,88 @@ ${dangerText(e.message)}
     }
   }
   async checkClientInfo(configManager, apiURL, previewBaseBranch) {
+    const MAX_RETRIES = 5;
     const { config: config2 } = configManager;
     const token = config2.token;
     const { clientId, branch, host } = (0, import_schema_tools2.parseURL)(apiURL);
-    const url = `https://${host}/db/${clientId}/status/${previewBaseBranch || branch}`;
     const bar2 = new import_progress2.default("Checking clientId and token. :prog", 1);
-    let branchKnown = false;
-    let hasUpstream = false;
-    let timestamp;
-    try {
-      const res = await request({
-        token,
-        url
-      });
-      timestamp = res.timestamp || 0;
-      bar2.tick({
-        prog: "\u2705"
-      });
-      if (!(res.status === "unknown")) {
-        branchKnown = true;
-      }
-      if (res.hasUpstream) {
-        hasUpstream = true;
+    const getBranchInfo = async () => {
+      const url = `https://${host}/db/${clientId}/status/${previewBaseBranch || branch}`;
+      const branchInfo2 = {
+        status: "unknown",
+        branchKnown: false,
+        hasUpstream: false,
+        timestamp: 0,
+        detectedBotBranch: false,
+        defaultBranch: void 0
+      };
+      try {
+        const res = await request({
+          token,
+          url
+        });
+        branchInfo2.status = res.status;
+        branchInfo2.branchKnown = res.status !== "unknown";
+        branchInfo2.timestamp = res.timestamp || 0;
+        branchInfo2.hasUpstream = res.hasUpstream;
+        branchInfo2.detectedBotBranch = res.json.detectedBotBranch;
+        branchInfo2.defaultBranch = res.json.defaultBranch;
+      } catch (e) {
+        summary({
+          heading: "Error when checking client information",
+          items: [
+            {
+              emoji: "\u274C",
+              heading: "You provided",
+              subItems: [
+                {
+                  key: "clientId",
+                  value: config2.clientId
+                },
+                {
+                  key: "branch",
+                  value: config2.branch
+                },
+                {
+                  key: "token",
+                  value: config2.token
+                }
+              ]
+            }
+          ]
+        });
+        throw e;
       }
-    } catch (e) {
-      summary({
-        heading: "Error when checking client information",
-        items: [
-          {
-            emoji: "\u274C",
-            heading: "You provided",
-            subItems: [
-              {
-                key: "clientId",
-                value: config2.clientId
-              },
-              {
-                key: "branch",
-                value: config2.branch
-              },
-              {
-                key: "token",
-                value: config2.token
-              }
-            ]
-          }
-        ]
-      });
-      throw e;
-    }
-    const branchBar = new import_progress2.default("Checking branch is on TinaCloud. :prog", 1);
-    if (branchKnown) {
+      return branchInfo2;
+    };
+    const branchInfo = await getBranchInfo();
+    bar2.tick({
+      prog: "\u2705"
+    });
+    const branchBar = new import_progress2.default(
+      `Checking branch '${config2.branch}' is on TinaCloud. :prog`,
+      1
+    );
+    if (branchInfo.branchKnown) {
       branchBar.tick({
         prog: "\u2705"
       });
-      return {
-        hasUpstream,
-        timestamp
-      };
+      return branchInfo;
     }
-    for (let i = 0; i <= 5; i++) {
-      await sleepAndCallFunc({
-        fn: async () => {
-          const res = await request({
-            token,
-            url
-          });
-          if (this.verbose) {
-            logger.info(
-              `Branch status: ${res.status}. Attempt: ${i + 1}. Trying again in 5 seconds.`
-            );
-          }
-          if (!(res.status === "unknown")) {
-            branchBar.tick({
-              prog: "\u2705"
-            });
-            return;
-          }
-        },
-        ms: 5e3
-      });
+    for (let i = 1; i <= MAX_RETRIES; i++) {
+      await timeout(5e3);
+      const branchInfo2 = await getBranchInfo();
+      if (this.verbose) {
+        logger.info(
+          `Branch status: ${branchInfo2.status}. Attempt: ${i}. Trying again in 5 seconds.`
+        );
+      }
+      if (branchInfo2.branchKnown) {
+        branchBar.tick({
+          prog: "\u2705"
+        });
+        return branchInfo2;
+      }
     }
     branchBar.tick({
       prog: "\u274C"
@@ -3177,7 +3200,7 @@ ${dangerText(e.message)}
     logger.error(
       `${dangerText(
         `ERROR: Branch '${branch}' is not on TinaCloud.`
-      )} Please make sure that branch '${branch}' exists in your repository and that you have pushed your all changes to the remote. View all all branches and there current status here: ${linkText(
+      )} Please make sure that branch '${branch}' exists in your repository and that you have pushed your all changes to the remote. View all branches and their current status here: ${linkText(
         `https://app.tina.io/projects/${clientId}/configuration`
       )}`
     );
@@ -3252,7 +3275,7 @@ ${dangerText(e.message)}
         prog: "\u274C"
       });
       let errorMessage = `The remote GraphQL schema does not exist. Check indexing for this branch.`;
-      if (config2 == null ? void 0 : config2.branch) {
+      if (config2?.branch) {
         errorMessage += `
 
 Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
@@ -3284,7 +3307,7 @@ Check out '${faqLink}' for possible solutions.`}`;
 Additional info:
 
 `;
-        if (config2 == null ? void 0 : config2.branch) {
+        if (config2?.branch) {
           errorMessage += `	Branch: ${config2.branch}, Client ID: ${config2.clientId}
 `;
         }
@@ -3333,7 +3356,7 @@ Additional info:
         prog: "\u274C"
       });
       let errorMessage = `The remote Tina schema does not exist. Check indexing for this branch.`;
-      if (config2 == null ? void 0 : config2.branch) {
+      if (config2?.branch) {
         errorMessage += `
 
 Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
@@ -3364,7 +3387,7 @@ Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
 Additional info:
 
 `;
-      if (config2 == null ? void 0 : config2.branch) {
+      if (config2?.branch) {
         errorMessage += `        Branch: ${config2.branch}, Client ID: ${config2.clientId}
 `;
       }
@@ -3376,18 +3399,13 @@ Additional info:
     }
   }
 };
-BuildCommand.paths = [["build"]];
-BuildCommand.usage = import_clipanion3.Command.Usage({
-  category: `Commands`,
-  description: `Build the CMS and autogenerated modules for usage with TinaCloud`
-});
 async function request(args) {
   const headers = new Headers();
   if (args.token) {
     headers.append("X-API-KEY", args.token);
   }
   headers.append("Content-Type", "application/json");
-  const url = args == null ? void 0 : args.url;
+  const url = args?.url;
   const res = await fetch(url, {
     method: args.method || "GET",
     headers,
@@ -3417,9 +3435,10 @@ Message from server: ${json.message}`;
     );
   }
   return {
-    status: json == null ? void 0 : json.status,
-    timestamp: json == null ? void 0 : json.timestamp,
-    hasUpstream: (json == null ? void 0 : json.hasUpstream) || false
+    status: json?.status,
+    timestamp: json?.timestamp,
+    hasUpstream: json?.hasUpstream || false,
+    json
   };
 }
 var fetchRemoteGraphqlSchema = async ({
@@ -3442,7 +3461,7 @@ var fetchRemoteGraphqlSchema = async ({
   });
   const data = await res.json();
   return {
-    remoteSchema: data == null ? void 0 : data.data,
+    remoteSchema: data?.data,
     remoteRuntimeVersion: res.headers.get("tinacms-grapqhl-version"),
     remoteProjectVersion: res.headers.get("tinacms-graphql-project-version")
   };
@@ -3652,6 +3671,15 @@ var AuditCommand = class extends import_clipanion4.Command {
       description: "Specify a port to run the datalayer server on. (default 9000)"
     });
   }
+  static {
+    this.paths = [["audit"]];
+  }
+  static {
+    this.usage = import_clipanion4.Command.Usage({
+      category: `Commands`,
+      description: `Audit config and content files`
+    });
+  }
   async catch(error) {
     logger.error("Error occured during tinacms audit");
     if (this.verbose) {
@@ -3705,11 +3733,6 @@ var AuditCommand = class extends import_clipanion4.Command {
     process.exit();
   }
 };
-AuditCommand.paths = [["audit"]];
-AuditCommand.usage = import_clipanion4.Command.Usage({
-  category: `Commands`,
-  description: `Audit config and content files`
-});
 
 // src/next/commands/init-command/index.ts
 var import_clipanion6 = require("clipanion");
@@ -3728,13 +3751,13 @@ var makeGeneratedFile = async (name2, generatedFileType, parentPath, opts) => {
   const result = {
     fullPathTS: import_path7.default.join(
       parentPath,
-      `${name2}.${(opts == null ? void 0 : opts.typescriptSuffix) || (opts == null ? void 0 : opts.extensionOverride) || "ts"}`
+      `${name2}.${opts?.typescriptSuffix || opts?.extensionOverride || "ts"}`
     ),
     fullPathJS: import_path7.default.join(
       parentPath,
-      `${name2}.${(opts == null ? void 0 : opts.extensionOverride) || "js"}`
+      `${name2}.${opts?.extensionOverride || "js"}`
     ),
-    fullPathOverride: (opts == null ? void 0 : opts.extensionOverride) ? import_path7.default.join(parentPath, `${name2}.${opts == null ? void 0 : opts.extensionOverride}`) : "",
+    fullPathOverride: opts?.extensionOverride ? import_path7.default.join(parentPath, `${name2}.${opts?.extensionOverride}`) : "",
     generatedFileType,
     name: name2,
     parentPath,
@@ -3762,7 +3785,6 @@ var detectEnvironment = async ({
   rootPath,
   debug = false
 }) => {
-  var _a;
   const hasForestryConfig = await import_fs_extra8.default.pathExists(
     import_path7.default.join(pathToForestryConfig, ".forestry", "settings.yml")
   );
@@ -3819,10 +3841,10 @@ var detectEnvironment = async ({
     try {
       const packageJSON = await import_fs_extra8.default.readJSON("package.json");
       const deps = [];
-      if (packageJSON == null ? void 0 : packageJSON.dependencies) {
+      if (packageJSON?.dependencies) {
         deps.push(...Object.keys(packageJSON.dependencies));
       }
-      if (packageJSON == null ? void 0 : packageJSON.devDependencies) {
+      if (packageJSON?.devDependencies) {
         deps.push(...Object.keys(packageJSON.devDependencies));
       }
       if (deps.includes("@tinacms/cli") && deps.includes("tinacms")) {
@@ -3843,7 +3865,7 @@ var detectEnvironment = async ({
     const hugoConfigPath = import_path7.default.join(rootPath, "config.toml");
     if (await import_fs_extra8.default.pathExists(hugoConfigPath)) {
       const hugoConfig = await import_fs_extra8.default.readFile(hugoConfigPath, "utf8");
-      const metaDataFormat = (_a = hugoConfig.match(/metaDataFormat = "(.*)"/)) == null ? void 0 : _a[1];
+      const metaDataFormat = hugoConfig.toString().match(/metaDataFormat = "(.*)"/)?.[1];
       if (metaDataFormat && (metaDataFormat === "yaml" || metaDataFormat === "toml" || metaDataFormat === "json")) {
         frontMatterFormat = metaDataFormat;
       }
@@ -4462,6 +4484,7 @@ var import_path9 = __toESM(require("path"));
 var import_js_yaml2 = __toESM(require("js-yaml"));
 var import_minimatch = __toESM(require("minimatch"));
 var import_graphql16 = require("@tinacms/graphql");
+var import_schema_tools3 = require("@tinacms/schema-tools");
 
 // src/cmds/forestry-migrate/util/index.ts
 var import_fs_extra9 = __toESM(require("fs-extra"));
@@ -4494,8 +4517,7 @@ var ErrorSingleton = class _ErrorSingleton {
     this.collectionNameErrors.push(error);
   }
   printCollectionNameErrors() {
-    var _a;
-    if ((_a = this.collectionNameErrors) == null ? void 0 : _a.length) {
+    if (this.collectionNameErrors?.length) {
       logger.error(
         dangerText("ERROR: TinaCMS only supports alphanumeric template names")
       );
@@ -4677,8 +4699,7 @@ var transformForestryFieldsToTinaFields = ({
   skipBlocks = false
 }) => {
   const tinaFields = [];
-  fields == null ? void 0 : fields.forEach((forestryField2) => {
-    var _a, _b, _c, _d;
+  fields?.forEach((forestryField2) => {
     if (forestryField2.name === "menu") {
       logger.info(
         warnText(
@@ -4754,12 +4775,12 @@ var transformForestryFieldsToTinaFields = ({
         };
         break;
       case "select":
-        if ((_a = forestryField2.config) == null ? void 0 : _a.options) {
+        if (forestryField2.config?.options) {
           field = {
             type: "string",
             ...getTinaFieldsFromName(forestryField2.name),
             label: forestryField2.label,
-            options: ((_b = forestryField2.config) == null ? void 0 : _b.options) || []
+            options: forestryField2.config?.options || []
           };
         } else {
           logger.info(
@@ -4777,7 +4798,7 @@ var transformForestryFieldsToTinaFields = ({
           label: forestryField2.label,
           list: true
         };
-        if ((_c = forestryField2.config) == null ? void 0 : _c.options) {
+        if (forestryField2.config?.options) {
           field.options = forestryField2.config.options;
         }
         break;
@@ -4825,7 +4846,7 @@ var transformForestryFieldsToTinaFields = ({
           break;
         }
         const templates2 = [];
-        forestryField2 == null ? void 0 : forestryField2.template_types.forEach((tem) => {
+        forestryField2?.template_types.forEach((tem) => {
           const { template: template2 } = getFieldsFromTemplates({
             tem,
             skipBlocks: true,
@@ -4883,7 +4904,7 @@ var transformForestryFieldsToTinaFields = ({
         );
     }
     if (field) {
-      if ((_d = forestryField2.config) == null ? void 0 : _d.required) {
+      if (forestryField2.config?.required) {
         field = { ...field, required: true };
       }
       tinaFields.push(field);
@@ -4945,8 +4966,7 @@ var stringifyLabelWithField = (label) => {
   return `${labelString}Fields`;
 };
 var transformForestryMatchToTinaMatch = (match) => {
-  var _a, _b;
-  const newMatch = (_b = (_a = match.replace(" ", "").replace(/\.?(mdx|md|json|yaml|yml|toml)/g, "")) == null ? void 0 : _a.replace(/\..*$/g, "")) == null ? void 0 : _b.replace("{}", "");
+  const newMatch = match.replace(" ", "").replace(/\.?(mdx|md|json|yaml|yml|toml)/g, "")?.replace(/\..*$/g, "")?.replace("{}", "");
   if (match !== newMatch) {
     logger.info(
       `Info: Match ${match} was transformed to ${newMatch}. See ${linkText(
@@ -4958,7 +4978,7 @@ var transformForestryMatchToTinaMatch = (match) => {
 };
 function checkExt(ext) {
   const extReal = ext.replace(".", "");
-  if (["mdx", "md", "json", "yaml", "yml", "toml"].includes(extReal)) {
+  if (import_schema_tools3.CONTENT_FORMATS.includes(extReal)) {
     return extReal;
   } else {
     return false;
@@ -5011,18 +5031,18 @@ var generateCollectionFromForestrySection = (args) => {
   }
   if (section.match) {
     baseCollection.match = {
-      ...(baseCollection == null ? void 0 : baseCollection.match) || {},
+      ...baseCollection?.match || {},
       include: transformForestryMatchToTinaMatch(section.match)
     };
   }
   if (section.exclude) {
     baseCollection.match = {
-      ...(baseCollection == null ? void 0 : baseCollection.match) || {},
+      ...baseCollection?.match || {},
       exclude: transformForestryMatchToTinaMatch(section.exclude)
     };
   }
   if (section.type === "directory") {
-    if (!(section == null ? void 0 : section.path) || section.path === "/" || section.path === "./" || section.path === ".") {
+    if (!section?.path || section.path === "/" || section.path === "./" || section.path === ".") {
       logger.log(
         warnText(
           `Warning: Section ${section.label} is using a Root Path. Currently, Tina Does not support Root paths see ${linkText(
@@ -5032,11 +5052,11 @@ var generateCollectionFromForestrySection = (args) => {
       );
       return;
     }
-    const forestryTemplates = (section == null ? void 0 : section.templates) || [];
+    const forestryTemplates = section?.templates || [];
     if (forestryTemplates.length === 0 && section.create === "all") {
       for (const templateKey of templateMap.keys()) {
         const { templateObj } = templateMap.get(templateKey);
-        const pages = templateObj == null ? void 0 : templateObj.pages;
+        const pages = templateObj?.pages;
         if (pages) {
           let glob = section.match;
           const skipPath = section.path === "" || section.path === "/" || !section.path;
@@ -5053,7 +5073,7 @@ var generateCollectionFromForestrySection = (args) => {
     }
     const hasBody = ["md", "mdx", "markdown"].includes(format3);
     let c;
-    if (((forestryTemplates == null ? void 0 : forestryTemplates.length) || 0) > 1) {
+    if ((forestryTemplates?.length || 0) > 1) {
       c = {
         ...baseCollection,
         // @ts-expect-error
@@ -5075,7 +5095,7 @@ var generateCollectionFromForestrySection = (args) => {
         })
       };
     }
-    if ((forestryTemplates == null ? void 0 : forestryTemplates.length) === 1) {
+    if (forestryTemplates?.length === 1) {
       const tem = forestryTemplates[0];
       const template = templateMap.get(tem);
       const fieldsString = stringifyLabelWithField(template.templateObj.label);
@@ -5090,7 +5110,7 @@ var generateCollectionFromForestrySection = (args) => {
         })
       };
     }
-    if ((forestryTemplates == null ? void 0 : forestryTemplates.length) === 0) {
+    if (forestryTemplates?.length === 0) {
       logger.warn(
         warnText(
           `No templates found for section ${section.label}. Please see ${linkText(
@@ -5103,7 +5123,7 @@ var generateCollectionFromForestrySection = (args) => {
         fields: [BODY_FIELD]
       };
     }
-    if ((section == null ? void 0 : section.create) === "none") {
+    if (section?.create === "none") {
       c.ui = {
         ...c.ui,
         allowedActions: {
@@ -5125,7 +5145,7 @@ var generateCollectionFromForestrySection = (args) => {
       }
       for (const currentTemplateName of templateMap.keys()) {
         const { templateObj, fields: additionalFields } = templateMap.get(currentTemplateName);
-        const pages = (templateObj == null ? void 0 : templateObj.pages) || [];
+        const pages = templateObj?.pages || [];
         if (pages.includes(section.path)) {
           fields.push(...additionalFields);
           break;
@@ -5204,11 +5224,10 @@ var generateCollections = async ({
   };
 };
 var rewriteTemplateKeysInDocs = (args) => {
-  var _a;
   const { templateMap, markdownParseConfig } = args;
   for (const templateKey of templateMap.keys()) {
     const { templateObj } = templateMap.get(templateKey);
-    (_a = templateObj == null ? void 0 : templateObj.pages) == null ? void 0 : _a.forEach((page) => {
+    templateObj?.pages?.forEach((page) => {
       try {
         const filePath = import_path9.default.join(page);
         if (import_fs_extra10.default.lstatSync(filePath).isDirectory()) {
@@ -5257,6 +5276,15 @@ var CodemodCommand = class extends import_clipanion5.Command {
       description: "increase verbosity of logged output"
     });
   }
+  static {
+    this.paths = [["codemod"], ["codemod", "move-tina-folder"]];
+  }
+  static {
+    this.usage = import_clipanion5.Command.Usage({
+      category: `Commands`,
+      description: `Use codemods for various Tina tasks`
+    });
+  }
   async catch(error) {
     console.log(error);
   }
@@ -5277,11 +5305,6 @@ var CodemodCommand = class extends import_clipanion5.Command {
     await command2();
   }
 };
-CodemodCommand.paths = [["codemod"], ["codemod", "move-tina-folder"]];
-CodemodCommand.usage = import_clipanion5.Command.Usage({
-  category: `Commands`,
-  description: `Use codemods for various Tina tasks`
-});
 var moveTinaFolder = async (rootPath = process.cwd()) => {
   const configManager = new ConfigManager({ rootPath });
   try {
@@ -5561,11 +5584,10 @@ var baseFields = `[
   },
 ]`;
 var generateCollectionString = (args) => {
-  var _a, _b, _c, _d;
   if (args.collections) {
     return args.collections;
   }
-  let extraTinaCollections = (_b = (_a = args.config.authProvider) == null ? void 0 : _a.extraTinaCollections) == null ? void 0 : _b.join(",\n");
+  let extraTinaCollections = args.config.authProvider?.extraTinaCollections?.join(",\n");
   if (extraTinaCollections) {
     extraTinaCollections = extraTinaCollections + ",";
   }
@@ -5591,18 +5613,17 @@ var generateCollectionString = (args) => {
       },
     },
   ]`;
-  if (((_d = (_c = args.config) == null ? void 0 : _c.framework) == null ? void 0 : _d.name) === "next") {
+  if (args.config?.framework?.name === "next") {
     return nextExampleCollection;
   }
   return baseCollections;
 };
 var generateConfig = (args) => {
-  var _a, _b, _c;
-  const isUsingTinaCloud = !args.selfHosted || ((_a = args.config.authProvider) == null ? void 0 : _a.name) === "tina-cloud";
+  const isUsingTinaCloud = !args.selfHosted || args.config.authProvider?.name === "tina-cloud";
   let extraImports = "";
   if (args.selfHosted) {
     if (args.config.authProvider) {
-      extraImports = extraImports + makeImportString((_b = args.config.authProvider) == null ? void 0 : _b.configImports);
+      extraImports = extraImports + makeImportString(args.config.authProvider?.configImports);
     }
     if (!isUsingTinaCloud) {
       extraImports = extraImports + `
@@ -5625,7 +5646,7 @@ import { LocalAuthProvider } from "tinacms";`;
     branch,
     ${args.selfHosted && !isUsingTinaCloud ? `authProvider: isLocal
     ? new LocalAuthProvider()
-    :${(_c = args.config) == null ? void 0 : _c.authProvider.configAuthProviderClass},` : ""}
+    :${args.config?.authProvider.configAuthProviderClass},` : ""}
     ${isUsingTinaCloud ? `// Get this from tina.io
         clientId: process.env.NEXT_PUBLIC_TINA_CLIENT_ID,` : ""}
     ${isUsingTinaCloud ? `// Get this from tina.io
@@ -5652,11 +5673,10 @@ import { LocalAuthProvider } from "tinacms";`;
 
 // src/cmds/init/templates/database.ts
 var databaseTemplate = ({ config: config2 }) => {
-  var _a, _b, _c, _d;
   return `
 import { createDatabase, createLocalDatabase } from '@tinacms/datalayer'
-${makeImportString((_a = config2.gitProvider) == null ? void 0 : _a.imports)}
-${makeImportString((_b = config2.databaseAdapter) == null ? void 0 : _b.imports)}
+${makeImportString(config2.gitProvider?.imports)}
+${makeImportString(config2.databaseAdapter?.imports)}
 
 const branch = (process.env.GITHUB_BRANCH ||
   process.env.VERCEL_GIT_COMMIT_REF ||
@@ -5668,8 +5688,8 @@ const isLocal =  process.env.${config2.isLocalEnvVarName} === 'true'
 export default isLocal
   ? createLocalDatabase()
   : createDatabase({
-      gitProvider: ${(_c = config2.gitProvider) == null ? void 0 : _c.gitProviderClassText},
-      databaseAdapter: ${(_d = config2.databaseAdapter) == null ? void 0 : _d.databaseAdapterClassText},
+      gitProvider: ${config2.gitProvider?.gitProviderClassText},
+      databaseAdapter: ${config2.databaseAdapter?.databaseAdapterClassText},
       namespace: branch,
     })
 `;
@@ -5680,10 +5700,9 @@ var nextApiRouteTemplate = ({
   config: config2,
   env
 }) => {
-  var _a, _b;
   const extraPath = env.usingSrc ? "../" : "";
   return `import { TinaNodeBackend, LocalBackendAuthProvider } from '@tinacms/datalayer'
-  ${makeImportString((_a = config2.authProvider) == null ? void 0 : _a.backendAuthProviderImports)}
+  ${makeImportString(config2.authProvider?.backendAuthProviderImports)}
  
 
   
@@ -5694,7 +5713,7 @@ var nextApiRouteTemplate = ({
   const handler = TinaNodeBackend({
     authProvider: isLocal
       ? LocalBackendAuthProvider()
-      : ${((_b = config2.authProvider) == null ? void 0 : _b.backendAuthProvider) || ""},
+      : ${config2.authProvider?.backendAuthProvider || ""},
     databaseClient,
   })
   
@@ -5722,19 +5741,18 @@ var import_prettier2 = require("prettier");
 // src/utils/script-helpers.ts
 function generateGqlScript(scriptValue, opts) {
   const cmd = `tinacms dev -c "${scriptValue}"`;
-  if (opts == null ? void 0 : opts.isLocalEnvVarName) {
+  if (opts?.isLocalEnvVarName) {
     return `${opts.isLocalEnvVarName}=true ${cmd}`;
   }
   return cmd;
 }
 function extendNextScripts(scripts, opts) {
-  var _a, _b;
   const result = {
     ...scripts,
-    dev: !(scripts == null ? void 0 : scripts.dev) || ((_a = scripts == null ? void 0 : scripts.dev) == null ? void 0 : _a.indexOf("tinacms dev -c")) === -1 ? generateGqlScript((scripts == null ? void 0 : scripts.dev) || "next dev", opts) : scripts == null ? void 0 : scripts.dev,
-    build: !(scripts == null ? void 0 : scripts.build) || !((_b = scripts == null ? void 0 : scripts.build) == null ? void 0 : _b.startsWith("tinacms build &&")) ? `tinacms build && ${(scripts == null ? void 0 : scripts.build) || "next build"}` : scripts == null ? void 0 : scripts.build
+    dev: !scripts?.dev || scripts?.dev?.indexOf("tinacms dev -c") === -1 ? generateGqlScript(scripts?.dev || "next dev", opts) : scripts?.dev,
+    build: !scripts?.build || !scripts?.build?.startsWith("tinacms build &&") ? `tinacms build && ${scripts?.build || "next build"}` : scripts?.build
   };
-  if ((opts == null ? void 0 : opts.addSetupUsers) && !scripts["setup:users"]) {
+  if (opts?.addSetupUsers && !scripts["setup:users"]) {
     result["setup:users"] = "tinacms-next-auth setup";
   }
   return result;
@@ -5816,7 +5834,6 @@ var makeVariableStatementVisitor = (sourceFile, variableStmtSourceFile, variable
   }
 };
 var makeImportsVisitor = (sourceFile, importMap) => (ctx) => (node) => {
-  var _a;
   if (import_typescript3.default.isSourceFile(node)) {
     const newStatements = [...node.statements];
     let changed = false;
@@ -5825,7 +5842,7 @@ var makeImportsVisitor = (sourceFile, importMap) => (ctx) => (node) => {
       for (const statement of newStatements) {
         if (import_typescript3.default.isImportDeclaration(statement) && import_typescript3.default.isStringLiteral(statement.moduleSpecifier) && statement.moduleSpecifier.text === moduleName) {
           foundImportStatement = true;
-          const existingImports = ((_a = statement.importClause) == null ? void 0 : _a.namedBindings) && import_typescript3.default.isNamedImports(statement.importClause.namedBindings) ? statement.importClause.namedBindings.elements.map(
+          const existingImports = statement.importClause?.namedBindings && import_typescript3.default.isNamedImports(statement.importClause.namedBindings) ? statement.importClause.namedBindings.elements.map(
             (e) => e.name.text
           ) : [];
           const newImports = [
@@ -6042,7 +6059,6 @@ async function apply({
   params,
   config: config2
 }) {
-  var _a;
   if (config2.framework.name === "other" && config2.hosting === "self-host") {
     logger.error(
       logText(
@@ -6168,7 +6184,7 @@ async function apply({
     env.tinaConfigExists && // Are we running tinacms init backend
     params.isBackendInit && // Do the user choose the 'self-host' option
     config2.hosting === "self-host" && // the user did not choose the 'tina-cloud' auth provider
-    (((_a = config2.authProvider) == null ? void 0 : _a.name) || "") !== "tina-cloud"
+    (config2.authProvider?.name || "") !== "tina-cloud"
   ) {
     await addSelfHostedTinaAuthToConfig(config2, env.generatedFiles["config"]);
   }
@@ -6236,7 +6252,6 @@ var updateGitIgnore = async ({
   await import_fs_extra13.default.writeFile(import_path11.default.join(baseDir, ".gitignore"), newGitignoreContent);
 };
 var addDependencies = async (config2, env, params) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const { packageManager } = config2;
   const tagVersion = params.tinaVersion ? `@${params.tinaVersion}` : "";
   let deps = [];
@@ -6252,18 +6267,18 @@ var addDependencies = async (config2, env, params) => {
     deps.push("@tinacms/datalayer");
   }
   deps.push(
-    ...((_b = (_a = config2.databaseAdapter) == null ? void 0 : _a.imports) == null ? void 0 : _b.map((x) => x.packageName)) || []
+    ...config2.databaseAdapter?.imports?.map((x) => x.packageName) || []
   );
-  deps.push(...((_c = config2.authProvider) == null ? void 0 : _c.peerDependencies) || []);
+  deps.push(...config2.authProvider?.peerDependencies || []);
   deps.push(
-    ...((_e = (_d = config2.authProvider) == null ? void 0 : _d.backendAuthProviderImports) == null ? void 0 : _e.map(
+    ...config2.authProvider?.backendAuthProviderImports?.map(
       (x) => x.packageName
-    )) || []
+    ) || []
   );
   deps.push(
-    ...((_g = (_f = config2.authProvider) == null ? void 0 : _f.configImports) == null ? void 0 : _g.map((x) => x.packageName)) || []
+    ...config2.authProvider?.configImports?.map((x) => x.packageName) || []
   );
-  deps.push(...((_i = (_h = config2.gitProvider) == null ? void 0 : _h.imports) == null ? void 0 : _i.map((x) => x.packageName)) || []);
+  deps.push(...config2.gitProvider?.imports?.map((x) => x.packageName) || []);
   if (tagVersion) {
     deps = deps.map(
       (dep) => dep.indexOf("tina") >= 0 ? `${dep}${tagVersion}` : dep
@@ -6327,12 +6342,11 @@ var addConfigFile = async ({
   generatedFile,
   config: config2
 }) => {
-  var _a;
   const content = (0, import_prettier2.format)(generateConfig(configArgs), {
     parser: "babel"
   });
   await writeGeneratedFile({
-    overwrite: (_a = config2.overwriteList) == null ? void 0 : _a.includes("config"),
+    overwrite: config2.overwriteList?.includes("config"),
     generatedFile,
     content,
     typescript: config2.typescript
@@ -6346,10 +6360,9 @@ var addDatabaseFile = async ({
   config: config2,
   generatedFile
 }) => {
-  var _a;
   await writeGeneratedFile({
     generatedFile,
-    overwrite: (_a = config2.overwriteList) == null ? void 0 : _a.includes("database"),
+    overwrite: config2.overwriteList?.includes("database"),
     content: databaseTemplate({ config: config2 }),
     typescript: config2.typescript
   });
@@ -6359,13 +6372,12 @@ var addNextApiRoute = async ({
   generatedFile,
   env
 }) => {
-  var _a;
   const content = (0, import_prettier2.format)(nextApiRouteTemplate({ config: config2, env }), {
     parser: "babel"
   });
   await writeGeneratedFile({
     generatedFile,
-    overwrite: (_a = config2.overwriteList) == null ? void 0 : _a.includes("next-api-handler"),
+    overwrite: config2.overwriteList?.includes("next-api-handler"),
     content,
     typescript: config2.typescript
   });
@@ -6375,10 +6387,9 @@ var addTemplateFile = async ({
   generatedFile,
   config: config2
 }) => {
-  var _a;
   await writeGeneratedFile({
     generatedFile,
-    overwrite: (_a = config2.overwriteList) == null ? void 0 : _a.includes(generatedFile.generatedFileType),
+    overwrite: config2.overwriteList?.includes(generatedFile.generatedFileType),
     content,
     typescript: config2.typescript
   });
@@ -6387,7 +6398,6 @@ var addContentFile = async ({
   config: config2,
   env
 }) => {
-  var _a;
   await writeGeneratedFile({
     generatedFile: {
       javascriptExists: false,
@@ -6405,7 +6415,7 @@ var addContentFile = async ({
         });
       }
     },
-    overwrite: (_a = config2.overwriteList) == null ? void 0 : _a.includes("sample-content"),
+    overwrite: config2.overwriteList?.includes("sample-content"),
     content: helloWorldPost,
     typescript: false
   });
@@ -6496,12 +6506,11 @@ var addReactiveFile = {
     baseDir,
     dataLayer
   }) => {
-    var _a, _b;
     const packageJsonPath = import_path11.default.join(baseDir, "package.json");
     await writeGeneratedFile({
       generatedFile,
       typescript: config2.typescript,
-      overwrite: (_a = config2.overwriteList) == null ? void 0 : _a.includes(
+      overwrite: config2.overwriteList?.includes(
         generatedFile.generatedFileType
       ),
       content: templates["demo-post-page"]({
@@ -6517,7 +6526,7 @@ var addReactiveFile = {
         ...packageJson,
         scripts: extendNextScripts(scripts, {
           isLocalEnvVarName: config2.isLocalEnvVarName,
-          addSetupUsers: ((_b = config2.authProvider) == null ? void 0 : _b.name) === "next-auth"
+          addSetupUsers: config2.authProvider?.name === "next-auth"
         })
       },
       null,
@@ -6592,6 +6601,15 @@ var InitCommand = class extends import_clipanion6.Command {
       description: "Specify a version for tina dependencies"
     });
   }
+  static {
+    this.paths = [["init"], ["init", "backend"]];
+  }
+  static {
+    this.usage = import_clipanion6.Command.Usage({
+      category: `Commands`,
+      description: `Add Tina to an existing project`
+    });
+  }
   async catch(error) {
     logger.error("Error occured during tinacms init");
     console.error(error);
@@ -6611,11 +6629,6 @@ var InitCommand = class extends import_clipanion6.Command {
     process.exit();
   }
 };
-InitCommand.paths = [["init"], ["init", "backend"]];
-InitCommand.usage = import_clipanion6.Command.Usage({
-  category: `Commands`,
-  description: `Add Tina to an existing project`
-});
 
 // src/next/commands/searchindex-command/index.ts
 var import_clipanion7 = require("clipanion");
@@ -6631,13 +6644,21 @@ var SearchIndexCommand = class extends import_clipanion7.Command {
       description: "increase verbosity of logged output"
     });
   }
+  static {
+    this.paths = [["search-index"]];
+  }
+  static {
+    this.usage = import_clipanion7.Command.Usage({
+      category: `Commands`,
+      description: `Index the site for search`
+    });
+  }
   async catch(error) {
     logger.error("Error occured during tinacms search-index");
     console.error(error);
     process.exit(1);
   }
   async execute() {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
     const rootPath = this.rootPath || process.cwd();
     const configManager = new ConfigManager({ rootPath });
     try {
@@ -6648,7 +6669,7 @@ var SearchIndexCommand = class extends import_clipanion7.Command {
         console.error(e);
       }
     }
-    if (!((_a = configManager.config) == null ? void 0 : _a.search)) {
+    if (!configManager.config?.search) {
       logger.error("No search config found");
       process.exit(1);
     }
@@ -6657,9 +6678,9 @@ var SearchIndexCommand = class extends import_clipanion7.Command {
       schema: { ...schema, config: configManager.config }
     });
     let client;
-    const hasTinaSearch = Boolean((_c = (_b = configManager.config) == null ? void 0 : _b.search) == null ? void 0 : _c.tina);
+    const hasTinaSearch = Boolean(configManager.config?.search?.tina);
     if (hasTinaSearch) {
-      if (!((_d = configManager.config) == null ? void 0 : _d.branch)) {
+      if (!configManager.config?.branch) {
         logger.error(
           `${dangerText(
             `ERROR: Branch not configured in tina search configuration.`
@@ -6667,11 +6688,11 @@ var SearchIndexCommand = class extends import_clipanion7.Command {
         );
         throw new Error("Branch not configured in tina search configuration.");
       }
-      if (!((_e = configManager.config) == null ? void 0 : _e.clientId)) {
+      if (!configManager.config?.clientId) {
         logger.error(`${dangerText(`ERROR: clientId not configured.`)}`);
         throw new Error("clientId not configured.");
       }
-      if (!((_h = (_g = (_f = configManager.config) == null ? void 0 : _f.search) == null ? void 0 : _g.tina) == null ? void 0 : _h.indexerToken)) {
+      if (!configManager.config?.search?.tina?.indexerToken) {
         logger.error(
           `${dangerText(
             `ERROR: indexerToken not configured in tina search configuration.`
@@ -6682,22 +6703,22 @@ var SearchIndexCommand = class extends import_clipanion7.Command {
         );
       }
       client = new import_search3.TinaCMSSearchIndexClient({
-        apiUrl: `${((_i = configManager.config.tinaioConfig) == null ? void 0 : _i.contentApiUrlOverride) || "https://content.tinajs.io"}/searchIndex/${(_j = configManager.config) == null ? void 0 : _j.clientId}`,
-        branch: (_k = configManager.config) == null ? void 0 : _k.branch,
-        indexerToken: (_n = (_m = (_l = configManager.config) == null ? void 0 : _l.search) == null ? void 0 : _m.tina) == null ? void 0 : _n.indexerToken,
-        stopwordLanguages: (_q = (_p = (_o = configManager.config) == null ? void 0 : _o.search) == null ? void 0 : _p.tina) == null ? void 0 : _q.stopwordLanguages
+        apiUrl: `${configManager.config.tinaioConfig?.contentApiUrlOverride || "https://content.tinajs.io"}/searchIndex/${configManager.config?.clientId}`,
+        branch: configManager.config?.branch,
+        indexerToken: configManager.config?.search?.tina?.indexerToken,
+        stopwordLanguages: configManager.config?.search?.tina?.stopwordLanguages
       });
     } else {
-      client = (_s = (_r = configManager.config) == null ? void 0 : _r.search) == null ? void 0 : _s.searchClient;
+      client = configManager.config?.search?.searchClient;
     }
     const searchIndexer = new import_search3.SearchIndexer({
-      batchSize: ((_t = configManager.config.search) == null ? void 0 : _t.indexBatchSize) || 100,
+      batchSize: configManager.config.search?.indexBatchSize || 100,
       bridge: new import_graphql17.FilesystemBridge(
         configManager.rootPath,
         configManager.contentRootPath
       ),
       schema: tinaSchema,
-      textIndexLength: ((_u = configManager.config.search) == null ? void 0 : _u.maxSearchIndexFieldLength) || 100,
+      textIndexLength: configManager.config.search?.maxSearchIndexFieldLength || 100,
       client
     });
     let err;
@@ -6718,11 +6739,6 @@ var SearchIndexCommand = class extends import_clipanion7.Command {
     process.exit(0);
   }
 };
-SearchIndexCommand.paths = [["search-index"]];
-SearchIndexCommand.usage = import_clipanion7.Command.Usage({
-  category: `Commands`,
-  description: `Index the site for search`
-});
 
 // src/index.ts
 var cli = new import_clipanion8.Cli({