@0xcert/utils - npm Package Compare versions

Comparing version 2.0.0-alpha1 to 2.0.0-alpha10

CHANGELOG.json

@@ -5,4 +5,4 @@ {
     {
-      "version": "2.0.0-alpha1",
-      "tag": "@0xcert/utils_v2.0.0-alpha1",
+      "version": "2.0.0-alpha10",
+      "tag": "@0xcert/utils_v2.0.0-alpha10",
       "date": "Wed, 19 Jun 2019 10:31:05 GMT",
@@ -9,0 +9,0 @@ "comments": {}

CHANGELOG.md

@@ -5,3 +5,3 @@ # Change Log - @0xcert/utils
 
-## 2.0.0-alpha1
+## 2.0.0-alpha10
 Wed, 19 Jun 2019 10:31:05 GMT
@@ -8,0 +8,0 @@

dist/methods/fetch.d.ts

@@ -1,1 +0,1 @@
-export declare function fetch(path: any, options?: any): Promise<any>;
+export declare function fetchJson(path: any, options?: any): Promise<any>;

dist/methods/fetch.js

 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -11,13 +12,21 @@ });
 Object.defineProperty(exports, "__esModule", { value: true });
-function fetch(path, options) {
+function fetchJson(path, options) {
     return __awaiter(this, void 0, void 0, function* () {
         if (typeof window !== 'undefined') {
-            return window.fetch(path, options);
+            return window.fetch(path, options).then((r) => r.json());
         }
+        else if (path.lastIndexOf('http', 0) !== 0) {
+            try {
+                return require('fs').promises.readFile(path, 'utf8').then((d) => JSON.parse(d));
+            }
+            catch (e) {
+                return null;
+            }
+        }
         else {
-            return require('node-fetch')(path, options);
+            return require('node-fetch')(path, options).then((r) => r.json());
         }
     });
 }
-exports.fetch = fetch;
+exports.fetchJson = fetchJson;
 //# sourceMappingURL=fetch.js.map

dist/methods/sha.js

 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -8,0 +9,0 @@ });

dist/tests/index.test.js

@@ -14,5 +14,5 @@ "use strict";
     ctx.true(!!utils.toTuple);
-    ctx.true(!!utils.fetch);
+    ctx.true(!!utils.fetchJson);
 });
 exports.default = spec;
 //# sourceMappingURL=index.test.js.map

dist/tests/methods/fetch.test.js

 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -12,9 +13,14 @@ });
 const spec_1 = require("@hayspec/spec");
+const path = require("path");
 const fetch_1 = require("../../methods/fetch");
 const spec = new spec_1.Spec();
-spec.test('downloads a remote file', (ctx) => __awaiter(this, void 0, void 0, function* () {
-    const res = yield fetch_1.fetch('https://docs.0xcert.org/xcert-mock.json').then((r) => r.json());
+spec.test('downloads a remote file', (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const res = yield fetch_1.fetchJson('https://docs.0xcert.org/xcert-mock.json');
     ctx.true(!!res.XcertMock);
 }));
+spec.test('reads a local file', (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const res = yield fetch_1.fetchJson(path.join(__dirname, '..', 'mocks', 'xcert-mock.json'));
+    ctx.true(!!res.XcertMock);
+}));
 exports.default = spec;
 //# sourceMappingURL=fetch.test.js.map

dist/tests/methods/keccak.test.js

 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -14,3 +15,3 @@ });
 const spec = new spec_1.Spec();
-spec.test('converts string into keccak256 hash', (ctx) => __awaiter(this, void 0, void 0, function* () {
+spec.test('converts string into keccak256 hash', (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.is(keccak_1.keccak256('foo#'), '0xe7bb87eda991af44cdb673a7d5f2bfeb854dd089e421b3934d022fc5c29259a0');
@@ -17,0 +18,0 @@ ctx.is(keccak_1.keccak256('bar!'), '0x179eb773d34690d312adc3f96661402e2de2009e39dbf4b8dee22b3adc842752');

dist/tests/methods/sha.test.js

 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -14,3 +15,3 @@ });
 const spec = new spec_1.Spec();
-spec.test('converts string into SHA256 hash', (ctx) => __awaiter(this, void 0, void 0, function* () {
+spec.test('converts string into SHA256 hash', (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.is(yield sha_1.sha(256, 'foo#'), '18845243706c9f9a00b514348b58edd82fe708a68393ccbb3f70e1599577a148');
@@ -17,0 +18,0 @@ ctx.is(yield sha_1.sha(256, 'bar!'), 'e687b749f2cd93615923a2f705faace4033f35d57ccfca652cdc39616a94a3c2');

package.json

 {
   "name": "@0xcert/utils",
-  "version": "2.0.0-alpha1",
+  "version": "2.0.0-alpha10",
   "description": "General utility module with common helper functions.",
@@ -67,14 +67,14 @@ "main": "./dist/index.js",
   "devDependencies": {
-    "@hayspec/cli": "^0.8.3",
-    "@hayspec/spec": "^0.8.3",
-    "@types/node": "^10.12.24",
-    "nyc": "^13.1.0",
-    "ts-node": "^7.0.1",
-    "tslint": "^5.12.1",
-    "typescript": "^3.1.1"
+    "@hayspec/cli": "0.9.0",
+    "@hayspec/spec": "0.9.0",
+    "@types/node": "12.7.8",
+    "nyc": "14.1.1",
+    "ts-node": "8.4.1",
+    "tslint": "5.20.0",
+    "typescript": "3.6.3"
   },
   "dependencies": {
-    "eth-lib": "0.1.27",
-    "node-fetch": "^2.3.0"
+    "eth-lib": "0.2.8",
+    "node-fetch": "2.6.0"
   }
 }

src/methods/fetch.ts

 /**
- * Universal fetch method reads remote or local file.
+ * Universal fetch method reads remote or local JSON file.
  * @param path URL or local path.
  */
-export async function fetch(path, options?) {
+export async function fetchJson(path, options?): Promise<any> {
   if (typeof window !== 'undefined') {
-    return (window as any).fetch(path, options);
+    return (window as any).fetch(path, options).then((r) => r.json());
+  } else if (path.lastIndexOf('http', 0) !== 0) {
+    try { // UI with SSR sometimes can't find `fs` module, but it's not needed
+      return require('fs').promises.readFile(path, 'utf8').then((d) => JSON.parse(d));
+    } catch (e) {
+      return null;
+    }
   } else {
-    return require('node-fetch')(path, options);
+    return require('node-fetch')(path, options).then((r) => r.json());
   }
 }

src/tests/index.test.ts

@@ -14,5 +14,5 @@ import { Spec } from '@hayspec/spec';
   ctx.true(!!utils.toTuple);
-  ctx.true(!!utils.fetch);
+  ctx.true(!!utils.fetchJson);
 });
 
 export default spec;

src/tests/methods/fetch.test.ts

 import { Spec } from '@hayspec/spec';
-import { fetch } from '../../methods/fetch';
+import * as path from 'path';
+import { fetchJson } from '../../methods/fetch';
 
@@ -7,6 +8,11 @@ const spec = new Spec();
 spec.test('downloads a remote file', async (ctx) => {
-  const res = await fetch('https://docs.0xcert.org/xcert-mock.json').then((r) => r.json());
+  const res = await fetchJson('https://docs.0xcert.org/xcert-mock.json');
   ctx.true(!!res.XcertMock);
 });
 
+spec.test('reads a local file', async (ctx) => {
+  const res = await fetchJson(path.join(__dirname, '..', 'mocks', 'xcert-mock.json'));
+  ctx.true(!!res.XcertMock);
+});
+
 export default spec;

New alerts

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Fixed alerts

Network access

Supply chain risk

This module accesses the network.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

79422

increased by18.8%

Number of package files

86

increased by4.88%

Lines of code

1033

increased by9.66%

Number of medium supply chain risk alerts

0

decreased by-100%

Worsened metrics

Number of low supply chain risk alerts

1

increased byInfinity%

Dependency changes

• + Addedeth-lib@0.2.8(transitive)

• + Addednode-fetch@2.6.0(transitive)

• - Removedaccepts@1.3.8(transitive)

• - Removedajv@6.12.6(transitive)

• - Removedarray-flatten@1.1.1(transitive)

• - Removedasn1@0.2.6(transitive)

• - Removedassert-plus@1.0.0(transitive)

• - Removedasync-limiter@1.0.1(transitive)

• - Removedasynckit@0.4.0(transitive)

• - Removedaws-sign2@0.7.0(transitive)

• - Removedaws4@1.13.2(transitive)

• - Removedbcrypt-pbkdf@1.0.2(transitive)

• - Removedbody-parser@1.20.3(transitive)

• - Removedbrowserify-sha3@0.0.4(transitive)

• - Removedbytes@3.1.2(transitive)

• - Removedcall-bind-apply-helpers@1.0.1(transitive)

• - Removedcall-bound@1.0.3(transitive)

• - Removedcaseless@0.12.0(transitive)

• - Removedcombined-stream@1.0.8(transitive)

• - Removedcontent-disposition@0.5.4(transitive)

• - Removedcontent-type@1.0.5(transitive)

• - Removedcookie@0.7.1(transitive)

• - Removedcookie-signature@1.0.6(transitive)

• - Removedcore-util-is@1.0.2(transitive)

• - Removedcors@2.8.5(transitive)

• - Removeddashdash@1.14.1(transitive)

• - Removeddebug@2.6.9(transitive)

• - Removeddelayed-stream@1.0.0(transitive)

• - Removeddepd@2.0.0(transitive)

• - Removeddestroy@1.2.0(transitive)

• - Removeddunder-proto@1.0.1(transitive)

• - Removedecc-jsbn@0.1.2(transitive)

• - Removedee-first@1.1.1(transitive)

• - Removedencodeurl@1.0.22.0.0(transitive)

• - Removedes-define-property@1.0.1(transitive)

• - Removedes-errors@1.3.0(transitive)

• - Removedes-object-atoms@1.1.1(transitive)

• - Removedescape-html@1.0.3(transitive)

• - Removedetag@1.8.1(transitive)

• - Removedeth-lib@0.1.27(transitive)

• - Removedexpress@4.21.2(transitive)

• - Removedextend@3.0.2(transitive)

• - Removedextsprintf@1.3.0(transitive)

• - Removedfast-deep-equal@3.1.3(transitive)

• - Removedfast-json-stable-stringify@2.1.0(transitive)

• - Removedfinalhandler@1.3.1(transitive)

• - Removedforever-agent@0.6.1(transitive)

• - Removedform-data@2.3.3(transitive)

• - Removedforwarded@0.2.0(transitive)

• - Removedfresh@0.5.2(transitive)

• - Removedfunction-bind@1.1.2(transitive)

• - Removedget-intrinsic@1.2.7(transitive)

• - Removedget-proto@1.0.1(transitive)

• - Removedgetpass@0.1.7(transitive)

• - Removedgopd@1.2.0(transitive)

• - Removedhar-schema@2.0.0(transitive)

• - Removedhar-validator@5.1.5(transitive)

• - Removedhas-symbols@1.1.0(transitive)

• - Removedhasown@2.0.2(transitive)

• - Removedhttp-errors@2.0.0(transitive)

• - Removedhttp-signature@1.2.0(transitive)

• - Removediconv-lite@0.4.24(transitive)

• - Removedipaddr.js@1.9.1(transitive)

• - Removedis-typedarray@1.0.0(transitive)

• - Removedisstream@0.1.2(transitive)

• - Removedjs-sha3@0.6.1(transitive)

• - Removedjsbn@0.1.1(transitive)

• - Removedjson-schema@0.4.0(transitive)

• - Removedjson-schema-traverse@0.4.1(transitive)

• - Removedjson-stringify-safe@5.0.1(transitive)

• - Removedjsprim@1.4.2(transitive)

• - Removedkeccakjs@0.2.3(transitive)

• - Removedmath-intrinsics@1.1.0(transitive)

• - Removedmedia-typer@0.3.0(transitive)

• - Removedmerge-descriptors@1.0.3(transitive)

• - Removedmethods@1.1.2(transitive)

• - Removedmime@1.6.0(transitive)

• - Removedmime-db@1.52.0(transitive)

• - Removedmime-types@2.1.35(transitive)

• - Removedms@2.0.02.1.3(transitive)

• - Removednan@2.13.2(transitive)

• - Removednano-json-stream-parser@0.1.2(transitive)

• - Removednegotiator@0.6.3(transitive)

• - Removednode-fetch@2.7.0(transitive)

• - Removedoauth-sign@0.9.0(transitive)

• - Removedobject-inspect@1.13.3(transitive)

• - Removedon-finished@2.4.1(transitive)

• - Removedparseurl@1.3.3(transitive)

• - Removedpath-to-regexp@0.1.12(transitive)

• - Removedperformance-now@2.1.0(transitive)

• - Removedproxy-addr@2.0.7(transitive)

• - Removedpsl@1.15.0(transitive)

• - Removedpunycode@2.3.1(transitive)

• - Removedqs@6.13.06.5.3(transitive)

• - Removedrange-parser@1.2.1(transitive)

• - Removedraw-body@2.5.2(transitive)

• - Removedrequest@2.88.2(transitive)

• - Removedsafe-buffer@5.1.25.2.1(transitive)

• - Removedsafer-buffer@2.1.2(transitive)

• - Removedsend@0.19.0(transitive)

• - Removedserve-static@1.16.2(transitive)

• - Removedservify@0.1.12(transitive)

• - Removedsetprototypeof@1.2.0(transitive)

• - Removedsha3@1.2.6(transitive)

• - Removedside-channel@1.1.0(transitive)

• - Removedside-channel-list@1.0.0(transitive)

• - Removedside-channel-map@1.0.1(transitive)

• - Removedside-channel-weakmap@1.0.2(transitive)

• - Removedsshpk@1.18.0(transitive)

• - Removedstatuses@2.0.1(transitive)

• - Removedtoidentifier@1.0.1(transitive)

• - Removedtough-cookie@2.5.0(transitive)

• - Removedtr46@0.0.3(transitive)

• - Removedtunnel-agent@0.6.0(transitive)

• - Removedtweetnacl@0.14.5(transitive)

• - Removedtype-is@1.6.18(transitive)

• - Removedultron@1.1.1(transitive)

• - Removedunpipe@1.0.0(transitive)

• - Removeduri-js@4.4.1(transitive)

• - Removedutils-merge@1.0.1(transitive)

• - Removeduuid@3.4.0(transitive)

• - Removedvary@1.1.2(transitive)

• - Removedverror@1.10.0(transitive)

• - Removedwebidl-conversions@3.0.1(transitive)

• - Removedwhatwg-url@5.0.0(transitive)

• - Removedws@3.3.3(transitive)

• Updatedeth-lib@0.2.8

• Updatednode-fetch@2.6.0