@tinacms/graphql 0.60.6 → 0.60.7

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # tina-graphql
 
+## 0.60.7
+
+### Patch Changes
+
+- f6cb634c2: Added an optional config key to the schema that will be used for tina cloud media store
+- b1a4290e6: Use media config from the schema in the local media server
+- 1955b8842: Uses new `schema.config` when resolving media/asset urls
+- 8b81c3cf3: Added more context to error messages to help to user debug issues
+  - @tinacms/datalayer@0.1.1
+
 ## 0.60.6
 
 ### Patch Changes

package/dist/index.d.ts

@@ -12,6 +12,7 @@ limitations under the License.
 */
 export { indexDB } from './build';
 export { resolve } from './resolve';
+export * from './resolver/error';
 export { createDatabase } from './database';
 export type { QueryOptions } from './database';
 import type { Database } from './database';

package/dist/index.js

@@ -10384,9 +10384,14 @@ var require_remark_mdx = __commonJS({
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/index.ts
 __export(exports, {
+  TinaFetchError: () => TinaFetchError,
+  TinaGraphQLError: () => TinaGraphQLError,
+  TinaParseDocumentError: () => TinaParseDocumentError,
+  TinaQueryError: () => TinaQueryError,
   assertShape: () => assertShape,
   buildSchema: () => buildSchema,
   createDatabase: () => createDatabase,
+  handleFetchErrorError: () => handleFetchErrorError,
   indexDB: () => indexDB,
   parseFile: () => parseFile,
   resolve: () => resolve,
@@ -12575,6 +12580,7 @@ var filterSelections = (arr) => {
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/schema/validate.ts
 var import_lodash2 = __toModule(require("lodash"));
 var yup2 = __toModule(require("yup"));
+var import_schema_tools = __toModule(require("@tinacms/schema-tools"));
 var FIELD_TYPES = [
   "string",
   "number",
@@ -12589,6 +12595,13 @@ var validateSchema = async (schema) => {
   const schema2 = addNamespaceToSchema(import_lodash2.default.cloneDeep(schema));
   const collections = await sequential(schema2.collections, async (collection) => validateCollection(collection));
   validationCollectionsPathAndMatch(collections);
+  if (schema2.config) {
+    const config = (0, import_schema_tools.validateTinaCloudSchemaConfig)(schema2.config);
+    return {
+      collections,
+      config
+    };
+  }
   return {
     collections
   };
@@ -12680,7 +12693,7 @@ var validateField = async (field) => {
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/package.json
 var name = "@tinacms/graphql";
-var version = "0.60.6";
+var version = "0.60.7";
 var main = "dist/index.js";
 var typings = "dist/index.d.ts";
 var files = [
@@ -12822,15 +12835,52 @@ var package_default = {
 };
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/resolver/error.ts
-var TinaError = class extends Error {
+var TinaGraphQLError = class extends Error {
   constructor(message, extensions) {
     super(message);
     if (!this.name) {
-      Object.defineProperty(this, "name", { value: "TinaError" });
+      Object.defineProperty(this, "name", { value: "TinaGraphQLError" });
     }
     this.extensions = __spreadValues({}, extensions);
   }
 };
+var TinaFetchError = class extends Error {
+  constructor(message, args) {
+    super(message);
+    this.name = "TinaFetchError";
+    this.collection = args.collection;
+    this.stack = args.stack;
+    this.file = args.file;
+    this.originalError = args.originalError;
+  }
+};
+var TinaQueryError = class extends TinaFetchError {
+  constructor(args) {
+    super(`Error querying file ${args.file} collection ${args.collection}. Please run "tinacms audit" or add the --verbose option for more info`, args);
+  }
+};
+var TinaParseDocumentError = class extends TinaFetchError {
+  constructor(args) {
+    super(`Error Parsing file ${args.file} collection ${args.collection}. Please run "tinacms audit" or add the --verbose option  for more info`, args);
+  }
+  toString() {
+    return super.toString() + "\n OriginalError: \n" + this.originalError.toString();
+  }
+};
+var handleFetchErrorError = (e, verbose) => {
+  if (e instanceof Error) {
+    if (e instanceof TinaFetchError) {
+      if (verbose) {
+        console.log(e.toString());
+        console.log(e);
+        console.log(e.stack);
+      }
+    }
+  } else {
+    console.error(e);
+  }
+  throw e;
+};
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/schema/index.ts
 var createSchema = async ({
@@ -12943,7 +12993,7 @@ var TinaSchema = class {
           assertShape(data, (yup3) => yup3.object({ _template: yup3.string().required() }));
           const template = templateInfo.templates.find((template2) => template2.namespace[template2.namespace.length - 1] === data._template);
           if (!template) {
-            throw new TinaError(`Expected to find template named '${data._template}' for collection '${lastItem(collection.namespace)}'`, {
+            throw new TinaGraphQLError(`Expected to find template named '${data._template}' for collection '${lastItem(collection.namespace)}'`, {
               collection: lastItem(collection.namespace),
               possibleTemplates: templateInfo.templates.map((template2) => lastItem(template2.namespace)),
               data
@@ -20428,40 +20478,60 @@ var visit = function(tree, test, visitor, reverse) {
 var import_lodash4 = __toModule(require("lodash"));
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/resolver/media-utils.ts
-var resolveMediaCloudToRelative = (value, config = { useRelativeMedia: true }) => {
+var resolveMediaCloudToRelative = (value, config = { useRelativeMedia: true }, schema) => {
   if (config && value) {
     if (config.useRelativeMedia === true) {
       return value;
-    } else {
+    }
+    if (hasTinaMediaConfig(schema) === true) {
       const assetsURL = `https://${config.assetsHost}/${config.clientId}`;
       if (typeof value === "string" && value.includes(assetsURL)) {
-        return value.replace(assetsURL, "");
-      } else {
-        return value;
+        const cleanSyncFolder = cleanUpSlashes(schema.config.media.tina.syncFolder);
+        const strippedURL = value.replace(assetsURL, "");
+        return `${cleanSyncFolder}${strippedURL}`;
       }
+      return value;
     }
+    return value;
   } else {
     return value;
   }
 };
-var resolveMediaRelativeToCloud = (value, config = { useRelativeMedia: true }) => {
+var resolveMediaRelativeToCloud = (value, config = { useRelativeMedia: true }, schema) => {
   if (config && value) {
     if (config.useRelativeMedia === true) {
       return value;
-    } else {
-      return `https://${config.assetsHost}/${config.clientId}${value}`;
     }
+    if (hasTinaMediaConfig(schema) === true) {
+      const cleanSyncFolder = cleanUpSlashes(schema.config.media.tina.syncFolder);
+      const strippedValue = value.replace(cleanSyncFolder, "");
+      return `https://${config.assetsHost}/${config.clientId}${strippedValue}`;
+    }
+    return value;
   } else {
     return value;
   }
 };
+var cleanUpSlashes = (path6) => {
+  if (path6) {
+    return `/${path6.replace(/^\/+|\/+$/gm, "")}`;
+  }
+  return "";
+};
+var hasTinaMediaConfig = (schema) => {
+  var _a, _b, _c, _d, _e, _f;
+  if (((_c = (_b = (_a = schema.config) == null ? void 0 : _a.media) == null ? void 0 : _b.tina) == null ? void 0 : _c.publicFolder) && ((_f = (_e = (_d = schema.config) == null ? void 0 : _d.media) == null ? void 0 : _e.tina) == null ? void 0 : _f.syncFolder)) {
+    return true;
+  }
+  return false;
+};
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/mdx/parse.ts
-var parseMDX = (value, field, graphQLconfig) => {
+var parseMDX = (value, field, graphQLconfig, schema) => {
   const tree = unified().use(remark_parse_default).use(import_remark_mdx.default).parse(value);
-  return parseMDXInner(tree, field, graphQLconfig);
+  return parseMDXInner(tree, field, graphQLconfig, schema);
 };
-var parseMDXInner = (tree, field, graphQLconfig) => {
+var parseMDXInner = (tree, field, graphQLconfig, schema) => {
   visit(tree, (node) => {
     delete node.position;
   });
@@ -20469,7 +20539,7 @@ var parseMDXInner = (tree, field, graphQLconfig) => {
     var _a;
     let props = {};
     if (!node.name) {
-      props = parseMDXInner({ type: "root", children: node.children }, field, graphQLconfig);
+      props = parseMDXInner({ type: "root", children: node.children }, field, graphQLconfig, schema);
     }
     const template = (_a = field.templates) == null ? void 0 : _a.find((template2) => {
       const templateName = typeof template2 === "string" ? template2 : template2.name;
@@ -20500,7 +20570,7 @@ var parseMDXInner = (tree, field, graphQLconfig) => {
           if (!field2) {
             throw new Error(`Unknown property '${attribute.name}' for embedded structure '${node.name}'`);
           }
-          parseField(attribute, field2, props, graphQLconfig);
+          parseField(attribute, field2, props, graphQLconfig, schema);
         }
       } else {
         console.log(`Not sure what this is, type: ${attribute.type}`);
@@ -20509,10 +20579,10 @@ var parseMDXInner = (tree, field, graphQLconfig) => {
     delete node.attributes;
     node.props = props;
   });
-  const slateTree = tree.children.map((node) => remarkToSlate(node, graphQLconfig));
+  const slateTree = tree.children.map((node) => remarkToSlate(node, graphQLconfig, schema));
   return { type: "root", children: slateTree };
 };
-var parseField = (attribute, field, props, graphQLconfig) => {
+var parseField = (attribute, field, props, graphQLconfig, schema) => {
   var _a, _b;
   switch (field.type) {
     case "boolean":
@@ -20520,7 +20590,7 @@ var parseField = (attribute, field, props, graphQLconfig) => {
       props[field.name] = attribute.value;
       break;
     case "image":
-      props[field.name] = resolveMediaRelativeToCloud(attribute.value, graphQLconfig);
+      props[field.name] = resolveMediaRelativeToCloud(attribute.value, graphQLconfig, schema);
       break;
     case "number":
     case "string":
@@ -20583,7 +20653,7 @@ var parseField = (attribute, field, props, graphQLconfig) => {
                       throw new Error(`Global fields not supported at this time`);
                     }
                     field.fields.forEach((field2) => {
-                      parseField(property, field2, objectProps, graphQLconfig);
+                      parseField(property, field2, objectProps, graphQLconfig, schema);
                     });
                   }
                 });
@@ -20605,7 +20675,7 @@ var parseField = (attribute, field, props, graphQLconfig) => {
                           throw new Error(`Global fields not supported at this time`);
                         }
                         field.fields.forEach((field2) => {
-                          parseField(property, field2, objectProps, graphQLconfig);
+                          parseField(property, field2, objectProps, graphQLconfig, schema);
                         });
                       }
                       if (field.templates) {
@@ -20614,7 +20684,7 @@ var parseField = (attribute, field, props, graphQLconfig) => {
                             throw new Error(`Global fields not supported at this time`);
                           }
                           fieldTemplate.fields.forEach((field2) => {
-                            parseField(property, field2, objectProps, graphQLconfig);
+                            parseField(property, field2, objectProps, graphQLconfig, schema);
                           });
                         });
                       }
@@ -20637,13 +20707,13 @@ var parseField = (attribute, field, props, graphQLconfig) => {
       if (attribute.value) {
         if (field.name === "children") {
           if (Array.isArray(attribute.value)) {
-            props[field.name] = parseMDXInner({ type: "root", children: attribute.value }, field, graphQLconfig);
+            props[field.name] = parseMDXInner({ type: "root", children: attribute.value }, field, graphQLconfig, schema);
           } else {
             throw Error(`Expected an array of MDX strings for rich-text field with the special name 'children'`);
           }
         } else {
           try {
-            const mdx2 = parseMDX(attribute.value.value, field, graphQLconfig);
+            const mdx2 = parseMDX(attribute.value.value, field, graphQLconfig, schema);
             props[field.name] = mdx2.children[0].props;
           } catch (e) {
             console.log(e);
@@ -20714,7 +20784,7 @@ var defaultNodeTypes = {
   break: "break",
   image: plateElements.ELEMENT_IMAGE
 };
-function remarkToSlate(node, graphQLconfig) {
+function remarkToSlate(node, graphQLconfig, schema) {
   const types = __spreadProps(__spreadValues({}, defaultNodeTypes), {
     heading: __spreadValues({}, defaultNodeTypes.heading)
   });
@@ -20722,12 +20792,12 @@ function remarkToSlate(node, graphQLconfig) {
     case "heading":
       return {
         type: types.heading[node.depth],
-        children: node.children.map((node2) => remarkToSlate(node2, graphQLconfig))
+        children: node.children.map((node2) => remarkToSlate(node2, graphQLconfig, schema))
       };
     case "list":
       return {
         type: node.ordered ? types.ol_list : types.ul_list,
-        children: node.children.map((node2) => remarkToSlate(node2, graphQLconfig))
+        children: node.children.map((node2) => remarkToSlate(node2, graphQLconfig, schema))
       };
     case "listItem":
       const realChildren = [];
@@ -20735,12 +20805,12 @@ function remarkToSlate(node, graphQLconfig) {
         if (child.type === "list") {
           realChildren.push({
             type: child.ordered ? types.ol_list : types.ul_list,
-            children: child.children.map((node2) => remarkToSlate(node2, graphQLconfig))
+            children: child.children.map((node2) => remarkToSlate(node2, graphQLconfig, schema))
           });
         } else {
           realChildren.push({
             type: plateElements.ELEMENT_LIC,
-            children: child.children.map((node2) => remarkToSlate(node2, graphQLconfig))
+            children: child.children.map((node2) => remarkToSlate(node2, graphQLconfig, schema))
           });
         }
       });
@@ -20751,16 +20821,16 @@ function remarkToSlate(node, graphQLconfig) {
     case "paragraph":
       return {
         type: types.paragraph,
-        children: node.children.map((node2) => remarkToSlate(node2, graphQLconfig))
+        children: node.children.map((node2) => remarkToSlate(node2, graphQLconfig, schema))
       };
     case "link":
       return {
         type: types.link,
         url: node.url,
-        children: node.children.map((node2) => remarkToSlate(node2, graphQLconfig))
+        children: node.children.map((node2) => remarkToSlate(node2, graphQLconfig, schema))
       };
     case "image":
-      const url = resolveMediaRelativeToCloud(node.url, graphQLconfig);
+      const url = resolveMediaRelativeToCloud(node.url, graphQLconfig, schema);
       return {
         type: types.image,
         url,
@@ -20770,7 +20840,7 @@ function remarkToSlate(node, graphQLconfig) {
     case "blockquote":
       return {
         type: types.block_quote,
-        children: node.children.map((node2) => remarkToSlate(node2, graphQLconfig))
+        children: node.children.map((node2) => remarkToSlate(node2, graphQLconfig, schema))
       };
     case "code":
       return {
@@ -22231,10 +22301,10 @@ var mdxToMarkdown = {
 };
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/mdx/stringify.ts
-var stringifyMDX = (value, field, graphQLconfig) => {
+var stringifyMDX = (value, field, graphQLconfig, schema) => {
   const slateTree = value.children;
   try {
-    const tree = stringifyChildren(slateTree, field, graphQLconfig);
+    const tree = stringifyChildren(slateTree, field, graphQLconfig, schema);
     const out = toMarkdown({
       type: "root",
       children: tree
@@ -22252,13 +22322,13 @@ var allChildrenEmpty = (children) => {
   }
   return false;
 };
-var stringifyChildren = (children, field, graphQLconfig) => {
+var stringifyChildren = (children, field, graphQLconfig, schema) => {
   if (!children) {
     return [];
   }
-  return children.map((child) => stringify(child, field, graphQLconfig)).filter(Boolean);
+  return children.map((child) => stringify(child, field, graphQLconfig, schema)).filter(Boolean);
 };
-var stringify = (node, field, graphQLconfig) => {
+var stringify = (node, field, graphQLconfig, schema) => {
   var _a;
   if (!node.type) {
     if (node == null ? void 0 : node.code) {
@@ -22284,40 +22354,40 @@ var stringify = (node, field, graphQLconfig) => {
       return {
         type: "heading",
         depth: 1,
-        children: stringifyChildren(node.children, field, graphQLconfig)
+        children: stringifyChildren(node.children, field, graphQLconfig, schema)
       };
     case plateElements.ELEMENT_H2:
       return {
         type: "heading",
         depth: 2,
-        children: stringifyChildren(node.children, field, graphQLconfig)
+        children: stringifyChildren(node.children, field, graphQLconfig, schema)
       };
     case plateElements.ELEMENT_H3:
       return {
         type: "heading",
         depth: 3,
-        children: stringifyChildren(node.children, field, graphQLconfig)
+        children: stringifyChildren(node.children, field, graphQLconfig, schema)
       };
     case plateElements.ELEMENT_H4:
       return {
         type: "heading",
         depth: 4,
-        children: stringifyChildren(node.children, field, graphQLconfig)
+        children: stringifyChildren(node.children, field, graphQLconfig, schema)
       };
     case plateElements.ELEMENT_H5:
       return {
         type: "heading",
         depth: 5,
-        children: stringifyChildren(node.children, field, graphQLconfig)
+        children: stringifyChildren(node.children, field, graphQLconfig, schema)
       };
     case plateElements.ELEMENT_H6:
       return {
         type: "heading",
         depth: 6,
-        children: stringifyChildren(node.children, field, graphQLconfig)
+        children: stringifyChildren(node.children, field, graphQLconfig, schema)
       };
     case plateElements.ELEMENT_PARAGRAPH:
-      const children = stringifyChildren(node.children, field, graphQLconfig);
+      const children = stringifyChildren(node.children, field, graphQLconfig, schema);
       if (allChildrenEmpty(children)) {
         return false;
       }
@@ -22337,7 +22407,7 @@ var stringify = (node, field, graphQLconfig) => {
         ordered: false,
         spread: false,
         check: null,
-        children: stringifyChildren(node.children, field, graphQLconfig)
+        children: stringifyChildren(node.children, field, graphQLconfig, schema)
       };
     case plateElements.ELEMENT_OL:
       return {
@@ -22345,7 +22415,7 @@ var stringify = (node, field, graphQLconfig) => {
         ordered: true,
         spread: false,
         check: null,
-        children: stringifyChildren(node.children, field, graphQLconfig)
+        children: stringifyChildren(node.children, field, graphQLconfig, schema)
       };
     case plateElements.ELEMENT_LI:
       const realChildren = [];
@@ -22368,17 +22438,17 @@ var stringify = (node, field, graphQLconfig) => {
         spread: false,
         check: null,
         children: [
-          ...stringifyChildren([p], field, graphQLconfig),
-          ...stringifyChildren(extraChildren, field, graphQLconfig)
+          ...stringifyChildren([p], field, graphQLconfig, schema),
+          ...stringifyChildren(extraChildren, field, graphQLconfig, schema)
         ]
       };
     case plateElements.ELEMENT_LIC:
       return {
         type: "paragraph",
-        children: stringifyChildren(node.children, field, graphQLconfig)
+        children: stringifyChildren(node.children, field, graphQLconfig, schema)
       };
     case plateElements.ELEMENT_IMAGE:
-      const url = resolveMediaCloudToRelative(node.url, graphQLconfig);
+      const url = resolveMediaCloudToRelative(node.url, graphQLconfig, schema);
       return {
         type: "image",
         title: node.caption,
@@ -22394,12 +22464,12 @@ var stringify = (node, field, graphQLconfig) => {
         type: "link",
         url: node.url,
         title: node.title,
-        children: stringifyChildren(node.children, field, graphQLconfig)
+        children: stringifyChildren(node.children, field, graphQLconfig, schema)
       };
     case plateElements.ELEMENT_BLOCKQUOTE:
       return {
         type: "blockquote",
-        children: stringifyChildren(node.children, field, graphQLconfig)
+        children: stringifyChildren(node.children, field, graphQLconfig, schema)
       };
     case "mdxJsxTextElement":
     case "mdxJsxFlowElement":
@@ -22564,7 +22634,7 @@ var stringify = (node, field, graphQLconfig) => {
                 }
                 break;
               case "rich-text":
-                const tree = stringifyChildren(value.children, field2, graphQLconfig);
+                const tree = stringifyChildren(value.children, field2, graphQLconfig, schema);
                 if (field2.name === "children") {
                   children2 = tree;
                 } else {
@@ -22767,7 +22837,18 @@ var Resolver = class {
           _collection: rawData._collection,
           _template: rawData._template
         };
-        await sequential(template.fields, async (field) => this.resolveFieldData(field, rawData, data));
+        try {
+          await sequential(template.fields, async (field) => {
+            return this.resolveFieldData(field, rawData, data);
+          });
+        } catch (e) {
+          throw new TinaParseDocumentError({
+            originalError: e,
+            collection: collection.name,
+            file: relativePath,
+            stack: e.stack
+          });
+        }
         const titleField = template.fields.find((x) => {
           if (x.type === "string" && (x == null ? void 0 : x.isTitle)) {
             return true;
@@ -22793,8 +22874,8 @@ var Resolver = class {
           _values: data
         });
       } catch (e) {
-        if (e instanceof TinaError) {
-          throw new TinaError(e.message, __spreadValues({
+        if (e instanceof TinaGraphQLError) {
+          throw new TinaGraphQLError(e.message, __spreadValues({
             requestedDocument: fullPath
           }, e.extensions));
         }
@@ -23088,13 +23169,13 @@ var Resolver = class {
             accum[fieldName] = fieldValue;
             break;
           case "image":
-            accum[fieldName] = resolveMediaCloudToRelative(fieldValue, this.config);
+            accum[fieldName] = resolveMediaCloudToRelative(fieldValue, this.config, this.tinaSchema.schema);
             break;
           case "object":
             accum[fieldName] = this.buildObjectMutations(fieldValue, field);
             break;
           case "rich-text":
-            accum[fieldName] = stringifyMDX(fieldValue, field, this.config);
+            accum[fieldName] = stringifyMDX(fieldValue, field, this.config, this.tinaSchema.schema);
             break;
           case "reference":
             accum[fieldName] = fieldValue;
@@ -23127,10 +23208,10 @@ var Resolver = class {
           accumulator[field.name] = value;
           break;
         case "image":
-          accumulator[field.name] = resolveMediaRelativeToCloud(value, this.config);
+          accumulator[field.name] = resolveMediaRelativeToCloud(value, this.config, this.tinaSchema.schema);
           break;
         case "rich-text":
-          const tree = parseMDX(value, field, this.config);
+          const tree = parseMDX(value, field, this.config, this.tinaSchema.schema);
           accumulator[field.name] = tree;
           break;
         case "object":
@@ -23235,10 +23316,12 @@ var resolve = async ({
   query,
   variables,
   database,
-  silenceErrors
+  silenceErrors,
+  verbose
 }) => {
   var _a;
   try {
+    const verboseValue = verbose != null ? verbose : true;
     const graphQLSchemaAst = await database.getGraphQLSchema();
     const graphQLSchema = (0, import_graphql3.buildASTSchema)(graphQLSchemaAst);
     const tinaConfig = await database.getTinaSchema();
@@ -23266,141 +23349,152 @@ var resolve = async ({
         }
       },
       fieldResolver: async (source = {}, _args = {}, _context, info) => {
-        const args = JSON.parse(JSON.stringify(_args));
-        const returnType = (0, import_graphql3.getNamedType)(info.returnType).toString();
-        const lookup = await database.getLookup(returnType);
-        const isMutation = info.parentType.toString() === "Mutation";
-        const value = source[info.fieldName];
-        if (returnType === "Collection") {
-          if (value) {
-            return value;
-          }
-          if (info.fieldName === "collections") {
-            const collectionNode2 = info.fieldNodes.find((x) => x.name.value === "collections");
-            const hasDocuments2 = collectionNode2.selectionSet.selections.find((x) => {
-              var _a2;
-              return ((_a2 = x == null ? void 0 : x.name) == null ? void 0 : _a2.value) === "documents";
-            });
-            return tinaSchema.getCollections().map((collection) => {
-              return resolver2.resolveCollection(args, collection.name, Boolean(hasDocuments2));
-            });
-          }
-          const collectionNode = info.fieldNodes.find((x) => x.name.value === "collection");
-          const hasDocuments = collectionNode.selectionSet.selections.find((x) => {
-            var _a2;
-            return ((_a2 = x == null ? void 0 : x.name) == null ? void 0 : _a2.value) === "documents";
-          });
-          return resolver2.resolveCollection(args, args.collection, Boolean(hasDocuments));
-        }
-        if (info.fieldName === "getOptimizedQuery") {
-          try {
-            const [optimizedQuery] = (0, import_relay_operation_optimizer.optimizeDocuments)(info.schema, [(0, import_graphql3.parse)(args.queryString)], {
-              assumeValid: true,
-              includeFragments: false,
-              noLocation: true
-            });
-            return (0, import_graphql3.print)(optimizedQuery);
-          } catch (e) {
-            throw new Error(`Invalid query provided, Error message: ${e.message}`);
-          }
-        }
-        if (!lookup) {
-          return value;
-        }
-        const isCreation = lookup[info.fieldName] === "create";
-        switch (lookup.resolveType) {
-          case "nodeDocument":
-            assertShape(args, (yup3) => yup3.object({ id: yup3.string().required() }));
-            return resolver2.getDocument(args.id);
-          case "multiCollectionDocument":
-            if (typeof value === "string") {
-              return resolver2.getDocument(value);
+        try {
+          const args = JSON.parse(JSON.stringify(_args));
+          const returnType = (0, import_graphql3.getNamedType)(info.returnType).toString();
+          const lookup = await database.getLookup(returnType);
+          const isMutation = info.parentType.toString() === "Mutation";
+          const value = source[info.fieldName];
+          if (returnType === "Collection") {
+            if (value) {
+              return value;
             }
-            if (args && args.collection && info.fieldName === "addPendingDocument") {
-              return resolver2.resolveDocument({
-                args: __spreadProps(__spreadValues({}, args), { params: {} }),
-                collection: args.collection,
-                isMutation,
-                isCreation: true,
-                isAddPendingDocument: true
+            if (info.fieldName === "collections") {
+              const collectionNode2 = info.fieldNodes.find((x) => x.name.value === "collections");
+              const hasDocuments2 = collectionNode2.selectionSet.selections.find((x) => {
+                var _a2;
+                return ((_a2 = x == null ? void 0 : x.name) == null ? void 0 : _a2.value) === "documents";
               });
-            }
-            if ([
-              NAMER.documentQueryName(),
-              "createDocument",
-              "updateDocument",
-              "deleteDocument"
-            ].includes(info.fieldName)) {
-              const result2 = await resolver2.resolveDocument({
-                args,
-                collection: args.collection,
-                isMutation,
-                isCreation,
-                isDeletion: info.fieldName === "deleteDocument",
-                isAddPendingDocument: false,
-                isCollectionSpecific: false
+              return tinaSchema.getCollections().map((collection) => {
+                return resolver2.resolveCollection(args, collection.name, Boolean(hasDocuments2));
               });
-              return result2;
             }
-            return value;
-          case "multiCollectionDocumentList":
-            if (Array.isArray(value)) {
-              return {
-                totalCount: value.length,
-                edges: value.map((document3) => {
-                  return { node: document3 };
-                })
-              };
-            } else if (info.fieldName === "documents" && (value == null ? void 0 : value.collection) && (value == null ? void 0 : value.hasDocuments)) {
-              return resolver2.resolveCollectionConnection({
-                args,
-                collection: value.collection
+            const collectionNode = info.fieldNodes.find((x) => x.name.value === "collection");
+            const hasDocuments = collectionNode.selectionSet.selections.find((x) => {
+              var _a2;
+              return ((_a2 = x == null ? void 0 : x.name) == null ? void 0 : _a2.value) === "documents";
+            });
+            return resolver2.resolveCollection(args, args.collection, Boolean(hasDocuments));
+          }
+          if (info.fieldName === "getOptimizedQuery") {
+            try {
+              const [optimizedQuery] = (0, import_relay_operation_optimizer.optimizeDocuments)(info.schema, [(0, import_graphql3.parse)(args.queryString)], {
+                assumeValid: true,
+                includeFragments: false,
+                noLocation: true
               });
-            } else {
-              throw new Error(`Expected an array for result of ${info.fieldName} at ${info.path}`);
+              return (0, import_graphql3.print)(optimizedQuery);
+            } catch (e) {
+              throw new Error(`Invalid query provided, Error message: ${e.message}`);
             }
-          case "collectionDocument":
-            if (value) {
-              return value;
-            }
-            const result = value || await resolver2.resolveDocument({
-              args,
-              collection: lookup.collection,
-              isMutation,
-              isCreation,
-              isAddPendingDocument: false,
-              isCollectionSpecific: true
-            });
-            return result;
-          case "collectionDocumentList":
-            return resolver2.resolveCollectionConnection({
-              args,
-              collection: tinaSchema.getCollection(lookup.collection)
-            });
-          case "unionData":
-            if (!value) {
-              if (args.relativePath) {
+          }
+          if (!lookup) {
+            return value;
+          }
+          const isCreation = lookup[info.fieldName] === "create";
+          switch (lookup.resolveType) {
+            case "nodeDocument":
+              assertShape(args, (yup3) => yup3.object({ id: yup3.string().required() }));
+              return resolver2.getDocument(args.id);
+            case "multiCollectionDocument":
+              if (typeof value === "string") {
+                return resolver2.getDocument(value);
+              }
+              if (args && args.collection && info.fieldName === "addPendingDocument") {
+                return resolver2.resolveDocument({
+                  args: __spreadProps(__spreadValues({}, args), { params: {} }),
+                  collection: args.collection,
+                  isMutation,
+                  isCreation: true,
+                  isAddPendingDocument: true
+                });
+              }
+              if ([
+                NAMER.documentQueryName(),
+                "createDocument",
+                "updateDocument",
+                "deleteDocument"
+              ].includes(info.fieldName)) {
                 const result2 = await resolver2.resolveDocument({
                   args,
-                  collection: lookup.collection,
+                  collection: args.collection,
                   isMutation,
                   isCreation,
+                  isDeletion: info.fieldName === "deleteDocument",
                   isAddPendingDocument: false,
-                  isCollectionSpecific: true
+                  isCollectionSpecific: false
                 });
                 return result2;
               }
-            }
-            return value;
-          default:
-            console.error(lookup);
-            throw new Error(`Unexpected resolve type`);
+              return value;
+            case "multiCollectionDocumentList":
+              if (Array.isArray(value)) {
+                return {
+                  totalCount: value.length,
+                  edges: value.map((document3) => {
+                    return { node: document3 };
+                  })
+                };
+              } else if (info.fieldName === "documents" && (value == null ? void 0 : value.collection) && (value == null ? void 0 : value.hasDocuments)) {
+                return resolver2.resolveCollectionConnection({
+                  args,
+                  collection: value.collection
+                });
+              } else {
+                throw new Error(`Expected an array for result of ${info.fieldName} at ${info.path}`);
+              }
+            case "collectionDocument":
+              if (value) {
+                return value;
+              }
+              const result = value || await resolver2.resolveDocument({
+                args,
+                collection: lookup.collection,
+                isMutation,
+                isCreation,
+                isAddPendingDocument: false,
+                isCollectionSpecific: true
+              });
+              return result;
+            case "collectionDocumentList":
+              return resolver2.resolveCollectionConnection({
+                args,
+                collection: tinaSchema.getCollection(lookup.collection)
+              });
+            case "unionData":
+              if (!value) {
+                if (args.relativePath) {
+                  const result2 = await resolver2.resolveDocument({
+                    args,
+                    collection: lookup.collection,
+                    isMutation,
+                    isCreation,
+                    isAddPendingDocument: false,
+                    isCollectionSpecific: true
+                  });
+                  return result2;
+                }
+              }
+              return value;
+            default:
+              console.error(lookup);
+              throw new Error(`Unexpected resolve type`);
+          }
+        } catch (e) {
+          handleFetchErrorError(e, verboseValue);
         }
       }
     });
     if (res.errors) {
       if (!silenceErrors) {
-        console.error(res.errors);
+        res.errors.map((e) => {
+          console.error(e.toString());
+          if (verboseValue) {
+            console.error("More error context below");
+            console.error(e.message);
+            console.error(e);
+          }
+        });
       }
     }
     return res;
@@ -23553,25 +23647,34 @@ var Database = class {
       });
     };
     this.put = async (filepath, data, collection) => {
-      if (SYSTEM_FILES.includes(filepath)) {
-        throw new Error(`Unexpected put for config file ${filepath}`);
-      } else {
-        let collectionIndexDefinitions;
-        if (collection) {
-          const indexDefinitions = await this.getIndexDefinitions();
-          collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection];
-        }
-        const { stringifiedFile, payload, keepTemplateKey } = await this.stringifyFile(filepath, data);
-        if (this.store.supportsSeeding()) {
-          await this.bridge.put(normalizePath(filepath), stringifiedFile);
+      try {
+        if (SYSTEM_FILES.includes(filepath)) {
+          throw new Error(`Unexpected put for config file ${filepath}`);
+        } else {
+          let collectionIndexDefinitions;
+          if (collection) {
+            const indexDefinitions = await this.getIndexDefinitions();
+            collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection];
+          }
+          const { stringifiedFile, payload, keepTemplateKey } = await this.stringifyFile(filepath, data);
+          if (this.store.supportsSeeding()) {
+            await this.bridge.put(normalizePath(filepath), stringifiedFile);
+          }
+          await this.store.put(normalizePath(filepath), payload, {
+            keepTemplateKey,
+            collection,
+            indexDefinitions: collectionIndexDefinitions
+          });
         }
-        await this.store.put(normalizePath(filepath), payload, {
-          keepTemplateKey,
+        return true;
+      } catch (error) {
+        throw new TinaFetchError(`Error in PUT for ${filepath}`, {
+          originalError: error,
+          file: filepath,
           collection,
-          indexDefinitions: collectionIndexDefinitions
+          stack: error.stack
         });
       }
-      return true;
     };
     this.stringifyFile = async (filepath, data) => {
       if (SYSTEM_FILES.includes(filepath)) {
@@ -23747,11 +23850,24 @@ var Database = class {
       } = await this.store.query(storeQueryOptions);
       return {
         edges: await sequential(edges, async (edge) => {
-          const node = await hydrator(edge.path);
-          return {
-            node,
-            cursor: (0, import_datalayer2.btoa)(edge.cursor)
-          };
+          try {
+            const node = await hydrator(edge.path);
+            return {
+              node,
+              cursor: (0, import_datalayer2.btoa)(edge.cursor)
+            };
+          } catch (error) {
+            if (error instanceof Error) {
+              throw new TinaQueryError({
+                originalError: error,
+                file: edge.path,
+                collection,
+                stack: error.stack
+              });
+            } else {
+              throw error;
+            }
+          }
         }),
         pageInfo: {
           hasPreviousPage,
@@ -23898,10 +24014,19 @@ var _indexContent = async (database, documentPaths, collection) => {
     };
   }
   await sequential(documentPaths, async (filepath) => {
-    const dataString = await database.bridge.get(normalizePath(filepath));
-    const data = parseFile(dataString, import_path4.default.extname(filepath), (yup3) => yup3.object({}));
-    if (database.store.supportsSeeding()) {
-      await database.store.seed(normalizePath(filepath), data, seedOptions);
+    try {
+      const dataString = await database.bridge.get(normalizePath(filepath));
+      const data = parseFile(dataString, import_path4.default.extname(filepath), (yup3) => yup3.object({}));
+      if (database.store.supportsSeeding()) {
+        await database.store.seed(normalizePath(filepath), data, seedOptions);
+      }
+    } catch (error) {
+      throw new TinaFetchError(`Unable to seed ${filepath}`, {
+        originalError: error,
+        file: filepath,
+        collection: collection.name,
+        stack: error.stack
+      });
     }
   });
 };
@@ -23934,9 +24059,14 @@ var buildSchema = async (rootPath, database, flags) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  TinaFetchError,
+  TinaGraphQLError,
+  TinaParseDocumentError,
+  TinaQueryError,
   assertShape,
   buildSchema,
   createDatabase,
+  handleFetchErrorError,
   indexDB,
   parseFile,
   resolve,

package/dist/mdx/parse.d.ts

@@ -17,7 +17,8 @@ limitations under the License.
 */
 import type { Content } from 'mdast';
 import type { GraphQLConfig, RichTypeInner } from '../types';
-export declare const parseMDX: (value: string, field: RichTypeInner, graphQLconfig: GraphQLConfig) => {
+import type { TinaCloudSchemaEnriched } from '@tinacms/schema-tools';
+export declare const parseMDX: (value: string, field: RichTypeInner, graphQLconfig: GraphQLConfig, schema: TinaCloudSchemaEnriched) => {
     type: string;
     children: any;
 };
@@ -70,7 +71,7 @@ export declare const parseMDX: (value: string, field: RichTypeInner, graphQLconf
  * 2. We don't need to do any client-side parsing. Since TinaMarkdown and the slate editor work with the same
  * format we can just allow Tina to do it's thing and update the form valuse with no additional work.
  */
-export declare const parseMDXInner: (tree: any, field: RichTypeInner, graphQLconfig: GraphQLConfig) => {
+export declare const parseMDXInner: (tree: any, field: RichTypeInner, graphQLconfig: GraphQLConfig, schema: TinaCloudSchemaEnriched) => {
     type: string;
     children: any;
 };
@@ -226,5 +227,5 @@ export declare const plateElements: {
     MARK_UNDERLINE: string;
 };
 export declare const defaultNodeTypes: NodeTypes;
-export default function remarkToSlate(node: MdxAstNode, graphQLconfig: GraphQLConfig): any;
+export default function remarkToSlate(node: MdxAstNode, graphQLconfig: GraphQLConfig, schema: TinaCloudSchemaEnriched): any;
 export {};

package/dist/mdx/stringify.d.ts

@@ -16,9 +16,10 @@ limitations under the License.
 
 */
 import type { GraphQLConfig, RichTypeInner } from '../types';
+import type { TinaCloudSchemaEnriched } from '@tinacms/schema-tools';
 import { plateElements } from './parse';
 import type { Content } from 'mdast';
-export declare const stringifyMDX: (value: unknown, field: RichTypeInner, graphQLconfig: GraphQLConfig) => string;
+export declare const stringifyMDX: (value: unknown, field: RichTypeInner, graphQLconfig: GraphQLConfig, schema: TinaCloudSchemaEnriched) => string;
 export declare const stringify: (node: {
     type: typeof plateElements;
-}, field: RichTypeInner, graphQLconfig: GraphQLConfig) => Content;
+}, field: RichTypeInner, graphQLconfig: GraphQLConfig, schema: TinaCloudSchemaEnriched) => Content;

package/dist/resolve.d.ts

@@ -12,12 +12,13 @@ limitations under the License.
 */
 import type { Database } from './database';
 import type { GraphQLConfig } from './types';
-export declare const resolve: ({ config, query, variables, database, silenceErrors, }: {
+export declare const resolve: ({ config, query, variables, database, silenceErrors, verbose, }: {
     config?: GraphQLConfig;
     query: string;
     variables: object;
     database: Database;
     silenceErrors?: boolean;
+    verbose?: boolean;
 }) => Promise<import("graphql").ExecutionResult<{
     [key: string]: any;
 }, {

package/dist/resolver/error.d.ts

@@ -11,7 +11,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import { ASTNode, GraphQLError, Source, SourceLocation } from 'graphql';
-export declare class TinaError extends Error implements GraphQLError {
+export declare class TinaGraphQLError extends Error implements GraphQLError {
     extensions: Record<string, any>;
     readonly name: string;
     readonly locations: ReadonlyArray<SourceLocation> | undefined;
@@ -23,3 +23,32 @@ export declare class TinaError extends Error implements GraphQLError {
     [key: string]: any;
     constructor(message: string, extensions?: Record<string, any>);
 }
+export declare type TypeFetchErrorArgs = {
+    stack?: string;
+    file?: string;
+    originalError: Error;
+    collection?: string;
+};
+export declare class TinaFetchError extends Error {
+    stack?: string;
+    collection?: string;
+    file?: string;
+    originalError: Error;
+    constructor(message: string, args: TypeFetchErrorArgs);
+}
+export declare class TinaQueryError extends TinaFetchError {
+    stack?: string;
+    collection?: string;
+    file?: string;
+    originalError: Error;
+    constructor(args: TypeFetchErrorArgs);
+}
+export declare class TinaParseDocumentError extends TinaFetchError {
+    stack?: string;
+    collection?: string;
+    file?: string;
+    originalError: Error;
+    constructor(args: TypeFetchErrorArgs);
+    toString(): string;
+}
+export declare const handleFetchErrorError: (e: unknown, verbose: any) => never;

package/dist/resolver/media-utils.d.ts

@@ -10,7 +10,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-import { GraphQLConfig } from '../types';
+import type { GraphQLConfig } from '../types';
+import type { TinaCloudSchemaEnriched } from '@tinacms/schema-tools';
 /**
  * Strips away the Tina Cloud Asset URL from an `image` value
  *
@@ -18,7 +19,7 @@ import { GraphQLConfig } from '../types';
  * @param {GraphQLConfig} config
  * @returns {string}
  */
-export declare const resolveMediaCloudToRelative: (value: string, config?: GraphQLConfig) => string;
+export declare const resolveMediaCloudToRelative: (value: string, config: GraphQLConfig, schema: TinaCloudSchemaEnriched) => string;
 /**
  * Adds Tina Cloud Asset URL to an `image` value
  *
@@ -26,4 +27,4 @@ export declare const resolveMediaCloudToRelative: (value: string, config?: Graph
  * @param {GraphQLConfig} config
  * @returns {string}
  */
-export declare const resolveMediaRelativeToCloud: (value: string, config?: GraphQLConfig) => string;
+export declare const resolveMediaRelativeToCloud: (value: string, config: GraphQLConfig, schema: TinaCloudSchemaEnriched) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "0.60.6",
+  "version": "0.60.7",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -98,8 +98,8 @@
   },
   "devDependencies": {
     "@tinacms/datalayer": "0.1.1",
-    "@tinacms/schema-tools": "0.0.4",
-    "@tinacms/scripts": "0.50.7",
+    "@tinacms/schema-tools": "0.0.5",
+    "@tinacms/scripts": "0.50.8",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",
     "@types/express": "^4.17.8",