Merge branch 'release/4.35.0'

ecrmnn · Mar 29, 2023 · 7706950 · 7706950
2 parents 84ad447 + 34169cf
commit 7706950
Show file tree

Hide file tree

Showing 10 changed files with 133 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -59,6 +59,7 @@ All available methods
 - [diff](#diff)
 - [diffAssoc](#diffassoc)
 - [diffKeys](#diffkeys)
+- [diffUsing](#diffusing)
 - [doesntContain](#doesntcontain)
 - [dump](#dump)
 - [duplicates](#duplicates)
@@ -553,6 +554,31 @@ diff.all();
 // { a: 'a', c: 'c' }
 ```
 
+#### `diffUsing()`
+
+The diffUsing method compares the collection against another collection or a plain array based on its values using a callback. This method will return the values in the original collection that are not present in the given collection:
+
+```js
+const collection = collect([
+  { name: 'Alice', age: 25 },
+  { name: 'Bob', age: 30 },
+  { name: 'Charlie', age: 35 },
+]);
+
+const users = [
+  { name: 'Bob', age: 30 },
+  { name: 'Charlie', age: 35 },
+  { name: 'David', age: 40 },
+];
+
+const diff = collection.diffUsing(users, (a, b) => a.age - b.age);
+
+diff.all();
+
+// [{ name: 'Alice', age: 25 }]
+```
+
+
 #### `doesntContain()`
 
 The `doesntContain` method determines whether the collection does not contain a given item. You may pass a closure to the `doesntContain` method to determine if an element does not exist in the collection matching a given truth test:

diff --git a/build/collect.js b/build/collect.js
diff --git a/build/collect.min.js b/build/collect.min.js
diff --git a/dist/index.js b/dist/index.js
@@ -48,6 +48,7 @@ Collection.prototype.dd = require('./methods/dd');
 Collection.prototype.diff = require('./methods/diff');
 Collection.prototype.diffAssoc = require('./methods/diffAssoc');
 Collection.prototype.diffKeys = require('./methods/diffKeys');
+Collection.prototype.diffUsing = require('./methods/diffUsing');
 Collection.prototype.doesntContain = require('./methods/doesntContain');
 Collection.prototype.dump = require('./methods/dump');
 Collection.prototype.duplicates = require('./methods/duplicates');

diff --git a/dist/methods/diffUsing.js b/dist/methods/diffUsing.js
@@ -0,0 +1,10 @@
+'use strict';
+
+module.exports = function diffUsing(values, callback) {
+  var collection = this.items.filter(function (item) {
+    return !(values && values.some(function (otherItem) {
+      return callback(item, otherItem) === 0;
+    }));
+  });
+  return new this.constructor(collection);
+};
diff --git a/docs/api/diffUsing.md b/docs/api/diffUsing.md
@@ -0,0 +1,25 @@
+# `diffUsing()`
+
+The diffUsing method compares the collection against another collection or a plain array based on its values using a callback. This method will return the values in the original collection that are not present in the given collection:
+
+```js
+const collection = collect([
+  { name: 'Alice', age: 25 },
+  { name: 'Bob', age: 30 },
+  { name: 'Charlie', age: 35 },
+]);
+
+const users = [
+  { name: 'Bob', age: 30 },
+  { name: 'Charlie', age: 35 },
+  { name: 'David', age: 40 },
+];
+
+const diff = collection.diffUsing(users, (a, b) => a.age - b.age);
+
+diff.all();
+
+// [{ name: 'Alice', age: 25 }]
+```
+
+[View source on GitHub](https://github.com/ecrmnn/collect.js/blob/master/src/methods/diffUsing.js)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "collect.js",
-  "version": "4.34.3",
+  "version": "4.35.0",
   "description": "Convenient and dependency free wrapper for working with arrays and objects.",
   "main": "dist/index.js",
   "typings": "index.d.ts",

diff --git a/src/index.js b/src/index.js
@@ -44,6 +44,7 @@ Collection.prototype.dd = require('./methods/dd');
 Collection.prototype.diff = require('./methods/diff');
 Collection.prototype.diffAssoc = require('./methods/diffAssoc');
 Collection.prototype.diffKeys = require('./methods/diffKeys');
+Collection.prototype.diffUsing = require('./methods/diffUsing');
 Collection.prototype.doesntContain = require('./methods/doesntContain');
 Collection.prototype.dump = require('./methods/dump');
 Collection.prototype.duplicates = require('./methods/duplicates');

diff --git a/src/methods/diffUsing.js b/src/methods/diffUsing.js
@@ -0,0 +1,9 @@
+'use strict';
+
+module.exports = function diffUsing(values, callback) {
+  const collection = this.items.filter(item => (
+    !(values && values.some(otherItem => callback(item, otherItem) === 0))
+  ));
+
+  return new this.constructor(collection);
+};
diff --git a/test/methods/diffUsing_test.js b/test/methods/diffUsing_test.js
@@ -0,0 +1,46 @@
+'use strict';
+
+module.exports = (it, expect, collect) => {
+  it('should compare the collection against a javascript array using a callback', () => {
+    const collection = collect(['fr', 'en_gb', 'hr']);
+    const diffArray = ['en_gb', 'hr'];
+
+    const diff = collection.diffUsing(diffArray, (a, b) => a.localeCompare(b));
+
+    expect(diff.all()).to.eql(['fr']);
+    expect(collection.all()).to.eql(['fr', 'en_gb', 'hr']);
+  });
+
+  it('should compare with null', () => {
+    const collection = collect(['fr', 'en_gb', 'hr']);
+
+    const diff = collection.diffUsing(null, (a, b) => a.localeCompare(b));
+
+    expect(diff.all()).to.eql(collection.all());
+  });
+
+  it('should compare the collection against another collection using on a callback', () => {
+    const collection = collect([
+      { name: 'Alice', age: 25 },
+      { name: 'Bob', age: 30 },
+      { name: 'Charlie', age: 35 },
+    ]);
+
+    const diffCollection = collect([
+      { name: 'Bob', age: 30 },
+      { name: 'Charlie', age: 35 },
+      { name: 'David', age: 40 },
+    ]);
+
+    const diff = collection.diffUsing(diffCollection, (a, b) => a.age - b.age);
+
+    expect(diff.all()).to.be.eql([{ name: 'Alice', age: 25 }]);
+  });
+
+  it('does not return a difference when the comparison is null', () => {
+    const collection = collect(['apple', 'banana', 'cherry']);
+    const diff = collection.diffUsing(null, (a, b) => a.localeCompare(b));
+
+    expect(diff.all()).to.eql(['apple', 'banana', 'cherry']);
+  });
+};