scanoss 0.5.8 → 0.6.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/.idea/workspace.xml +24 -19
- package/build/main/cli/bin/cli-bin.js +1 -1
- package/build/main/sdk/Dependencies/LocalDependency/DependencyTypes.d.ts +1 -1
- package/build/main/sdk/Dependencies/LocalDependency/LocalDependency.d.ts +2 -0
- package/build/main/sdk/Dependencies/LocalDependency/LocalDependency.js +54 -4
- package/build/main/sdk/Dependencies/LocalDependency/parsers/buildGradleParser.d.ts +2 -0
- package/build/main/sdk/Dependencies/LocalDependency/parsers/buildGradleParser.js +95 -0
- package/build/main/sdk/Dependencies/LocalDependency/parsers/golangParser.d.ts +2 -2
- package/build/main/sdk/Dependencies/LocalDependency/parsers/golangParser.js +5 -5
- package/build/main/sdk/Dependencies/LocalDependency/parsers/mavenParser.d.ts +1 -1
- package/build/main/sdk/Dependencies/LocalDependency/parsers/mavenParser.js +4 -3
- package/build/main/sdk/Dependencies/LocalDependency/parsers/npmParser.d.ts +5 -5
- package/build/main/sdk/Dependencies/LocalDependency/parsers/npmParser.js +11 -10
- package/build/main/sdk/Dependencies/LocalDependency/parsers/nugetParser.d.ts +2 -2
- package/build/main/sdk/Dependencies/LocalDependency/parsers/nugetParser.js +4 -4
- package/build/main/sdk/Dependencies/LocalDependency/parsers/pyParser.d.ts +1 -1
- package/build/main/sdk/Dependencies/LocalDependency/parsers/pyParser.js +3 -3
- package/build/main/sdk/Dependencies/LocalDependency/parsers/rubyParser.d.ts +2 -2
- package/build/main/sdk/Dependencies/LocalDependency/parsers/rubyParser.js +5 -5
- package/build/main/sdk/filters/DefaultFilterForDependencies.js +1 -3
- package/build/main/sdk/scanner/Dispatcher/Dispatcher.js +1 -2
- package/build/main/tsconfig.tsbuildinfo +61 -17
- package/build/module/cli/bin/cli-bin.js +1 -1
- package/build/module/sdk/Dependencies/LocalDependency/DependencyTypes.d.ts +1 -1
- package/build/module/sdk/Dependencies/LocalDependency/LocalDependency.d.ts +2 -0
- package/build/module/sdk/Dependencies/LocalDependency/LocalDependency.js +54 -4
- package/build/module/sdk/Dependencies/LocalDependency/parsers/buildGradleParser.d.ts +2 -0
- package/build/module/sdk/Dependencies/LocalDependency/parsers/buildGradleParser.js +87 -0
- package/build/module/sdk/Dependencies/LocalDependency/parsers/golangParser.d.ts +2 -2
- package/build/module/sdk/Dependencies/LocalDependency/parsers/golangParser.js +5 -5
- package/build/module/sdk/Dependencies/LocalDependency/parsers/mavenParser.d.ts +1 -1
- package/build/module/sdk/Dependencies/LocalDependency/parsers/mavenParser.js +4 -3
- package/build/module/sdk/Dependencies/LocalDependency/parsers/npmParser.d.ts +5 -5
- package/build/module/sdk/Dependencies/LocalDependency/parsers/npmParser.js +11 -10
- package/build/module/sdk/Dependencies/LocalDependency/parsers/nugetParser.d.ts +2 -2
- package/build/module/sdk/Dependencies/LocalDependency/parsers/nugetParser.js +4 -4
- package/build/module/sdk/Dependencies/LocalDependency/parsers/pyParser.d.ts +1 -1
- package/build/module/sdk/Dependencies/LocalDependency/parsers/pyParser.js +3 -3
- package/build/module/sdk/Dependencies/LocalDependency/parsers/rubyParser.d.ts +2 -2
- package/build/module/sdk/Dependencies/LocalDependency/parsers/rubyParser.js +5 -5
- package/build/module/sdk/filters/DefaultFilterForDependencies.js +1 -3
- package/build/module/sdk/scanner/Dispatcher/Dispatcher.js +1 -2
- package/build/module/tsconfig.module.tsbuildinfo +61 -17
- package/package.json +3 -2
- package/src/cli/bin/cli-bin.ts +1 -1
- package/src/sdk/Dependencies/LocalDependency/DependencyTypes.ts +1 -1
- package/src/sdk/Dependencies/LocalDependency/LocalDependency.ts +63 -5
- package/src/sdk/Dependencies/LocalDependency/parsers/buildGradleParser.ts +115 -0
- package/src/sdk/Dependencies/LocalDependency/parsers/golangParser.ts +6 -6
- package/src/sdk/Dependencies/LocalDependency/parsers/mavenParser.ts +4 -3
- package/src/sdk/Dependencies/LocalDependency/parsers/npmParser.ts +16 -15
- package/src/sdk/Dependencies/LocalDependency/parsers/nugetParser.ts +64 -0
- package/src/sdk/Dependencies/LocalDependency/parsers/pyParser.ts +3 -3
- package/src/sdk/Dependencies/LocalDependency/parsers/rubyParser.ts +6 -6
- package/src/sdk/filters/DefaultFilterForDependencies.ts +0 -2
- package/src/sdk/scanner/Dispatcher/Dispatcher.ts +0 -1
- package/tests/sdk/Dependencies/LocalDependency/LocalDependency.spec.ts +24 -0
- package/tests/sdk/Dependencies/LocalDependency/Parsers/buildGradle.spec.ts +48 -0
- package/tests/sdk/Dependencies/LocalDependency/Parsers/golangParser.spec.ts +4 -4
- package/tests/sdk/Dependencies/LocalDependency/Parsers/npmParser.spec.ts +14 -14
- package/tests/sdk/Dependencies/LocalDependency/Parsers/nugetParser.spec.ts +73 -0
- package/tests/sdk/Dependencies/LocalDependency/Parsers/pomParser.spec.ts +2 -2
- package/tests/sdk/Dependencies/LocalDependency/Parsers/samples/gradle/1/build.gradle +26 -0
- package/tests/sdk/Dependencies/LocalDependency/Parsers/samples/gradle/2/build.gradle +16 -0
- package/tests/sdk/Dependencies/LocalDependency/Parsers/samples/nuget/NoDependencies.csproj +115 -0
- package/tests/sdk/Dependencies/LocalDependency/Parsers/samples/nuget/netcore-2.csproj +18 -0
- package/tests/sdk/Dependencies/LocalDependency/Parsers/samples/nuget/netcore.csproj +14 -0
- package/tests/sdk/Dependencies/LocalDependency/Parsers/samples/nuget/packageConfig-1/packages.config +5 -0
- package/tests/sdk/Dependencies/LocalDependency/Parsers/samples/yarn-lock/generate_expected_output.sh +1 -1
- package/yarn.lock +19 -0
- package/package-lock.json +0 -17030
package/.idea/workspace.xml
CHANGED
|
@@ -5,8 +5,7 @@
|
|
|
5
5
|
</component>
|
|
6
6
|
<component name="ChangeListManager">
|
|
7
7
|
<list default="true" id="6c78089c-ef2a-4dae-87f6-bd2f320855c8" name="Changes" comment="Fix yarn.lock parser error">
|
|
8
|
-
<change beforePath="$PROJECT_DIR$/
|
|
9
|
-
<change beforePath="$PROJECT_DIR$/src/cli/bin/cli-bin.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/cli/bin/cli-bin.ts" afterDir="false" />
|
|
8
|
+
<change beforePath="$PROJECT_DIR$/tests/sdk/Dependencies/LocalDependency/Parsers/nugetParser.spec.ts" beforeDir="false" afterPath="$PROJECT_DIR$/tests/sdk/Dependencies/LocalDependency/Parsers/nugetParser.spec.ts" afterDir="false" />
|
|
10
9
|
</list>
|
|
11
10
|
<option name="SHOW_DIALOG" value="false" />
|
|
12
11
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -39,7 +38,7 @@
|
|
|
39
38
|
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
40
39
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
41
40
|
"WebServerToolWindowFactoryState": "false",
|
|
42
|
-
"last_opened_file_path": "/home/ubuntu/Projects/SCANOSS/scanoss.js
|
|
41
|
+
"last_opened_file_path": "/home/ubuntu/Projects/SCANOSS/scanoss.js/tests/sdk/Dependencies/LocalDependency/Parsers/samples/gradle/2",
|
|
43
42
|
"node.js.detected.package.eslint": "true",
|
|
44
43
|
"node.js.detected.package.tslint": "true",
|
|
45
44
|
"node.js.selected.package.eslint": "(autodetect)",
|
|
@@ -53,18 +52,21 @@
|
|
|
53
52
|
}</component>
|
|
54
53
|
<component name="RecentsManager">
|
|
55
54
|
<key name="CopyFile.RECENT_KEYS">
|
|
55
|
+
<recent name="$PROJECT_DIR$/tests/sdk/Dependencies/LocalDependency/Parsers/samples/gradle/2" />
|
|
56
|
+
<recent name="$PROJECT_DIR$/tests/sdk/Dependencies/LocalDependency/Parsers/samples" />
|
|
56
57
|
<recent name="$PROJECT_DIR$/tests/sdk/Dependencies/LocalDependency/Parsers/samples/yarn-lock/v1_2" />
|
|
57
58
|
<recent name="$PROJECT_DIR$/tests/sdk/Scanner/WfpProvider/WfpSplitter/samples" />
|
|
58
59
|
<recent name="$PROJECT_DIR$/tests/sdk/Scanner/WfpProvider/WfpSplitter" />
|
|
59
|
-
<recent name="$PROJECT_DIR$/src/sdk/Decompress" />
|
|
60
60
|
</key>
|
|
61
61
|
<key name="MoveFile.RECENT_KEYS">
|
|
62
|
+
<recent name="$PROJECT_DIR$/tests/sdk/Dependencies/LocalDependency/Parsers/samples/gradle/1" />
|
|
63
|
+
<recent name="$PROJECT_DIR$/tests/sdk/Dependencies/LocalDependency/Parsers/samples/gradle" />
|
|
62
64
|
<recent name="$PROJECT_DIR$/src/sdk/Decompress/Decompresor" />
|
|
63
65
|
<recent name="$PROJECT_DIR$/tests/sdk/DataLayer/samples/simple-1" />
|
|
64
66
|
</key>
|
|
65
67
|
</component>
|
|
66
|
-
<component name="RunManager" selected="Mocha.Suit test for
|
|
67
|
-
<configuration name="Suit test for
|
|
68
|
+
<component name="RunManager" selected="Mocha.Suit test for build.gradle parser.Table of test for valids build.gradle files">
|
|
69
|
+
<configuration name="Suit test for LocalDependency Scanner" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
|
|
68
70
|
<node-interpreter>project</node-interpreter>
|
|
69
71
|
<node-options />
|
|
70
72
|
<mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
|
|
@@ -72,15 +74,14 @@
|
|
|
72
74
|
<pass-parent-env>true</pass-parent-env>
|
|
73
75
|
<ui>bdd</ui>
|
|
74
76
|
<extra-mocha-options>--require ts-node/register</extra-mocha-options>
|
|
75
|
-
<test-kind>
|
|
76
|
-
<test-file>$PROJECT_DIR$/tests/sdk/
|
|
77
|
+
<test-kind>SUITE</test-kind>
|
|
78
|
+
<test-file>$PROJECT_DIR$/tests/sdk/Dependencies/LocalDependency/LocalDependency.spec.ts</test-file>
|
|
77
79
|
<test-names>
|
|
78
|
-
<name value="Suit test for
|
|
79
|
-
<name value="Test ComponentDataLayer" />
|
|
80
|
+
<name value="Suit test for LocalDependency Scanner" />
|
|
80
81
|
</test-names>
|
|
81
82
|
<method v="2" />
|
|
82
83
|
</configuration>
|
|
83
|
-
<configuration name="Suit test for LocalDependency Scanner" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
|
|
84
|
+
<configuration name="Suit test for LocalDependency Scanner.Testing wildcard string matching" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
|
|
84
85
|
<node-interpreter>project</node-interpreter>
|
|
85
86
|
<node-options />
|
|
86
87
|
<mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
|
|
@@ -88,14 +89,15 @@
|
|
|
88
89
|
<pass-parent-env>true</pass-parent-env>
|
|
89
90
|
<ui>bdd</ui>
|
|
90
91
|
<extra-mocha-options>--require ts-node/register</extra-mocha-options>
|
|
91
|
-
<test-kind>
|
|
92
|
+
<test-kind>TEST</test-kind>
|
|
92
93
|
<test-file>$PROJECT_DIR$/tests/sdk/Dependencies/LocalDependency/LocalDependency.spec.ts</test-file>
|
|
93
94
|
<test-names>
|
|
94
95
|
<name value="Suit test for LocalDependency Scanner" />
|
|
96
|
+
<name value="Testing wildcard string matching" />
|
|
95
97
|
</test-names>
|
|
96
98
|
<method v="2" />
|
|
97
99
|
</configuration>
|
|
98
|
-
<configuration name="Suit test for
|
|
100
|
+
<configuration name="Suit test for build.gradle parser.Table of test for valids build.gradle files" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
|
|
99
101
|
<node-interpreter>project</node-interpreter>
|
|
100
102
|
<node-options />
|
|
101
103
|
<mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
|
|
@@ -104,10 +106,10 @@
|
|
|
104
106
|
<ui>bdd</ui>
|
|
105
107
|
<extra-mocha-options>--require ts-node/register</extra-mocha-options>
|
|
106
108
|
<test-kind>TEST</test-kind>
|
|
107
|
-
<test-file>$PROJECT_DIR$/tests/sdk/Dependencies/LocalDependency/
|
|
109
|
+
<test-file>$PROJECT_DIR$/tests/sdk/Dependencies/LocalDependency/Parsers/buildGradle.spec.ts</test-file>
|
|
108
110
|
<test-names>
|
|
109
|
-
<name value="Suit test for
|
|
110
|
-
<name value="
|
|
111
|
+
<name value="Suit test for build.gradle parser" />
|
|
112
|
+
<name value="Table of test for valids build.gradle files" />
|
|
111
113
|
</test-names>
|
|
112
114
|
<method v="2" />
|
|
113
115
|
</configuration>
|
|
@@ -145,11 +147,11 @@
|
|
|
145
147
|
</configuration>
|
|
146
148
|
<recent_temporary>
|
|
147
149
|
<list>
|
|
150
|
+
<item itemvalue="Mocha.Suit test for build.gradle parser.Table of test for valids build.gradle files" />
|
|
148
151
|
<item itemvalue="Mocha.Suit test for LocalDependency Scanner.Testing wildcard string matching" />
|
|
149
152
|
<item itemvalue="Mocha.Suit test for LocalDependency Scanner" />
|
|
150
153
|
<item itemvalue="Mocha.Suit test for yarn lock files.Testing yarn lock file v1_2" />
|
|
151
154
|
<item itemvalue="Mocha.Suit test for yarn lock files.Testing yarn lock file v1 complex" />
|
|
152
|
-
<item itemvalue="Mocha.Suit test for DataProvider.Test ComponentDataLayer" />
|
|
153
155
|
</list>
|
|
154
156
|
</recent_temporary>
|
|
155
157
|
</component>
|
|
@@ -208,7 +210,10 @@
|
|
|
208
210
|
<workItem from="1671627681023" duration="31000" />
|
|
209
211
|
<workItem from="1671631779468" duration="1226000" />
|
|
210
212
|
<workItem from="1671704770184" duration="294000" />
|
|
211
|
-
<workItem from="1671731110475" duration="
|
|
213
|
+
<workItem from="1671731110475" duration="2220000" />
|
|
214
|
+
<workItem from="1672394102884" duration="2007000" />
|
|
215
|
+
<workItem from="1672817339832" duration="23446000" />
|
|
216
|
+
<workItem from="1672861024566" duration="2962000" />
|
|
212
217
|
</task>
|
|
213
218
|
<servers />
|
|
214
219
|
</component>
|
|
@@ -250,7 +255,7 @@
|
|
|
250
255
|
</line-breakpoint>
|
|
251
256
|
<line-breakpoint enabled="true" type="javascript">
|
|
252
257
|
<url>file://$PROJECT_DIR$/src/sdk/Dependencies/LocalDependency/LocalDependency.ts</url>
|
|
253
|
-
<line>
|
|
258
|
+
<line>111</line>
|
|
254
259
|
<option name="timeStamp" value="13" />
|
|
255
260
|
</line-breakpoint>
|
|
256
261
|
</breakpoints>
|
|
@@ -11,7 +11,7 @@ function CLIErrorHandler(e) {
|
|
|
11
11
|
}
|
|
12
12
|
async function main() {
|
|
13
13
|
commander_1.program
|
|
14
|
-
.version("0.
|
|
14
|
+
.version("0.6.0")
|
|
15
15
|
.description('The SCANOSS JS package provides a simple, easy to consume module for interacting with SCANOSS APIs/Engine.');
|
|
16
16
|
commander_1.program
|
|
17
17
|
.command('scan <source>')
|
|
@@ -10,7 +10,7 @@ export interface ILocalDependency {
|
|
|
10
10
|
export interface ILocalDependencies {
|
|
11
11
|
files: Array<ILocalDependency>;
|
|
12
12
|
}
|
|
13
|
-
export declare type ParserFuncType = (fileContent: string, filePath: string) => ILocalDependency
|
|
13
|
+
export declare type ParserFuncType = (fileContent: string, filePath: string) => Promise<ILocalDependency>;
|
|
14
14
|
export interface ParserDefinitions {
|
|
15
15
|
[key: string]: ParserFuncType;
|
|
16
16
|
}
|
|
@@ -10,6 +10,8 @@ const mavenParser_1 = require("./parsers/mavenParser");
|
|
|
10
10
|
const npmParser_1 = require("./parsers/npmParser");
|
|
11
11
|
const rubyParser_1 = require("./parsers/rubyParser");
|
|
12
12
|
const golangParser_1 = require("./parsers/golangParser");
|
|
13
|
+
const nugetParser_1 = require("./parsers/nugetParser");
|
|
14
|
+
const buildGradleParser_1 = require("./parsers/buildGradleParser");
|
|
13
15
|
class LocalDependencies {
|
|
14
16
|
constructor() {
|
|
15
17
|
/*
|
|
@@ -25,17 +27,21 @@ class LocalDependencies {
|
|
|
25
27
|
'Gemfile.lock': rubyParser_1.gemfilelockParser,
|
|
26
28
|
'go.mod': golangParser_1.goModParser,
|
|
27
29
|
'go.sum': golangParser_1.goSumParser,
|
|
28
|
-
'yarn.lock': npmParser_1.yarnLockParser
|
|
30
|
+
'yarn.lock': npmParser_1.yarnLockParser,
|
|
31
|
+
'*.csproj': nugetParser_1.csprojParser,
|
|
32
|
+
'packages.config': nugetParser_1.packagesConfigParser,
|
|
33
|
+
'build.gradle': buildGradleParser_1.buildGradleParser,
|
|
29
34
|
};
|
|
30
35
|
}
|
|
31
36
|
async search(files) {
|
|
32
37
|
let results = { files: [] };
|
|
33
38
|
for (const filePath of files) {
|
|
34
39
|
const fileName = path_1.default.basename(filePath);
|
|
35
|
-
|
|
40
|
+
const parser = this.getParserFunc(fileName);
|
|
41
|
+
if (parser != null) {
|
|
36
42
|
try {
|
|
37
43
|
const fileContent = await fs_1.default.promises.readFile(filePath, 'utf8');
|
|
38
|
-
const dependency =
|
|
44
|
+
const dependency = await parser(fileContent, filePath);
|
|
39
45
|
if (dependency.purls.length != 0)
|
|
40
46
|
results.files.push(dependency);
|
|
41
47
|
}
|
|
@@ -47,6 +53,50 @@ class LocalDependencies {
|
|
|
47
53
|
}
|
|
48
54
|
return results;
|
|
49
55
|
}
|
|
56
|
+
getParserFunc(filename) {
|
|
57
|
+
//Check for an exact match
|
|
58
|
+
const func = this.parserMap[filename];
|
|
59
|
+
if (func)
|
|
60
|
+
return func;
|
|
61
|
+
//Check for a wildcard string match
|
|
62
|
+
const filesPatterns = Object.keys(this.parserMap).filter((item) => item.includes("*"));
|
|
63
|
+
for (const pattern of filesPatterns) {
|
|
64
|
+
if (this.stringMatchWithWildcard(filename, pattern))
|
|
65
|
+
return this.parserMap[pattern];
|
|
66
|
+
}
|
|
67
|
+
return null;
|
|
68
|
+
}
|
|
69
|
+
// The logic for the string wildcard match algorithm was an imitation from here:
|
|
70
|
+
// https://www.codeproject.com/Articles/5163931/Fast-String-Matching-with-Wildcards-Globs-and-Giti
|
|
71
|
+
stringMatchWithWildcard(text, pattern) {
|
|
72
|
+
let iText = 0;
|
|
73
|
+
let iPattern = 0;
|
|
74
|
+
let iTextBackup = null;
|
|
75
|
+
let iPatternBackup = null;
|
|
76
|
+
while (text[iText]) {
|
|
77
|
+
if (pattern[iPattern] == '*') {
|
|
78
|
+
// new star-loop: backup positions in pattern and text
|
|
79
|
+
iTextBackup = iText;
|
|
80
|
+
iPatternBackup = ++iPattern;
|
|
81
|
+
}
|
|
82
|
+
else if (text[iText] == pattern[iPattern]) {
|
|
83
|
+
iText++;
|
|
84
|
+
iPattern++;
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
//If there are no star, we fail to match
|
|
88
|
+
if (iPatternBackup == null)
|
|
89
|
+
return false;
|
|
90
|
+
iText = ++iTextBackup;
|
|
91
|
+
iPattern = iPatternBackup;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
//Ignore trailling stars
|
|
95
|
+
while (pattern[iPattern] == '*')
|
|
96
|
+
iPatternBackup++;
|
|
97
|
+
//There is a match when the pattern was walked all the way throught
|
|
98
|
+
return iPattern >= pattern.length ? true : false;
|
|
99
|
+
}
|
|
50
100
|
}
|
|
51
101
|
exports.LocalDependencies = LocalDependencies;
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9jYWxEZXBlbmRlbmN5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3Nkay9EZXBlbmRlbmNpZXMvTG9jYWxEZXBlbmRlbmN5L0xvY2FsRGVwZW5kZW5jeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLGdEQUF3QjtBQUN4Qiw0Q0FBb0I7QUFFcEIsaURBQXdEO0FBQ3hELHVEQUFrRDtBQUNsRCxtREFJNkI7QUFDN0IscURBQXdFO0FBQ3hFLHlEQUFrRTtBQUNsRSx1REFBMkU7QUFDM0UsbUVBQWdFO0FBRWhFLE1BQWEsaUJBQWlCO0lBRzVCO1FBQ0k7OztVQUdFO1FBQ0YsSUFBSSxDQUFDLFNBQVMsR0FBRztZQUNmLGtCQUFrQixFQUFFLDZCQUFrQjtZQUN0QyxTQUFTLEVBQUUsdUJBQVM7WUFDcEIsY0FBYyxFQUFFLHlCQUFhO1lBQzdCLG1CQUFtQixFQUFFLDZCQUFpQjtZQUN0QyxTQUFTLEVBQUUsMEJBQWE7WUFDeEIsY0FBYyxFQUFFLDhCQUFpQjtZQUNqQyxRQUFRLEVBQUUsMEJBQVc7WUFDckIsUUFBUSxFQUFFLDBCQUFXO1lBQ3JCLFdBQVcsRUFBRSwwQkFBYztZQUMzQixVQUFVLEVBQUUsMEJBQVk7WUFDeEIsaUJBQWlCLEVBQUUsa0NBQW9CO1lBQ3ZDLGNBQWMsRUFBRSxxQ0FBaUI7U0FDbEMsQ0FBQztJQUVOLENBQUM7SUFFTSxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQW9CO1FBQ3RDLElBQUksT0FBTyxHQUF1QixFQUFDLEtBQUssRUFBRSxFQUFFLEVBQUMsQ0FBQztRQUM5QyxLQUFLLE1BQU0sUUFBUSxJQUFJLEtBQUssRUFBRTtZQUMxQixNQUFNLFFBQVEsR0FBRyxjQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ3pDLE1BQU0sTUFBTSxHQUFtQixJQUFJLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQzVELElBQUcsTUFBTSxJQUFJLElBQUks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
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
2
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
3
|
+
};
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.buildGradleParser = void 0;
|
|
6
|
+
const path_1 = __importDefault(require("path"));
|
|
7
|
+
const packageurl_js_1 = require("packageurl-js");
|
|
8
|
+
const MANIFEST_FILE = 'build.gradle';
|
|
9
|
+
const depBlockRex = /dependencies\s*{\s*(?<dependencies>(.|\n)*?)}/gm;
|
|
10
|
+
var GRADLE_STATES;
|
|
11
|
+
(function (GRADLE_STATES) {
|
|
12
|
+
GRADLE_STATES[GRADLE_STATES["WALKING"] = 0] = "WALKING";
|
|
13
|
+
GRADLE_STATES[GRADLE_STATES["SINGLELINE_DEPENDENCY"] = 1] = "SINGLELINE_DEPENDENCY";
|
|
14
|
+
GRADLE_STATES[GRADLE_STATES["MULTILINE_DEPENDENCY"] = 2] = "MULTILINE_DEPENDENCY";
|
|
15
|
+
})(GRADLE_STATES || (GRADLE_STATES = {}));
|
|
16
|
+
async function buildGradleParser(fileContent, filePath) {
|
|
17
|
+
var _a;
|
|
18
|
+
// If the file is not a manifest file, return an empty results
|
|
19
|
+
const results = { file: filePath, purls: [] };
|
|
20
|
+
if (path_1.default.basename(filePath) != MANIFEST_FILE)
|
|
21
|
+
return results;
|
|
22
|
+
//For each dependency block, generate purls
|
|
23
|
+
let gradle;
|
|
24
|
+
while ((gradle = depBlockRex.exec(fileContent)) !== null) {
|
|
25
|
+
let depBlock = (_a = gradle === null || gradle === void 0 ? void 0 : gradle.groups) === null || _a === void 0 ? void 0 : _a.dependencies;
|
|
26
|
+
let current_config_name = ""; //Config name is placed in the scope
|
|
27
|
+
let lines = depBlock.split(/\r?\n/);
|
|
28
|
+
for (let i = 0; i < lines.length; i++) {
|
|
29
|
+
let line = lines[i];
|
|
30
|
+
if (line.includes("//"))
|
|
31
|
+
line = line.replace(/\/\/.*$/gm, "");
|
|
32
|
+
line = line.trim();
|
|
33
|
+
if (line == '')
|
|
34
|
+
continue;
|
|
35
|
+
current_config_name = getConfigNameFromLine(line);
|
|
36
|
+
//Multiline dependency
|
|
37
|
+
if (current_config_name && line.includes("(")) {
|
|
38
|
+
while (i < lines.length && !lines[i].includes(")")) {
|
|
39
|
+
const componentData = createPurlNameFromLine(lines[i]);
|
|
40
|
+
if (componentData != null) {
|
|
41
|
+
results.purls.push({
|
|
42
|
+
purl: componentData.purlName,
|
|
43
|
+
requirement: componentData.version,
|
|
44
|
+
scope: current_config_name
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
i++;
|
|
48
|
+
}
|
|
49
|
+
current_config_name = '';
|
|
50
|
+
}
|
|
51
|
+
else { //Single line dependency
|
|
52
|
+
const componentData = createPurlNameFromLine(line);
|
|
53
|
+
if (componentData == null) {
|
|
54
|
+
current_config_name = '';
|
|
55
|
+
continue;
|
|
56
|
+
}
|
|
57
|
+
results.purls.push({ purl: componentData.purlName, requirement: componentData.version, scope: current_config_name });
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
return Promise.resolve(results);
|
|
62
|
+
}
|
|
63
|
+
exports.buildGradleParser = buildGradleParser;
|
|
64
|
+
function getConfigNameFromLine(line) {
|
|
65
|
+
let configName = "";
|
|
66
|
+
const dep = line.split(/\s/);
|
|
67
|
+
if (dep.length)
|
|
68
|
+
configName = dep[0].replace("(", "").trim();
|
|
69
|
+
return configName;
|
|
70
|
+
}
|
|
71
|
+
function createPurlNameFromLine(line) {
|
|
72
|
+
var _a, _b;
|
|
73
|
+
let namespace = undefined;
|
|
74
|
+
let name = undefined;
|
|
75
|
+
let version = undefined;
|
|
76
|
+
//Enters when line = implementation 'org.scala-lang:scala-library:2.11.12'
|
|
77
|
+
let dep = line.match(/(?<namespace>[\w\.\-]+):(?<name>[\w\.\-]+):(?<version>[\d\.]+)/);
|
|
78
|
+
if (dep === null || dep === void 0 ? void 0 : dep.length) {
|
|
79
|
+
namespace = dep.groups.namespace;
|
|
80
|
+
name = dep.groups.name;
|
|
81
|
+
version = dep.groups.version;
|
|
82
|
+
}
|
|
83
|
+
else if (line.includes("group") && line.includes("name") && line.includes("version")) {
|
|
84
|
+
version = line.match(/version:\s+['"](?<version>[\w\.\-\d]+)['"]/).groups.version;
|
|
85
|
+
name = (_a = line.match(/name:\s+['"](?<name>[\w\.\-\d]+)['"]/).groups) === null || _a === void 0 ? void 0 : _a.name;
|
|
86
|
+
namespace = (_b = line.match(/group:\s+['"](?<group>[\w\.\-\d]+)['"]/).groups) === null || _b === void 0 ? void 0 : _b.group;
|
|
87
|
+
}
|
|
88
|
+
let purlName = "";
|
|
89
|
+
if (name && namespace) {
|
|
90
|
+
const purlObj = new packageurl_js_1.PackageURL('maven', namespace, name, undefined, undefined, undefined);
|
|
91
|
+
return { purlName: purlObj.toString(), version };
|
|
92
|
+
}
|
|
93
|
+
return null;
|
|
94
|
+
}
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRHcmFkbGVQYXJzZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvc2RrL0RlcGVuZGVuY2llcy9Mb2NhbERlcGVuZGVuY3kvcGFyc2Vycy9idWlsZEdyYWRsZVBhcnNlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUNBLGdEQUF3QjtBQUN4QixpREFBMkM7QUFHM0MsTUFBTSxhQUFhLEdBQUcsY0FBYyxDQUFDO0FBQ3JDLE1BQU0sV0FBVyxHQUFHLGlEQUFpRCxDQUFDO0FBRXRFLElBQUssYUFJSjtBQUpELFdBQUssYUFBYTtJQUNoQix1REFBTyxDQUFBO0lBQ1AsbUZBQXFCLENBQUE7SUFDckIsaUZBQW9CLENBQUE7QUFDdEIsQ0FBQyxFQUpJLGFBQWEsS0FBYixhQUFhLFFBSWpCO0FBQ00sS0FBSyxVQUFVLGlCQUFpQixDQUFDLFdBQW1CLEVBQUUsUUFBZ0I7O0lBRzNFLDhEQUE4RDtJQUM5RCxNQUFNLE9BQU8sR0FBcUIsRUFBQyxJQUFJLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUMsQ0FBQztJQUM5RCxJQUFHLGNBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLElBQUksYUFBYTtRQUN6QyxPQUFPLE9BQU8sQ0FBQztJQUVqQiwyQ0FBMkM7SUFDM0MsSUFBSSxNQUFNLENBQUM7SUFDWCxPQUFPLENBQUMsTUFBTSxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUMsS0FBSyxJQUFJLEVBQUU7UUFDeEQsSUFBSSxRQUFRLFNBQUcsTUFBTSxhQUFOLE1BQU0sdUJBQU4sTUFBTSxDQUFFLE1BQU0sMENBQUUsWUFBWSxDQUFDO1FBRzVDLElBQUksbUJBQW1CLEdBQUcsRUFBRSxDQUFDLENBQUcsb0NBQW9DO1FBQ3BFLElBQUksS0FBSyxHQUFHLFFBQVEsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFXLENBQUM7UUFDOUMsS0FBSyxJQUFJLENBQUMs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
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { ILocalDependency } from "../DependencyTypes";
|
|
2
|
-
export declare function goModParser(fileContent: string, filePath: string): ILocalDependency
|
|
3
|
-
export declare function goSumParser(fileContent: string, filePath: string): ILocalDependency
|
|
2
|
+
export declare function goModParser(fileContent: string, filePath: string): Promise<ILocalDependency>;
|
|
3
|
+
export declare function goSumParser(fileContent: string, filePath: string): Promise<ILocalDependency>;
|
|
@@ -33,7 +33,7 @@ function goModParser(fileContent, filePath) {
|
|
|
33
33
|
// If the file is not a go.mod manifest file, return an empty results
|
|
34
34
|
const results = { file: filePath, purls: [] };
|
|
35
35
|
if (path_1.default.basename(filePath) != MANIFEST_FILE)
|
|
36
|
-
return results;
|
|
36
|
+
return Promise.resolve(results);
|
|
37
37
|
const lines = fileContent.split('\n');
|
|
38
38
|
const require = [];
|
|
39
39
|
for (let num = 0; num < lines.length; num += 1) {
|
|
@@ -51,7 +51,7 @@ function goModParser(fileContent, filePath) {
|
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
|
-
return results;
|
|
54
|
+
return Promise.resolve(results);
|
|
55
55
|
}
|
|
56
56
|
exports.goModParser = goModParser;
|
|
57
57
|
function parseGoSumDepLink(str) {
|
|
@@ -77,7 +77,7 @@ function goSumParser(fileContent, filePath) {
|
|
|
77
77
|
// If the file is not a go.mod manifest file, return an empty results
|
|
78
78
|
const results = { file: filePath, purls: [] };
|
|
79
79
|
if (path_1.default.basename(filePath) != 'go.sum')
|
|
80
|
-
return results;
|
|
80
|
+
return Promise.resolve(results);
|
|
81
81
|
const lines = fileContent.split('\n');
|
|
82
82
|
for (let num = 0; num < lines.length; num += 1) {
|
|
83
83
|
let line = preprocessLine(lines[num]); //Deletes coments
|
|
@@ -91,7 +91,7 @@ function goSumParser(fileContent, filePath) {
|
|
|
91
91
|
const purlString = `pkg:${PURL_TYPE}/${namespace}/${name}`;
|
|
92
92
|
results.purls.push({ purl: purlString, requirement: version });
|
|
93
93
|
}
|
|
94
|
-
return results;
|
|
94
|
+
return Promise.resolve(results);
|
|
95
95
|
}
|
|
96
96
|
exports.goSumParser = goSumParser;
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ29sYW5nUGFyc2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3Nkay9EZXBlbmRlbmNpZXMvTG9jYWxEZXBlbmRlbmN5L3BhcnNlcnMvZ29sYW5nUGFyc2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBRUEsaURBQTJDO0FBQzNDLGdEQUF3QjtBQUV4QixTQUFTLFlBQVksQ0FBRSxHQUFXOztJQUNoQyxNQUFNLEdBQUcsR0FBRywwQ0FBMEMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDakUsT0FBTztRQUNMLE9BQU8sUUFBRSxHQUFHLGFBQUgsR0FBRyx1QkFBSCxHQUFHLENBQUUsTUFBTSwwQ0FBRSxPQUFPO1FBQzdCLE9BQU8sUUFBRSxHQUFHLGFBQUgsR0FBRyx1QkFBSCxHQUFHLENBQUUsTUFBTSwwQ0FBRSxPQUFPO0tBQzlCLENBQUM7QUFDSixDQUFDO0FBRUQsU0FBUyx1QkFBdUIsQ0FBQyxJQUFZO0lBQzNDLE1BQU0sRUFBQyxPQUFPLEVBQUUsT0FBTyxFQUFDLEdBQUcsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRTlDLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDdkMsTUFBTSxTQUFTLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDOUMsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFFMUMsT0FBTyxFQUFDLFNBQVMsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFDLENBQUE7QUFDbkMsQ0FBQztBQUVELDhCQUE4QjtBQUM5QixTQUFTLGNBQWMsQ0FBQyxJQUFZO0lBQ2hDLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUM7UUFDckIsSUFBSSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMs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
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ILocalDependency } from "../DependencyTypes";
|
|
2
|
-
export declare function pomParser(fileContent: string, filePath: string): ILocalDependency
|
|
2
|
+
export declare function pomParser(fileContent: string, filePath: string): Promise<ILocalDependency>;
|
|
@@ -14,7 +14,7 @@ function pomParser(fileContent, filePath) {
|
|
|
14
14
|
// If the file is not a python manifest file, return an empty results
|
|
15
15
|
const results = { file: filePath, purls: [] };
|
|
16
16
|
if (path_1.default.basename(filePath) != MANIFEST_FILE)
|
|
17
|
-
return results;
|
|
17
|
+
return Promise.resolve(results);
|
|
18
18
|
const dependencies = fileContent.match(/<dependency>((?:.|\n)*?)<\/dependency>/gm);
|
|
19
19
|
if (dependencies) {
|
|
20
20
|
dependencies.forEach(dependency => {
|
|
@@ -44,7 +44,8 @@ function pomParser(fileContent, filePath) {
|
|
|
44
44
|
});
|
|
45
45
|
}
|
|
46
46
|
//Remove purls duplicated
|
|
47
|
-
|
|
47
|
+
const nonDuplicatedResults = removeDuplicated(results);
|
|
48
|
+
return Promise.resolve(nonDuplicatedResults);
|
|
48
49
|
}
|
|
49
50
|
exports.pomParser = pomParser;
|
|
50
51
|
function removeDuplicated(results) {
|
|
@@ -179,4 +180,4 @@ function extract_content_from_tag(file_content, selector) {
|
|
|
179
180
|
}
|
|
180
181
|
return '';
|
|
181
182
|
}
|
|
182
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
183
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mavenParser.js","sourceRoot":"","sources":["../../../../../../src/sdk/Dependencies/LocalDependency/parsers/mavenParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { ILocalDependency } from "../DependencyTypes";
|
|
2
|
-
export declare function packageParser(fileContent: string, filePath: string): ILocalDependency
|
|
3
|
-
export declare function packagelockParser(fileContent: string, filePath: string): ILocalDependency
|
|
4
|
-
export declare function yarnLockParser(fileContent: string, filePath: string): ILocalDependency
|
|
2
|
+
export declare function packageParser(fileContent: string, filePath: string): Promise<ILocalDependency>;
|
|
3
|
+
export declare function packagelockParser(fileContent: string, filePath: string): Promise<ILocalDependency>;
|
|
4
|
+
export declare function yarnLockParser(fileContent: string, filePath: string): Promise<ILocalDependency>;
|
|
5
5
|
declare enum YarnLockVersionEnum {
|
|
6
6
|
"V1" = 0,
|
|
7
7
|
"V2" = 1,
|
|
8
8
|
UnknownYarnLockFormat = 2
|
|
9
9
|
}
|
|
10
10
|
export declare function yarnLockRecognizeVersion(fileContent: string): YarnLockVersionEnum;
|
|
11
|
-
export declare function yarnLockV1Parser(fileContent: string, filePath: string): ILocalDependency
|
|
12
|
-
export declare function yarnLockV2Parser(fileContent: string, filePath: string): ILocalDependency
|
|
11
|
+
export declare function yarnLockV1Parser(fileContent: string, filePath: string): Promise<ILocalDependency>;
|
|
12
|
+
export declare function yarnLockV2Parser(fileContent: string, filePath: string): Promise<ILocalDependency>;
|
|
13
13
|
export {};
|
|
@@ -13,7 +13,7 @@ function packageParser(fileContent, filePath) {
|
|
|
13
13
|
// If the file is not manifest file, return an empty results
|
|
14
14
|
const results = { file: filePath, purls: [] };
|
|
15
15
|
if (path_1.default.basename(filePath) != MANIFEST_FILE)
|
|
16
|
-
return results;
|
|
16
|
+
return Promise.resolve(results);
|
|
17
17
|
const o = JSON.parse(fileContent);
|
|
18
18
|
let devDeps = Object.keys(o.devDependencies || {});
|
|
19
19
|
let deps = Object.keys(o.dependencies || {});
|
|
@@ -25,7 +25,7 @@ function packageParser(fileContent, filePath) {
|
|
|
25
25
|
const purlString = new packageurl_js_1.PackageURL(PURL_TYPE, undefined, name, undefined, undefined, undefined).toString();
|
|
26
26
|
results.purls.push({ purl: purlString, scope: "devDependencies", requirement: o.devDependencies[name] });
|
|
27
27
|
}
|
|
28
|
-
return results;
|
|
28
|
+
return Promise.resolve(results);
|
|
29
29
|
}
|
|
30
30
|
exports.packageParser = packageParser;
|
|
31
31
|
// Parse a package-lock.json file from node projects
|
|
@@ -34,10 +34,10 @@ function packagelockParser(fileContent, filePath) {
|
|
|
34
34
|
var _a;
|
|
35
35
|
const results = { file: filePath, purls: [] };
|
|
36
36
|
if (path_1.default.basename(filePath) != 'package-lock.json')
|
|
37
|
-
return results;
|
|
37
|
+
return Promise.resolve(results);
|
|
38
38
|
const packages = (_a = JSON.parse(fileContent)) === null || _a === void 0 ? void 0 : _a.packages;
|
|
39
39
|
if (!packages)
|
|
40
|
-
return results;
|
|
40
|
+
return Promise.resolve(results);
|
|
41
41
|
for (const [key, value] of Object.entries(packages)) {
|
|
42
42
|
if (!key)
|
|
43
43
|
continue;
|
|
@@ -47,19 +47,19 @@ function packagelockParser(fileContent, filePath) {
|
|
|
47
47
|
let req = value['version'];
|
|
48
48
|
results.purls.push({ purl: purl, requirement: req });
|
|
49
49
|
}
|
|
50
|
-
return results;
|
|
50
|
+
return Promise.resolve(results);
|
|
51
51
|
}
|
|
52
52
|
exports.packagelockParser = packagelockParser;
|
|
53
53
|
function yarnLockParser(fileContent, filePath) {
|
|
54
54
|
const results = { file: filePath, purls: [] };
|
|
55
55
|
if (path_1.default.basename(filePath) != 'yarn.lock')
|
|
56
|
-
return results;
|
|
56
|
+
return Promise.resolve(results);
|
|
57
57
|
const yarnVersion = yarnLockRecognizeVersion(fileContent);
|
|
58
58
|
if (yarnVersion === YarnLockVersionEnum.V1)
|
|
59
59
|
return yarnLockV1Parser(fileContent, filePath);
|
|
60
60
|
else if (yarnVersion === YarnLockVersionEnum.V2)
|
|
61
61
|
return yarnLockV2Parser(fileContent, filePath);
|
|
62
|
-
return results;
|
|
62
|
+
return Promise.resolve(results);
|
|
63
63
|
}
|
|
64
64
|
exports.yarnLockParser = yarnLockParser;
|
|
65
65
|
var YarnLockVersionEnum;
|
|
@@ -175,12 +175,13 @@ function yarnLockV1Parser(fileContent, filePath) {
|
|
|
175
175
|
}
|
|
176
176
|
results.purls.push({ purl: purl, requirement: requirement });
|
|
177
177
|
}
|
|
178
|
-
return results;
|
|
178
|
+
return Promise.resolve(results);
|
|
179
179
|
}
|
|
180
180
|
exports.yarnLockV1Parser = yarnLockV1Parser;
|
|
181
|
+
//TODO: Implement yarn lock V2 parser
|
|
181
182
|
function yarnLockV2Parser(fileContent, filePath) {
|
|
182
183
|
const results = { file: filePath, purls: [] };
|
|
183
|
-
return results;
|
|
184
|
+
return Promise.resolve(results);
|
|
184
185
|
}
|
|
185
186
|
exports.yarnLockV2Parser = yarnLockV2Parser;
|
|
186
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
187
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"npmParser.js","sourceRoot":"","sources":["../../../../../../src/sdk/Dependencies/LocalDependency/parsers/npmParser.ts"],"names":[],"mappings":"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"}
|