@tinacms/graphql 1.4.8 → 1.4.10

package/dist/index.es.js

@@ -2526,7 +2526,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.8",
+  version: "1.4.10",
   main: "dist/index.js",
   module: "dist/index.es.js",
   typings: "dist/index.d.ts",
@@ -3530,6 +3530,9 @@ var FolderTreeBuilder = class {
   }
   update(documentPath, collectionPath) {
     let folderPath = path.dirname(documentPath);
+    if (folderPath === ".") {
+      folderPath = "";
+    }
     if (collectionPath) {
       folderPath = stripCollectionFromPath(collectionPath, folderPath);
     }
@@ -3600,6 +3603,7 @@ var makeFolderOpsForCollection = (folderTree, collection, indexDefinitions, opTy
         type: "put",
         key: `${collection.path}/${parentFolderKey}.${collection.format}`,
         value: {
+          __collection: collection.name,
           __folderBasename: path.basename(folderName),
           __folderPath: folderName
         },
@@ -4827,8 +4831,16 @@ var Database = class {
           throw new GraphQLError4(`Unable to find record ${filepath}`);
         }
         const templateName = hasOwnProperty(contentObject, "_template") && typeof contentObject._template === "string" ? contentObject._template : void 0;
-        const { collection, template } = tinaSchema.getCollectionAndTemplateByFullPath(filepath, templateName);
-        const field = template.fields.find((field2) => {
+        const { collection, template } = hasOwnProperty(
+          contentObject,
+          "__collection"
+        ) ? {
+          collection: tinaSchema.getCollection(
+            contentObject["__collection"]
+          ),
+          template: void 0
+        } : tinaSchema.getCollectionAndTemplateByFullPath(filepath, templateName);
+        const field = template?.fields.find((field2) => {
           if (field2.type === "string" || field2.type === "rich-text") {
             if (field2.isBody) {
               return true;
@@ -4848,7 +4860,7 @@ var Database = class {
           ...data,
           _collection: collection.name,
           _keepTemplateKey: !!collection.templates,
-          _template: lastItem(template.namespace),
+          _template: template?.namespace ? lastItem(template?.namespace) : void 0,
           _relativePath: filepath.replace(collection.path, "").replace(/^\/|\/$/g, ""),
           _id: filepath
         };
@@ -5296,6 +5308,7 @@ var Database = class {
               cursor: btoa(edge.cursor)
             };
           } catch (error) {
+            console.log(error);
             if (error instanceof Error && (!edge.path.includes(".tina/__generated__/_graphql.json") || !edge.path.includes("tina/__generated__/_graphql.json"))) {
               throw new TinaQueryError({
                 originalError: error,
@@ -5873,9 +5886,10 @@ var FilesystemBridge = class {
   async glob(pattern, extension) {
     const basePath = path4.join(this.outputPath, ...pattern.split("/"));
     const items = await fg(
-      path4.join(basePath, "**", `/*${extension}`).replace(/\\/g, "/"),
+      path4.join(basePath, "**", `/*.${extension}`).replace(/\\/g, "/"),
       {
-        dot: true
+        dot: true,
+        ignore: ["**/node_modules/**"]
       }
     );
     const posixRootPath = normalize(this.outputPath);

package/dist/index.js

@@ -2577,7 +2577,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.8",
+  version: "1.4.10",
   main: "dist/index.js",
   module: "dist/index.es.js",
   typings: "dist/index.d.ts",
@@ -3576,6 +3576,9 @@ var FolderTreeBuilder = class {
   }
   update(documentPath, collectionPath) {
     let folderPath = import_path.default.dirname(documentPath);
+    if (folderPath === ".") {
+      folderPath = "";
+    }
     if (collectionPath) {
       folderPath = stripCollectionFromPath(collectionPath, folderPath);
     }
@@ -3646,6 +3649,7 @@ var makeFolderOpsForCollection = (folderTree, collection, indexDefinitions, opTy
         type: "put",
         key: `${collection.path}/${parentFolderKey}.${collection.format}`,
         value: {
+          __collection: collection.name,
           __folderBasename: import_path.default.basename(folderName),
           __folderPath: folderName
         },
@@ -4882,8 +4886,16 @@ var Database = class {
           throw new import_graphql5.GraphQLError(`Unable to find record ${filepath}`);
         }
         const templateName = hasOwnProperty(contentObject, "_template") && typeof contentObject._template === "string" ? contentObject._template : void 0;
-        const { collection, template } = tinaSchema.getCollectionAndTemplateByFullPath(filepath, templateName);
-        const field = template.fields.find((field2) => {
+        const { collection, template } = hasOwnProperty(
+          contentObject,
+          "__collection"
+        ) ? {
+          collection: tinaSchema.getCollection(
+            contentObject["__collection"]
+          ),
+          template: void 0
+        } : tinaSchema.getCollectionAndTemplateByFullPath(filepath, templateName);
+        const field = template == null ? void 0 : template.fields.find((field2) => {
           if (field2.type === "string" || field2.type === "rich-text") {
             if (field2.isBody) {
               return true;
@@ -4903,7 +4915,7 @@ var Database = class {
           ...data,
           _collection: collection.name,
           _keepTemplateKey: !!collection.templates,
-          _template: lastItem(template.namespace),
+          _template: (template == null ? void 0 : template.namespace) ? lastItem(template == null ? void 0 : template.namespace) : void 0,
           _relativePath: filepath.replace(collection.path, "").replace(/^\/|\/$/g, ""),
           _id: filepath
         };
@@ -5356,6 +5368,7 @@ var Database = class {
               cursor: btoa(edge.cursor)
             };
           } catch (error) {
+            console.log(error);
             if (error instanceof Error && (!edge.path.includes(".tina/__generated__/_graphql.json") || !edge.path.includes("tina/__generated__/_graphql.json"))) {
               throw new TinaQueryError({
                 originalError: error,
@@ -5933,9 +5946,10 @@ var FilesystemBridge = class {
   async glob(pattern, extension) {
     const basePath = import_path4.default.join(this.outputPath, ...pattern.split("/"));
     const items = await (0, import_fast_glob.default)(
-      import_path4.default.join(basePath, "**", `/*${extension}`).replace(/\\/g, "/"),
+      import_path4.default.join(basePath, "**", `/*.${extension}`).replace(/\\/g, "/"),
       {
-        dot: true
+        dot: true,
+        ignore: ["**/node_modules/**"]
       }
     );
     const posixRootPath = (0, import_normalize_path.default)(this.outputPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "1.4.8",
+  "version": "1.4.10",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
   "typings": "dist/index.d.ts",