@tinacms/graphql 1.4.11 → 1.4.13

package/dist/database/datalayer.d.ts

@@ -18,6 +18,7 @@ export declare type BinaryFilter = {
     operator: OP.EQ | OP.GT | OP.LT | OP.GTE | OP.LTE | OP.STARTS_WITH | OP.IN;
     type: string;
     pad?: PadDefinition;
+    list: boolean;
 };
 export declare type TernaryFilter = {
     pathExpression: string;
@@ -27,12 +28,14 @@ export declare type TernaryFilter = {
     rightOperator: OP.LT | OP.LTE;
     type: string;
     pad?: PadDefinition;
+    list: boolean;
 };
 export declare type IndexDefinition = {
     fields: {
         name: string;
         type?: string;
         pad?: PadDefinition;
+        list: boolean;
     }[];
 };
 export declare type PadDefinition = {

package/dist/database/level.d.ts

@@ -16,6 +16,7 @@ export declare type DelOp = {
     sublevel?: AbstractSublevel<Level, Buffer | Uint8Array | string, string, Record<string, Record<string, any>>>;
 };
 export declare type BatchOp = PutOp | DelOp;
+export declare const ARRAY_ITEM_VALUE_SEPARATOR = ",";
 export declare const INDEX_KEY_FIELD_SEPARATOR = "\u001D";
 export declare const CONTENT_ROOT_PREFIX = "~";
 export declare const SUBLEVEL_OPTIONS: AbstractSublevelOptions<string, Record<string, any>>;

package/dist/index.es.js

@@ -2525,7 +2525,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.11",
+  version: "1.4.13",
   main: "dist/index.js",
   module: "dist/index.es.js",
   typings: "dist/index.d.ts",
@@ -3001,6 +3001,7 @@ var collectConditionsForField = (fieldName, field, filterNode, pathExpression, c
       filterPath: pathExpression ? `${pathExpression}.${fieldName}` : fieldName,
       filterExpression: {
         _type: field.type,
+        _list: !!field.list,
         ...filterNode
       }
     });
@@ -3087,6 +3088,7 @@ import { JSONPath } from "jsonpath-plus";
 import sha from "js-sha1";
 
 // src/database/level.ts
+var ARRAY_ITEM_VALUE_SEPARATOR = ",";
 var INDEX_KEY_FIELD_SEPARATOR = "";
 var CONTENT_ROOT_PREFIX = "~";
 var SUBLEVEL_OPTIONS = {
@@ -3133,6 +3135,97 @@ var LevelProxy = class {
 
 // src/database/datalayer.ts
 import path from "path";
+
+// src/database/util.ts
+import toml from "@iarna/toml";
+import yaml from "js-yaml";
+import matter from "gray-matter";
+import { normalizePath } from "@tinacms/schema-tools";
+var matterEngines = {
+  toml: {
+    parse: (val) => toml.parse(val),
+    stringify: (val) => toml.stringify(val)
+  }
+};
+var stringifyFile = (content, format, keepTemplateKey, markdownParseConfig) => {
+  const {
+    _relativePath,
+    _keepTemplateKey,
+    _id,
+    _template,
+    _collection,
+    $_body,
+    ...rest
+  } = content;
+  const extra = {};
+  if (keepTemplateKey) {
+    extra["_template"] = _template;
+  }
+  const strippedContent = { ...rest, ...extra };
+  switch (format) {
+    case ".markdown":
+    case ".mdx":
+    case ".md":
+      const ok = matter.stringify(
+        typeof $_body === "undefined" ? "" : `
+${$_body}`,
+        strippedContent,
+        {
+          language: markdownParseConfig?.frontmatterFormat ?? "yaml",
+          engines: matterEngines,
+          delimiters: markdownParseConfig?.frontmatterDelimiters ?? "---"
+        }
+      );
+      return ok;
+    case ".json":
+      return JSON.stringify(strippedContent, null, 2);
+    case ".yaml":
+    case ".yml":
+      return yaml.safeDump(strippedContent);
+    case ".toml":
+      return toml.stringify(strippedContent);
+    default:
+      throw new Error(`Must specify a valid format, got ${format}`);
+  }
+};
+var parseFile = (content, format, yupSchema, markdownParseConfig) => {
+  switch (format) {
+    case ".markdown":
+    case ".mdx":
+    case ".md":
+      const contentJSON = matter(content || "", {
+        language: markdownParseConfig?.frontmatterFormat ?? "yaml",
+        delimiters: markdownParseConfig?.frontmatterDelimiters ?? "---",
+        engines: matterEngines
+      });
+      const markdownData = {
+        ...contentJSON.data,
+        $_body: contentJSON.content
+      };
+      assertShape(markdownData, yupSchema);
+      return markdownData;
+    case ".json":
+      if (!content) {
+        return {};
+      }
+      return JSON.parse(content);
+    case ".toml":
+      if (!content) {
+        return {};
+      }
+      return toml.parse(content);
+    case ".yaml":
+    case ".yml":
+      if (!content) {
+        return {};
+      }
+      return yaml.safeLoad(content);
+    default:
+      throw new Error(`Must specify a valid format, got ${format}`);
+  }
+};
+
+// src/database/datalayer.ts
 var DEFAULT_COLLECTION_SORT_KEY = "__filepath__";
 var DEFAULT_NUMERIC_LPAD = 4;
 var applyPadding = (input, pad) => {
@@ -3179,10 +3272,24 @@ var makeKeyForField = (definition, data, stringEscaper2, maxStringLength = 100)
   for (const field of definition.fields) {
     if (field.name in data && data[field.name] !== void 0 && data[field.name] !== null) {
       const rawValue = data[field.name];
-      const resolvedValue = String(
-        field.type === "datetime" ? new Date(rawValue).getTime() : field.type === "string" ? stringEscaper2(rawValue) : rawValue
-      ).substring(0, maxStringLength);
-      valueParts.push(applyPadding(resolvedValue, field.pad));
+      let resolvedValue;
+      if (field.type === "datetime") {
+        resolvedValue = String(new Date(rawValue).getTime());
+      } else {
+        if (field.type === "string") {
+          const escapedString = stringEscaper2(rawValue);
+          if (Array.isArray(escapedString)) {
+            resolvedValue = escapedString.sort().join(ARRAY_ITEM_VALUE_SEPARATOR);
+          } else {
+            resolvedValue = escapedString;
+          }
+        } else {
+          resolvedValue = String(rawValue);
+        }
+      }
+      valueParts.push(
+        applyPadding(resolvedValue.substring(0, maxStringLength), field.pad)
+      );
     } else {
       return null;
     }
@@ -3249,12 +3356,96 @@ var coerceFilterChainOperands = (filterChain, escapeString = stringEscaper) => {
   }
   return result;
 };
+function operatorMatchesBinaryFilter(operator, operands, filter) {
+  let matches = false;
+  switch (operator) {
+    case "eq" /* EQ */:
+      if (operands.findIndex((operand) => operand === filter.rightOperand) >= 0) {
+        matches = true;
+      }
+      break;
+    case "gt" /* GT */:
+      for (const operand of operands) {
+        if (operand > filter.rightOperand) {
+          matches = true;
+          break;
+        }
+      }
+      break;
+    case "lt" /* LT */:
+      for (const operand of operands) {
+        if (operand < filter.rightOperand) {
+          matches = true;
+          break;
+        }
+      }
+      break;
+    case "gte" /* GTE */:
+      for (const operand of operands) {
+        if (operand >= filter.rightOperand) {
+          matches = true;
+          break;
+        }
+      }
+      break;
+    case "lte" /* LTE */:
+      for (const operand of operands) {
+        if (operand <= filter.rightOperand) {
+          matches = true;
+          break;
+        }
+      }
+      break;
+    case "in" /* IN */:
+      for (const operand of operands) {
+        if (filter.rightOperand.indexOf(operand) >= 0) {
+          matches = true;
+          break;
+        }
+      }
+      break;
+    case "startsWith" /* STARTS_WITH */:
+      for (const operand of operands) {
+        if (operand.startsWith(filter.rightOperand)) {
+          matches = true;
+          break;
+        }
+      }
+      break;
+    default:
+      throw new Error(`unexpected operator ${operator}`);
+  }
+  return matches;
+}
+function operatorMatchesTernaryFilter(operands, rightOperator, rightOperand, leftOperator, leftOperand) {
+  let matches = false;
+  for (const operand of operands) {
+    let rightMatches = false;
+    let leftMatches = false;
+    if (rightOperator === "lte" /* LTE */ && operand <= rightOperand) {
+      rightMatches = true;
+    } else if (rightOperator === "lt" /* LT */ && operand < rightOperand) {
+      rightMatches = true;
+    }
+    if (leftOperator === "gte" /* GTE */ && operand >= leftOperand) {
+      leftMatches = true;
+    } else if (leftOperator === "gt" /* GT */ && operand > leftOperand) {
+      leftMatches = true;
+    }
+    if (rightMatches && leftMatches) {
+      matches = true;
+      break;
+    }
+  }
+  return matches;
+}
 var makeFilter = ({
   filterChain
 }) => {
   return (values) => {
     for (const filter of filterChain) {
       const dataType = filter.type;
+      const isList = filter.list;
       const resolvedValues = JSONPath({
         path: filter.pathExpression,
         json: values
@@ -3266,99 +3457,74 @@ var makeFilter = ({
       if (dataType === "string" || dataType === "reference") {
         operands = resolvedValues;
       } else if (dataType === "number") {
-        operands = resolvedValues.map((resolvedValue) => Number(resolvedValue));
+        operands = resolvedValues.map((resolvedValue) => {
+          if (isList) {
+            return resolvedValue.map((listValue) => Number(listValue));
+          }
+          return Number(resolvedValue);
+        });
       } else if (dataType === "datetime") {
         operands = resolvedValues.map((resolvedValue) => {
+          if (isList) {
+            return resolvedValue.map((listValue) => {
+              const coerced2 = new Date(listValue).getTime();
+              return isNaN(coerced2) ? Number(listValue) : coerced2;
+            });
+          }
           const coerced = new Date(resolvedValue).getTime();
           return isNaN(coerced) ? Number(resolvedValue) : coerced;
         });
       } else if (dataType === "boolean") {
-        operands = resolvedValues.map(
-          (resolvedValue) => typeof resolvedValue === "boolean" && resolvedValue || resolvedValue === "true" || resolvedValue === "1"
-        );
+        operands = resolvedValues.map((resolvedValue) => {
+          if (isList) {
+            return resolvedValue.map((listValue) => {
+              return typeof listValue === "boolean" && listValue || listValue === "true" || listValue === "1";
+            });
+          }
+          return typeof resolvedValue === "boolean" && resolvedValue || resolvedValue === "true" || resolvedValue === "1";
+        });
       } else {
         throw new Error(`Unexpected datatype ${dataType}`);
       }
       const { operator } = filter;
       let matches = false;
       if (operator) {
-        switch (operator) {
-          case "eq" /* EQ */:
-            if (operands.findIndex(
-              (operand) => operand === filter.rightOperand
-            ) >= 0) {
+        if (isList) {
+          for (const operand of operands) {
+            if (operatorMatchesBinaryFilter(operator, operand, filter)) {
               matches = true;
+              break;
             }
-            break;
-          case "gt" /* GT */:
-            for (const operand of operands) {
-              if (operand > filter.rightOperand) {
-                matches = true;
-                break;
-              }
-            }
-            break;
-          case "lt" /* LT */:
-            for (const operand of operands) {
-              if (operand < filter.rightOperand) {
-                matches = true;
-                break;
-              }
-            }
-            break;
-          case "gte" /* GTE */:
-            for (const operand of operands) {
-              if (operand >= filter.rightOperand) {
-                matches = true;
-                break;
-              }
-            }
-            break;
-          case "lte" /* LTE */:
-            for (const operand of operands) {
-              if (operand <= filter.rightOperand) {
-                matches = true;
-                break;
-              }
-            }
-            break;
-          case "in" /* IN */:
-            for (const operand of operands) {
-              if (filter.rightOperand.indexOf(operand) >= 0) {
-                matches = true;
-                break;
-              }
-            }
-            break;
-          case "startsWith" /* STARTS_WITH */:
-            for (const operand of operands) {
-              if (operand.startsWith(filter.rightOperand)) {
-                matches = true;
-                break;
-              }
-            }
-            break;
-          default:
-            throw new Error(`unexpected operator ${operator}`);
+          }
+        } else {
+          if (operatorMatchesBinaryFilter(operator, operands, filter)) {
+            matches = true;
+          }
         }
       } else {
         const { rightOperator, leftOperator, rightOperand, leftOperand } = filter;
-        for (const operand of operands) {
-          let rightMatches = false;
-          let leftMatches = false;
-          if (rightOperator === "lte" /* LTE */ && operand <= rightOperand) {
-            rightMatches = true;
-          } else if (rightOperator === "lt" /* LT */ && operand < rightOperand) {
-            rightMatches = true;
-          }
-          if (leftOperator === "gte" /* GTE */ && operand >= leftOperand) {
-            leftMatches = true;
-          } else if (leftOperator === "gt" /* GT */ && operand > leftOperand) {
-            leftMatches = true;
+        if (isList) {
+          for (const operand of operands) {
+            if (operatorMatchesTernaryFilter(
+              operand,
+              rightOperator,
+              rightOperand,
+              leftOperator,
+              leftOperand
+            )) {
+              matches = true;
+              break;
+            }
           }
-          if (rightMatches && leftMatches) {
+        } else {
+          if (operatorMatchesTernaryFilter(
+            operands,
+            rightOperator,
+            rightOperand,
+            leftOperator,
+            leftOperand
+          )) {
             matches = true;
-            break;
           }
         }
       }
@@ -3378,7 +3544,7 @@ var makeFilterChain = ({
   }
   for (const condition of conditions) {
     const { filterPath, filterExpression } = condition;
-    const { _type, ...keys } = filterExpression;
+    const { _type, _list, ...keys } = filterExpression;
     const [key1, key2, ...extraKeys] = Object.keys(keys);
     if (extraKeys.length) {
       throw new Error(
@@ -3387,6 +3553,7 @@ var makeFilterChain = ({
     }
     if (key1 && !key2) {
       filterChain.push({
+        list: _list,
         pathExpression: filterPath,
         rightOperand: filterExpression[key1],
         operator: inferOperatorFromFilter(key1),
@@ -3407,6 +3574,7 @@ var makeFilterChain = ({
           leftOperand = filterExpression[key2];
         }
         filterChain.push({
+          list: _list,
           pathExpression: filterPath,
           rightOperand,
           leftOperand,
@@ -3516,7 +3684,7 @@ var FolderTreeBuilder = class {
     return this._tree;
   }
   update(documentPath, collectionPath) {
-    let folderPath = path.dirname(documentPath);
+    let folderPath = path.dirname(normalizePath(documentPath));
     if (folderPath === ".") {
       folderPath = "";
     }
@@ -3529,7 +3697,7 @@ var FolderTreeBuilder = class {
       if (!this._tree[current2]) {
         this._tree[current2] = /* @__PURE__ */ new Set();
       }
-      this._tree[current2].add(path.join(current2, part));
+      this._tree[current2].add(normalizePath(path.join(current2, part)));
       parent.push(part);
     });
     const current = parent.join("/");
@@ -4185,7 +4353,9 @@ var Resolver = class {
         case "boolean":
         case "number":
         case "reference":
-          accumulator[field.name] = value;
+          if (value) {
+            accumulator[field.name] = value;
+          }
           break;
         case "image":
           accumulator[field.name] = resolveMediaRelativeToCloud(
@@ -4451,7 +4621,7 @@ var resolve = async ({
               );
               return resolver.getDocument(args.id);
             case "multiCollectionDocument":
-              if (typeof value === "string") {
+              if (typeof value === "string" && value !== "") {
                 return resolver.getDocument(value);
               }
               if (args && args.collection && info.fieldName === "addPendingDocument") {
@@ -4581,95 +4751,6 @@ import path3 from "path";
 import { GraphQLError as GraphQLError4 } from "graphql";
 import micromatch from "micromatch";
 
-// src/database/util.ts
-import toml from "@iarna/toml";
-import yaml from "js-yaml";
-import matter from "gray-matter";
-import { normalizePath } from "@tinacms/schema-tools";
-var matterEngines = {
-  toml: {
-    parse: (val) => toml.parse(val),
-    stringify: (val) => toml.stringify(val)
-  }
-};
-var stringifyFile = (content, format, keepTemplateKey, markdownParseConfig) => {
-  const {
-    _relativePath,
-    _keepTemplateKey,
-    _id,
-    _template,
-    _collection,
-    $_body,
-    ...rest
-  } = content;
-  const extra = {};
-  if (keepTemplateKey) {
-    extra["_template"] = _template;
-  }
-  const strippedContent = { ...rest, ...extra };
-  switch (format) {
-    case ".markdown":
-    case ".mdx":
-    case ".md":
-      const ok = matter.stringify(
-        typeof $_body === "undefined" ? "" : `
-${$_body}`,
-        strippedContent,
-        {
-          language: markdownParseConfig?.frontmatterFormat ?? "yaml",
-          engines: matterEngines,
-          delimiters: markdownParseConfig?.frontmatterDelimiters ?? "---"
-        }
-      );
-      return ok;
-    case ".json":
-      return JSON.stringify(strippedContent, null, 2);
-    case ".yaml":
-    case ".yml":
-      return yaml.safeDump(strippedContent);
-    case ".toml":
-      return toml.stringify(strippedContent);
-    default:
-      throw new Error(`Must specify a valid format, got ${format}`);
-  }
-};
-var parseFile = (content, format, yupSchema, markdownParseConfig) => {
-  switch (format) {
-    case ".markdown":
-    case ".mdx":
-    case ".md":
-      const contentJSON = matter(content || "", {
-        language: markdownParseConfig?.frontmatterFormat ?? "yaml",
-        delimiters: markdownParseConfig?.frontmatterDelimiters ?? "---",
-        engines: matterEngines
-      });
-      const markdownData = {
-        ...contentJSON.data,
-        $_body: contentJSON.content
-      };
-      assertShape(markdownData, yupSchema);
-      return markdownData;
-    case ".json":
-      if (!content) {
-        return {};
-      }
-      return JSON.parse(content);
-    case ".toml":
-      if (!content) {
-        return {};
-      }
-      return toml.parse(content);
-    case ".yaml":
-    case ".yml":
-      if (!content) {
-        return {};
-      }
-      return yaml.safeLoad(content);
-    default:
-      throw new Error(`Must specify a valid format, got ${format}`);
-  }
-};
-
 // src/database/alias-utils.ts
 var replaceBlockAliases = (template, item) => {
   const output = { ...item };
@@ -5169,6 +5250,7 @@ var Database = class {
                       {
                         name: field.name,
                         type: field.type,
+                        list: !!field.list,
                         pad: field.type === "number" ? { fillString: "0", maxLength: DEFAULT_NUMERIC_LPAD } : void 0
                       }
                     ]
@@ -5178,12 +5260,16 @@ var Database = class {
               if (collection.indexes) {
                 for (const index of collection.indexes) {
                   indexDefinitions[index.name] = {
-                    fields: index.fields.map((indexField) => ({
-                      name: indexField.name,
-                      type: collection.fields.find(
-                        (field) => indexField.name === field.name
-                      )?.type
-                    }))
+                    fields: index.fields.map((indexField) => {
+                      const field = collection.fields.find(
+                        (field2) => indexField.name === field2.name
+                      );
+                      return {
+                        name: indexField.name,
+                        type: field?.type,
+                        list: !!field?.list
+                      };
+                    })
                   };
                 }
               }
@@ -5268,10 +5354,27 @@ var Database = class {
         if (!matcher || indexDefinition && matcher.length !== indexDefinition.fields.length + 2) {
           continue;
         }
-        const filepath = matcher.groups["_filepath_"];
-        if (!itemFilter(
-          filterSuffixes ? matcher.groups : indexDefinition ? await rootLevel.get(filepath) : value
-        )) {
+        let filepath = matcher.groups["_filepath_"];
+        let itemRecord;
+        if (filterSuffixes) {
+          itemRecord = matcher.groups;
+          for (const field of indexDefinition.fields) {
+            if (itemRecord[field.name]) {
+              if (field.list) {
+                itemRecord[field.name] = itemRecord[field.name].split(
+                  ARRAY_ITEM_VALUE_SEPARATOR
+                );
+              }
+            }
+          }
+        } else {
+          if (indexDefinition) {
+            itemRecord = await rootLevel.get(filepath);
+          } else {
+            itemRecord = value;
+          }
+        }
+        if (!itemFilter(itemRecord)) {
           continue;
         }
         if (limit !== -1 && edges.length >= limit) {
@@ -5328,13 +5431,24 @@ var Database = class {
       let nextLevel;
       return await this.indexStatusCallbackWrapper(
         async () => {
-          const lookup = lookupFromLockFile || JSON.parse(
-            await this.bridge.get(
-              normalizePath(
-                path3.join(this.getGeneratedFolder(), "_lookup.json")
+          let lookup;
+          try {
+            lookup = lookupFromLockFile || JSON.parse(
+              await this.bridge.get(
+                normalizePath(
+                  path3.join(this.getGeneratedFolder(), "_lookup.json")
+                )
               )
-            )
-          );
+            );
+          } catch (error) {
+            console.error("Error: Unable to find generated lookup file");
+            if (this.tinaDirectory === "tina") {
+              console.error(
+                'If you are using the .tina folder. Please set {tinaDirectory: ".tina"} in your createDatabase options or migrate to the new tina folder: https://tina.io/blog/tina-config-rearrangements/'
+              );
+            }
+            throw error;
+          }
           let nextVersion;
           if (!this.config.version) {
             await this.level.clear();
@@ -5525,7 +5639,7 @@ This will be an error in the future. See https://tina.io/docs/errors/file-in-mut
       }
       return { warnings };
     };
-    this.tinaDirectory = config.tinaDirectory || ".tina";
+    this.tinaDirectory = config.tinaDirectory || "tina";
     this.bridge = config.bridge;
     this.rootLevel = config.level && new LevelProxy(config.level);
     this.indexStatusCallback = config.indexStatusCallback || defaultStatusCallback;

package/dist/index.js

@@ -2577,7 +2577,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.11",
+  version: "1.4.13",
   main: "dist/index.js",
   module: "dist/index.es.js",
   typings: "dist/index.d.ts",
@@ -3047,6 +3047,7 @@ var collectConditionsForField = (fieldName, field, filterNode, pathExpression, c
       filterPath: pathExpression ? `${pathExpression}.${fieldName}` : fieldName,
       filterExpression: {
         _type: field.type,
+        _list: !!field.list,
         ...filterNode
       }
     });
@@ -3134,6 +3135,7 @@ var import_jsonpath_plus = require("jsonpath-plus");
 var import_js_sha1 = __toESM(require("js-sha1"));
 
 // src/database/level.ts
+var ARRAY_ITEM_VALUE_SEPARATOR = ",";
 var INDEX_KEY_FIELD_SEPARATOR = "";
 var CONTENT_ROOT_PREFIX = "~";
 var SUBLEVEL_OPTIONS = {
@@ -3180,6 +3182,99 @@ var LevelProxy = class {
 
 // src/database/datalayer.ts
 var import_path = __toESM(require("path"));
+
+// 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),
+    stringify: (val) => import_toml.default.stringify(val)
+  }
+};
+var stringifyFile = (content, format, keepTemplateKey, markdownParseConfig) => {
+  var _a, _b;
+  const {
+    _relativePath,
+    _keepTemplateKey,
+    _id,
+    _template,
+    _collection,
+    $_body,
+    ...rest
+  } = content;
+  const extra = {};
+  if (keepTemplateKey) {
+    extra["_template"] = _template;
+  }
+  const strippedContent = { ...rest, ...extra };
+  switch (format) {
+    case ".markdown":
+    case ".mdx":
+    case ".md":
+      const ok = import_gray_matter.default.stringify(
+        typeof $_body === "undefined" ? "" : `
+${$_body}`,
+        strippedContent,
+        {
+          language: (_a = markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterFormat) != null ? _a : "yaml",
+          engines: matterEngines,
+          delimiters: (_b = markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterDelimiters) != null ? _b : "---"
+        }
+      );
+      return ok;
+    case ".json":
+      return JSON.stringify(strippedContent, null, 2);
+    case ".yaml":
+    case ".yml":
+      return import_js_yaml.default.safeDump(strippedContent);
+    case ".toml":
+      return import_toml.default.stringify(strippedContent);
+    default:
+      throw new Error(`Must specify a valid format, got ${format}`);
+  }
+};
+var parseFile = (content, format, yupSchema, markdownParseConfig) => {
+  var _a, _b;
+  switch (format) {
+    case ".markdown":
+    case ".mdx":
+    case ".md":
+      const contentJSON = (0, import_gray_matter.default)(content || "", {
+        language: (_a = markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterFormat) != null ? _a : "yaml",
+        delimiters: (_b = markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterDelimiters) != null ? _b : "---",
+        engines: matterEngines
+      });
+      const markdownData = {
+        ...contentJSON.data,
+        $_body: contentJSON.content
+      };
+      assertShape(markdownData, yupSchema);
+      return markdownData;
+    case ".json":
+      if (!content) {
+        return {};
+      }
+      return JSON.parse(content);
+    case ".toml":
+      if (!content) {
+        return {};
+      }
+      return import_toml.default.parse(content);
+    case ".yaml":
+    case ".yml":
+      if (!content) {
+        return {};
+      }
+      return import_js_yaml.default.safeLoad(content);
+    default:
+      throw new Error(`Must specify a valid format, got ${format}`);
+  }
+};
+
+// src/database/datalayer.ts
 var DEFAULT_COLLECTION_SORT_KEY = "__filepath__";
 var DEFAULT_NUMERIC_LPAD = 4;
 var applyPadding = (input, pad) => {
@@ -3226,10 +3321,24 @@ var makeKeyForField = (definition, data, stringEscaper2, maxStringLength = 100)
   for (const field of definition.fields) {
     if (field.name in data && data[field.name] !== void 0 && data[field.name] !== null) {
       const rawValue = data[field.name];
-      const resolvedValue = String(
-        field.type === "datetime" ? new Date(rawValue).getTime() : field.type === "string" ? stringEscaper2(rawValue) : rawValue
-      ).substring(0, maxStringLength);
-      valueParts.push(applyPadding(resolvedValue, field.pad));
+      let resolvedValue;
+      if (field.type === "datetime") {
+        resolvedValue = String(new Date(rawValue).getTime());
+      } else {
+        if (field.type === "string") {
+          const escapedString = stringEscaper2(rawValue);
+          if (Array.isArray(escapedString)) {
+            resolvedValue = escapedString.sort().join(ARRAY_ITEM_VALUE_SEPARATOR);
+          } else {
+            resolvedValue = escapedString;
+          }
+        } else {
+          resolvedValue = String(rawValue);
+        }
+      }
+      valueParts.push(
+        applyPadding(resolvedValue.substring(0, maxStringLength), field.pad)
+      );
     } else {
       return null;
     }
@@ -3296,12 +3405,96 @@ var coerceFilterChainOperands = (filterChain, escapeString = stringEscaper) => {
   }
   return result;
 };
+function operatorMatchesBinaryFilter(operator, operands, filter) {
+  let matches = false;
+  switch (operator) {
+    case "eq" /* EQ */:
+      if (operands.findIndex((operand) => operand === filter.rightOperand) >= 0) {
+        matches = true;
+      }
+      break;
+    case "gt" /* GT */:
+      for (const operand of operands) {
+        if (operand > filter.rightOperand) {
+          matches = true;
+          break;
+        }
+      }
+      break;
+    case "lt" /* LT */:
+      for (const operand of operands) {
+        if (operand < filter.rightOperand) {
+          matches = true;
+          break;
+        }
+      }
+      break;
+    case "gte" /* GTE */:
+      for (const operand of operands) {
+        if (operand >= filter.rightOperand) {
+          matches = true;
+          break;
+        }
+      }
+      break;
+    case "lte" /* LTE */:
+      for (const operand of operands) {
+        if (operand <= filter.rightOperand) {
+          matches = true;
+          break;
+        }
+      }
+      break;
+    case "in" /* IN */:
+      for (const operand of operands) {
+        if (filter.rightOperand.indexOf(operand) >= 0) {
+          matches = true;
+          break;
+        }
+      }
+      break;
+    case "startsWith" /* STARTS_WITH */:
+      for (const operand of operands) {
+        if (operand.startsWith(filter.rightOperand)) {
+          matches = true;
+          break;
+        }
+      }
+      break;
+    default:
+      throw new Error(`unexpected operator ${operator}`);
+  }
+  return matches;
+}
+function operatorMatchesTernaryFilter(operands, rightOperator, rightOperand, leftOperator, leftOperand) {
+  let matches = false;
+  for (const operand of operands) {
+    let rightMatches = false;
+    let leftMatches = false;
+    if (rightOperator === "lte" /* LTE */ && operand <= rightOperand) {
+      rightMatches = true;
+    } else if (rightOperator === "lt" /* LT */ && operand < rightOperand) {
+      rightMatches = true;
+    }
+    if (leftOperator === "gte" /* GTE */ && operand >= leftOperand) {
+      leftMatches = true;
+    } else if (leftOperator === "gt" /* GT */ && operand > leftOperand) {
+      leftMatches = true;
+    }
+    if (rightMatches && leftMatches) {
+      matches = true;
+      break;
+    }
+  }
+  return matches;
+}
 var makeFilter = ({
   filterChain
 }) => {
   return (values) => {
     for (const filter of filterChain) {
       const dataType = filter.type;
+      const isList = filter.list;
       const resolvedValues = (0, import_jsonpath_plus.JSONPath)({
         path: filter.pathExpression,
         json: values
@@ -3313,99 +3506,74 @@ var makeFilter = ({
       if (dataType === "string" || dataType === "reference") {
         operands = resolvedValues;
       } else if (dataType === "number") {
-        operands = resolvedValues.map((resolvedValue) => Number(resolvedValue));
+        operands = resolvedValues.map((resolvedValue) => {
+          if (isList) {
+            return resolvedValue.map((listValue) => Number(listValue));
+          }
+          return Number(resolvedValue);
+        });
       } else if (dataType === "datetime") {
         operands = resolvedValues.map((resolvedValue) => {
+          if (isList) {
+            return resolvedValue.map((listValue) => {
+              const coerced2 = new Date(listValue).getTime();
+              return isNaN(coerced2) ? Number(listValue) : coerced2;
+            });
+          }
           const coerced = new Date(resolvedValue).getTime();
           return isNaN(coerced) ? Number(resolvedValue) : coerced;
         });
       } else if (dataType === "boolean") {
-        operands = resolvedValues.map(
-          (resolvedValue) => typeof resolvedValue === "boolean" && resolvedValue || resolvedValue === "true" || resolvedValue === "1"
-        );
+        operands = resolvedValues.map((resolvedValue) => {
+          if (isList) {
+            return resolvedValue.map((listValue) => {
+              return typeof listValue === "boolean" && listValue || listValue === "true" || listValue === "1";
+            });
+          }
+          return typeof resolvedValue === "boolean" && resolvedValue || resolvedValue === "true" || resolvedValue === "1";
+        });
       } else {
         throw new Error(`Unexpected datatype ${dataType}`);
       }
       const { operator } = filter;
       let matches = false;
       if (operator) {
-        switch (operator) {
-          case "eq" /* EQ */:
-            if (operands.findIndex(
-              (operand) => operand === filter.rightOperand
-            ) >= 0) {
+        if (isList) {
+          for (const operand of operands) {
+            if (operatorMatchesBinaryFilter(operator, operand, filter)) {
               matches = true;
+              break;
             }
-            break;
-          case "gt" /* GT */:
-            for (const operand of operands) {
-              if (operand > filter.rightOperand) {
-                matches = true;
-                break;
-              }
-            }
-            break;
-          case "lt" /* LT */:
-            for (const operand of operands) {
-              if (operand < filter.rightOperand) {
-                matches = true;
-                break;
-              }
-            }
-            break;
-          case "gte" /* GTE */:
-            for (const operand of operands) {
-              if (operand >= filter.rightOperand) {
-                matches = true;
-                break;
-              }
-            }
-            break;
-          case "lte" /* LTE */:
-            for (const operand of operands) {
-              if (operand <= filter.rightOperand) {
-                matches = true;
-                break;
-              }
-            }
-            break;
-          case "in" /* IN */:
-            for (const operand of operands) {
-              if (filter.rightOperand.indexOf(operand) >= 0) {
-                matches = true;
-                break;
-              }
-            }
-            break;
-          case "startsWith" /* STARTS_WITH */:
-            for (const operand of operands) {
-              if (operand.startsWith(filter.rightOperand)) {
-                matches = true;
-                break;
-              }
-            }
-            break;
-          default:
-            throw new Error(`unexpected operator ${operator}`);
+          }
+        } else {
+          if (operatorMatchesBinaryFilter(operator, operands, filter)) {
+            matches = true;
+          }
         }
       } else {
         const { rightOperator, leftOperator, rightOperand, leftOperand } = filter;
-        for (const operand of operands) {
-          let rightMatches = false;
-          let leftMatches = false;
-          if (rightOperator === "lte" /* LTE */ && operand <= rightOperand) {
-            rightMatches = true;
-          } else if (rightOperator === "lt" /* LT */ && operand < rightOperand) {
-            rightMatches = true;
-          }
-          if (leftOperator === "gte" /* GTE */ && operand >= leftOperand) {
-            leftMatches = true;
-          } else if (leftOperator === "gt" /* GT */ && operand > leftOperand) {
-            leftMatches = true;
+        if (isList) {
+          for (const operand of operands) {
+            if (operatorMatchesTernaryFilter(
+              operand,
+              rightOperator,
+              rightOperand,
+              leftOperator,
+              leftOperand
+            )) {
+              matches = true;
+              break;
+            }
           }
-          if (rightMatches && leftMatches) {
+        } else {
+          if (operatorMatchesTernaryFilter(
+            operands,
+            rightOperator,
+            rightOperand,
+            leftOperator,
+            leftOperand
+          )) {
             matches = true;
-            break;
           }
         }
       }
@@ -3425,7 +3593,7 @@ var makeFilterChain = ({
   }
   for (const condition of conditions) {
     const { filterPath, filterExpression } = condition;
-    const { _type, ...keys } = filterExpression;
+    const { _type, _list, ...keys } = filterExpression;
     const [key1, key2, ...extraKeys] = Object.keys(keys);
     if (extraKeys.length) {
       throw new Error(
@@ -3434,6 +3602,7 @@ var makeFilterChain = ({
     }
     if (key1 && !key2) {
       filterChain.push({
+        list: _list,
         pathExpression: filterPath,
         rightOperand: filterExpression[key1],
         operator: inferOperatorFromFilter(key1),
@@ -3454,6 +3623,7 @@ var makeFilterChain = ({
           leftOperand = filterExpression[key2];
         }
         filterChain.push({
+          list: _list,
           pathExpression: filterPath,
           rightOperand,
           leftOperand,
@@ -3563,7 +3733,7 @@ var FolderTreeBuilder = class {
     return this._tree;
   }
   update(documentPath, collectionPath) {
-    let folderPath = import_path.default.dirname(documentPath);
+    let folderPath = import_path.default.dirname((0, import_schema_tools3.normalizePath)(documentPath));
     if (folderPath === ".") {
       folderPath = "";
     }
@@ -3576,7 +3746,7 @@ var FolderTreeBuilder = class {
       if (!this._tree[current2]) {
         this._tree[current2] = /* @__PURE__ */ new Set();
       }
-      this._tree[current2].add(import_path.default.join(current2, part));
+      this._tree[current2].add((0, import_schema_tools3.normalizePath)(import_path.default.join(current2, part)));
       parent.push(part);
     });
     const current = parent.join("/");
@@ -4233,7 +4403,9 @@ var Resolver = class {
         case "boolean":
         case "number":
         case "reference":
-          accumulator[field.name] = value;
+          if (value) {
+            accumulator[field.name] = value;
+          }
           break;
         case "image":
           accumulator[field.name] = resolveMediaRelativeToCloud(
@@ -4503,7 +4675,7 @@ var resolve = async ({
               );
               return resolver.getDocument(args.id);
             case "multiCollectionDocument":
-              if (typeof value === "string") {
+              if (typeof value === "string" && value !== "") {
                 return resolver.getDocument(value);
               }
               if (args && args.collection && info.fieldName === "addPendingDocument") {
@@ -4633,97 +4805,6 @@ var import_path3 = __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),
-    stringify: (val) => import_toml.default.stringify(val)
-  }
-};
-var stringifyFile = (content, format, keepTemplateKey, markdownParseConfig) => {
-  var _a, _b;
-  const {
-    _relativePath,
-    _keepTemplateKey,
-    _id,
-    _template,
-    _collection,
-    $_body,
-    ...rest
-  } = content;
-  const extra = {};
-  if (keepTemplateKey) {
-    extra["_template"] = _template;
-  }
-  const strippedContent = { ...rest, ...extra };
-  switch (format) {
-    case ".markdown":
-    case ".mdx":
-    case ".md":
-      const ok = import_gray_matter.default.stringify(
-        typeof $_body === "undefined" ? "" : `
-${$_body}`,
-        strippedContent,
-        {
-          language: (_a = markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterFormat) != null ? _a : "yaml",
-          engines: matterEngines,
-          delimiters: (_b = markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterDelimiters) != null ? _b : "---"
-        }
-      );
-      return ok;
-    case ".json":
-      return JSON.stringify(strippedContent, null, 2);
-    case ".yaml":
-    case ".yml":
-      return import_js_yaml.default.safeDump(strippedContent);
-    case ".toml":
-      return import_toml.default.stringify(strippedContent);
-    default:
-      throw new Error(`Must specify a valid format, got ${format}`);
-  }
-};
-var parseFile = (content, format, yupSchema, markdownParseConfig) => {
-  var _a, _b;
-  switch (format) {
-    case ".markdown":
-    case ".mdx":
-    case ".md":
-      const contentJSON = (0, import_gray_matter.default)(content || "", {
-        language: (_a = markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterFormat) != null ? _a : "yaml",
-        delimiters: (_b = markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterDelimiters) != null ? _b : "---",
-        engines: matterEngines
-      });
-      const markdownData = {
-        ...contentJSON.data,
-        $_body: contentJSON.content
-      };
-      assertShape(markdownData, yupSchema);
-      return markdownData;
-    case ".json":
-      if (!content) {
-        return {};
-      }
-      return JSON.parse(content);
-    case ".toml":
-      if (!content) {
-        return {};
-      }
-      return import_toml.default.parse(content);
-    case ".yaml":
-    case ".yml":
-      if (!content) {
-        return {};
-      }
-      return import_js_yaml.default.safeLoad(content);
-    default:
-      throw new Error(`Must specify a valid format, got ${format}`);
-  }
-};
-
 // src/database/alias-utils.ts
 var replaceBlockAliases = (template, item) => {
   const output = { ...item };
@@ -5226,6 +5307,7 @@ var Database = class {
                       {
                         name: field.name,
                         type: field.type,
+                        list: !!field.list,
                         pad: field.type === "number" ? { fillString: "0", maxLength: DEFAULT_NUMERIC_LPAD } : void 0
                       }
                     ]
@@ -5236,12 +5318,13 @@ var Database = class {
                 for (const index of collection.indexes) {
                   indexDefinitions[index.name] = {
                     fields: index.fields.map((indexField) => {
-                      var _a;
+                      const field = collection.fields.find(
+                        (field2) => indexField.name === field2.name
+                      );
                       return {
                         name: indexField.name,
-                        type: (_a = collection.fields.find(
-                          (field) => indexField.name === field.name
-                        )) == null ? void 0 : _a.type
+                        type: field == null ? void 0 : field.type,
+                        list: !!(field == null ? void 0 : field.list)
                       };
                     })
                   };
@@ -5329,10 +5412,27 @@ var Database = class {
         if (!matcher || indexDefinition && matcher.length !== indexDefinition.fields.length + 2) {
           continue;
         }
-        const filepath = matcher.groups["_filepath_"];
-        if (!itemFilter(
-          filterSuffixes ? matcher.groups : indexDefinition ? await rootLevel.get(filepath) : value
-        )) {
+        let filepath = matcher.groups["_filepath_"];
+        let itemRecord;
+        if (filterSuffixes) {
+          itemRecord = matcher.groups;
+          for (const field of indexDefinition.fields) {
+            if (itemRecord[field.name]) {
+              if (field.list) {
+                itemRecord[field.name] = itemRecord[field.name].split(
+                  ARRAY_ITEM_VALUE_SEPARATOR
+                );
+              }
+            }
+          }
+        } else {
+          if (indexDefinition) {
+            itemRecord = await rootLevel.get(filepath);
+          } else {
+            itemRecord = value;
+          }
+        }
+        if (!itemFilter(itemRecord)) {
           continue;
         }
         if (limit !== -1 && edges.length >= limit) {
@@ -5389,13 +5489,24 @@ var Database = class {
       let nextLevel;
       return await this.indexStatusCallbackWrapper(
         async () => {
-          const lookup = lookupFromLockFile || JSON.parse(
-            await this.bridge.get(
-              (0, import_schema_tools3.normalizePath)(
-                import_path3.default.join(this.getGeneratedFolder(), "_lookup.json")
+          let lookup;
+          try {
+            lookup = lookupFromLockFile || JSON.parse(
+              await this.bridge.get(
+                (0, import_schema_tools3.normalizePath)(
+                  import_path3.default.join(this.getGeneratedFolder(), "_lookup.json")
+                )
               )
-            )
-          );
+            );
+          } catch (error) {
+            console.error("Error: Unable to find generated lookup file");
+            if (this.tinaDirectory === "tina") {
+              console.error(
+                'If you are using the .tina folder. Please set {tinaDirectory: ".tina"} in your createDatabase options or migrate to the new tina folder: https://tina.io/blog/tina-config-rearrangements/'
+              );
+            }
+            throw error;
+          }
           let nextVersion;
           if (!this.config.version) {
             await this.level.clear();
@@ -5586,7 +5697,7 @@ This will be an error in the future. See https://tina.io/docs/errors/file-in-mut
       }
       return { warnings };
     };
-    this.tinaDirectory = config.tinaDirectory || ".tina";
+    this.tinaDirectory = config.tinaDirectory || "tina";
     this.bridge = config.bridge;
     this.rootLevel = config.level && new LevelProxy(config.level);
     this.indexStatusCallback = config.indexStatusCallback || defaultStatusCallback;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "1.4.11",
+  "version": "1.4.13",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
   "typings": "dist/index.d.ts",
@@ -25,8 +25,8 @@
   "dependencies": {
     "@graphql-tools/relay-operation-optimizer": "^6.4.1",
     "@iarna/toml": "^2.2.5",
-    "@tinacms/mdx": "1.3.9",
-    "@tinacms/schema-tools": "1.4.3",
+    "@tinacms/mdx": "1.3.10",
+    "@tinacms/schema-tools": "1.4.4",
     "abstract-level": "^1.0.3",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
@@ -84,7 +84,7 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
-    "@tinacms/schema-tools": "1.4.3",
+    "@tinacms/schema-tools": "1.4.4",
     "@tinacms/scripts": "1.1.0",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",