@tinacms/graphql 1.4.39 → 1.5.0

package/dist/index.mjs

@@ -1,9 +1,6 @@
 // src/build.ts
-import _3 from "lodash";
 import { print } from "graphql";
-
-// src/ast-builder/index.ts
-import _ from "lodash";
+import uniqBy2 from "lodash.uniqby";
 
 // src/util.ts
 import * as yup from "yup";
@@ -46,8 +43,20 @@ var btoa = (string2) => {
 var lastItem = (arr) => {
   return arr[arr.length - 1];
 };
+var get = (obj, path7, defaultValue = void 0) => {
+  const travel = (regexp) => String.prototype.split.call(path7, regexp).filter(Boolean).reduce(
+    (res, key) => res !== null && res !== void 0 ? res[key] : res,
+    obj
+  );
+  const result = travel(/[,[\]]+?/) || travel(/[,[\].]+?/);
+  return result === void 0 || result === obj ? defaultValue : result;
+};
+var flattenDeep = (arr) => arr.flatMap(
+  (subArray, index) => Array.isArray(subArray) ? flattenDeep(subArray) : subArray
+);
 
 // src/ast-builder/index.ts
+import uniqBy from "lodash.uniqby";
 var SysFieldDefinition = {
   kind: "Field",
   name: {
@@ -933,7 +942,7 @@ var astBuilder = {
     };
   },
   toGraphQLAst: (ast) => {
-    const definitions = _.uniqBy(
+    const definitions = uniqBy(
       [
         ...extractInlineTypes(ast.query),
         ...extractInlineTypes(ast.globalTemplates),
@@ -954,25 +963,24 @@ var capitalize = (s) => {
 };
 var extractInlineTypes = (item) => {
   if (Array.isArray(item)) {
-    const accumulator = item.map((i) => {
+    const accumulator2 = item.map((i) => {
       return extractInlineTypes(i);
     });
-    return _.flattenDeep(accumulator);
-  } else {
-    const accumulator = [item];
-    for (const node of walk(item)) {
-      if (node.kind === "UnionTypeDefinition") {
-        node.types = _.uniqBy(node.types, (type) => type.name.value);
-      }
-      if (node.kind === "NamedType") {
-        if (typeof node.name.value !== "string") {
-          accumulator.push(node.name.value);
-          node.name.value = node.name.value.name.value;
-        }
+    return flattenDeep(accumulator2);
+  }
+  const accumulator = [item];
+  for (const node of walk(item)) {
+    if (node.kind === "UnionTypeDefinition") {
+      node.types = uniqBy(node.types, (type) => type.name.value);
+    }
+    if (node.kind === "NamedType") {
+      if (typeof node.name.value !== "string") {
+        accumulator.push(node.name.value);
+        node.name.value = node.name.value.name.value;
       }
     }
-    return accumulator;
   }
+  return accumulator;
 };
 function* walk(maybeNode, visited = /* @__PURE__ */ new WeakSet()) {
   if (typeof maybeNode === "string") {
@@ -2653,7 +2661,7 @@ var filterSelections = (arr) => {
 import { TinaSchema } from "@tinacms/schema-tools";
 
 // src/schema/validate.ts
-import _2 from "lodash";
+import deepClone from "lodash.clonedeep";
 import * as yup2 from "yup";
 import {
   validateTinaCloudSchemaConfig
@@ -2671,7 +2679,7 @@ var FIELD_TYPES = [
 ];
 var validateSchema = async (schema) => {
   const schema2 = addNamespaceToSchema(
-    _2.cloneDeep(schema)
+    deepClone(schema)
   );
   const collections = await sequential(
     schema2.collections,
@@ -2776,7 +2784,7 @@ var validateCollection = async (collection) => {
   }
   if (validCollection.fields) {
     if (typeof validCollection.fields === "string") {
-      throw new Error(`Global templates are not yet supported`);
+      throw new Error("Global templates are not yet supported");
     }
     fields = await sequential(validCollection.fields, async (field) => {
       return validateField(field);
@@ -2807,7 +2815,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.39",
+  version: "1.5.0",
   main: "dist/index.js",
   module: "dist/index.mjs",
   typings: "dist/index.d.ts",
@@ -2841,24 +2849,26 @@ var package_default = {
     "@iarna/toml": "^2.2.5",
     "@tinacms/mdx": "workspace:*",
     "@tinacms/schema-tools": "workspace:*",
-    "abstract-level": "^1.0.3",
-    "date-fns": "^2.21.1",
-    "fast-glob": "^3.2.5",
-    "fs-extra": "^9.0.1",
+    "abstract-level": "^1.0.4",
+    "date-fns": "^2.30.0",
+    "fast-glob": "^3.3.2",
+    "fs-extra": "^9.1.0",
     "glob-parent": "^6.0.2",
     graphql: "15.8.0",
-    "gray-matter": "^4.0.2",
-    "isomorphic-git": "^1.21.0",
+    "gray-matter": "^4.0.3",
+    "isomorphic-git": "^1.27.1",
     "js-sha1": "^0.6.0",
     "js-yaml": "^3.14.1",
     "jsonpath-plus": "^6.0.1",
-    lodash: "^4.17.20",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.set": "^4.3.2",
+    "lodash.uniqby": "^4.7.0",
     "many-level": "^2.0.0",
     micromatch: "4.0.5",
     "normalize-path": "^3.0.0",
-    "readable-stream": "^4.3.0",
+    "readable-stream": "^4.5.2",
     scmp: "^2.1.0",
-    yup: "^0.32.9"
+    yup: "^0.32.11"
   },
   publishConfig: {
     registry: "https://registry.npmjs.org"
@@ -2870,29 +2880,28 @@ var package_default = {
   devDependencies: {
     "@tinacms/schema-tools": "workspace:*",
     "@tinacms/scripts": "workspace:*",
-    "@types/cors": "^2.8.7",
+    "@types/cors": "^2.8.17",
     "@types/estree": "^0.0.50",
-    "@types/express": "^4.17.8",
-    "@types/fs-extra": "^9.0.2",
-    "@types/jest": "^26.0.4",
-    "@types/js-yaml": "^3.12.5",
-    "@types/lodash": "^4.14.161",
-    "@types/lodash.camelcase": "^4.3.6",
-    "@types/lodash.upperfirst": "^4.3.6",
-    "@types/lru-cache": "^5.1.0",
-    "@types/mdast": "^3.0.10",
-    "@types/micromatch": "^4.0.2",
-    "@types/node": "^14.17.34",
-    "@types/normalize-path": "^3.0.0",
-    "@types/ws": "^7.2.6",
-    "@types/yup": "^0.29.7",
-    jest: "^29.5.0",
-    "jest-diff": "^29.5.0",
+    "@types/express": "^4.17.21",
+    "@types/fs-extra": "^9.0.13",
+    "@types/jest": "^26.0.24",
+    "@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/node": "^14.18.63",
+    "@types/normalize-path": "^3.0.2",
+    "@types/ws": "^7.4.7",
+    "@types/yup": "^0.29.14",
+    jest: "^29.7.0",
+    "jest-diff": "^29.7.0",
     "jest-file-snapshot": "^0.5.0",
-    "jest-matcher-utils": "^29.5.0",
+    "jest-matcher-utils": "^29.7.0",
     "memory-level": "^1.0.0",
     nodemon: "2.0.19",
-    typescript: "4.6.4"
+    typescript: "^5.5.4"
   }
 };
 
@@ -2962,7 +2971,7 @@ var _buildFragments = async (builder, tinaSchema) => {
   });
   const fragDoc = {
     kind: "Document",
-    definitions: _3.uniqBy(
+    definitions: uniqBy2(
       extractInlineTypes(fragmentDefinitionsFields),
       (node) => node.name.value
     )
@@ -2993,7 +3002,7 @@ var _buildQueries = async (builder, tinaSchema) => {
   });
   const queryDoc = {
     kind: "Document",
-    definitions: _3.uniqBy(
+    definitions: uniqBy2(
       extractInlineTypes(operationsDefinitions),
       (node) => node.name.value
     )
@@ -3081,7 +3090,7 @@ var _buildSchema = async (builder, tinaSchema) => {
   );
   return {
     kind: "Document",
-    definitions: _3.uniqBy(
+    definitions: uniqBy2(
       extractInlineTypes(definitions),
       (node) => node.name.value
     )
@@ -5176,7 +5185,7 @@ var resolveDateInput = (value) => {
 };
 
 // src/resolve.ts
-import _4 from "lodash";
+import set from "lodash.set";
 
 // src/error.ts
 import { GraphQLError as GraphQLError3 } from "graphql";
@@ -5202,7 +5211,7 @@ var resolve = async ({
     const verboseValue = verbose ?? true;
     const graphQLSchemaAst = await database.getGraphQLSchema();
     if (!graphQLSchemaAst) {
-      throw new GraphQLError4(`GraphQL schema not found`);
+      throw new GraphQLError4("GraphQL schema not found");
     }
     const graphQLSchema = buildASTSchema(graphQLSchemaAst);
     const tinaConfig = await database.getTinaSchema();
@@ -5230,9 +5239,8 @@ var resolve = async ({
         const lookup = await database.getLookup(namedType);
         if (lookup.resolveType === "unionData") {
           return lookup.typeMap[source._template];
-        } else {
-          throw new Error(`Unable to find lookup key for ${namedType}`);
         }
+        throw new Error(`Unable to find lookup key for ${namedType}`);
       },
       fieldResolver: async (source = {}, _args = {}, _context, info) => {
         try {
@@ -5289,7 +5297,7 @@ var resolve = async ({
             const sub = args.sub || ctxUser?.sub;
             const collection = tinaSchema.getCollections().find((c) => c.isAuthCollection);
             if (!collection) {
-              throw new Error(`Auth collection not found`);
+              throw new Error("Auth collection not found");
             }
             const userFields = mapUserFields(collection, ["_rawData"]);
             if (!userFields.length) {
@@ -5305,7 +5313,7 @@ var resolve = async ({
             const userField = userFields[0];
             const realPath = `${collection.path}/index.json`;
             const userDoc = await resolver.getDocument(realPath);
-            const users = _4.get(userDoc, userField.path);
+            const users = get(userDoc, userField.path);
             if (!users) {
               throw new Error("No users found");
             }
@@ -5318,7 +5326,7 @@ var resolve = async ({
               return null;
             }
             if (info.fieldName === "authenticate") {
-              const saltedHash = _4.get(user, [passwordFieldName || "", "value"]);
+              const saltedHash = get(user, [passwordFieldName || "", "value"]);
               if (!saltedHash) {
                 throw new Error("No password field found on user field");
               }
@@ -5328,12 +5336,10 @@ var resolve = async ({
               });
               if (matches) {
                 return user;
-              } else {
-                return null;
               }
-            } else {
-              return user;
+              return null;
             }
+            return user;
           }
           if (info.fieldName === "updatePassword") {
             if (!ctxUser?.sub) {
@@ -5344,7 +5350,7 @@ var resolve = async ({
             }
             const collection = tinaSchema.getCollections().find((c) => c.isAuthCollection);
             if (!collection) {
-              throw new Error(`Auth collection not found`);
+              throw new Error("Auth collection not found");
             }
             const userFields = mapUserFields(collection, ["_rawData"]);
             if (!userFields.length) {
@@ -5360,7 +5366,7 @@ var resolve = async ({
             const userField = userFields[0];
             const realPath = `${collection.path}/index.json`;
             const userDoc = await resolver.getDocument(realPath);
-            const users = _4.get(userDoc, userField.path);
+            const users = get(userDoc, userField.path);
             if (!users) {
               throw new Error("No users found");
             }
@@ -5374,21 +5380,20 @@ var resolve = async ({
               passwordChangeRequired: false
             };
             const params = {};
-            _4.set(
+            set(
               params,
               userField.path.slice(1),
               users.map((u) => {
                 if (user[idFieldName] === u[idFieldName]) {
                   return user;
-                } else {
-                  return {
-                    ...u,
-                    [passwordFieldName]: {
-                      ...u[passwordFieldName],
-                      value: ""
-                    }
-                  };
                 }
+                return {
+                  ...u,
+                  [passwordFieldName]: {
+                    ...u[passwordFieldName],
+                    value: ""
+                  }
+                };
               })
             );
             await resolver.updateResolveDocument({
@@ -5415,7 +5420,7 @@ var resolve = async ({
               if (typeof value === "string" && value !== "") {
                 return resolver.getDocument(value);
               }
-              if (args && args.collection && info.fieldName === "addPendingDocument") {
+              if (args?.collection && info.fieldName === "addPendingDocument") {
                 return resolver.resolveDocument({
                   args: { ...args, params: {} },
                   collection: args.collection,
@@ -5431,7 +5436,7 @@ var resolve = async ({
                 "deleteDocument",
                 "createFolder"
               ].includes(info.fieldName)) {
-                const result2 = await resolver.resolveDocument({
+                const result = await resolver.resolveDocument({
                   args,
                   collection: args.collection,
                   isMutation,
@@ -5442,7 +5447,7 @@ var resolve = async ({
                   isAddPendingDocument: false,
                   isCollectionSpecific: false
                 });
-                return result2;
+                return result;
               }
               return value;
             case "multiCollectionDocumentList":
@@ -5453,7 +5458,8 @@ var resolve = async ({
                     return { node: document };
                   })
                 };
-              } else if (info.fieldName === "documents" && value?.collection && value?.hasDocuments) {
+              }
+              if (info.fieldName === "documents" && value?.collection && value?.hasDocuments) {
                 let filter = args.filter;
                 if (typeof args?.filter !== "undefined" && args?.filter !== null && typeof value?.collection?.name === "string" && Object.keys(args.filter).includes(value?.collection?.name) && typeof args.filter[value?.collection?.name] !== "undefined") {
                   filter = args.filter[value.collection.name];
@@ -5465,12 +5471,11 @@ var resolve = async ({
                   },
                   collection: value.collection
                 });
-              } else {
-                throw new Error(
-                  `Expected an array for result of ${info.fieldName} at ${info.path}`
-                );
               }
-            case "collectionDocument":
+              throw new Error(
+                `Expected an array for result of ${info.fieldName} at ${info.path}`
+              );
+            case "collectionDocument": {
               if (value) {
                 return value;
               }
@@ -5483,6 +5488,7 @@ var resolve = async ({
                 isCollectionSpecific: true
               });
               return result;
+            }
             case "collectionDocumentList":
               return resolver.resolveCollectionConnection({
                 args,
@@ -5491,7 +5497,7 @@ var resolve = async ({
             case "unionData":
               if (!value) {
                 if (args.relativePath) {
-                  const result2 = await resolver.resolveDocument({
+                  const result = await resolver.resolveDocument({
                     args,
                     collection: lookup.collection,
                     isMutation,
@@ -5499,13 +5505,13 @@ var resolve = async ({
                     isAddPendingDocument: false,
                     isCollectionSpecific: true
                   });
-                  return result2;
+                  return result;
                 }
               }
               return value;
             default:
               console.error(lookup);
-              throw new Error(`Unexpected resolve type`);
+              throw new Error("Unexpected resolve type");
           }
         } catch (e) {
           handleFetchErrorError(e, verboseValue);
@@ -5536,9 +5542,8 @@ var resolve = async ({
       return {
         errors: [e]
       };
-    } else {
-      throw e;
     }
+    throw e;
   }
 };
 
@@ -5568,7 +5573,7 @@ import path4 from "path";
 import { GraphQLError as GraphQLError5 } from "graphql";
 import micromatch2 from "micromatch";
 import sha2 from "js-sha1";
-import _5 from "lodash";
+import set2 from "lodash.set";
 var createLocalDatabase = (config) => {
   const level = new TinaLevelClient(config?.port);
   level.openConnection();
@@ -5723,46 +5728,50 @@ var Database = class {
       }
       const folderTreeBuilder = new FolderTreeBuilder();
       const folderKey = folderTreeBuilder.update(filepath, collection.path || "");
-      const putOps = [
-        ...makeIndexOpsForDocument(
-          normalizedPath,
-          collection?.name,
-          collectionIndexDefinitions,
-          dataFields,
-          "put",
-          level
-        ),
-        ...makeIndexOpsForDocument(
-          normalizedPath,
-          `${collection?.name}_${folderKey}`,
-          collectionIndexDefinitions,
-          dataFields,
-          "put",
-          level
-        )
-      ];
-      const existingItem = await level.sublevel(
-        CONTENT_ROOT_PREFIX,
-        SUBLEVEL_OPTIONS
-      ).get(normalizedPath);
-      const delOps = existingItem ? [
-        ...makeIndexOpsForDocument(
-          normalizedPath,
-          collection?.name,
-          collectionIndexDefinitions,
-          existingItem,
-          "del",
-          level
-        ),
-        ...makeIndexOpsForDocument(
-          normalizedPath,
-          `${collection?.name}_${folderKey}`,
-          collectionIndexDefinitions,
-          existingItem,
-          "del",
-          level
-        )
-      ] : [];
+      let putOps = [];
+      let delOps = [];
+      if (!isGitKeep(normalizedPath, collection)) {
+        putOps = [
+          ...makeIndexOpsForDocument(
+            normalizedPath,
+            collection?.name,
+            collectionIndexDefinitions,
+            dataFields,
+            "put",
+            level
+          ),
+          ...makeIndexOpsForDocument(
+            normalizedPath,
+            `${collection?.name}_${folderKey}`,
+            collectionIndexDefinitions,
+            dataFields,
+            "put",
+            level
+          )
+        ];
+        const existingItem = await level.sublevel(
+          CONTENT_ROOT_PREFIX,
+          SUBLEVEL_OPTIONS
+        ).get(normalizedPath);
+        delOps = existingItem ? [
+          ...makeIndexOpsForDocument(
+            normalizedPath,
+            collection?.name,
+            collectionIndexDefinitions,
+            existingItem,
+            "del",
+            level
+          ),
+          ...makeIndexOpsForDocument(
+            normalizedPath,
+            `${collection?.name}_${folderKey}`,
+            collectionIndexDefinitions,
+            existingItem,
+            "del",
+            level
+          )
+        ] : [];
+      }
       const ops = [
         ...delOps,
         ...putOps,
@@ -5834,46 +5843,50 @@ var Database = class {
             collection.path || ""
           );
           const level = collection?.isDetached ? this.appLevel.sublevel(collection?.name, SUBLEVEL_OPTIONS) : this.contentLevel;
-          const putOps = [
-            ...makeIndexOpsForDocument(
-              normalizedPath,
-              collectionName,
-              collectionIndexDefinitions,
-              dataFields,
-              "put",
-              level
-            ),
-            ...makeIndexOpsForDocument(
-              normalizedPath,
-              `${collection?.name}_${folderKey}`,
-              collectionIndexDefinitions,
-              dataFields,
-              "put",
-              level
-            )
-          ];
-          const existingItem = await level.sublevel(
-            CONTENT_ROOT_PREFIX,
-            SUBLEVEL_OPTIONS
-          ).get(normalizedPath);
-          const delOps = existingItem ? [
-            ...makeIndexOpsForDocument(
-              normalizedPath,
-              collectionName,
-              collectionIndexDefinitions,
-              existingItem,
-              "del",
-              level
-            ),
-            ...makeIndexOpsForDocument(
-              normalizedPath,
-              `${collection?.name}_${folderKey}`,
-              collectionIndexDefinitions,
-              existingItem,
-              "del",
-              level
-            )
-          ] : [];
+          let putOps = [];
+          let delOps = [];
+          if (!isGitKeep(normalizedPath, collection)) {
+            putOps = [
+              ...makeIndexOpsForDocument(
+                normalizedPath,
+                collectionName,
+                collectionIndexDefinitions,
+                dataFields,
+                "put",
+                level
+              ),
+              ...makeIndexOpsForDocument(
+                normalizedPath,
+                `${collection?.name}_${folderKey}`,
+                collectionIndexDefinitions,
+                dataFields,
+                "put",
+                level
+              )
+            ];
+            const existingItem = await level.sublevel(
+              CONTENT_ROOT_PREFIX,
+              SUBLEVEL_OPTIONS
+            ).get(normalizedPath);
+            delOps = existingItem ? [
+              ...makeIndexOpsForDocument(
+                normalizedPath,
+                collectionName,
+                collectionIndexDefinitions,
+                existingItem,
+                "del",
+                level
+              ),
+              ...makeIndexOpsForDocument(
+                normalizedPath,
+                `${collection?.name}_${folderKey}`,
+                collectionIndexDefinitions,
+                existingItem,
+                "del",
+                level
+              )
+            ] : [];
+          }
           const ops = [
             ...delOps,
             ...putOps,
@@ -6194,9 +6207,8 @@ var Database = class {
                 collection: collection.name,
                 stack: error.stack
               });
-            } else {
-              throw error;
             }
+            throw error;
           }
         }),
         pageInfo: {
@@ -6546,9 +6558,9 @@ var Database = class {
 };
 var hashPasswordVisitor = async (node, path7) => {
   const passwordValuePath = [...path7, "value"];
-  const plaintextPassword = _5.get(node, passwordValuePath);
+  const plaintextPassword = get(node, passwordValuePath);
   if (plaintextPassword) {
-    _5.set(
+    set2(
       node,
       passwordValuePath,
       await generatePasswordHash({ password: plaintextPassword })
@@ -6573,6 +6585,7 @@ var hashPasswordValues = async (data, passwordFields) => Promise.all(
     async (passwordField) => visitNodes(data, passwordField, hashPasswordVisitor)
   )
 );
+var isGitKeep = (filepath, collection) => filepath.endsWith(`.gitkeep.${collection?.format || "md"}`);
 var _indexContent = async (database, level, documentPaths, enqueueOps, collection, passwordFields) => {
   let collectionIndexDefinitions;
   let collectionPath;
@@ -6609,33 +6622,35 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
         normalizedPath,
         collectionPath || ""
       );
-      await enqueueOps([
-        ...makeIndexOpsForDocument(
-          normalizedPath,
-          collection?.name,
-          collectionIndexDefinitions,
-          aliasedData,
-          "put",
-          level
-        ),
-        ...makeIndexOpsForDocument(
-          normalizedPath,
-          `${collection?.name}_${folderKey}`,
-          collectionIndexDefinitions,
-          aliasedData,
-          "put",
-          level
-        ),
-        {
-          type: "put",
-          key: normalizedPath,
-          value: aliasedData,
-          sublevel: level.sublevel(
-            CONTENT_ROOT_PREFIX,
-            SUBLEVEL_OPTIONS
-          )
-        }
-      ]);
+      if (!isGitKeep(filepath, collection)) {
+        await enqueueOps([
+          ...makeIndexOpsForDocument(
+            normalizedPath,
+            collection?.name,
+            collectionIndexDefinitions,
+            aliasedData,
+            "put",
+            level
+          ),
+          ...makeIndexOpsForDocument(
+            normalizedPath,
+            `${collection?.name}_${folderKey}`,
+            collectionIndexDefinitions,
+            aliasedData,
+            "put",
+            level
+          ),
+          {
+            type: "put",
+            key: normalizedPath,
+            value: aliasedData,
+            sublevel: level.sublevel(
+              CONTENT_ROOT_PREFIX,
+              SUBLEVEL_OPTIONS
+            )
+          }
+        ]);
+      }
     } catch (error) {
       throw new TinaFetchError(`Unable to seed ${filepath}`, {
         originalError: error,
@@ -7294,3 +7309,5 @@ export {
   transformDocument,
   transformDocumentIntoPayload
 };
+//! Replaces _.flattenDeep()
+//! Replaces _.get()