@tinacms/graphql 0.0.0-db8aa8e-20250228034006 → 0.0.0-dced6ab-20250611061422

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.13",
+  version: "1.5.18",
   main: "dist/index.js",
   module: "dist/index.mjs",
   typings: "dist/index.d.ts",
@@ -3045,33 +3045,32 @@ var package_default = {
     types: "pnpm tsc",
     build: "tinacms-scripts build",
     docs: "pnpm typedoc",
-    serve: "pnpm nodemon dist/server.js",
     test: "vitest run",
     "test-watch": "vitest"
   },
   dependencies: {
-    "@iarna/toml": "^2.2.5",
+    "@iarna/toml": "catalog:",
     "@tinacms/mdx": "workspace:*",
     "@tinacms/schema-tools": "workspace:*",
-    "abstract-level": "^1.0.4",
+    "abstract-level": "catalog:",
     "date-fns": "^2.30.0",
-    "fast-glob": "^3.3.3",
-    "fs-extra": "^11.3.0",
-    "glob-parent": "^6.0.2",
+    "fast-glob": "catalog:",
+    "fs-extra": "catalog:",
+    "glob-parent": "catalog:",
     graphql: "15.8.0",
-    "gray-matter": "^4.0.3",
-    "isomorphic-git": "^1.29.0",
-    "js-sha1": "^0.6.0",
+    "gray-matter": "catalog:",
+    "isomorphic-git": "catalog:",
+    "js-sha1": "catalog:",
     "js-yaml": "^3.14.1",
-    "jsonpath-plus": "10.1.0",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.set": "^4.3.2",
-    "lodash.uniqby": "^4.7.0",
-    "many-level": "^2.0.0",
-    micromatch: "4.0.8",
-    "normalize-path": "^3.0.0",
-    "readable-stream": "^4.7.0",
-    scmp: "^2.1.0",
+    "jsonpath-plus": "catalog:",
+    "lodash.clonedeep": "catalog:",
+    "lodash.set": "catalog:",
+    "lodash.uniqby": "catalog:",
+    "many-level": "catalog:",
+    micromatch: "catalog:",
+    "normalize-path": "catalog:",
+    "readable-stream": "catalog:",
+    scmp: "catalog:",
     yup: "^0.32.11"
   },
   publishConfig: {
@@ -3086,21 +3085,20 @@ var package_default = {
     "@tinacms/scripts": "workspace:*",
     "@types/cors": "^2.8.17",
     "@types/estree": "^0.0.50",
-    "@types/express": "^4.17.21",
+    "@types/express": "catalog:",
     "@types/fs-extra": "^9.0.13",
     "@types/js-yaml": "^3.12.10",
-    "@types/lodash.camelcase": "^4.3.9",
-    "@types/lodash.upperfirst": "^4.3.9",
-    "@types/lru-cache": "^5.1.1",
-    "@types/mdast": "^3.0.15",
-    "@types/micromatch": "^4.0.9",
+    "@types/lodash.camelcase": "catalog:",
+    "@types/lodash.upperfirst": "catalog:",
+    "@types/lru-cache": "catalog:",
+    "@types/mdast": "catalog:",
+    "@types/micromatch": "catalog:",
     "@types/node": "^22.13.1",
-    "@types/normalize-path": "^3.0.2",
-    "@types/ws": "^7.4.7",
+    "@types/normalize-path": "catalog:",
+    "@types/ws": "catalog:",
     "@types/yup": "^0.29.14",
     "jest-file-snapshot": "^0.5.0",
-    "memory-level": "^1.0.0",
-    nodemon: "3.1.4",
+    "memory-level": "catalog:",
     typescript: "^5.7.3",
     vite: "^4.5.9",
     vitest: "^0.32.4",
@@ -3260,7 +3258,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 +3575,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 +4553,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 +4810,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 +4852,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 +4883,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 +4900,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 +5106,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 +5228,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 +5282,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 +6655,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;
                   }
@@ -6895,13 +6984,14 @@ var Database = class {
           documentPaths,
           async (collection, documentPaths2) => {
             if (collection && !collection.isDetached) {
-              await _indexContent(
-                this,
-                this.contentLevel,
-                documentPaths2,
+              await _indexContent({
+                database: this,
+                level: this.contentLevel,
+                documentPaths: documentPaths2,
                 enqueueOps,
-                collection
-              );
+                collection,
+                isPartialReindex: true
+              });
             }
           }
         );
@@ -7008,20 +7098,26 @@ var Database = class {
             );
             const doc = await level2.keys({ limit: 1 }).next();
             if (!doc) {
-              await _indexContent(
-                this,
-                level2,
-                contentPaths,
+              await _indexContent({
+                database: this,
+                level: level2,
+                documentPaths: contentPaths,
                 enqueueOps,
                 collection,
-                userFields.map((field) => [
+                passwordFields: userFields.map((field) => [
                   ...field.path,
                   field.passwordFieldName
                 ])
-              );
+              });
             }
           } else {
-            await _indexContent(this, level, contentPaths, enqueueOps, collection);
+            await _indexContent({
+              database: this,
+              level,
+              documentPaths: contentPaths,
+              enqueueOps,
+              collection
+            });
           }
         }
       );
@@ -7160,7 +7256,15 @@ var hashPasswordValues = async (data, passwordFields) => Promise.all(
   )
 );
 var isGitKeep = (filepath, collection) => filepath.endsWith(`.gitkeep.${collection?.format || "md"}`);
-var _indexContent = async (database, level, documentPaths, enqueueOps, collection, passwordFields) => {
+var _indexContent = async ({
+  database,
+  level,
+  documentPaths,
+  enqueueOps,
+  collection,
+  passwordFields,
+  isPartialReindex
+}) => {
   let collectionIndexDefinitions;
   let collectionPath;
   if (collection) {
@@ -7201,40 +7305,42 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
         normalizedPath,
         collectionPath || ""
       );
-      const item = await rootSublevel.get(normalizedPath);
-      if (item) {
-        await database.contentLevel.batch([
-          ...makeRefOpsForDocument(
-            normalizedPath,
-            collection?.name,
-            collectionReferences,
-            item,
-            "del",
-            level
-          ),
-          ...makeIndexOpsForDocument(
-            normalizedPath,
-            collection.name,
-            collectionIndexDefinitions,
-            item,
-            "del",
-            level
-          ),
-          // folder indices
-          ...makeIndexOpsForDocument(
-            normalizedPath,
-            `${collection.name}_${folderKey}`,
-            collectionIndexDefinitions,
-            item,
-            "del",
-            level
-          ),
-          {
-            type: "del",
-            key: normalizedPath,
-            sublevel: rootSublevel
-          }
-        ]);
+      if (isPartialReindex) {
+        const item = await rootSublevel.get(normalizedPath);
+        if (item) {
+          await database.contentLevel.batch([
+            ...makeRefOpsForDocument(
+              normalizedPath,
+              collection?.name,
+              collectionReferences,
+              item,
+              "del",
+              level
+            ),
+            ...makeIndexOpsForDocument(
+              normalizedPath,
+              collection.name,
+              collectionIndexDefinitions,
+              item,
+              "del",
+              level
+            ),
+            // folder indices
+            ...makeIndexOpsForDocument(
+              normalizedPath,
+              `${collection.name}_${folderKey}`,
+              collectionIndexDefinitions,
+              item,
+              "del",
+              level
+            ),
+            {
+              type: "del",
+              key: normalizedPath,
+              sublevel: rootSublevel
+            }
+          ]);
+        }
       }
       if (!isGitKeep(filepath, collection)) {
         await enqueueOps([
@@ -7470,8 +7576,8 @@ import path6 from "path";
 import normalize from "normalize-path";
 var FilesystemBridge = class {
   constructor(rootPath, outputPath) {
-    this.rootPath = rootPath || "";
-    this.outputPath = outputPath || rootPath;
+    this.rootPath = path6.resolve(rootPath);
+    this.outputPath = outputPath ? path6.resolve(outputPath) : this.rootPath;
   }
   async glob(pattern, extension) {
     const basePath = path6.join(this.outputPath, ...pattern.split("/"));
@@ -7483,19 +7589,19 @@ var FilesystemBridge = class {
       }
     );
     const posixRootPath = normalize(this.outputPath);
-    return items.map((item) => {
-      return item.replace(posixRootPath, "").replace(/^\/|\/$/g, "");
-    });
+    return items.map(
+      (item) => item.substring(posixRootPath.length).replace(/^\/|\/$/g, "")
+    );
   }
   async delete(filepath) {
     await fs2.remove(path6.join(this.outputPath, filepath));
   }
   async get(filepath) {
-    return fs2.readFileSync(path6.join(this.outputPath, filepath)).toString();
+    return (await fs2.readFile(path6.join(this.outputPath, filepath))).toString();
   }
   async put(filepath, data, basePathOverride) {
     const basePath = basePathOverride || this.outputPath;
-    await fs2.outputFileSync(path6.join(basePath, filepath), data);
+    await fs2.outputFile(path6.join(basePath, filepath), data);
   }
 };
 var AuditFileSystemBridge = class extends FilesystemBridge {

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
@@ -71,10 +74,10 @@ export declare class Resolver {
                 name: string;
             }[];
         }[];
-        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "yml" | "toml";
+        format?: import("@tinacms/schema-tools").ContentFormat;
         ui?: import("@tinacms/schema-tools").UICollection;
         defaultItem?: import("@tinacms/schema-tools").DefaultItem<Record<string, any>>;
-        frontmatterFormat?: "yaml" | "toml" | "json";
+        frontmatterFormat?: import("@tinacms/schema-tools").ContentFrontmatterFormat;
         frontmatterDelimiters?: [string, string] | string;
         match?: {
             include?: string;
@@ -99,10 +102,10 @@ export declare class Resolver {
                 name: string;
             }[];
         }[];
-        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "yml" | "toml";
+        format?: import("@tinacms/schema-tools").ContentFormat;
         ui?: import("@tinacms/schema-tools").UICollection;
         defaultItem?: import("@tinacms/schema-tools").DefaultItem<Record<string, any>>;
-        frontmatterFormat?: "yaml" | "toml" | "json";
+        frontmatterFormat?: import("@tinacms/schema-tools").ContentFrontmatterFormat;
         frontmatterDelimiters?: [string, string] | string;
         match?: {
             include?: string;

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/dist/schema/createSchema.d.ts

@@ -1,6 +1,3 @@
-/**
-
-*/
 import { TinaSchema, Schema } from '@tinacms/schema-tools';
 export declare const createSchema: ({ schema, flags, }: {
     schema: Schema;

package/dist/schema/validate.d.ts

@@ -1,6 +1,3 @@
-/**
-
-*/
 import { type Schema, type Collection } from '@tinacms/schema-tools';
 export declare const validateSchema: (schema: Schema) => Promise<{
     collections: Collection<true>[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "0.0.0-db8aa8e-20250228034006",
+  "version": "0.0.0-dced6ab-20250611061422",
   "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": "0.0.0-dced6ab-20250611061422",
+    "@tinacms/schema-tools": "0.0.0-dced6ab-20250611061422"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -71,19 +71,17 @@
     "@types/yup": "^0.29.14",
     "jest-file-snapshot": "^0.5.0",
     "memory-level": "^1.0.0",
-    "nodemon": "3.1.4",
     "typescript": "^5.7.3",
     "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": "0.0.0-dced6ab-20250611061422",
+    "@tinacms/scripts": "0.0.0-dced6ab-20250611061422"
   },
   "scripts": {
     "types": "pnpm tsc",
     "build": "tinacms-scripts build",
     "docs": "pnpm typedoc",
-    "serve": "pnpm nodemon dist/server.js",
     "test": "vitest run",
     "test-watch": "vitest"
   }