@tinacms/graphql 0.0.0-20230922191950 → 0.0.0-20230922192012

package/dist/index.js

@@ -4465,7 +4465,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);
@@ -4510,6 +4510,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,

package/dist/index.mjs

@@ -4400,7 +4400,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 +4445,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,

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": "0.0.0-20230922191950",
+  "version": "0.0.0-20230922192012",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "typings": "dist/index.d.ts",
@@ -24,8 +24,6 @@
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",
-    "@tinacms/mdx": "0.0.0-20230922191950",
-    "@tinacms/schema-tools": "1.4.12",
     "abstract-level": "^1.0.3",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
@@ -47,7 +45,9 @@
     "micromatch": "4.0.5",
     "normalize-path": "^3.0.0",
     "readable-stream": "^4.3.0",
-    "yup": "^0.32.9"
+    "yup": "^0.32.9",
+    "@tinacms/mdx": "0.0.0-20230922192012",
+    "@tinacms/schema-tools": "1.4.12"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -57,8 +57,6 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
-    "@tinacms/schema-tools": "1.4.12",
-    "@tinacms/scripts": "1.1.2",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",
     "@types/express": "^4.17.8",
@@ -81,7 +79,9 @@
     "jest-matcher-utils": "^29.5.0",
     "memory-level": "^1.0.0",
     "nodemon": "2.0.19",
-    "typescript": "4.3.5"
+    "typescript": "4.3.5",
+    "@tinacms/schema-tools": "1.4.12",
+    "@tinacms/scripts": "1.1.2"
   },
   "scripts": {
     "types": "pnpm tsc",