@tinacms/graphql 1.4.7 → 1.4.9

package/dist/index.js

@@ -506,6 +506,7 @@ var astBuilder = {
     },
     MultiCollectionDocument: "DocumentNode",
     CollectionDocumentUnion: "DocumentUnion",
+    Folder: "Folder",
     String: "String",
     Reference: "Reference",
     Collection: "Collection",
@@ -1274,6 +1275,21 @@ var scalarDefinitions = [
       })
     ]
   }),
+  astBuilder.ObjectTypeDefinition({
+    name: astBuilder.TYPES.Folder,
+    fields: [
+      astBuilder.FieldDefinition({
+        name: "name",
+        required: true,
+        type: astBuilder.TYPES.String
+      }),
+      astBuilder.FieldDefinition({
+        name: "path",
+        required: true,
+        type: astBuilder.TYPES.String
+      })
+    ]
+  }),
   astBuilder.ObjectTypeDefinition({
     name: "PageInfo",
     fields: [
@@ -1326,7 +1342,8 @@ var Builder = class {
         namespace: ["document"],
         nodeType: astBuilder.TYPES.MultiCollectionDocument,
         collections,
-        connectionNamespace: ["document"]
+        connectionNamespace: ["document"],
+        includeFolderFilter: true
       });
       const type = astBuilder.ObjectTypeDefinition({
         name: typeName,
@@ -1425,7 +1442,8 @@ var Builder = class {
       ];
       const type = await this._buildMultiCollectionDocumentDefinition({
         fieldName: astBuilder.TYPES.MultiCollectionDocument,
-        collections
+        collections,
+        includeFolderType: true
       });
       return astBuilder.FieldDefinition({
         name,
@@ -1856,7 +1874,8 @@ var Builder = class {
     };
     this._buildMultiCollectionDocumentDefinition = async ({
       fieldName,
-      collections
+      collections,
+      includeFolderType
     }) => {
       const types = [];
       collections.forEach((collection) => {
@@ -1866,14 +1885,14 @@ var Builder = class {
         }
         if (collection.templates) {
           collection.templates.forEach((template) => {
-            if (typeof template === "string") {
-              throw new Error("Global templates not yet supported");
-            }
             const typeName = NAMER.documentTypeName(template.namespace);
             types.push(typeName);
           });
         }
       });
+      if (includeFolderType) {
+        types.push(astBuilder.TYPES.Folder);
+      }
       const type = astBuilder.UnionTypeDefinition({
         name: fieldName,
         types
@@ -1891,7 +1910,8 @@ var Builder = class {
       namespace,
       nodeType,
       collections,
-      connectionNamespace
+      connectionNamespace,
+      includeFolderFilter
     }) => {
       const connectionName = NAMER.referenceConnectionType(namespace);
       await this.database.addToLookupMap({
@@ -1904,7 +1924,8 @@ var Builder = class {
         namespace: connectionNamespace,
         connectionName,
         nodeType,
-        collections
+        collections,
+        includeFolderFilter
       });
     };
     this._buildFieldFilter = async (field) => {
@@ -2211,7 +2232,8 @@ var Builder = class {
       connectionName,
       nodeType,
       collection,
-      collections
+      collections,
+      includeFolderFilter
     }) => {
       const extra = [
         await this._connectionFilterBuilder({
@@ -2221,6 +2243,14 @@ var Builder = class {
           collections
         })
       ];
+      if (includeFolderFilter) {
+        extra.push(
+          astBuilder.InputValueDefinition({
+            name: "folder",
+            type: astBuilder.TYPES.String
+          })
+        );
+      }
       return astBuilder.FieldDefinition({
         name: fieldName,
         required: true,
@@ -2487,7 +2517,12 @@ var validateCollection = async (collection) => {
     name: yup2.string().matches(/^[a-zA-Z0-9_]*$/, {
       message: (obj) => `Collection's "name" must match ${obj.regex} at ${messageName}`
     }).required(),
-    path: yup2.string().required().transform((value) => {
+    path: yup2.string().test("is-required", "path is a required field", (value) => {
+      if (value === "") {
+        return true;
+      }
+      return yup2.string().required().isValidSync(value);
+    }).transform((value) => {
       return value.replace(/^\/|\/$/g, "");
     })
   });
@@ -2542,7 +2577,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.7",
+  version: "1.4.9",
   main: "dist/index.js",
   module: "dist/index.es.js",
   typings: "dist/index.d.ts",
@@ -2594,6 +2629,7 @@ var package_default = {
     "graphql-type-json": "^0.3.2",
     "gray-matter": "^4.0.2",
     "isomorphic-git": "^1.21.0",
+    "js-sha1": "^0.6.0",
     "js-yaml": "^3.14.1",
     "jsonpath-plus": "^6.0.1",
     leveldown: "^6.1.0",
@@ -2857,7 +2893,7 @@ var _buildSchema = async (builder, tinaSchema) => {
 var import_graphql4 = require("graphql");
 
 // src/resolver/index.ts
-var import_path = __toESM(require("path"));
+var import_path2 = __toESM(require("path"));
 var import_isValid = __toESM(require("date-fns/isValid"));
 
 // src/mdx/index.ts
@@ -3088,9 +3124,9 @@ var resolveMediaRelativeToCloud = (value, config = { useRelativeMedia: true }, s
     return value;
   }
 };
-var cleanUpSlashes = (path4) => {
-  if (path4) {
-    return `/${path4.replace(/^\/+|\/+$/gm, "")}`;
+var cleanUpSlashes = (path5) => {
+  if (path5) {
+    return `/${path5.replace(/^\/+|\/+$/gm, "")}`;
   }
   return "";
 };
@@ -3107,6 +3143,7 @@ var import_graphql3 = require("graphql");
 
 // src/database/datalayer.ts
 var import_jsonpath_plus = require("jsonpath-plus");
+var import_js_sha1 = __toESM(require("js-sha1"));
 
 // src/database/level.ts
 var INDEX_KEY_FIELD_SEPARATOR = "";
@@ -3154,6 +3191,7 @@ var LevelProxy = class {
 };
 
 // src/database/datalayer.ts
+var import_path = __toESM(require("path"));
 var DEFAULT_COLLECTION_SORT_KEY = "__filepath__";
 var DEFAULT_NUMERIC_LPAD = 4;
 var applyPadding = (input, pad) => {
@@ -3520,6 +3558,107 @@ var makeFilterSuffixes = (filterChain, index) => {
     return {};
   }
 };
+var FOLDER_ROOT = "~";
+var stripCollectionFromPath = (collectionPath, path5) => {
+  const collectionPathParts = collectionPath.split("/");
+  const pathParts = path5.split("/");
+  const strippedPathParts = pathParts.slice(collectionPathParts.length);
+  return strippedPathParts.join("/");
+};
+var FolderTreeBuilder = class {
+  constructor() {
+    this._tree = {
+      [FOLDER_ROOT]: /* @__PURE__ */ new Set()
+    };
+  }
+  get tree() {
+    return this._tree;
+  }
+  update(documentPath, collectionPath) {
+    let folderPath = import_path.default.dirname(documentPath);
+    if (collectionPath) {
+      folderPath = stripCollectionFromPath(collectionPath, folderPath);
+    }
+    const parent = [FOLDER_ROOT];
+    folderPath.split("/").filter((part) => part.length).forEach((part) => {
+      const current2 = parent.join("/");
+      if (!this._tree[current2]) {
+        this._tree[current2] = /* @__PURE__ */ new Set();
+      }
+      this._tree[current2].add(import_path.default.join(current2, part));
+      parent.push(part);
+    });
+    const current = parent.join("/");
+    if (!this._tree[current]) {
+      this._tree[current] = /* @__PURE__ */ new Set();
+    }
+    return current === FOLDER_ROOT ? FOLDER_ROOT : import_js_sha1.default.hex(current);
+  }
+};
+var makeFolderOpsForCollection = (folderTree, collection, indexDefinitions, opType, level, escapeStr = stringEscaper) => {
+  const result = [];
+  const data = {};
+  const indexedValues = {};
+  for (const [sort, indexDefinition] of Object.entries(indexDefinitions)) {
+    for (const field of indexDefinition.fields) {
+      data[field.name] = "";
+    }
+    indexedValues[sort] = makeKeyForField(indexDefinition, data, escapeStr);
+  }
+  const baseCharacter = "a".charCodeAt(0);
+  for (const [folderName, folder] of Object.entries(folderTree)) {
+    const parentFolderKey = folderName === FOLDER_ROOT ? FOLDER_ROOT : import_js_sha1.default.hex(folderName);
+    const folderCollectionSublevel = level.sublevel(
+      `${collection.name}_${parentFolderKey}`,
+      SUBLEVEL_OPTIONS
+    );
+    let folderSortingIdx = 0;
+    for (const path5 of Array.from(folder).sort()) {
+      for (const [sort] of Object.entries(indexDefinitions)) {
+        const indexSublevel = folderCollectionSublevel.sublevel(
+          sort,
+          SUBLEVEL_OPTIONS
+        );
+        const subFolderKey = import_js_sha1.default.hex(path5);
+        if (sort === DEFAULT_COLLECTION_SORT_KEY) {
+          result.push({
+            type: opType,
+            key: `${collection.path}/${subFolderKey}.${collection.format}`,
+            sublevel: indexSublevel,
+            value: {}
+          });
+        } else {
+          const indexValue = `${String.fromCharCode(
+            baseCharacter + folderSortingIdx
+          )}${indexedValues[sort].substring(1)}`;
+          result.push({
+            type: opType,
+            key: `${indexValue}${INDEX_KEY_FIELD_SEPARATOR}${collection.path}/${subFolderKey}.${collection.format}`,
+            sublevel: indexSublevel,
+            value: {}
+          });
+        }
+      }
+      folderSortingIdx++;
+    }
+    if (folderName !== FOLDER_ROOT) {
+      result.push({
+        type: "put",
+        key: `${collection.path}/${parentFolderKey}.${collection.format}`,
+        value: {
+          __collection: collection.name,
+          __folderBasename: import_path.default.basename(folderName),
+          __folderPath: folderName
+        },
+        sublevel: level.sublevel(
+          CONTENT_ROOT_PREFIX,
+          SUBLEVEL_OPTIONS
+        )
+      });
+    }
+  }
+  return result;
+};
 var makeIndexOpsForDocument = (filepath, collection, indexDefinitions, data, opType, level, escapeStr = stringEscaper) => {
   const result = [];
   if (collection) {
@@ -3584,11 +3723,37 @@ var Resolver = class {
         ...extraFields
       };
     };
+    this.getRaw = async (fullPath) => {
+      if (typeof fullPath !== "string") {
+        throw new Error(`fullPath must be of type string for getDocument request`);
+      }
+      return this.database.get(fullPath);
+    };
+    this.getDocumentOrDirectory = async (fullPath) => {
+      if (typeof fullPath !== "string") {
+        throw new Error(
+          `fullPath must be of type string for getDocumentOrDirectory request`
+        );
+      }
+      const rawData = await this.getRaw(fullPath);
+      if (rawData["__folderBasename"]) {
+        return {
+          __typename: "Folder",
+          name: rawData["__folderBasename"],
+          path: rawData["__folderPath"]
+        };
+      } else {
+        return this.transformDocumentIntoPayload(fullPath, rawData);
+      }
+    };
     this.getDocument = async (fullPath) => {
       if (typeof fullPath !== "string") {
         throw new Error(`fullPath must be of type string for getDocument request`);
       }
-      const rawData = await this.database.get(fullPath);
+      const rawData = await this.getRaw(fullPath);
+      return this.transformDocumentIntoPayload(fullPath, rawData);
+    };
+    this.transformDocumentIntoPayload = async (fullPath, rawData) => {
       const collection = this.tinaSchema.getCollection(rawData._collection);
       try {
         const template = await this.tinaSchema.getTemplateForData({
@@ -3599,7 +3764,7 @@ var Resolver = class {
           base: basename,
           ext: extension,
           name: filename
-        } = import_path.default.parse(fullPath);
+        } = import_path2.default.parse(fullPath);
         const relativePath = fullPath.replace(/\\/g, "/").replace(collection.path, "").replace(/^\/|\/$/g, "");
         const breadcrumbs = relativePath.replace(extension, "").split("/");
         const data = {
@@ -3631,7 +3796,7 @@ var Resolver = class {
           id: fullPath,
           ...data,
           _sys: {
-            title,
+            title: title || "",
             basename,
             filename,
             extension,
@@ -3842,7 +4007,7 @@ var Resolver = class {
         (yup3) => yup3.object({ relativePath: yup3.string().required() })
       );
       const collection = await this.tinaSchema.getCollection(collectionLookup);
-      const realPath = import_path.default.join(collection == null ? void 0 : collection.path, args.relativePath);
+      const realPath = import_path2.default.join(collection == null ? void 0 : collection.path, args.relativePath);
       const alreadyExists = await this.database.documentExists(realPath);
       if (isMutation) {
         if (isCreation) {
@@ -3883,7 +4048,7 @@ var Resolver = class {
             (yup3) => yup3.object({ relativePath: yup3.string().required() })
           );
           const doc = await this.getDocument(realPath);
-          const newRealPath = import_path.default.join(
+          const newRealPath = import_path2.default.join(
             collection == null ? void 0 : collection.path,
             args.params.relativePath
           );
@@ -3938,7 +4103,7 @@ var Resolver = class {
             first: -1
           },
           collection: referencedCollection,
-          hydrator: (path4) => path4
+          hydrator: (path5) => path5
         }
       );
       const { edges } = resolvedCollectionConnection;
@@ -3986,11 +4151,12 @@ var Resolver = class {
         first: args.first,
         last: args.last,
         before: args.before,
-        after: args.after
+        after: args.after,
+        folder: args.folder
       };
       const result = await this.database.query(
         queryOptions,
-        hydrator ? hydrator : this.getDocument
+        hydrator ? hydrator : this.getDocumentOrDirectory
       );
       const edges = result.edges;
       const pageInfo = result.pageInfo;
@@ -4472,7 +4638,7 @@ var resolve = async ({
 };
 
 // src/database/index.ts
-var import_path2 = __toESM(require("path"));
+var import_path3 = __toESM(require("path"));
 var import_graphql5 = require("graphql");
 var import_micromatch = __toESM(require("micromatch"));
 
@@ -4682,6 +4848,7 @@ var _applyNameOverrides = (fields, obj) => {
 };
 
 // src/database/index.ts
+var import_js_sha12 = __toESM(require("js-sha1"));
 var createDatabase = (config) => {
   return new Database({
     ...config,
@@ -4700,14 +4867,14 @@ var Database = class {
       const tinaSchema = await this.getSchema(this.level);
       return tinaSchema.getCollectionByFullPath(filepath);
     };
-    this.getGeneratedFolder = () => import_path2.default.join(this.tinaDirectory, "__generated__");
+    this.getGeneratedFolder = () => import_path3.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_path2.default.extname(filepath);
+        const extension = import_path3.default.extname(filepath);
         const contentObject = await this.level.sublevel(
           CONTENT_ROOT_PREFIX,
           SUBLEVEL_OPTIONS
@@ -4716,8 +4883,16 @@ var Database = class {
           throw new import_graphql5.GraphQLError(`Unable to find record ${filepath}`);
         }
         const templateName = hasOwnProperty(contentObject, "_template") && typeof contentObject._template === "string" ? contentObject._template : void 0;
-        const { collection, template } = tinaSchema.getCollectionAndTemplateByFullPath(filepath, templateName);
-        const field = template.fields.find((field2) => {
+        const { collection, template } = hasOwnProperty(
+          contentObject,
+          "__collection"
+        ) ? {
+          collection: tinaSchema.getCollection(
+            contentObject["__collection"]
+          ),
+          template: void 0
+        } : tinaSchema.getCollectionAndTemplateByFullPath(filepath, templateName);
+        const field = template == null ? void 0 : template.fields.find((field2) => {
           if (field2.type === "string" || field2.type === "rich-text") {
             if (field2.isBody) {
               return true;
@@ -4737,7 +4912,7 @@ var Database = class {
           ...data,
           _collection: collection.name,
           _keepTemplateKey: !!collection.templates,
-          _template: lastItem(template.namespace),
+          _template: (template == null ? void 0 : template.namespace) ? lastItem(template == null ? void 0 : template.namespace) : void 0,
           _relativePath: filepath.replace(collection.path, "").replace(/^\/|\/$/g, ""),
           _id: filepath
         };
@@ -4762,26 +4937,48 @@ var Database = class {
         await this.bridge.put(normalizedPath, stringifiedFile);
       }
       await this.onPut(normalizedPath, stringifiedFile);
-      const putOps = makeIndexOpsForDocument(
-        normalizedPath,
-        collection == null ? void 0 : collection.name,
-        collectionIndexDefinitions,
-        dataFields,
-        "put",
-        this.level
-      );
+      const folderTreeBuilder = new FolderTreeBuilder();
+      const folderKey = folderTreeBuilder.update(filepath, collection.path || "");
+      const putOps = [
+        ...makeIndexOpsForDocument(
+          normalizedPath,
+          collection == null ? void 0 : collection.name,
+          collectionIndexDefinitions,
+          dataFields,
+          "put",
+          this.level
+        ),
+        ...makeIndexOpsForDocument(
+          normalizedPath,
+          `${collection == null ? void 0 : collection.name}_${folderKey}`,
+          collectionIndexDefinitions,
+          dataFields,
+          "put",
+          this.level
+        )
+      ];
       const existingItem = await this.level.sublevel(
         CONTENT_ROOT_PREFIX,
         SUBLEVEL_OPTIONS
       ).get(normalizedPath);
-      const delOps = existingItem ? makeIndexOpsForDocument(
-        normalizedPath,
-        collection == null ? void 0 : collection.name,
-        collectionIndexDefinitions,
-        existingItem,
-        "del",
-        this.level
-      ) : [];
+      const delOps = existingItem ? [
+        ...makeIndexOpsForDocument(
+          normalizedPath,
+          collection == null ? void 0 : collection.name,
+          collectionIndexDefinitions,
+          existingItem,
+          "del",
+          this.level
+        ),
+        ...makeIndexOpsForDocument(
+          normalizedPath,
+          `${collection == null ? void 0 : collection.name}_${folderKey}`,
+          collectionIndexDefinitions,
+          existingItem,
+          "del",
+          this.level
+        )
+      ] : [];
       const ops = [
         ...delOps,
         ...putOps,
@@ -4832,26 +5029,51 @@ var Database = class {
             await this.bridge.put(normalizedPath, stringifiedFile);
           }
           await this.onPut(normalizedPath, stringifiedFile);
-          const putOps = makeIndexOpsForDocument(
-            normalizedPath,
-            collectionName,
-            collectionIndexDefinitions,
-            dataFields,
-            "put",
-            this.level
+          const folderTreeBuilder = new FolderTreeBuilder();
+          const folderKey = folderTreeBuilder.update(
+            filepath,
+            collection.path || ""
           );
+          const putOps = [
+            ...makeIndexOpsForDocument(
+              normalizedPath,
+              collectionName,
+              collectionIndexDefinitions,
+              dataFields,
+              "put",
+              this.level
+            ),
+            ...makeIndexOpsForDocument(
+              normalizedPath,
+              `${collection == null ? void 0 : collection.name}_${folderKey}`,
+              collectionIndexDefinitions,
+              dataFields,
+              "put",
+              this.level
+            )
+          ];
           const existingItem = await this.level.sublevel(
             CONTENT_ROOT_PREFIX,
             SUBLEVEL_OPTIONS
           ).get(normalizedPath);
-          const delOps = existingItem ? makeIndexOpsForDocument(
-            normalizedPath,
-            collectionName,
-            collectionIndexDefinitions,
-            existingItem,
-            "del",
-            this.level
-          ) : [];
+          const delOps = existingItem ? [
+            ...makeIndexOpsForDocument(
+              normalizedPath,
+              collectionName,
+              collectionIndexDefinitions,
+              existingItem,
+              "del",
+              this.level
+            ),
+            ...makeIndexOpsForDocument(
+              normalizedPath,
+              `${collection == null ? void 0 : collection.name}_${folderKey}`,
+              collectionIndexDefinitions,
+              existingItem,
+              "del",
+              this.level
+            )
+          ] : [];
           const ops = [
             ...delOps,
             ...putOps,
@@ -4909,7 +5131,7 @@ var Database = class {
       );
       const writeTemplateKey = templateDetails.info.type === "union";
       const aliasedData = applyNameOverrides(templateDetails.template, payload);
-      const extension = import_path2.default.extname(filepath);
+      const extension = import_path3.default.extname(filepath);
       const stringifiedFile = stringifyFile(
         aliasedData,
         extension,
@@ -4935,7 +5157,7 @@ var Database = class {
     this.getLookup = async (returnType) => {
       await this.initLevel();
       const lookupPath = (0, import_schema_tools3.normalizePath)(
-        import_path2.default.join(this.getGeneratedFolder(), `_lookup.json`)
+        import_path3.default.join(this.getGeneratedFolder(), `_lookup.json`)
       );
       if (!this._lookup) {
         const _lookup = await this.level.sublevel(
@@ -4949,7 +5171,7 @@ var Database = class {
     this.getGraphQLSchema = async () => {
       await this.initLevel();
       const graphqlPath = (0, import_schema_tools3.normalizePath)(
-        import_path2.default.join(this.getGeneratedFolder(), `_graphql.json`)
+        import_path3.default.join(this.getGeneratedFolder(), `_graphql.json`)
       );
       return await this.level.sublevel(
         CONTENT_ROOT_PREFIX,
@@ -4961,7 +5183,7 @@ var Database = class {
         throw new Error(`No bridge configured`);
       }
       const graphqlPath = (0, import_schema_tools3.normalizePath)(
-        import_path2.default.join(this.getGeneratedFolder(), `_graphql.json`)
+        import_path3.default.join(this.getGeneratedFolder(), `_graphql.json`)
       );
       const _graphql = await this.bridge.get(graphqlPath);
       return JSON.parse(_graphql);
@@ -4969,7 +5191,7 @@ var Database = class {
     this.getTinaSchema = async (level) => {
       await this.initLevel();
       const schemaPath = (0, import_schema_tools3.normalizePath)(
-        import_path2.default.join(this.getGeneratedFolder(), `_schema.json`)
+        import_path3.default.join(this.getGeneratedFolder(), `_schema.json`)
       );
       return await (level || this.level).sublevel(
         CONTENT_ROOT_PREFIX,
@@ -4985,7 +5207,7 @@ var Database = class {
       if (!schema) {
         throw new Error(
           `Unable to get schema from level db: ${(0, import_schema_tools3.normalizePath)(
-            import_path2.default.join(this.getGeneratedFolder(), `_schema.json`)
+            import_path3.default.join(this.getGeneratedFolder(), `_schema.json`)
           )}`
         );
       }
@@ -5063,7 +5285,8 @@ var Database = class {
         before,
         sort = DEFAULT_COLLECTION_SORT_KEY,
         collection,
-        filterChain: rawFilterChain
+        filterChain: rawFilterChain,
+        folder
       } = queryOptions;
       let limit = 50;
       if (first) {
@@ -5091,12 +5314,15 @@ var Database = class {
         CONTENT_ROOT_PREFIX,
         SUBLEVEL_OPTIONS
       );
-      const sublevel = indexDefinition ? this.level.sublevel(collection, SUBLEVEL_OPTIONS).sublevel(sort, SUBLEVEL_OPTIONS) : rootLevel;
+      const sublevel = indexDefinition ? this.level.sublevel(
+        `${collection}${folder ? `_${folder === FOLDER_ROOT ? folder : import_js_sha12.default.hex(folder)}` : ""}`,
+        SUBLEVEL_OPTIONS
+      ).sublevel(sort, SUBLEVEL_OPTIONS) : rootLevel;
       if (!query.gt && !query.gte) {
         query.gte = (filterSuffixes == null ? void 0 : filterSuffixes.left) ? filterSuffixes.left : "";
       }
       if (!query.lt && !query.lte) {
-        query.lte = (filterSuffixes == null ? void 0 : filterSuffixes.right) ? `${filterSuffixes.right}\xFF` : "\xFF";
+        query.lte = (filterSuffixes == null ? void 0 : filterSuffixes.right) ? `${filterSuffixes.right}\uFFFF` : "\uFFFF";
       }
       let edges = [];
       let startKey = "";
@@ -5139,6 +5365,7 @@ var Database = class {
               cursor: btoa(edge.cursor)
             };
           } catch (error) {
+            console.log(error);
             if (error instanceof Error && (!edge.path.includes(".tina/__generated__/_graphql.json") || !edge.path.includes("tina/__generated__/_graphql.json"))) {
               throw new TinaQueryError({
                 originalError: error,
@@ -5165,11 +5392,11 @@ var Database = class {
     }) => {
       if (this.bridge && this.bridge.supportsBuilding()) {
         await this.bridge.putConfig(
-          (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), `_graphql.json`)),
+          (0, import_schema_tools3.normalizePath)(import_path3.default.join(this.getGeneratedFolder(), `_graphql.json`)),
           JSON.stringify(graphQLSchema)
         );
         await this.bridge.putConfig(
-          (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), `_schema.json`)),
+          (0, import_schema_tools3.normalizePath)(import_path3.default.join(this.getGeneratedFolder(), `_schema.json`)),
           JSON.stringify(tinaSchema.schema)
         );
       }
@@ -5189,7 +5416,7 @@ var Database = class {
           const lookup = lookupFromLockFile || JSON.parse(
             await this.bridge.get(
               (0, import_schema_tools3.normalizePath)(
-                import_path2.default.join(this.getGeneratedFolder(), "_lookup.json")
+                import_path3.default.join(this.getGeneratedFolder(), "_lookup.json")
               )
             )
           );
@@ -5204,15 +5431,15 @@ var Database = class {
           }
           const contentRootLevel = nextLevel.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS);
           await contentRootLevel.put(
-            (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), "_graphql.json")),
+            (0, import_schema_tools3.normalizePath)(import_path3.default.join(this.getGeneratedFolder(), "_graphql.json")),
             graphQLSchema
           );
           await contentRootLevel.put(
-            (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), "_schema.json")),
+            (0, import_schema_tools3.normalizePath)(import_path3.default.join(this.getGeneratedFolder(), "_schema.json")),
             tinaSchema.schema
           );
           await contentRootLevel.put(
-            (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), "_lookup.json")),
+            (0, import_schema_tools3.normalizePath)(import_path3.default.join(this.getGeneratedFolder(), "_lookup.json")),
             lookup
           );
           const result = await this._indexAllContent(
@@ -5253,7 +5480,9 @@ var Database = class {
             collections[collection]
           );
         }
-        await _deleteIndexContent(this, nonCollectionPaths, enqueueOps, null);
+        if (nonCollectionPaths.length) {
+          await _deleteIndexContent(this, nonCollectionPaths, enqueueOps, null);
+        }
       });
       while (operations.length) {
         await this.level.batch(operations.splice(0, 25));
@@ -5304,6 +5533,11 @@ var Database = class {
       );
       const item = await rootSublevel.get(itemKey);
       if (item) {
+        const folderTreeBuilder = new FolderTreeBuilder();
+        const folderKey = folderTreeBuilder.update(
+          filepath,
+          collection.path || ""
+        );
         await this.level.batch([
           ...makeIndexOpsForDocument(
             filepath,
@@ -5313,6 +5547,14 @@ var Database = class {
             "del",
             this.level
           ),
+          ...makeIndexOpsForDocument(
+            filepath,
+            `${collection.name}_${folderKey}`,
+            collectionIndexDefinitions,
+            item,
+            "del",
+            this.level
+          ),
           {
             type: "del",
             key: itemKey,
@@ -5344,17 +5586,17 @@ var Database = class {
         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);
+        filteredPaths.forEach((path5) => {
+          if (filesSeen.has(path5)) {
+            filesSeen.get(path5).push(collection.name);
+            duplicateFiles.add(path5);
           } else {
-            filesSeen.set(path4, [collection.name]);
+            filesSeen.set(path5, [collection.name]);
           }
         });
-        duplicateFiles.forEach((path4) => {
+        duplicateFiles.forEach((path5) => {
           warnings.push(
-            `"${path4}" Found in multiple collections: ${filesSeen.get(path4).map((collection2) => `"${collection2}"`).join(
+            `"${path5}" Found in multiple collections: ${filesSeen.get(path5).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. See https://tina.io/docs/errors/file-in-mutpliple-collections/
@@ -5372,7 +5614,7 @@ This will be an error in the future. See https://tina.io/docs/errors/file-in-mut
       if (!this.bridge) {
         throw new Error("No bridge configured");
       }
-      const lookupPath = import_path2.default.join(this.getGeneratedFolder(), `_lookup.json`);
+      const lookupPath = import_path3.default.join(this.getGeneratedFolder(), `_lookup.json`);
       let lookupMap;
       try {
         lookupMap = JSON.parse(await this.bridge.get((0, import_schema_tools3.normalizePath)(lookupPath)));
@@ -5490,24 +5732,27 @@ function hasOwnProperty(obj, prop) {
 }
 var _indexContent = async (database, level, documentPaths, enqueueOps, collection) => {
   let collectionIndexDefinitions;
+  let collectionPath;
   if (collection) {
     const indexDefinitions = await database.getIndexDefinitions(level);
     collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
     if (!collectionIndexDefinitions) {
       throw new Error(`No indexDefinitions for collection ${collection.name}`);
     }
+    collectionPath = collection.path;
   }
   const tinaSchema = await database.getSchema();
   let templateInfo = null;
   if (collection) {
     templateInfo = await tinaSchema.getTemplatesForCollectable(collection);
   }
+  const folderTreeBuilder = new FolderTreeBuilder();
   await sequential(documentPaths, async (filepath) => {
     try {
       const dataString = await database.bridge.get((0, import_schema_tools3.normalizePath)(filepath));
       const data = parseFile(
         dataString,
-        import_path2.default.extname(filepath),
+        import_path3.default.extname(filepath),
         (yup3) => yup3.object({}),
         {
           frontmatterDelimiters: collection == null ? void 0 : collection.frontmatterDelimiters,
@@ -5522,6 +5767,10 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
         return;
       }
       const normalizedPath = (0, import_schema_tools3.normalizePath)(filepath);
+      const folderKey = folderTreeBuilder.update(
+        normalizedPath,
+        collectionPath || ""
+      );
       const aliasedData = templateInfo ? replaceNameOverrides(template, data) : data;
       await enqueueOps([
         ...makeIndexOpsForDocument(
@@ -5532,6 +5781,14 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
           "put",
           level
         ),
+        ...makeIndexOpsForDocument(
+          normalizedPath,
+          `${collection == null ? void 0 : collection.name}_${folderKey}`,
+          collectionIndexDefinitions,
+          aliasedData,
+          "put",
+          level
+        ),
         {
           type: "put",
           key: normalizedPath,
@@ -5551,8 +5808,22 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
       });
     }
   });
+  if (collection) {
+    await enqueueOps(
+      makeFolderOpsForCollection(
+        folderTreeBuilder.tree,
+        collection,
+        collectionIndexDefinitions,
+        "put",
+        level
+      )
+    );
+  }
 };
-var _deleteIndexContent = async (database, documentPaths, enequeueOps, collection) => {
+var _deleteIndexContent = async (database, documentPaths, enqueueOps, collection) => {
+  if (!documentPaths.length) {
+    return;
+  }
   let collectionIndexDefinitions;
   if (collection) {
     const indexDefinitions = await database.getIndexDefinitions(database.level);
@@ -5561,20 +5832,42 @@ var _deleteIndexContent = async (database, documentPaths, enequeueOps, collectio
       throw new Error(`No indexDefinitions for collection ${collection.name}`);
     }
   }
+  const tinaSchema = await database.getSchema();
+  let templateInfo = null;
+  if (collection) {
+    templateInfo = await tinaSchema.getTemplatesForCollectable(collection);
+  }
   const rootLevel = database.level.sublevel(
     CONTENT_ROOT_PREFIX,
     SUBLEVEL_OPTIONS
   );
+  const folderTreeBuilder = new FolderTreeBuilder();
   await sequential(documentPaths, async (filepath) => {
     const itemKey = (0, import_schema_tools3.normalizePath)(filepath);
     const item = await rootLevel.get(itemKey);
     if (item) {
-      await enequeueOps([
+      const folderKey = folderTreeBuilder.update(
+        itemKey,
+        (collection == null ? void 0 : collection.path) || ""
+      );
+      const aliasedData = templateInfo ? replaceNameOverrides(
+        getTemplateForFile(templateInfo, item),
+        item
+      ) : item;
+      await enqueueOps([
         ...makeIndexOpsForDocument(
           itemKey,
           collection.name,
           collectionIndexDefinitions,
-          item,
+          aliasedData,
+          "del",
+          database.level
+        ),
+        ...makeIndexOpsForDocument(
+          itemKey,
+          `${collection == null ? void 0 : collection.name}_${folderKey}`,
+          collectionIndexDefinitions,
+          aliasedData,
           "del",
           database.level
         ),
@@ -5582,6 +5875,17 @@ var _deleteIndexContent = async (database, documentPaths, enequeueOps, collectio
       ]);
     }
   });
+  if (collectionIndexDefinitions) {
+    await enqueueOps(
+      makeFolderOpsForCollection(
+        folderTreeBuilder.tree,
+        collection,
+        collectionIndexDefinitions,
+        "del",
+        database.level
+      )
+    );
+  }
 };
 var getTemplateForFile = (templateInfo, data) => {
   if (templateInfo.type === "object") {
@@ -5629,7 +5933,7 @@ var TinaLevelClient = class extends import_many_level.ManyLevelGuest {
 // src/database/bridge/filesystem.ts
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_fast_glob = __toESM(require("fast-glob"));
-var import_path3 = __toESM(require("path"));
+var import_path4 = __toESM(require("path"));
 var import_normalize_path = __toESM(require("normalize-path"));
 var FilesystemBridge = class {
   constructor(rootPath, outputPath) {
@@ -5637,9 +5941,9 @@ var FilesystemBridge = class {
     this.outputPath = outputPath || rootPath;
   }
   async glob(pattern, extension) {
-    const basePath = import_path3.default.join(this.outputPath, ...pattern.split("/"));
+    const basePath = import_path4.default.join(this.outputPath, ...pattern.split("/"));
     const items = await (0, import_fast_glob.default)(
-      import_path3.default.join(basePath, "**", `/*${extension}`).replace(/\\/g, "/"),
+      import_path4.default.join(basePath, "**", `/*${extension}`).replace(/\\/g, "/"),
       {
         dot: true
       }
@@ -5653,10 +5957,10 @@ var FilesystemBridge = class {
     return true;
   }
   async delete(filepath) {
-    await import_fs_extra.default.remove(import_path3.default.join(this.outputPath, filepath));
+    await import_fs_extra.default.remove(import_path4.default.join(this.outputPath, filepath));
   }
   async get(filepath) {
-    return import_fs_extra.default.readFileSync(import_path3.default.join(this.outputPath, filepath)).toString();
+    return import_fs_extra.default.readFileSync(import_path4.default.join(this.outputPath, filepath)).toString();
   }
   async putConfig(filepath, data) {
     if (this.rootPath !== this.outputPath) {
@@ -5668,7 +5972,7 @@ var FilesystemBridge = class {
   }
   async put(filepath, data, basePathOverride) {
     const basePath = basePathOverride || this.outputPath;
-    await import_fs_extra.default.outputFileSync(import_path3.default.join(basePath, filepath), data);
+    await import_fs_extra.default.outputFileSync(import_path4.default.join(basePath, filepath), data);
   }
 };
 var AuditFileSystemBridge = class extends FilesystemBridge {
@@ -5690,7 +5994,7 @@ 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_path4 = require("path");
+var import_path5 = 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);
@@ -5749,7 +6053,7 @@ var IsomorphicBridge = class {
   async listEntries({
     pattern,
     entry,
-    path: path4,
+    path: path5,
     results
   }) {
     const treeResult = await import_isomorphic_git.default.readTree({
@@ -5759,7 +6063,7 @@ var IsomorphicBridge = class {
     });
     const children = [];
     for (const childEntry of treeResult.tree) {
-      const childPath = path4 ? `${path4}/${childEntry.path}` : childEntry.path;
+      const childPath = path5 ? `${path5}/${childEntry.path}` : childEntry.path;
       if (childEntry.type === "tree") {
         children.push(childEntry);
       } else {
@@ -5769,7 +6073,7 @@ var IsomorphicBridge = class {
       }
     }
     for (const childEntry of children) {
-      const childPath = path4 ? `${path4}/${childEntry.path}` : childEntry.path;
+      const childPath = path5 ? `${path5}/${childEntry.path}` : childEntry.path;
       await this.listEntries({
         pattern,
         entry: childEntry,
@@ -5778,17 +6082,17 @@ var IsomorphicBridge = class {
       });
     }
   }
-  async resolvePathEntries(path4, ref) {
-    let pathParts = path4.split("/");
+  async resolvePathEntries(path5, ref) {
+    let pathParts = path5.split("/");
     const result = await import_isomorphic_git.default.walk({
       ...this.isomorphicConfig,
       map: async (filepath, [head]) => {
         if (head._fullpath === ".") {
           return head;
         }
-        if (path4.startsWith(filepath)) {
-          if ((0, import_path4.dirname)(path4) === (0, import_path4.dirname)(filepath)) {
-            if (path4 === filepath) {
+        if (path5.startsWith(filepath)) {
+          if ((0, import_path5.dirname)(path5) === (0, import_path5.dirname)(filepath)) {
+            if (path5 === filepath) {
               return head;
             }
           } else {
@@ -5808,7 +6112,7 @@ var IsomorphicBridge = class {
     }
     return { pathParts, pathEntries };
   }
-  async updateTreeHierarchy(existingOid, updatedOid, path4, type, pathEntries, pathParts) {
+  async updateTreeHierarchy(existingOid, updatedOid, path5, type, pathEntries, pathParts) {
     const lastIdx = pathEntries.length - 1;
     const parentEntry = pathEntries[lastIdx];
     const parentPath = pathParts[lastIdx];
@@ -5823,7 +6127,7 @@ var IsomorphicBridge = class {
         cache: this.cache
       });
       tree = existingOid ? treeResult.tree.map((entry) => {
-        if (entry.path === path4) {
+        if (entry.path === path5) {
           entry.oid = updatedOid;
         }
         return entry;
@@ -5832,7 +6136,7 @@ var IsomorphicBridge = class {
         {
           oid: updatedOid,
           type,
-          path: path4,
+          path: path5,
           mode
         }
       ];
@@ -5841,7 +6145,7 @@ var IsomorphicBridge = class {
         {
           oid: updatedOid,
           type,
-          path: path4,
+          path: path5,
           mode
         }
       ];
@@ -5942,7 +6246,7 @@ var IsomorphicBridge = class {
       path: parentPath,
       results
     });
-    return results.map((path4) => this.unqualifyPath(path4)).filter((path4) => path4.endsWith(extension));
+    return results.map((path5) => this.unqualifyPath(path5)).filter((path5) => path5.endsWith(extension));
   }
   supportsBuilding() {
     return true;