@tinacms/graphql 0.0.0-db8aa8e-20250228034006 → 0.0.0-df15737-20250329200825

package/dist/index.d.ts

@@ -1,32 +1 @@
-import type { Schema, Collection, Template as TinaTemplate } from '@tinacms/schema-tools';
-import { buildDotTinaFiles } from './build';
-export { resolve } from './resolve';
-export { transformDocumentIntoPayload } from './resolver';
-export * from './resolver/error';
-export { TinaLevelClient } from './level/tinaLevel';
-export type { Level } from './database/level';
-export type { QueryOptions, OnDeleteCallback, OnPutCallback, DatabaseArgs, GitProvider, CreateDatabase, } from './database';
-export { Database, createDatabaseInternal, createDatabase, createLocalDatabase, } from './database';
-import type { Config } from '@tinacms/schema-tools';
-export { getChangedFiles, getSha, shaExists } from './git';
-export * from './auth/utils';
-export { sequential, assertShape } from './util';
-export { loadAndParseWithAliases, stringifyFile, parseFile, scanAllContent, scanContentByPaths, transformDocument, } from './database/util';
-export { createSchema } from './schema/createSchema';
-export { buildDotTinaFiles };
-export type DummyType = unknown;
-export declare const buildSchema: (config: Config, flags?: string[]) => Promise<{
-    graphQLSchema: {
-        kind: "Document";
-        definitions: any;
-    };
-    tinaSchema: import("@tinacms/schema-tools").TinaSchema;
-    lookup: Record<string, import("./database").LookupMapType>;
-    fragDoc: string;
-    queryDoc: string;
-}>;
-export type TinaSchema = Schema;
-export type { TinaTemplate, Schema, Collection };
-export { FilesystemBridge, AuditFileSystemBridge, } from './database/bridge/filesystem';
-export { IsomorphicBridge } from './database/bridge/isomorphic';
-export type { Bridge } from './database/bridge';
+export * from "../src/index"

package/dist/index.js

@@ -3090,7 +3090,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.5.13",
+  version: "1.5.15",
   main: "dist/index.js",
   module: "dist/index.mjs",
   typings: "dist/index.d.ts",
@@ -3332,7 +3332,9 @@ var _buildSchema = async (builder, tinaSchema) => {
     await builder.buildCreateCollectionFolderMutation()
   );
   await sequential(collections, async (collection) => {
-    queryTypeDefinitionFields.push(await builder.collectionDocument(collection));
+    queryTypeDefinitionFields.push(
+      await builder.collectionDocument(collection)
+    );
     if (collection.isAuthCollection) {
       queryTypeDefinitionFields.push(
         await builder.authenticationCollectionDocument(collection)
@@ -3648,7 +3650,9 @@ var LevelProxyHandler = {
       throw new Error(`The property, ${property.toString()}, doesn't exist`);
     }
     if (typeof target[property] !== "function") {
-      throw new Error(`The property, ${property.toString()}, is not a function`);
+      throw new Error(
+        `The property, ${property.toString()}, is not a function`
+      );
     }
     if (property === "get") {
       return async (...args) => {
@@ -4626,8 +4630,14 @@ var makeRefOpsForDocument = (filepath, collection, references, data, opType, lev
       const references2 = {};
       for (const path7 of referencePaths) {
         const ref = (0, import_jsonpath_plus.JSONPath)({ path: path7, json: data });
+        if (!ref) {
+          continue;
+        }
         if (Array.isArray(ref)) {
           for (const r of ref) {
+            if (!r) {
+              continue;
+            }
             if (references2[r]) {
               references2[r].push(path7);
             } else {
@@ -4878,25 +4888,32 @@ var transformDocumentIntoPayload = async (fullPath, rawData, tinaSchema, config,
   }
 };
 var updateObjectWithJsonPath = (obj, path7, oldValue, newValue) => {
+  let updated = false;
   if (!path7.includes(".") && !path7.includes("[")) {
     if (path7 in obj && obj[path7] === oldValue) {
       obj[path7] = newValue;
+      updated = true;
     }
-    return obj;
+    return { object: obj, updated };
   }
   const parentPath = path7.replace(/\.[^.\[\]]+$/, "");
   const keyToUpdate = path7.match(/[^.\[\]]+$/)[0];
-  const parents = (0, import_jsonpath_plus2.JSONPath)({ path: parentPath, json: obj, resultType: "value" });
+  const parents = (0, import_jsonpath_plus2.JSONPath)({
+    path: parentPath,
+    json: obj,
+    resultType: "value"
+  });
   if (parents.length > 0) {
     parents.forEach((parent) => {
       if (parent && typeof parent === "object" && keyToUpdate in parent) {
         if (parent[keyToUpdate] === oldValue) {
           parent[keyToUpdate] = newValue;
+          updated = true;
         }
       }
     });
   }
-  return obj;
+  return { object: obj, updated };
 };
 var Resolver = class {
   constructor(init) {
@@ -4913,7 +4930,9 @@ var Resolver = class {
     };
     this.getRaw = async (fullPath) => {
       if (typeof fullPath !== "string") {
-        throw new Error(`fullPath must be of type string for getDocument request`);
+        throw new Error(
+          `fullPath must be of type string for getDocument request`
+        );
       }
       return this.database.get(fullPath);
     };
@@ -4942,7 +4961,9 @@ var Resolver = class {
     };
     this.getDocument = async (fullPath, opts = {}) => {
       if (typeof fullPath !== "string") {
-        throw new Error(`fullPath must be of type string for getDocument request`);
+        throw new Error(
+          `fullPath must be of type string for getDocument request`
+        );
       }
       const rawData = await this.getRaw(fullPath);
       const hasReferences = (opts == null ? void 0 : opts.checkReferences) ? await this.hasReferences(fullPath, opts.collection) : void 0;
@@ -4957,7 +4978,9 @@ var Resolver = class {
     };
     this.deleteDocument = async (fullPath) => {
       if (typeof fullPath !== "string") {
-        throw new Error(`fullPath must be of type string for getDocument request`);
+        throw new Error(
+          `fullPath must be of type string for getDocument request`
+        );
       }
       await this.database.delete(fullPath);
     };
@@ -5161,7 +5184,11 @@ var Resolver = class {
         collection,
         doc == null ? void 0 : doc._rawData
       );
-      await this.database.put(realPath, { ...oldDoc, ...params }, collection.name);
+      await this.database.put(
+        realPath,
+        { ...oldDoc, ...params },
+        collection.name
+      );
       return this.getDocument(realPath);
     };
     /**
@@ -5280,10 +5307,30 @@ var Resolver = class {
                 docsWithRefs
               )) {
                 let refDoc = await this.getRaw(pathToDocWithRef);
+                let hasUpdate = false;
                 for (const path7 of referencePaths) {
-                  refDoc = updateObjectWithJsonPath(refDoc, path7, realPath, null);
+                  const { object: object2, updated } = updateObjectWithJsonPath(
+                    refDoc,
+                    path7,
+                    realPath,
+                    null
+                  );
+                  refDoc = object2;
+                  hasUpdate = updated || hasUpdate;
+                }
+                if (hasUpdate) {
+                  const collectionWithRef = this.tinaSchema.getCollectionByFullPath(pathToDocWithRef);
+                  if (!collectionWithRef) {
+                    throw new Error(
+                      `Unable to find collection for ${pathToDocWithRef}`
+                    );
+                  }
+                  await this.database.put(
+                    pathToDocWithRef,
+                    refDoc,
+                    collectionWithRef.name
+                  );
                 }
-                await this.database.put(pathToDocWithRef, refDoc, collection2);
               }
             }
           }
@@ -5314,21 +5361,38 @@ var Resolver = class {
               docsWithRefs
             )) {
               let docWithRef = await this.getRaw(pathToDocWithRef);
+              let hasUpdate = false;
               for (const path7 of referencePaths) {
-                docWithRef = updateObjectWithJsonPath(
+                const { object: object2, updated } = updateObjectWithJsonPath(
                   docWithRef,
                   path7,
                   realPath,
                   newRealPath
                 );
+                docWithRef = object2;
+                hasUpdate = updated || hasUpdate;
+              }
+              if (hasUpdate) {
+                const collectionWithRef = this.tinaSchema.getCollectionByFullPath(pathToDocWithRef);
+                if (!collectionWithRef) {
+                  throw new Error(
+                    `Unable to find collection for ${pathToDocWithRef}`
+                  );
+                }
+                await this.database.put(
+                  pathToDocWithRef,
+                  docWithRef,
+                  collectionWithRef.name
+                );
               }
-              await this.database.put(pathToDocWithRef, docWithRef, collection2);
             }
           }
           return this.getDocument(newRealPath);
         }
         if (alreadyExists === false) {
-          throw new Error(`Unable to update document, ${realPath} does not exist`);
+          throw new Error(
+            `Unable to update document, ${realPath} does not exist`
+          );
         }
         return this.updateResolveDocument({
           collection,
@@ -6677,8 +6741,35 @@ var Database = class {
                   ]
                 }
               };
-              if (collection.fields) {
-                for (const field of collection.fields) {
+              let fields = [];
+              if (collection.templates) {
+                const templateFieldMap = {};
+                const conflictedFields = /* @__PURE__ */ new Set();
+                for (const template of collection.templates) {
+                  for (const field of template.fields) {
+                    if (!templateFieldMap[field.name]) {
+                      templateFieldMap[field.name] = field;
+                    } else {
+                      if (templateFieldMap[field.name].type !== field.type) {
+                        console.warn(
+                          `Field ${field.name} has conflicting types in templates - skipping index`
+                        );
+                        conflictedFields.add(field.name);
+                      }
+                    }
+                  }
+                }
+                for (const conflictedField in conflictedFields) {
+                  delete templateFieldMap[conflictedField];
+                }
+                for (const field of Object.values(templateFieldMap)) {
+                  fields.push(field);
+                }
+              } else if (collection.fields) {
+                fields = collection.fields;
+              }
+              if (fields) {
+                for (const field of fields) {
                   if (field.indexed !== void 0 && field.indexed === false || field.type === "object") {
                     continue;
                   }
@@ -7107,7 +7198,13 @@ var Database = class {
               );
             }
           } else {
-            await _indexContent(this, level, contentPaths, enqueueOps, collection);
+            await _indexContent(
+              this,
+              level,
+              contentPaths,
+              enqueueOps,
+              collection
+            );
           }
         }
       );

package/dist/index.mjs

@@ -3019,7 +3019,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.5.13",
+  version: "1.5.15",
   main: "dist/index.js",
   module: "dist/index.mjs",
   typings: "dist/index.d.ts",
@@ -3260,7 +3260,9 @@ var _buildSchema = async (builder, tinaSchema) => {
     await builder.buildCreateCollectionFolderMutation()
   );
   await sequential(collections, async (collection) => {
-    queryTypeDefinitionFields.push(await builder.collectionDocument(collection));
+    queryTypeDefinitionFields.push(
+      await builder.collectionDocument(collection)
+    );
     if (collection.isAuthCollection) {
       queryTypeDefinitionFields.push(
         await builder.authenticationCollectionDocument(collection)
@@ -3575,7 +3577,9 @@ var LevelProxyHandler = {
       throw new Error(`The property, ${property.toString()}, doesn't exist`);
     }
     if (typeof target[property] !== "function") {
-      throw new Error(`The property, ${property.toString()}, is not a function`);
+      throw new Error(
+        `The property, ${property.toString()}, is not a function`
+      );
     }
     if (property === "get") {
       return async (...args) => {
@@ -4551,8 +4555,14 @@ var makeRefOpsForDocument = (filepath, collection, references, data, opType, lev
       const references2 = {};
       for (const path7 of referencePaths) {
         const ref = JSONPath({ path: path7, json: data });
+        if (!ref) {
+          continue;
+        }
         if (Array.isArray(ref)) {
           for (const r of ref) {
+            if (!r) {
+              continue;
+            }
             if (references2[r]) {
               references2[r].push(path7);
             } else {
@@ -4802,25 +4812,32 @@ var transformDocumentIntoPayload = async (fullPath, rawData, tinaSchema, config,
   }
 };
 var updateObjectWithJsonPath = (obj, path7, oldValue, newValue) => {
+  let updated = false;
   if (!path7.includes(".") && !path7.includes("[")) {
     if (path7 in obj && obj[path7] === oldValue) {
       obj[path7] = newValue;
+      updated = true;
     }
-    return obj;
+    return { object: obj, updated };
   }
   const parentPath = path7.replace(/\.[^.\[\]]+$/, "");
   const keyToUpdate = path7.match(/[^.\[\]]+$/)[0];
-  const parents = JSONPath2({ path: parentPath, json: obj, resultType: "value" });
+  const parents = JSONPath2({
+    path: parentPath,
+    json: obj,
+    resultType: "value"
+  });
   if (parents.length > 0) {
     parents.forEach((parent) => {
       if (parent && typeof parent === "object" && keyToUpdate in parent) {
         if (parent[keyToUpdate] === oldValue) {
           parent[keyToUpdate] = newValue;
+          updated = true;
         }
       }
     });
   }
-  return obj;
+  return { object: obj, updated };
 };
 var Resolver = class {
   constructor(init) {
@@ -4837,7 +4854,9 @@ var Resolver = class {
     };
     this.getRaw = async (fullPath) => {
       if (typeof fullPath !== "string") {
-        throw new Error(`fullPath must be of type string for getDocument request`);
+        throw new Error(
+          `fullPath must be of type string for getDocument request`
+        );
       }
       return this.database.get(fullPath);
     };
@@ -4866,7 +4885,9 @@ var Resolver = class {
     };
     this.getDocument = async (fullPath, opts = {}) => {
       if (typeof fullPath !== "string") {
-        throw new Error(`fullPath must be of type string for getDocument request`);
+        throw new Error(
+          `fullPath must be of type string for getDocument request`
+        );
       }
       const rawData = await this.getRaw(fullPath);
       const hasReferences = opts?.checkReferences ? await this.hasReferences(fullPath, opts.collection) : void 0;
@@ -4881,7 +4902,9 @@ var Resolver = class {
     };
     this.deleteDocument = async (fullPath) => {
       if (typeof fullPath !== "string") {
-        throw new Error(`fullPath must be of type string for getDocument request`);
+        throw new Error(
+          `fullPath must be of type string for getDocument request`
+        );
       }
       await this.database.delete(fullPath);
     };
@@ -5085,7 +5108,11 @@ var Resolver = class {
         collection,
         doc?._rawData
       );
-      await this.database.put(realPath, { ...oldDoc, ...params }, collection.name);
+      await this.database.put(
+        realPath,
+        { ...oldDoc, ...params },
+        collection.name
+      );
       return this.getDocument(realPath);
     };
     /**
@@ -5203,10 +5230,30 @@ var Resolver = class {
                 docsWithRefs
               )) {
                 let refDoc = await this.getRaw(pathToDocWithRef);
+                let hasUpdate = false;
                 for (const path7 of referencePaths) {
-                  refDoc = updateObjectWithJsonPath(refDoc, path7, realPath, null);
+                  const { object: object2, updated } = updateObjectWithJsonPath(
+                    refDoc,
+                    path7,
+                    realPath,
+                    null
+                  );
+                  refDoc = object2;
+                  hasUpdate = updated || hasUpdate;
+                }
+                if (hasUpdate) {
+                  const collectionWithRef = this.tinaSchema.getCollectionByFullPath(pathToDocWithRef);
+                  if (!collectionWithRef) {
+                    throw new Error(
+                      `Unable to find collection for ${pathToDocWithRef}`
+                    );
+                  }
+                  await this.database.put(
+                    pathToDocWithRef,
+                    refDoc,
+                    collectionWithRef.name
+                  );
                 }
-                await this.database.put(pathToDocWithRef, refDoc, collection2);
               }
             }
           }
@@ -5237,21 +5284,38 @@ var Resolver = class {
               docsWithRefs
             )) {
               let docWithRef = await this.getRaw(pathToDocWithRef);
+              let hasUpdate = false;
               for (const path7 of referencePaths) {
-                docWithRef = updateObjectWithJsonPath(
+                const { object: object2, updated } = updateObjectWithJsonPath(
                   docWithRef,
                   path7,
                   realPath,
                   newRealPath
                 );
+                docWithRef = object2;
+                hasUpdate = updated || hasUpdate;
+              }
+              if (hasUpdate) {
+                const collectionWithRef = this.tinaSchema.getCollectionByFullPath(pathToDocWithRef);
+                if (!collectionWithRef) {
+                  throw new Error(
+                    `Unable to find collection for ${pathToDocWithRef}`
+                  );
+                }
+                await this.database.put(
+                  pathToDocWithRef,
+                  docWithRef,
+                  collectionWithRef.name
+                );
               }
-              await this.database.put(pathToDocWithRef, docWithRef, collection2);
             }
           }
           return this.getDocument(newRealPath);
         }
         if (alreadyExists === false) {
-          throw new Error(`Unable to update document, ${realPath} does not exist`);
+          throw new Error(
+            `Unable to update document, ${realPath} does not exist`
+          );
         }
         return this.updateResolveDocument({
           collection,
@@ -6593,8 +6657,35 @@ var Database = class {
                   ]
                 }
               };
-              if (collection.fields) {
-                for (const field of collection.fields) {
+              let fields = [];
+              if (collection.templates) {
+                const templateFieldMap = {};
+                const conflictedFields = /* @__PURE__ */ new Set();
+                for (const template of collection.templates) {
+                  for (const field of template.fields) {
+                    if (!templateFieldMap[field.name]) {
+                      templateFieldMap[field.name] = field;
+                    } else {
+                      if (templateFieldMap[field.name].type !== field.type) {
+                        console.warn(
+                          `Field ${field.name} has conflicting types in templates - skipping index`
+                        );
+                        conflictedFields.add(field.name);
+                      }
+                    }
+                  }
+                }
+                for (const conflictedField in conflictedFields) {
+                  delete templateFieldMap[conflictedField];
+                }
+                for (const field of Object.values(templateFieldMap)) {
+                  fields.push(field);
+                }
+              } else if (collection.fields) {
+                fields = collection.fields;
+              }
+              if (fields) {
+                for (const field of fields) {
                   if (field.indexed !== void 0 && field.indexed === false || field.type === "object") {
                     continue;
                   }
@@ -7021,7 +7112,13 @@ var Database = class {
               );
             }
           } else {
-            await _indexContent(this, level, contentPaths, enqueueOps, collection);
+            await _indexContent(
+              this,
+              level,
+              contentPaths,
+              enqueueOps,
+              collection
+            );
           }
         }
       );

package/dist/resolver/index.d.ts

@@ -47,7 +47,10 @@ export declare const transformDocumentIntoPayload: (fullPath: string, rawData: {
  * @param newValue - The new value to set at the specified path.
  * @returns the updated object.
  */
-export declare const updateObjectWithJsonPath: (obj: any, path: string, oldValue: any, newValue: any) => any;
+export declare const updateObjectWithJsonPath: (obj: any, path: string, oldValue: any, newValue: any) => {
+    object: any;
+    updated: boolean;
+};
 /**
  * The resolver provides functions for all possible types of lookup
  * values and retrieves them from the database

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "0.0.0-db8aa8e-20250228034006",
+  "version": "0.0.0-df15737-20250329200825",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "typings": "dist/index.d.ts",
@@ -44,8 +44,8 @@
     "readable-stream": "^4.7.0",
     "scmp": "^2.1.0",
     "yup": "^0.32.11",
-    "@tinacms/mdx": "0.0.0-db8aa8e-20250228034006",
-    "@tinacms/schema-tools": "0.0.0-db8aa8e-20250228034006"
+    "@tinacms/mdx": "1.6.1",
+    "@tinacms/schema-tools": "1.7.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -76,8 +76,8 @@
     "vite": "^4.5.9",
     "vitest": "^0.32.4",
     "zod": "^3.24.2",
-    "@tinacms/schema-tools": "0.0.0-db8aa8e-20250228034006",
-    "@tinacms/scripts": "0.0.0-db8aa8e-20250228034006"
+    "@tinacms/schema-tools": "1.7.2",
+    "@tinacms/scripts": "1.3.3"
   },
   "scripts": {
     "types": "pnpm tsc",