@tinacms/graphql 1.5.14 → 1.5.16

package/dist/builder/index.d.ts

@@ -2,7 +2,7 @@
 
 */
 import { LookupMapType } from '../database';
-import type { ObjectTypeDefinitionNode, InlineFragmentNode, FieldDefinitionNode } from 'graphql';
+import type { FieldDefinitionNode, InlineFragmentNode, ObjectTypeDefinitionNode } from 'graphql';
 import type { Collection, Template } from '@tinacms/schema-tools';
 import { TinaSchema } from '@tinacms/schema-tools';
 export declare const createBuilder: ({ tinaSchema, }: {
@@ -177,7 +177,7 @@ export declare class Builder {
      * ```
      *
      * @public
-     * @param collection a Tina Cloud collection
+     * @param collection a TinaCloud collection
      */
     collectionFragment: (collection: Collection<true>) => Promise<import("graphql").FragmentDefinitionNode>;
     /**

package/dist/index.js

@@ -1914,7 +1914,7 @@ var Builder = class {
      * ```
      *
      * @public
-     * @param collection a Tina Cloud collection
+     * @param collection a TinaCloud collection
      */
     this.collectionFragment = async (collection) => {
       const name = NAMER.dataTypeName(collection.namespace);
@@ -3090,7 +3090,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.5.14",
+  version: "1.5.16",
   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) => {
@@ -4894,7 +4898,11 @@ var updateObjectWithJsonPath = (obj, path7, oldValue, newValue) => {
   }
   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) {
@@ -4922,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);
     };
@@ -4951,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;
@@ -4966,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);
     };
@@ -5170,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);
     };
     /**
@@ -5372,7 +5390,9 @@ var Resolver = class {
           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,
@@ -6721,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;
                   }
@@ -7151,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

@@ -1847,7 +1847,7 @@ var Builder = class {
      * ```
      *
      * @public
-     * @param collection a Tina Cloud collection
+     * @param collection a TinaCloud collection
      */
     this.collectionFragment = async (collection) => {
       const name = NAMER.dataTypeName(collection.namespace);
@@ -3019,7 +3019,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.5.14",
+  version: "1.5.16",
   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) => {
@@ -4818,7 +4822,11 @@ var updateObjectWithJsonPath = (obj, path7, oldValue, newValue) => {
   }
   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) {
@@ -4846,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);
     };
@@ -4875,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;
@@ -4890,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);
     };
@@ -5094,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);
     };
     /**
@@ -5295,7 +5313,9 @@ var Resolver = class {
           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,
@@ -6637,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;
                   }
@@ -7065,7 +7112,13 @@ var Database = class {
               );
             }
           } else {
-            await _indexContent(this, level, contentPaths, enqueueOps, collection);
+            await _indexContent(
+              this,
+              level,
+              contentPaths,
+              enqueueOps,
+              collection
+            );
           }
         }
       );

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

@@ -1,10 +1,10 @@
 /**
 
 */
-import type { GraphQLConfig } from '../types';
 import type { Schema } from '@tinacms/schema-tools';
+import type { GraphQLConfig } from '../types';
 /**
- * Strips away the Tina Cloud Asset URL from an `image` value
+ * Strips away the TinaCloud Asset URL from an `image` value
  *
  * @param {string | string[]} value
  * @param {GraphQLConfig} config
@@ -12,7 +12,7 @@ import type { Schema } from '@tinacms/schema-tools';
  */
 export declare const resolveMediaCloudToRelative: (value: string | string[], config: GraphQLConfig, schema: Schema<true>) => string | string[];
 /**
- * Adds Tina Cloud Asset URL to an `image` value
+ * Adds TinaCloud Asset URL to an `image` value
  *
  * @param {string | string[]} value
  * @param {GraphQLConfig} config

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "1.5.14",
+  "version": "1.5.16",
   "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/schema-tools": "1.7.2",
-    "@tinacms/mdx": "1.6.1"
+    "@tinacms/mdx": "1.6.2",
+    "@tinacms/schema-tools": "1.7.3"
   },
   "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": "1.7.2",
-    "@tinacms/scripts": "1.3.3"
+    "@tinacms/schema-tools": "1.7.3",
+    "@tinacms/scripts": "1.3.4"
   },
   "scripts": {
     "types": "pnpm tsc",