snyk-paket-parser 1.4.0 → 1.5.0
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/dependencies-parser.js +34 -17
- package/dist/dependencies-parser.js.map +1 -1
- package/dist/index.d.ts +0 -1
- package/dist/index.js +16 -18
- package/dist/index.js.map +1 -1
- package/dist/line-parser.js +13 -1
- package/dist/line-parser.js.map +1 -1
- package/package.json +4 -5
|
@@ -13,27 +13,44 @@ var GIT = 'git';
|
|
|
13
13
|
var GIST = 'gist';
|
|
14
14
|
var HTTP = 'http';
|
|
15
15
|
function parseNuget(line) {
|
|
16
|
+
var commentRegex = new RegExp("(?:" + COMMENTS[0] + "|" + COMMENTS[1] + ").+");
|
|
17
|
+
var nameVersionOptionsRegex = new RegExp(/(\S+)\s*([^:\n]*)(:.*)?/);
|
|
18
|
+
var versionFirstOptionRegex = new RegExp(/\s(?=[^ ]*$)/);
|
|
19
|
+
var _a = tslib_1.__read(line
|
|
20
|
+
.replace(NUGET, '') // Remove 'nuget' string
|
|
21
|
+
.replace(commentRegex, '') // Remove comments from line end
|
|
22
|
+
.trim()
|
|
23
|
+
.match(nameVersionOptionsRegex), 4), name = _a[1], versionRangeAndFirstOption = _a[2], restOptions = _a[3]; // Split into groups for further parsing
|
|
24
|
+
// nuget dependency result object to be returned
|
|
16
25
|
var result = {
|
|
17
|
-
|
|
26
|
+
source: NUGET,
|
|
27
|
+
name: name,
|
|
28
|
+
versionRange: versionRangeAndFirstOption,
|
|
18
29
|
options: {},
|
|
19
|
-
source: 'nuget',
|
|
20
|
-
versionRange: '',
|
|
21
30
|
};
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
31
|
+
if (restOptions) {
|
|
32
|
+
// tslint:disable-next-line:prefer-const
|
|
33
|
+
var _b = tslib_1.__read(versionRangeAndFirstOption.split(versionFirstOptionRegex), 2), versionRange = _b[0], firstOptionName = _b[1];
|
|
34
|
+
result.versionRange = versionRange;
|
|
35
|
+
// If version is missing it will treat first option as version
|
|
36
|
+
if (!firstOptionName) {
|
|
37
|
+
result.versionRange = '';
|
|
38
|
+
firstOptionName = versionRange;
|
|
39
|
+
}
|
|
40
|
+
result.options = ("" + firstOptionName + restOptions)
|
|
41
|
+
.split(/\s*,\s*/) // Split by comma if there is couple possibilities for option (e.g. framework >= net40, net45)
|
|
42
|
+
.reverse()
|
|
43
|
+
.reduce(function (optionsMap, option, index, array) {
|
|
44
|
+
if (option.includes(':')) {
|
|
45
|
+
var _a = tslib_1.__read(option.split(/:\s*/), 2), optionKey = _a[0], value = _a[1];
|
|
46
|
+
optionsMap[optionKey] = value;
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
array[index + 1] = array[index + 1] + ", " + option;
|
|
50
|
+
}
|
|
51
|
+
return optionsMap;
|
|
52
|
+
}, {});
|
|
30
53
|
}
|
|
31
|
-
dependencyString = dependencyString.replace(NUGET, '').trim();
|
|
32
|
-
// Split by space between words. First chunk will be name of the dependency and all rest - version.
|
|
33
|
-
var dependencyStringParts = dependencyString.split(/\s+/);
|
|
34
|
-
result.name = dependencyStringParts[0];
|
|
35
|
-
result.versionRange = dependencyStringParts.splice(1).join(' ');
|
|
36
|
-
// TODO: parse options
|
|
37
54
|
return result;
|
|
38
55
|
}
|
|
39
56
|
// https://fsprojects.github.io/Paket/github-dependencies.html
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies-parser.js","sourceRoot":"","sources":["../lib/dependencies-parser.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAEzC,IAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AAC7B,IAAM,KAAK,GAAG,OAAO,CAAC;AACtB,IAAM,MAAM,GAAG,QAAQ,CAAC;AACxB,oEAAoE;AACpE,IAAM,MAAM,GAAG,QAAQ,CAAC;AACxB,IAAM,KAAK,GAAG,OAAO,CAAC;AACtB,IAAM,OAAO,GAAG,SAAS,CAAC;AAC1B,IAAM,GAAG,GAAG,KAAK,CAAC;AAClB,IAAM,IAAI,GAAG,MAAM,CAAC;AACpB,IAAM,IAAI,GAAG,MAAM,CAAC;AAwCpB,SAAS,UAAU,CAAC,IAAY;IAC9B,IAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"dependencies-parser.js","sourceRoot":"","sources":["../lib/dependencies-parser.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -16,4 +16,3 @@ export declare enum DepType {
|
|
|
16
16
|
dev = "dev"
|
|
17
17
|
}
|
|
18
18
|
export declare function buildDepTreeFromFiles(root: string, manifestFilePath: string, lockFilePath: string, includeDev?: boolean, strict?: boolean): Promise<DepTree>;
|
|
19
|
-
export declare function buildDepTree(manifestFileContents: string, lockFileContents: string, includeDev?: boolean, strict?: boolean, defaultManifestFileName?: string): Promise<DepTree>;
|
package/dist/index.js
CHANGED
|
@@ -20,9 +20,9 @@ function buildDepTreeFromFiles(root, manifestFilePath, lockFilePath, includeDev,
|
|
|
20
20
|
if (includeDev === void 0) { includeDev = false; }
|
|
21
21
|
if (strict === void 0) { strict = true; }
|
|
22
22
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
23
|
-
var manifestFileFullPath, lockFileFullPath, manifestFileContents, lockFileContents;
|
|
24
|
-
return tslib_1.__generator(this, function (
|
|
25
|
-
switch (
|
|
23
|
+
var manifestFileFullPath, lockFileFullPath, manifestFileContents, lockFileContents, _a;
|
|
24
|
+
return tslib_1.__generator(this, function (_b) {
|
|
25
|
+
switch (_b.label) {
|
|
26
26
|
case 0:
|
|
27
27
|
manifestFileFullPath = path.resolve(root, manifestFilePath);
|
|
28
28
|
lockFileFullPath = path.resolve(root, lockFilePath);
|
|
@@ -36,27 +36,25 @@ function buildDepTreeFromFiles(root, manifestFilePath, lockFilePath, includeDev,
|
|
|
36
36
|
}
|
|
37
37
|
manifestFileContents = fs.readFileSync(manifestFileFullPath, 'utf-8');
|
|
38
38
|
lockFileContents = fs.readFileSync(lockFileFullPath, 'utf-8');
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
_a = {};
|
|
40
|
+
return [4 /*yield*/, buildDepTree(manifestFileContents, lockFileContents, includeDev, strict)];
|
|
41
|
+
case 1: return [2 /*return*/, (_a.dependencies = _b.sent(),
|
|
42
|
+
_a.name = path.basename(path.dirname(manifestFileFullPath)),
|
|
43
|
+
_a.version = '',
|
|
44
|
+
_a)];
|
|
41
45
|
}
|
|
42
46
|
});
|
|
43
47
|
});
|
|
44
48
|
}
|
|
45
49
|
exports.buildDepTreeFromFiles = buildDepTreeFromFiles;
|
|
46
|
-
function buildDepTree(manifestFileContents, lockFileContents, includeDev, strict
|
|
50
|
+
function buildDepTree(manifestFileContents, lockFileContents, includeDev, strict) {
|
|
47
51
|
if (includeDev === void 0) { includeDev = false; }
|
|
48
52
|
if (strict === void 0) { strict = true; }
|
|
49
|
-
if (defaultManifestFileName === void 0) { defaultManifestFileName = 'paket.dependencies'; }
|
|
50
53
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
51
|
-
var e_1, _a, e_2, _b, manifestFile, lockFile,
|
|
54
|
+
var e_1, _a, e_2, _b, manifestFile, lockFile, dependenciesMap, _c, _d, dep, dependencies, _e, _f, dep, frequentSubTree;
|
|
52
55
|
return tslib_1.__generator(this, function (_g) {
|
|
53
56
|
manifestFile = dependencies_parser_1.parseDependenciesFile(manifestFileContents);
|
|
54
57
|
lockFile = lock_parser_1.parseLockFile(lockFileContents);
|
|
55
|
-
depTree = {
|
|
56
|
-
dependencies: {},
|
|
57
|
-
name: defaultManifestFileName,
|
|
58
|
-
version: '',
|
|
59
|
-
};
|
|
60
58
|
dependenciesMap = new Map();
|
|
61
59
|
collectRootDeps(manifestFile, dependenciesMap);
|
|
62
60
|
collectResolvedDeps(lockFile, dependenciesMap);
|
|
@@ -75,6 +73,7 @@ function buildDepTree(manifestFileContents, lockFileContents, includeDev, strict
|
|
|
75
73
|
}
|
|
76
74
|
finally { if (e_1) throw e_1.error; }
|
|
77
75
|
}
|
|
76
|
+
dependencies = {};
|
|
78
77
|
try {
|
|
79
78
|
for (_e = tslib_1.__values(dependenciesMap.values()), _f = _e.next(); !_f.done; _f = _e.next()) {
|
|
80
79
|
dep = _f.value;
|
|
@@ -82,9 +81,9 @@ function buildDepTree(manifestFileContents, lockFileContents, includeDev, strict
|
|
|
82
81
|
if (strict && !dep.resolved) {
|
|
83
82
|
throw new errors_1.OutOfSyncError(dep.name);
|
|
84
83
|
}
|
|
85
|
-
|
|
84
|
+
dependencies[dep.name] = buildTreeFromList(dep, dependenciesMap);
|
|
86
85
|
if (!dep.resolved) {
|
|
87
|
-
|
|
86
|
+
dependencies[dep.name].missingLockFileEntry = true;
|
|
88
87
|
}
|
|
89
88
|
}
|
|
90
89
|
}
|
|
@@ -98,13 +97,12 @@ function buildDepTree(manifestFileContents, lockFileContents, includeDev, strict
|
|
|
98
97
|
}
|
|
99
98
|
frequentSubTree = buildFrequentDepsSubtree(dependenciesMap);
|
|
100
99
|
if (Object.keys(frequentSubTree.dependencies).length) {
|
|
101
|
-
|
|
100
|
+
dependencies[frequentSubTree.name] = frequentSubTree;
|
|
102
101
|
}
|
|
103
|
-
return [2 /*return*/,
|
|
102
|
+
return [2 /*return*/, dependencies];
|
|
104
103
|
});
|
|
105
104
|
});
|
|
106
105
|
}
|
|
107
|
-
exports.buildDepTree = buildDepTree;
|
|
108
106
|
function collectRootDeps(manifestFile, dependenciesMap) {
|
|
109
107
|
var e_3, _a, e_4, _b;
|
|
110
108
|
try {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;AAAA,6CAAuD;AACvD,6DAAgG;AAChG,2BAA6B;AAC7B,uBAAyB;AACzB,mCAA+D;AAMvD,gCANA,8BAAqB,CAMA;AAAE,yBANA,uBAAc,CAMA;AAJ7C,IAAM,UAAU,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AAC9C,IAAM,iBAAiB,GAAG,CAAC,OAAO,CAAC,CAAC;AACpC,IAAM,mBAAmB,GAAG,GAAG,CAAC;AAgBhC,IAAY,OAGX;AAHD,WAAY,OAAO;IACjB,wBAAa,CAAA;IACb,sBAAW,CAAA;AACb,CAAC,EAHW,OAAO,GAAP,eAAO,KAAP,eAAO,QAGlB;AAYD,SAAsB,qBAAqB,CACzC,IAAY,EACZ,gBAAwB,EACxB,YAAoB,EACpB,UAAkB,EAClB,MAAa;IADb,2BAAA,EAAA,kBAAkB;IAClB,uBAAA,EAAA,aAAa;;;;;;oBAEP,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;oBAC5D,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;oBAE1D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE;wBACxC,MAAM,IAAI,8BAAqB,CAAC,8CAA8C;6BAC5E,eAAa,oBAAsB,CAAA,CAAC,CAAC;qBACxC;oBACD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;wBACpC,MAAM,IAAI,8BAAqB,CAAC,kCAAkC;4BAChE,gBAAgB,CAAC,CAAC;qBACrB;oBAEK,oBAAoB,GAAG,EAAE,CAAC,YAAY,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;oBACtE,gBAAgB,GAAG,EAAE,CAAC,YAAY,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"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"}
|
package/dist/line-parser.js
CHANGED
|
@@ -17,12 +17,24 @@ function countIndents(line, indent) {
|
|
|
17
17
|
}
|
|
18
18
|
return count;
|
|
19
19
|
}
|
|
20
|
+
// On windows machines first symbol of the file sometimes is special
|
|
21
|
+
// "ZERO WIDTH NO-BREAK SPACE". Remove it before continue processing because it
|
|
22
|
+
// could be counted as a space in `countIndents`.
|
|
23
|
+
//
|
|
24
|
+
// - https://en.wikipedia.org/wiki/Byte_order_mark
|
|
25
|
+
// - https://stackoverflow.com/questions/6784799/what-is-this-char-65279
|
|
26
|
+
function removeByteOrderMark(input) {
|
|
27
|
+
if (input.length > 0 && input.charAt(0) === '\uFEFF') {
|
|
28
|
+
return input.substr(1);
|
|
29
|
+
}
|
|
30
|
+
return input;
|
|
31
|
+
}
|
|
20
32
|
// parse space indented lines into array of Lines
|
|
21
33
|
function parseLines(input, indent /* two spaces */, lineSeparator) {
|
|
22
34
|
if (indent === void 0) { indent = ' '; }
|
|
23
35
|
if (lineSeparator === void 0) { lineSeparator = /\r?\n/; }
|
|
24
36
|
var e_1, _a;
|
|
25
|
-
var lines = input.split(lineSeparator);
|
|
37
|
+
var lines = removeByteOrderMark(input).split(lineSeparator);
|
|
26
38
|
var result = [];
|
|
27
39
|
try {
|
|
28
40
|
for (var lines_1 = tslib_1.__values(lines), lines_1_1 = lines_1.next(); !lines_1_1.done; lines_1_1 = lines_1.next()) {
|
package/dist/line-parser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line-parser.js","sourceRoot":"","sources":["../lib/line-parser.ts"],"names":[],"mappings":";;;AAAA;IAIE,cAAY,IAAY,EAAE,WAAmB;QAC3C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IACH,WAAC;AAAD,CAAC,AARD,IAQC;AARY,oBAAI;AAUjB,SAAS,YAAY,CAAC,IAAY,EAAE,MAAc;IAChD,IAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC5C,IAAM,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;KAC/C;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,iDAAiD;AACjD,SAAgB,UAAU,CACxB,KAAa,EACb,MAAqB,CAAC,gBAAgB,EACtC,aAA+B;IAD/B,uBAAA,EAAA,aAAqB;IACrB,8BAAA,EAAA,uBAA+B;;IAG/B,IAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"line-parser.js","sourceRoot":"","sources":["../lib/line-parser.ts"],"names":[],"mappings":";;;AAAA;IAIE,cAAY,IAAY,EAAE,WAAmB;QAC3C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IACH,WAAC;AAAD,CAAC,AARD,IAQC;AARY,oBAAI;AAUjB,SAAS,YAAY,CAAC,IAAY,EAAE,MAAc;IAChD,IAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC5C,IAAM,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;KAC/C;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,oEAAoE;AACpE,+EAA+E;AAC/E,iDAAiD;AACjD,EAAE;AACF,kDAAkD;AAClD,wEAAwE;AACxE,SAAS,mBAAmB,CAAC,KAAa;IACxC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;QACpD,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;KACxB;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,iDAAiD;AACjD,SAAgB,UAAU,CACxB,KAAa,EACb,MAAqB,CAAC,gBAAgB,EACtC,aAA+B;IAD/B,uBAAA,EAAA,aAAqB;IACrB,8BAAA,EAAA,uBAA+B;;IAG/B,IAAM,KAAK,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAC9D,IAAM,MAAM,GAAW,EAAE,CAAC;;QAE1B,KAAmB,IAAA,UAAA,iBAAA,KAAK,CAAA,4BAAA,+CAAE;YAArB,IAAM,IAAI,kBAAA;YACb,IAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAEzB,IAAI,IAAI,KAAK,EAAE,EAAE,EAAE,wCAAwC;gBACzD,SAAS;aACV;YAED,IAAM,WAAW,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAE/C,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;SAC1C;;;;;;;;;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAtBD,gCAsBC"}
|
package/package.json
CHANGED
|
@@ -3,9 +3,8 @@
|
|
|
3
3
|
"description": "Generate a dep tree given a collection of manifests",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"scripts": {
|
|
6
|
-
"test": "
|
|
6
|
+
"test": "jest",
|
|
7
7
|
"test-jest": "jest",
|
|
8
|
-
"test-node4": "npm build && node ./test/node4/index.js",
|
|
9
8
|
"lint": "tslint -p tsconfig.json",
|
|
10
9
|
"build": "tsc",
|
|
11
10
|
"build-watch": "tsc -w",
|
|
@@ -19,7 +18,7 @@
|
|
|
19
18
|
"author": "snyk.io",
|
|
20
19
|
"license": "Apache-2.0",
|
|
21
20
|
"engines": {
|
|
22
|
-
"node": ">=
|
|
21
|
+
"node": ">=6"
|
|
23
22
|
},
|
|
24
23
|
"files": [
|
|
25
24
|
"bin",
|
|
@@ -30,7 +29,7 @@
|
|
|
30
29
|
"tslib": "^1.9.3"
|
|
31
30
|
},
|
|
32
31
|
"devDependencies": {
|
|
33
|
-
"@types/node": "^
|
|
32
|
+
"@types/node": "^6.14.3",
|
|
34
33
|
"ts-node": "7.0.0",
|
|
35
34
|
"tslint": "5.11.0",
|
|
36
35
|
"typescript": "3.0.1",
|
|
@@ -38,5 +37,5 @@
|
|
|
38
37
|
"jest": "^23.6.0",
|
|
39
38
|
"ts-jest": "^23.10.5"
|
|
40
39
|
},
|
|
41
|
-
"version": "1.
|
|
40
|
+
"version": "1.5.0"
|
|
42
41
|
}
|