@tinacms/schema-tools 1.7.0 → 1.7.2

package/dist/index.js

@@ -1945,7 +1945,7 @@
           }
         }
       };
-      this.walkFields = (cb) => {
+      this.legacyWalkFields = (cb) => {
         const walk = (collectionOrObject, collection, path) => {
           if (collectionOrObject.templates) {
             collectionOrObject.templates.forEach((template) => {
@@ -1967,7 +1967,7 @@
         collections.forEach((collection) => walk(collection, collection, []));
       };
       this.schema = config;
-      this.walkFields(({ field, collection, path }) => {
+      this.legacyWalkFields(({ field, collection }) => {
         if (!("searchable" in field)) {
           if (field.type === "image") {
             field.searchable = false;
@@ -1988,20 +1988,67 @@
         field.uid = field.uid || false;
       });
     }
-    findReferences(name2) {
+    findReferencesFromCollection(name2) {
       const result = {};
       this.walkFields(({ field, collection: c, path }) => {
+        if (c.name !== name2) {
+          return;
+        }
         if (field.type === "reference") {
-          if (field.collections.includes(name2)) {
-            if (result[c.name] === void 0) {
-              result[c.name] = [];
+          field.collections.forEach((name22) => {
+            if (result[name22] === void 0) {
+              result[name22] = [];
             }
-            result[c.name].push({ path, field });
-          }
+            result[name22].push(path);
+          });
         }
       });
       return result;
     }
+    /**
+     * Walk all fields in tina schema
+     *
+     * @param cb callback function invoked for each field
+     */
+    walkFields(cb) {
+      const walk = (collectionOrObject, collection, path = "$") => {
+        if (collectionOrObject.templates) {
+          collectionOrObject.templates.forEach((template) => {
+            const templatePath = `${path}.${template.name}`;
+            template.fields.forEach((field) => {
+              const fieldPath = field.list ? `${templatePath}[*].${field.name}` : `${templatePath}.${field.name}`;
+              cb({ field, collection, path: fieldPath });
+              if (field.type === "object") {
+                walk(field, collection, fieldPath);
+              }
+            });
+          });
+        }
+        if (collectionOrObject.fields) {
+          collectionOrObject.fields.forEach((field) => {
+            const fieldPath = field.list ? `${path}.${field.name}[*]` : `${path}.${field.name}`;
+            cb({ field, collection, path: fieldPath });
+            if (field.type === "object" && field.fields) {
+              walk(field, collection, fieldPath);
+            } else if (field.templates) {
+              field.templates.forEach((template) => {
+                const templatePath = `${fieldPath}.${template.name}`;
+                template.fields.forEach((field2) => {
+                  const fieldPath2 = field2.list ? `${templatePath}[*].${field2.name}` : `${templatePath}.${field2.name}`;
+                  cb({ field: field2, collection, path: fieldPath2 });
+                  if (field2.type === "object") {
+                    walk(field2, collection, fieldPath2);
+                  }
+                });
+              });
+            }
+          });
+        }
+      };
+      this.getCollections().forEach((collection) => {
+        walk(collection, collection);
+      });
+    }
     /**
      * This function returns an array of glob matches for a given collection.
      *

package/dist/index.mjs

@@ -1927,7 +1927,7 @@ class TinaSchema {
         }
       }
     };
-    this.walkFields = (cb) => {
+    this.legacyWalkFields = (cb) => {
       const walk = (collectionOrObject, collection, path) => {
         if (collectionOrObject.templates) {
           collectionOrObject.templates.forEach((template) => {
@@ -1949,7 +1949,7 @@ class TinaSchema {
       collections.forEach((collection) => walk(collection, collection, []));
     };
     this.schema = config;
-    this.walkFields(({ field, collection, path }) => {
+    this.legacyWalkFields(({ field, collection }) => {
       if (!("searchable" in field)) {
         if (field.type === "image") {
           field.searchable = false;
@@ -1970,20 +1970,67 @@ class TinaSchema {
       field.uid = field.uid || false;
     });
   }
-  findReferences(name2) {
+  findReferencesFromCollection(name2) {
     const result = {};
     this.walkFields(({ field, collection: c, path }) => {
+      if (c.name !== name2) {
+        return;
+      }
       if (field.type === "reference") {
-        if (field.collections.includes(name2)) {
-          if (result[c.name] === void 0) {
-            result[c.name] = [];
+        field.collections.forEach((name22) => {
+          if (result[name22] === void 0) {
+            result[name22] = [];
           }
-          result[c.name].push({ path, field });
-        }
+          result[name22].push(path);
+        });
       }
     });
     return result;
   }
+  /**
+   * Walk all fields in tina schema
+   *
+   * @param cb callback function invoked for each field
+   */
+  walkFields(cb) {
+    const walk = (collectionOrObject, collection, path = "$") => {
+      if (collectionOrObject.templates) {
+        collectionOrObject.templates.forEach((template) => {
+          const templatePath = `${path}.${template.name}`;
+          template.fields.forEach((field) => {
+            const fieldPath = field.list ? `${templatePath}[*].${field.name}` : `${templatePath}.${field.name}`;
+            cb({ field, collection, path: fieldPath });
+            if (field.type === "object") {
+              walk(field, collection, fieldPath);
+            }
+          });
+        });
+      }
+      if (collectionOrObject.fields) {
+        collectionOrObject.fields.forEach((field) => {
+          const fieldPath = field.list ? `${path}.${field.name}[*]` : `${path}.${field.name}`;
+          cb({ field, collection, path: fieldPath });
+          if (field.type === "object" && field.fields) {
+            walk(field, collection, fieldPath);
+          } else if (field.templates) {
+            field.templates.forEach((template) => {
+              const templatePath = `${fieldPath}.${template.name}`;
+              template.fields.forEach((field2) => {
+                const fieldPath2 = field2.list ? `${templatePath}[*].${field2.name}` : `${templatePath}.${field2.name}`;
+                cb({ field: field2, collection, path: fieldPath2 });
+                if (field2.type === "object") {
+                  walk(field2, collection, fieldPath2);
+                }
+              });
+            });
+          }
+        });
+      }
+    };
+    this.getCollections().forEach((collection) => {
+      walk(collection, collection);
+    });
+  }
   /**
    * This function returns an array of glob matches for a given collection.
    *

package/dist/schema/TinaSchema.d.ts

@@ -28,10 +28,7 @@ export declare class TinaSchema {
     } & Schema);
     getIsTitleFieldName: (collection: string) => string;
     getCollectionsByName: (collectionNames: string[]) => Collection<true>[];
-    findReferences(name: string): Record<string, {
-        path: string[];
-        field: TinaField;
-    }[]>;
+    findReferencesFromCollection(name: string): Record<string, string[]>;
     getCollection: (collectionName: string) => Collection<true>;
     getCollections: () => Collection<true>[];
     getCollectionByFullPath: (filepath: string) => Collection<true>;
@@ -63,7 +60,26 @@ export declare class TinaSchema {
      *
      */
     getTemplatesForCollectable: (collection: Collectable) => CollectionTemplateable;
-    walkFields: (cb: (args: {
+    /**
+     * Walk all fields in tina schema
+     *
+     * @param cb callback function invoked for each field
+     */
+    walkFields(cb: (args: {
+        field: any;
+        collection: any;
+        path: string;
+        isListItem?: boolean;
+    }) => void): void;
+    /**
+     * Walk all fields in Tina Schema
+     *
+     * This is a legacy version to preserve backwards compatibility for the tina generated schema. It does not
+     * traverse fields in object lists in rich-text templates.
+     *
+     * @param cb callback function invoked for each field
+     */
+    legacyWalkFields: (cb: (args: {
         field: TinaField;
         collection: Collection;
         path: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/schema-tools",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
   "exports": {
@@ -25,14 +25,14 @@
   "devDependencies": {
     "@types/jest": "^29.5.14",
     "@types/micromatch": "^4.0.9",
-    "@types/react": "^18.3.12",
+    "@types/react": "^18.3.18",
     "@types/yup": "^0.29.14",
     "jest": "^29.7.0",
     "react": "^18.3.1",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.6.3",
+    "typescript": "^5.7.3",
     "yup": "^0.32.11",
-    "@tinacms/scripts": "1.3.1"
+    "@tinacms/scripts": "1.3.3"
   },
   "peerDependencies": {
     "react": ">=16.14.0",
@@ -48,7 +48,7 @@
   "dependencies": {
     "picomatch-browser": "2.2.6",
     "url-pattern": "^1.0.3",
-    "zod": "^3.23.8"
+    "zod": "^3.24.2"
   },
   "scripts": {
     "build": "tinacms-scripts build",