@tinacms/graphql 0.61.6 → 0.62.0

package/dist/{src/build.d.ts → build.d.ts}

@@ -10,11 +10,25 @@ 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 { DocumentNode } from 'graphql';
 import type { TinaSchema } from './schema';
 import { Database } from './database';
-export declare const indexDB: ({ database, config, flags, buildSDK, }: {
+/**
+ *
+ * This will build the files (_schema.json, _lookup.json, _graphQL.json)
+ */
+export declare const indexDB: (args: {
     database: Database;
     config: TinaSchema['config'];
     flags?: string[];
     buildSDK?: boolean;
 }) => Promise<void>;
+export declare const buildFiles: ({ database, config, flags, buildSDK, }: {
+    database: Database;
+    config: TinaSchema['config'];
+    flags?: string[];
+    buildSDK?: boolean;
+}) => Promise<{
+    graphQLSchema: DocumentNode;
+    tinaSchema: TinaSchema;
+}>;

package/dist/{src/builder → builder}/index.d.ts

@@ -28,6 +28,7 @@ export declare class Builder {
         database: Database;
         tinaSchema: TinaSchema;
     };
+    private maxDepth;
     tinaSchema: TinaSchema;
     database: Database;
     constructor(config: {
@@ -173,8 +174,23 @@ export declare class Builder {
      * @param collection a Tina Cloud collection
      */
     collectionFragment: (collection: TinaCloudCollectionEnriched) => Promise<import("graphql").FragmentDefinitionNode>;
+    /**
+     * Given a collection this function returns its selections set. For example for Post this would return
+     *
+     * "
+     * body
+     * title
+     * ... on Author {
+     *   name
+     *   heroImg
+     * }
+     *
+     * But in the AST format
+     *
+     * */
+    private _getCollectionFragmentSelections;
     private _buildFieldNodeForFragments;
-    buildTemplateFragments(template: Template<true>): Promise<InlineFragmentNode>;
+    buildTemplateFragments(template: Template<true>, depth: number): Promise<InlineFragmentNode>;
     /**
      * ```graphql
      * # ex.

package/dist/index.d.ts

@@ -1 +1,32 @@
-export * from "../src/index"
+/**
+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.
+*/
+export { indexDB } from './build';
+export { resolve } from './resolve';
+export * from './resolver/error';
+export { createDatabase } from './database';
+export type { QueryOptions } from './database';
+import type { Database } from './database';
+export type { Database } from './database';
+export type { Store } from '@tinacms/datalayer';
+export type { Bridge } from './database/bridge';
+export { sequential, assertShape } from './util';
+export { stringifyFile, parseFile } from './database/util';
+export declare type DummyType = unknown;
+export declare const buildSchema: (rootPath: string, database: Database, flags?: string[], skipIndexing?: boolean) => Promise<import("graphql").GraphQLSchema>;
+import type { TinaCloudSchema as TinaCloudSchemaBase, TinaCloudCollection as TinaCloudCollectionBase, TinaCloudTemplateBase as TinaTemplate, TinaFieldBase } from './types';
+export declare type TinaCloudSchema = TinaCloudSchemaBase<false>;
+export declare type TinaSchema = TinaCloudSchema;
+export declare type TinaCloudCollection = TinaCloudCollectionBase<false>;
+export declare type TinaCollection = TinaCloudCollectionBase<false>;
+export declare type TinaField = TinaFieldBase;
+export type { TinaTemplate };

package/dist/index.js

@@ -7009,32 +7009,30 @@ var Builder = class {
     this.collectionFragment = async (collection) => {
       const name2 = NAMER.dataTypeName(collection.namespace);
       const fragmentName = NAMER.fragmentName(collection.namespace);
+      const selections = await this._getCollectionFragmentSelections(collection, 0);
+      return astBuilder.FragmentDefinition({
+        name: name2,
+        fragmentName,
+        selections: filterSelections(selections)
+      });
+    };
+    this._getCollectionFragmentSelections = async (collection, depth) => {
+      const selections = [];
       if (typeof collection.fields === "object") {
-        const selections = [];
         await sequential(collection.fields, async (x) => {
-          const field = await this._buildFieldNodeForFragments(x);
+          const field = await this._buildFieldNodeForFragments(x, depth);
           selections.push(field);
         });
-        return astBuilder.FragmentDefinition({
-          name: name2,
-          fragmentName,
-          selections: filterSelections(selections)
-        });
       } else {
-        const selections = [];
         await sequential(collection.templates, async (tem) => {
           if (typeof tem === "object") {
-            selections.push(await this.buildTemplateFragments(tem));
+            selections.push(await this.buildTemplateFragments(tem, depth));
           }
         });
-        return astBuilder.FragmentDefinition({
-          name: name2,
-          fragmentName,
-          selections: filterSelections(selections)
-        });
       }
+      return selections;
     };
-    this._buildFieldNodeForFragments = async (field) => {
+    this._buildFieldNodeForFragments = async (field, depth) => {
       switch (field.type) {
         case "string":
         case "image":
@@ -7045,37 +7043,62 @@ var Builder = class {
           return astBuilder.FieldNodeDefinition(field);
         case "object":
           if (typeof field.fields === "object") {
-            const selections = [];
+            const selections2 = [];
             await sequential(field.fields, async (item) => {
-              const field2 = await this._buildFieldNodeForFragments(item);
-              selections.push(field2);
+              const field2 = await this._buildFieldNodeForFragments(item, depth);
+              selections2.push(field2);
             });
             return astBuilder.FieldWithSelectionSetDefinition({
               name: field.name,
               selections: [
                 { kind: "Field", name: { kind: "Name", value: "__typename" } },
-                ...filterSelections(selections)
+                ...filterSelections(selections2)
               ]
             });
           } else if (typeof field.templates === "object") {
-            const selections = [];
+            const selections2 = [];
             await sequential(field.templates, async (tem) => {
               if (typeof tem === "object") {
-                selections.push(await this.buildTemplateFragments(tem));
+                selections2.push(await this.buildTemplateFragments(tem, depth));
               }
             });
             return astBuilder.FieldWithSelectionSetDefinition({
               name: field.name,
               selections: [
                 { kind: "Field", name: { kind: "Name", value: "__typename" } },
-                ...filterSelections(selections)
+                ...filterSelections(selections2)
               ]
             });
           }
         case "reference":
+          if (depth >= this.maxDepth)
+            return false;
+          if (!("collections" in field)) {
+            return false;
+          }
+          const selections = [];
+          await sequential(field.collections, async (col) => {
+            const collection = this.tinaSchema.getCollection(col);
+            selections.push({
+              kind: "InlineFragment",
+              typeCondition: {
+                kind: "NamedType",
+                name: {
+                  kind: "Name",
+                  value: NAMER.documentTypeName(collection.namespace)
+                }
+              },
+              directives: [],
+              selectionSet: {
+                kind: "SelectionSet",
+                selections: filterSelections(await this._getCollectionFragmentSelections(collection, depth + 1))
+              }
+            });
+          });
           return astBuilder.FieldWithSelectionSetDefinition({
             name: field.name,
             selections: [
+              ...selections,
               {
                 kind: "InlineFragment",
                 typeCondition: {
@@ -7716,13 +7739,15 @@ Visit https://tina.io/docs/errors/ui-not-supported/ for more information
         ]
       });
     };
+    var _a, _b, _c, _d;
+    this.maxDepth = (_d = (_c = (_b = (_a = config == null ? void 0 : config.tinaSchema.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.client) == null ? void 0 : _c.referenceDepth) != null ? _d : 5;
     this.tinaSchema = config.tinaSchema;
     this.database = config.database;
   }
-  async buildTemplateFragments(template) {
+  async buildTemplateFragments(template, depth) {
     const selections = [];
     await sequential(template.fields || [], async (item) => {
-      const field = await this._buildFieldNodeForFragments(item);
+      const field = await this._buildFieldNodeForFragments(item, depth);
       selections.push(field);
     });
     return astBuilder.InlineFragmentDefinition({
@@ -7873,7 +7898,7 @@ var validateField = async (field) => {
 
 // package.json
 var name = "@tinacms/graphql";
-var version = "0.61.6";
+var version = "0.62.0";
 var main = "dist/index.js";
 var typings = "dist/index.d.ts";
 var files = [
@@ -8230,7 +8255,11 @@ var TinaSchema = class {
 
 // src/build.ts
 var import_path = __toModule(require("path"));
-var indexDB = async ({
+var indexDB = async (args) => {
+  const { graphQLSchema, tinaSchema } = await buildFiles(args);
+  await args.database.indexContent({ graphQLSchema, tinaSchema });
+};
+var buildFiles = async ({
   database,
   config,
   flags = [],
@@ -8253,11 +8282,11 @@ var indexDB = async ({
   } else {
     graphQLSchema = JSON.parse(await database.bridge.get(".tina/__generated__/_graphql.json"));
   }
-  await database.indexContent({ graphQLSchema, tinaSchema });
   if (buildSDK) {
     await _buildFragments(builder, tinaSchema, database.bridge.rootPath);
     await _buildQueries(builder, tinaSchema, database.bridge.rootPath);
   }
+  return { graphQLSchema, tinaSchema };
 };
 var _buildFragments = async (builder, tinaSchema, rootPath) => {
   const fragmentDefinitionsFields = [];
@@ -24469,46 +24498,35 @@ 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) {
-        let conditions;
-        if (args.filter) {
-          if (collection.fields) {
-            conditions = await this.resolveFilterConditions(args.filter, collection.fields, collection.name);
-          } else if (collection.templates) {
-            for (const templateName of Object.keys(args.filter)) {
-              const template = collection.templates.find((template2) => template2.name === templateName);
-              if (template) {
-                conditions = await this.resolveFilterConditions(args.filter[templateName], template.fields, `${collection.name}.${templateName}`);
-              } else {
-                throw new Error(`Error template not found: ${templateName} in collection ${collection.name}`);
-              }
+      let conditions;
+      if (args.filter) {
+        if (collection.fields) {
+          conditions = await this.resolveFilterConditions(args.filter, collection.fields, collection.name);
+        } else if (collection.templates) {
+          for (const templateName of Object.keys(args.filter)) {
+            const template = collection.templates.find((template2) => template2.name === templateName);
+            if (template) {
+              conditions = await this.resolveFilterConditions(args.filter[templateName], template.fields, `${collection.name}.${templateName}`);
+            } else {
+              throw new Error(`Error template not found: ${templateName} in collection ${collection.name}`);
             }
           }
         }
-        const queryOptions = {
-          filterChain: (0, import_datalayer.makeFilterChain)({
-            conditions: conditions || []
-          }),
-          collection: collection.name,
-          sort: args.sort,
-          first: args.first,
-          last: args.last,
-          before: args.before,
-          after: args.after
-        };
-        const result = await this.database.query(queryOptions, hydrator ? hydrator : this.getDocument);
-        edges = result.edges;
-        pageInfo = result.pageInfo;
-      } else {
-        const ext = (collection == null ? void 0 : collection.format) || ".md";
-        edges = (await this.database.store.glob(collection.path, this.getDocument, ext)).map((document3) => ({
-          node: document3
-        }));
       }
+      const queryOptions = {
+        filterChain: (0, import_datalayer.makeFilterChain)({
+          conditions: conditions || []
+        }),
+        collection: collection.name,
+        sort: args.sort,
+        first: args.first,
+        last: args.last,
+        before: args.before,
+        after: args.after
+      };
+      const result = await this.database.query(queryOptions, hydrator ? hydrator : this.getDocument);
+      const edges = result.edges;
+      const pageInfo = result.pageInfo;
       return {
         totalCount: edges.length,
         edges,
@@ -25422,11 +25440,15 @@ var _deleteIndexContent = async (database, documentPaths, collection) => {
 };
 
 // src/index.ts
-var buildSchema = async (rootPath, database, flags) => {
+var buildSchema = async (rootPath, database, flags, skipIndexing) => {
   const tempConfig = import_path5.default.join(rootPath, ".tina", "__generated__", "config");
   const config = await import_fs_extra2.default.readFileSync(import_path5.default.join(tempConfig, "schema.json")).toString();
   await import_fs_extra2.default.rm(tempConfig, { recursive: true });
-  await indexDB({ database, config: JSON.parse(config), flags });
+  if (skipIndexing != null ? skipIndexing : false) {
+    await buildFiles({ database, config: JSON.parse(config), flags });
+  } else {
+    await indexDB({ database, config: JSON.parse(config), flags });
+  }
   const gqlAst = await database.getGraphQLSchemaFromBridge();
   return (0, import_graphql5.buildASTSchema)(gqlAst);
 };

package/dist/{src/resolver → resolver}/index.d.ts

@@ -210,9 +210,17 @@ export declare class Resolver {
         collection: TinaCloudCollection<true>;
         hydrator?: (string: any) => any;
     }) => Promise<{
-        totalCount: any;
-        edges: any;
-        pageInfo: any;
+        totalCount: number;
+        edges: {
+            node: any;
+            cursor: string;
+        }[];
+        pageInfo: {
+            hasPreviousPage: boolean;
+            hasNextPage: boolean;
+            startCursor: string;
+            endCursor: string;
+        };
     }>;
     private buildFieldMutations;
     private resolveFieldData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "0.61.6",
+  "version": "0.62.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -39,8 +39,8 @@
   },
   "dependencies": {
     "@graphql-tools/relay-operation-optimizer": "^6.4.1",
-    "@tinacms/datalayer": "0.2.1",
-    "@tinacms/schema-tools": "0.0.8",
+    "@tinacms/datalayer": "0.2.2",
+    "@tinacms/schema-tools": "0.0.9",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
     "dataloader": "^2.0.0",
@@ -90,8 +90,8 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
-    "@tinacms/datalayer": "0.2.1",
-    "@tinacms/schema-tools": "0.0.8",
+    "@tinacms/datalayer": "0.2.2",
+    "@tinacms/schema-tools": "0.0.9",
     "@tinacms/scripts": "0.50.9",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",

package/dist/src/index.d.ts

@@ -1,31 +0,0 @@
-/**
-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.
-*/
-export { indexDB } from './build';
-export { resolve } from './resolve';
-export * from './resolver/error';
-export { createDatabase } from './database';
-export type { QueryOptions } from './database';
-import type { Database } from './database';
-export type { Database } from './database';
-export type { Store } from '@tinacms/datalayer';
-export type { Bridge } from './database/bridge';
-export { sequential, assertShape } from './util';
-export { stringifyFile, parseFile } from './database/util';
-export declare const buildSchema: (rootPath: string, database: Database, flags?: string[]) => Promise<import("graphql").GraphQLSchema>;
-import type { TinaCloudSchema as TinaCloudSchemaBase, TinaCloudCollection as TinaCloudCollectionBase, TinaCloudTemplateBase as TinaTemplate, TinaFieldBase } from './types';
-export declare type TinaCloudSchema = TinaCloudSchemaBase<false>;
-export declare type TinaSchema = TinaCloudSchema;
-export declare type TinaCloudCollection = TinaCloudCollectionBase<false>;
-export declare type TinaCollection = TinaCloudCollectionBase<false>;
-export declare type TinaField = TinaFieldBase;
-export type { TinaTemplate };