@tinacms/graphql 1.3.2 → 1.3.3

package/dist/index.js

@@ -1580,8 +1580,9 @@ var Builder = class {
       });
     };
     this._getCollectionFragmentSelections = async (collection, depth) => {
+      var _a;
       const selections = [];
-      if (typeof collection.fields === "object") {
+      if (((_a = collection.fields) == null ? void 0 : _a.length) > 0) {
         await sequential(collection.fields, async (x) => {
           const field = await this._buildFieldNodeForFragments(x, depth);
           selections.push(field);
@@ -1596,6 +1597,7 @@ var Builder = class {
       return selections;
     };
     this._buildFieldNodeForFragments = async (field, depth) => {
+      var _a, _b;
       switch (field.type) {
         case "string":
         case "image":
@@ -1605,7 +1607,7 @@ var Builder = class {
         case "rich-text":
           return astBuilder.FieldNodeDefinition(field);
         case "object":
-          if (typeof field.fields === "object") {
+          if (((_a = field.fields) == null ? void 0 : _a.length) > 0) {
             const selections2 = [];
             await sequential(field.fields, async (item) => {
               const field2 = await this._buildFieldNodeForFragments(item, depth);
@@ -1618,7 +1620,7 @@ var Builder = class {
                 ...filterSelections(selections2)
               ]
             });
-          } else if (typeof field.templates === "object") {
+          } else if (((_b = field.templates) == null ? void 0 : _b.length) > 0) {
             const selections2 = [];
             await sequential(field.templates, async (tem) => {
               if (typeof tem === "object") {
@@ -2447,9 +2449,6 @@ var validateCollection = async (collection) => {
   const validCollection = await collectionSchema.cast(collection);
   if (validCollection.templates) {
     templates = await sequential(validCollection.templates, async (template) => {
-      if (typeof template === "string") {
-        throw new Error(`Global templates are not yet supported`);
-      }
       const fields2 = await sequential(template.fields, async (field) => {
         return validateField(field);
       });
@@ -2478,12 +2477,13 @@ var validateField = async (field) => {
     type: yup2.string().oneOf(FIELD_TYPES, (obj) => `'type' must be one of: ${obj.values}, but got '${obj.value}' at ${messageName}`)
   });
   await schema.validate(field);
-  return field;
+  const validField = await schema.cast(field);
+  return validField;
 };
 
 // package.json
 var name = "@tinacms/graphql";
-var version = "1.3.2";
+var version = "1.3.3";
 var main = "dist/index.js";
 var module2 = "dist/index.es.js";
 var typings = "dist/index.d.ts";
@@ -2842,16 +2842,7 @@ var resolveReferences = async (filter, fields, resolver) => {
         }
       } else if (fieldDefinition.type === "object") {
         if (fieldDefinition.templates) {
-          const globalTemplates = {};
-          for (const template of fieldDefinition.templates) {
-            if (typeof template === "string") {
-              globalTemplates[template] = 1;
-            }
-          }
           for (const templateName of Object.keys(filter[fieldKey])) {
-            if (templateName in globalTemplates) {
-              throw new Error("Global templates not yet supported for queries");
-            }
             const template = fieldDefinition.templates.find((template2) => !(typeof template2 === "string") && template2.name === templateName);
             if (template) {
               await resolveReferences(filter[fieldKey][templateName], template.fields, resolver);
@@ -2879,16 +2870,7 @@ var collectConditionsForChildFields = (filterNode, fields, pathExpression, colle
 };
 var collectConditionsForObjectField = (fieldName, field, filterNode, pathExpression, collectCondition) => {
   if (field.list && field.templates) {
-    const globalTemplates = {};
-    for (const template of field.templates) {
-      if (typeof template === "string") {
-        globalTemplates[template] = 1;
-      }
-    }
     for (const [filterKey, childFilterNode] of Object.entries(filterNode)) {
-      if (filterKey in globalTemplates) {
-        throw new Error("Global templates not yet supported for queries");
-      }
       const template = field.templates.find((template2) => !(typeof template2 === "string") && template2.name === filterKey);
       const jsonPath = `${fieldName}[?(@._template=="${filterKey}")]`;
       const filterPath = pathExpression ? `${pathExpression}.${jsonPath}` : jsonPath;
@@ -3471,7 +3453,7 @@ var Resolver = class {
     };
     this.buildObjectMutations = (fieldValue, field) => {
       if (field.fields) {
-        const objectTemplate = typeof field.fields === "string" ? this.tinaSchema.getGlobalTemplate(field.fields) : field;
+        const objectTemplate = field;
         if (Array.isArray(fieldValue)) {
           return fieldValue.map((item) => this.buildFieldMutations(item, objectTemplate));
         } else {
@@ -3485,9 +3467,6 @@ var Resolver = class {
               throw new Error(`Expected object for template value for field ${field.name}`);
             }
             const templates = field.templates.map((templateOrTemplateName) => {
-              if (typeof templateOrTemplateName === "string") {
-                return this.tinaSchema.getGlobalTemplate(templateOrTemplateName);
-              }
               return templateOrTemplateName;
             });
             const [templateName] = Object.entries(item)[0];
@@ -3504,9 +3483,6 @@ var Resolver = class {
             throw new Error(`Expected object for template value for field ${field.name}`);
           }
           const templates = field.templates.map((templateOrTemplateName) => {
-            if (typeof templateOrTemplateName === "string") {
-              return this.tinaSchema.getGlobalTemplate(templateOrTemplateName);
-            }
             return templateOrTemplateName;
           });
           const [templateName] = Object.entries(fieldValue)[0];
@@ -4217,6 +4193,64 @@ var parseFile = (content, format, yupSchema, markdownParseConfig) => {
 };
 var normalizePath = (filepath) => filepath.replace(/\\/g, "/");
 
+// src/database/alias-utils.ts
+var replaceNameOverrides = (template, obj) => {
+  if (template.list) {
+    return obj.map((item) => {
+      return _replaceNameOverrides(getTemplateForData(template, item).fields, item);
+    });
+  } else {
+    return _replaceNameOverrides(getTemplateForData(template, obj).fields, obj);
+  }
+};
+var _replaceNameOverrides = (fields, obj) => {
+  const output = {};
+  Object.keys(obj).forEach((key) => {
+    const field = fields.find((fieldWithMatchingAlias) => ((fieldWithMatchingAlias == null ? void 0 : fieldWithMatchingAlias.nameOverride) || (fieldWithMatchingAlias == null ? void 0 : fieldWithMatchingAlias.name)) === key);
+    output[(field == null ? void 0 : field.name) || key] = (field == null ? void 0 : field.type) == "object" ? replaceNameOverrides(field, obj[key]) : obj[key];
+  });
+  return output;
+};
+var getTemplateKey = (field) => {
+  var _a, _b, _c;
+  const DEFAULT_TEMPLATE_KEY = "_template";
+  if ((_a = field.templates) == null ? void 0 : _a.length) {
+    const templateField = (_c = (_b = field.templates[0]) == null ? void 0 : _b.fields) == null ? void 0 : _c.find((field2) => field2.name === DEFAULT_TEMPLATE_KEY);
+    return (templateField == null ? void 0 : templateField.alias) || DEFAULT_TEMPLATE_KEY;
+  }
+  return DEFAULT_TEMPLATE_KEY;
+};
+var getTemplateForData = (field, data) => {
+  var _a;
+  if ((_a = field.templates) == null ? void 0 : _a.length) {
+    const templateKey = getTemplateKey(field);
+    if (data[templateKey]) {
+      return field.templates.find((template) => template.name === data[templateKey]);
+    }
+  } else {
+    return field;
+  }
+  throw new Error("No template found for field " + field.name);
+};
+var applyNameOverrides = (template, obj) => {
+  if (template.list) {
+    return obj.map((item) => {
+      return _applyNameOverrides(getTemplateForData(template, item).fields, item);
+    });
+  } else {
+    return _applyNameOverrides(getTemplateForData(template, obj).fields, obj);
+  }
+};
+var _applyNameOverrides = (fields, obj) => {
+  const output = {};
+  Object.keys(obj).forEach((key) => {
+    const field = fields.find((field2) => field2.name === key);
+    const outputKey = (field == null ? void 0 : field.nameOverride) || key;
+    output[outputKey] = (field == null ? void 0 : field.type) === "object" ? applyNameOverrides(field, obj[key]) : obj[key];
+  });
+  return output;
+};
+
 // src/database/index.ts
 var createDatabase = (config) => {
   return new Database(__spreadProps(__spreadValues({}, config), {
@@ -4276,8 +4310,9 @@ var Database = class {
     };
     this.addPendingDocument = async (filepath, data) => {
       await this.initLevel();
-      const { stringifiedFile, payload } = await this.stringifyFile(filepath, data);
+      const dataFields = await this.formatBodyOnPayload(filepath, data);
       const collection = await this.collectionForPath(filepath);
+      const stringifiedFile = await this.stringifyFile(filepath, dataFields, collection);
       let collectionIndexDefinitions;
       if (collection) {
         const indexDefinitions = await this.getIndexDefinitions(this.level);
@@ -4288,7 +4323,7 @@ var Database = class {
         await this.bridge.put(normalizedPath, stringifiedFile);
       }
       await this.onPut(normalizedPath, stringifiedFile);
-      const putOps = makeIndexOpsForDocument(normalizedPath, collection == null ? void 0 : collection.name, collectionIndexDefinitions, payload, "put", this.level);
+      const putOps = makeIndexOpsForDocument(normalizedPath, collection == null ? void 0 : collection.name, collectionIndexDefinitions, dataFields, "put", this.level);
       const existingItem = await this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS).get(normalizedPath);
       const delOps = existingItem ? makeIndexOpsForDocument(normalizedPath, collection == null ? void 0 : collection.name, collectionIndexDefinitions, existingItem, "del", this.level) : [];
       const ops = [
@@ -4297,39 +4332,41 @@ var Database = class {
         {
           type: "put",
           key: normalizedPath,
-          value: payload,
+          value: dataFields,
           sublevel: this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS)
         }
       ];
       await this.level.batch(ops);
     };
-    this.put = async (filepath, data, collection) => {
+    this.put = async (filepath, data, collectionName) => {
       await this.initLevel();
       try {
         if (SYSTEM_FILES.includes(filepath)) {
           throw new Error(`Unexpected put for config file ${filepath}`);
         } else {
           let collectionIndexDefinitions;
-          if (collection) {
+          if (collectionName) {
             const indexDefinitions = await this.getIndexDefinitions(this.level);
-            collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection];
+            collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collectionName];
           }
           const normalizedPath = normalizePath(filepath);
-          const { stringifiedFile, payload } = await this.stringifyFile(filepath, data);
+          const dataFields = await this.formatBodyOnPayload(filepath, data);
+          const collection = await this.collectionForPath(filepath);
+          const stringifiedFile = await this.stringifyFile(filepath, dataFields, collection);
           if (this.bridge) {
             await this.bridge.put(normalizedPath, stringifiedFile);
           }
           await this.onPut(normalizedPath, stringifiedFile);
-          const putOps = makeIndexOpsForDocument(normalizedPath, collection, collectionIndexDefinitions, payload, "put", this.level);
+          const putOps = makeIndexOpsForDocument(normalizedPath, collectionName, collectionIndexDefinitions, dataFields, "put", this.level);
           const existingItem = await this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS).get(normalizedPath);
-          const delOps = existingItem ? makeIndexOpsForDocument(normalizedPath, collection, collectionIndexDefinitions, existingItem, "del", this.level) : [];
+          const delOps = existingItem ? makeIndexOpsForDocument(normalizedPath, collectionName, collectionIndexDefinitions, existingItem, "del", this.level) : [];
           const ops = [
             ...delOps,
             ...putOps,
             {
               type: "put",
               key: normalizedPath,
-              value: payload,
+              value: dataFields,
               sublevel: this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS)
             }
           ];
@@ -4340,66 +4377,52 @@ var Database = class {
         throw new TinaFetchError(`Error in PUT for ${filepath}`, {
           originalError: error,
           file: filepath,
-          collection,
+          collection: collectionName,
           stack: error.stack
         });
       }
     };
-    this.stringifyFile = async (filepath, data) => {
-      if (SYSTEM_FILES.includes(filepath)) {
-        throw new Error(`Unexpected put for config file ${filepath}`);
-      } else {
-        const tinaSchema = await this.getSchema(this.level);
-        const collection = tinaSchema.getCollectionByFullPath(filepath);
-        const templateInfo = await tinaSchema.getTemplatesForCollectable(collection);
-        let template;
-        if (templateInfo.type === "object") {
-          template = templateInfo.template;
-        }
-        if (templateInfo.type === "union") {
-          if (hasOwnProperty(data, "_template")) {
-            template = templateInfo.templates.find((t) => lastItem(t.namespace) === data._template);
-          } else {
-            throw new Error(`Expected _template to be provided for document in an ambiguous collection`);
+    this.formatBodyOnPayload = async (filepath, data) => {
+      const tinaSchema = await this.getSchema(this.level);
+      const collection = tinaSchema.getCollectionByFullPath(filepath);
+      const { template } = await this.getTemplateDetailsForFile(collection, data);
+      const bodyField = template.fields.find((field) => {
+        if (field.type === "string" || field.type === "rich-text") {
+          if (field.isBody) {
+            return true;
           }
         }
-        if (!template) {
-          throw new Error(`Unable to determine template`);
-        }
-        const field = template.fields.find((field2) => {
-          if (field2.type === "string" || field2.type === "rich-text") {
-            if (field2.isBody) {
-              return true;
-            }
+        return false;
+      });
+      let payload = {};
+      if (["md", "mdx"].includes(collection.format) && bodyField) {
+        Object.entries(data).forEach(([key, value]) => {
+          if (key !== bodyField.name) {
+            payload[key] = value;
           }
-          return false;
         });
-        let payload = {};
-        if (["md", "mdx"].includes(collection.format) && field) {
-          Object.entries(data).forEach(([key, value]) => {
-            if (key !== field.name) {
-              payload[key] = value;
-            }
-          });
-          payload["$_body"] = data[field.name];
-        } else {
-          payload = data;
-        }
-        const extension = import_path3.default.extname(filepath);
-        const stringifiedFile = stringifyFile(payload, extension, templateInfo.type === "union", {
-          frontmatterFormat: collection == null ? void 0 : collection.frontmatterFormat,
-          frontmatterDelimiters: collection == null ? void 0 : collection.frontmatterDelimiters
-        });
-        return {
-          stringifiedFile,
-          payload,
-          keepTemplateKey: templateInfo.type === "union"
-        };
+        payload["$_body"] = data[bodyField.name];
+      } else {
+        payload = data;
       }
+      return payload;
+    };
+    this.stringifyFile = async (filepath, payload, collection) => {
+      const templateDetails = await this.getTemplateDetailsForFile(collection, payload);
+      const writeTemplateKey = templateDetails.info.type === "union";
+      const aliasedData = applyNameOverrides(templateDetails.template, payload);
+      const extension = import_path3.default.extname(filepath);
+      const stringifiedFile = stringifyFile(aliasedData, extension, writeTemplateKey, {
+        frontmatterFormat: collection == null ? void 0 : collection.frontmatterFormat,
+        frontmatterDelimiters: collection == null ? void 0 : collection.frontmatterDelimiters
+      });
+      return stringifiedFile;
     };
     this.flush = async (filepath) => {
       const data = await this.get(filepath);
-      const { stringifiedFile } = await this.stringifyFile(filepath, data);
+      const dataFields = await this.formatBodyOnPayload(filepath, data);
+      const collection = await this.collectionForPath(filepath);
+      const stringifiedFile = await this.stringifyFile(filepath, dataFields, collection);
       return stringifiedFile;
     };
     this.getLookup = async (returnType) => {
@@ -4793,6 +4816,28 @@ var Database = class {
       throw new import_graphql5.GraphQLError("Error initializing LevelDB instance");
     }
   }
+  async getTemplateDetailsForFile(collection, data) {
+    const tinaSchema = await this.getSchema();
+    const templateInfo = await tinaSchema.getTemplatesForCollectable(collection);
+    let template;
+    if (templateInfo.type === "object") {
+      template = templateInfo.template;
+    }
+    if (templateInfo.type === "union") {
+      if (hasOwnProperty(data, "_template")) {
+        template = templateInfo.templates.find((t) => lastItem(t.namespace) === data._template);
+      } else {
+        throw new Error(`Expected _template to be provided for document in an ambiguous collection`);
+      }
+    }
+    if (!template) {
+      throw new Error(`Unable to determine template`);
+    }
+    return {
+      template,
+      info: templateInfo
+    };
+  }
   clearCache() {
     this.tinaSchema = null;
     this._lookup = null;
@@ -4820,6 +4865,11 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
       throw new Error(`No indexDefinitions for collection ${collection.name}`);
     }
   }
+  const tinaSchema = await database.getSchema();
+  let templateInfo = null;
+  if (collection) {
+    templateInfo = await tinaSchema.getTemplatesForCollectable(collection);
+  }
   await sequential(documentPaths, async (filepath) => {
     try {
       const dataString = await database.bridge.get(normalizePath(filepath));
@@ -4828,12 +4878,13 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
         frontmatterFormat: collection == null ? void 0 : collection.frontmatterFormat
       });
       const normalizedPath = normalizePath(filepath);
+      const aliasedData = templateInfo ? replaceNameOverrides(getTemplateForFile(templateInfo, data), data) : data;
       await enqueueOps([
-        ...makeIndexOpsForDocument(normalizedPath, collection == null ? void 0 : collection.name, collectionIndexDefinitions, data, "put", level),
+        ...makeIndexOpsForDocument(normalizedPath, collection == null ? void 0 : collection.name, collectionIndexDefinitions, aliasedData, "put", level),
         {
           type: "put",
           key: normalizedPath,
-          value: data,
+          value: aliasedData,
           sublevel: level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS)
         }
       ]);
@@ -4868,6 +4919,19 @@ var _deleteIndexContent = async (database, documentPaths, enequeueOps, collectio
     }
   });
 };
+var getTemplateForFile = (templateInfo, data) => {
+  if (templateInfo.type === "object") {
+    return templateInfo.template;
+  }
+  if (templateInfo.type === "union") {
+    if (hasOwnProperty(data, "_template")) {
+      return templateInfo.templates.find((t) => lastItem(t.namespace) === data._template);
+    } else {
+      throw new Error(`Expected _template to be provided for document in an ambiguous collection`);
+    }
+  }
+  throw new Error(`Unable to determine template`);
+};
 
 // src/level/tinaLevel.ts
 var import_many_level = __toModule(require("many-level"));

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

@@ -1,13 +1,13 @@
 /**
 
 */
-import type { ReferenceTypeInner, TinaFieldInner } from '@tinacms/schema-tools';
+import type { ReferenceType, TinaField } from '@tinacms/schema-tools';
 import { FilterCondition } from '../database/datalayer';
-export declare type ReferenceResolver = (filter: Record<string, object>, fieldDefinition: ReferenceTypeInner) => Promise<{
+export declare type ReferenceResolver = (filter: Record<string, object>, fieldDefinition: ReferenceType) => Promise<{
     edges: {
         node: any;
     }[];
     values: any[];
 }>;
-export declare const resolveReferences: (filter: any, fields: TinaFieldInner<false>[], resolver: ReferenceResolver) => Promise<void>;
-export declare const collectConditionsForField: (fieldName: string, field: TinaFieldInner<false>, filterNode: Record<string, object>, pathExpression: string, collectCondition: (condition: FilterCondition) => void) => void;
+export declare const resolveReferences: (filter: any, fields: TinaField[], resolver: ReferenceResolver) => Promise<void>;
+export declare const collectConditionsForField: (fieldName: string, field: TinaField, filterNode: Record<string, object>, pathExpression: string, collectCondition: (condition: FilterCondition) => void) => void;

package/dist/resolver/index.d.ts

@@ -2,7 +2,7 @@
 
 */
 import { Database } from '../database';
-import type { Collectable, ReferenceTypeWithNamespace, TinaCloudCollection, TinaFieldInner, TinaSchema } from '@tinacms/schema-tools';
+import type { Collectable, Collection, TinaField, Template, TinaSchema } from '@tinacms/schema-tools';
 import type { GraphQLConfig } from '../types';
 interface ResolverConfig {
     config?: GraphQLConfig;
@@ -23,47 +23,49 @@ export declare class Resolver {
     isAudit: boolean;
     constructor(init: ResolverConfig);
     resolveCollection: (args: any, collectionName: string, hasDocuments?: boolean) => Promise<{
-        fields: TinaFieldInner<true>[];
+        fields: TinaField<true>[];
         templates?: undefined;
-        references?: ReferenceTypeWithNamespace[];
-        namespace: string[];
         label?: string;
         name: string;
         path: string;
+        indexes?: {
+            name: string;
+            fields: {
+                name: string;
+            }[];
+        }[];
+        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "yml" | "toml";
+        ui?: import("@tinacms/schema-tools").UICollection;
         defaultItem?: import("@tinacms/schema-tools").DefaultItem<Record<string, any>>;
-        indexes?: import("@tinacms/schema-tools").TinaIndex[];
-        format?: "json" | "md" | "markdown" | "mdx";
         frontmatterFormat?: "json" | "yaml" | "toml";
         frontmatterDelimiters?: string | [string, string];
-        ui?: import("@tinacms/schema-tools").UICollection;
         match?: string;
+        namespace: string[];
         documents: {
-            collection: TinaCloudCollection<true>;
+            collection: Collection<true>;
             hasDocuments: boolean;
         };
     } | {
-        templates: (string | {
-            label: string;
-            name: string;
-            ui?: import("@tinacms/schema-tools").UICollection;
-            fields: TinaFieldInner<true>[];
-            namespace: string[];
-        })[];
+        templates: Template<true>[];
         fields?: undefined;
-        references?: ReferenceTypeWithNamespace[];
-        namespace: string[];
         label?: string;
         name: string;
         path: string;
+        indexes?: {
+            name: string;
+            fields: {
+                name: string;
+            }[];
+        }[];
+        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "yml" | "toml";
+        ui?: import("@tinacms/schema-tools").UICollection;
         defaultItem?: import("@tinacms/schema-tools").DefaultItem<Record<string, any>>;
-        indexes?: import("@tinacms/schema-tools").TinaIndex[];
-        format?: "json" | "md" | "markdown" | "mdx";
         frontmatterFormat?: "json" | "yaml" | "toml";
         frontmatterDelimiters?: string | [string, string];
-        ui?: import("@tinacms/schema-tools").UICollection;
         match?: string;
+        namespace: string[];
         documents: {
-            collection: TinaCloudCollection<true>;
+            collection: Collection<true>;
             hasDocuments: boolean;
         };
     }>;
@@ -76,7 +78,7 @@ export declare class Resolver {
             path: string;
             relativePath: string;
             breadcrumbs: string[];
-            collection: TinaCloudCollection<true>;
+            collection: Collection<true>;
             template: string | number;
         };
         _values: {
@@ -99,7 +101,7 @@ export declare class Resolver {
         [key: string]: unknown;
     }[];
     createResolveDocument: ({ collection, realPath, args, isAddPendingDocument, }: {
-        collection: TinaCloudCollection<true>;
+        collection: Collection<true>;
         realPath: string;
         args: unknown;
         isAddPendingDocument: boolean;
@@ -112,7 +114,7 @@ export declare class Resolver {
             path: string;
             relativePath: string;
             breadcrumbs: string[];
-            collection: TinaCloudCollection<true>;
+            collection: Collection<true>;
             template: string | number;
         };
         _values: {
@@ -129,7 +131,7 @@ export declare class Resolver {
         id: string;
     }>;
     updateResolveDocument: ({ collection, realPath, args, isAddPendingDocument, isCollectionSpecific, }: {
-        collection: TinaCloudCollection<true>;
+        collection: Collection<true>;
         realPath: string;
         args: unknown;
         isAddPendingDocument: boolean;
@@ -143,7 +145,7 @@ export declare class Resolver {
             path: string;
             relativePath: string;
             breadcrumbs: string[];
-            collection: TinaCloudCollection<true>;
+            collection: Collection<true>;
             template: string | number;
         };
         _values: {
@@ -177,7 +179,7 @@ export declare class Resolver {
             path: string;
             relativePath: string;
             breadcrumbs: string[];
-            collection: TinaCloudCollection<true>;
+            collection: Collection<true>;
             template: string | number;
         };
         _values: {
@@ -207,7 +209,7 @@ export declare class Resolver {
                     path: string;
                     relativePath: string;
                     breadcrumbs: string[];
-                    collection: TinaCloudCollection<true>;
+                    collection: Collection<true>;
                     template: string | number;
                 };
                 _values: {
@@ -229,7 +231,7 @@ export declare class Resolver {
     private resolveFilterConditions;
     resolveCollectionConnection: ({ args, collection, hydrator, }: {
         args: Record<string, Record<string, object> | string | number>;
-        collection: TinaCloudCollection<true>;
+        collection: Collection<true>;
         hydrator?: (string: any) => any;
     }) => Promise<{
         totalCount: number;

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

@@ -2,7 +2,7 @@
 
 */
 import type { GraphQLConfig } from '../types';
-import type { TinaCloudSchemaEnriched } from '@tinacms/schema-tools';
+import type { Schema } from '@tinacms/schema-tools';
 /**
  * Strips away the Tina Cloud Asset URL from an `image` value
  *
@@ -10,7 +10,7 @@ import type { TinaCloudSchemaEnriched } from '@tinacms/schema-tools';
  * @param {GraphQLConfig} config
  * @returns {string}
  */
-export declare const resolveMediaCloudToRelative: (value: string, config: GraphQLConfig, schema: TinaCloudSchemaEnriched) => string;
+export declare const resolveMediaCloudToRelative: (value: string, config: GraphQLConfig, schema: Schema<true>) => string;
 /**
  * Adds Tina Cloud Asset URL to an `image` value
  *
@@ -18,4 +18,4 @@ export declare const resolveMediaCloudToRelative: (value: string, config: GraphQ
  * @param {GraphQLConfig} config
  * @returns {string}
  */
-export declare const resolveMediaRelativeToCloud: (value: string, config: GraphQLConfig, schema: TinaCloudSchemaEnriched) => string;
+export declare const resolveMediaRelativeToCloud: (value: string, config: GraphQLConfig, schema: Schema<true>) => string;

package/dist/schema/createSchema.d.ts

@@ -1,8 +1,8 @@
 /**
 
 */
-import { TinaSchema, TinaCloudSchemaBase } from '@tinacms/schema-tools';
+import { TinaSchema, Schema } from '@tinacms/schema-tools';
 export declare const createSchema: ({ schema, flags, }: {
-    schema: TinaCloudSchemaBase;
+    schema: Schema;
     flags?: string[];
 }) => Promise<TinaSchema>;

package/dist/schema/validate.d.ts

@@ -1,5 +1,11 @@
 /**
 
 */
-import { TinaCloudSchemaBase } from '@tinacms/schema-tools';
-export declare const validateSchema: (schema: TinaCloudSchemaBase) => Promise<TinaCloudSchemaBase>;
+import { Schema, Collection } from '@tinacms/schema-tools';
+export declare const validateSchema: (schema: Schema) => Promise<{
+    collections: Collection<true>[];
+    config: import("@tinacms/schema-tools").Config<undefined, undefined, undefined, undefined>;
+} | {
+    collections: Collection<true>[];
+    config?: undefined;
+}>;