scanoss 0.37.0 → 0.38.1

package/build/main/sdk/Dependencies/LocalDependency/parsers/buildGradleParser.js

@@ -5,22 +5,52 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildGradleParser = buildGradleParser;
 const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
 const packageurl_js_1 = require("packageurl-js");
-const MANIFEST_FILE = 'build.gradle';
+const libsVersionsTomlParser_1 = require("./gradle/libsVersionsTomlParser");
+const MANIFEST_FILES = ['build.gradle', 'build.gradle.kts'];
+// Per-project cache of parsed version catalog (libs.versions.toml) entries.
+// Outer key: project root directory path where gradle/libs.versions.toml was found
+// Inner map: normalized alias (e.g. "androidx.activity.compose") → resolved Maven coordinates
+// Example: { "/home/user/my-project" → { "hilt.android" → { purl: "pkg:maven/com.google.dagger/hilt-android", version: "2.59" } } }
+const catalogCache = new Map();
 const depBlockRex = /dependencies\s*{\s*(?<dependencies>(.|\n)*?)}/gm;
-var GRADLE_STATES;
-(function (GRADLE_STATES) {
-    GRADLE_STATES[GRADLE_STATES["WALKING"] = 0] = "WALKING";
-    GRADLE_STATES[GRADLE_STATES["SINGLELINE_DEPENDENCY"] = 1] = "SINGLELINE_DEPENDENCY";
-    GRADLE_STATES[GRADLE_STATES["MULTILINE_DEPENDENCY"] = 2] = "MULTILINE_DEPENDENCY";
-})(GRADLE_STATES || (GRADLE_STATES = {}));
-async function buildGradleParser(fileContent, filePath) {
+function resolveCatalogAlias(line, catalogMap) {
+    const match = line.match(/\blibs\.([a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)\b/);
+    if (match)
+        return catalogMap.get(match[1]);
+}
+function findCatalogMap(gradleFilePath, basePath) {
+    let dir = path_1.default.dirname(path_1.default.resolve(gradleFilePath));
+    const root = path_1.default.parse(dir).root;
+    // Stop at basePath (scan root) to avoid searching outside the project scope.
+    // Falls back to filesystem root when basePath is not provided.
+    const boundary = basePath ? path_1.default.resolve(basePath) : root;
+    while (true) {
+        if (catalogCache.has(dir))
+            return catalogCache.get(dir);
+        const tomlPath = path_1.default.join(dir, 'gradle', 'libs.versions.toml');
+        if (fs_1.default.existsSync(tomlPath)) {
+            const content = fs_1.default.readFileSync(tomlPath, 'utf8');
+            const map = (0, libsVersionsTomlParser_1.buildCatalogAliasMap)(content);
+            catalogCache.set(dir, map);
+            return map;
+        }
+        if (dir === boundary || dir === root)
+            break;
+        dir = path_1.default.dirname(dir);
+    }
+    return new Map();
+}
+async function buildGradleParser(fileContent, filePath, basePath) {
     var _a;
     // If the file is not a manifest file, return an empty results
     const results = { file: filePath, purls: [] };
-    if (path_1.default.basename(filePath) != MANIFEST_FILE)
+    if (!MANIFEST_FILES.includes(path_1.default.basename(filePath)))
         return results;
+    const catalogMap = findCatalogMap(filePath, basePath);
     //For each dependency block, generate purls
+    depBlockRex.lastIndex = 0;
     let gradle;
     while ((gradle = depBlockRex.exec(fileContent)) !== null) {
         let depBlock = (_a = gradle === null || gradle === void 0 ? void 0 : gradle.groups) === null || _a === void 0 ? void 0 : _a.dependencies;
@@ -34,8 +64,8 @@ async function buildGradleParser(fileContent, filePath) {
             if (line == '')
                 continue;
             current_config_name = getConfigNameFromLine(line);
-            //Multiline dependency
-            if (current_config_name && line.includes("(")) {
+            //Multiline dependency (only if line has '(' but not ')' on the same line)
+            if (current_config_name && line.includes("(") && !line.includes(")")) {
                 while (i < lines.length && !lines[i].includes(")")) {
                     const componentData = createPurlNameFromLine(lines[i]);
                     if (componentData != null) {
@@ -45,6 +75,12 @@ async function buildGradleParser(fileContent, filePath) {
                             scope: current_config_name
                         });
                     }
+                    else {
+                        const entry = resolveCatalogAlias(lines[i], catalogMap);
+                        if (entry) {
+                            results.purls.push({ purl: entry.purl, requirement: entry.version, scope: current_config_name });
+                        }
+                    }
                     i++;
                 }
                 current_config_name = '';
@@ -52,6 +88,11 @@ async function buildGradleParser(fileContent, filePath) {
             else { //Single line dependency
                 const componentData = createPurlNameFromLine(line);
                 if (componentData == null) {
+                    // Try resolving via catalog alias
+                    const entry = resolveCatalogAlias(line, catalogMap);
+                    if (entry) {
+                        results.purls.push({ purl: entry.purl, requirement: entry.version, scope: current_config_name });
+                    }
                     current_config_name = '';
                     continue;
                 }
@@ -63,13 +104,13 @@ async function buildGradleParser(fileContent, filePath) {
 }
 function getConfigNameFromLine(line) {
     let configName = "";
-    const dep = line.split(/\s/);
+    const dep = line.split(/[\s(]/);
     if (dep.length)
-        configName = dep[0].replace("(", "").trim();
+        configName = dep[0].trim();
     return configName;
 }
 function createPurlNameFromLine(line) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f;
     let namespace = undefined;
     let name = undefined;
     let version = undefined;
@@ -81,9 +122,9 @@ function createPurlNameFromLine(line) {
         version = dep.groups.version;
     }
     else if (line.includes("group") && line.includes("name") && line.includes("version")) {
-        version = line.match(/version:\s+['"](?<version>[\w\.\-\d]+)['"]/).groups.version;
-        name = (_a = line.match(/name:\s+['"](?<name>[\w\.\-\d]+)['"]/).groups) === null || _a === void 0 ? void 0 : _a.name;
-        namespace = (_b = line.match(/group:\s+['"](?<group>[\w\.\-\d]+)['"]/).groups) === null || _b === void 0 ? void 0 : _b.group;
+        version = (_b = (_a = line.match(/version\s*[:=]\s*['"](?<version>[\w\.\-\d]+)['"]/)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.version;
+        name = (_d = (_c = line.match(/name\s*[:=]\s*['"](?<name>[\w\.\-\d]+)['"]/)) === null || _c === void 0 ? void 0 : _c.groups) === null || _d === void 0 ? void 0 : _d.name;
+        namespace = (_f = (_e = line.match(/group\s*[:=]\s*['"](?<group>[\w\.\-\d]+)['"]/)) === null || _e === void 0 ? void 0 : _e.groups) === null || _f === void 0 ? void 0 : _f.group;
     }
     let purlName = "";
     if (name && namespace) {
@@ -92,4 +133,4 @@ function createPurlNameFromLine(line) {
     }
     return null;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRHcmFkbGVQYXJzZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvc2RrL0RlcGVuZGVuY2llcy9Mb2NhbERlcGVuZGVuY3kvcGFyc2Vycy9idWlsZEdyYWRsZVBhcnNlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQWFBLDhDQTBEQztBQXRFRCxnREFBd0I7QUFDeEIsaURBQTJDO0FBRzNDLE1BQU0sYUFBYSxHQUFHLGNBQWMsQ0FBQztBQUNyQyxNQUFNLFdBQVcsR0FBRyxpREFBaUQsQ0FBQztBQUV0RSxJQUFLLGFBSUo7QUFKRCxXQUFLLGFBQWE7SUFDaEIsdURBQU8sQ0FBQTtJQUNQLG1GQUFxQixDQUFBO0lBQ3JCLGlGQUFvQixDQUFBO0FBQ3RCLENBQUMsRUFKSSxhQUFhLEtBQWIsYUFBYSxRQUlqQjtBQUNNLEtBQUssVUFBVSxpQkFBaUIsQ0FBQyxXQUFtQixFQUFFLFFBQWdCOztJQUczRSw4REFBOEQ7SUFDOUQsTUFBTSxPQUFPLEdBQXFCLEVBQUMsSUFBSSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFDLENBQUM7SUFDOUQsSUFBRyxjQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxJQUFJLGFBQWE7UUFDekMsT0FBTyxPQUFPLENBQUM7SUFFakIsMkNBQTJDO0lBQzNDLElBQUksTUFBTSxDQUFDO0lBQ1gsT0FBTyxDQUFDLE1BQU0sR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDLEtBQUssSUFBSSxFQUFFLENBQUM7UUFDekQsSUFBSSxRQUFRLEdBQUcsTUFBQSxNQUFNLGFBQU4sTUFBTSx1QkFBTixNQUFNLENBQUUsTUFBTSwwQ0FBRSxZQUFZLENBQUM7UUFHNUMsSUFBSSxtQkFBbUIsR0FBRyxFQUFFLENBQUMsQ0FBRyxvQ0FBb0M7UUFDcEUsSUFBSSxLQUFLLEdBQUcsUUFBUSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQVcsQ0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRHcmFkbGVQYXJzZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvc2RrL0RlcGVuZGVuY2llcy9Mb2NhbERlcGVuZGVuY3kvcGFyc2Vycy9idWlsZEdyYWRsZVBhcnNlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQTZDQSw4Q0F1RUM7QUFuSEQsZ0RBQXdCO0FBQ3hCLDRDQUFvQjtBQUNwQixpREFBMkM7QUFDM0MsNEVBQXNGO0FBR3RGLE1BQU0sY0FBYyxHQUFHLENBQUMsY0FBYyxFQUFFLGtCQUFrQixDQUFDLENBQUM7QUFDNUQsNEVBQTRFO0FBQzVFLG1GQUFtRjtBQUNuRiw4RkFBOEY7QUFDOUYsb0lBQW9JO0FBQ3BJLE1BQU0sWUFBWSxHQUFHLElBQUksR0FBRyxFQUFzQyxDQUFDO0FBQ25FLE1BQU0sV0FBVyxHQUFHLGlEQUFpRCxDQUFDO0FBR3RFLFNBQVMsbUJBQW1CLENBQUMsSUFBWSxFQUFFLFVBQXNDO0lBQy9FLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsNkNBQTZDLENBQUMsQ0FBQztJQUN4RSxJQUFJLEtBQUs7UUFBRSxPQUFPLFVBQVUsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDN0MsQ0FBQztBQUVELFNBQVMsY0FBYyxDQUFDLGNBQXNCLEVBQUUsUUFBaUI7SUFDL0QsSUFBSSxHQUFHLEdBQUcsY0FBSSxDQUFDLE9BQU8sQ0FBQyxjQUFJLENBQUMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUM7SUFDckQsTUFBTSxJQUFJLEdBQUcsY0FBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7SUFDbEMsNkVBQTZFO0lBQzdFLCtEQUErRDtJQUMvRCxNQUFNLFFBQVEsR0FBRyxRQUFRLENBQUMsQ0FBQyxDQUFDLGNBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUMs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

package/build/main/sdk/Dependencies/LocalDependency/parsers/gradle/libsVersionsTomlParser.d.ts

@@ -0,0 +1,27 @@
+import { ILocalDependency } from '../../DependencyTypes';
+export interface ICatalogEntry {
+    purl: string;
+    version?: string;
+}
+/**
+ * Normalizes a TOML alias key to match Gradle accessor notation.
+ * Replaces dashes and underscores with dots: "hilt-android" → "hilt.android"
+ */
+export declare function normalizeCatalogAlias(alias: string): string;
+/**
+ * Builds a map from normalized catalog alias to resolved Maven coordinates.
+ * Keys use dot-separated notation matching Kotlin DSL accessors (e.g., "hilt.android").
+ */
+export declare function buildCatalogAliasMap(fileContent: string): Map<string, ICatalogEntry>;
+/**
+ * Parses a Gradle Version Catalog TOML file (libs.versions.toml) and extracts
+ * Maven dependency coordinates as PURLs.
+ *
+ * Supports:
+ * - module + version.ref: `lib = { module = "group:artifact", version.ref = "key" }`
+ * - module + inline version: `lib = { module = "group:artifact", version = "1.0" }`
+ * - group/name form: `lib = { group = "g", name = "n", version.ref = "key" }`
+ * - simple string: `lib = "group:artifact:version"`
+ * - no version (BOM-managed): `lib = { module = "group:artifact" }`
+ */
+export declare function libsVersionsTomlParser(fileContent: string, filePath: string): Promise<ILocalDependency>;

package/build/main/sdk/Dependencies/LocalDependency/parsers/gradle/libsVersionsTomlParser.js

@@ -0,0 +1,207 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeCatalogAlias = normalizeCatalogAlias;
+exports.buildCatalogAliasMap = buildCatalogAliasMap;
+exports.libsVersionsTomlParser = libsVersionsTomlParser;
+const path_1 = __importDefault(require("path"));
+const packageurl_js_1 = require("packageurl-js");
+/**
+ * Known limitations:
+ * - Rich versions in [versions] (e.g. { strictly = "[4.0, 5.0[", prefer = "4.12.0" }) are not parsed.
+ *   Only simple key = "value" entries are supported.
+ * - The version catalog is expected at gradle/libs.versions.toml (Gradle default convention).
+ *   Custom catalog paths configured via settings.gradle.kts versionCatalogs block are not detected.
+ * - settings.gradle.kts is not parsed. Plugin declarations and catalog configuration in settings are ignored.
+ * - Multi-line library entries are not supported. Each library must be declared on a single line.
+ *   e.g. `hilt-android = { module = "...", version.ref = "hilt" }` works, but splitting it
+ *   across multiple lines does not.
+ */
+const MANIFEST_FILE = 'libs.versions.toml';
+// --- Exported functions ---
+/**
+ * Normalizes a TOML alias key to match Gradle accessor notation.
+ * Replaces dashes and underscores with dots: "hilt-android" → "hilt.android"
+ */
+function normalizeCatalogAlias(alias) {
+    return alias.replace(/[-_]/g, '.');
+}
+/**
+ * Builds a map from normalized catalog alias to resolved Maven coordinates.
+ * Keys use dot-separated notation matching Kotlin DSL accessors (e.g., "hilt.android").
+ */
+function buildCatalogAliasMap(fileContent) {
+    const map = new Map();
+    const versions = parseVersionsSection(fileContent);
+    const libraries = parseLibrariesSection(fileContent, versions);
+    for (const lib of libraries) {
+        if (lib.namespace && lib.name) {
+            const aliasKey = normalizeCatalogAlias(lib.alias);
+            const purlObj = new packageurl_js_1.PackageURL('maven', lib.namespace, lib.name, undefined, undefined, undefined);
+            map.set(aliasKey, { purl: purlObj.toString(), version: lib.version });
+        }
+    }
+    return map;
+}
+/**
+ * Parses a Gradle Version Catalog TOML file (libs.versions.toml) and extracts
+ * Maven dependency coordinates as PURLs.
+ *
+ * Supports:
+ * - module + version.ref: `lib = { module = "group:artifact", version.ref = "key" }`
+ * - module + inline version: `lib = { module = "group:artifact", version = "1.0" }`
+ * - group/name form: `lib = { group = "g", name = "n", version.ref = "key" }`
+ * - simple string: `lib = "group:artifact:version"`
+ * - no version (BOM-managed): `lib = { module = "group:artifact" }`
+ */
+async function libsVersionsTomlParser(fileContent, filePath) {
+    const results = { file: filePath, purls: [] };
+    if (path_1.default.basename(filePath) !== MANIFEST_FILE)
+        return results;
+    const versions = parseVersionsSection(fileContent);
+    const libraries = parseLibrariesSection(fileContent, versions);
+    for (const lib of libraries) {
+        if (lib.namespace && lib.name) {
+            const purlObj = new packageurl_js_1.PackageURL('maven', lib.namespace, lib.name, undefined, undefined, undefined);
+            results.purls.push({ purl: purlObj.toString(), ...(lib.version && { requirement: lib.version }) });
+        }
+    }
+    return results;
+}
+// --- Private helpers ---
+/**
+ * Extracts the content of a TOML section by header name.
+ * Returns the text between `[sectionName]` and the next `[` header (or end of file).
+ */
+function extractSection(fileContent, sectionName) {
+    const regex = new RegExp(`^\\[${sectionName}\\]\\s*$`, 'm');
+    const match = regex.exec(fileContent);
+    if (!match)
+        return null;
+    const start = match.index + match[0].length;
+    const nextSection = fileContent.indexOf('\n[', start);
+    return nextSection === -1
+        ? fileContent.substring(start)
+        : fileContent.substring(start, nextSection);
+}
+/**
+ * Parses the [versions] section into a map of key -> version string.
+ *
+ * Example input:
+ *   [versions]
+ *   hilt = "2.51.1"
+ *   kotlin = "2.0.0"
+ *
+ * Returns: Map { "hilt" → "2.51.1", "kotlin" → "2.0.0" }
+ */
+function parseVersionsSection(fileContent) {
+    const versions = new Map();
+    const section = extractSection(fileContent, 'versions');
+    if (!section)
+        return versions;
+    for (const line of section.split(/\r?\n/)) {
+        const trimmed = line.trim();
+        if (!trimmed || trimmed.startsWith('#'))
+            continue;
+        // Match: key = "value" or key = 'value'
+        const match = trimmed.match(/^([\w-]+)\s*=\s*["']([^"']+)["']/);
+        if (match) {
+            versions.set(match[1], match[2]);
+        }
+    }
+    return versions;
+}
+/**
+ * Parses the [libraries] section and resolves version references.
+ *
+ * Example input:
+ *   [libraries]
+ *   hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
+ *   simple = "com.example:simple:1.0.0"
+ *
+ * Returns: [
+ *   { alias: "hilt-android", namespace: "com.google.dagger", name: "hilt-android", version: "2.51.1" },
+ *   { alias: "simple", namespace: "com.example", name: "simple", version: "1.0.0" }
+ * ]
+ */
+function parseLibrariesSection(fileContent, versions) {
+    const libraries = [];
+    const section = extractSection(fileContent, 'libraries');
+    if (!section)
+        return libraries;
+    for (const line of section.split(/\r?\n/)) {
+        const trimmed = line.trim();
+        if (!trimmed || trimmed.startsWith('#'))
+            continue;
+        // Match the key = value pattern
+        const kvMatch = trimmed.match(/^([\w-]+)\s*=\s*(.*)/);
+        if (!kvMatch)
+            continue;
+        const value = kvMatch[2].trim();
+        const entry = parseLibraryValue(value, versions);
+        if (entry)
+            libraries.push({ alias: kvMatch[1], ...entry });
+    }
+    return libraries;
+}
+/**
+ * Parses a single library value from the TOML file.
+ */
+function parseLibraryValue(value, versions) {
+    // Simple string notation: "group:artifact:version"
+    const stringMatch = value.match(/^["']([^"']+)["']/);
+    if (stringMatch) {
+        const strContent = stringMatch[1];
+        const parts = strContent.split(':');
+        if (parts.length >= 2) {
+            return {
+                namespace: parts[0],
+                name: parts[1],
+                ...(parts[2] && { version: parts[2] }),
+            };
+        }
+        return null;
+    }
+    // Inline table notation: { ... }
+    if (value.startsWith('{')) {
+        let namespace;
+        let name;
+        let version;
+        // Check for module = "group:artifact"
+        const moduleMatch = value.match(/module\s*=\s*["']([^"']+)["']/);
+        if (moduleMatch) {
+            const parts = moduleMatch[1].split(':');
+            if (parts.length >= 2) {
+                namespace = parts[0];
+                name = parts[1];
+            }
+        }
+        else {
+            // Check for group = "...", name = "..."
+            const groupMatch = value.match(/group\s*=\s*["']([^"']+)["']/);
+            const nameMatch = value.match(/name\s*=\s*["']([^"']+)["']/);
+            if (groupMatch)
+                namespace = groupMatch[1];
+            if (nameMatch)
+                name = nameMatch[1];
+        }
+        // Resolve version: version.ref = "key" or version = "value"
+        const versionRefMatch = value.match(/version\.ref\s*=\s*["']([^"']+)["']/);
+        if (versionRefMatch) {
+            version = versions.get(versionRefMatch[1]);
+        }
+        else {
+            const versionMatch = value.match(/(?<![.\w])version\s*=\s*["']([^"']+)["']/);
+            if (versionMatch) {
+                version = versionMatch[1];
+            }
+        }
+        if (namespace && name) {
+            return { namespace, name, ...(version && { version }) };
+        }
+    }
+    return null;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlic1ZlcnNpb25zVG9tbFBhcnNlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvRGVwZW5kZW5jaWVzL0xvY2FsRGVwZW5kZW5jeS9wYXJzZXJzL2dyYWRsZS9saWJzVmVyc2lvbnNUb21sUGFyc2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBdUNBLHNEQUVDO0FBTUQsb0RBY0M7QUFhRCx3REFnQkM7QUF6RkQsZ0RBQXdCO0FBQ3hCLGlEQUEyQztBQUUzQzs7Ozs7Ozs7OztHQVVHO0FBRUgsTUFBTSxhQUFhLEdBQUcsb0JBQW9CLENBQUM7QUFpQjNDLDZCQUE2QjtBQUU3Qjs7O0dBR0c7QUFDSCxTQUFnQixxQkFBcUIsQ0FBQyxLQUFhO0lBQ2pELE9BQU8sS0FBSyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsR0FBRyxDQUFDLENBQUM7QUFDckMsQ0FBQztBQUVEOzs7R0FHRztBQUNILFNBQWdCLG9CQUFvQixDQUFDLFdBQW1CO0lBQ3RELE1BQU0sR0FBRyxHQUFHLElBQUksR0FBRyxFQUF5QixDQUFDO0lBQzdDLE1BQU0sUUFBUSxHQUFHLG9CQUFvQixDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ25ELE1BQU0sU0FBUyxHQUFHLHFCQUFxQixDQUFDLFdBQVcsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUUvRCxLQUFLLE1BQU0sR0FBRyxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQzVCLElBQUksR0FBRyxDQUFDLFNBQVMsSUFBSSxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDOUIsTUFBTSxRQUFRLEdBQUcscUJBQXFCLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ2xELE1BQU0sT0FBTyxHQUFHLElBQUksMEJBQVUsQ0FBQyxPQUFPLEVBQUUsR0FBRyxDQUFDLFNBQVMsRUFBRSxHQUFHLENBQUMsSUFBSSxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQUUsU0FBUyxDQUFD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