@tinacms/graphql 0.0.0-202231421406 → 0.0.0-2022320202159

package/CHANGELOG.md

@@ -1,16 +1,17 @@
 # tina-graphql
 
-## 0.0.0-202231421406
+## 0.0.0-2022320202159
 
 ### Patch Changes
 
 - 4da32454b: Modify database to write config json files without whitespace to reduce file sizes
 - 921709a7e: Adds validation to the schema instead of only using typescript types
+- 558cc4368: Make schema init platform-aware and refactor database put requests
 - 06666d39f: Link to MDX documentation when unregistered component error occurs
 - 3e2d9e43a: Adds new GraphQL `deleteDocument` mutation and logic
 - Updated dependencies [a2906d6fe]
 - Updated dependencies [3e2d9e43a]
-  - @tinacms/datalayer@0.0.0-202231421406
+  - @tinacms/datalayer@0.0.0-2022320202159
 
 ## 0.59.10
 

package/dist/database/index.d.ts

@@ -40,13 +40,15 @@ export declare class Database {
     private _graphql;
     private _tinaSchema;
     constructor(config: CreateDatabase);
+    private collectionForPath;
+    private partitionPathsByCollection;
     get: <T extends object>(filepath: string) => Promise<T>;
     addPendingDocument: (filepath: string, data: {
         [key: string]: unknown;
     }) => Promise<void>;
     put: (filepath: string, data: {
         [key: string]: unknown;
-    }) => Promise<boolean>;
+    }, collection?: string) => Promise<boolean>;
     stringifyFile: (filepath: string, data: {
         [key: string]: unknown;
     }) => Promise<{

package/dist/index.js

@@ -22624,8 +22624,7 @@ var Resolver = class {
         return this.getDocument(realPath);
       }
       const params = this.buildObjectMutations(args.params[collection.name], collection);
-      console.log("calling put3", realPath);
-      await this.database.put(realPath, params);
+      await this.database.put(realPath, params, collection.name);
       return this.getDocument(realPath);
     };
     this.updateResolveDocument = async ({
@@ -22642,8 +22641,7 @@ var Resolver = class {
           case "object":
             if (params2) {
               const values = this.buildFieldMutations(params2, templateInfo.template);
-              console.log("calling put", realPath);
-              await this.database.put(realPath, values);
+              await this.database.put(realPath, values, collection.name);
             }
             break;
           case "union":
@@ -22656,16 +22654,14 @@ var Resolver = class {
                 const values = __spreadProps(__spreadValues({}, this.buildFieldMutations(templateParams, template)), {
                   _template: lastItem(template.namespace)
                 });
-                console.log("calling put4", realPath);
-                await this.database.put(realPath, values);
+                await this.database.put(realPath, values, collection.name);
               }
             });
         }
         return this.getDocument(realPath);
       }
       const params = this.buildObjectMutations(isCollectionSpecific ? args.params : args.params[collection.name], collection);
-      console.log("calling put2", realPath);
-      await this.database.put(realPath, params);
+      await this.database.put(realPath, params, collection.name);
       return this.getDocument(realPath);
     };
     this.resolveDocument = async ({
@@ -23618,6 +23614,11 @@ var GENERATED_FOLDER = import_path4.default.join(".tina", "__generated__");
 var Database = class {
   constructor(config) {
     this.config = config;
+    this.collectionForPath = async (filepath) => {
+      const tinaSchema = await this.getSchema();
+      const collection = tinaSchema.schema.collections.find((collection2) => filepath.startsWith(collection2.path));
+      return collection;
+    };
     this.get = async (filepath) => {
       if (SYSTEM_FILES.includes(filepath)) {
         throw new Error(`Unexpected get for config file ${filepath}`);
@@ -23657,8 +23658,7 @@ var Database = class {
     };
     this.addPendingDocument = async (filepath, data) => {
       const { stringifiedFile, payload, keepTemplateKey } = await this.stringifyFile(filepath, data);
-      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();
@@ -23669,23 +23669,18 @@ var Database = class {
       }
       await this.store.put(filepath, payload, {
         keepTemplateKey,
-        collection: collection.name,
+        collection: collection == null ? void 0 : collection.name,
         indexDefinitions: collectionIndexDefinitions
       });
     };
-    this.put = async (filepath, data) => {
-      console.log("Database.put", filepath, data);
+    this.put = async (filepath, data, collection) => {
       if (SYSTEM_FILES.includes(filepath)) {
         throw new Error(`Unexpected put for config file ${filepath}`);
       } else {
-        const tinaSchema = await this.getSchema();
-        const collection = tinaSchema.schema.collections.find((collection2) => filepath.startsWith(collection2.path));
-        console.log("Database.put", collection);
         let collectionIndexDefinitions;
         if (collection) {
-          console.log(collection == null ? void 0 : collection.name);
           const indexDefinitions = await this.getIndexDefinitions();
-          collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
+          collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection];
         }
         const { stringifiedFile, payload, keepTemplateKey } = await this.stringifyFile(filepath, data);
         if (this.store.supportsSeeding()) {
@@ -23693,7 +23688,7 @@ var Database = class {
         }
         await this.store.put(filepath, payload, {
           keepTemplateKey,
-          collection: collection.name,
+          collection,
           indexDefinitions: collectionIndexDefinitions
         });
       }
@@ -23914,44 +23909,14 @@ var Database = class {
       }
     };
     this.deleteContentByPaths = async (documentPaths) => {
-      const pathsByCollection = {};
-      const nonCollectionPaths = [];
-      const collections = {};
-      const tinaSchema = await this.getSchema();
-      for (const documentPath of documentPaths) {
-        const collection = tinaSchema.schema.collections.find((collection2) => documentPath.startsWith(collection2.path));
-        if (collection) {
-          if (!pathsByCollection[collection.name]) {
-            pathsByCollection[collection.name] = [];
-          }
-          collections[collection.name] = collection;
-          pathsByCollection[collection.name].push(documentPath);
-        } else {
-          nonCollectionPaths.push(documentPath);
-        }
-      }
+      const { pathsByCollection, nonCollectionPaths, collections } = await this.partitionPathsByCollection(documentPaths);
       for (const collection of Object.keys(pathsByCollection)) {
         await _deleteIndexContent(this, pathsByCollection[collection], collections[collection]);
       }
       await _deleteIndexContent(this, nonCollectionPaths, null);
     };
     this.indexContentByPaths = async (documentPaths) => {
-      const pathsByCollection = {};
-      const nonCollectionPaths = [];
-      const collections = {};
-      const tinaSchema = await this.getSchema();
-      for (const documentPath of documentPaths) {
-        const collection = tinaSchema.schema.collections.find((collection2) => documentPath.startsWith(collection2.path));
-        if (collection) {
-          if (!pathsByCollection[collection.name]) {
-            pathsByCollection[collection.name] = [];
-          }
-          collections[collection.name] = collection;
-          pathsByCollection[collection.name].push(documentPath);
-        } else {
-          nonCollectionPaths.push(documentPath);
-        }
-      }
+      const { pathsByCollection, nonCollectionPaths, collections } = await this.partitionPathsByCollection(documentPaths);
       for (const collection of Object.keys(pathsByCollection)) {
         await _indexContent(this, pathsByCollection[collection], collections[collection]);
       }
@@ -23994,6 +23959,24 @@ var Database = class {
     this.bridge = config.bridge;
     this.store = config.store;
   }
+  async partitionPathsByCollection(documentPaths) {
+    const pathsByCollection = {};
+    const nonCollectionPaths = [];
+    const collections = {};
+    for (const documentPath of documentPaths) {
+      const collection = await this.collectionForPath(documentPath);
+      if (collection) {
+        if (!pathsByCollection[collection.name]) {
+          pathsByCollection[collection.name] = [];
+        }
+        collections[collection.name] = collection;
+        pathsByCollection[collection.name].push(documentPath);
+      } else {
+        nonCollectionPaths.push(documentPath);
+      }
+    }
+    return { pathsByCollection, nonCollectionPaths, collections };
+  }
 };
 function hasOwnProperty2(obj, prop) {
   return obj.hasOwnProperty(prop);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "0.0.0-202231421406",
+  "version": "0.0.0-2022320202159",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@graphql-tools/relay-operation-optimizer": "^6.4.1",
-    "@tinacms/datalayer": "0.0.0-202231421406",
+    "@tinacms/datalayer": "0.0.0-2022320202159",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
     "dataloader": "^2.0.0",
@@ -96,7 +96,7 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
-    "@tinacms/datalayer": "0.0.0-202231421406",
+    "@tinacms/datalayer": "0.0.0-2022320202159",
     "@tinacms/scripts": "0.50.7",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",