mapexplorer-core - npm Package Compare versions

Comparing version 1.0.0-alpha to 1.0.1-alpha

bower.json

@@ -30,4 +30,4 @@ {
     "d3": "^4.1.1",
-    "stratumn-sdk": "alpha"
+    "stratumn-agent-client": "alpha"
   }
 }

karma.conf.js

@@ -15,3 +15,3 @@ var path = require('path');
     // frameworks to use
-    frameworks: ['mocha', 'should', 'sinon'],
+    frameworks: ['mocha', 'should'],
 
@@ -21,2 +21,3 @@
     files: [
+      'test/integration/init.js',
       'bower_components/babel-polyfill/browser-polyfill.js',
@@ -29,2 +30,3 @@ 'bower_components/d3/d3.js',
     preprocessors: {
+      'test/integration/init.js': ['rollup'],
       'test/integration/*.test.js': ['rollup']
@@ -109,3 +111,3 @@ },
 
-  if (process.env.TRAVIS){
+  if (process.env.TRAVIS) {
     config.set({
@@ -112,0 +114,0 @@ browsers: ['TravisCI_Chrome', 'PhantomJS'],

lib/mapexplorer-core.js

 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('d3-hierarchy'), require('d3-transition'), require('d3-ease'), require('d3-selection'), require('d3-zoom'), require('d3-array'), require('deepmerge'), require('stratumn-sdk'), require('canonical-json'), require('js-sha256'), require('httpplease'), require('buffer')) :
-    typeof define === 'function' && define.amd ? define(['exports', 'd3-hierarchy', 'd3-transition', 'd3-ease', 'd3-selection', 'd3-zoom', 'd3-array', 'deepmerge', 'stratumn-sdk', 'canonical-json', 'js-sha256', 'httpplease', 'buffer'], factory) :
-    (factory((global.mapexplorerCore = global.mapexplorerCore || {}),global.d3,global.d3,global.d3,global.d3,global.d3,global.d3,global.merge,global.stratumnSdk,global.stringify,global.sha256,global.httpplease,global.buffer));
-}(this, (function (exports,d3Hierarchy,d3Transition,d3Ease,d3Selection,d3Zoom,d3Array,merge,stratumnSdk,stringify,sha256,httpplease,buffer) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('d3-hierarchy'), require('d3-transition'), require('d3-ease'), require('d3-selection'), require('d3-zoom'), require('d3-array'), require('deepmerge'), require('stratumn-agent-client'), require('canonical-json'), require('js-sha256'), require('httpplease'), require('buffer')) :
+    typeof define === 'function' && define.amd ? define(['exports', 'd3-hierarchy', 'd3-transition', 'd3-ease', 'd3-selection', 'd3-zoom', 'd3-array', 'deepmerge', 'stratumn-agent-client', 'canonical-json', 'js-sha256', 'httpplease', 'buffer'], factory) :
+    (factory((global.mapexplorerCore = global.mapexplorerCore || {}),global.d3,global.d3,global.d3,global.d3,global.d3,global.d3,global.merge,global.stratumnAgentClient,global.stringify,global.sha256,global.httpplease,global.buffer));
+}(this, (function (exports,d3Hierarchy,d3Transition,d3Ease,d3Selection,d3Zoom,d3Array,merge,stratumnAgentClient,stringify,sha256,httpplease,buffer) { 'use strict';
 
@@ -13,3 +13,3 @@ merge = 'default' in merge ? merge['default'] : merge;
 function makeLink(source, target) {
-  var margin = arguments.length <= 2 || arguments[2] === undefined ? 0 : arguments[2];
+  var margin = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
 
@@ -41,5 +41,118 @@ var finalTarget = target || source;
 } : function (obj) {
-  return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj;
+  return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
 };
 
+var asyncGenerator = function () {
+  function AwaitValue(value) {
+    this.value = value;
+  }
+
+  function AsyncGenerator(gen) {
+    var front, back;
+
+    function send(key, arg) {
+      return new Promise(function (resolve, reject) {
+        var request = {
+          key: key,
+          arg: arg,
+          resolve: resolve,
+          reject: reject,
+          next: null
+        };
+
+        if (back) {
+          back = back.next = request;
+        } else {
+          front = back = request;
+          resume(key, arg);
+        }
+      });
+    }
+
+    function resume(key, arg) {
+      try {
+        var result = gen[key](arg);
+        var value = result.value;
+
+        if (value instanceof AwaitValue) {
+          Promise.resolve(value.value).then(function (arg) {
+            resume("next", arg);
+          }, function (arg) {
+            resume("throw", arg);
+          });
+        } else {
+          settle(result.done ? "return" : "normal", result.value);
+        }
+      } catch (err) {
+        settle("throw", err);
+      }
+    }
+
+    function settle(type, value) {
+      switch (type) {
+        case "return":
+          front.resolve({
+            value: value,
+            done: true
+          });
+          break;
+
+        case "throw":
+          front.reject(value);
+          break;
+
+        default:
+          front.resolve({
+            value: value,
+            done: false
+          });
+          break;
+      }
+
+      front = front.next;
+
+      if (front) {
+        resume(front.key, front.arg);
+      } else {
+        back = null;
+      }
+    }
+
+    this._invoke = send;
+
+    if (typeof gen.return !== "function") {
+      this.return = undefined;
+    }
+  }
+
+  if (typeof Symbol === "function" && Symbol.asyncIterator) {
+    AsyncGenerator.prototype[Symbol.asyncIterator] = function () {
+      return this;
+    };
+  }
+
+  AsyncGenerator.prototype.next = function (arg) {
+    return this._invoke("next", arg);
+  };
+
+  AsyncGenerator.prototype.throw = function (arg) {
+    return this._invoke("throw", arg);
+  };
+
+  AsyncGenerator.prototype.return = function (arg) {
+    return this._invoke("return", arg);
+  };
+
+  return {
+    wrap: function (fn) {
+      return function () {
+        return new AsyncGenerator(fn.apply(this, arguments));
+      };
+    },
+    await: function (value) {
+      return new AwaitValue(value);
+    }
+  };
+}();
+
 var classCallCheck = function (instance, Constructor) {
@@ -248,3 +361,3 @@ if (!(instance instanceof Constructor)) {
     if (!segment.link.state) {
-      return stratumnSdk.loadLink(segment).then(function (res) {
+      return stratumnAgentClient.loadLink(segment).then(function (res) {
         return merge(res, segment);
@@ -349,4 +462,4 @@ });
     value: function _load(map) {
-      return stratumnSdk.getAgent(map.applicationUrl).then(function (app) {
-        return app.findSegments({ mapId: map.id });
+      return stratumnAgentClient.getAgent(map.applicationUrl).then(function (app) {
+        return app.findSegments({ mapId: map.id, limit: -1 });
       }).catch(function (res) {
@@ -417,41 +530,31 @@ return console.log(res);
     value: function _validateMerklePath() {
-      var _this = this;
-
       var evidence = this.segment.meta.evidence;
       if (evidence) {
         if (evidence.state === 'COMPLETE') {
-          var _ret = function () {
-            var previous = _this.segment.meta.linkHash;
+          var previous = this.segment.meta.linkHash;
 
-            var error = void 0;
-            evidence.merklePath.every(function (merkleNode) {
-              if (merkleNode.left === previous || merkleNode.right === previous) {
-                var computedParent = computeMerkleParent(merkleNode.left, merkleNode.right);
+          var error = void 0;
+          evidence.merklePath.every(function (merkleNode) {
+            if (merkleNode.left === previous || merkleNode.right === previous) {
+              var computedParent = computeMerkleParent(merkleNode.left, merkleNode.right);
 
-                if (computedParent !== merkleNode.parent) {
-                  error = 'Invalid Merkle Node ' + JSON.stringify(merkleNode) + ': ' + ('computed parent: ' + computedParent);
-                  return false;
-                }
-                previous = merkleNode.parent;
-                return true;
+              if (computedParent !== merkleNode.parent) {
+                error = 'Invalid Merkle Node ' + JSON.stringify(merkleNode) + ': ' + ('computed parent: ' + computedParent);
+                return false;
               }
-              error = 'Invalid Merkle Node ' + JSON.stringify(merkleNode) + ': ' + ('previous hash (' + previous + ') not found');
-              return false;
-            });
-
-            if (error) {
-              return {
-                v: error
-              };
+              previous = merkleNode.parent;
+              return true;
             }
+            error = 'Invalid Merkle Node ' + JSON.stringify(merkleNode) + ': ' + ('previous hash (' + previous + ') not found');
+            return false;
+          });
 
-            var lastMerkleNode = evidence.merklePath[evidence.merklePath.length - 1];
-            if (lastMerkleNode.parent !== evidence.merkleRoot) {
-              return {
-                v: 'Invalid Merkle Root ' + evidence.merkleRoot + ': not found in Merkle Path'
-              };
-            }
-          }();
+          if (error) {
+            return error;
+          }
 
-          if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v;
+          var lastMerkleNode = evidence.merklePath[evidence.merklePath.length - 1];
+          if (lastMerkleNode.parent !== evidence.merkleRoot) {
+            return 'Invalid Merkle Root ' + evidence.merkleRoot + ': not found in Merkle Path';
+          }
         }
@@ -464,3 +567,3 @@ }
     value: function _validateFossil() {
-      var _this2 = this;
+      var _this = this;
 
@@ -471,3 +574,3 @@ var txId = this.segment.meta.evidence.transactions['bitcoin:main'];
         if (!body.outputs.find(function (output) {
-          return output.data_hex === _this2.segment.meta.evidence.merkleRoot;
+          return output.data_hex === _this.segment.meta.evidence.merkleRoot;
         })) {
@@ -474,0 +577,0 @@ return 'Merkle root not found in transaction data';

package.json

 {
   "name": "mapexplorer-core",
-  "version": "1.0.0-alpha",
+  "version": "1.0.1-alpha",
   "description": "Core library for building Map Explorer components",
@@ -18,3 +18,3 @@ "main": "lib/mapexplorer-core.js",
     "build": "npm run build:npm && npm run build:bower",
-    "watch": "rollup -c -w",
+    "watch": "rollup -c rollup.bower.config.js -w",
     "prepublish": "npm run build:npm"
@@ -56,3 +56,2 @@ },
     "karma-should": "^1.0.0",
-    "karma-sinon": "^1.0.5",
     "karma-sourcemap-loader": "^0.3.7",
@@ -65,3 +64,3 @@ "mocha": "^2.4.5",
     "rollup-plugin-commonjs": "^3.3.1",
-    "rollup-plugin-json": "^2.0.1",
+    "rollup-plugin-json": "^2.1.0",
     "rollup-plugin-node-builtins": "^1.0.7",
@@ -72,3 +71,3 @@ "rollup-plugin-node-globals": "^1.0.6",
     "should": "^8.2.2",
-    "sinon": "^1.17.5",
+    "xhr-mock": "^1.7.0",
     "zock": "^0.2.6"
@@ -87,4 +86,4 @@ },
     "js-sha256": "^0.3.0",
-    "stratumn-sdk": "^1.2.2"
+    "stratumn-agent-client": "^1.7.1"
   }
 }

src/ChainTreeBuilder.js

@@ -7,3 +7,3 @@ import ChainTree from './ChainTree';
 import tagsSet from './tagsSet';
-import { getAgent } from 'stratumn-sdk';
+import { getAgent } from 'stratumn-agent-client';
 
@@ -65,5 +65,5 @@ export const defaultOptions = {
     return getAgent(map.applicationUrl)
-      .then(app => app.findSegments({ mapId: map.id }))
+      .then(app => app.findSegments({ mapId: map.id, limit: -1 }))
       .catch(res => console.log(res));
   }
 }

src/resolveLinks.js

 import merge from 'deepmerge';
-import { loadLink } from 'stratumn-sdk';
+import { loadLink } from 'stratumn-agent-client';
 
@@ -4,0 +4,0 @@ export default function resolveLinks(segments) {

src/SegmentValidator.js

@@ -98,3 +98,4 @@ import hashJson from './hashJson';
       httpplease.get(`https://api.blockcypher.com/v1/btc/main/txs/${txId}`, (err, res) =>
-        (err ? reject(err) : resolve(res)))
+        (err ? reject(err) : resolve(res))
+      )
     );
@@ -101,0 +102,0 @@ blockCypherCache[txId] = p;

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

147956

increased by8.25%

Dev dependency count

32

decreased by-3.03%

Lines of code

1965

increased by9.9%

Dependency changes

• + Addedstratumn-agent-client@^1.7.1

• + Addedsetimmediate@1.0.5(transitive)

• + Addedstratumn-agent-client@1.9.0(transitive)

• - Removedstratumn-sdk@^1.2.2

• - Removedstratumn-sdk@1.5.0(transitive)