@tinacms/graphql 0.0.0-20225819424 → 0.0.0-20225820237

package/CHANGELOG.md

@@ -1,24 +1,19 @@
 # tina-graphql
 
-## 0.0.0-20225819424
+## 0.0.0-20225820237
 
 ### Patch Changes
 
-- Updated dependencies [d9782ce8b]
-  - @tinacms/schema-tools@0.0.0-20225819424
-  - @tinacms/datalayer@0.0.0-20225819424
+- 24d6feda6: Handles Cloud URLs to Relative URLs when saving to document
 
-## 0.60.5
+  Introduces a pair of function (resolveMediaRelativeToCloud and resolveMediaCloudToRelative) that takes a URL and GraphQLConfig and returns a modified URL.
 
-### Patch Changes
-
-- 57f09bdd7: Always use the query function when the dataLayer in enabled
+  These are used in conjuction with two pairs of functions:
 
-## 0.60.4
-
-### Patch Changes
+      buildFieldMutations and resolveFieldData
+      stringifyMDX and parseMDX
 
-- d103b27ad: Fix issue where new collections would not be added when CLI restarts
+  I also added tests to use those functions.
 
 ## 0.60.3
 

package/dist/database/index.d.ts

@@ -44,6 +44,8 @@ export declare class Database {
     private tinaSchema;
     private collectionIndexDefinitions;
     private _lookup;
+    private _graphql;
+    private _tinaSchema;
     constructor(config: CreateDatabase);
     private collectionForPath;
     private partitionPathsByCollection;
@@ -63,10 +65,6 @@ export declare class Database {
         };
         keepTemplateKey: boolean;
     }>;
-    /**
-     * Clears the internal cache of the tinaSchema and the lookup file. This allows the state to be reset
-     */
-    clearCache(): void;
     flush: (filepath: string) => Promise<string>;
     getLookup: (returnType: string) => Promise<LookupMapType>;
     getGraphQLSchema: () => Promise<DocumentNode>;

package/dist/index.js

@@ -12480,7 +12480,7 @@ var validateField = async (field) => {
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/package.json
 var name = "@tinacms/graphql";
-var version = "0.60.5";
+var version = "0.60.3";
 var main = "dist/index.js";
 var typings = "dist/index.d.ts";
 var files = [
@@ -20222,11 +20222,42 @@ var visit = function(tree, test, visitor, reverse) {
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/mdx/parse.ts
 var import_lodash4 = __toModule(require("lodash"));
-var parseMDX = (value, field) => {
+
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/resolver/media-utils.ts
+var resolveMediaCloudToRelative = (value, config = { useRelativeMedia: true }) => {
+  if (config) {
+    if (config.useRelativeMedia === true) {
+      return value;
+    } else {
+      const assetsURL = `https://${config.assetsHost}/${config.clientId}`;
+      if (typeof value === "string" && value.includes(assetsURL)) {
+        return value.replace(assetsURL, "");
+      } else {
+        return value;
+      }
+    }
+  } else {
+    return value;
+  }
+};
+var resolveMediaRelativeToCloud = (value, config = { useRelativeMedia: true }) => {
+  if (config) {
+    if (config.useRelativeMedia === true) {
+      return value;
+    } else {
+      return `https://${config.assetsHost}/${config.clientId}${value}`;
+    }
+  } else {
+    return value;
+  }
+};
+
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/mdx/parse.ts
+var parseMDX = (value, field, graphQLconfig) => {
   const tree = unified().use(remark_parse_default).use(import_remark_mdx.default).parse(value);
-  return parseMDXInner(tree, field);
+  return parseMDXInner(tree, field, graphQLconfig);
 };
-var parseMDXInner = (tree, field) => {
+var parseMDXInner = (tree, field, graphQLconfig) => {
   visit(tree, (node) => {
     delete node.position;
   });
@@ -20234,7 +20265,7 @@ var parseMDXInner = (tree, field) => {
     var _a;
     let props = {};
     if (!node.name) {
-      props = parseMDXInner({ type: "root", children: node.children }, field);
+      props = parseMDXInner({ type: "root", children: node.children }, field, graphQLconfig);
     }
     const template = (_a = field.templates) == null ? void 0 : _a.find((template2) => {
       const templateName = typeof template2 === "string" ? template2 : template2.name;
@@ -20265,7 +20296,7 @@ var parseMDXInner = (tree, field) => {
           if (!field2) {
             throw new Error(`Unknown property '${attribute.name}' for embedded structure '${node.name}'`);
           }
-          parseField(attribute, field2, props);
+          parseField(attribute, field2, props, graphQLconfig);
         }
       } else {
         console.log(`Not sure what this is, type: ${attribute.type}`);
@@ -20274,15 +20305,19 @@ var parseMDXInner = (tree, field) => {
     delete node.attributes;
     node.props = props;
   });
-  const slateTree = tree.children.map(remarkToSlate);
+  const slateTree = tree.children.map((node) => remarkToSlate(node, graphQLconfig));
   return { type: "root", children: slateTree };
 };
-var parseField = (attribute, field, props) => {
+var parseField = (attribute, field, props, graphQLconfig) => {
   var _a, _b;
   switch (field.type) {
     case "boolean":
     case "datetime":
+      props[field.name] = attribute.value;
+      break;
     case "image":
+      props[field.name] = resolveMediaRelativeToCloud(attribute.value, graphQLconfig);
+      break;
     case "number":
     case "string":
       if (field.list) {
@@ -20344,7 +20379,7 @@ var parseField = (attribute, field, props) => {
                       throw new Error(`Global fields not supported at this time`);
                     }
                     field.fields.forEach((field2) => {
-                      parseField(property, field2, objectProps);
+                      parseField(property, field2, objectProps, graphQLconfig);
                     });
                   }
                 });
@@ -20366,7 +20401,7 @@ var parseField = (attribute, field, props) => {
                           throw new Error(`Global fields not supported at this time`);
                         }
                         field.fields.forEach((field2) => {
-                          parseField(property, field2, objectProps);
+                          parseField(property, field2, objectProps, graphQLconfig);
                         });
                       }
                       if (field.templates) {
@@ -20375,7 +20410,7 @@ var parseField = (attribute, field, props) => {
                             throw new Error(`Global fields not supported at this time`);
                           }
                           fieldTemplate.fields.forEach((field2) => {
-                            parseField(property, field2, objectProps);
+                            parseField(property, field2, objectProps, graphQLconfig);
                           });
                         });
                       }
@@ -20398,13 +20433,13 @@ var parseField = (attribute, field, props) => {
       if (attribute.value) {
         if (field.name === "children") {
           if (Array.isArray(attribute.value)) {
-            props[field.name] = parseMDXInner({ type: "root", children: attribute.value }, field);
+            props[field.name] = parseMDXInner({ type: "root", children: attribute.value }, field, graphQLconfig);
           } else {
             throw Error(`Expected an array of MDX strings for rich-text field with the special name 'children'`);
           }
         } else {
           try {
-            const mdx2 = parseMDX(attribute.value.value, field);
+            const mdx2 = parseMDX(attribute.value.value, field, graphQLconfig);
             props[field.name] = mdx2.children[0].props;
           } catch (e) {
             console.log(e);
@@ -20475,7 +20510,7 @@ var defaultNodeTypes = {
   break: "break",
   image: plateElements.ELEMENT_IMAGE
 };
-function remarkToSlate(node) {
+function remarkToSlate(node, graphQLconfig) {
   const types = __spreadProps(__spreadValues({}, defaultNodeTypes), {
     heading: __spreadValues({}, defaultNodeTypes.heading)
   });
@@ -20483,12 +20518,12 @@ function remarkToSlate(node) {
     case "heading":
       return {
         type: types.heading[node.depth],
-        children: node.children.map(remarkToSlate)
+        children: node.children.map((node2) => remarkToSlate(node2, graphQLconfig))
       };
     case "list":
       return {
         type: node.ordered ? types.ol_list : types.ul_list,
-        children: node.children.map(remarkToSlate)
+        children: node.children.map((node2) => remarkToSlate(node2, graphQLconfig))
       };
     case "listItem":
       const realChildren = [];
@@ -20496,12 +20531,12 @@ function remarkToSlate(node) {
         if (child.type === "list") {
           realChildren.push({
             type: child.ordered ? types.ol_list : types.ul_list,
-            children: child.children.map(remarkToSlate)
+            children: child.children.map((node2) => remarkToSlate(node2, graphQLconfig))
           });
         } else {
           realChildren.push({
             type: plateElements.ELEMENT_LIC,
-            children: child.children.map(remarkToSlate)
+            children: child.children.map((node2) => remarkToSlate(node2, graphQLconfig))
           });
         }
       });
@@ -20512,25 +20547,26 @@ function remarkToSlate(node) {
     case "paragraph":
       return {
         type: types.paragraph,
-        children: node.children.map(remarkToSlate)
+        children: node.children.map((node2) => remarkToSlate(node2, graphQLconfig))
       };
     case "link":
       return {
         type: types.link,
         url: node.url,
-        children: node.children.map(remarkToSlate)
+        children: node.children.map((node2) => remarkToSlate(node2, graphQLconfig))
       };
     case "image":
+      const url = resolveMediaRelativeToCloud(node.url, graphQLconfig);
       return {
         type: types.image,
-        url: node.url,
+        url,
         alt: node.alt,
         caption: node.title
       };
     case "blockquote":
       return {
         type: types.block_quote,
-        children: node.children.map(remarkToSlate)
+        children: node.children.map((node2) => remarkToSlate(node2, graphQLconfig))
       };
     case "code":
       return {
@@ -21991,10 +22027,10 @@ var mdxToMarkdown = {
 };
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/mdx/stringify.ts
-var stringifyMDX = (value, field) => {
+var stringifyMDX = (value, field, graphQLconfig) => {
   const slateTree = value.children;
   try {
-    const tree = stringifyChildren(slateTree, field);
+    const tree = stringifyChildren(slateTree, field, graphQLconfig);
     const out = toMarkdown({
       type: "root",
       children: tree
@@ -22012,13 +22048,13 @@ var allChildrenEmpty = (children) => {
   }
   return false;
 };
-var stringifyChildren = (children, field) => {
+var stringifyChildren = (children, field, graphQLconfig) => {
   if (!children) {
     return [];
   }
-  return children.map((child) => stringify(child, field)).filter(Boolean);
+  return children.map((child) => stringify(child, field, graphQLconfig)).filter(Boolean);
 };
-var stringify = (node, field) => {
+var stringify = (node, field, graphQLconfig) => {
   var _a;
   if (!node.type) {
     if (node == null ? void 0 : node.code) {
@@ -22044,40 +22080,40 @@ var stringify = (node, field) => {
       return {
         type: "heading",
         depth: 1,
-        children: stringifyChildren(node.children, field)
+        children: stringifyChildren(node.children, field, graphQLconfig)
       };
     case plateElements.ELEMENT_H2:
       return {
         type: "heading",
         depth: 2,
-        children: stringifyChildren(node.children, field)
+        children: stringifyChildren(node.children, field, graphQLconfig)
       };
     case plateElements.ELEMENT_H3:
       return {
         type: "heading",
         depth: 3,
-        children: stringifyChildren(node.children, field)
+        children: stringifyChildren(node.children, field, graphQLconfig)
       };
     case plateElements.ELEMENT_H4:
       return {
         type: "heading",
         depth: 4,
-        children: stringifyChildren(node.children, field)
+        children: stringifyChildren(node.children, field, graphQLconfig)
       };
     case plateElements.ELEMENT_H5:
       return {
         type: "heading",
         depth: 5,
-        children: stringifyChildren(node.children, field)
+        children: stringifyChildren(node.children, field, graphQLconfig)
       };
     case plateElements.ELEMENT_H6:
       return {
         type: "heading",
         depth: 6,
-        children: stringifyChildren(node.children, field)
+        children: stringifyChildren(node.children, field, graphQLconfig)
       };
     case plateElements.ELEMENT_PARAGRAPH:
-      const children = stringifyChildren(node.children, field);
+      const children = stringifyChildren(node.children, field, graphQLconfig);
       if (allChildrenEmpty(children)) {
         return false;
       }
@@ -22097,7 +22133,7 @@ var stringify = (node, field) => {
         ordered: false,
         spread: false,
         check: null,
-        children: stringifyChildren(node.children, field)
+        children: stringifyChildren(node.children, field, graphQLconfig)
       };
     case plateElements.ELEMENT_OL:
       return {
@@ -22105,7 +22141,7 @@ var stringify = (node, field) => {
         ordered: true,
         spread: false,
         check: null,
-        children: stringifyChildren(node.children, field)
+        children: stringifyChildren(node.children, field, graphQLconfig)
       };
     case plateElements.ELEMENT_LI:
       const realChildren = [];
@@ -22128,21 +22164,22 @@ var stringify = (node, field) => {
         spread: false,
         check: null,
         children: [
-          ...stringifyChildren([p], field),
-          ...stringifyChildren(extraChildren, field)
+          ...stringifyChildren([p], field, graphQLconfig),
+          ...stringifyChildren(extraChildren, field, graphQLconfig)
         ]
       };
     case plateElements.ELEMENT_LIC:
       return {
         type: "paragraph",
-        children: stringifyChildren(node.children, field)
+        children: stringifyChildren(node.children, field, graphQLconfig)
       };
     case plateElements.ELEMENT_IMAGE:
+      const url = resolveMediaCloudToRelative(node.url, graphQLconfig);
       return {
         type: "image",
         title: node.caption,
         alt: node.alt,
-        url: node.url
+        url
       };
     case plateElements.ELEMENT_HR:
       return {
@@ -22153,12 +22190,12 @@ var stringify = (node, field) => {
         type: "link",
         url: node.url,
         title: node.title,
-        children: stringifyChildren(node.children, field)
+        children: stringifyChildren(node.children, field, graphQLconfig)
       };
     case plateElements.ELEMENT_BLOCKQUOTE:
       return {
         type: "blockquote",
-        children: stringifyChildren(node.children, field)
+        children: stringifyChildren(node.children, field, graphQLconfig)
       };
     case "mdxJsxTextElement":
     case "mdxJsxFlowElement":
@@ -22323,7 +22360,7 @@ var stringify = (node, field) => {
                 }
                 break;
               case "rich-text":
-                const tree = stringifyChildren(value.children, field2);
+                const tree = stringifyChildren(value.children, field2, graphQLconfig);
                 if (field2.name === "children") {
                   children2 = tree;
                 } else {
@@ -22751,6 +22788,10 @@ var Resolver = class {
         })
       };
     };
+    this.getDocumentsForCollection = async (collectionName) => {
+      const collection = this.tinaSchema.getCollection(collectionName);
+      return this.database.store.glob(collection.path, this.getDocument);
+    };
     this.referenceResolver = async (filter, fieldDefinition) => {
       const referencedCollection = this.tinaSchema.getCollection(fieldDefinition.collections[0]);
       if (!referencedCollection) {
@@ -22775,11 +22816,9 @@ var Resolver = class {
       collection,
       hydrator
     }) => {
-      var _a, _b, _c, _d;
       let edges;
       let pageInfo;
-      const useDataLayer = Boolean((_d = (_c = (_b = (_a = this.tinaSchema) == null ? void 0 : _a.config) == null ? void 0 : _b.meta) == null ? void 0 : _c.flags) == null ? void 0 : _d.find((x) => x === "experimentalData"));
-      if (useDataLayer) {
+      if (args.filter || args.sort) {
         let conditions;
         if (args.filter) {
           if (collection.fields) {
@@ -22844,15 +22883,16 @@ var Resolver = class {
           case "string":
           case "boolean":
           case "number":
-          case "image":
             accum[fieldName] = fieldValue;
             break;
+          case "image":
+            accum[fieldName] = resolveMediaCloudToRelative(fieldValue, this.config);
+            break;
           case "object":
             accum[fieldName] = this.buildObjectMutations(fieldValue, field);
             break;
           case "rich-text":
-            field;
-            accum[fieldName] = stringifyMDX(fieldValue, field);
+            accum[fieldName] = stringifyMDX(fieldValue, field, this.config);
             break;
           case "reference":
             accum[fieldName] = fieldValue;
@@ -22885,18 +22925,10 @@ var Resolver = class {
           accumulator[field.name] = value;
           break;
         case "image":
-          if (this.config) {
-            if (this.config.useRelativeMedia === true) {
-              accumulator[field.name] = value;
-            } else {
-              accumulator[field.name] = `https://${this.config.assetsHost}/${this.config.clientId}/${value}`;
-            }
-          } else {
-            accumulator[field.name] = value;
-          }
+          accumulator[field.name] = resolveMediaRelativeToCloud(value, this.config);
           break;
         case "rich-text":
-          const tree = parseMDX(value, field);
+          const tree = parseMDX(value, field, this.config);
           accumulator[field.name] = tree;
           break;
         case "object":
@@ -23003,14 +23035,12 @@ var resolve = async ({
   database,
   silenceErrors
 }) => {
-  var _a;
   try {
     const graphQLSchemaAst = await database.getGraphQLSchema();
     const graphQLSchema = (0, import_graphql3.buildASTSchema)(graphQLSchemaAst);
     const tinaConfig = await database.getTinaSchema();
     const tinaSchema = await createSchema({
-      schema: tinaConfig,
-      flags: (_a = tinaConfig == null ? void 0 : tinaConfig.meta) == null ? void 0 : _a.flags
+      schema: tinaConfig
     });
     const resolver2 = await createResolver2({ config, database, tinaSchema });
     const res = await (0, import_graphql3.graphql)({
@@ -23044,8 +23074,8 @@ var resolve = async ({
           if (info.fieldName === "collections") {
             const collectionNode2 = info.fieldNodes.find((x) => x.name.value === "collections");
             const hasDocuments2 = collectionNode2.selectionSet.selections.find((x) => {
-              var _a2;
-              return ((_a2 = x == null ? void 0 : x.name) == null ? void 0 : _a2.value) === "documents";
+              var _a;
+              return ((_a = x == null ? void 0 : x.name) == null ? void 0 : _a.value) === "documents";
             });
             return tinaSchema.getCollections().map((collection) => {
               return resolver2.resolveCollection(args, collection.name, Boolean(hasDocuments2));
@@ -23053,8 +23083,8 @@ var resolve = async ({
           }
           const collectionNode = info.fieldNodes.find((x) => x.name.value === "collection");
           const hasDocuments = collectionNode.selectionSet.selections.find((x) => {
-            var _a2;
-            return ((_a2 = x == null ? void 0 : x.name) == null ? void 0 : _a2.value) === "documents";
+            var _a;
+            return ((_a = x == null ? void 0 : x.name) == null ? void 0 : _a.value) === "documents";
           });
           return resolver2.resolveCollection(args, args.collection, Boolean(hasDocuments));
         }
@@ -23628,10 +23658,6 @@ var Database = class {
     }
     return { pathsByCollection, nonCollectionPaths, collections };
   }
-  clearCache() {
-    this.tinaSchema = null;
-    this._lookup = null;
-  }
   async indexStatusCallbackWrapper(fn) {
     await this.indexStatusCallback({ status: "inprogress" });
     try {

package/dist/mdx/parse.d.ts

@@ -16,8 +16,8 @@ limitations under the License.
 
 */
 import type { Content } from 'mdast';
-import type { RichTypeInner } from '../types';
-export declare const parseMDX: (value: string, field: RichTypeInner) => {
+import type { GraphQLConfig, RichTypeInner } from '../types';
+export declare const parseMDX: (value: string, field: RichTypeInner, graphQLconfig: GraphQLConfig) => {
     type: string;
     children: any;
 };
@@ -70,7 +70,7 @@ export declare const parseMDX: (value: string, field: RichTypeInner) => {
  * 2. We don't need to do any client-side parsing. Since TinaMarkdown and the slate editor work with the same
  * format we can just allow Tina to do it's thing and update the form valuse with no additional work.
  */
-export declare const parseMDXInner: (tree: any, field: RichTypeInner) => {
+export declare const parseMDXInner: (tree: any, field: RichTypeInner, graphQLconfig: GraphQLConfig) => {
     type: string;
     children: any;
 };
@@ -226,5 +226,5 @@ export declare const plateElements: {
     MARK_UNDERLINE: string;
 };
 export declare const defaultNodeTypes: NodeTypes;
-export default function remarkToSlate(node: MdxAstNode): any;
+export default function remarkToSlate(node: MdxAstNode, graphQLconfig: GraphQLConfig): any;
 export {};

package/dist/mdx/stringify.d.ts

@@ -15,10 +15,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 */
-import type { RichTypeInner } from '../types';
+import type { GraphQLConfig, RichTypeInner } from '../types';
 import { plateElements } from './parse';
 import type { Content } from 'mdast';
-export declare const stringifyMDX: (value: unknown, field: RichTypeInner) => string;
+export declare const stringifyMDX: (value: unknown, field: RichTypeInner, graphQLconfig: GraphQLConfig) => string;
 export declare const stringify: (node: {
     type: typeof plateElements;
-}, field: RichTypeInner) => Content;
+}, field: RichTypeInner, graphQLconfig: GraphQLConfig) => Content;

package/dist/resolver/index.d.ts

@@ -203,6 +203,7 @@ export declare class Resolver {
             };
         }[];
     }>;
+    getDocumentsForCollection: (collectionName: string) => Promise<string[]>;
     private referenceResolver;
     private resolveFilterConditions;
     resolveCollectionConnection: ({ args, collection, hydrator, }: {

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

@@ -0,0 +1,29 @@
+/**
+Copyright 2021 Forestry.io Holdings, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+import { GraphQLConfig } from '../types';
+/**
+ * Strips away the Tina Cloud Asset URL from an `image` value
+ *
+ * @param {string} value
+ * @param {GraphQLConfig} config
+ * @returns {string}
+ */
+export declare const resolveMediaCloudToRelative: (value: string, config?: GraphQLConfig) => string;
+/**
+ * Adds Tina Cloud Asset URL to an `image` value
+ *
+ * @param {string} value
+ * @param {GraphQLConfig} config
+ * @returns {string}
+ */
+export declare const resolveMediaRelativeToCloud: (value: string, config?: GraphQLConfig) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "0.0.0-20225819424",
+  "version": "0.0.0-20225820237",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "@graphql-tools/relay-operation-optimizer": "^6.4.1",
-    "@tinacms/datalayer": "0.0.0-20225819424",
+    "@tinacms/datalayer": "0.1.1",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
     "dataloader": "^2.0.0",
@@ -97,9 +97,9 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
-    "@tinacms/datalayer": "0.0.0-20225819424",
-    "@tinacms/schema-tools": "0.0.0-20225819424",
-    "@tinacms/scripts": "0.0.0-20225819424",
+    "@tinacms/datalayer": "0.1.1",
+    "@tinacms/schema-tools": "0.0.4",
+    "@tinacms/scripts": "0.50.7",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",
     "@types/express": "^4.17.8",