scanoss 0.2.24 → 0.2.27
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/.gitignore +5 -0
- package/.idea/codeStyles/Project.xml +61 -0
- package/.idea/codeStyles/codeStyleConfig.xml +5 -0
- package/.idea/inspectionProfiles/Project_Default.xml +6 -0
- package/.idea/modules.xml +8 -0
- package/.idea/scanoss.js.iml +12 -0
- package/.idea/vcs.xml +6 -0
- package/.idea/workspace.xml +62 -0
- package/build/main/bin/cli-bin.js +3 -3
- package/build/main/lib/dependencies/DependencyScanner.js +3 -1
- package/build/main/lib/dependencies/LocalDependency/parsers/mavenParser.js +130 -14
- package/build/main/lib/scanner/Scanner.d.ts +0 -1
- package/build/main/lib/scanner/Scanner.js +8 -12
- package/build/main/lib/scanner/WfpProvider/WfpProviderFactory.d.ts +6 -0
- package/build/main/lib/scanner/WfpProvider/WfpProviderFactory.js +16 -0
- package/build/module/bin/cli-bin.js +3 -3
- package/build/module/lib/dependencies/DependencyScanner.js +3 -1
- package/build/module/lib/dependencies/LocalDependency/parsers/mavenParser.js +130 -14
- package/build/module/lib/scanner/Scanner.d.ts +0 -1
- package/build/module/lib/scanner/Scanner.js +7 -12
- package/build/module/lib/scanner/WfpProvider/WfpProviderFactory.d.ts +6 -0
- package/build/module/lib/scanner/WfpProvider/WfpProviderFactory.js +12 -0
- package/build/tsconfig.module.tsbuildinfo +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package-lock.json +2 -2
- package/package.json +1 -1
- package/src/bin/cli-bin.ts +2 -2
- package/src/lib/dependencies/DependencyScanner.ts +4 -2
- package/src/lib/dependencies/LocalDependency/parsers/mavenParser.ts +143 -16
- package/src/lib/scanner/Scanner.ts +6 -13
- package/test/dependencies/data/Gemfile/1/Gemfile +6 -0
- package/test/dependencies/data/Gemfile/1/Gemfile~ +0 -0
- package/test/dependencies/data/Gemfile/2/Gemfile +3 -0
- package/test/dependencies/data/Gemfile/2/Gemfile~ +6 -0
- package/test/dependencies/data/Gemfile/3/Gemfile +7 -0
- package/test/dependencies/data/Gemfile/3/Gemfile~ +6 -0
- package/test/dependencies/data/Gemfile/4/Gemfile +31 -0
- package/test/dependencies/data/Gemfile/4/Gemfile~ +7 -0
- package/test/dependencies/data/Gemfile.lock/1/Gemfile.lock +180 -0
- package/test/dependencies/data/Gemfile.lock/2/Gemfile.lock +60 -0
- package/test/dependencies/data/Gemfile.lock/2/Gemfile.lock~ +0 -0
- package/test/dependencies/data/pom.xml/1/pom.xml +162 -0
package/.idea/.gitignore
ADDED
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
<component name="ProjectCodeStyleConfiguration">
|
|
2
|
+
<code_scheme name="Project" version="173">
|
|
3
|
+
<HTMLCodeStyleSettings>
|
|
4
|
+
<option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
|
|
5
|
+
<option name="HTML_QUOTE_STYLE" value="Single" />
|
|
6
|
+
<option name="HTML_ENFORCE_QUOTES" value="true" />
|
|
7
|
+
</HTMLCodeStyleSettings>
|
|
8
|
+
<JSCodeStyleSettings version="0">
|
|
9
|
+
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
10
|
+
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
|
11
|
+
<option name="USE_DOUBLE_QUOTES" value="false" />
|
|
12
|
+
<option name="FORCE_QUOTE_STYlE" value="true" />
|
|
13
|
+
<option name="ENFORCE_TRAILING_COMMA" value="Remove" />
|
|
14
|
+
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
|
15
|
+
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
|
16
|
+
</JSCodeStyleSettings>
|
|
17
|
+
<TypeScriptCodeStyleSettings version="0">
|
|
18
|
+
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
19
|
+
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
|
20
|
+
<option name="USE_DOUBLE_QUOTES" value="false" />
|
|
21
|
+
<option name="FORCE_QUOTE_STYlE" value="true" />
|
|
22
|
+
<option name="ENFORCE_TRAILING_COMMA" value="Remove" />
|
|
23
|
+
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
|
24
|
+
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
|
25
|
+
</TypeScriptCodeStyleSettings>
|
|
26
|
+
<VueCodeStyleSettings>
|
|
27
|
+
<option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
|
|
28
|
+
<option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
|
|
29
|
+
</VueCodeStyleSettings>
|
|
30
|
+
<codeStyleSettings language="HTML">
|
|
31
|
+
<option name="SOFT_MARGINS" value="80" />
|
|
32
|
+
<indentOptions>
|
|
33
|
+
<option name="INDENT_SIZE" value="2" />
|
|
34
|
+
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
35
|
+
<option name="TAB_SIZE" value="2" />
|
|
36
|
+
</indentOptions>
|
|
37
|
+
</codeStyleSettings>
|
|
38
|
+
<codeStyleSettings language="JavaScript">
|
|
39
|
+
<option name="SOFT_MARGINS" value="80" />
|
|
40
|
+
<indentOptions>
|
|
41
|
+
<option name="INDENT_SIZE" value="2" />
|
|
42
|
+
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
43
|
+
<option name="TAB_SIZE" value="2" />
|
|
44
|
+
</indentOptions>
|
|
45
|
+
</codeStyleSettings>
|
|
46
|
+
<codeStyleSettings language="TypeScript">
|
|
47
|
+
<option name="SOFT_MARGINS" value="80" />
|
|
48
|
+
<indentOptions>
|
|
49
|
+
<option name="INDENT_SIZE" value="2" />
|
|
50
|
+
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
51
|
+
<option name="TAB_SIZE" value="2" />
|
|
52
|
+
</indentOptions>
|
|
53
|
+
</codeStyleSettings>
|
|
54
|
+
<codeStyleSettings language="Vue">
|
|
55
|
+
<option name="SOFT_MARGINS" value="80" />
|
|
56
|
+
<indentOptions>
|
|
57
|
+
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
58
|
+
</indentOptions>
|
|
59
|
+
</codeStyleSettings>
|
|
60
|
+
</code_scheme>
|
|
61
|
+
</component>
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<project version="4">
|
|
3
|
+
<component name="ProjectModuleManager">
|
|
4
|
+
<modules>
|
|
5
|
+
<module fileurl="file://$PROJECT_DIR$/.idea/scanoss.js.iml" filepath="$PROJECT_DIR$/.idea/scanoss.js.iml" />
|
|
6
|
+
</modules>
|
|
7
|
+
</component>
|
|
8
|
+
</project>
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<module type="WEB_MODULE" version="4">
|
|
3
|
+
<component name="NewModuleRootManager">
|
|
4
|
+
<content url="file://$MODULE_DIR$">
|
|
5
|
+
<excludeFolder url="file://$MODULE_DIR$/temp" />
|
|
6
|
+
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
|
|
7
|
+
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
|
8
|
+
</content>
|
|
9
|
+
<orderEntry type="inheritedJdk" />
|
|
10
|
+
<orderEntry type="sourceFolder" forTests="false" />
|
|
11
|
+
</component>
|
|
12
|
+
</module>
|
package/.idea/vcs.xml
ADDED
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<project version="4">
|
|
3
|
+
<component name="AutoImportSettings">
|
|
4
|
+
<option name="autoReloadType" value="SELECTIVE" />
|
|
5
|
+
</component>
|
|
6
|
+
<component name="ChangeListManager">
|
|
7
|
+
<list default="true" id="0ac507d1-fb77-4a7e-8a1c-824548785ccb" name="Changes" comment="">
|
|
8
|
+
<change beforePath="$PROJECT_DIR$/src/lib/dependencies/LocalDependency/parsers/mavenParser.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/lib/dependencies/LocalDependency/parsers/mavenParser.ts" afterDir="false" />
|
|
9
|
+
</list>
|
|
10
|
+
<option name="SHOW_DIALOG" value="false" />
|
|
11
|
+
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
12
|
+
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
13
|
+
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
14
|
+
</component>
|
|
15
|
+
<component name="Git.Settings">
|
|
16
|
+
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
17
|
+
</component>
|
|
18
|
+
<component name="MarkdownSettingsMigration">
|
|
19
|
+
<option name="stateVersion" value="1" />
|
|
20
|
+
</component>
|
|
21
|
+
<component name="ProjectId" id="28NwqMrRNzf1WmRliDY1hQDlsTG" />
|
|
22
|
+
<component name="ProjectViewState">
|
|
23
|
+
<option name="hideEmptyMiddlePackages" value="true" />
|
|
24
|
+
<option name="showLibraryContents" value="true" />
|
|
25
|
+
</component>
|
|
26
|
+
<component name="PropertiesComponent"><![CDATA[{
|
|
27
|
+
"keyToString": {
|
|
28
|
+
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
29
|
+
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
30
|
+
"WebServerToolWindowFactoryState": "false",
|
|
31
|
+
"eslint.code.style.apply.dismiss": "true",
|
|
32
|
+
"last_opened_file_path": "/home/ubuntu/Projects/SCANOSS/scanoss.js",
|
|
33
|
+
"node.js.detected.package.eslint": "true",
|
|
34
|
+
"node.js.detected.package.tslint": "true",
|
|
35
|
+
"node.js.selected.package.eslint": "(autodetect)",
|
|
36
|
+
"node.js.selected.package.tslint": "(autodetect)",
|
|
37
|
+
"nodejs_package_manager_path": "yarn",
|
|
38
|
+
"ts.external.directory.path": "/home/ubuntu/Projects/SCANOSS/scanoss.js/node_modules/typescript/lib",
|
|
39
|
+
"vue.rearranger.settings.migration": "true"
|
|
40
|
+
}
|
|
41
|
+
}]]></component>
|
|
42
|
+
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
|
43
|
+
<component name="TaskManager">
|
|
44
|
+
<task active="true" id="Default" summary="Default task">
|
|
45
|
+
<changelist id="0ac507d1-fb77-4a7e-8a1c-824548785ccb" name="Changes" comment="" />
|
|
46
|
+
<created>1651070540410</created>
|
|
47
|
+
<option name="number" value="Default" />
|
|
48
|
+
<option name="presentableId" value="Default" />
|
|
49
|
+
<updated>1651070540410</updated>
|
|
50
|
+
<workItem from="1651070541670" duration="3451000" />
|
|
51
|
+
</task>
|
|
52
|
+
<servers />
|
|
53
|
+
</component>
|
|
54
|
+
<component name="TypeScriptGeneratedFilesManager">
|
|
55
|
+
<option name="version" value="3" />
|
|
56
|
+
<option name="exactExcludedFiles">
|
|
57
|
+
<list>
|
|
58
|
+
<option value="$PROJECT_DIR$/src/index.js" />
|
|
59
|
+
</list>
|
|
60
|
+
</option>
|
|
61
|
+
</component>
|
|
62
|
+
</project>
|
|
@@ -12,7 +12,7 @@ function CLIErrorHandler(e) {
|
|
|
12
12
|
}
|
|
13
13
|
async function main() {
|
|
14
14
|
commander_1.program
|
|
15
|
-
.version("0.2.
|
|
15
|
+
.version("0.2.27")
|
|
16
16
|
.description('The SCANOSS JS package provides a simple, easy to consume module for interacting with SCANOSS APIs/Engine.');
|
|
17
17
|
commander_1.program
|
|
18
18
|
.command('scan <source>')
|
|
@@ -34,7 +34,7 @@ async function main() {
|
|
|
34
34
|
$ scanoss-js scan -o scan-output.json <source-folder>`);
|
|
35
35
|
commander_1.program
|
|
36
36
|
.command('dep <source>')
|
|
37
|
-
.description('Scan for dependencies
|
|
37
|
+
.description('Scan for dependencies')
|
|
38
38
|
.option('-o, --output <filename>', 'Output result file name (optional - default stdout)')
|
|
39
39
|
.option('-a, --grpc-host <host>', 'SCANOSS GRPC HOST (optional - default: scanoss.com)')
|
|
40
40
|
.option('-p, --grpc-port <port>', 'SCANOSS GRPC PORT (optional - default: 443)')
|
|
@@ -54,4 +54,4 @@ catch (e) {
|
|
|
54
54
|
console.error(e);
|
|
55
55
|
process.exit(1);
|
|
56
56
|
}
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLWJpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9iaW4vY2xpLWJpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQSx5Q0FBb0M7QUFDcEMseUNBQTZDO0FBQzdDLHlEQUE2RDtBQUM3RCwyQ0FBK0M7QUFFL0MsU0FBUyxlQUFlLENBQUMsQ0FBUTtJQUMvQixPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ25CLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDakIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNsQixDQUFDO0FBS0QsS0FBSyxVQUFVLElBQUk7SUFDakIsbUJBQU87U0FDSixPQUFPLENBQUMsUUFBUSxDQUFDO1NBQ2pCLFdBQVcsQ0FBQyw0R0FBNEcsQ0FBQyxDQUFBO0lBRTVILG1CQUFPO1NBQ0osT0FBTyxDQUFDLGVBQWUsQ0FBQztTQUN4QixXQUFXLENBQUMsb0JBQW9CLENBQUM7U0FDakMsTUFBTSxDQUFDLFdBQVcsRUFBRSxzQ0FBc0MsQ0FBQztTQUMzRCxNQUFNLENBQUMsNEJBQTRCLEVBQUUsK0VBQStFLENBQUM7U0FDckgsTUFBTSxDQUFDLHFCQUFxQixFQUFFLHlDQUF5QyxDQUFDO1NBQ3hFLE1BQU0sQ0FBQyx5QkFBeUIsRUFBRSxxREFBcUQsQ0FBQztTQUN4RixNQUFNLENBQUMscUJBQXFCLEVBQUUsbVJBQW1SLENBQUM7U0FDbFQsTUFBTSxDQUFDLDRCQUE0QixFQUFFLGlGQUFpRixDQUFDO1NBQ3ZILE1BQU0sQ0FBQyx5QkFBeUIsRUFBRSwyREFBMkQsQ0FBQztTQUM5RixNQUFNLENBQUMseUJBQXlCLEVBQUUsb0VBQW9FLENBQUM7U0FDdkcsTUFBTSxDQUFDLHVCQUF1QixFQUFFLHlFQUF5RSxDQUFDO1NBQzFHLE1BQU0sQ0FBQyxpQkFBaUIsRUFBRSx1RUFBdUUsQ0FBQztTQUNsRyxNQUFNLENBQUMsZUFBZSxFQUFFLDhCQUE4QixDQUFDO1NBQ3ZELE1BQU0sQ0FBQyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsRUFBRSxHQUFFLElBQUEsa0JBQVcsRUFBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsR0FBRSxlQUFlLENBQUMsQ0FBQyxDQUFDLENBQUEsQ0FBQSxDQUFDLENBQUMsQ0FBQSxDQUFBLENBQUMsQ0FBQztTQUM5RixXQUFXLENBQUMsT0FBTyxFQUFFOzswREFFZ0MsQ0FDckQsQ0FBQztJQUVGLG1CQUFPO1NBQ04sT0FBTyxDQUFDLGNBQWMsQ0FBQztTQUN2QixXQUFXLENBQUMsdUJBQXVCLENBQUM7U0FDcEMsTUFBTSxDQUFDLHlCQUF5QixFQUFFLHFEQUFxRCxDQUFDO1NBQ3hGLE1BQU0sQ0FBQyx3QkFBd0IsRUFBRSxxREFBcUQsQ0FBQztTQUN2RixNQUFNLENBQUMsd0JBQXdCLEVBQUUsOENBQThDLENBQUM7U0FDaEYsTUFBTSxDQUFDLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxFQUFFLEdBQUUsSUFBQSxnQkFBVSxFQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxHQUFFLGVBQWUsQ0FBQyxDQUFDLENBQUMsQ0FBQSxDQUFBLENBQUMsQ0FBQyxDQUFBLENBQUEsQ0FBQyxDQUFDLENBQUE7SUFFOUYsbUJBQU87U0FDTixPQUFPLENBQUMsc0JBQXNCLENBQUM7U0FDL0IsV0FBVyxDQUFDLDBDQUEwQyxDQUFDO1NBQ3ZELE1BQU0sQ0FBQyx5QkFBeUIsRUFBRSxxREFBcUQsQ0FBQztTQUN4RixNQUFNLENBQUMseUJBQXlCLEVBQUUseUVBQXlFLENBQUM7U0FDNUcsTUFBTSxDQUFDLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxFQUFFLEdBQUUsSUFBQSxnQ0FBa0IsRUFBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsR0FBRSxlQUFlLENBQUMsQ0FBQyxDQUFDLENBQUEsQ0FBQSxDQUFDLENBQUMsQ0FBQSxDQUFBLENBQUMsQ0FBQyxDQUFBO0lBRXRHLE1BQU0sbUJBQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0FBQzNDLENBQUM7QUFHRCxJQUFJO0lBQ0YsSUFBSSxFQUFFLENBQUM7Q0FDUjtBQUFDLE9BQU8sQ0FBQyxFQUFFO0lBQ1YsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNqQixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0NBQ2pCIn0=
|
|
@@ -29,6 +29,8 @@ class DependencyScanner {
|
|
|
29
29
|
const version = packageurl_js_1.PackageURL.fromString(purl.purl).version;
|
|
30
30
|
purl.requirement = version;
|
|
31
31
|
purl.purl = purl.purl.replace('@' + version, '');
|
|
32
|
+
if (purl.purl.includes('%2F'))
|
|
33
|
+
purl.purl = purl.purl.replace(/%2F/g, '/');
|
|
32
34
|
}
|
|
33
35
|
}
|
|
34
36
|
return localDependencies;
|
|
@@ -77,4 +79,4 @@ class DependencyScanner {
|
|
|
77
79
|
}
|
|
78
80
|
}
|
|
79
81
|
exports.DependencyScanner = DependencyScanner;
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVwZW5kZW5jeVNjYW5uZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbGliL2RlcGVuZGVuY2llcy9EZXBlbmRlbmN5U2Nhbm5lci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSx5RUFBc0U7QUFDdEUseUdBQW9IO0FBQ3BILHVFQUFzRTtBQUN0RSxpRUFBOEQ7QUFFOUQsaURBQTJDO0FBRTNDLE1BQWEsaUJBQWlCO0lBTTVCLFlBQVksR0FBRyxHQUFHLElBQUksMkNBQW9CLEVBQUU7UUFDMUMsSUFBSSxDQUFDLHFCQUFxQixHQUFHLElBQUksNkNBQXFCLENBQUMsR0FBRyxDQUFDLGlCQUFpQixFQUFFLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1FBQ3JHLElBQUksQ0FBQyxlQUFlLEdBQUcsSUFBSSxtQ0FBaUIsRUFBRSxDQUFDO0lBQ2pELENBQUM7SUFHTSxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQW9CO1FBQ3BDLElBQUksaUJBQWlCLEdBQUcsTUFBTSxJQUFJLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNqRSxJQUFJLGlCQUFpQixDQUFDLEtBQUssQ0FBQyxNQUFNLEtBQUssQ0FBQztZQUFFLE9BQU8sRUFBQyxTQUFTLEVBQUUsRUFBRSxFQUFDLENBQUM7UUFDakUsaUJBQWlCLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1FBQ3hELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUNyRCxNQUFNLFlBQVksR0FBRyxNQUFNLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDbkUsTUFBTSxRQUFRLEdBQUcsWUFBWSxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBR3pDLDhEQUE4RDtRQUM5RCxJQUFJLENBQUMsZUFBZSxDQUFDLGlCQUFpQixFQUFF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
|
|
@@ -27,17 +27,9 @@ function pomParser(fileContent, filePath) {
|
|
|
27
27
|
const artifactId = dependency.match(/<artifactId>([^<]*)<\/artifactId>/);
|
|
28
28
|
const name = artifactId ? artifactId[1] : '';
|
|
29
29
|
const versionReg = dependency.match(/<version>([^<]*)<\/version>/);
|
|
30
|
-
let version =
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
if (ver[1] === 'project.version') { // TODO: Add support for project.version
|
|
34
|
-
version = undefined;
|
|
35
|
-
}
|
|
36
|
-
else {
|
|
37
|
-
const res = fileContent.match(new RegExp(`<${ver[1]}>([^<]*)<\/${ver[1]}>`));
|
|
38
|
-
version = res.length >= 1 ? res[1] : '';
|
|
39
|
-
}
|
|
40
|
-
}
|
|
30
|
+
let version = null;
|
|
31
|
+
if (versionReg && versionReg.length > 0)
|
|
32
|
+
version = resolve_version(versionReg[1], fileContent);
|
|
41
33
|
let purlQualifiers;
|
|
42
34
|
const type = dependency.match(/<type>([^<]*)<\/type>/);
|
|
43
35
|
if (type) {
|
|
@@ -46,12 +38,136 @@ function pomParser(fileContent, filePath) {
|
|
|
46
38
|
}
|
|
47
39
|
// Extract scope.
|
|
48
40
|
const scopeRes = dependency.match(/<scope>([^<]*)<\/scope>/);
|
|
49
|
-
const scope = scopeRes ? scopeRes[1] :
|
|
41
|
+
const scope = scopeRes ? scopeRes[1] : null;
|
|
50
42
|
const purlString = new packageurl_js_1.PackageURL(PURL_TYPE, namespace, name, version, purlQualifiers, undefined).toString();
|
|
51
|
-
results.purls.push({ purl: purlString, scope
|
|
43
|
+
results.purls.push({ purl: purlString, scope });
|
|
52
44
|
});
|
|
53
45
|
}
|
|
54
46
|
return results;
|
|
55
47
|
}
|
|
56
48
|
exports.pomParser = pomParser;
|
|
57
|
-
|
|
49
|
+
function resolve_version(dependency_version, file_content) {
|
|
50
|
+
// See properties: https://maven.apache.org/pom.html#properties
|
|
51
|
+
let version = '';
|
|
52
|
+
if (dependency_version) {
|
|
53
|
+
if (/\${project.version}/.test(dependency_version)) {
|
|
54
|
+
version = extract_content_from_tag(file_content, ['project', 'version']);
|
|
55
|
+
}
|
|
56
|
+
else if (/\${.*?}/.test(dependency_version)) {
|
|
57
|
+
const property = dependency_version.match(/\${(.*?)}/)[1];
|
|
58
|
+
const result = file_content.match(new RegExp(`<${property}>([^<]*)<\/${property}>`));
|
|
59
|
+
if (result && result.length > 0)
|
|
60
|
+
version = result[1];
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
version = dependency_version.toString();
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
return version;
|
|
67
|
+
}
|
|
68
|
+
function get_start_tag_name(line) {
|
|
69
|
+
const result = line.match(/\<([\w\-\.]+).*?>/);
|
|
70
|
+
if (result)
|
|
71
|
+
return result[1].trim();
|
|
72
|
+
return '';
|
|
73
|
+
}
|
|
74
|
+
function get_end_tag_name(line) {
|
|
75
|
+
const result = line.match(/\<\/([\w\-\.]+) ?>/);
|
|
76
|
+
if (result)
|
|
77
|
+
return result[1].trim();
|
|
78
|
+
return '';
|
|
79
|
+
}
|
|
80
|
+
function get_end_tag(line) {
|
|
81
|
+
const result = get_end_tag_name(line);
|
|
82
|
+
if (result !== '')
|
|
83
|
+
return `</${result}>`;
|
|
84
|
+
return '';
|
|
85
|
+
}
|
|
86
|
+
function get_start_tag(line) {
|
|
87
|
+
const result = get_start_tag_name(line);
|
|
88
|
+
if (result !== '')
|
|
89
|
+
return `<${result}>`;
|
|
90
|
+
return '';
|
|
91
|
+
}
|
|
92
|
+
function element_match(openTag, closeTag) {
|
|
93
|
+
return get_start_tag_name(openTag) === get_end_tag_name(closeTag);
|
|
94
|
+
}
|
|
95
|
+
function is_element_complete(line) {
|
|
96
|
+
return get_start_tag_name(line) === get_end_tag_name(line);
|
|
97
|
+
}
|
|
98
|
+
function get_offset_until_end_of_tag(lines, end_tag_name) {
|
|
99
|
+
let i = 0;
|
|
100
|
+
for (const line of lines) {
|
|
101
|
+
if (get_end_tag_name(line) === end_tag_name)
|
|
102
|
+
break;
|
|
103
|
+
i += 1;
|
|
104
|
+
}
|
|
105
|
+
return i;
|
|
106
|
+
}
|
|
107
|
+
function remove_comments(lines) {
|
|
108
|
+
for (let i = 0; i < lines.length; i += 1) {
|
|
109
|
+
let openCommentFlag = /<!--/.test(lines[i]);
|
|
110
|
+
let endCommentFlag = /-->/.test(lines[i]);
|
|
111
|
+
if (openCommentFlag && endCommentFlag)
|
|
112
|
+
lines[i] = lines[i].replace(/<!--.*-->/, '');
|
|
113
|
+
else if (openCommentFlag) {
|
|
114
|
+
while (!/-->/.test(lines[i]) && i < lines.length) {
|
|
115
|
+
lines[i] = '';
|
|
116
|
+
i += 1;
|
|
117
|
+
}
|
|
118
|
+
lines[i] = lines[i].replace(/.*-->/, '');
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
return lines;
|
|
122
|
+
}
|
|
123
|
+
function extract_content_from_tag(file_content, selector) {
|
|
124
|
+
let lines = file_content.split('\n');
|
|
125
|
+
const stack = [];
|
|
126
|
+
let selectorIndex = 0;
|
|
127
|
+
let startTagName = '';
|
|
128
|
+
let endTagName = '';
|
|
129
|
+
let content = '';
|
|
130
|
+
// Sanitize xml: Removes comments
|
|
131
|
+
lines = remove_comments(lines);
|
|
132
|
+
for (let i = 0; i < lines.length; i += 1) {
|
|
133
|
+
let line = lines[i].trim();
|
|
134
|
+
if (line === '')
|
|
135
|
+
continue;
|
|
136
|
+
startTagName = get_start_tag_name(line);
|
|
137
|
+
endTagName = get_end_tag_name(line);
|
|
138
|
+
// Element complete in the same line and different than my selector
|
|
139
|
+
if (selector[selectorIndex] !== startTagName && is_element_complete(line))
|
|
140
|
+
continue;
|
|
141
|
+
// Element spans multiline and is different than my selector
|
|
142
|
+
// Loop until find corresponding end tag
|
|
143
|
+
if (selector[selectorIndex] !== startTagName) {
|
|
144
|
+
i += 1;
|
|
145
|
+
while (i < lines.length && !element_match(line, lines[i]))
|
|
146
|
+
i += 1;
|
|
147
|
+
continue;
|
|
148
|
+
}
|
|
149
|
+
// lines[i] points to the opening tag of the current selector[selectorIndex]
|
|
150
|
+
selectorIndex += 1;
|
|
151
|
+
stack.push(startTagName);
|
|
152
|
+
// Target reached
|
|
153
|
+
if (selector.length === stack.length) {
|
|
154
|
+
// Target has only one line
|
|
155
|
+
if (is_element_complete(line)) {
|
|
156
|
+
line = line.replace(get_end_tag(line), '');
|
|
157
|
+
line = line.replace(get_start_tag(line), '');
|
|
158
|
+
return line;
|
|
159
|
+
}
|
|
160
|
+
// Extracts everything beetwen opening and closing tag and return.
|
|
161
|
+
i += 1;
|
|
162
|
+
while (i < lines.length && !element_match(line, lines[i])) {
|
|
163
|
+
content += lines[i].trim();
|
|
164
|
+
i += 1;
|
|
165
|
+
}
|
|
166
|
+
return content;
|
|
167
|
+
}
|
|
168
|
+
startTagName = '';
|
|
169
|
+
endTagName = '';
|
|
170
|
+
}
|
|
171
|
+
return '';
|
|
172
|
+
}
|
|
173
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWF2ZW5QYXJzZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvbGliL2RlcGVuZGVuY2llcy9Mb2NhbERlcGVuZGVuY3kvcGFyc2Vycy9tYXZlblBhcnNlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxnREFBd0I7QUFDeEIsaURBQTJDO0FBRzNDLE1BQU0sU0FBUyxHQUFHLE9BQU8sQ0FBQztBQUUxQixnREFBZ0Q7QUFDaEQsOEZBQThGO0FBQzlGLDZGQUE2RjtBQUM3RixNQUFNLGFBQWEsR0FBRyxTQUFTLENBQUM7QUFDaEMsU0FBZ0IsU0FBUyxDQUFDLFdBQW1CLEVBQUUsUUFBZ0I7SUFFM0QscUVBQXFFO0lBQ3JFLE1BQU0sT0FBTyxHQUFxQixFQUFDLElBQUksRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBQyxDQUFDO0lBQzlELElBQUcsY0FBSSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxhQUFhO1FBQ3ZDLE9BQU8sT0FBTyxDQUFDO0lBRW5CLE1BQU0sWUFBWSxHQUFHLFdBQVcsQ0FBQyxLQUFLLENBQUMsMENBQTBDLENBQUMsQ0FBQztJQUNuRixJQUFHLFlBQVksRUFBRTtRQUVmLHlDQUF5QztRQUN6QyxZQUFZLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxFQUFFO1lBQ2hDLDJDQUEyQztZQUMzQyxNQUFNLE9BQU8sR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDLDZCQUE2QixDQUFDLENBQUM7WUFDaEUsTUFBTSxTQUFTLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUU1QywwQ0FBMEM7WUFDMUMsTUFBTSxVQUFVLEdBQUcsVUFBVSxDQUFDLEtBQUssQ0FBQyxtQ0FBbUMsQ0FBQyxDQUFDO1lBQ3pFLE1BQU0sSUFBSSxHQUFHLFVBQVUsQ0FBQyxDQUFDLENBQUMsVUFB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
|
|
@@ -38,7 +38,6 @@ export declare class Scanner extends EventEmitter {
|
|
|
38
38
|
errorHandler(error: any, origin: any): void;
|
|
39
39
|
createOutputFiles(): void;
|
|
40
40
|
appendOutputFiles(wfpContent: any, serverResponse: any): void;
|
|
41
|
-
scanFromWinnowingFile(wfpFilePath: string): Promise<void>;
|
|
42
41
|
scan(scannerInput: Array<ScannerInput>): Promise<void>;
|
|
43
42
|
private isValidInput;
|
|
44
43
|
getScannerId(): string;
|
|
@@ -215,20 +215,16 @@ class Scanner extends eventemitter3_1.default {
|
|
|
215
215
|
const newResultStr = JSON.stringify(storedResultObj);
|
|
216
216
|
fs_1.default.writeFileSync(this.resultFilePath, newResultStr);
|
|
217
217
|
}
|
|
218
|
-
scanFromWinnowingFile(wfpFilePath) {
|
|
219
|
-
this.init();
|
|
220
|
-
this.createOutputFiles();
|
|
221
|
-
return this.finishPromise;
|
|
222
|
-
}
|
|
223
218
|
scan(scannerInput) {
|
|
219
|
+
var _a;
|
|
224
220
|
this.init();
|
|
225
221
|
this.createOutputFiles();
|
|
226
222
|
this.scannerInput = scannerInput;
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
if (scannerInput[0].wfpPath) {
|
|
223
|
+
if (!this.isValidInput(scannerInput)) {
|
|
224
|
+
this.finishScan();
|
|
225
|
+
return this.finishPromise;
|
|
226
|
+
}
|
|
227
|
+
if ((_a = scannerInput[0]) === null || _a === void 0 ? void 0 : _a.wfpPath) {
|
|
232
228
|
this.wfpProvider = new WfpSplitter_1.WfpSplitter();
|
|
233
229
|
this.setWinnowerListeners();
|
|
234
230
|
this.wfpProvider.start({ wfpPath: scannerInput[0].wfpPath });
|
|
@@ -254,7 +250,7 @@ class Scanner extends eventemitter3_1.default {
|
|
|
254
250
|
this.reportLog('[ SCANNER ]: Input array is empty', 'warning');
|
|
255
251
|
return false;
|
|
256
252
|
}
|
|
257
|
-
if (scannerInput.some((input) => !input.fileList.length)) {
|
|
253
|
+
if (scannerInput.some((input) => !input.fileList.length && !input.wfpPath)) {
|
|
258
254
|
this.reportLog('[ SCANNER ]: Input array contains an element with no file list', 'warning');
|
|
259
255
|
return false;
|
|
260
256
|
}
|
|
@@ -276,4 +272,4 @@ class Scanner extends eventemitter3_1.default {
|
|
|
276
272
|
}
|
|
277
273
|
}
|
|
278
274
|
exports.Scanner = Scanner;
|
|
279
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Scanner.js","sourceRoot":"","sources":["../../../../src/lib/scanner/Scanner.ts"],"names":[],"mappings":"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"}
|
|
275
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Scanner.js","sourceRoot":"","sources":["../../../../src/lib/scanner/Scanner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { ScannerInput } from "../ScannerTypes";
|
|
2
|
+
import { WfpCalculator } from "./WfpCalculator/WfpCalculator";
|
|
3
|
+
import { WfpSplitter } from "./WfpSplitter/WfpSplitter";
|
|
4
|
+
export declare class WfpProviderFactory {
|
|
5
|
+
static create(scannerInput: ScannerInput): WfpCalculator | WfpSplitter;
|
|
6
|
+
}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.WfpProviderFactory = void 0;
|
|
4
|
+
const WfpCalculator_1 = require("./WfpCalculator/WfpCalculator");
|
|
5
|
+
const WfpSplitter_1 = require("./WfpSplitter/WfpSplitter");
|
|
6
|
+
class WfpProviderFactory {
|
|
7
|
+
static create(scannerInput) {
|
|
8
|
+
if (scannerInput.fileScan)
|
|
9
|
+
return new WfpCalculator_1.WfpCalculator();
|
|
10
|
+
if (scannerInput.wfpScan)
|
|
11
|
+
return new WfpSplitter_1.WfpSplitter();
|
|
12
|
+
return null;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
exports.WfpProviderFactory = WfpProviderFactory;
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV2ZwUHJvdmlkZXJGYWN0b3J5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL2xpYi9zY2FubmVyL1dmcFByb3ZpZGVyL1dmcFByb3ZpZGVyRmFjdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxpRUFBOEQ7QUFDOUQsMkRBQXdEO0FBRXhELE1BQWEsa0JBQWtCO0lBRTdCLE1BQU0sQ0FBQyxNQUFNLENBQUMsWUFBMEI7UUFDdEMsSUFBSSxZQUFZLENBQUMsUUFBUTtZQUFFLE9BQU8sSUFBSSw2QkFBYSxFQUFFLENBQUM7UUFDdEQsSUFBSSxZQUFZLENBQUMsT0FBTztZQUFFLE9BQU8sSUFBSSx5QkFBVyxFQUFFLENBQUM7UUFDbkQsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0NBSUY7QUFWRCxnREFVQyJ9
|
|
@@ -10,7 +10,7 @@ function CLIErrorHandler(e) {
|
|
|
10
10
|
}
|
|
11
11
|
async function main() {
|
|
12
12
|
program
|
|
13
|
-
.version("0.2.
|
|
13
|
+
.version("0.2.27")
|
|
14
14
|
.description('The SCANOSS JS package provides a simple, easy to consume module for interacting with SCANOSS APIs/Engine.');
|
|
15
15
|
program
|
|
16
16
|
.command('scan <source>')
|
|
@@ -32,7 +32,7 @@ async function main() {
|
|
|
32
32
|
$ scanoss-js scan -o scan-output.json <source-folder>`);
|
|
33
33
|
program
|
|
34
34
|
.command('dep <source>')
|
|
35
|
-
.description('Scan for dependencies
|
|
35
|
+
.description('Scan for dependencies')
|
|
36
36
|
.option('-o, --output <filename>', 'Output result file name (optional - default stdout)')
|
|
37
37
|
.option('-a, --grpc-host <host>', 'SCANOSS GRPC HOST (optional - default: scanoss.com)')
|
|
38
38
|
.option('-p, --grpc-port <port>', 'SCANOSS GRPC PORT (optional - default: 443)')
|
|
@@ -52,4 +52,4 @@ catch (e) {
|
|
|
52
52
|
console.error(e);
|
|
53
53
|
process.exit(1);
|
|
54
54
|
}
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLWJpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9iaW4vY2xpLWJpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNwQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDN0MsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDN0QsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRS9DLFNBQVMsZUFBZSxDQUFDLENBQVE7SUFDL0IsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNuQixPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2pCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDbEIsQ0FBQztBQUtELEtBQUssVUFBVSxJQUFJO0lBQ2pCLE9BQU87U0FDSixPQUFPLENBQUMsUUFBUSxDQUFDO1NBQ2pCLFdBQVcsQ0FBQyw0R0FBNEcsQ0FBQyxDQUFBO0lBRTVILE9BQU87U0FDSixPQUFPLENBQUMsZUFBZSxDQUFDO1NBQ3hCLFdBQVcsQ0FBQyxvQkFBb0IsQ0FBQztTQUNqQyxNQUFNLENBQUMsV0FBVyxFQUFFLHNDQUFzQyxDQUFDO1NBQzNELE1BQU0sQ0FBQyw0QkFBNEIsRUFBRSwrRUFBK0UsQ0FBQztTQUNySCxNQUFNLENBQUMscUJBQXFCLEVBQUUseUNBQXlDLENBQUM7U0FDeEUsTUFBTSxDQUFDLHlCQUF5QixFQUFFLHFEQUFxRCxDQUFDO1NBQ3hGLE1BQU0sQ0FBQyxxQkFBcUIsRUFBRSxtUkFBbVIsQ0FBQztTQUNsVCxNQUFNLENBQUMsNEJBQTRCLEVBQUUsaUZBQWlGLENBQUM7U0FDdkgsTUFBTSxDQUFDLHlCQUF5QixFQUFFLDJEQUEyRCxDQUFDO1NBQzlGLE1BQU0sQ0FBQyx5QkFBeUIsRUFBRSxvRUFBb0UsQ0FBQztTQUN2RyxNQUFNLENBQUMsdUJBQXVCLEVBQUUseUVBQXlFLENBQUM7U0FDMUcsTUFBTSxDQUFDLGlCQUFpQixFQUFFLHVFQUF1RSxDQUFDO1NBQ2xHLE1BQU0sQ0FBQyxlQUFlLEVBQUUsOEJBQThCLENBQUM7U0FDdkQsTUFBTSxDQUFDLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxFQUFFLEdBQUUsV0FBVyxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxHQUFFLGVBQWUsQ0FBQyxDQUFDLENBQUMsQ0FBQSxDQUFBLENBQUMsQ0FBQyxDQUFBLENBQUEsQ0FBQyxDQUFDO1NBQzlGLFdBQVcsQ0FBQyxPQUFPLEVBQUU7OzBEQUVnQyxDQUNyRCxDQUFDO0lBRUYsT0FBTztTQUNOLE9BQU8sQ0FBQyxjQUFjLENBQUM7U0FDdkIsV0FBVyxDQUFDLHVCQUF1QixDQUFDO1NBQ3BDLE1BQU0sQ0FBQyx5QkFBeUIsRUFBRSxxREFBcUQsQ0FBQztTQUN4RixNQUFNLENBQUMsd0JBQXdCLEVBQUUscURBQXFELENBQUM7U0FDdkYsTUFBTSxDQUFDLHdCQUF3QixFQUFFLDhDQUE4QyxDQUFDO1NBQ2hGLE1BQU0sQ0FBQyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsRUFBRSxHQUFFLFVBQVUsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsR0FBRSxlQUFlLENBQUMsQ0FBQyxDQUFDLENBQUEsQ0FBQSxDQUFDLENBQUMsQ0FBQSxDQUFBLENBQUMsQ0FBQyxDQUFBO0lBRTlGLE9BQU87U0FDTixPQUFPLENBQUMsc0JBQXNCLENBQUM7U0FDL0IsV0FBVyxDQUFDLDBDQUEwQyxDQUFDO1NBQ3ZELE1BQU0sQ0FBQyx5QkFBeUIsRUFBRSxxREFBcUQsQ0FBQztTQUN4RixNQUFNLENBQUMseUJBQXlCLEVBQUUseUVBQXlFLENBQUM7U0FDNUcsTUFBTSxDQUFDLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxFQUFFLEdBQUUsa0JBQWtCLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLEdBQUUsZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFBLENBQUEsQ0FBQyxDQUFDLENBQUEsQ0FBQSxDQUFDLENBQUMsQ0FBQTtJQUV0RyxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0FBQzNDLENBQUM7QUFHRCxJQUFJO0lBQ0YsSUFBSSxFQUFFLENBQUM7Q0FDUjtBQUFDLE9BQU8sQ0FBQyxFQUFFO0lBQ1YsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNqQixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0NBQ2pCIn0=
|