json-hash - npm Package Compare versions

Comparing version 1.1.0 to 1.2.0

lib/browser.js

@@ -22,4 +22,5 @@ "use strict";
   var crypto = _ref$crypto === undefined ? crypto_ : _ref$crypto;
+  var sets = _ref.sets;
 
-  return digest_(a, { algorithm: algorithm, inputEncoding: inputEncoding, outputEncoding: outputEncoding, crypto: crypto });
+  return digest_(a, { algorithm: algorithm, inputEncoding: inputEncoding, outputEncoding: outputEncoding, crypto: crypto, sets: sets });
 }
@@ -26,0 +27,0 @@ Object.defineProperty(exports, "__esModule", {

lib/digest.js

@@ -15,2 +15,3 @@ "use strict";
   var crypto = _ref.crypto;
+  var sets = _ref.sets;
 
@@ -26,3 +27,3 @@ var h = crypto.createHash(algorithm);
   var d = function (a) {
-    return digest(a, { algorithm: algorithm, inputEncoding: inputEncoding, outputEncoding: outputEncoding, crypto: crypto });
+    return digest(a, { algorithm: algorithm, inputEncoding: inputEncoding, outputEncoding: outputEncoding, crypto: crypto, sets: sets });
   };
@@ -82,7 +83,15 @@ switch (true) {
     case Array.isArray(a):
-      u("[");
-      a.forEach(function (e) {
-        return u("a", d(e));
-      });
-      u("]");
+      if (sets) {
+        u("<");
+        a.map(d).sort().forEach(function (e) {
+          return u("A", e);
+        });
+        u(">");
+      } else {
+        u("[");
+        a.forEach(function (e) {
+          return u("a", d(e));
+        });
+        u("]");
+      }
       break;
@@ -89,0 +98,0 @@

lib/index.js

@@ -22,4 +22,5 @@ "use strict";
   var crypto = _ref$crypto === undefined ? crypto_ : _ref$crypto;
+  var sets = _ref.sets;
 
-  return digest_(a, { algorithm: algorithm, inputEncoding: inputEncoding, outputEncoding: outputEncoding, crypto: crypto });
+  return digest_(a, { algorithm: algorithm, inputEncoding: inputEncoding, outputEncoding: outputEncoding, crypto: crypto, sets: sets });
 }
@@ -26,0 +27,0 @@ Object.defineProperty(exports, "__esModule", {

package.json

 {
   "name": "json-hash",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Compute JSON hash.",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

spec/spec-crypto.js

@@ -66,3 +66,3 @@
 
-  return it('should handle utf8', function () {
+  it('should handle utf8', function () {
     let r = 'Dopóki nie skorzys­tałem z In­terne­tu, nie wie­działem, że na świecie jest ty­lu idiotów.'
@@ -69,0 +69,0 @@ for (let e in [ undefined, 'binary', 'ascii', 'utf8' ]) {

spec/spec-digest.js

@@ -10,19 +10,19 @@
 // Get digest from browser and crypto based versions.
-function d (s) {
-  let a = null
-  let b = null
-  for (let e in [ undefined, 'binary', 'ascii', 'utf8' ]) {
-    a = browser.digest(s, e)
-    b = crypto.digest(s, e)
-    assert.equal(a, b)
+function d(s, { sets } = {}) {
+  let a = null;
+  let b = null;
+  for (let inputEncoding in [ undefined, 'binary', 'ascii', 'utf8' ]) {
+    a = browser.digest(s, { inputEncoding, sets });
+    b = crypto.digest(s, { inputEncoding, sets });
+    assert.equal(a, b);
   }
-  return a
+  return a;
 }
 
-function eq (a, b) {
-  assert.equal(d(a), d(b))
+function eq(a, b, options) {
+  assert.equal(d(a, options), d(b, options));
 }
 
-function ne (a, b) {
-  assert.notEqual(d(a), d(b))
+function ne(a, b, options) {
+  assert.notEqual(d(a, options), d(b, options));
 }
@@ -42,2 +42,11 @@
 
+  it('should have different hashes for arrays with different order', function () {
+    ne(['foo', 'bar'], ['bar', 'foo']);
+  });
+
+  it('should have same hashes for arrays with different order with sets = true option', function () {
+    eq(['foo', 'bar'], ['bar', 'foo'], { sets: true });
+    eq({ foo: ['foo', 'bar'] }, { foo: ['bar', 'foo'] }, { sets: true });
+  });
+
   it('should have different hashes for 1 as a number and "1" as a string', function() {
@@ -44,0 +53,0 @@ ne( 1, '1' )

src/browser.js

@@ -5,4 +5,4 @@
 
-export function digest (a, { algorithm = 'sha1', inputEncoding = 'utf8', outputEncoding = 'hex', crypto = crypto_ } = {}) {
-  return digest_(a, { algorithm, inputEncoding, outputEncoding, crypto })
+export function digest (a, { algorithm = 'sha1', inputEncoding = 'utf8', outputEncoding = 'hex', crypto = crypto_, sets } = {}) {
+  return digest_(a, { algorithm, inputEncoding, outputEncoding, crypto, sets })
 }

src/digest.js

 
 // Compute digest for JSON object.
-export function digest (a, { algorithm = 'sha1', inputEncoding = 'utf8', outputEncoding = 'hex', crypto } = {}) {
+export function digest (a, { algorithm = 'sha1', inputEncoding = 'utf8', outputEncoding = 'hex', crypto, sets } = {}) {
   let h = crypto.createHash(algorithm)
   let u = (...args) => h.update(args.join(':'), inputEncoding)
-  let d = a => digest(a, { algorithm, inputEncoding, outputEncoding, crypto })
+  let d = a => digest(a, { algorithm, inputEncoding, outputEncoding, crypto, sets })
   switch (true) {
@@ -60,5 +60,11 @@
     case Array.isArray(a):
-      u('[')
-      a.forEach(e => u('a', d(e)))
-      u(']')
+      if (sets) {
+        u('<')
+        a.map(d).sort().forEach(e => u('A', e))
+        u('>')
+      } else {
+        u('[')
+        a.forEach(e => u('a', d(e)))
+        u(']')
+      }
       break
@@ -65,0 +71,0 @@

src/index.js

@@ -5,4 +5,4 @@
 
-export function digest (a, { algorithm = 'sha1', inputEncoding = 'utf8', outputEncoding = 'hex', crypto = crypto_ } = {}) {
-  return digest_(a, { algorithm, inputEncoding, outputEncoding, crypto })
+export function digest (a, { algorithm = 'sha1', inputEncoding = 'utf8', outputEncoding = 'hex', crypto = crypto_, sets } = {}) {
+  return digest_(a, { algorithm, inputEncoding, outputEncoding, crypto, sets })
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

38165

increased by3.92%

Lines of code

692

increased by3.59%

No dependency changes