@tinacms/graphql 1.3.5 → 1.4.1

package/dist/index.js

@@ -46,13 +46,10 @@ __export(src_exports, {
   stringifyFile: () => stringifyFile
 });
 module.exports = __toCommonJS(src_exports);
-var import_fs_extra4 = __toESM(require("fs-extra"));
-var import_path6 = __toESM(require("path"));
 var import_graphql7 = require("graphql");
 
 // src/build.ts
 var import_lodash3 = __toESM(require("lodash"));
-var import_fs_extra = __toESM(require("fs-extra"));
 var import_graphql2 = require("graphql");
 
 // src/ast-builder/index.ts
@@ -2272,11 +2269,11 @@ Visit https://tina.io/docs/errors/ui-not-supported/ for more information
       switch (field.type) {
         case "boolean":
         case "datetime":
-        case "image":
         case "number":
           if (field.list) {
             console.warn(listWarningMsg);
           }
+        case "image":
         case "string":
           return astBuilder.FieldDefinition({
             name: field.name,
@@ -2436,19 +2433,29 @@ var validationCollectionsPathAndMatch = (collections) => {
   }
   const noMatchCollections = collections.filter((x) => {
     return typeof (x == null ? void 0 : x.match) === "undefined";
-  }).map((x) => x.path);
+  }).map((x) => `${x.path}${x.format || "md"}`);
   if (noMatchCollections.length !== new Set(noMatchCollections).size) {
-    throw new Error("path must be unique");
+    throw new Error(
+      "Two collections without match can not have the same `path`. Please make the `path` unique or add a matches property to the collection."
+    );
   }
   const hasMatchAndPath = collections.filter((x) => {
     return typeof x.path !== "undefined" && typeof x.match !== "undefined";
-  }).map((x) => `${x.path}|${x.match}`);
+  }).map(
+    (x) => {
+      var _a, _b;
+      return `${x.path}|${((_a = x == null ? void 0 : x.match) == null ? void 0 : _a.exclude) || ""}|${((_b = x == null ? void 0 : x.match) == null ? void 0 : _b.include) || ""}|${x.format || "md"}`;
+    }
+  );
   if (hasMatchAndPath.length !== new Set(hasMatchAndPath).size) {
-    throw new Error("Both `match` and `path` can not be the same");
+    throw new Error(
+      "Can not have two or more collections with the same path and match. Please update either the path or the match to be unique."
+    );
   }
   const groupbyPath = collections.reduce((r, a) => {
-    r[a.path] = r[a.path] || [];
-    r[a.path].push(a);
+    const key = `${a.path}|${a.format || "md"}`;
+    r[key] = r[key] || [];
+    r[key].push(a);
     return r;
   }, /* @__PURE__ */ Object.create(null));
   Object.keys(groupbyPath).forEach((key) => {
@@ -2456,12 +2463,20 @@ var validationCollectionsPathAndMatch = (collections) => {
     if (collectionsArr.length === 1) {
       return;
     }
-    const matches = collectionsArr.filter((x) => {
-      return typeof x.match !== "undefined";
-    });
-    if (matches.length !== collections.length) {
-      throw new Error("path must be unique when no `match` is provided");
+    if (collectionsArr.some((x) => typeof x.match === "undefined")) {
+      throw new Error(
+        "Can not have two or more collections with the same path and format if one doesn't have a match property"
+      );
+    }
+    const matches = collectionsArr.map(
+      (x) => typeof (x == null ? void 0 : x.match) === "object" ? JSON.stringify(x.match) : ""
+    );
+    if (matches.length === new Set(matches).size) {
+      return;
     }
+    throw new Error(
+      "Can not have two or more collections with the same path format and match. Please update either the path or the match to be unique."
+    );
   });
 };
 var validateCollection = async (collection) => {
@@ -2527,7 +2542,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.3.5",
+  version: "1.4.1",
   main: "dist/index.js",
   module: "dist/index.es.js",
   typings: "dist/index.d.ts",
@@ -2590,6 +2605,7 @@ var package_default = {
     "mdast-util-mdx-expression": "^1.1.0",
     "mdast-util-to-markdown": "^1.2.1",
     "micromark-extension-mdxjs": "^1.0.0",
+    micromatch: "4.0.5",
     "normalize-path": "^3.0.0",
     prettier: "^2.2.1",
     "readable-stream": "^4.3.0",
@@ -2630,6 +2646,7 @@ var package_default = {
     "@types/lodash.upperfirst": "^4.3.6",
     "@types/lru-cache": "^5.1.0",
     "@types/mdast": "^3.0.10",
+    "@types/micromatch": "^4.0.2",
     "@types/node": "^14.17.34",
     "@types/normalize-path": "^3.0.0",
     "@types/ws": "^7.2.6",
@@ -2668,7 +2685,6 @@ var createSchema = async ({
 };
 
 // src/build.ts
-var import_path = __toESM(require("path"));
 var buildDotTinaFiles = async ({
   database,
   config,
@@ -2678,7 +2694,11 @@ var buildDotTinaFiles = async ({
   if (flags.indexOf("experimentalData") === -1) {
     flags.push("experimentalData");
   }
-  const tinaSchema = await createSchema({ schema: config, flags });
+  const { schema } = config;
+  const tinaSchema = await createSchema({
+    schema: { ...schema, config },
+    flags
+  });
   const builder = await createBuilder({
     database,
     tinaSchema
@@ -2692,11 +2712,21 @@ var buildDotTinaFiles = async ({
       await database.bridge.get(".tina/__generated__/_graphql.json")
     );
   }
+  let fragDoc = "";
+  let queryDoc = "";
   if (buildSDK) {
-    await _buildFragments(builder, tinaSchema, database.bridge.rootPath);
-    await _buildQueries(builder, tinaSchema, database.bridge.rootPath);
+    fragDoc = await _buildFragments(
+      builder,
+      tinaSchema,
+      database.bridge.rootPath
+    );
+    queryDoc = await _buildQueries(
+      builder,
+      tinaSchema,
+      database.bridge.rootPath
+    );
   }
-  return { graphQLSchema, tinaSchema };
+  return { graphQLSchema, tinaSchema, fragDoc, queryDoc };
 };
 var _buildFragments = async (builder, tinaSchema, rootPath) => {
   const fragmentDefinitionsFields = [];
@@ -2714,23 +2744,7 @@ var _buildFragments = async (builder, tinaSchema, rootPath) => {
       (node) => node.name.value
     )
   };
-  const fragPath = import_path.default.join(rootPath, ".tina", "__generated__");
-  await import_fs_extra.default.outputFile(import_path.default.join(fragPath, "frags.gql"), (0, import_graphql2.print)(fragDoc));
-  if (await (await import_fs_extra.default.stat(import_path.default.join(fragPath, "frags.gql"))).size > 100 * 1024) {
-    console.warn(
-      "Warning: frags.gql is very large (>100kb). Consider setting the reference depth to 1 or 0. See code snippet below."
-    );
-    console.log(
-      `const schema = defineSchema({
-        config: {
-            client: {
-                referenceDepth: 1,
-            },
-        }
-        // ...
-    })`
-    );
-  }
+  return (0, import_graphql2.print)(fragDoc);
 };
 var _buildQueries = async (builder, tinaSchema, rootPath) => {
   const operationsDefinitions = [];
@@ -2762,8 +2776,7 @@ var _buildQueries = async (builder, tinaSchema, rootPath) => {
       (node) => node.name.value
     )
   };
-  const fragPath = import_path.default.join(rootPath, ".tina", "__generated__");
-  await import_fs_extra.default.outputFile(import_path.default.join(fragPath, "queries.gql"), (0, import_graphql2.print)(queryDoc));
+  return (0, import_graphql2.print)(queryDoc);
 };
 var _buildSchema = async (builder, tinaSchema) => {
   const definitions = [];
@@ -2844,7 +2857,7 @@ var _buildSchema = async (builder, tinaSchema) => {
 var import_graphql4 = require("graphql");
 
 // src/resolver/index.ts
-var import_path2 = __toESM(require("path"));
+var import_path = __toESM(require("path"));
 var import_isValid = __toESM(require("date-fns/isValid"));
 
 // src/mdx/index.ts
@@ -3054,9 +3067,9 @@ var resolveMediaRelativeToCloud = (value, config = { useRelativeMedia: true }, s
     return value;
   }
 };
-var cleanUpSlashes = (path6) => {
-  if (path6) {
-    return `/${path6.replace(/^\/+|\/+$/gm, "")}`;
+var cleanUpSlashes = (path4) => {
+  if (path4) {
+    return `/${path4.replace(/^\/+|\/+$/gm, "")}`;
   }
   return "";
 };
@@ -3521,7 +3534,11 @@ var makeStringEscaper = (regex, replacement) => {
         (val) => val.replace(regex, replacement)
       );
     } else {
-      return input.replace(regex, replacement);
+      if (typeof input === "string") {
+        return input.replace(regex, replacement);
+      } else {
+        return input;
+      }
     }
   };
 };
@@ -3561,7 +3578,7 @@ var Resolver = class {
           base: basename,
           ext: extension,
           name: filename
-        } = import_path2.default.parse(fullPath);
+        } = import_path.default.parse(fullPath);
         const relativePath = fullPath.replace(/\\/g, "/").replace(collection.path, "").replace(/^\/|\/$/g, "");
         const breadcrumbs = relativePath.replace(extension, "").split("/");
         const data = {
@@ -3804,7 +3821,7 @@ var Resolver = class {
         (yup3) => yup3.object({ relativePath: yup3.string().required() })
       );
       const collection = await this.tinaSchema.getCollection(collectionLookup);
-      const realPath = import_path2.default.join(collection == null ? void 0 : collection.path, args.relativePath);
+      const realPath = import_path.default.join(collection == null ? void 0 : collection.path, args.relativePath);
       const alreadyExists = await this.database.documentExists(realPath);
       if (isMutation) {
         if (isCreation) {
@@ -3845,7 +3862,7 @@ var Resolver = class {
             (yup3) => yup3.object({ relativePath: yup3.string().required() })
           );
           const doc = await this.getDocument(realPath);
-          const newRealPath = import_path2.default.join(
+          const newRealPath = import_path.default.join(
             collection == null ? void 0 : collection.path,
             args.params.relativePath
           );
@@ -3900,7 +3917,7 @@ var Resolver = class {
             first: -1
           },
           collection: referencedCollection,
-          hydrator: (path6) => path6
+          hydrator: (path4) => path4
         }
       );
       const { edges } = resolvedCollectionConnection;
@@ -4434,13 +4451,15 @@ var resolve = async ({
 };
 
 // src/database/index.ts
-var import_path3 = __toESM(require("path"));
+var import_path2 = __toESM(require("path"));
 var import_graphql5 = require("graphql");
+var import_micromatch = __toESM(require("micromatch"));
 
 // src/database/util.ts
 var import_toml = __toESM(require("@iarna/toml"));
 var import_js_yaml = __toESM(require("js-yaml"));
 var import_gray_matter = __toESM(require("gray-matter"));
+var import_schema_tools3 = require("@tinacms/schema-tools");
 var matterEngines = {
   toml: {
     parse: (val) => import_toml.default.parse(val),
@@ -4524,7 +4543,6 @@ var parseFile = (content, format, yupSchema, markdownParseConfig) => {
       throw new Error(`Must specify a valid format, got ${format}`);
   }
 };
-var normalizePath = (filepath) => filepath.replace(/\\/g, "/");
 
 // src/database/alias-utils.ts
 var replaceNameOverrides = (template, obj) => {
@@ -4615,18 +4633,18 @@ var Database = class {
       const tinaSchema = await this.getSchema(this.level);
       return tinaSchema.getCollectionByFullPath(filepath);
     };
-    this.getGeneratedFolder = () => import_path3.default.join(this.tinaDirectory, "__generated__");
+    this.getGeneratedFolder = () => import_path2.default.join(this.tinaDirectory, "__generated__");
     this.get = async (filepath) => {
       await this.initLevel();
       if (SYSTEM_FILES.includes(filepath)) {
         throw new Error(`Unexpected get for config file ${filepath}`);
       } else {
         const tinaSchema = await this.getSchema(this.level);
-        const extension = import_path3.default.extname(filepath);
+        const extension = import_path2.default.extname(filepath);
         const contentObject = await this.level.sublevel(
           CONTENT_ROOT_PREFIX,
           SUBLEVEL_OPTIONS
-        ).get(normalizePath(filepath));
+        ).get((0, import_schema_tools3.normalizePath)(filepath));
         if (!contentObject) {
           throw new import_graphql5.GraphQLError(`Unable to find record ${filepath}`);
         }
@@ -4672,7 +4690,7 @@ var Database = class {
         const indexDefinitions = await this.getIndexDefinitions(this.level);
         collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
       }
-      const normalizedPath = normalizePath(filepath);
+      const normalizedPath = (0, import_schema_tools3.normalizePath)(filepath);
       if (this.bridge) {
         await this.bridge.put(normalizedPath, stringifiedFile);
       }
@@ -4713,6 +4731,7 @@ var Database = class {
       await this.level.batch(ops);
     };
     this.put = async (filepath, data, collectionName) => {
+      var _a, _b;
       await this.initLevel();
       try {
         if (SYSTEM_FILES.includes(filepath)) {
@@ -4723,9 +4742,20 @@ var Database = class {
             const indexDefinitions = await this.getIndexDefinitions(this.level);
             collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collectionName];
           }
-          const normalizedPath = normalizePath(filepath);
+          const normalizedPath = (0, import_schema_tools3.normalizePath)(filepath);
           const dataFields = await this.formatBodyOnPayload(filepath, data);
           const collection = await this.collectionForPath(filepath);
+          if (((_a = collection.match) == null ? void 0 : _a.exclude) || ((_b = collection.match) == null ? void 0 : _b.include)) {
+            const matches = this.tinaSchema.getMatches({ collection });
+            const match = import_micromatch.default.isMatch(filepath, matches);
+            if (!match) {
+              throw new import_graphql5.GraphQLError(
+                `File ${filepath} does not match collection ${collection.name} glob ${matches.join(
+                  ","
+                )}. Please change the filename or update matches for ${collection.name} in your config file.`
+              );
+            }
+          }
           const stringifiedFile = await this.stringifyFile(
             filepath,
             dataFields,
@@ -4812,7 +4842,7 @@ var Database = class {
       );
       const writeTemplateKey = templateDetails.info.type === "union";
       const aliasedData = applyNameOverrides(templateDetails.template, payload);
-      const extension = import_path3.default.extname(filepath);
+      const extension = import_path2.default.extname(filepath);
       const stringifiedFile = stringifyFile(
         aliasedData,
         extension,
@@ -4837,8 +4867,8 @@ var Database = class {
     };
     this.getLookup = async (returnType) => {
       await this.initLevel();
-      const lookupPath = normalizePath(
-        import_path3.default.join(this.getGeneratedFolder(), `_lookup.json`)
+      const lookupPath = (0, import_schema_tools3.normalizePath)(
+        import_path2.default.join(this.getGeneratedFolder(), `_lookup.json`)
       );
       if (!this._lookup) {
         const _lookup = await this.level.sublevel(
@@ -4851,8 +4881,8 @@ var Database = class {
     };
     this.getGraphQLSchema = async () => {
       await this.initLevel();
-      const graphqlPath = normalizePath(
-        import_path3.default.join(this.getGeneratedFolder(), `_graphql.json`)
+      const graphqlPath = (0, import_schema_tools3.normalizePath)(
+        import_path2.default.join(this.getGeneratedFolder(), `_graphql.json`)
       );
       return await this.level.sublevel(
         CONTENT_ROOT_PREFIX,
@@ -4863,16 +4893,16 @@ var Database = class {
       if (!this.bridge) {
         throw new Error(`No bridge configured`);
       }
-      const graphqlPath = normalizePath(
-        import_path3.default.join(this.getGeneratedFolder(), `_graphql.json`)
+      const graphqlPath = (0, import_schema_tools3.normalizePath)(
+        import_path2.default.join(this.getGeneratedFolder(), `_graphql.json`)
       );
       const _graphql = await this.bridge.get(graphqlPath);
       return JSON.parse(_graphql);
     };
     this.getTinaSchema = async (level) => {
       await this.initLevel();
-      const schemaPath = normalizePath(
-        import_path3.default.join(this.getGeneratedFolder(), `_schema.json`)
+      const schemaPath = (0, import_schema_tools3.normalizePath)(
+        import_path2.default.join(this.getGeneratedFolder(), `_schema.json`)
       );
       return await (level || this.level).sublevel(
         CONTENT_ROOT_PREFIX,
@@ -5061,11 +5091,11 @@ var Database = class {
     }) => {
       if (this.bridge && this.bridge.supportsBuilding()) {
         await this.bridge.putConfig(
-          normalizePath(import_path3.default.join(this.getGeneratedFolder(), `_graphql.json`)),
+          (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), `_graphql.json`)),
           JSON.stringify(graphQLSchema)
         );
         await this.bridge.putConfig(
-          normalizePath(import_path3.default.join(this.getGeneratedFolder(), `_schema.json`)),
+          (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), `_schema.json`)),
           JSON.stringify(tinaSchema.schema)
         );
       }
@@ -5079,10 +5109,10 @@ var Database = class {
         throw new Error("No bridge configured");
       }
       await this.initLevel();
-      await this.indexStatusCallbackWrapper(async () => {
+      const result = await this.indexStatusCallbackWrapper(async () => {
         const lookup = lookupFromLockFile || JSON.parse(
           await this.bridge.get(
-            normalizePath(import_path3.default.join(this.getGeneratedFolder(), "_lookup.json"))
+            (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), "_lookup.json"))
           )
         );
         let nextLevel;
@@ -5100,18 +5130,18 @@ var Database = class {
           SUBLEVEL_OPTIONS
         );
         await contentRootLevel.put(
-          normalizePath(import_path3.default.join(this.getGeneratedFolder(), "_graphql.json")),
+          (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), "_graphql.json")),
           graphQLSchema
         );
         await contentRootLevel.put(
-          normalizePath(import_path3.default.join(this.getGeneratedFolder(), "_schema.json")),
+          (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), "_schema.json")),
           tinaSchema.schema
         );
         await contentRootLevel.put(
-          normalizePath(import_path3.default.join(this.getGeneratedFolder(), "_lookup.json")),
+          (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), "_lookup.json")),
           lookup
         );
-        await this._indexAllContent(nextLevel);
+        const result2 = await this._indexAllContent(nextLevel);
         if (this.config.version) {
           await this.updateDatabaseVersion(nextVersion);
           if (this.level) {
@@ -5119,7 +5149,9 @@ var Database = class {
           }
           this.level = nextLevel;
         }
+        return result2;
       });
+      return result;
     };
     this.deleteContentByPaths = async (documentPaths) => {
       await this.initLevel();
@@ -5184,7 +5216,7 @@ var Database = class {
         CONTENT_ROOT_PREFIX,
         SUBLEVEL_OPTIONS
       );
-      const itemKey = normalizePath(filepath);
+      const itemKey = (0, import_schema_tools3.normalizePath)(filepath);
       const rootSublevel = this.level.sublevel(
         CONTENT_ROOT_PREFIX,
         SUBLEVEL_OPTIONS
@@ -5208,11 +5240,12 @@ var Database = class {
         ]);
       }
       if (this.bridge) {
-        await this.bridge.delete(normalizePath(filepath));
+        await this.bridge.delete((0, import_schema_tools3.normalizePath)(filepath));
       }
-      await this.onDelete(normalizePath(filepath));
+      await this.onDelete((0, import_schema_tools3.normalizePath)(filepath));
     };
     this._indexAllContent = async (level) => {
+      const warnings = [];
       const tinaSchema = await this.getSchema(level);
       const operations = [];
       const enqueueOps = async (ops) => {
@@ -5222,25 +5255,46 @@ var Database = class {
           await level.batch(batchOps);
         }
       };
+      const filesSeen = /* @__PURE__ */ new Map();
+      const duplicateFiles = /* @__PURE__ */ new Set();
       await sequential(tinaSchema.getCollections(), async (collection) => {
-        const documentPaths = await this.bridge.glob(
-          normalizePath(collection.path),
-          collection.format || "md"
-        );
-        await _indexContent(this, level, documentPaths, enqueueOps, collection);
+        const normalPath = (0, import_schema_tools3.normalizePath)(collection.path);
+        const format = collection.format || "md";
+        const documentPaths = await this.bridge.glob(normalPath, format);
+        const matches = this.tinaSchema.getMatches({ collection });
+        const filteredPaths = matches.length > 0 ? (0, import_micromatch.default)(documentPaths, matches) : documentPaths;
+        filteredPaths.forEach((path4) => {
+          if (filesSeen.has(path4)) {
+            filesSeen.get(path4).push(collection.name);
+            duplicateFiles.add(path4);
+          } else {
+            filesSeen.set(path4, [collection.name]);
+          }
+        });
+        duplicateFiles.forEach((path4) => {
+          warnings.push(
+            `"${path4}" Found in multiple collections: ${filesSeen.get(path4).map((collection2) => `"${collection2}"`).join(
+              ", "
+            )}. This can cause unexpected behavior. We recommend updating the \`match\` property of those collections so that each file is in only one collection.
+This will be an error in the future.
+`
+          );
+        });
+        await _indexContent(this, level, filteredPaths, enqueueOps, collection);
       });
       while (operations.length) {
         await level.batch(operations.splice(0, 25));
       }
+      return { warnings };
     };
     this.addToLookupMap = async (lookup) => {
       if (!this.bridge) {
         throw new Error("No bridge configured");
       }
-      const lookupPath = import_path3.default.join(this.getGeneratedFolder(), `_lookup.json`);
+      const lookupPath = import_path2.default.join(this.getGeneratedFolder(), `_lookup.json`);
       let lookupMap;
       try {
-        lookupMap = JSON.parse(await this.bridge.get(normalizePath(lookupPath)));
+        lookupMap = JSON.parse(await this.bridge.get((0, import_schema_tools3.normalizePath)(lookupPath)));
       } catch (e) {
         lookupMap = {};
       }
@@ -5249,7 +5303,7 @@ var Database = class {
         [lookup.type]: lookup
       };
       await this.bridge.putConfig(
-        normalizePath(lookupPath),
+        (0, import_schema_tools3.normalizePath)(lookupPath),
         JSON.stringify(updatedLookup)
       );
     };
@@ -5338,8 +5392,9 @@ var Database = class {
   async indexStatusCallbackWrapper(fn) {
     await this.indexStatusCallback({ status: "inprogress" });
     try {
-      await fn();
+      const result = await fn();
       await this.indexStatusCallback({ status: "complete" });
+      return result;
     } catch (error) {
       await this.indexStatusCallback({ status: "failed", error });
       throw error;
@@ -5365,17 +5420,17 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
   }
   await sequential(documentPaths, async (filepath) => {
     try {
-      const dataString = await database.bridge.get(normalizePath(filepath));
+      const dataString = await database.bridge.get((0, import_schema_tools3.normalizePath)(filepath));
       const data = parseFile(
         dataString,
-        import_path3.default.extname(filepath),
+        import_path2.default.extname(filepath),
         (yup3) => yup3.object({}),
         {
           frontmatterDelimiters: collection == null ? void 0 : collection.frontmatterDelimiters,
           frontmatterFormat: collection == null ? void 0 : collection.frontmatterFormat
         }
       );
-      const normalizedPath = normalizePath(filepath);
+      const normalizedPath = (0, import_schema_tools3.normalizePath)(filepath);
       const aliasedData = templateInfo ? replaceNameOverrides(
         getTemplateForFile(templateInfo, data),
         data
@@ -5423,7 +5478,7 @@ var _deleteIndexContent = async (database, documentPaths, enequeueOps, collectio
     SUBLEVEL_OPTIONS
   );
   await sequential(documentPaths, async (filepath) => {
-    const itemKey = normalizePath(filepath);
+    const itemKey = (0, import_schema_tools3.normalizePath)(filepath);
     const item = await rootLevel.get(itemKey);
     if (item) {
       await enequeueOps([
@@ -5446,9 +5501,15 @@ var getTemplateForFile = (templateInfo, data) => {
   }
   if (templateInfo.type === "union") {
     if (hasOwnProperty(data, "_template")) {
-      return templateInfo.templates.find(
+      const template = templateInfo.templates.find(
         (t) => lastItem(t.namespace) === data._template
       );
+      if (!template) {
+        throw new Error(
+          `Unable to find template "${data._template}". Possible templates are: ${templateInfo.templates.map((template2) => `"${template2.name}"`).join(", ")}.`
+        );
+      }
+      return template;
     } else {
       throw new Error(
         `Expected _template to be provided for document in an ambiguous collection`
@@ -5479,22 +5540,19 @@ var TinaLevelClient = class extends import_many_level.ManyLevelGuest {
 };
 
 // src/database/bridge/filesystem.ts
-var import_fs_extra2 = __toESM(require("fs-extra"));
+var import_fs_extra = __toESM(require("fs-extra"));
 var import_fast_glob = __toESM(require("fast-glob"));
-var import_path4 = __toESM(require("path"));
+var import_path3 = __toESM(require("path"));
 var import_normalize_path = __toESM(require("normalize-path"));
 var FilesystemBridge = class {
-  constructor(rootPath) {
+  constructor(rootPath, outputPath) {
     this.rootPath = rootPath || "";
-    this.outputPath = rootPath || "";
-  }
-  addOutputPath(outputPath) {
-    this.outputPath = outputPath;
+    this.outputPath = outputPath || rootPath;
   }
   async glob(pattern, extension) {
-    const basePath = import_path4.default.join(this.outputPath, ...pattern.split("/"));
+    const basePath = import_path3.default.join(this.outputPath, ...pattern.split("/"));
     const items = await (0, import_fast_glob.default)(
-      import_path4.default.join(basePath, "**", `/*${extension}`).replace(/\\/g, "/"),
+      import_path3.default.join(basePath, "**", `/*${extension}`).replace(/\\/g, "/"),
       {
         dot: true
       }
@@ -5508,10 +5566,10 @@ var FilesystemBridge = class {
     return true;
   }
   async delete(filepath) {
-    await import_fs_extra2.default.remove(import_path4.default.join(this.outputPath, filepath));
+    await import_fs_extra.default.remove(import_path3.default.join(this.outputPath, filepath));
   }
   async get(filepath) {
-    return import_fs_extra2.default.readFileSync(import_path4.default.join(this.outputPath, filepath)).toString();
+    return import_fs_extra.default.readFileSync(import_path3.default.join(this.outputPath, filepath)).toString();
   }
   async putConfig(filepath, data) {
     if (this.rootPath !== this.outputPath) {
@@ -5523,7 +5581,7 @@ var FilesystemBridge = class {
   }
   async put(filepath, data, basePathOverride) {
     const basePath = basePathOverride || this.outputPath;
-    await import_fs_extra2.default.outputFileSync(import_path4.default.join(basePath, filepath), data);
+    await import_fs_extra.default.outputFileSync(import_path3.default.join(basePath, filepath), data);
   }
 };
 var AuditFileSystemBridge = class extends FilesystemBridge {
@@ -5541,11 +5599,11 @@ var AuditFileSystemBridge = class extends FilesystemBridge {
 
 // src/database/bridge/isomorphic.ts
 var import_isomorphic_git = __toESM(require("isomorphic-git"));
-var import_fs_extra3 = __toESM(require("fs-extra"));
+var import_fs_extra2 = __toESM(require("fs-extra"));
 var import_glob_parent = __toESM(require("glob-parent"));
 var import_normalize_path2 = __toESM(require("normalize-path"));
 var import_graphql6 = require("graphql");
-var import_path5 = require("path");
+var import_path4 = require("path");
 var flat = typeof Array.prototype.flat === "undefined" ? (entries) => entries.reduce((acc, x) => acc.concat(x), []) : (entries) => entries.flat();
 var toUint8Array = (buf) => {
   const ab = new ArrayBuffer(buf.length);
@@ -5560,7 +5618,7 @@ var IsomorphicBridge = class {
     gitRoot,
     author,
     committer,
-    fsModule = import_fs_extra3.default,
+    fsModule = import_fs_extra2.default,
     commitMessage = "Update from GraphQL client",
     ref,
     onPut,
@@ -5604,7 +5662,7 @@ var IsomorphicBridge = class {
   async listEntries({
     pattern,
     entry,
-    path: path6,
+    path: path4,
     results
   }) {
     const treeResult = await import_isomorphic_git.default.readTree({
@@ -5614,7 +5672,7 @@ var IsomorphicBridge = class {
     });
     const children = [];
     for (const childEntry of treeResult.tree) {
-      const childPath = path6 ? `${path6}/${childEntry.path}` : childEntry.path;
+      const childPath = path4 ? `${path4}/${childEntry.path}` : childEntry.path;
       if (childEntry.type === "tree") {
         children.push(childEntry);
       } else {
@@ -5624,7 +5682,7 @@ var IsomorphicBridge = class {
       }
     }
     for (const childEntry of children) {
-      const childPath = path6 ? `${path6}/${childEntry.path}` : childEntry.path;
+      const childPath = path4 ? `${path4}/${childEntry.path}` : childEntry.path;
       await this.listEntries({
         pattern,
         entry: childEntry,
@@ -5633,17 +5691,17 @@ var IsomorphicBridge = class {
       });
     }
   }
-  async resolvePathEntries(path6, ref) {
-    let pathParts = path6.split("/");
+  async resolvePathEntries(path4, ref) {
+    let pathParts = path4.split("/");
     const result = await import_isomorphic_git.default.walk({
       ...this.isomorphicConfig,
       map: async (filepath, [head]) => {
         if (head._fullpath === ".") {
           return head;
         }
-        if (path6.startsWith(filepath)) {
-          if ((0, import_path5.dirname)(path6) === (0, import_path5.dirname)(filepath)) {
-            if (path6 === filepath) {
+        if (path4.startsWith(filepath)) {
+          if ((0, import_path4.dirname)(path4) === (0, import_path4.dirname)(filepath)) {
+            if (path4 === filepath) {
               return head;
             }
           } else {
@@ -5663,7 +5721,7 @@ var IsomorphicBridge = class {
     }
     return { pathParts, pathEntries };
   }
-  async updateTreeHierarchy(existingOid, updatedOid, path6, type, pathEntries, pathParts) {
+  async updateTreeHierarchy(existingOid, updatedOid, path4, type, pathEntries, pathParts) {
     const lastIdx = pathEntries.length - 1;
     const parentEntry = pathEntries[lastIdx];
     const parentPath = pathParts[lastIdx];
@@ -5678,7 +5736,7 @@ var IsomorphicBridge = class {
         cache: this.cache
       });
       tree = existingOid ? treeResult.tree.map((entry) => {
-        if (entry.path === path6) {
+        if (entry.path === path4) {
           entry.oid = updatedOid;
         }
         return entry;
@@ -5687,7 +5745,7 @@ var IsomorphicBridge = class {
         {
           oid: updatedOid,
           type,
-          path: path6,
+          path: path4,
           mode
         }
       ];
@@ -5696,7 +5754,7 @@ var IsomorphicBridge = class {
         {
           oid: updatedOid,
           type,
-          path: path6,
+          path: path4,
           mode
         }
       ];
@@ -5797,7 +5855,7 @@ var IsomorphicBridge = class {
       path: parentPath,
       results
     });
-    return results.map((path6) => this.unqualifyPath(path6)).filter((path6) => path6.endsWith(extension));
+    return results.map((path4) => this.unqualifyPath(path4)).filter((path4) => path4.endsWith(extension));
   }
   supportsBuilding() {
     return true;
@@ -5933,16 +5991,12 @@ var IsomorphicBridge = class {
 };
 
 // src/index.ts
-var buildSchema = async (rootPath, database, flags) => {
-  const tempConfig = import_path6.default.join(rootPath, ".tina", "__generated__", "config");
-  const config = await import_fs_extra4.default.readFileSync(import_path6.default.join(tempConfig, "schema.json")).toString();
-  await import_fs_extra4.default.remove(tempConfig);
-  const { graphQLSchema, tinaSchema } = await buildDotTinaFiles({
+var buildSchema = async (database, config, flags) => {
+  return buildDotTinaFiles({
     database,
-    config: JSON.parse(config),
+    config,
     flags
   });
-  return { graphQLSchema, tinaSchema };
 };
 var getASTSchema = async (database) => {
   const gqlAst = await database.getGraphQLSchemaFromBridge();