@tinacms/graphql 1.4.26 → 1.4.27

package/dist/error.d.ts

@@ -0,0 +1,4 @@
+import { ASTNode, GraphQLError, GraphQLErrorExtensions, Source } from 'graphql';
+export declare class NotFoundError extends GraphQLError {
+    constructor(message: string, nodes?: ASTNode | readonly ASTNode[], source?: Source, positions?: readonly number[], path?: readonly (string | number)[], originalError?: Error, extensions?: GraphQLErrorExtensions);
+}

package/dist/index.js

@@ -1574,7 +1574,12 @@ var Builder = class {
         [NAMER.createName([collection.name])]: "create",
         [NAMER.updateName([collection.name])]: "update"
       });
-      return astBuilder.FieldDefinition({ type, name, args, required: true });
+      return astBuilder.FieldDefinition({
+        type,
+        name,
+        args,
+        required: true
+      });
     };
     this.collectionFragment = async (collection) => {
       const name = NAMER.dataTypeName(collection.namespace);
@@ -2590,7 +2595,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.26",
+  version: "1.4.27",
   main: "dist/index.js",
   module: "dist/index.mjs",
   typings: "dist/index.d.ts",
@@ -2863,7 +2868,7 @@ var _buildSchema = async (builder, tinaSchema) => {
 };
 
 // src/resolve.ts
-var import_graphql4 = require("graphql");
+var import_graphql5 = require("graphql");
 
 // src/resolver/index.ts
 var import_path3 = __toESM(require("path"));
@@ -3342,40 +3347,44 @@ ${$_body}`,
 };
 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}`);
+  try {
+    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);
+    }
+  } catch (e) {
+    console.error(e);
+    throw e;
   }
+  throw new Error(`Must specify a valid format, got ${format}`);
 };
 var scanAllContent = async (tinaSchema, bridge, callback) => {
   const warnings = [];
@@ -4858,6 +4867,15 @@ var resolveDateInput = (value) => {
   return date;
 };
 
+// src/error.ts
+var import_graphql4 = require("graphql");
+var NotFoundError = class extends import_graphql4.GraphQLError {
+  constructor(message, nodes, source, positions, path7, originalError, extensions) {
+    super(message, nodes, source, positions, path7, originalError, extensions);
+    this.name = "NotFoundError";
+  }
+};
+
 // src/resolve.ts
 var resolve = async ({
   config,
@@ -4873,9 +4891,9 @@ var resolve = async ({
     const verboseValue = verbose != null ? verbose : true;
     const graphQLSchemaAst = await database.getGraphQLSchema();
     if (!graphQLSchemaAst) {
-      throw new import_graphql4.GraphQLError(`GraphQL schema not found`);
+      throw new import_graphql5.GraphQLError(`GraphQL schema not found`);
     }
-    const graphQLSchema = (0, import_graphql4.buildASTSchema)(graphQLSchemaAst);
+    const graphQLSchema = (0, import_graphql5.buildASTSchema)(graphQLSchemaAst);
     const tinaConfig = await database.getTinaSchema();
     const tinaSchema = await createSchema({
       schema: tinaConfig,
@@ -4887,7 +4905,7 @@ var resolve = async ({
       tinaSchema,
       isAudit: isAudit || false
     });
-    const res = await (0, import_graphql4.graphql)({
+    const res = await (0, import_graphql5.graphql)({
       schema: graphQLSchema,
       source: query,
       variableValues: variables,
@@ -4897,7 +4915,7 @@ var resolve = async ({
       typeResolver: async (source, _args, info) => {
         if (source.__typename)
           return source.__typename;
-        const namedType = (0, import_graphql4.getNamedType)(info.returnType).toString();
+        const namedType = (0, import_graphql5.getNamedType)(info.returnType).toString();
         const lookup = await database.getLookup(namedType);
         if (lookup.resolveType === "unionData") {
           return lookup.typeMap[source._template];
@@ -4909,7 +4927,7 @@ var resolve = async ({
         var _a2, _b, _c, _d;
         try {
           const args = JSON.parse(JSON.stringify(_args));
-          const returnType = (0, import_graphql4.getNamedType)(info.returnType).toString();
+          const returnType = (0, import_graphql5.getNamedType)(info.returnType).toString();
           const lookup = await database.getLookup(returnType);
           const isMutation = info.parentType.toString() === "Mutation";
           const value = source[info.fieldName];
@@ -5072,11 +5090,14 @@ var resolve = async ({
     if (res.errors) {
       if (!silenceErrors) {
         res.errors.map((e) => {
-          console.error(e.toString());
-          if (verboseValue) {
-            console.error("More error context below");
-            console.error(e.message);
-            console.error(e);
+          if (e instanceof NotFoundError) {
+          } else {
+            console.error(e.toString());
+            if (verboseValue) {
+              console.error("More error context below");
+              console.error(e.message);
+              console.error(e);
+            }
           }
         });
       }
@@ -5086,7 +5107,7 @@ var resolve = async ({
     if (!silenceErrors) {
       console.error(e);
     }
-    if (e instanceof import_graphql4.GraphQLError) {
+    if (e instanceof import_graphql5.GraphQLError) {
       return {
         errors: [e]
       };
@@ -5098,7 +5119,7 @@ var resolve = async ({
 
 // src/database/index.ts
 var import_path4 = __toESM(require("path"));
-var import_graphql5 = require("graphql");
+var import_graphql6 = require("graphql");
 var import_micromatch2 = __toESM(require("micromatch"));
 var import_js_sha12 = __toESM(require("js-sha1"));
 var createDatabase = (config) => {
@@ -5144,7 +5165,7 @@ var Database = class {
           SUBLEVEL_OPTIONS
         ).get((0, import_schema_tools3.normalizePath)(filepath));
         if (!contentObject) {
-          throw new import_graphql5.GraphQLError(`Unable to find record ${filepath}`);
+          throw new NotFoundError(`Unable to find record ${filepath}`);
         }
         return transformDocument(
           filepath,
@@ -5158,7 +5179,7 @@ var Database = class {
       const dataFields = await this.formatBodyOnPayload(filepath, data);
       const collection = await this.collectionForPath(filepath);
       if (!collection) {
-        throw new import_graphql5.GraphQLError(`Unable to find collection for ${filepath}`);
+        throw new import_graphql6.GraphQLError(`Unable to find collection for ${filepath}`);
       }
       const stringifiedFile = await this.stringifyFile(
         filepath,
@@ -5174,7 +5195,7 @@ var Database = class {
       try {
         await this.onPut(normalizedPath, stringifiedFile);
       } catch (e) {
-        throw new import_graphql5.GraphQLError(
+        throw new import_graphql6.GraphQLError(
           `Error running onPut hook for ${filepath}: ${e}`,
           null,
           null,
@@ -5256,13 +5277,13 @@ var Database = class {
           const dataFields = await this.formatBodyOnPayload(filepath, data);
           const collection = await this.collectionForPath(filepath);
           if (!collection) {
-            throw new import_graphql5.GraphQLError(`Unable to find collection for ${filepath}.`);
+            throw new import_graphql6.GraphQLError(`Unable to find collection for ${filepath}.`);
           }
           if (((_a = collection.match) == null ? void 0 : _a.exclude) || ((_b = collection.match) == null ? void 0 : _b.include)) {
             const matches = this.tinaSchema.getMatches({ collection });
             const match = import_micromatch2.default.isMatch(filepath, matches);
             if (!match) {
-              throw new import_graphql5.GraphQLError(
+              throw new import_graphql6.GraphQLError(
                 `File ${filepath} does not match collection ${collection.name} glob ${matches.join(
                   ","
                 )}. Please change the filename or update matches for ${collection.name} in your config file.`
@@ -5280,7 +5301,7 @@ var Database = class {
           try {
             await this.onPut(normalizedPath, stringifiedFile);
           } catch (e) {
-            throw new import_graphql5.GraphQLError(
+            throw new import_graphql6.GraphQLError(
               `Error running onPut hook for ${filepath}: ${e}`,
               null,
               null,
@@ -5351,7 +5372,7 @@ var Database = class {
         }
         return true;
       } catch (error) {
-        if (error instanceof import_graphql5.GraphQLError) {
+        if (error instanceof import_graphql6.GraphQLError) {
           throw error;
         }
         throw new TinaFetchError(`Error in PUT for ${filepath}`, {
@@ -5859,7 +5880,7 @@ var Database = class {
       try {
         await this.onDelete((0, import_schema_tools3.normalizePath)(filepath));
       } catch (e) {
-        throw new import_graphql5.GraphQLError(
+        throw new import_graphql6.GraphQLError(
           `Error running onDelete hook for ${filepath}: ${e}`,
           null,
           null,
@@ -5925,7 +5946,7 @@ var Database = class {
       this.level = this.rootLevel.sublevel(version, SUBLEVEL_OPTIONS);
     }
     if (!this.level) {
-      throw new import_graphql5.GraphQLError("Error initializing LevelDB instance");
+      throw new import_graphql6.GraphQLError("Error initializing LevelDB instance");
     }
   }
   async getTemplateDetailsForFile(collection, data) {
@@ -5987,7 +6008,7 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
   const tinaSchema = await database.getSchema();
   let templateInfo = null;
   if (collection) {
-    templateInfo = await tinaSchema.getTemplatesForCollectable(collection);
+    templateInfo = tinaSchema.getTemplatesForCollectable(collection);
   }
   const folderTreeBuilder = new FolderTreeBuilder();
   await sequential(documentPaths, async (filepath) => {
@@ -6287,7 +6308,7 @@ var import_isomorphic_git2 = __toESM(require("isomorphic-git"));
 var import_fs_extra3 = __toESM(require("fs-extra"));
 var import_glob_parent = __toESM(require("glob-parent"));
 var import_normalize_path2 = __toESM(require("normalize-path"));
-var import_graphql6 = require("graphql");
+var import_graphql7 = require("graphql");
 var import_path7 = require("path");
 var flat = typeof Array.prototype.flat === "undefined" ? (entries) => entries.reduce((acc, x) => acc.concat(x), []) : (entries) => entries.flat();
 var toUint8Array = (buf) => {
@@ -6493,7 +6514,7 @@ var IsomorphicBridge = class {
       fullname: true
     });
     if (!ref) {
-      throw new import_graphql6.GraphQLError(
+      throw new import_graphql7.GraphQLError(
         `Unable to determine current branch from HEAD`,
         null,
         null,
@@ -6584,7 +6605,7 @@ var IsomorphicBridge = class {
         await this.commitTree(updatedRootTreeOid, ref);
         break;
       } else {
-        throw new import_graphql6.GraphQLError(
+        throw new import_graphql7.GraphQLError(
           `Unable to resolve path: ${filepath}`,
           null,
           null,

package/dist/index.mjs

@@ -1518,7 +1518,12 @@ var Builder = class {
         [NAMER.createName([collection.name])]: "create",
         [NAMER.updateName([collection.name])]: "update"
       });
-      return astBuilder.FieldDefinition({ type, name, args, required: true });
+      return astBuilder.FieldDefinition({
+        type,
+        name,
+        args,
+        required: true
+      });
     };
     this.collectionFragment = async (collection) => {
       const name = NAMER.dataTypeName(collection.namespace);
@@ -2530,7 +2535,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.26",
+  version: "1.4.27",
   main: "dist/index.js",
   module: "dist/index.mjs",
   typings: "dist/index.d.ts",
@@ -2802,7 +2807,7 @@ var _buildSchema = async (builder, tinaSchema) => {
 };
 
 // src/resolve.ts
-import { graphql, buildASTSchema, getNamedType, GraphQLError as GraphQLError3 } from "graphql";
+import { graphql, buildASTSchema, getNamedType, GraphQLError as GraphQLError4 } from "graphql";
 
 // src/resolver/index.ts
 import path3 from "path";
@@ -3278,40 +3283,44 @@ ${$_body}`,
   }
 };
 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}`);
+  try {
+    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);
+    }
+  } catch (e) {
+    console.error(e);
+    throw e;
   }
+  throw new Error(`Must specify a valid format, got ${format}`);
 };
 var scanAllContent = async (tinaSchema, bridge, callback) => {
   const warnings = [];
@@ -4792,6 +4801,15 @@ var resolveDateInput = (value) => {
   return date;
 };
 
+// src/error.ts
+import { GraphQLError as GraphQLError3 } from "graphql";
+var NotFoundError = class extends GraphQLError3 {
+  constructor(message, nodes, source, positions, path7, originalError, extensions) {
+    super(message, nodes, source, positions, path7, originalError, extensions);
+    this.name = "NotFoundError";
+  }
+};
+
 // src/resolve.ts
 var resolve = async ({
   config,
@@ -4806,7 +4824,7 @@ var resolve = async ({
     const verboseValue = verbose ?? true;
     const graphQLSchemaAst = await database.getGraphQLSchema();
     if (!graphQLSchemaAst) {
-      throw new GraphQLError3(`GraphQL schema not found`);
+      throw new GraphQLError4(`GraphQL schema not found`);
     }
     const graphQLSchema = buildASTSchema(graphQLSchemaAst);
     const tinaConfig = await database.getTinaSchema();
@@ -5002,11 +5020,14 @@ var resolve = async ({
     if (res.errors) {
       if (!silenceErrors) {
         res.errors.map((e) => {
-          console.error(e.toString());
-          if (verboseValue) {
-            console.error("More error context below");
-            console.error(e.message);
-            console.error(e);
+          if (e instanceof NotFoundError) {
+          } else {
+            console.error(e.toString());
+            if (verboseValue) {
+              console.error("More error context below");
+              console.error(e.message);
+              console.error(e);
+            }
           }
         });
       }
@@ -5016,7 +5037,7 @@ var resolve = async ({
     if (!silenceErrors) {
       console.error(e);
     }
-    if (e instanceof GraphQLError3) {
+    if (e instanceof GraphQLError4) {
       return {
         errors: [e]
       };
@@ -5028,7 +5049,7 @@ var resolve = async ({
 
 // src/database/index.ts
 import path4 from "path";
-import { GraphQLError as GraphQLError4 } from "graphql";
+import { GraphQLError as GraphQLError5 } from "graphql";
 import micromatch2 from "micromatch";
 import sha2 from "js-sha1";
 var createDatabase = (config) => {
@@ -5074,7 +5095,7 @@ var Database = class {
           SUBLEVEL_OPTIONS
         ).get(normalizePath(filepath));
         if (!contentObject) {
-          throw new GraphQLError4(`Unable to find record ${filepath}`);
+          throw new NotFoundError(`Unable to find record ${filepath}`);
         }
         return transformDocument(
           filepath,
@@ -5088,7 +5109,7 @@ var Database = class {
       const dataFields = await this.formatBodyOnPayload(filepath, data);
       const collection = await this.collectionForPath(filepath);
       if (!collection) {
-        throw new GraphQLError4(`Unable to find collection for ${filepath}`);
+        throw new GraphQLError5(`Unable to find collection for ${filepath}`);
       }
       const stringifiedFile = await this.stringifyFile(
         filepath,
@@ -5104,7 +5125,7 @@ var Database = class {
       try {
         await this.onPut(normalizedPath, stringifiedFile);
       } catch (e) {
-        throw new GraphQLError4(
+        throw new GraphQLError5(
           `Error running onPut hook for ${filepath}: ${e}`,
           null,
           null,
@@ -5185,13 +5206,13 @@ var Database = class {
           const dataFields = await this.formatBodyOnPayload(filepath, data);
           const collection = await this.collectionForPath(filepath);
           if (!collection) {
-            throw new GraphQLError4(`Unable to find collection for ${filepath}.`);
+            throw new GraphQLError5(`Unable to find collection for ${filepath}.`);
           }
           if (collection.match?.exclude || collection.match?.include) {
             const matches = this.tinaSchema.getMatches({ collection });
             const match = micromatch2.isMatch(filepath, matches);
             if (!match) {
-              throw new GraphQLError4(
+              throw new GraphQLError5(
                 `File ${filepath} does not match collection ${collection.name} glob ${matches.join(
                   ","
                 )}. Please change the filename or update matches for ${collection.name} in your config file.`
@@ -5209,7 +5230,7 @@ var Database = class {
           try {
             await this.onPut(normalizedPath, stringifiedFile);
           } catch (e) {
-            throw new GraphQLError4(
+            throw new GraphQLError5(
               `Error running onPut hook for ${filepath}: ${e}`,
               null,
               null,
@@ -5280,7 +5301,7 @@ var Database = class {
         }
         return true;
       } catch (error) {
-        if (error instanceof GraphQLError4) {
+        if (error instanceof GraphQLError5) {
           throw error;
         }
         throw new TinaFetchError(`Error in PUT for ${filepath}`, {
@@ -5787,7 +5808,7 @@ var Database = class {
       try {
         await this.onDelete(normalizePath(filepath));
       } catch (e) {
-        throw new GraphQLError4(
+        throw new GraphQLError5(
           `Error running onDelete hook for ${filepath}: ${e}`,
           null,
           null,
@@ -5853,7 +5874,7 @@ var Database = class {
       this.level = this.rootLevel.sublevel(version, SUBLEVEL_OPTIONS);
     }
     if (!this.level) {
-      throw new GraphQLError4("Error initializing LevelDB instance");
+      throw new GraphQLError5("Error initializing LevelDB instance");
     }
   }
   async getTemplateDetailsForFile(collection, data) {
@@ -5915,7 +5936,7 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
   const tinaSchema = await database.getSchema();
   let templateInfo = null;
   if (collection) {
-    templateInfo = await tinaSchema.getTemplatesForCollectable(collection);
+    templateInfo = tinaSchema.getTemplatesForCollectable(collection);
   }
   const folderTreeBuilder = new FolderTreeBuilder();
   await sequential(documentPaths, async (filepath) => {
@@ -6215,7 +6236,7 @@ import git2 from "isomorphic-git";
 import fs3 from "fs-extra";
 import globParent from "glob-parent";
 import normalize2 from "normalize-path";
-import { GraphQLError as GraphQLError5 } from "graphql";
+import { GraphQLError as GraphQLError6 } from "graphql";
 import { dirname } from "path";
 var flat = typeof Array.prototype.flat === "undefined" ? (entries) => entries.reduce((acc, x) => acc.concat(x), []) : (entries) => entries.flat();
 var toUint8Array = (buf) => {
@@ -6421,7 +6442,7 @@ var IsomorphicBridge = class {
       fullname: true
     });
     if (!ref) {
-      throw new GraphQLError5(
+      throw new GraphQLError6(
         `Unable to determine current branch from HEAD`,
         null,
         null,
@@ -6512,7 +6533,7 @@ var IsomorphicBridge = class {
         await this.commitTree(updatedRootTreeOid, ref);
         break;
       } else {
-        throw new GraphQLError5(
+        throw new GraphQLError6(
           `Unable to resolve path: ${filepath}`,
           null,
           null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "1.4.26",
+  "version": "1.4.27",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "typings": "dist/index.d.ts",
@@ -24,8 +24,8 @@
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",
-    "@tinacms/mdx": "1.3.19",
-    "@tinacms/schema-tools": "1.4.12",
+    "@tinacms/mdx": "1.3.20",
+    "@tinacms/schema-tools": "1.4.13",
     "abstract-level": "^1.0.3",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
@@ -57,7 +57,7 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
-    "@tinacms/schema-tools": "1.4.12",
+    "@tinacms/schema-tools": "1.4.13",
     "@tinacms/scripts": "1.1.2",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",