@tinacms/graphql 1.4.25 → 1.4.27

package/LICENSE

@@ -1,37 +1,176 @@
-This license is based on the Fair Source License, version 0.9, with explanatory changes to the Use Limitation.
-
-Copyright ©2023 Forestry.io Holdings Inc. 
-Licensor: Forestry.io Holdings Inc. 
-Software: Tina Data Layer
-Use Limitation: 5 users, 2 roles, and 500 documents per website
-
-License Grant. 
-Licensor hereby grants to each recipient of the Software (“you”) a non-exclusive, non-transferable, royalty-free 
-and fully-paid-up license, under all of the Licensor’s copyright and patent rights, to use, copy, distribute, 
-prepare derivative works of, publicly perform and display the Software, subject to the Use Limitation and the 
-conditions set forth below.
-
-Use Limitation. 
-The license granted above allows use by up to the number of users, roles, and documents, per website  set forth 
-above (the “Use Limitation”). You may only use one copy of the software per website. For determining the number of 
-users, roles, and documents, “you” includes all affiliates, meaning legal entities controlling, controlled by, or 
-under common control with you. If you exceed the Use Limitation, your use is subject to payment of Licensor’s 
-then-current list price for licenses.
-
-Conditions. 
-Redistribution in source code or other forms must include a copy of this license document to be provided in a 
-reasonable manner. Any redistribution of the Software is only allowed subject to this license.
-
-Trademarks. 
-This license does not grant you any right in the trademarks, service marks, brand names or logos of Licensor.
-
-DISCLAIMER. 
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OR CONDITION, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED 
-TO WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. LICENSORS HEREBY DISCLAIM 
-ALL LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-SOFTWARE.
-
-Termination. 
-If you violate the terms of this license, your rights will terminate automatically and will not be 
-reinstated without the prior written consent of Licensor. Any such termination will not affect the right of others 
-who may have received copies of the Software from you.
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

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/git/index.d.ts

@@ -16,3 +16,8 @@ export declare const getChangedFiles: ({ fs, dir, from, to, pathFilter, }: {
     modified: any[];
     deleted: any[];
 }>;
+export declare const shaExists: ({ fs, dir, sha, }: {
+    fs: CallbackFsClient | PromiseFsClient;
+    dir: string;
+    sha: string;
+}) => Promise<boolean>;

package/dist/index.d.ts

@@ -7,7 +7,7 @@ export { createDatabase } from './database';
 export { TinaLevelClient } from './level/tinaLevel';
 export type { QueryOptions, Database, OnDeleteCallback, OnPutCallback, CreateDatabase, } from './database';
 import type { Config } from '@tinacms/schema-tools';
-export { getChangedFiles, getSha } from './git';
+export { getChangedFiles, getSha, shaExists } from './git';
 export { sequential, assertShape } from './util';
 export { loadAndParseWithAliases, stringifyFile, parseFile, scanAllContent, scanContentByPaths, transformDocument, } from './database/util';
 export { createSchema } from './schema/createSchema';

package/dist/index.js

@@ -47,6 +47,7 @@ __export(src_exports, {
   scanAllContent: () => scanAllContent,
   scanContentByPaths: () => scanContentByPaths,
   sequential: () => sequential,
+  shaExists: () => shaExists,
   stringifyFile: () => stringifyFile,
   transformDocument: () => transformDocument,
   transformDocumentIntoPayload: () => transformDocumentIntoPayload
@@ -1573,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);
@@ -1591,6 +1597,10 @@ var Builder = class {
     this._getCollectionFragmentSelections = async (collection, depth) => {
       var _a;
       const selections = [];
+      selections.push({
+        name: { kind: "Name", value: "__typename" },
+        kind: "Field"
+      });
       if (((_a = collection.fields) == null ? void 0 : _a.length) > 0) {
         await sequential(collection.fields, async (x) => {
           const field = await this._buildFieldNodeForFragments(x, depth);
@@ -2585,7 +2595,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.25",
+  version: "1.4.27",
   main: "dist/index.js",
   module: "dist/index.mjs",
   typings: "dist/index.d.ts",
@@ -2858,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"));
@@ -3337,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 = [];
@@ -4464,7 +4478,7 @@ var Resolver = class {
       isCollectionSpecific
     }) => {
       const doc = await this.getDocument(realPath);
-      const oldDoc = (doc == null ? void 0 : doc._rawData) || {};
+      const oldDoc = this.resolveLegacyValues((doc == null ? void 0 : doc._rawData) || {}, collection);
       if (isAddPendingDocument === true) {
         const templateInfo = this.tinaSchema.getTemplatesForCollectable(collection);
         const params2 = this.buildParams(args);
@@ -4509,6 +4523,38 @@ var Resolver = class {
       await this.database.put(realPath, { ...oldDoc, ...params }, collection.name);
       return this.getDocument(realPath);
     };
+    this.resolveLegacyValues = (oldDoc, collection) => {
+      const legacyValues = {};
+      Object.entries(oldDoc).forEach(([key, value]) => {
+        var _a;
+        const reservedKeys = [
+          "$_body",
+          "_collection",
+          "_keepTemplateKey",
+          "_template",
+          "_relativePath",
+          "_id"
+        ];
+        if (reservedKeys.includes(key)) {
+          return;
+        }
+        if (oldDoc._template) {
+          const template = (_a = collection.templates) == null ? void 0 : _a.find(
+            ({ name }) => name === oldDoc._template
+          );
+          if (template) {
+            if (!template.fields.find(({ name }) => name === key)) {
+              legacyValues[key] = value;
+            }
+          }
+        } else {
+          if (!collection.fields.find(({ name }) => name === key)) {
+            legacyValues[key] = value;
+          }
+        }
+      });
+      return legacyValues;
+    };
     this.resolveDocument = async ({
       args,
       collection: collectionName,
@@ -4821,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,
@@ -4836,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,
@@ -4850,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,
@@ -4860,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];
@@ -4872,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];
@@ -5035,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);
+            }
           }
         });
       }
@@ -5049,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]
       };
@@ -5061,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) => {
@@ -5107,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,
@@ -5121,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,
@@ -5137,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,
@@ -5219,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.`
@@ -5243,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,
@@ -5314,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}`, {
@@ -5822,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,
@@ -5888,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) {
@@ -5950,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) => {
@@ -6188,6 +6246,11 @@ var getChangedFiles = async ({
   });
   return results;
 };
+var shaExists = async ({
+  fs: fs4,
+  dir,
+  sha: sha3
+}) => import_isomorphic_git.default.readCommit({ fs: fs4, dir, oid: sha3 }).then(() => true).catch(() => false);
 
 // src/database/bridge/filesystem.ts
 var import_fs_extra2 = __toESM(require("fs-extra"));
@@ -6245,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) => {
@@ -6451,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,
@@ -6542,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,
@@ -6658,6 +6721,7 @@ var buildSchema = async (config, flags) => {
   scanAllContent,
   scanContentByPaths,
   sequential,
+  shaExists,
   stringifyFile,
   transformDocument,
   transformDocumentIntoPayload

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);
@@ -1535,6 +1540,10 @@ var Builder = class {
     };
     this._getCollectionFragmentSelections = async (collection, depth) => {
       const selections = [];
+      selections.push({
+        name: { kind: "Name", value: "__typename" },
+        kind: "Field"
+      });
       if (collection.fields?.length > 0) {
         await sequential(collection.fields, async (x) => {
           const field = await this._buildFieldNodeForFragments(x, depth);
@@ -2526,7 +2535,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.25",
+  version: "1.4.27",
   main: "dist/index.js",
   module: "dist/index.mjs",
   typings: "dist/index.d.ts",
@@ -2798,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";
@@ -3274,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 = [];
@@ -4400,7 +4413,7 @@ var Resolver = class {
       isCollectionSpecific
     }) => {
       const doc = await this.getDocument(realPath);
-      const oldDoc = doc?._rawData || {};
+      const oldDoc = this.resolveLegacyValues(doc?._rawData || {}, collection);
       if (isAddPendingDocument === true) {
         const templateInfo = this.tinaSchema.getTemplatesForCollectable(collection);
         const params2 = this.buildParams(args);
@@ -4445,6 +4458,37 @@ var Resolver = class {
       await this.database.put(realPath, { ...oldDoc, ...params }, collection.name);
       return this.getDocument(realPath);
     };
+    this.resolveLegacyValues = (oldDoc, collection) => {
+      const legacyValues = {};
+      Object.entries(oldDoc).forEach(([key, value]) => {
+        const reservedKeys = [
+          "$_body",
+          "_collection",
+          "_keepTemplateKey",
+          "_template",
+          "_relativePath",
+          "_id"
+        ];
+        if (reservedKeys.includes(key)) {
+          return;
+        }
+        if (oldDoc._template) {
+          const template = collection.templates?.find(
+            ({ name }) => name === oldDoc._template
+          );
+          if (template) {
+            if (!template.fields.find(({ name }) => name === key)) {
+              legacyValues[key] = value;
+            }
+          }
+        } else {
+          if (!collection.fields.find(({ name }) => name === key)) {
+            legacyValues[key] = value;
+          }
+        }
+      });
+      return legacyValues;
+    };
     this.resolveDocument = async ({
       args,
       collection: collectionName,
@@ -4757,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,
@@ -4771,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();
@@ -4967,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);
+            }
           }
         });
       }
@@ -4981,7 +5037,7 @@ var resolve = async ({
     if (!silenceErrors) {
       console.error(e);
     }
-    if (e instanceof GraphQLError3) {
+    if (e instanceof GraphQLError4) {
       return {
         errors: [e]
       };
@@ -4993,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) => {
@@ -5039,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,
@@ -5053,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,
@@ -5069,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,
@@ -5150,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.`
@@ -5174,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,
@@ -5245,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}`, {
@@ -5752,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,
@@ -5818,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) {
@@ -5880,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) => {
@@ -6118,6 +6174,11 @@ var getChangedFiles = async ({
   });
   return results;
 };
+var shaExists = async ({
+  fs: fs4,
+  dir,
+  sha: sha3
+}) => git.readCommit({ fs: fs4, dir, oid: sha3 }).then(() => true).catch(() => false);
 
 // src/database/bridge/filesystem.ts
 import fs2 from "fs-extra";
@@ -6175,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) => {
@@ -6381,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,
@@ -6472,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,
@@ -6587,6 +6648,7 @@ export {
   scanAllContent,
   scanContentByPaths,
   sequential,
+  shaExists,
   stringifyFile,
   transformDocument,
   transformDocumentIntoPayload

package/dist/resolver/index.d.ts

@@ -228,6 +228,11 @@ export declare class Resolver {
         __typename: string;
         id: string;
     }>;
+    /**
+     * Returns top-level fields which are not defined in the collection, so their
+     * values are not eliminated from Tina when new values are saved
+     */
+    resolveLegacyValues: (oldDoc: any, collection: Collection<true>) => {};
     resolveDocument: ({ args, collection: collectionName, isMutation, isCreation, isDeletion, isAddPendingDocument, isCollectionSpecific, isUpdateName, }: {
         args: unknown;
         collection?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "1.4.25",
+  "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.18",
-    "@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",