Merge branch 'master' into bugfix/denormalize-tests

.github/workflows/test.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        meteor: [1.12.2, 2.6.1, 2.7.3, 2.9.1]
+        meteor: [2.3.1, 2.6.1, 2.7.3, 2.8.1, 2.9.1, 2.12]
 
     steps:
       - uses: actions/checkout@v3

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
 
 .idea/
-node_modules/
+node_modules/
+.vscode/

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.5.0
+- Minimum Meteor version bumped to 2.3
+- Update dependencies
+- Allow unblocking recursive publications [@Floriferous](https://github.com/Floriferous)
+
 ## 1.4.1
 - Fix reactive counters when filtering on dates [@vparpoil](https://github.com/vparpoil) [PR](https://github.com/cult-of-coders/grapher/pull/402)
 - Fix for storeOneResults when handling already processed results [@bhunjadi](https://github.com/bhunjadi) [PR](https://github.com/cult-of-coders/grapher/pull/405)

README.md

@@ -5,7 +5,7 @@
 - Read more about our approach coming from Meteor: https://www.bluelibs.com/blog/2021/11/26/the-meteor-of-2022
 - We've implemented [Grapher aka Nova](https://www.bluelibs.com/products/nova) as a standalone npm package compatible to native MongoDB drivers (including Meteor), it is not as feature-rich (no meta links, no pubsub functionality) but is more advanced.
 
-# Grapher 1.4.1
+# Grapher 1.5
 
 _Grapher_ is a Data Fetching Layer on top of Meteor and MongoDB. It is production ready and battle tested. Brought to you by [Cult of Coders](https://www.cultofcoders.com) — Web & Mobile Development Company. 
 
@@ -129,3 +129,26 @@ Result:
     }
 ]
 ```
+
+### Testing
+
+You can create `test` directory and configure dependencies (working directory is the root of this repo):
+```
+# create meteor app for testing
+# you can add a specific release with --release flag, this will just create the app with the latest release
+meteor create --bare test 
+cd test
+# install npm dependencies used for testing
+meteor npm i --save [email protected] [email protected] [email protected] chai
+
+# Running tests (always from ./test directory)
+METEOR_PACKAGE_DIRS="../" TEST_BROWSER_DRIVER=chrome meteor test-packages --once --driver-package meteortesting:mocha ../
+```
+
+If you use `TEST_BROWSER_DRIVER=chrome` you have to have chrome installed in the test environment. Otherwise, you can just run tests in your browser.
+
+Another option is to use `puppeteer` as a driver. You'll have to install it with `meteor npm i puppeteer@10`. Note that the latest versions don't work with Node 14.
+
+With `--port=X` you can run tests on port X.
+
+Omit `--once` and mocha will run in watch mode.

docs/linking_collections.md

@@ -386,6 +386,43 @@ Meteor.users.createQuery({
 
 `paymentProfile` inside `user` will be an object because it knows it should be unique.
 
+## Foreign identity field
+
+When you add a link by default grapher tries to match against `_id` of the linked collection.
+
+Consider a system with two collections:
+
+- `Appointments` - a collection of appointments with startDate, endDate, etc.
+- `Tasks` - a collection of tasks which has `referenceId` field which is `_id` of the appointment or some other entity. Tasks generally don't know anything about the appointment, they just have a reference to it.
+
+We can utilize `foreignIdentityField` option and do this:
+
+```js
+Appointments.addLinks({
+  tasks: {
+    collection: Tasks,
+    type: "many",
+    field: "_id", // field from Appointments collection
+    foreignIdentityField: "referenceId", // field from Tasks collection
+  },
+});
+```
+
+Now you can query for appointments and get all tasks for each appointment:
+
+```js
+Appointments.createQuery({
+    $filters: { ... },
+    tasks: {
+        title: 1,
+    },
+    startDate: 1,
+    endDate: 1,
+}).fetch();
+```
+
+If your foreign identity field is unique inside linked collection (in this case Tasks), you can use `type: "one"` and get a single task instead of an array.
+
 ## Data Consistency
 
 We clean out leftover links from deleted collection items.

lib/links/config.schema.js

@@ -24,11 +24,12 @@ export const LinkConfigSchema = {
             );
         })
     ),
+    foreignIdentityField: Match.Maybe(String),
     field: Match.Maybe(String),
     metadata: Match.Maybe(Boolean),
     inversedBy: Match.Maybe(String),
     index: Match.Maybe(Boolean),
     unique: Match.Maybe(Boolean),
     autoremove: Match.Maybe(Boolean),
     denormalize: Match.Maybe(Match.ObjectIncluding(DenormalizeSchema)),
-};
+};

lib/links/lib/createSearchFilters.js

@@ -1,37 +1,43 @@
 import sift from 'sift';
 import dot from 'dot-object';
 
-export default function createSearchFilters(object, fieldStorage, strategy, isVirtual, metaFilters) {
-    if (!isVirtual) {
+export default function createSearchFilters(object, linker, metaFilters) {
+    const fieldStorage = linker.linkStorageField;
+
+    const strategy = linker.strategy;
+    if (!linker.isVirtual()) {
         switch (strategy) {
-            case 'one': return createOne(object, fieldStorage);
+            case 'one': return createOne(object, linker);
             case 'one-meta': return createOneMeta(object, fieldStorage, metaFilters);
-            case 'many': return createMany(object, fieldStorage);
+            case 'many': return createMany(object, linker);
             case 'many-meta': return createManyMeta(object, fieldStorage, metaFilters);
             default:
                 throw new Meteor.Error(`Invalid linking strategy: ${strategy}`)
         }
     } else {
         switch (strategy) {
-            case 'one': return createOneVirtual(object, fieldStorage);
+            case 'one': return createOneVirtual(object, linker);
             case 'one-meta': return createOneMetaVirtual(object, fieldStorage, metaFilters);
-            case 'many': return createManyVirtual(object, fieldStorage);
+            case 'many': return createManyVirtual(object, linker);
             case 'many-meta': return createManyMetaVirtual(object, fieldStorage, metaFilters);
             default:
                 throw new Meteor.Error(`Invalid linking strategy: ${strategy}`)
         }
     }
 }
 
-export function createOne(object, fieldStorage) {
+export function createOne(object, linker) {
     return {
-        _id: dot.pick(fieldStorage, object)
+        // Using {$in: []} as a workaround because foreignIdentityField which is not _id is not required to be set
+        // and {something: undefined} in query returns all the records.
+        // $in: [] ensures that nothing will be returned for this query
+        [linker.foreignIdentityField]: dot.pick(linker.linkStorageField, object) || {$in: []},
     };
 }
 
-export function createOneVirtual(object, fieldStorage) {
+export function createOneVirtual(object, linker) {
     return {
-        [fieldStorage]: object._id
+        [linker.linkStorageField]: object[linker.foreignIdentityField] || {$in: []}
     };
 }
 
@@ -62,25 +68,26 @@ export function createOneMetaVirtual(object, fieldStorage, metaFilters) {
     return filters;
 }
 
-export function createMany(object, fieldStorage) {
-    const [root, ...nested] = fieldStorage.split('.');
+export function createMany(object, linker) {
+    const [root, ...nested] = linker.linkStorageField.split('.');
     if (nested.length > 0) {
         const arr = object[root];
         const ids = arr ? _.uniq(_.union(arr.map(obj => _.isObject(obj) ? dot.pick(nested.join('.'), obj) : []))) : [];
         return {
-            _id: {$in: ids}
+            [linker.foreignIdentityField]: {$in: ids}
         };
     }
+    const value = object[linker.linkStorageField];
     return {
-        _id: {
-            $in: object[fieldStorage] || []
+        [linker.foreignIdentityField]: {
+            $in: _.isArray(value) ? value : (value ? [value] : []),
         }
     };
 }
 
-export function createManyVirtual(object, fieldStorage) {
+export function createManyVirtual(object, linker) {
     return {
-        [fieldStorage]: object._id
+        [linker.linkStorageField]: object[linker.foreignIdentityField] || {$in: []},
     };
 }
 

lib/links/linkTypes/base.js

@@ -50,14 +50,14 @@ export default class Link {
 
         const searchFilters = createSearchFilters(
             this.object,
-            this.linkStorageField,
-            linker.strategy,
-            linker.isVirtual(),
+            this.linker,
             $metaFilters
         );
 
         let appliedFilters = _.extend({}, filters, searchFilters);
 
+        // console.log('search filters', searchFilters);
+
         // see https://github.com/cult-of-coders/grapher/issues/134
         // happens due to recursive importing of modules
         // TODO: find another way to do this
@@ -133,9 +133,13 @@ export default class Link {
             ids = [ids];
         }
 
+        // console.log('validate ids', ids);
+
+        const foreignIdentityField = this.linker.foreignIdentityField;
+
         const validIds = this.linkedCollection.find({
-            _id: {$in: ids}
-        }, {fields: {_id: 1}}).fetch().map(doc => doc._id);
+            [foreignIdentityField]: {$in: ids}
+        }, {fields: {[foreignIdentityField]: 1}}).fetch().map(doc => doc[foreignIdentityField]);
 
         if (validIds.length != ids.length) {
             throw new Meteor.Error('not-found', `You tried to create links with non-existing id(s) inside "${this.linkedCollection._name}": ${_.difference(ids, validIds).join(', ')}`)

lib/links/linkTypes/lib/smartArguments.js

@@ -7,21 +7,19 @@ export default new class {
     getIds(what, options) {
         if (Array.isArray(what)) {
             return _.map(what, (subWhat) => {
-                return this.getId(subWhat, options)
-            })
+                return this.getId(subWhat, options);
+            }).filter(id => typeof id === 'string');
         } else {
-            return [this.getId(what, options)];
+            return [this.getId(what, options)].filter(id => typeof id === 'string');
         }
-
-        throw new Meteor.Error('invalid-type', `Unrecognized type: ${typeof what} for managing links`);
     }
 
     getId(what, options) {
         if (typeof what === 'string') {
             return what;
         }
 
-        if (typeof what === 'object') {
+        if (_.isObject(what)) {
             if (!what._id && options.saveToDatabase) {
                 what._id = options.collection.insert(what);
             }

lib/links/linkTypes/linkMany.js

@@ -59,6 +59,7 @@ export default class LinkMany extends Link {
         if (this.isVirtual) throw new Meteor.Error('not-allowed', 'Add/Remove operations should be done from the owner of the relationship');
 
         this.clean();
+
         const field = this.linkStorageField;
         const [root, ...nested] = field.split('.');
 
@@ -67,15 +68,23 @@ export default class LinkMany extends Link {
         // update the field
         this.object[root] = _.filter(
             this.object[root],
-    _id => !_.contains(_ids, nested.length > 0 ? dot.pick(nested.join('.'), _id) : _id)
+            _id => !_.contains(_ids, nested.length > 0 ? dot.pick(nested.join('.'), _id) : _id)
         );
 
-        // update the db
-        let modifier = {
-            $pullAll: {
-                [root]: nested.length > 0 ? { [nested.join('.')]: _ids } : _ids,
-            },
-        };
+        let modifier;
+        if (this.linker.foreignIdentityField === '_id') {
+            // update the db
+            modifier = {
+                $pullAll: {
+                    [root]: nested.length > 0 ? { [nested.join('.')]: _ids } : _ids,
+                },
+            };
+        }
+        else {
+            modifier = {
+                $unset: {[root]: 1},
+            };
+        }
 
         this.linker.mainCollection.update(this.object._id, modifier);
 

lib/links/linker.js

@@ -70,6 +70,16 @@ export default class Linker {
         return this.linkConfig.field;
     }
 
+    /**
+     * Returns foreign field for querying linked collection
+     */
+    get foreignIdentityField() {
+        if (this.isVirtual()) {
+            return this.linkConfig.relatedLinker.linkConfig.foreignIdentityField || '_id';
+        }
+        return this.linkConfig.foreignIdentityField || '_id';
+    }
+
     /**
      * The collection that is linked with the current collection
      * @returns Mongo.Collection
@@ -377,11 +387,14 @@ export default class Linker {
 
         if (!this.isVirtual()) {
             this.mainCollection.after.remove((userId, doc) => {
-                this.getLinkedCollection().remove({
-                    _id: {
-                        $in: smartArguments.getIds(doc[this.linkStorageField]),
-                    },
-                });
+                const ids = smartArguments.getIds(doc[this.linkStorageField]);
+                if (ids.length > 0) {
+                    this.getLinkedCollection().remove({
+                        [this.foreignIdentityField]: {
+                            $in: ids,
+                        },
+                    });
+                }
             });
         } else {
             this.mainCollection.after.remove((userId, doc) => {