Add rels data structure to adapters

keystonejs · Mar 18, 2020 · 94ec087 · 94ec087
1 parent b6a555c
commit 94ec087
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 13 deletions.
diff --git a/packages/adapter-knex/lib/adapter-knex.js b/packages/adapter-knex/lib/adapter-knex.js
@@ -67,9 +67,9 @@ class KnexAdapter extends BaseKeystoneAdapter {
     return result;
   }
 
-  async postConnect() {
+  async postConnect({ rels }) {
     Object.values(this.listAdapters).forEach(listAdapter => {
-      listAdapter._postConnect();
+      listAdapter._postConnect({ rels });
     });
 
     // Run this only if explicity configured and still never in production
@@ -254,12 +254,18 @@ class KnexListAdapter extends BaseListAdapter {
     this.getListAdapterByKey = parentAdapter.getListAdapterByKey.bind(parentAdapter);
     this.realKeys = [];
     this.tableName = this.key;
+    this.rels = undefined;
   }
 
   prepareFieldAdapter() {}
 
-  _postConnect() {
+  _postConnect({ rels }) {
+    this.rels = rels;
     this.fieldAdapters.forEach(fieldAdapter => {
+      fieldAdapter.rel = rels.find(
+        ({ left, right }) =>
+          left.adapter === fieldAdapter || (right && right.adapter === fieldAdapter)
+      );
       if (fieldAdapter._hasRealKeys()) {
         this.realKeys.push(
           ...(fieldAdapter.realKeys ? fieldAdapter.realKeys : [fieldAdapter.path])

diff --git a/packages/adapter-mongoose/lib/adapter-mongoose.js b/packages/adapter-mongoose/lib/adapter-mongoose.js
@@ -59,9 +59,10 @@ class MongooseAdapter extends BaseKeystoneAdapter {
       ...mongooseConfig,
     });
   }
-  async postConnect() {
+
+  async postConnect({ rels }) {
     return await pSettle(
-      Object.values(this.listAdapters).map(listAdapter => listAdapter.postConnect())
+      Object.values(this.listAdapters).map(listAdapter => listAdapter.postConnect({ rels }))
     );
   }
 
@@ -129,6 +130,8 @@ class MongooseListAdapter extends BaseListAdapter {
 
     // Need to call postConnect() once all fields have registered and the database is connected to.
     this.model = null;
+
+    this.rels = undefined;
   }
 
   prepareFieldAdapter(fieldAdapter) {
@@ -142,7 +145,14 @@ class MongooseListAdapter extends BaseListAdapter {
    *
    * @return Promise<>
    */
-  async postConnect() {
+  async postConnect({ rels }) {
+    this.rels = rels;
+    this.fieldAdapters.forEach(fieldAdapter => {
+      fieldAdapter.rel = rels.find(
+        ({ left, right }) =>
+          left.adapter === fieldAdapter || (right && right.adapter === fieldAdapter)
+      );
+    });
     if (this.configureMongooseSchema) {
       this.configureMongooseSchema(this.schema, { mongoose: this.mongoose });
     }

diff --git a/packages/keystone/lib/Keystone/index.js b/packages/keystone/lib/Keystone/index.js
@@ -374,18 +374,23 @@ module.exports = class Keystone {
         `${left.listKey}.${left.path} refers to a non-existant field, ${left.config.ref}`
       );
     }
+
+    return Object.values(rels);
   }
 
   /**
    * @return Promise<null>
    */
   connect() {
     const { adapters, name } = this;
-    return resolveAllKeys(mapKeys(adapters, adapter => adapter.connect({ name }))).then(() => {
-      if (this.eventHandlers.onConnect) {
-        return this.eventHandlers.onConnect(this);
+    const rels = this._consolidateRelationships();
+    return resolveAllKeys(mapKeys(adapters, adapter => adapter.connect({ name, rels }))).then(
+      () => {
+        if (this.eventHandlers.onConnect) {
+          return this.eventHandlers.onConnect(this);
+        }
       }
-    });
+    );
   }
 
   /**
@@ -555,7 +560,6 @@ module.exports = class Keystone {
     pinoOptions,
     cors = { origin: true, credentials: true },
   } = {}) {
-    this._consolidateRelationships();
     const middlewares = await this._prepareMiddlewares({ dev, apps, distDir, pinoOptions, cors });
 
     // Now that the middlewares are done, it's safe to assume all the schemas

diff --git a/packages/keystone/lib/adapters/index.js b/packages/keystone/lib/adapters/index.js
@@ -17,7 +17,7 @@ class BaseKeystoneAdapter {
     return this.listAdapters[key];
   }
 
-  async connect({ name }) {
+  async connect({ name, rels }) {
     // Connect to the database
     await this._connect({ name }, this.config);
 
@@ -26,7 +26,7 @@ class BaseKeystoneAdapter {
       // Validate the minimum database version requirements are met.
       await this.checkDatabaseVersion();
 
-      const taskResults = await this.postConnect();
+      const taskResults = await this.postConnect({ rels });
       const errors = taskResults.filter(({ isRejected }) => isRejected).map(({ reason }) => reason);
 
       if (errors.length) {