@tinacms/graphql 1.4.3 → 1.4.5

package/dist/database/index.d.ts

@@ -1,6 +1,6 @@
 import type { DocumentNode } from 'graphql';
-import type { CollectionTemplateable, TinaCloudCollection, Schema, TinaSchema } from '@tinacms/schema-tools';
-import type { Bridge } from '../database/bridge';
+import type { CollectionTemplateable, Schema, TinaCloudCollection, TinaSchema } from '@tinacms/schema-tools';
+import type { Bridge } from './bridge';
 import { BinaryFilter, IndexDefinition, TernaryFilter } from './datalayer';
 import { Level } from './level';
 declare type IndexStatusEvent = {

package/dist/index.es.js

@@ -2491,7 +2491,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.3",
+  version: "1.4.5",
   main: "dist/index.js",
   module: "dist/index.es.js",
   typings: "dist/index.d.ts",
@@ -3000,6 +3000,17 @@ var resolveMediaCloudToRelative = (value, config = { useRelativeMedia: true }, s
         const strippedURL = value.replace(assetsURL, "");
         return `${cleanMediaRoot}${strippedURL}`;
       }
+      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 value;
     }
     return value;
@@ -3014,8 +3025,18 @@ var resolveMediaRelativeToCloud = (value, config = { useRelativeMedia: true }, s
     }
     if (hasTinaMediaConfig(schema) === true) {
       const cleanMediaRoot = cleanUpSlashes(schema.config.media.tina.mediaRoot);
-      const strippedValue = value.replace(cleanMediaRoot, "");
-      return `https://${config.assetsHost}/${config.clientId}${strippedValue}`;
+      if (typeof value === "string") {
+        const strippedValue = value.replace(cleanMediaRoot, "");
+        return `https://${config.assetsHost}/${config.clientId}${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 value;
   } else {
@@ -5095,49 +5116,53 @@ var Database = class {
         throw new Error("No bridge configured");
       }
       await this.initLevel();
-      const result = await this.indexStatusCallbackWrapper(async () => {
-        const lookup = lookupFromLockFile || JSON.parse(
-          await this.bridge.get(
-            normalizePath(path2.join(this.getGeneratedFolder(), "_lookup.json"))
-          )
-        );
-        let nextLevel;
-        let nextVersion;
-        if (!this.config.version) {
-          await this.level.clear();
-          nextLevel = this.level;
-        } else {
-          const version = await this.getDatabaseVersion();
-          nextVersion = version ? `${parseInt(version) + 1}` : "0";
-          nextLevel = this.rootLevel.sublevel(nextVersion, SUBLEVEL_OPTIONS);
-        }
-        const contentRootLevel = nextLevel.sublevel(
-          CONTENT_ROOT_PREFIX,
-          SUBLEVEL_OPTIONS
-        );
-        await contentRootLevel.put(
-          normalizePath(path2.join(this.getGeneratedFolder(), "_graphql.json")),
-          graphQLSchema
-        );
-        await contentRootLevel.put(
-          normalizePath(path2.join(this.getGeneratedFolder(), "_schema.json")),
-          tinaSchema.schema
-        );
-        await contentRootLevel.put(
-          normalizePath(path2.join(this.getGeneratedFolder(), "_lookup.json")),
-          lookup
-        );
-        const result2 = await this._indexAllContent(nextLevel);
-        if (this.config.version) {
-          await this.updateDatabaseVersion(nextVersion);
-          if (this.level) {
+      let nextLevel;
+      return await this.indexStatusCallbackWrapper(
+        async () => {
+          const lookup = lookupFromLockFile || JSON.parse(
+            await this.bridge.get(
+              normalizePath(
+                path2.join(this.getGeneratedFolder(), "_lookup.json")
+              )
+            )
+          );
+          let nextVersion;
+          if (!this.config.version) {
             await this.level.clear();
+            nextLevel = this.level;
+          } else {
+            const version = await this.getDatabaseVersion();
+            nextVersion = version ? `${parseInt(version) + 1}` : "0";
+            nextLevel = this.rootLevel.sublevel(nextVersion, SUBLEVEL_OPTIONS);
+          }
+          const contentRootLevel = nextLevel.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS);
+          await contentRootLevel.put(
+            normalizePath(path2.join(this.getGeneratedFolder(), "_graphql.json")),
+            graphQLSchema
+          );
+          await contentRootLevel.put(
+            normalizePath(path2.join(this.getGeneratedFolder(), "_schema.json")),
+            tinaSchema.schema
+          );
+          await contentRootLevel.put(
+            normalizePath(path2.join(this.getGeneratedFolder(), "_lookup.json")),
+            lookup
+          );
+          const result = await this._indexAllContent(nextLevel);
+          if (this.config.version) {
+            await this.updateDatabaseVersion(nextVersion);
+          }
+          return result;
+        },
+        async () => {
+          if (this.config.version) {
+            if (this.level) {
+              await this.level.clear();
+            }
+            this.level = nextLevel;
           }
-          this.level = nextLevel;
         }
-        return result2;
-      });
-      return result;
+      );
     };
     this.deleteContentByPaths = async (documentPaths) => {
       await this.initLevel();
@@ -5375,11 +5400,14 @@ This will be an error in the future. See https://tina.io/docs/errors/file-in-mut
     this.tinaSchema = null;
     this._lookup = null;
   }
-  async indexStatusCallbackWrapper(fn) {
+  async indexStatusCallbackWrapper(fn, post) {
     await this.indexStatusCallback({ status: "inprogress" });
     try {
       const result = await fn();
       await this.indexStatusCallback({ status: "complete" });
+      if (post) {
+        await post();
+      }
       return result;
     } catch (error) {
       await this.indexStatusCallback({ status: "failed", error });

package/dist/index.js

@@ -2542,7 +2542,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.3",
+  version: "1.4.5",
   main: "dist/index.js",
   module: "dist/index.es.js",
   typings: "dist/index.d.ts",
@@ -3045,6 +3045,17 @@ var resolveMediaCloudToRelative = (value, config = { useRelativeMedia: true }, s
         const strippedURL = value.replace(assetsURL, "");
         return `${cleanMediaRoot}${strippedURL}`;
       }
+      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 value;
     }
     return value;
@@ -3059,8 +3070,18 @@ var resolveMediaRelativeToCloud = (value, config = { useRelativeMedia: true }, s
     }
     if (hasTinaMediaConfig(schema) === true) {
       const cleanMediaRoot = cleanUpSlashes(schema.config.media.tina.mediaRoot);
-      const strippedValue = value.replace(cleanMediaRoot, "");
-      return `https://${config.assetsHost}/${config.clientId}${strippedValue}`;
+      if (typeof value === "string") {
+        const strippedValue = value.replace(cleanMediaRoot, "");
+        return `https://${config.assetsHost}/${config.clientId}${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 value;
   } else {
@@ -5153,49 +5174,53 @@ var Database = class {
         throw new Error("No bridge configured");
       }
       await this.initLevel();
-      const result = await this.indexStatusCallbackWrapper(async () => {
-        const lookup = lookupFromLockFile || JSON.parse(
-          await this.bridge.get(
-            (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), "_lookup.json"))
-          )
-        );
-        let nextLevel;
-        let nextVersion;
-        if (!this.config.version) {
-          await this.level.clear();
-          nextLevel = this.level;
-        } else {
-          const version = await this.getDatabaseVersion();
-          nextVersion = version ? `${parseInt(version) + 1}` : "0";
-          nextLevel = this.rootLevel.sublevel(nextVersion, SUBLEVEL_OPTIONS);
-        }
-        const contentRootLevel = nextLevel.sublevel(
-          CONTENT_ROOT_PREFIX,
-          SUBLEVEL_OPTIONS
-        );
-        await contentRootLevel.put(
-          (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), "_graphql.json")),
-          graphQLSchema
-        );
-        await contentRootLevel.put(
-          (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), "_schema.json")),
-          tinaSchema.schema
-        );
-        await contentRootLevel.put(
-          (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), "_lookup.json")),
-          lookup
-        );
-        const result2 = await this._indexAllContent(nextLevel);
-        if (this.config.version) {
-          await this.updateDatabaseVersion(nextVersion);
-          if (this.level) {
+      let nextLevel;
+      return await this.indexStatusCallbackWrapper(
+        async () => {
+          const lookup = lookupFromLockFile || JSON.parse(
+            await this.bridge.get(
+              (0, import_schema_tools3.normalizePath)(
+                import_path2.default.join(this.getGeneratedFolder(), "_lookup.json")
+              )
+            )
+          );
+          let nextVersion;
+          if (!this.config.version) {
             await this.level.clear();
+            nextLevel = this.level;
+          } else {
+            const version = await this.getDatabaseVersion();
+            nextVersion = version ? `${parseInt(version) + 1}` : "0";
+            nextLevel = this.rootLevel.sublevel(nextVersion, SUBLEVEL_OPTIONS);
+          }
+          const contentRootLevel = nextLevel.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS);
+          await contentRootLevel.put(
+            (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), "_graphql.json")),
+            graphQLSchema
+          );
+          await contentRootLevel.put(
+            (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), "_schema.json")),
+            tinaSchema.schema
+          );
+          await contentRootLevel.put(
+            (0, import_schema_tools3.normalizePath)(import_path2.default.join(this.getGeneratedFolder(), "_lookup.json")),
+            lookup
+          );
+          const result = await this._indexAllContent(nextLevel);
+          if (this.config.version) {
+            await this.updateDatabaseVersion(nextVersion);
+          }
+          return result;
+        },
+        async () => {
+          if (this.config.version) {
+            if (this.level) {
+              await this.level.clear();
+            }
+            this.level = nextLevel;
           }
-          this.level = nextLevel;
         }
-        return result2;
-      });
-      return result;
+      );
     };
     this.deleteContentByPaths = async (documentPaths) => {
       await this.initLevel();
@@ -5433,11 +5458,14 @@ This will be an error in the future. See https://tina.io/docs/errors/file-in-mut
     this.tinaSchema = null;
     this._lookup = null;
   }
-  async indexStatusCallbackWrapper(fn) {
+  async indexStatusCallbackWrapper(fn, post) {
     await this.indexStatusCallback({ status: "inprogress" });
     try {
       const result = await fn();
       await this.indexStatusCallback({ status: "complete" });
+      if (post) {
+        await post();
+      }
       return result;
     } catch (error) {
       await this.indexStatusCallback({ status: "failed", error });

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

@@ -6,16 +6,16 @@ import type { Schema } from '@tinacms/schema-tools';
 /**
  * Strips away the Tina Cloud Asset URL from an `image` value
  *
- * @param {string} value
+ * @param {string | string[]} value
  * @param {GraphQLConfig} config
  * @returns {string}
  */
-export declare const resolveMediaCloudToRelative: (value: string, config: GraphQLConfig, schema: Schema<true>) => string;
+export declare const resolveMediaCloudToRelative: (value: string | string[], config: GraphQLConfig, schema: Schema<true>) => string | string[];
 /**
  * Adds Tina Cloud Asset URL to an `image` value
  *
- * @param {string} value
+ * @param {string | string[]} value
  * @param {GraphQLConfig} config
  * @returns {string}
  */
-export declare const resolveMediaRelativeToCloud: (value: string, config: GraphQLConfig, schema: Schema<true>) => string;
+export declare const resolveMediaRelativeToCloud: (value: string | string[], config: GraphQLConfig, schema: Schema<true>) => string | string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
   "typings": "dist/index.d.ts",
@@ -25,6 +25,8 @@
   "dependencies": {
     "@graphql-tools/relay-operation-optimizer": "^6.4.1",
     "@iarna/toml": "^2.2.5",
+    "@tinacms/mdx": "1.3.7",
+    "@tinacms/schema-tools": "1.4.2",
     "abstract-level": "^1.0.3",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
@@ -71,9 +73,7 @@
     "unist-util-visit": "^4.0.0",
     "vfile": "^4.2.0",
     "ws": "^7.3.1",
-    "yup": "^0.32.9",
-    "@tinacms/mdx": "1.3.7",
-    "@tinacms/schema-tools": "1.4.2"
+    "yup": "^0.32.9"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -83,6 +83,8 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
+    "@tinacms/schema-tools": "1.4.2",
+    "@tinacms/scripts": "1.1.0",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",
     "@types/express": "^4.17.8",
@@ -105,9 +107,7 @@
     "jest-matcher-utils": "27.0.6",
     "memory-level": "^1.0.0",
     "nodemon": "2.0.19",
-    "typescript": "4.3.5",
-    "@tinacms/schema-tools": "1.4.2",
-    "@tinacms/scripts": "1.1.0"
+    "typescript": "4.3.5"
   },
   "scripts": {
     "types": "pnpm tsc",