@tinacms/graphql 1.4.13 → 1.4.15

package/dist/database/datalayer.d.ts

@@ -70,7 +70,7 @@ export declare class FolderTreeBuilder {
     update(documentPath: string, collectionPath: string): any;
 }
 export declare const makeFolderOpsForCollection: <T extends object>(folderTree: FolderTree, collection: Collection<true>, indexDefinitions: IndexDefinition[], opType: 'put' | 'del', level: Level, escapeStr?: StringEscaper) => BatchOp[];
-export declare const makeIndexOpsForDocument: <T extends object>(filepath: string, collection: string | undefined, indexDefinitions: IndexDefinition[], data: T, opType: 'put' | 'del', level: Level, escapeStr?: StringEscaper) => BatchOp[];
+export declare const makeIndexOpsForDocument: <T extends object>(filepath: string, collection: string | undefined, indexDefinitions: Record<string, IndexDefinition>, data: T, opType: 'put' | 'del', level: Level, escapeStr?: StringEscaper) => BatchOp[];
 export declare const makeStringEscaper: (regex: RegExp, replacement: string) => StringEscaper;
 export declare const stringEscaper: StringEscaper;
 export {};

package/dist/database/index.d.ts

@@ -1,5 +1,5 @@
 import type { DocumentNode } from 'graphql';
-import type { CollectionTemplateable, Schema, TinaCloudCollection, TinaSchema } from '@tinacms/schema-tools';
+import type { Collection, CollectionTemplateable, Schema, TinaSchema } from '@tinacms/schema-tools';
 import type { Bridge } from './bridge';
 import { BinaryFilter, IndexDefinition, TernaryFilter } from './datalayer';
 import { Level } from './level';
@@ -58,7 +58,7 @@ export declare class Database {
     put: (filepath: string, data: {
         [key: string]: unknown;
     }, collectionName?: string) => Promise<boolean>;
-    getTemplateDetailsForFile(collection: TinaCloudCollection<true>, data: {
+    getTemplateDetailsForFile(collection: Collection<true>, data: {
         [key: string]: unknown;
     }): Promise<{
         template: {
@@ -84,7 +84,7 @@ export declare class Database {
     }>;
     stringifyFile: (filepath: string, payload: {
         [key: string]: unknown;
-    }, collection: TinaCloudCollection<true>) => Promise<string>;
+    }, collection: Collection<true>) => Promise<string>;
     /**
      * Clears the internal cache of the tinaSchema and the lookup file. This allows the state to be reset
      */

package/dist/index.es.js

@@ -2525,7 +2525,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.13",
+  version: "1.4.15",
   main: "dist/index.js",
   module: "dist/index.es.js",
   typings: "dist/index.d.ts",
@@ -4352,6 +4352,8 @@ var Resolver = class {
         case "string":
         case "boolean":
         case "number":
+          accumulator[field.name] = value;
+          break;
         case "reference":
           if (value) {
             accumulator[field.name] = value;
@@ -4519,6 +4521,9 @@ var resolve = async ({
   try {
     const verboseValue = verbose ?? true;
     const graphQLSchemaAst = await database.getGraphQLSchema();
+    if (!graphQLSchemaAst) {
+      throw new GraphQLError3(`GraphQL schema not found`);
+    }
     const graphQLSchema = buildASTSchema(graphQLSchemaAst);
     const tinaConfig = await database.getTinaSchema();
     const tinaSchema = await createSchema({
@@ -4881,7 +4886,10 @@ var Database = class {
     this.config = config;
     this.collectionForPath = async (filepath) => {
       const tinaSchema = await this.getSchema(this.level);
-      return tinaSchema.getCollectionByFullPath(filepath);
+      try {
+        return tinaSchema.getCollectionByFullPath(filepath);
+      } catch (e) {
+      }
     };
     this.getGeneratedFolder = () => path3.join(this.tinaDirectory, "__generated__");
     this.get = async (filepath) => {
@@ -4938,16 +4946,16 @@ var Database = class {
       await this.initLevel();
       const dataFields = await this.formatBodyOnPayload(filepath, data);
       const collection = await this.collectionForPath(filepath);
+      if (!collection) {
+        throw new GraphQLError4(`Unable to find collection for ${filepath}`);
+      }
       const stringifiedFile = await this.stringifyFile(
         filepath,
         dataFields,
         collection
       );
-      let collectionIndexDefinitions;
-      if (collection) {
-        const indexDefinitions = await this.getIndexDefinitions(this.level);
-        collectionIndexDefinitions = indexDefinitions?.[collection.name];
-      }
+      const indexDefinitions = await this.getIndexDefinitions(this.level);
+      const collectionIndexDefinitions = indexDefinitions?.[collection.name];
       const normalizedPath = normalizePath(filepath);
       if (this.bridge) {
         await this.bridge.put(normalizedPath, stringifiedFile);
@@ -5024,6 +5032,9 @@ var Database = class {
           const normalizedPath = normalizePath(filepath);
           const dataFields = await this.formatBodyOnPayload(filepath, data);
           const collection = await this.collectionForPath(filepath);
+          if (!collection) {
+            throw new GraphQLError4(`Unable to find collection for ${filepath}.`);
+          }
           if (collection.match?.exclude || collection.match?.include) {
             const matches = this.tinaSchema.getMatches({ collection });
             const match = micromatch.isMatch(filepath, matches);
@@ -5115,8 +5126,10 @@ var Database = class {
       }
     };
     this.formatBodyOnPayload = async (filepath, data) => {
-      const tinaSchema = await this.getSchema(this.level);
-      const collection = tinaSchema.getCollectionByFullPath(filepath);
+      const collection = await this.collectionForPath(filepath);
+      if (!collection) {
+        throw new Error(`Unable to find collection for path ${filepath}`);
+      }
       const { template } = await this.getTemplateDetailsForFile(collection, data);
       const bodyField = template.fields.find((field) => {
         if (field.type === "string" || field.type === "rich-text") {
@@ -5162,6 +5175,9 @@ var Database = class {
       const data = await this.get(filepath);
       const dataFields = await this.formatBodyOnPayload(filepath, data);
       const collection = await this.collectionForPath(filepath);
+      if (!collection) {
+        throw new Error(`Unable to find collection for path ${filepath}`);
+      }
       const stringifiedFile = await this.stringifyFile(
         filepath,
         dataFields,
@@ -5546,11 +5562,11 @@ var Database = class {
     this.delete = async (filepath) => {
       await this.initLevel();
       const collection = await this.collectionForPath(filepath);
-      let collectionIndexDefinitions;
-      if (collection) {
-        const indexDefinitions = await this.getIndexDefinitions(this.level);
-        collectionIndexDefinitions = indexDefinitions?.[collection.name];
+      if (!collection) {
+        throw new Error(`No collection found for path: ${filepath}`);
       }
+      const indexDefinitions = await this.getIndexDefinitions(this.level);
+      const collectionIndexDefinitions = indexDefinitions?.[collection.name];
       this.level.sublevel(
         CONTENT_ROOT_PREFIX,
         SUBLEVEL_OPTIONS
@@ -5683,7 +5699,10 @@ This will be an error in the future. See https://tina.io/docs/errors/file-in-mut
       let version = await this.getDatabaseVersion();
       if (!version) {
         version = "";
-        await this.updateDatabaseVersion(version);
+        try {
+          await this.updateDatabaseVersion(version);
+        } catch (e) {
+        }
       }
       this.level = this.rootLevel.sublevel(version, SUBLEVEL_OPTIONS);
     }
@@ -5812,7 +5831,7 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
       throw new TinaFetchError(`Unable to seed ${filepath}`, {
         originalError: error,
         file: filepath,
-        collection: collection.name,
+        collection: collection?.name,
         stack: error.stack
       });
     }
@@ -5897,10 +5916,10 @@ var _deleteIndexContent = async (database, documentPaths, enqueueOps, collection
   }
 };
 var getTemplateForFile = (templateInfo, data) => {
-  if (templateInfo.type === "object") {
+  if (templateInfo?.type === "object") {
     return templateInfo.template;
   }
-  if (templateInfo.type === "union") {
+  if (templateInfo?.type === "union") {
     if (hasOwnProperty(data, "_template")) {
       const template = templateInfo.templates.find(
         (t) => lastItem(t.namespace) === data._template

package/dist/index.js

@@ -2577,7 +2577,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.13",
+  version: "1.4.15",
   main: "dist/index.js",
   module: "dist/index.es.js",
   typings: "dist/index.d.ts",
@@ -4402,6 +4402,8 @@ var Resolver = class {
         case "string":
         case "boolean":
         case "number":
+          accumulator[field.name] = value;
+          break;
         case "reference":
           if (value) {
             accumulator[field.name] = value;
@@ -4570,6 +4572,9 @@ var resolve = async ({
   try {
     const verboseValue = verbose != null ? verbose : true;
     const graphQLSchemaAst = await database.getGraphQLSchema();
+    if (!graphQLSchemaAst) {
+      throw new import_graphql4.GraphQLError(`GraphQL schema not found`);
+    }
     const graphQLSchema = (0, import_graphql4.buildASTSchema)(graphQLSchemaAst);
     const tinaConfig = await database.getTinaSchema();
     const tinaSchema = await createSchema({
@@ -4937,7 +4942,10 @@ var Database = class {
     this.config = config;
     this.collectionForPath = async (filepath) => {
       const tinaSchema = await this.getSchema(this.level);
-      return tinaSchema.getCollectionByFullPath(filepath);
+      try {
+        return tinaSchema.getCollectionByFullPath(filepath);
+      } catch (e) {
+      }
     };
     this.getGeneratedFolder = () => import_path3.default.join(this.tinaDirectory, "__generated__");
     this.get = async (filepath) => {
@@ -4994,16 +5002,16 @@ var Database = class {
       await this.initLevel();
       const dataFields = await this.formatBodyOnPayload(filepath, data);
       const collection = await this.collectionForPath(filepath);
+      if (!collection) {
+        throw new import_graphql5.GraphQLError(`Unable to find collection for ${filepath}`);
+      }
       const stringifiedFile = await this.stringifyFile(
         filepath,
         dataFields,
         collection
       );
-      let collectionIndexDefinitions;
-      if (collection) {
-        const indexDefinitions = await this.getIndexDefinitions(this.level);
-        collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
-      }
+      const indexDefinitions = await this.getIndexDefinitions(this.level);
+      const collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
       const normalizedPath = (0, import_schema_tools3.normalizePath)(filepath);
       if (this.bridge) {
         await this.bridge.put(normalizedPath, stringifiedFile);
@@ -5081,6 +5089,9 @@ var Database = class {
           const normalizedPath = (0, import_schema_tools3.normalizePath)(filepath);
           const dataFields = await this.formatBodyOnPayload(filepath, data);
           const collection = await this.collectionForPath(filepath);
+          if (!collection) {
+            throw new import_graphql5.GraphQLError(`Unable to find collection for ${filepath}.`);
+          }
           if (((_a = collection.match) == null ? void 0 : _a.exclude) || ((_b = collection.match) == null ? void 0 : _b.include)) {
             const matches = this.tinaSchema.getMatches({ collection });
             const match = import_micromatch.default.isMatch(filepath, matches);
@@ -5172,8 +5183,10 @@ var Database = class {
       }
     };
     this.formatBodyOnPayload = async (filepath, data) => {
-      const tinaSchema = await this.getSchema(this.level);
-      const collection = tinaSchema.getCollectionByFullPath(filepath);
+      const collection = await this.collectionForPath(filepath);
+      if (!collection) {
+        throw new Error(`Unable to find collection for path ${filepath}`);
+      }
       const { template } = await this.getTemplateDetailsForFile(collection, data);
       const bodyField = template.fields.find((field) => {
         if (field.type === "string" || field.type === "rich-text") {
@@ -5219,6 +5232,9 @@ var Database = class {
       const data = await this.get(filepath);
       const dataFields = await this.formatBodyOnPayload(filepath, data);
       const collection = await this.collectionForPath(filepath);
+      if (!collection) {
+        throw new Error(`Unable to find collection for path ${filepath}`);
+      }
       const stringifiedFile = await this.stringifyFile(
         filepath,
         dataFields,
@@ -5604,11 +5620,11 @@ var Database = class {
     this.delete = async (filepath) => {
       await this.initLevel();
       const collection = await this.collectionForPath(filepath);
-      let collectionIndexDefinitions;
-      if (collection) {
-        const indexDefinitions = await this.getIndexDefinitions(this.level);
-        collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
+      if (!collection) {
+        throw new Error(`No collection found for path: ${filepath}`);
       }
+      const indexDefinitions = await this.getIndexDefinitions(this.level);
+      const collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
       this.level.sublevel(
         CONTENT_ROOT_PREFIX,
         SUBLEVEL_OPTIONS
@@ -5741,7 +5757,10 @@ This will be an error in the future. See https://tina.io/docs/errors/file-in-mut
       let version = await this.getDatabaseVersion();
       if (!version) {
         version = "";
-        await this.updateDatabaseVersion(version);
+        try {
+          await this.updateDatabaseVersion(version);
+        } catch (e) {
+        }
       }
       this.level = this.rootLevel.sublevel(version, SUBLEVEL_OPTIONS);
     }
@@ -5870,7 +5889,7 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
       throw new TinaFetchError(`Unable to seed ${filepath}`, {
         originalError: error,
         file: filepath,
-        collection: collection.name,
+        collection: collection == null ? void 0 : collection.name,
         stack: error.stack
       });
     }
@@ -5955,10 +5974,10 @@ var _deleteIndexContent = async (database, documentPaths, enqueueOps, collection
   }
 };
 var getTemplateForFile = (templateInfo, data) => {
-  if (templateInfo.type === "object") {
+  if ((templateInfo == null ? void 0 : templateInfo.type) === "object") {
     return templateInfo.template;
   }
-  if (templateInfo.type === "union") {
+  if ((templateInfo == null ? void 0 : templateInfo.type) === "union") {
     if (hasOwnProperty(data, "_template")) {
       const template = templateInfo.templates.find(
         (t) => lastItem(t.namespace) === data._template

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "1.4.13",
+  "version": "1.4.15",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
   "typings": "dist/index.d.ts",