@tinacms/graphql 0.0.0-20224417538 → 0.0.0-2022510161017

package/CHANGELOG.md

@@ -1,10 +1,47 @@
 # tina-graphql
 
-## 0.0.0-20224417538
+## 0.0.0-2022510161017
 
 ### Patch Changes
 
-- 3abe46552: Add optional indexing status callback to Database
+- 7194aa3a0: Experimental isomorphic git bridge implementation
+- Updated dependencies [7194aa3a0]
+  - @tinacms/datalayer@0.0.0-2022510161017
+
+## 0.60.5
+
+### Patch Changes
+
+- 57f09bdd7: Always use the query function when the dataLayer in enabled
+
+## 0.60.4
+
+### Patch Changes
+
+- d103b27ad: Fix issue where new collections would not be added when CLI restarts
+
+## 0.60.3
+
+### Patch Changes
+
+- 79d112d79: Update cli to accept tinaCloudMediaStore flag and add to metadata during schema compilation
+- 3f46c6706: Fixed issue where generated SDK would not work with templates
+- db9168578: Adds support for an `assetsHost` when resolving `image` fields with `useRelativeMedia`
+- 91d6e6758: Fix issues with experimentalData on windows related to path separator inconsistency and interference with the .tina/**generated** folder
+
+## 0.60.2
+
+### Patch Changes
+
+- 08cdb672a: Adds `useRelativeMedia` support to local graphql client
+- fdbfe9a16: Fixes issue where on windows documents could not be deleted localy
+- 6e2ed31a2: Added `isTitle` property to the schema that allows the title to be displayed in the CMS
+
+## 0.60.1
+
+### Patch Changes
+
+- 3b11ff6ad: Add optional indexing status callback to Database
 
 ## 0.60.0
 

package/dist/build.d.ts

@@ -12,8 +12,9 @@ limitations under the License.
 */
 import type { TinaSchema } from './schema';
 import { Database } from './database';
-export declare const indexDB: ({ database, config, buildSDK, }: {
+export declare const indexDB: ({ database, config, flags, buildSDK, }: {
     database: Database;
     config: TinaSchema['config'];
+    flags?: string[];
     buildSDK?: boolean;
 }) => Promise<void>;

package/dist/database/index.d.ts

@@ -44,8 +44,6 @@ export declare class Database {
     private tinaSchema;
     private collectionIndexDefinitions;
     private _lookup;
-    private _graphql;
-    private _tinaSchema;
     constructor(config: CreateDatabase);
     private collectionForPath;
     private partitionPathsByCollection;
@@ -65,6 +63,10 @@ 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/database/util.d.ts

@@ -14,3 +14,4 @@ import * as yup from 'yup';
 export declare const stringifyFile: (content: object, format: FormatType | string, keepTemplateKey: boolean) => string;
 export declare const parseFile: <T extends object>(content: string, format: FormatType | string, yupSchema: (args: typeof yup) => yup.ObjectSchema<any>) => T;
 export declare type FormatType = 'json' | 'md' | 'mdx' | 'markdown';
+export declare const normalizePath: (filepath: string) => string;

package/dist/index.d.ts

@@ -20,7 +20,7 @@ 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) => Promise<import("graphql").GraphQLSchema>;
+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;

package/dist/index.js

@@ -10911,15 +10911,31 @@ var astBuilder = {
             selectionSet: {
               kind: "SelectionSet",
               selections: [
-                SysFieldDefinition,
                 {
-                  kind: "Field",
-                  name: {
-                    kind: "Name",
-                    value: "id"
+                  kind: "InlineFragment",
+                  typeCondition: {
+                    kind: "NamedType",
+                    name: {
+                      kind: "Name",
+                      value: "Document"
+                    }
                   },
-                  arguments: [],
-                  directives: []
+                  directives: [],
+                  selectionSet: {
+                    kind: "SelectionSet",
+                    selections: [
+                      SysFieldDefinition,
+                      {
+                        kind: "Field",
+                        name: {
+                          kind: "Name",
+                          value: "id"
+                        },
+                        arguments: [],
+                        directives: []
+                      }
+                    ]
+                  }
                 },
                 {
                   kind: "FragmentSpread",
@@ -10995,15 +11011,31 @@ var astBuilder = {
                           kind: "SelectionSet",
                           selections: [
                             {
-                              kind: "Field",
-                              name: {
-                                kind: "Name",
-                                value: "id"
+                              kind: "InlineFragment",
+                              typeCondition: {
+                                kind: "NamedType",
+                                name: {
+                                  kind: "Name",
+                                  value: "Document"
+                                }
                               },
-                              arguments: [],
-                              directives: []
+                              directives: [],
+                              selectionSet: {
+                                kind: "SelectionSet",
+                                selections: [
+                                  SysFieldDefinition,
+                                  {
+                                    kind: "Field",
+                                    name: {
+                                      kind: "Name",
+                                      value: "id"
+                                    },
+                                    arguments: [],
+                                    directives: []
+                                  }
+                                ]
+                              }
                             },
-                            SysFieldDefinition,
                             {
                               kind: "FragmentSpread",
                               name: {
@@ -11264,6 +11296,11 @@ var scalarDefinitions = [
         required: true,
         type: astBuilder.TYPES.String
       }),
+      astBuilder.FieldDefinition({
+        name: "title",
+        required: false,
+        type: astBuilder.TYPES.String
+      }),
       astBuilder.FieldDefinition({
         name: "basename",
         required: true,
@@ -12443,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.0";
+var version = "0.60.5";
 var main = "dist/index.js";
 var typings = "dist/index.d.ts";
 var files = [
@@ -12485,7 +12522,8 @@ var scripts = {
   build: 'echo "Run `yarn build` from the root of the repository instead"',
   docs: "yarn typedoc",
   serve: "yarn nodemon dist/server.js",
-  test: "jest"
+  test: "jest",
+  "test-watch": "jest --watch"
 };
 var dependencies = {
   "@graphql-tools/relay-operation-optimizer": "^6.4.1",
@@ -12540,6 +12578,7 @@ var repository = {
 };
 var devDependencies = {
   "@tinacms/datalayer": "workspace:*",
+  "@tinacms/schema-tools": "workspace:*",
   "@tinacms/scripts": "workspace:*",
   "@types/cors": "^2.8.7",
   "@types/estree": "^0.0.50",
@@ -12563,6 +12602,9 @@ var devDependencies = {
   nodemon: "^2.0.4",
   typescript: "^4.3.5"
 };
+var peerDependencies = {
+  "@tinacms/schema-tools": "*"
+};
 var package_default = {
   name,
   version,
@@ -12575,7 +12617,8 @@ var package_default = {
   dependencies,
   publishConfig,
   repository,
-  devDependencies
+  devDependencies,
+  peerDependencies
 };
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/resolver/error.ts
@@ -12763,11 +12806,16 @@ var import_path = __toModule(require("path"));
 var indexDB = async ({
   database,
   config,
+  flags = [],
   buildSDK = true
 }) => {
-  const flags = [];
   if (database.store.supportsIndexing()) {
-    flags.push("experimentalData");
+    if (flags.indexOf("experimentalData") === -1) {
+      flags.push("experimentalData");
+    }
+    if (flags.indexOf("isomorphicGitBridge") === -1) {
+      flags.push("isomorphicGitBridge");
+    }
   }
   const tinaSchema = await createSchema({ schema: config, flags });
   const builder = await createBuilder({
@@ -22452,15 +22500,11 @@ var createResolver2 = (args) => {
 var Resolver = class {
   constructor(init) {
     this.init = init;
-    this.resolveCollection = async (collectionName, hasDocuments) => {
+    this.resolveCollection = async (args, collectionName, hasDocuments) => {
       const collection = this.tinaSchema.getCollection(collectionName);
       const extraFields = {};
-      let documents = {};
-      if (hasDocuments) {
-        documents = await this.getDocumentsForCollection(collectionName);
-      }
       return __spreadValues(__spreadValues({
-        documents
+        documents: { collection, hasDocuments }
       }, collection), extraFields);
     };
     this.getDocument = async (fullPath) => {
@@ -22486,11 +22530,19 @@ var Resolver = class {
           _template: rawData._template
         };
         await sequential(template.fields, async (field) => this.resolveFieldData(field, rawData, data));
+        const titleField = template.fields.find((x) => {
+          if (x.type === "string" && (x == null ? void 0 : x.isTitle)) {
+            return true;
+          }
+        });
+        const titleFieldName = titleField == null ? void 0 : titleField.name;
+        const title = data[titleFieldName || " "] || null;
         return __spreadProps(__spreadValues({
           __typename: collection.fields ? NAMER.documentTypeName(collection.namespace) : NAMER.documentTypeName(template.namespace),
           id: fullPath
         }, data), {
           _sys: {
+            title,
             basename,
             filename,
             extension: extension2,
@@ -22702,10 +22754,6 @@ 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) {
@@ -22730,9 +22778,11 @@ var Resolver = class {
       collection,
       hydrator
     }) => {
+      var _a, _b, _c, _d;
       let edges;
       let pageInfo;
-      if (args.filter || args.sort) {
+      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) {
@@ -22835,9 +22885,19 @@ var Resolver = class {
         case "boolean":
         case "number":
         case "reference":
-        case "image":
           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;
+          }
+          break;
         case "rich-text":
           const tree = parseMDX(value, field);
           accumulator[field.name] = tree;
@@ -22903,6 +22963,7 @@ var Resolver = class {
       }));
       return args.params;
     };
+    this.config = init.config;
     this.database = init.database;
     this.tinaSchema = init.tinaSchema;
   }
@@ -22939,17 +23000,22 @@ 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 ({
+  config,
   query,
   variables,
   database,
   silenceErrors
 }) => {
+  var _a;
   try {
     const graphQLSchemaAst = await database.getGraphQLSchema();
     const graphQLSchema = (0, import_graphql3.buildASTSchema)(graphQLSchemaAst);
-    const config = await database.getTinaSchema();
-    const tinaSchema = await createSchema({ schema: config });
-    const resolver2 = await createResolver2({ database, tinaSchema });
+    const tinaConfig = await database.getTinaSchema();
+    const tinaSchema = await createSchema({
+      schema: tinaConfig,
+      flags: (_a = tinaConfig == null ? void 0 : tinaConfig.meta) == null ? void 0 : _a.flags
+    });
+    const resolver2 = await createResolver2({ config, database, tinaSchema });
     const res = await (0, import_graphql3.graphql)({
       schema: graphQLSchema,
       source: query,
@@ -22981,19 +23047,19 @@ 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 _a;
-              return ((_a = x == null ? void 0 : x.name) == null ? void 0 : _a.value) === "documents";
+              var _a2;
+              return ((_a2 = x == null ? void 0 : x.name) == null ? void 0 : _a2.value) === "documents";
             });
             return tinaSchema.getCollections().map((collection) => {
-              return resolver2.resolveCollection(collection.name, Boolean(hasDocuments2));
+              return resolver2.resolveCollection(args, collection.name, Boolean(hasDocuments2));
             });
           }
           const collectionNode = info.fieldNodes.find((x) => x.name.value === "collection");
           const hasDocuments = collectionNode.selectionSet.selections.find((x) => {
-            var _a;
-            return ((_a = x == null ? void 0 : x.name) == null ? void 0 : _a.value) === "documents";
+            var _a2;
+            return ((_a2 = x == null ? void 0 : x.name) == null ? void 0 : _a2.value) === "documents";
           });
-          return resolver2.resolveCollection(args.collection, Boolean(hasDocuments));
+          return resolver2.resolveCollection(args, args.collection, Boolean(hasDocuments));
         }
         if (info.fieldName === "getOptimizedQuery") {
           try {
@@ -23054,6 +23120,11 @@ var resolve = async ({
                   return { node: document3 };
                 })
               };
+            } else if (info.fieldName === "documents" && (value == null ? void 0 : value.collection) && (value == null ? void 0 : value.hasDocuments)) {
+              return resolver2.resolveCollectionConnection({
+                args,
+                collection: value.collection
+              });
             } else {
               throw new Error(`Expected an array for result of ${info.fieldName} at ${info.path}`);
             }
@@ -23175,6 +23246,7 @@ var parseFile = (content3, format, yupSchema) => {
       throw new Error(`Must specify a valid format, got ${format}`);
   }
 };
+var normalizePath = (filepath) => filepath.replace(/\\/g, "/");
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/database/index.ts
 var import_datalayer2 = __toModule(require("@tinacms/datalayer"));
@@ -23192,7 +23264,7 @@ var Database = class {
     this.config = config;
     this.collectionForPath = async (filepath) => {
       const tinaSchema = await this.getSchema();
-      const collection = tinaSchema.schema.collections.find((collection2) => filepath.startsWith(collection2.path));
+      const collection = await tinaSchema.getCollectionByFullPath(filepath);
       return collection;
     };
     this.get = async (filepath) => {
@@ -23201,7 +23273,7 @@ var Database = class {
       } else {
         const tinaSchema = await this.getSchema();
         const extension2 = import_path4.default.extname(filepath);
-        const contentObject = await this.store.get(filepath);
+        const contentObject = await this.store.get(normalizePath(filepath));
         if (!contentObject) {
           throw new import_graphql4.GraphQLError(`Unable to find record ${filepath}`);
         }
@@ -23241,9 +23313,9 @@ var Database = class {
         collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
       }
       if (this.store.supportsSeeding()) {
-        await this.bridge.put(filepath, stringifiedFile);
+        await this.bridge.put(normalizePath(filepath), stringifiedFile);
       }
-      await this.store.put(filepath, payload, {
+      await this.store.put(normalizePath(filepath), payload, {
         keepTemplateKey,
         collection: collection == null ? void 0 : collection.name,
         indexDefinitions: collectionIndexDefinitions
@@ -23260,9 +23332,9 @@ var Database = class {
         }
         const { stringifiedFile, payload, keepTemplateKey } = await this.stringifyFile(filepath, data);
         if (this.store.supportsSeeding()) {
-          await this.bridge.put(filepath, stringifiedFile);
+          await this.bridge.put(normalizePath(filepath), stringifiedFile);
         }
-        await this.store.put(filepath, payload, {
+        await this.store.put(normalizePath(filepath), payload, {
           keepTemplateKey,
           collection,
           indexDefinitions: collectionIndexDefinitions
@@ -23327,23 +23399,23 @@ var Database = class {
     this.getLookup = async (returnType) => {
       const lookupPath = import_path4.default.join(GENERATED_FOLDER, `_lookup.json`);
       if (!this._lookup) {
-        const _lookup = await this.store.get(lookupPath);
+        const _lookup = await this.store.get(normalizePath(lookupPath));
         this._lookup = _lookup;
       }
       return this._lookup[returnType];
     };
     this.getGraphQLSchema = async () => {
       const graphqlPath = import_path4.default.join(GENERATED_FOLDER, `_graphql.json`);
-      return this.store.get(graphqlPath);
+      return this.store.get(normalizePath(graphqlPath));
     };
     this.getGraphQLSchemaFromBridge = async () => {
       const graphqlPath = import_path4.default.join(GENERATED_FOLDER, `_graphql.json`);
-      const _graphql = await this.bridge.get(graphqlPath);
+      const _graphql = await this.bridge.get(normalizePath(graphqlPath));
       return JSON.parse(_graphql);
     };
     this.getTinaSchema = async () => {
       const schemaPath = import_path4.default.join(GENERATED_FOLDER, `_schema.json`);
-      return this.store.get(schemaPath);
+      return this.store.get(normalizePath(schemaPath));
     };
     this.getSchema = async () => {
       if (this.tinaSchema) {
@@ -23463,8 +23535,8 @@ var Database = class {
       tinaSchema
     }) => {
       if (this.bridge.supportsBuilding()) {
-        await this.bridge.putConfig(import_path4.default.join(GENERATED_FOLDER, `_graphql.json`), JSON.stringify(graphQLSchema));
-        await this.bridge.putConfig(import_path4.default.join(GENERATED_FOLDER, `_schema.json`), JSON.stringify(tinaSchema.schema));
+        await this.bridge.putConfig(normalizePath(import_path4.default.join(GENERATED_FOLDER, `_graphql.json`)), JSON.stringify(graphQLSchema));
+        await this.bridge.putConfig(normalizePath(import_path4.default.join(GENERATED_FOLDER, `_schema.json`)), JSON.stringify(tinaSchema.schema));
       }
     };
     this.indexContent = async ({
@@ -23472,12 +23544,12 @@ var Database = class {
       tinaSchema
     }) => {
       await this.indexStatusCallbackWrapper(async () => {
-        const lookup = JSON.parse(await this.bridge.get(import_path4.default.join(GENERATED_FOLDER, "_lookup.json")));
+        const lookup = JSON.parse(await this.bridge.get(normalizePath(import_path4.default.join(GENERATED_FOLDER, "_lookup.json"))));
         if (this.store.supportsSeeding()) {
           await this.store.clear();
-          await this.store.seed(import_path4.default.join(GENERATED_FOLDER, "_graphql.json"), graphQLSchema);
-          await this.store.seed(import_path4.default.join(GENERATED_FOLDER, "_schema.json"), tinaSchema.schema);
-          await this.store.seed(import_path4.default.join(GENERATED_FOLDER, "_lookup.json"), lookup);
+          await this.store.seed(normalizePath(import_path4.default.join(GENERATED_FOLDER, "_graphql.json")), graphQLSchema);
+          await this.store.seed(normalizePath(import_path4.default.join(GENERATED_FOLDER, "_schema.json")), tinaSchema.schema);
+          await this.store.seed(normalizePath(import_path4.default.join(GENERATED_FOLDER, "_lookup.json")), lookup);
           await this._indexAllContent();
         } else {
           if (this.store.supportsIndexing()) {
@@ -23505,23 +23577,22 @@ var Database = class {
       });
     };
     this.delete = async (filepath) => {
-      const tinaSchema = await this.getSchema();
-      const collection = tinaSchema.schema.collections.find((collection2) => filepath.startsWith(collection2.path));
+      const collection = await this.collectionForPath(filepath);
       let collectionIndexDefinitions;
       if (collection) {
         const indexDefinitions = await this.getIndexDefinitions();
         collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
       }
-      await this.store.delete(filepath, {
+      await this.store.delete(normalizePath(filepath), {
         collection: collection.name,
         indexDefinitions: collectionIndexDefinitions
       });
-      await this.bridge.delete(filepath);
+      await this.bridge.delete(normalizePath(filepath));
     };
     this._indexAllContent = async () => {
       const tinaSchema = await this.getSchema();
       await sequential(tinaSchema.getCollections(), async (collection) => {
-        const documentPaths = await this.bridge.glob(collection.path);
+        const documentPaths = await this.bridge.glob(normalizePath(collection.path));
         await _indexContent(this, documentPaths, collection);
       });
     };
@@ -23529,14 +23600,14 @@ var Database = class {
       const lookupPath = import_path4.default.join(GENERATED_FOLDER, `_lookup.json`);
       let lookupMap;
       try {
-        lookupMap = JSON.parse(await this.bridge.get(lookupPath));
+        lookupMap = JSON.parse(await this.bridge.get(normalizePath(lookupPath)));
       } catch (e) {
         lookupMap = {};
       }
       const updatedLookup = __spreadProps(__spreadValues({}, lookupMap), {
         [lookup.type]: lookup
       });
-      await this.bridge.putConfig(lookupPath, JSON.stringify(updatedLookup));
+      await this.bridge.putConfig(normalizePath(lookupPath), JSON.stringify(updatedLookup));
     };
     this.bridge = config.bridge;
     this.store = config.store;
@@ -23560,6 +23631,10 @@ var Database = class {
     }
     return { pathsByCollection, nonCollectionPaths, collections };
   }
+  clearCache() {
+    this.tinaSchema = null;
+    this._lookup = null;
+  }
   async indexStatusCallbackWrapper(fn) {
     await this.indexStatusCallback({ status: "inprogress" });
     try {
@@ -23592,10 +23667,10 @@ var _indexContent = async (database, documentPaths, collection) => {
     };
   }
   await sequential(documentPaths, async (filepath) => {
-    const dataString = await database.bridge.get(filepath);
+    const dataString = await database.bridge.get(normalizePath(filepath));
     const data = parseFile(dataString, import_path4.default.extname(filepath), (yup3) => yup3.object({}));
     if (database.store.supportsSeeding()) {
-      await database.store.seed(filepath, data, seedOptions);
+      await database.store.seed(normalizePath(filepath), data, seedOptions);
     }
   });
 };
@@ -23618,11 +23693,11 @@ var _deleteIndexContent = async (database, documentPaths, collection) => {
 };
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/index.ts
-var buildSchema = async (rootPath, database) => {
+var buildSchema = async (rootPath, database, flags) => {
   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.rmdir(tempConfig, { recursive: true });
-  await indexDB({ database, config: JSON.parse(config) });
+  await indexDB({ database, config: JSON.parse(config), flags });
   const gqlAst = await database.getGraphQLSchemaFromBridge();
   return (0, import_graphql5.buildASTSchema)(gqlAst);
 };

package/dist/resolve.d.ts

@@ -11,7 +11,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import type { Database } from './database';
-export declare const resolve: ({ query, variables, database, silenceErrors, }: {
+import type { GraphQLConfig } from './types';
+export declare const resolve: ({ config, query, variables, database, silenceErrors, }: {
+    config?: GraphQLConfig;
     query: string;
     variables: object;
     database: Database;

package/dist/resolver/index.d.ts

@@ -11,10 +11,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import { Database } from '../database';
-import { TinaSchema } from '../schema';
-import type { Collectable, ReferenceTypeWithNamespace, TinaCloudCollection } from '../types';
-import { TinaFieldInner } from '../types';
+import type { Collectable, ReferenceTypeWithNamespace, TinaCloudCollection, TinaFieldInner, TinaSchema } from '@tinacms/schema-tools';
+import type { GraphQLConfig } from '../types';
 interface ResolverConfig {
+    config?: GraphQLConfig;
     database: Database;
     tinaSchema: TinaSchema;
 }
@@ -25,11 +25,12 @@ export declare const createResolver: (args: ResolverConfig) => Resolver;
  */
 export declare class Resolver {
     init: ResolverConfig;
+    config: GraphQLConfig;
     database: Database;
     tinaSchema: TinaSchema;
     constructor(init: ResolverConfig);
-    resolveCollection: (collectionName: string, hasDocuments?: boolean) => Promise<{
-        fields: string | TinaFieldInner<true>[];
+    resolveCollection: (args: any, collectionName: string, hasDocuments?: boolean) => Promise<{
+        fields: TinaFieldInner<true>[];
         templates?: undefined;
         references?: ReferenceTypeWithNamespace[];
         namespace: string[];
@@ -38,14 +39,18 @@ export declare class Resolver {
         path: string;
         format?: "json" | "md" | "markdown" | "mdx";
         match?: string;
-        indexes?: import("../types").TinaIndex[];
-        documents: {};
+        documents: {
+            collection: TinaCloudCollection<true>;
+            hasDocuments: boolean;
+        };
     } | {
         templates: (string | {
             label: string;
             name: string;
             fields: TinaFieldInner<true>[];
-            ui?: object;
+            ui?: object | (import("@tinacms/schema-tools").UIField<any, any> & {
+                previewSrc: string;
+            });
             namespace: string[];
         })[];
         fields?: undefined;
@@ -56,11 +61,14 @@ export declare class Resolver {
         path: string;
         format?: "json" | "md" | "markdown" | "mdx";
         match?: string;
-        indexes?: import("../types").TinaIndex[];
-        documents: {};
+        documents: {
+            collection: TinaCloudCollection<true>;
+            hasDocuments: boolean;
+        };
     }>;
     getDocument: (fullPath: unknown) => Promise<{
         _sys: {
+            title: any;
             basename: string;
             filename: string;
             extension: string;
@@ -92,6 +100,7 @@ export declare class Resolver {
         isAddPendingDocument: boolean;
     }) => Promise<{
         _sys: {
+            title: any;
             basename: string;
             filename: string;
             extension: string;
@@ -118,6 +127,7 @@ export declare class Resolver {
         isCollectionSpecific: boolean;
     }) => Promise<{
         _sys: {
+            title: any;
             basename: string;
             filename: string;
             extension: string;
@@ -146,6 +156,7 @@ export declare class Resolver {
         isCollectionSpecific?: boolean;
     }) => Promise<{
         _sys: {
+            title: any;
             basename: string;
             filename: string;
             extension: string;
@@ -171,6 +182,7 @@ export declare class Resolver {
         edges: {
             node: {
                 _sys: {
+                    title: any;
                     basename: string;
                     filename: string;
                     extension: string;
@@ -191,7 +203,6 @@ export declare class Resolver {
             };
         }[];
     }>;
-    getDocumentsForCollection: (collectionName: string) => Promise<string[]>;
     private referenceResolver;
     private resolveFilterConditions;
     resolveCollectionConnection: ({ args, collection, hydrator, }: {

package/dist/types.d.ts

@@ -263,4 +263,11 @@ export declare type Templateable = {
     fields: TinaFieldEnriched[];
     ui?: object;
 };
+export declare type GraphQLConfig = {
+    useRelativeMedia: true;
+} | {
+    useRelativeMedia: false;
+    clientId: string;
+    assetsHost: string;
+};
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "0.0.0-20224417538",
+  "version": "0.0.0-2022510161017",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -42,11 +42,12 @@
     "build": "echo \"Run `yarn build` from the root of the repository instead\"",
     "docs": "yarn typedoc",
     "serve": "yarn nodemon dist/server.js",
-    "test": "jest"
+    "test": "jest",
+    "test-watch": "jest --watch"
   },
   "dependencies": {
     "@graphql-tools/relay-operation-optimizer": "^6.4.1",
-    "@tinacms/datalayer": "0.1.1",
+    "@tinacms/datalayer": "0.0.0-2022510161017",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
     "dataloader": "^2.0.0",
@@ -96,7 +97,8 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
-    "@tinacms/datalayer": "0.1.1",
+    "@tinacms/datalayer": "0.0.0-2022510161017",
+    "@tinacms/schema-tools": "0.0.4",
     "@tinacms/scripts": "0.50.7",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",
@@ -119,5 +121,8 @@
     "jest-matcher-utils": "27.0.6",
     "nodemon": "^2.0.4",
     "typescript": "^4.3.5"
+  },
+  "peerDependencies": {
+    "@tinacms/schema-tools": "*"
   }
 }