@dxworks/depinder 0.1.1 → 0.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/analyse.js +16 -17
- package/dist/commands/analyse.js.map +1 -1
- package/dist/commands/cache.js +7 -7
- package/dist/commands/cache.js.map +1 -1
- package/dist/commands/update.js +8 -8
- package/dist/commands/update.js.map +1 -1
- package/dist/extension-points/code-impact.d.ts +9 -8
- package/dist/plugins/dotnet/index.js +2 -2
- package/dist/plugins/dotnet/index.js.map +1 -1
- package/dist/plugins/java/index.js +2 -2
- package/dist/plugins/java/index.js.map +1 -1
- package/dist/plugins/javascript/index.js +6 -6
- package/dist/plugins/javascript/index.js.map +1 -1
- package/dist/plugins/python/index.js +5 -7
- package/dist/plugins/python/index.js.map +1 -1
- package/dist/utils/logging.d.ts +1 -0
- package/dist/utils/logging.js +36 -0
- package/dist/utils/logging.js.map +1 -0
- package/package.json +3 -4
package/dist/commands/analyse.js
CHANGED
|
@@ -8,7 +8,6 @@ const commander_1 = require("commander");
|
|
|
8
8
|
const fs_1 = __importDefault(require("fs"));
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
10
10
|
const plugins_1 = require("../plugins");
|
|
11
|
-
const cli_common_1 = require("@dxworks/cli-common");
|
|
12
11
|
const vulnerabilities_1 = require("../utils/vulnerabilities");
|
|
13
12
|
const semver_1 = require("semver");
|
|
14
13
|
const lodash_1 = __importDefault(require("lodash"));
|
|
@@ -22,7 +21,7 @@ const utils_1 = require("../utils/utils");
|
|
|
22
21
|
const blacklist_1 = require("../utils/blacklist");
|
|
23
22
|
const minimatch_1 = __importDefault(require("minimatch"));
|
|
24
23
|
const mongo_cache_1 = require("../cache/mongo-cache");
|
|
25
|
-
|
|
24
|
+
const logging_1 = require("../utils/logging");
|
|
26
25
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
27
26
|
const licenseIds = require('spdx-license-ids/');
|
|
28
27
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
@@ -59,29 +58,29 @@ function convertDepToRow(proj, dep) {
|
|
|
59
58
|
async function extractProjects(plugin, files) {
|
|
60
59
|
const projects = [];
|
|
61
60
|
for (const context of plugin.extractor.createContexts(files)) {
|
|
62
|
-
|
|
61
|
+
logging_1.log.info(`Parsing dependency tree information for ${JSON.stringify(context)}`);
|
|
63
62
|
try {
|
|
64
63
|
if (!plugin.parser) {
|
|
65
|
-
|
|
64
|
+
logging_1.log.info(`Plugin ${plugin.name} does not have a parser!`);
|
|
66
65
|
continue;
|
|
67
66
|
}
|
|
68
67
|
const proj = await plugin.parser.parseDependencyTree(context);
|
|
69
|
-
|
|
68
|
+
logging_1.log.info(`Done parsing dependency tree information for ${JSON.stringify(context)}`);
|
|
70
69
|
projects.push(proj);
|
|
71
70
|
}
|
|
72
71
|
catch (e) {
|
|
73
|
-
|
|
74
|
-
|
|
72
|
+
logging_1.log.warn(`Exception parsing dependency tree information for ${JSON.stringify(context)}`);
|
|
73
|
+
logging_1.log.error(e);
|
|
75
74
|
}
|
|
76
75
|
}
|
|
77
76
|
return projects;
|
|
78
77
|
}
|
|
79
78
|
function chooseCacheOption() {
|
|
80
79
|
if ((0, cache_2.getMongoDockerContainerStatus)() != 'running') {
|
|
81
|
-
|
|
80
|
+
logging_1.log.warn('Mongo cache is not running, using in-memory cache');
|
|
82
81
|
return json_cache_1.jsonCache;
|
|
83
82
|
}
|
|
84
|
-
|
|
83
|
+
logging_1.log.info('Mongo cache is up and running, using Mongo cache');
|
|
85
84
|
return mongo_cache_1.mongoCache;
|
|
86
85
|
}
|
|
87
86
|
async function cacheHit(cache, plugin, dep, refresh, refreshedLibs) {
|
|
@@ -95,12 +94,12 @@ async function analyseFiles(folders, options, useCache = true) {
|
|
|
95
94
|
const resultFolder = options.results || 'results';
|
|
96
95
|
if (!fs_1.default.existsSync(path_1.default.resolve(process.cwd(), resultFolder))) {
|
|
97
96
|
fs_1.default.mkdirSync(path_1.default.resolve(process.cwd(), resultFolder), { recursive: true });
|
|
98
|
-
|
|
97
|
+
logging_1.log.info('Creating results dir');
|
|
99
98
|
}
|
|
100
99
|
const allFiles = folders.flatMap(it => (0, utils_1.walkDir)(it));
|
|
101
100
|
const selectedPlugins = (0, plugins_1.getPluginsFromNames)(options.plugins);
|
|
102
101
|
for (const plugin of selectedPlugins) {
|
|
103
|
-
|
|
102
|
+
logging_1.log.info(`Plugin ${plugin.name} starting`);
|
|
104
103
|
const cache = useCache ? chooseCacheOption() : cache_1.noCache;
|
|
105
104
|
await cache.load();
|
|
106
105
|
const refreshedLibs = [];
|
|
@@ -112,7 +111,7 @@ async function analyseFiles(folders, options, useCache = true) {
|
|
|
112
111
|
const multiProgressBar = new cli_progress_1.MultiBar({}, cli_progress_1.Presets.shades_grey);
|
|
113
112
|
const projectsBar = multiProgressBar.create(projects.length, 0, { name: 'Projects', state: 'Analysing' });
|
|
114
113
|
for (const project of projects) {
|
|
115
|
-
|
|
114
|
+
logging_1.log.info(`Plugin ${plugin.name} analyzing project ${project.name}@${project.version}`);
|
|
116
115
|
const dependencies = Object.values(project.dependencies);
|
|
117
116
|
const filteredDependencies = dependencies.filter(it => !blacklist_1.blacklistedGlobs.some(glob => (0, minimatch_1.default)(it.name, glob)));
|
|
118
117
|
const depProgressBar = multiProgressBar.create(filteredDependencies.length, 0, {
|
|
@@ -153,12 +152,12 @@ async function analyseFiles(folders, options, useCache = true) {
|
|
|
153
152
|
dep.vulnerabilities = thisVersionVulnerabilities || [];
|
|
154
153
|
}
|
|
155
154
|
catch (e) {
|
|
156
|
-
|
|
157
|
-
|
|
155
|
+
logging_1.log.warn(`Exception getting remote info for ${dep.name}`);
|
|
156
|
+
logging_1.log.error(e);
|
|
158
157
|
}
|
|
159
158
|
depProgressBar.increment();
|
|
160
159
|
depsWithInfo++;
|
|
161
|
-
|
|
160
|
+
logging_1.log.info(`Got remote information on ${dep.name} (${depsWithInfo}/${filteredDependencies.length})`);
|
|
162
161
|
}
|
|
163
162
|
depProgressBar.stop();
|
|
164
163
|
projectsBar.increment();
|
|
@@ -208,8 +207,8 @@ async function analyseFiles(folders, options, useCache = true) {
|
|
|
208
207
|
return `${proj.path},${proj.name},${directDeps.length},${indirectDeps.length},${directOutdated.length},${directOutDatedPercent},${indirectOutdated.length},${indirectOutDatedPercent},${directVulnerable.length},${indirectVulnerable.length},${directOutOfSupport.length},${indirectOutOfSupport.length}`;
|
|
209
208
|
}).join('\n'));
|
|
210
209
|
}
|
|
211
|
-
|
|
212
|
-
|
|
210
|
+
logging_1.log.info(`Results are written to ${path_1.default.resolve(process.cwd(), resultFolder)}`);
|
|
211
|
+
logging_1.log.info('Done');
|
|
213
212
|
}
|
|
214
213
|
exports.analyseFiles = analyseFiles;
|
|
215
214
|
//# sourceMappingURL=analyse.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyse.js","sourceRoot":"","sources":["../../src/commands/analyse.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"analyse.js","sourceRoot":"","sources":["../../src/commands/analyse.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/cache.js
CHANGED
|
@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.cacheCommand = exports.cacheInitCommand = exports.cacheInfoCommand = exports.cacheDownCommand = exports.cacheUpCommand = exports.cacheInitAction = exports.cacheInfoAction = exports.getMongoDockerContainerStatus = exports.cacheDownAction = exports.cacheUpAction = void 0;
|
|
7
7
|
const commander_1 = require("commander");
|
|
8
8
|
const child_process_1 = require("child_process");
|
|
9
|
-
const cli_common_1 = require("@dxworks/cli-common");
|
|
10
9
|
const chalk_1 = __importDefault(require("chalk"));
|
|
11
10
|
const fs_1 = __importDefault(require("fs"));
|
|
12
11
|
const utils_1 = require("../utils/utils");
|
|
13
12
|
const path_1 = __importDefault(require("path"));
|
|
13
|
+
const logging_1 = require("../utils/logging");
|
|
14
14
|
async function cacheUpAction() {
|
|
15
15
|
(0, child_process_1.execSync)('docker-compose up -d', { cwd: path_1.default.resolve((0, utils_1.getHomeDir)(), 'cache'), stdio: 'inherit' });
|
|
16
16
|
}
|
|
@@ -24,7 +24,7 @@ function getMongoDockerContainerStatus() {
|
|
|
24
24
|
const output = (0, child_process_1.execSync)('docker inspect depinder-mongo').toString();
|
|
25
25
|
const result = JSON.parse(output);
|
|
26
26
|
if (result.length == 0) {
|
|
27
|
-
|
|
27
|
+
logging_1.log.error('Mongo is not running');
|
|
28
28
|
return null;
|
|
29
29
|
}
|
|
30
30
|
return result[0].State.Status;
|
|
@@ -37,16 +37,16 @@ exports.getMongoDockerContainerStatus = getMongoDockerContainerStatus;
|
|
|
37
37
|
function cacheInfoAction() {
|
|
38
38
|
const status = getMongoDockerContainerStatus();
|
|
39
39
|
if (status == null) {
|
|
40
|
-
|
|
41
|
-
|
|
40
|
+
logging_1.log.error('Mongo is not running');
|
|
41
|
+
logging_1.log.info(`To start Mongo cache run: ${chalk_1.default.yellow('depinder cache up')}`);
|
|
42
42
|
return;
|
|
43
43
|
}
|
|
44
44
|
if (status == 'running') {
|
|
45
|
-
|
|
45
|
+
logging_1.log.info(chalk_1.default.green('Mongo cache is up and running'));
|
|
46
46
|
}
|
|
47
47
|
else {
|
|
48
|
-
|
|
49
|
-
|
|
48
|
+
logging_1.log.info(`Mongo is ${status}`);
|
|
49
|
+
logging_1.log.info(`To start Mongo cache run: ${chalk_1.default.yellow('depinder cache up')}`);
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
exports.cacheInfoAction = cacheInfoAction;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/commands/cache.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAiC;AACjC,iDAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/commands/cache.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/update.js
CHANGED
|
@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.updateLibs = exports.updateCommand = void 0;
|
|
7
7
|
const commander_1 = require("commander");
|
|
8
|
-
const cli_common_1 = require("@dxworks/cli-common");
|
|
9
8
|
const chalk_1 = __importDefault(require("chalk"));
|
|
10
9
|
const cache_1 = require("./cache");
|
|
11
10
|
const mongo_cache_1 = require("../cache/mongo-cache");
|
|
@@ -13,6 +12,7 @@ const moment_1 = __importDefault(require("moment"));
|
|
|
13
12
|
const plugins_1 = require("../plugins");
|
|
14
13
|
const vulnerabilities_1 = require("../utils/vulnerabilities");
|
|
15
14
|
const cli_progress_1 = require("cli-progress");
|
|
15
|
+
const logging_1 = require("../utils/logging");
|
|
16
16
|
exports.updateCommand = new commander_1.Command()
|
|
17
17
|
.name('update')
|
|
18
18
|
.argument('[updated_before]', 'Update all libs that were updated before this date')
|
|
@@ -29,8 +29,8 @@ async function updateLibrariesAndLogProcess(idsToUpdate, selectedPlugins) {
|
|
|
29
29
|
async function updateLibs(updated_before, plugins) {
|
|
30
30
|
const status = (0, cache_1.getMongoDockerContainerStatus)();
|
|
31
31
|
if (status !== 'running') {
|
|
32
|
-
|
|
33
|
-
|
|
32
|
+
logging_1.log.info(chalk_1.default.red('Mongo Cache is not running properly.'));
|
|
33
|
+
logging_1.log.info(`To start Mongo cache run: ${chalk_1.default.yellow('depinder cache up')}`);
|
|
34
34
|
return;
|
|
35
35
|
}
|
|
36
36
|
const lastUpdateMoment = updated_before ? (0, moment_1.default)(updated_before) : (0, moment_1.default)().subtract(1, 'month');
|
|
@@ -39,11 +39,11 @@ async function updateLibs(updated_before, plugins) {
|
|
|
39
39
|
const selectedPlugins = (0, plugins_1.getPluginsFromNames)(plugins);
|
|
40
40
|
const idsToUpdate = ids.filter(id => selectedPlugins.some(plugin => id.startsWith(`${plugin.name}:`)));
|
|
41
41
|
if (idsToUpdate.length > 0) {
|
|
42
|
-
|
|
42
|
+
logging_1.log.info(`Updating ${idsToUpdate.length} of ${ids.length} libraries...`);
|
|
43
43
|
await updateLibrariesAndLogProcess(idsToUpdate, selectedPlugins);
|
|
44
44
|
}
|
|
45
45
|
else {
|
|
46
|
-
|
|
46
|
+
logging_1.log.info('No libraries to update.');
|
|
47
47
|
}
|
|
48
48
|
mongo_cache_1.mongoCache.write();
|
|
49
49
|
}
|
|
@@ -55,7 +55,7 @@ async function getLibraryIdsToUpdate(lastUpdateMoment) {
|
|
|
55
55
|
return docs.map(doc => doc._id.toString());
|
|
56
56
|
}
|
|
57
57
|
catch (err) {
|
|
58
|
-
|
|
58
|
+
logging_1.log.error('Error while searching for libraries to update in cache: ', err);
|
|
59
59
|
return [];
|
|
60
60
|
}
|
|
61
61
|
}
|
|
@@ -74,8 +74,8 @@ async function updateLibrariesFor(selectedPlugins, idsToUpdate, progressBar) {
|
|
|
74
74
|
await mongo_cache_1.mongoCache.set(id, lib);
|
|
75
75
|
}
|
|
76
76
|
catch (e) {
|
|
77
|
-
|
|
78
|
-
|
|
77
|
+
logging_1.log.warn(`Exception getting remote info for ${libraryName}`);
|
|
78
|
+
logging_1.log.error(e);
|
|
79
79
|
}
|
|
80
80
|
progressBar.increment({ library: libraryName, plugin: plugin.name });
|
|
81
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
|
-
import { DepinderDependency
|
|
1
|
+
import { DepinderDependency } from './extract';
|
|
2
|
+
import { LibraryInfo } from './registrar';
|
|
2
3
|
export interface CodeFinder {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
languages: string[];
|
|
6
|
-
getDeclaredEntities?(library: DepinderDependency): Promise<string[]>;
|
|
7
|
-
checkUsage(library: DepinderDependency, importedEntity: string): Promise<boolean>;
|
|
4
|
+
getDeclaredEntities?: (library: DepinderDependency) => Promise<string[]>;
|
|
5
|
+
matchImportToLibrary?: (importStatement: ImportStatement) => LibraryInfo | null;
|
|
8
6
|
}
|
|
9
|
-
export interface
|
|
7
|
+
export interface ImportStatement {
|
|
10
8
|
file: string;
|
|
11
9
|
importedEntity: string;
|
|
12
|
-
|
|
10
|
+
modifiers: string[];
|
|
13
11
|
language: string;
|
|
12
|
+
used?: boolean;
|
|
13
|
+
library?: string;
|
|
14
|
+
fullImport: string;
|
|
14
15
|
}
|
|
@@ -11,7 +11,7 @@ const nuget_inspector_1 = require("@dxworks/nuget-inspector");
|
|
|
11
11
|
const fs_1 = __importDefault(require("fs"));
|
|
12
12
|
const path_1 = __importDefault(require("path"));
|
|
13
13
|
const utils_1 = require("../../utils/utils");
|
|
14
|
-
const
|
|
14
|
+
const logging_1 = require("../../utils/logging");
|
|
15
15
|
const extractor = {
|
|
16
16
|
files: ['*.csproj', '*.fsproj', '*.vbproj'],
|
|
17
17
|
createContexts: (files) => files.map(it => ({
|
|
@@ -81,7 +81,7 @@ async function runNugetInspector(context) {
|
|
|
81
81
|
await (0, nuget_inspector_1.runNuGetInspectorProgrammatically)(context.root, tempFile, process.cwd());
|
|
82
82
|
}
|
|
83
83
|
catch (e) {
|
|
84
|
-
|
|
84
|
+
logging_1.log.error(e);
|
|
85
85
|
throw new Error(`NuGet Inspector failed for project ${context.root}`);
|
|
86
86
|
}
|
|
87
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/dotnet/index.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AAEzB,gEAAgH;AAShH,oDAA2B;AAE3B,8DAA0E;AAC1E,4CAAmB;AACnB,gDAAuB;AACvB,6CAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/dotnet/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,8 +10,8 @@ const registrar_1 = require("../../extension-points/registrar");
|
|
|
10
10
|
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
11
11
|
const fs_1 = __importDefault(require("fs"));
|
|
12
12
|
const utils_1 = require("../../utils/utils");
|
|
13
|
-
const cli_common_1 = require("@dxworks/cli-common");
|
|
14
13
|
const maven_1 = require("./parsers/maven");
|
|
14
|
+
const logging_1 = require("../../utils/logging");
|
|
15
15
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
16
16
|
const pomParser = require('pom-parser');
|
|
17
17
|
const extractor = {
|
|
@@ -110,7 +110,7 @@ class MavenCentralRegistrar extends registrar_1.AbstractRegistrar {
|
|
|
110
110
|
pom = (await this.getPom(groupId, artifactId, docs, libraryName)).pomObject;
|
|
111
111
|
}
|
|
112
112
|
catch (e) {
|
|
113
|
-
|
|
113
|
+
logging_1.log.warn(`Failed to get pom for ${libraryName}`);
|
|
114
114
|
throw e;
|
|
115
115
|
}
|
|
116
116
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/java/index.ts"],"names":[],"mappings":";;;;;;AACA,aAAa;AACb,gDAAuB;AACvB,gEAAqG;AACrG,4DAA8B;AAG9B,4CAAmB;AACnB,6CAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/java/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,10 @@ exports.javascript = exports.retrieveFromNpm = void 0;
|
|
|
7
7
|
const snyk_nodejs_lockfile_parser_1 = require("snyk-nodejs-lockfile-parser");
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
9
|
const semver_1 = require("semver");
|
|
10
|
-
const cli_common_1 = require("@dxworks/cli-common");
|
|
11
10
|
const npm_registry_fetch_1 = require("npm-registry-fetch");
|
|
12
11
|
const npm_1 = require("../../utils/npm");
|
|
13
12
|
const fs_1 = __importDefault(require("fs"));
|
|
13
|
+
const logging_1 = require("../../utils/logging");
|
|
14
14
|
const extractor = {
|
|
15
15
|
files: ['package.json', 'package-lock.json', 'yarn.lock'],
|
|
16
16
|
createContexts: files => {
|
|
@@ -36,12 +36,12 @@ const extractor = {
|
|
|
36
36
|
}))
|
|
37
37
|
.map(context => {
|
|
38
38
|
try {
|
|
39
|
-
|
|
39
|
+
logging_1.log.info(`Trying to generate lock file for ${context.root}`);
|
|
40
40
|
npm_1.npm.install('', '--package-lock-only', context.root);
|
|
41
41
|
return Object.assign(Object.assign({}, context), { lockFile: path_1.default.resolve(context.root, 'package-lock.json') });
|
|
42
42
|
}
|
|
43
43
|
catch (e) {
|
|
44
|
-
|
|
44
|
+
logging_1.log.error(e);
|
|
45
45
|
return null;
|
|
46
46
|
}
|
|
47
47
|
})
|
|
@@ -86,17 +86,17 @@ function recursivelyTransformDeps(tree, result) {
|
|
|
86
86
|
});
|
|
87
87
|
}
|
|
88
88
|
catch (e) {
|
|
89
|
-
|
|
89
|
+
logging_1.log.warn(`Invalid version! ${e}`);
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
92
|
recursivelyTransformDeps(dep, result);
|
|
93
93
|
});
|
|
94
94
|
}
|
|
95
95
|
function transformDeps(tree, root) {
|
|
96
|
-
|
|
96
|
+
logging_1.log.info(`Starting recursive transformation for ${root}`);
|
|
97
97
|
const result = new Map();
|
|
98
98
|
recursivelyTransformDeps(tree, result);
|
|
99
|
-
|
|
99
|
+
logging_1.log.info(`End recursive transformation for ${root}.`);
|
|
100
100
|
return result;
|
|
101
101
|
}
|
|
102
102
|
async function parseLockFile({ root, manifestFile, lockFile }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/javascript/index.ts"],"names":[],"mappings":";;;;;;AAOA,6EAAiE;AACjE,gDAAuB;AACvB,mCAA6B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/javascript/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,17 +27,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.python = exports.pythonRegistrar = void 0;
|
|
30
|
-
// @ts-ignore
|
|
31
30
|
const path_1 = __importDefault(require("path"));
|
|
32
31
|
const registrar_1 = require("../../extension-points/registrar");
|
|
33
32
|
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
34
33
|
const fs_1 = __importDefault(require("fs"));
|
|
35
34
|
const moment_1 = __importDefault(require("moment"));
|
|
36
|
-
const cli_common_1 = require("@dxworks/cli-common");
|
|
37
35
|
const child_process_1 = require("child_process");
|
|
38
36
|
const toml = __importStar(require("toml"));
|
|
39
37
|
const utils_1 = require("../../utils/utils");
|
|
40
|
-
|
|
38
|
+
const logging_1 = require("../../utils/logging");
|
|
41
39
|
const extractor = {
|
|
42
40
|
files: ['requirements.txt', 'setup.py', 'Pipfile', 'Pipfile.lock', 'pyproject.toml', 'poetry.lock'],
|
|
43
41
|
createContexts: files => {
|
|
@@ -54,12 +52,12 @@ const extractor = {
|
|
|
54
52
|
}))
|
|
55
53
|
.map(context => {
|
|
56
54
|
try {
|
|
57
|
-
|
|
55
|
+
logging_1.log.info(`Trying to generate lock file for ${context.root}`);
|
|
58
56
|
(0, child_process_1.execSync)('pipenv lock', { cwd: context.root });
|
|
59
57
|
return Object.assign(Object.assign({}, context), { lockFile: path_1.default.resolve(context.root, 'Pipfile.lock') });
|
|
60
58
|
}
|
|
61
59
|
catch (e) {
|
|
62
|
-
|
|
60
|
+
logging_1.log.error(e);
|
|
63
61
|
return null;
|
|
64
62
|
}
|
|
65
63
|
})
|
|
@@ -75,7 +73,7 @@ const extractor = {
|
|
|
75
73
|
return Object.assign(Object.assign({}, context), { tree: path_1.default.resolve(context.root, 'PipTree.json') });
|
|
76
74
|
}
|
|
77
75
|
catch (e) {
|
|
78
|
-
|
|
76
|
+
logging_1.log.error(`Could not generate pipenv tree for project ${context.root}`, e);
|
|
79
77
|
return context;
|
|
80
78
|
}
|
|
81
79
|
});
|
|
@@ -121,7 +119,7 @@ function parseLockFile(context) {
|
|
|
121
119
|
directDeps = Object.keys(pipfile.packages);
|
|
122
120
|
}
|
|
123
121
|
catch (e) {
|
|
124
|
-
|
|
122
|
+
logging_1.log.error(e);
|
|
125
123
|
}
|
|
126
124
|
let dependencies = {};
|
|
127
125
|
// @ts-ignore
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/python/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/python/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const log: import("winston").Logger;
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.log = void 0;
|
|
7
|
+
const winston_1 = require("winston");
|
|
8
|
+
const path_1 = __importDefault(require("path"));
|
|
9
|
+
const utils_1 = require("./utils");
|
|
10
|
+
const { json, errors, timestamp, prettyPrint, colorize, combine, printf } = winston_1.format;
|
|
11
|
+
const simplestFormat = printf(({ message }) => {
|
|
12
|
+
return `${message}`;
|
|
13
|
+
});
|
|
14
|
+
exports.log = (0, winston_1.createLogger)({
|
|
15
|
+
transports: [
|
|
16
|
+
new winston_1.transports.Console({
|
|
17
|
+
level: ['dev', 'develop', 'development'].includes(process.env.NODE_ENV || '') ? 'debug' : 'info',
|
|
18
|
+
format: combine(colorize({
|
|
19
|
+
all: true,
|
|
20
|
+
colors: {
|
|
21
|
+
info: 'blue',
|
|
22
|
+
warn: 'yellow',
|
|
23
|
+
error: 'red',
|
|
24
|
+
debug: 'grey',
|
|
25
|
+
},
|
|
26
|
+
}), simplestFormat),
|
|
27
|
+
}),
|
|
28
|
+
new winston_1.transports.File({
|
|
29
|
+
filename: 'depinder.log',
|
|
30
|
+
dirname: path_1.default.resolve(utils_1.depinderFolder),
|
|
31
|
+
format: combine(json(), errors({ stack: true }), timestamp(), prettyPrint()),
|
|
32
|
+
tailable: false,
|
|
33
|
+
}),
|
|
34
|
+
],
|
|
35
|
+
});
|
|
36
|
+
//# sourceMappingURL=logging.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/utils/logging.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAwD;AACxD,gDAAuB;AACvB,mCAAsC;AAEtC,MAAM,EAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAC,GAAG,gBAAM,CAAA;AAEhF,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,EAAC,OAAO,EAAC,EAAE,EAAE;IACxC,OAAO,GAAG,OAAO,EAAE,CAAA;AACvB,CAAC,CAAC,CAAA;AAEW,QAAA,GAAG,GAAG,IAAA,sBAAY,EAAC;IAC5B,UAAU,EAAE;QACR,IAAI,oBAAU,CAAC,OAAO,CAAC;YACnB,KAAK,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;YAChG,MAAM,EAAE,OAAO,CACX,QAAQ,CAAC;gBACL,GAAG,EAAE,IAAI;gBACT,MAAM,EAAE;oBACJ,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,MAAM;iBAChB;aACJ,CAAC,EACF,cAAc,CACjB;SACJ,CAAC;QACF,IAAI,oBAAU,CAAC,IAAI,CAAC;YAChB,QAAQ,EAAE,cAAc;YACxB,OAAO,EAAE,cAAI,CAAC,OAAO,CAAC,sBAAc,CAAC;YACrC,MAAM,EAAE,OAAO,CACX,IAAI,EAAE,EACN,MAAM,CAAC,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,EACrB,SAAS,EAAE,EACX,WAAW,EAAE,CAChB;YACD,QAAQ,EAAE,KAAK;SAClB,CAAC;KACL;CACJ,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxworks/depinder",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.3",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"dxworks",
|
|
@@ -37,8 +37,6 @@
|
|
|
37
37
|
"test:dev": "jest --watch"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@dxworks/cli-common": "^0.0.20",
|
|
41
|
-
"@dxworks/ktextensions": "^0.1.0",
|
|
42
40
|
"@dxworks/nuget-inspector": "^1.2.0",
|
|
43
41
|
"@octokit/graphql": "^4.8.0",
|
|
44
42
|
"@snyk/gemfile": "^1.2.0",
|
|
@@ -65,7 +63,8 @@
|
|
|
65
63
|
"spdx-correct": "^3.1.1",
|
|
66
64
|
"spdx-license-ids": "^3.0.10",
|
|
67
65
|
"tmp": "^0.2.1",
|
|
68
|
-
"toml": "^3.0.0"
|
|
66
|
+
"toml": "^3.0.0",
|
|
67
|
+
"winston": "^3.11.0"
|
|
69
68
|
},
|
|
70
69
|
"devDependencies": {
|
|
71
70
|
"@types/cli-progress": "^3.9.2",
|