@tinacms/graphql 0.59.5 → 0.59.8

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # tina-graphql
 
+## 0.59.8
+
+### Patch Changes
+
+- e7b27ba3b: Fix issue where un-normalized rich-text fields which send `null` values to the server on save would cause a parsing error
+- 11d55f441: Add experimental useGraphQLForms hook
+
+## 0.59.7
+
+### Patch Changes
+
+- c730fa1dd: fix: #1452: update indexDocument to handle adding new docs
+- cd0f6f022: Do not resolve all documents in `getCollection` if it is not needed
+
+## 0.59.6
+
+### Patch Changes
+
+- b399c734c: Fixes support for collection.templates in graphql
+
 ## 0.59.5
 
 ### Patch Changes

package/dist/database/index.d.ts

@@ -43,6 +43,7 @@ export declare class Database {
         payload: {
             [key: string]: unknown;
         };
+        keepTemplateKey: boolean;
     }>;
     flush: (filepath: string) => Promise<string>;
     getLookup: (returnType: string) => Promise<LookupMapType>;

package/dist/database/store/index.d.ts

@@ -68,7 +68,5 @@ export interface Store {
      * user's repo.
      */
     supportsIndexing(): boolean;
-    put(filepath: string, data: object, options?: {
-        includeTemplate?: boolean;
-    }): Promise<void>;
+    put(filepath: string, data: object, keepTemplateKey?: boolean): Promise<void>;
 }

package/dist/index.js

@@ -12370,7 +12370,7 @@ var validateField = async (field) => {
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/package.json
 var name = "@tinacms/graphql";
-var version = "0.59.5";
+var version = "0.59.8";
 var main = "dist/index.js";
 var typings = "dist/index.d.ts";
 var files = [
@@ -12415,6 +12415,7 @@ var scripts = {
   test: "jest"
 };
 var dependencies = {
+  "@graphql-tools/relay-operation-optimizer": "^6.4.1",
   "body-parser": "^1.19.0",
   cors: "^2.8.5",
   dataloader: "^2.0.0",
@@ -12753,6 +12754,17 @@ var _buildSchema = async (builder, tinaSchema) => {
   const queryTypeDefinitionFields = [];
   const mutationTypeDefinitionFields = [];
   const collections = tinaSchema.getCollections();
+  queryTypeDefinitionFields.push(astBuilder.FieldDefinition({
+    name: "getOptimizedQuery",
+    args: [
+      astBuilder.InputValueDefinition({
+        name: "queryString",
+        type: astBuilder.TYPES.String,
+        required: true
+      })
+    ],
+    type: astBuilder.TYPES.String
+  }));
   queryTypeDefinitionFields.push(await builder.buildCollectionDefinition(collections));
   queryTypeDefinitionFields.push(await builder.buildMultiCollectionDefinition(collections));
   queryTypeDefinitionFields.push(await builder.multiNodeDocument());
@@ -21883,6 +21895,9 @@ var allChildrenEmpty = (children) => {
   return false;
 };
 var stringifyChildren = (children, field) => {
+  if (!children) {
+    return [];
+  }
   return children.map((child) => stringify(child, field)).filter(Boolean);
 };
 var stringify = (node, field) => {
@@ -21995,7 +22010,7 @@ var stringify = (node, field) => {
         spread: false,
         check: null,
         children: [
-          stringify(p, field),
+          ...stringifyChildren([p], field),
           ...stringifyChildren(extraChildren, field)
         ]
       };
@@ -22019,12 +22034,13 @@ var stringify = (node, field) => {
       return {
         type: "link",
         url: node.url,
-        children: node.children.map((child) => stringify(child, field))
+        title: node.title,
+        children: stringifyChildren(node.children, field)
       };
     case plateElements.ELEMENT_BLOCKQUOTE:
       return {
         type: "blockquote",
-        children: node.children.map((child) => stringify(child, field))
+        children: stringifyChildren(node.children, field)
       };
     case "mdxJsxTextElement":
     case "mdxJsxFlowElement":
@@ -22189,12 +22205,7 @@ var stringify = (node, field) => {
                 }
                 break;
               case "rich-text":
-                const tree = value.children.map((item) => stringify(item, field2)).filter((item) => {
-                  if (item.type === "text" && !item.text) {
-                    return false;
-                  }
-                  return true;
-                });
+                const tree = stringifyChildren(value.children, field2);
                 if (field2.name === "children") {
                   children2 = tree;
                 } else {
@@ -22269,10 +22280,13 @@ var createResolver2 = (args) => {
 var Resolver = class {
   constructor(init) {
     this.init = init;
-    this.resolveCollection = async (collectionName) => {
+    this.resolveCollection = async (collectionName, hasDocuments) => {
       const collection = this.tinaSchema.getCollection(collectionName);
       const extraFields = {};
-      const documents = await this.getDocumentsForCollection(collectionName);
+      let documents = {};
+      if (hasDocuments) {
+        documents = await this.getDocumentsForCollection(collectionName);
+      }
       return __spreadValues(__spreadValues({
         documents
       }, collection), extraFields);
@@ -22867,6 +22881,7 @@ var resolveDateInput = (value) => {
 };
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/resolve.ts
+var import_relay_operation_optimizer = __toModule(require("@graphql-tools/relay-operation-optimizer"));
 var resolve = async ({
   query,
   variables,
@@ -22948,15 +22963,37 @@ var resolve = async ({
             return value;
           }
           if (info.fieldName === "getCollections") {
+            const getCollectionNode2 = info.fieldNodes.find((x) => x.name.value === "getCollections");
+            const hasDocuments2 = getCollectionNode2.selectionSet.selections.find((x) => {
+              var _a;
+              return ((_a = x == null ? void 0 : x.name) == null ? void 0 : _a.value) === "documents";
+            });
             return tinaSchema.getCollections().map((collection) => {
-              return resolver2.resolveCollection(collection.name);
+              return resolver2.resolveCollection(collection.name, Boolean(hasDocuments2));
             });
           }
-          return resolver2.resolveCollection(args.collection);
+          const getCollectionNode = info.fieldNodes.find((x) => x.name.value === "getCollection");
+          const hasDocuments = getCollectionNode.selectionSet.selections.find((x) => {
+            var _a;
+            return ((_a = x == null ? void 0 : x.name) == null ? void 0 : _a.value) === "documents";
+          });
+          return resolver2.resolveCollection(args.collection, Boolean(hasDocuments));
         }
         if (info.fieldName === "getDocumentFields") {
           return resolver2.getDocumentFields();
         }
+        if (info.fieldName === "getOptimizedQuery") {
+          try {
+            const [optimizedQuery] = (0, import_relay_operation_optimizer.optimizeDocuments)(info.schema, [(0, import_graphql3.parse)(args.queryString)], {
+              assumeValid: true,
+              includeFragments: false,
+              noLocation: true
+            });
+            return (0, import_graphql3.print)(optimizedQuery);
+          } catch (e) {
+            throw new Error(`Invalid query provided, Error message: ${e.message}`);
+          }
+        }
         if (!lookup) {
           return value;
         }
@@ -23391,17 +23428,17 @@ var Database = class {
       }
     };
     this.addPendingDocument = async (filepath, data) => {
-      const { stringifiedFile, payload } = await this.stringifyFile(filepath, data);
+      const { stringifiedFile, payload, keepTemplateKey } = await this.stringifyFile(filepath, data);
       if (this.store.supportsSeeding()) {
         await this.bridge.put(filepath, stringifiedFile);
       }
-      await this.store.put(filepath, payload);
+      await this.store.put(filepath, payload, keepTemplateKey);
     };
     this.put = async (filepath, data) => {
       if (SYSTEM_FILES.includes(filepath)) {
         throw new Error(`Unexpected put for config file ${filepath}`);
       } else {
-        const { stringifiedFile, payload } = await this.stringifyFile(filepath, data);
+        const { stringifiedFile, payload, keepTemplateKey } = await this.stringifyFile(filepath, data);
         if (this.store.supportsSeeding()) {
           await this.bridge.put(filepath, stringifiedFile);
         }
@@ -23412,7 +23449,7 @@ var Database = class {
             database: this
           });
         }
-        await this.store.put(filepath, payload);
+        await this.store.put(filepath, payload, keepTemplateKey);
       }
       return true;
     };
@@ -23458,7 +23495,11 @@ var Database = class {
         }
         const extension2 = import_path4.default.extname(filepath);
         const stringifiedFile = stringifyFile(payload, extension2, templateInfo.type === "union");
-        return { stringifiedFile, payload };
+        return {
+          stringifiedFile,
+          payload,
+          keepTemplateKey: templateInfo.type === "union"
+        };
       }
     };
     this.flush = async (filepath) => {
@@ -23579,21 +23620,31 @@ var indexDocument = async ({
   data,
   database
 }) => {
+  var _a;
   const schema = await database.getSchema();
   const collection = await schema.getCollectionByFullPath(filepath);
-  const existingData = await database.get(filepath);
-  const attributesToFilterOut = await _indexCollectable({
-    record: filepath,
-    value: existingData,
-    field: collection,
-    prefix: collection.name,
-    database
-  });
-  await sequential(attributesToFilterOut, async (attribute) => {
-    const records = await database.store.get(attribute) || [];
-    await database.store.put(attribute, records.filter((item) => item !== filepath));
-    return true;
-  });
+  let existingData;
+  try {
+    existingData = await database.get(filepath);
+  } catch (err) {
+    if (((_a = err.extensions) == null ? void 0 : _a["status"]) !== 404) {
+      throw err;
+    }
+  }
+  if (existingData) {
+    const attributesToFilterOut = await _indexCollectable({
+      record: filepath,
+      value: existingData,
+      field: collection,
+      prefix: collection.name,
+      database
+    });
+    await sequential(attributesToFilterOut, async (attribute) => {
+      const records = await database.store.get(attribute) || [];
+      await database.store.put(attribute, records.filter((item) => item !== filepath));
+      return true;
+    });
+  }
   const attributes = await _indexCollectable({
     record: filepath,
     field: collection,

package/dist/resolver/index.d.ts

@@ -27,7 +27,7 @@ export declare class Resolver {
     database: Database;
     tinaSchema: TinaSchema;
     constructor(init: ResolverConfig);
-    resolveCollection: (collectionName: string) => Promise<{
+    resolveCollection: (collectionName: string, hasDocuments?: boolean) => Promise<{
         fields: string | import("../types").TinaFieldInner<true>[];
         templates?: undefined;
         references?: import("../types").ReferenceTypeWithNamespace[];
@@ -37,7 +37,7 @@ export declare class Resolver {
         path: string;
         format?: "json" | "md" | "markdown" | "mdx";
         match?: string;
-        documents: string[];
+        documents: {};
     } | {
         templates: (string | {
             label: string;
@@ -54,7 +54,7 @@ export declare class Resolver {
         path: string;
         format?: "json" | "md" | "markdown" | "mdx";
         match?: string;
-        documents: string[];
+        documents: {};
     }>;
     getDocument: (fullPath: unknown) => Promise<{
         __typename: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "0.59.5",
+  "version": "0.59.8",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -45,6 +45,7 @@
     "test": "jest"
   },
   "dependencies": {
+    "@graphql-tools/relay-operation-optimizer": "^6.4.1",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
     "dataloader": "^2.0.0",
@@ -94,8 +95,8 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
-    "@tinacms/datalayer": "0.0.1",
-    "@tinacms/scripts": "0.50.5",
+    "@tinacms/datalayer": "0.0.2",
+    "@tinacms/scripts": "0.50.7",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",
     "@types/express": "^4.17.8",