Merge pull request #57 from snyk/fix/reduce-lodash

fix: Reduce lodash usage

src/core/create-from-json.ts

@@ -1,4 +1,3 @@
-import * as _ from '@snyk/lodash';
 import * as semver from 'semver';
 import * as graphlib from '@snyk/graphlib';
 import * as types from './types';
@@ -93,7 +92,7 @@ function validateDepGraphData(depGraphData: DepGraphData) {
     nodesMap[rootNodeId].pkgId === rootPkgId,
     `the root node .pkgId should be "${rootPkgId}"`,
   );
-  const pkgIds = _.keys(pkgsMap);
+  const pkgIds = Object.keys(pkgsMap);
   // NOTE: this name@version check is very strict,
   // we can relax it later, it just makes things easier now
   assert(
@@ -102,11 +101,13 @@ function validateDepGraphData(depGraphData: DepGraphData) {
     'pkgs ids should be name@version',
   );
   assert(
-    _.values(nodesMap).filter((node) => !(node.pkgId in pkgsMap)).length === 0,
+    Object.values(nodesMap).filter((node) => !(node.pkgId in pkgsMap))
+      .length === 0,
     'some instance nodes belong to non-existing pkgIds',
   );
   assert(
-    _.values(pkgsMap).filter((pkg: { name: string }) => !pkg.name).length === 0,
+    Object.values(pkgsMap).filter((pkg: { name: string }) => !pkg.name)
+      .length === 0,
     'some .pkgs elements have no .name field',
   );
 }

src/core/dep-graph.ts

@@ -48,7 +48,7 @@ class DepGraphImpl implements types.DepGraphInternal {
     this._rootNodeId = rootNodeId;
     this._rootPkgId = (graph.node(rootNodeId) as GraphNode).pkgId;
 
-    this._pkgList = _.values(pkgs);
+    this._pkgList = Object.values(pkgs);
     this._depPkgsList = this._pkgList.filter((pkg) => pkg !== this.rootPkg);
   }
 
@@ -213,14 +213,14 @@ class DepGraphImpl implements types.DepGraphInternal {
         pkgId: node.pkgId,
         deps,
       };
-      if (!_.isEmpty(node.info)) {
+      if (node.info && Object.keys(node.info).length > 0) {
         elem.info = node.info;
       }
       acc.push(elem);
       return acc;
     }, []);
 
-    const pkgs: Array<{ id: string; info: types.PkgInfo }> = _.keys(
+    const pkgs: Array<{ id: string; info: types.PkgInfo }> = Object.keys(
       this._pkgs,
     ).map((pkgId: string) => ({
       id: pkgId,

src/core/validate-graph.ts

@@ -1,4 +1,3 @@
-import * as _ from '@snyk/lodash';
 import * as graphlib from '@snyk/graphlib';
 import { ValidationError } from './errors';
 
@@ -26,7 +25,7 @@ export function validateGraph(
     'not all graph nodes are reachable from root',
   );
 
-  const pkgIds = _.keys(pkgs) as string[];
+  const pkgIds = Object.keys(pkgs);
   const pkgsWithoutInstances = pkgIds.filter(
     (pkgId) => !pkgNodes[pkgId] || pkgNodes[pkgId].size === 0,
   );

src/legacy/index.ts

@@ -1,4 +1,3 @@
-import * as _ from '@snyk/lodash';
 import * as crypto from 'crypto';
 import * as types from '../core/types';
 import { DepGraphBuilder } from '../core/builder';
@@ -95,7 +94,7 @@ async function buildGraph(
 
   const deps = depTree.dependencies || {};
   // filter-out invalid null deps (shouldn't happen - but did...)
-  const depNames = _.keys(deps).filter((d) => !!deps[d]);
+  const depNames = Object.keys(deps).filter((d) => !!deps[d]);
   for (const depName of depNames.sort()) {
     const dep = deps[depName];
 

test/helpers.ts

@@ -9,7 +9,7 @@ export function loadFixture(name: string) {
   );
 }
 
-function depSort(a: any, b: any) {
+function depCompare(a: any, b: any) {
   if (a.name < b.name) {
     return -1;
   } else if (a.name > b.name) {
@@ -24,7 +24,9 @@ function depSort(a: any, b: any) {
 }
 
 export function expectSamePkgs(actual: PkgInfo[], expected: PkgInfo[]) {
-  return expect(actual.sort(depSort)).toEqual(expected.sort(depSort));
+  actual = actual.slice().sort(depCompare);
+  expected = expected.slice().sort(depCompare);
+  return expect(actual).toEqual(expected);
 }
 
 export function depTreesEqual(a: any, b: any) {
@@ -43,17 +45,17 @@ export function depTreesEqual(a: any, b: any) {
   const bDeps = b.dependencies || {};
 
   if (
-    _.keys(aDeps)
+    Object.keys(aDeps)
       .sort()
       .join(',') !==
-    _.keys(bDeps)
+    Object.keys(bDeps)
       .sort()
       .join(',')
   ) {
     return false;
   }
 
-  for (const depName of _.keys(aDeps)) {
+  for (const depName of Object.keys(aDeps)) {
     const aSubtree = aDeps[depName];
     const bSubtree = bDeps[depName];
 
@@ -65,3 +67,16 @@ export function depTreesEqual(a: any, b: any) {
 
   return true;
 }
+
+export const sortBy = (arr: any[], p: string) =>
+  arr.slice().sort((x: any, y: any) => {
+    const a = x[p];
+    const b = y[p];
+    if (a < b) {
+      return -1;
+    } else if (a > b) {
+      return 1;
+    } else {
+      return 0;
+    }
+  });

test/legacy/from-dep-tree.test.ts

@@ -1,4 +1,3 @@
-import * as _ from '@snyk/lodash';
 import * as depGraphLib from '../../src';
 import * as types from '../../src/core/types';
 import * as helpers from '../helpers';
@@ -342,25 +341,15 @@ describe('depTreeToGraph with (invalid) null dependency', () => {
       depTree as any,
       'composer',
     );
-    expect(_.sortBy(depGraph.getPkgs(), 'name')).toEqual(
-      _.sortBy(
-        [
-          { name: 'pine', version: '4' },
-          { name: 'foo', version: '1' },
-          { name: 'baz', version: '3' },
-        ],
-        'name',
-      ),
-    );
-    expect(_.sortBy(depGraph.getDepPkgs(), 'name')).toEqual(
-      _.sortBy(
-        [
-          { name: 'foo', version: '1' },
-          { name: 'baz', version: '3' },
-        ],
-        'name',
-      ),
-    );
+    helpers.expectSamePkgs(depGraph.getPkgs(), [
+      { name: 'pine', version: '4' },
+      { name: 'foo', version: '1' },
+      { name: 'baz', version: '3' },
+    ]);
+    helpers.expectSamePkgs(depGraph.getDepPkgs(), [
+      { name: 'foo', version: '1' },
+      { name: 'baz', version: '3' },
+    ]);
   });
 });
 
@@ -444,7 +433,7 @@ describe('with labels', () => {
 
   it('getPkgNodes() returns labels', () => {
     let dNodes = depGraph.getPkgNodes({ name: 'd', version: '2.0.0' });
-    dNodes = _.sortBy(dNodes, 'id');
+    dNodes = helpers.sortBy(dNodes, 'id');
     expect(dNodes[0].info.labels).toEqual({ key: 'value1' });
     expect(dNodes[1].info.labels).toEqual({ key: 'value2' });
   });

test/legacy/to-dep-tree-prune.test.ts

@@ -1,4 +1,3 @@
-import * as _ from '@snyk/lodash';
 import * as depGraphLib from '../../src';
 import * as helpers from '../helpers';
 

test/legacy/to-dep-tree.test.ts

@@ -1,4 +1,3 @@
-import * as _ from '@snyk/lodash';
 import * as depGraphLib from '../../src';
 import * as helpers from '../helpers';