snyk-resolve-deps
Advanced tools
Comparing version
"use strict"; | ||
const depTypes = require("./dep-types"); | ||
const fs = require("then-fs"); | ||
const _ = require("./lodash"); | ||
const _get = require("lodash.get"); | ||
const _set = require("lodash.set"); | ||
const _clone = require("lodash.clone"); | ||
const _assign = require("lodash.assign"); | ||
const _flatten = require("lodash.flatten"); | ||
const debugModule = require("debug"); | ||
@@ -16,3 +20,3 @@ const path = require("path"); | ||
extraFields.forEach(function applyExtraField(field) { | ||
_.set(dest, field, _.get(src, field) || null); | ||
_set(dest, field, _get(src, field) || null); | ||
}); | ||
@@ -23,3 +27,3 @@ } | ||
tryRequire.cache.reset(); // reset the package cache on re-run | ||
let opt = _.clone(options || {}); | ||
let opt = _clone(options || {}); | ||
let pkgRoot = root; | ||
@@ -78,3 +82,3 @@ if (opt.file) { | ||
applyExtraFields(pkg, modules, options.extraFields); | ||
_.assign(modules, { | ||
_assign(modules, { | ||
name: pkg.name, | ||
@@ -139,3 +143,3 @@ version: pkg.version || null, | ||
return Promise.all(res).then(function (response) { | ||
response = _.flatten(response).filter(Boolean); | ||
response = _flatten(response).filter(Boolean); | ||
// if res.length === 0 we used to throw MISSING_NODE_MODULES but we're | ||
@@ -166,3 +170,3 @@ // not doing that now, and I think it's okay. | ||
applyExtraFields(curr, acc[curr.name], options.extraFields); | ||
_.assign(acc[curr.name], { | ||
_assign(acc[curr.name], { | ||
name: curr.name, | ||
@@ -169,0 +173,0 @@ version: curr.version || null, |
@@ -5,2 +5,3 @@ "use strict"; | ||
const unique = require("./unique"); | ||
const _assignIn = require("lodash.assignin"); | ||
const path = require("path"); | ||
@@ -10,3 +11,2 @@ const depTypes = require("./dep-types"); | ||
const moduleToObject = require("snyk-module"); | ||
const _ = require("./lodash"); | ||
const util = require("util"); | ||
@@ -103,4 +103,4 @@ const format = util.format; | ||
// only include the devDeps on the root level package | ||
let deps = _.extend({}, tree.__dependencies, tree.__from && from.length === 1 ? tree.__devDependencies : {}); | ||
deps = _.extend(deps, tree.__optionalDependencies); | ||
let deps = _assignIn({}, tree.__dependencies, tree.__from && from.length === 1 ? tree.__devDependencies : {}); | ||
deps = _assignIn(deps, tree.__optionalDependencies); | ||
return Object.keys(deps).reduce(function walkDepsPicker(acc, curr) { | ||
@@ -107,0 +107,0 @@ // only attempt to walk this dep if it's not in our path already |
@@ -26,4 +26,2 @@ { | ||
"devDependencies": { | ||
"@types/lodash": "^4.14.123", | ||
"jscs": "^3.0.7", | ||
"proxyquire": "^1.7.4", | ||
@@ -60,3 +58,3 @@ "sinon": "^1.17.3", | ||
}, | ||
"version": "4.4.1" | ||
"version": "4.4.2" | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
7
-22.22%47564
-1.07%21
-8.7%557
-0.89%