@tinacms/graphql 2.2.5 → 2.3.1

package/dist/index.js

@@ -3035,7 +3035,7 @@ var validateField = async (field) => {
 var package_default = {
   name: "@tinacms/graphql",
   type: "module",
-  version: "2.2.5",
+  version: "2.3.1",
   main: "dist/index.js",
   module: "./dist/index.js",
   files: [
@@ -3779,6 +3779,9 @@ var getTemplateForFile = (templateInfo, data) => {
   throw new Error(`Unable to determine template`);
 };
 var loadAndParseWithAliases = async (bridge, filepath, collection, templateInfo) => {
+  if (filepath.endsWith(".gitkeep")) {
+    return { _is_tina_folder_placeholder: true };
+  }
   const dataString = await bridge.get(normalizePath(filepath));
   const data = parseFile(
     dataString,
@@ -4638,21 +4641,17 @@ var resolveMediaCloudToRelative = (value, config = { useRelativeMedia: true }, s
     }
     if (hasTinaMediaConfig(schema) === true) {
       const assetsURL = `https://${config.assetsHost}/${config.clientId}`;
+      const cleanMediaRoot = cleanUpSlashes(schema.config.media.tina.mediaRoot);
       if (typeof value === "string" && value.includes(assetsURL)) {
-        const cleanMediaRoot = cleanUpSlashes(
-          schema.config.media.tina.mediaRoot
-        );
-        const strippedURL = value.replace(assetsURL, "");
-        return `${cleanMediaRoot}${strippedURL}`;
+        return `${cleanMediaRoot}${stripStagingPrefix(
+          value.replace(assetsURL, "")
+        )}`;
       }
       if (Array.isArray(value)) {
         return value.map((v) => {
           if (!v || typeof v !== "string") return v;
-          const cleanMediaRoot = cleanUpSlashes(
-            schema.config.media.tina.mediaRoot
-          );
           const strippedURL = v.replace(assetsURL, "");
-          return `${cleanMediaRoot}${strippedURL}`;
+          return `${cleanMediaRoot}${stripStagingPrefix(strippedURL)}`;
         });
       }
       return value;
@@ -4669,15 +4668,16 @@ var resolveMediaRelativeToCloud = (value, config = { useRelativeMedia: true }, s
     }
     if (hasTinaMediaConfig(schema) === true) {
       const cleanMediaRoot = cleanUpSlashes(schema.config.media.tina.mediaRoot);
+      const prefix = stagingPrefix(config);
       if (typeof value === "string") {
         const strippedValue = value.replace(cleanMediaRoot, "");
-        return `https://${config.assetsHost}/${config.clientId}${strippedValue}`;
+        return `https://${config.assetsHost}/${config.clientId}${prefix}${strippedValue}`;
       }
       if (Array.isArray(value)) {
         return value.map((v) => {
           if (!v || typeof v !== "string") return v;
           const strippedValue = v.replace(cleanMediaRoot, "");
-          return `https://${config.assetsHost}/${config.clientId}${strippedValue}`;
+          return `https://${config.assetsHost}/${config.clientId}${prefix}${strippedValue}`;
         });
       }
     }
@@ -4686,6 +4686,12 @@ var resolveMediaRelativeToCloud = (value, config = { useRelativeMedia: true }, s
     return value;
   }
 };
+var stagingPrefix = (config) => config.branch && config.branch !== config.mediaBranch ? `/__staging/${encodeURIComponent(config.branch)}` : "";
+var STAGING_SEGMENT = /^\/__staging\/[^/]+(\/.*)$/;
+var stripStagingPrefix = (path9) => {
+  const match = path9.match(STAGING_SEGMENT);
+  return match ? match[1] : path9;
+};
 var cleanUpSlashes = (path9) => {
   if (path9) {
     return `/${path9.replace(/^\/+|\/+$/gm, "")}`;
@@ -5358,6 +5364,12 @@ var Resolver = class _Resolver {
       if (newRealPath === realPath) {
         return doc;
       }
+      const newPathAlreadyExists = await this.database.documentExists(newRealPath);
+      if (newPathAlreadyExists) {
+        throw new Error(
+          `Unable to rename document, ${newRealPath} already exists`
+        );
+      }
       await this.database.put(newRealPath, doc._rawData, collection.name);
       await this.deleteDocument(realPath);
       const collRefs = await this.findReferences(realPath, collection);
@@ -6912,7 +6924,10 @@ var Database = class {
         if (!collection) {
           throw new GraphQLError5(`Unable to find collection for ${filepath}.`);
         }
-        if (collection.match?.exclude || collection.match?.include) {
+        const isFolderPlaceholder = filepath.endsWith(
+          `.gitkeep.${collection.format || "md"}`
+        );
+        if (!isFolderPlaceholder && (collection.match?.exclude || collection.match?.include)) {
           const matches = this.tinaSchema.getMatches({ collection });
           const match = micromatch2.isMatch(filepath, matches);
           if (!match) {
@@ -7836,8 +7851,9 @@ var _indexContent = async ({
           ]);
         }
       }
+      let putOps = [];
       if (!isGitKeep(filepath, collection)) {
-        await enqueueOps([
+        putOps = [
           ...makeRefOpsForDocument(
             normalizedPath,
             collection?.name,
@@ -7862,18 +7878,21 @@ var _indexContent = async ({
             aliasedData,
             "put",
             level
-          ),
-          {
-            type: "put",
-            key: normalizedPath,
-            value: aliasedData,
-            sublevel: level.sublevel(
-              CONTENT_ROOT_PREFIX,
-              SUBLEVEL_OPTIONS
-            )
-          }
-        ]);
+          )
+        ];
       }
+      await enqueueOps([
+        ...putOps,
+        {
+          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,
@@ -8648,3 +8667,8 @@ export {
 };
 //! Replaces _.get()
 //! Replaces _.flattenDeep()
+/**
+ * @license
+ * Copyright 2023 Forestry.io Holdings, Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */

package/dist/resolver/index.d.ts

@@ -11,6 +11,11 @@ interface ResolverConfig {
     isAudit: boolean;
 }
 export declare const createResolver: (args: ResolverConfig) => Resolver;
+export declare const resolveFieldData: ({ namespace, ...field }: TinaField<true>, rawData: unknown, accumulator: {
+    [key: string]: unknown;
+}, tinaSchema: TinaSchema, config?: GraphQLConfig, isAudit?: boolean) => Promise<{
+    [key: string]: unknown;
+}>;
 export declare const transformDocumentIntoPayload: (fullPath: string, rawData: {
     _collection: any;
     _template: any;

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

@@ -1,6 +1,8 @@
 /**
-
-*/
+ * @license
+ * Copyright 2023 Forestry.io Holdings, Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import type { Schema } from '@tinacms/schema-tools';
 import type { GraphQLConfig } from '../types';
 /**

package/dist/types.d.ts

@@ -7,4 +7,6 @@ export type GraphQLConfig = {
     useRelativeMedia: false;
     clientId: string;
     assetsHost: string;
+    branch?: string;
+    mediaBranch?: string;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tinacms/graphql",
   "type": "module",
-  "version": "2.2.5",
+  "version": "2.3.1",
   "main": "dist/index.js",
   "module": "./dist/index.js",
   "files": [
@@ -43,8 +43,8 @@
     "normalize-path": "^3.0.0",
     "readable-stream": "^4.7.0",
     "yup": "^1.6.1",
-    "@tinacms/mdx": "2.1.2",
-    "@tinacms/schema-tools": "2.7.2"
+    "@tinacms/mdx": "2.1.4",
+    "@tinacms/schema-tools": "2.7.4"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -72,8 +72,8 @@
     "vite": "^4.5.9",
     "vitest": "^0.32.4",
     "zod": "^3.24.2",
-    "@tinacms/scripts": "1.6.0",
-    "@tinacms/schema-tools": "2.7.2"
+    "@tinacms/schema-tools": "2.7.4",
+    "@tinacms/scripts": "1.6.1"
   },
   "scripts": {
     "types": "pnpm tsc",