nx 14.3.5 → 14.4.0-beta.1

package/src/hasher/hasher.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Hasher = void 0;
+exports.expandNamedInput = exports.splitInputsIntoSelfAndDependencies = exports.Hasher = void 0;
 const tslib_1 = require("tslib");
-const workspaces_1 = require("../config/workspaces");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const minimatch = require("minimatch");
@@ -10,9 +9,10 @@ const path_1 = require("path");
 const perf_hooks_1 = require("perf_hooks");
 const typescript_1 = require("../utils/typescript");
 const workspace_root_1 = require("../utils/workspace-root");
-const file_utils_1 = require("../project-graph/file-utils");
 const hashing_impl_1 = require("./hashing-impl");
 const fileutils_1 = require("../utils/fileutils");
+const configuration_1 = require("../config/configuration");
+const path_2 = require("../utils/path");
 /**
  * The default hasher used by executors.
  */
@@ -29,27 +29,25 @@ class Hasher {
             // this is only used for testing
             this.hashing = hashing;
         }
-        this.projectHashes = new ProjectHasher(this.projectGraph, this.hashing, {
+        this.taskHasher = new TaskHasher(this.projectGraph, this.hashing, {
             selectivelyHashTsConfig: (_a = this.options.selectivelyHashTsConfig) !== null && _a !== void 0 ? _a : false,
         });
     }
-    hashTaskWithDepsAndContext(task, filter = 'all-files') {
+    hashTaskWithDepsAndContext(task) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const command = this.hashCommand(task);
             const values = (yield Promise.all([
-                this.projectHashes.hashProject(task.target.project, [task.target.project], filter),
+                this.taskHasher.hashTask(task, [task.target.project]),
                 this.implicitDepsHash(),
                 this.runtimeInputsHash(),
             ]));
             const value = this.hashing.hashArray([
                 Hasher.version,
-                command,
                 ...values.map((v) => v.value),
             ]);
             return {
                 value,
                 details: {
-                    command,
+                    command: values[0].command,
                     nodes: values[0].nodes,
                     implicitDeps: values[1].files,
                     runtime: values[2].runtime,
@@ -57,21 +55,6 @@ class Hasher {
             };
         });
     }
-    hashCommand(task) {
-        var _a, _b, _c;
-        const overrides = Object.assign({}, task.overrides);
-        delete overrides['__overrides_unparsed__'];
-        const sortedOverrides = {};
-        for (let k of Object.keys(overrides).sort()) {
-            sortedOverrides[k] = overrides[k];
-        }
-        return this.hashing.hashArray([
-            (_a = task.target.project) !== null && _a !== void 0 ? _a : '',
-            (_b = task.target.target) !== null && _b !== void 0 ? _b : '',
-            (_c = task.target.configuration) !== null && _c !== void 0 ? _c : '',
-            JSON.stringify(sortedOverrides),
-        ]);
-    }
     hashContext() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const values = (yield Promise.all([
@@ -84,9 +67,15 @@ class Hasher {
             };
         });
     }
+    hashCommand(task) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return (yield this.taskHasher.hashTask(task, [task.target.project]))
+                .command;
+        });
+    }
     hashSource(task) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this.projectHashes.hashProjectNodeSource(task.target.project, 'all-files');
+            return (yield this.taskHasher.hashTask(task, [task.target.project])).value;
         });
     }
     hashArray(values) {
@@ -151,6 +140,7 @@ class Hasher {
                 const fileNames = [
                     ...filesWithoutPatterns,
                     ...implicitDepsFromPatterns,
+                    'nx.json',
                     //TODO: vsavkin move the special cases into explicit ts support
                     'package-lock.json',
                     'yarn.lock',
@@ -174,7 +164,6 @@ class Hasher {
                         const hash = this.hashing.hashFile(file);
                         return { file, hash };
                     }),
-                    ...this.hashNxJson(),
                 ];
                 const combinedHash = this.hashing.hashArray(fileHashes.map((v) => v.hash));
                 perf_hooks_1.performance.mark('hasher:implicit deps hash:end');
@@ -187,147 +176,191 @@ class Hasher {
             return this.implicitDependencies;
         });
     }
-    hashNxJson() {
-        const nxJsonPath = (0, path_1.join)(workspace_root_1.workspaceRoot, 'nx.json');
-        if (!(0, fs_1.existsSync)(nxJsonPath)) {
-            return [];
-        }
-        let nxJsonContents = '{}';
-        try {
-            const nxJson = (0, fileutils_1.readJsonFile)(nxJsonPath);
-            delete nxJson.projects;
-            nxJsonContents = JSON.stringify(nxJson);
-        }
-        catch (_a) { }
-        return [
-            {
-                hash: this.hashing.hashArray([nxJsonContents]),
-                file: 'nx.json',
-            },
-        ];
-    }
 }
 exports.Hasher = Hasher;
-Hasher.version = '2.0';
-class ProjectHasher {
+Hasher.version = '3.0';
+const DEFAULT_INPUTS = [
+    {
+        projects: 'self',
+        fileset: 'default',
+    },
+    {
+        projects: 'dependencies',
+        input: 'default',
+    },
+];
+class TaskHasher {
     constructor(projectGraph, hashing, options) {
         this.projectGraph = projectGraph;
         this.hashing = hashing;
         this.options = options;
-        this.sourceHashes = {};
-        this.workspaceJson = this.readWorkspaceConfigFile((0, file_utils_1.workspaceFileName)());
-        this.nxJson = this.readNxJsonConfigFile('nx.json');
+        this.filesetHashes = {};
         this.tsConfigJson = this.readTsConfig();
+        this.nxJson = (0, configuration_1.readNxJson)();
     }
-    hashProject(projectName, visited, filter) {
+    hashTask(task, visited) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return Promise.resolve().then(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 var _a;
-                const deps = (_a = this.projectGraph.dependencies[projectName]) !== null && _a !== void 0 ? _a : [];
-                const depHashes = (yield Promise.all(deps.map((d) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                const projectNode = this.projectGraph.nodes[task.target.project];
+                if (!projectNode) {
+                    return this.hashExternalDependency(task);
+                }
+                const projectGraphDeps = (_a = this.projectGraph.dependencies[task.target.project]) !== null && _a !== void 0 ? _a : [];
+                const { selfInputs, depsInputs } = this.inputs(task, projectNode);
+                const self = yield this.hashSelfInputs(task, selfInputs);
+                const deps = yield this.hashDepsTasks(depsInputs, projectGraphDeps, visited);
+                const command = this.hashCommand(task);
+                const nodes = deps.reduce((m, c) => {
+                    return Object.assign(Object.assign({}, m), c.nodes);
+                }, {});
+                nodes[self.taskId] = self.value;
+                const value = this.hashing.hashArray([
+                    command,
+                    self.value,
+                    ...deps.map((d) => d.value),
+                ]);
+                return { value, command, nodes };
+            }));
+        });
+    }
+    hashDepsTasks(inputs, projectGraphDeps, visited) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return (yield Promise.all(inputs.map((input) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                return yield Promise.all(projectGraphDeps.map((d) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                     if (visited.indexOf(d.target) > -1) {
                         return null;
                     }
                     else {
                         visited.push(d.target);
-                        return yield this.hashProject(d.target, visited, filter);
+                        return yield this.hashTask({
+                            id: `${d.target}:$input:${input.input}`,
+                            target: {
+                                project: d.target,
+                                target: '$input',
+                                configuration: input.input,
+                            },
+                            overrides: {},
+                        }, visited);
                     }
-                })))).filter((r) => !!r);
-                const filterForProject = filter === 'all-files'
-                    ? 'all-files'
-                    : filter === 'exclude-tests-of-deps' && visited[0] === projectName
-                        ? 'all-files'
-                        : 'exclude-tests';
-                const projectHash = yield this.hashProjectNodeSource(projectName, filterForProject);
-                const nodes = depHashes.reduce((m, c) => {
-                    return Object.assign(Object.assign({}, m), c.nodes);
-                }, { [projectName]: projectHash });
-                const value = this.hashing.hashArray([
-                    ...depHashes.map((d) => d.value),
-                    projectHash,
-                ]);
-                return { value, nodes };
-            }));
+                })));
+            }))))
+                .flat()
+                .filter((r) => !!r);
         });
     }
-    hashProjectNodeSource(projectName, filter) {
+    hashSelfInputs(task, inputs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const mapKey = `${projectName}-${filter}`;
-            if (!this.sourceHashes[mapKey]) {
-                this.sourceHashes[mapKey] = new Promise((res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    var _a, _b;
-                    const p = this.projectGraph.nodes[projectName];
-                    if (!p) {
-                        const n = this.projectGraph.externalNodes[projectName];
-                        const version = (_a = n === null || n === void 0 ? void 0 : n.data) === null || _a === void 0 ? void 0 : _a.version;
-                        let hash;
-                        if (version) {
-                            hash = this.hashing.hashArray([version]);
-                        }
-                        else {
-                            // unknown dependency
-                            // this may occur if a file has a dependency to a npm package
-                            // which is not directly registestered in package.json
-                            // but only indirectly through dependencies of registered
-                            // npm packages
-                            // when it is at a later stage registered in package.json
-                            // the cache project graph will not know this module but
-                            // the new project graph will know it
-                            // The actual checksum added here is of no importance as
-                            // the version is unknown and may only change when some
-                            // other change occurs in package.json and/or package-lock.json
-                            hash = `__${projectName}__`;
-                        }
-                        res(hash);
-                        return;
-                    }
-                    const filteredFiles = filter === 'all-files'
-                        ? p.data.files
-                        : p.data.files.filter((f) => !this.isSpec(f.file));
+            return this.hashFilesetSource(task, inputs.map((r) => r.fileset));
+        });
+    }
+    inputs(task, projectNode) {
+        if (task.target.target === '$input') {
+            return {
+                depsInputs: [{ input: task.target.configuration }],
+                selfInputs: expandNamedInput(task.target.configuration, Object.assign(Object.assign({}, this.nxJson.namedInputs), projectNode.data.namedInputs)),
+            };
+        }
+        else {
+            const targetData = projectNode.data.targets[task.target.target];
+            const targetDefaults = this.nxJson.targetDefaults[task.target.target];
+            // task from TaskGraph can be added here
+            return splitInputsIntoSelfAndDependencies(targetData.inputs || (targetDefaults === null || targetDefaults === void 0 ? void 0 : targetDefaults.inputs) || DEFAULT_INPUTS, Object.assign(Object.assign({}, this.nxJson.namedInputs), projectNode.data.namedInputs));
+        }
+    }
+    hashExternalDependency(task) {
+        var _a;
+        const n = this.projectGraph.externalNodes[task.target.project];
+        const version = (_a = n === null || n === void 0 ? void 0 : n.data) === null || _a === void 0 ? void 0 : _a.version;
+        let hash;
+        if (version) {
+            hash = this.hashing.hashArray([version]);
+        }
+        else {
+            // unknown dependency
+            // this may occur if a file has a dependency to a npm package
+            // which is not directly registestered in package.json
+            // but only indirectly through dependencies of registered
+            // npm packages
+            // when it is at a later stage registered in package.json
+            // the cache project graph will not know this module but
+            // the new project graph will know it
+            // The actual checksum added here is of no importance as
+            // the version is unknown and may only change when some
+            // other change occurs in package.json and/or package-lock.json
+            hash = `__${task.target.project}__`;
+        }
+        return {
+            value: hash,
+            command: '',
+            nodes: {
+                [task.target.project]: version || hash,
+            },
+        };
+    }
+    hashCommand(task) {
+        var _a, _b, _c;
+        const overrides = Object.assign({}, task.overrides);
+        delete overrides['__overrides_unparsed__'];
+        const sortedOverrides = {};
+        for (let k of Object.keys(overrides).sort()) {
+            sortedOverrides[k] = overrides[k];
+        }
+        return this.hashing.hashArray([
+            (_a = task.target.project) !== null && _a !== void 0 ? _a : '',
+            (_b = task.target.target) !== null && _b !== void 0 ? _b : '',
+            (_c = task.target.configuration) !== null && _c !== void 0 ? _c : '',
+            JSON.stringify(sortedOverrides),
+        ]);
+    }
+    hashFilesetSource(task, filesetPatterns) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const mapKey = `${task.target.project}:$filesets`;
+            if (!this.filesetHashes[mapKey]) {
+                this.filesetHashes[mapKey] = new Promise((res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    const p = this.projectGraph.nodes[task.target.project];
+                    const filteredFiles = this.filterFiles(p.data.files, filesetPatterns);
                     const fileNames = filteredFiles.map((f) => f.file);
                     const values = filteredFiles.map((f) => f.hash);
-                    const workspaceJson = JSON.stringify((_b = this.workspaceJson.projects[projectName]) !== null && _b !== void 0 ? _b : '');
                     let tsConfig;
-                    if (this.options.selectivelyHashTsConfig) {
-                        tsConfig = this.removeOtherProjectsPathRecords(projectName);
-                    }
-                    else {
-                        tsConfig = JSON.stringify(this.tsConfigJson);
-                    }
-                    res(this.hashing.hashArray([
-                        ...fileNames,
-                        ...values,
-                        workspaceJson,
-                        tsConfig,
-                    ]));
+                    tsConfig = this.hashTsConfig(p);
+                    res({
+                        taskId: mapKey,
+                        value: this.hashing.hashArray([
+                            ...fileNames,
+                            ...values,
+                            JSON.stringify(Object.assign(Object.assign({}, p.data), { files: undefined })),
+                            tsConfig,
+                        ]),
+                    });
                 }));
             }
-            return this.sourceHashes[mapKey];
+            return this.filesetHashes[mapKey];
         });
     }
-    isSpec(file) {
-        return (file.endsWith('.spec.tsx') ||
-            file.endsWith('.test.tsx') ||
-            file.endsWith('-test.tsx') ||
-            file.endsWith('-spec.tsx') ||
-            file.endsWith('.spec.ts') ||
-            file.endsWith('.test.ts') ||
-            file.endsWith('-test.ts') ||
-            file.endsWith('-spec.ts') ||
-            file.endsWith('.spec.js') ||
-            file.endsWith('.test.js') ||
-            file.endsWith('-test.js') ||
-            file.endsWith('-spec.js'));
+    filterFiles(files, patterns) {
+        patterns = patterns.filter((p) => p !== 'default');
+        if (patterns.length === 0)
+            return files;
+        return files.filter((f) => !!patterns.find((pattern) => minimatch(f.file, pattern)));
     }
-    removeOtherProjectsPathRecords(projectName) {
-        var _a;
-        const _b = this.tsConfigJson.compilerOptions, { paths } = _b, compilerOptions = tslib_1.__rest(_b, ["paths"]);
-        const rootPath = this.workspaceJson.projects[projectName].root.split('/');
+    hashTsConfig(p) {
+        if (this.options.selectivelyHashTsConfig) {
+            return this.removeOtherProjectsPathRecords(p);
+        }
+        else {
+            return JSON.stringify(this.tsConfigJson);
+        }
+    }
+    removeOtherProjectsPathRecords(p) {
+        var _a, _b;
+        const _c = this.tsConfigJson.compilerOptions, { paths } = _c, compilerOptions = tslib_1.__rest(_c, ["paths"]);
+        const rootPath = p.data.root.split('/');
         rootPath.shift();
-        const pathAlias = `@${this.nxJson.npmScope}/${rootPath.join('/')}`;
+        const pathAlias = (0, path_2.getImportPath)((_a = this.nxJson) === null || _a === void 0 ? void 0 : _a.npmScope, rootPath.join('/'));
         return JSON.stringify({
             compilerOptions: Object.assign(Object.assign({}, compilerOptions), { paths: {
-                    [pathAlias]: (_a = paths[pathAlias]) !== null && _a !== void 0 ? _a : [],
+                    [pathAlias]: (_b = paths[pathAlias]) !== null && _b !== void 0 ? _b : [],
                 } }),
         });
     }
@@ -345,27 +378,62 @@ class ProjectHasher {
             };
         }
     }
-    readWorkspaceConfigFile(path) {
-        var _a;
-        try {
-            const res = (0, fileutils_1.readJsonFile)(path);
-            (_a = res.projects) !== null && _a !== void 0 ? _a : (res.projects = {});
-            return (0, workspaces_1.resolveNewFormatWithInlineProjects)(res);
+}
+function splitInputsIntoSelfAndDependencies(inputs, namedInputs) {
+    const depsInputs = [];
+    const selfInputs = [];
+    for (const d of inputs) {
+        if (typeof d === 'string') {
+            if (d.startsWith('^')) {
+                depsInputs.push({ input: d.substring(1) });
+            }
+            else {
+                selfInputs.push(d);
+            }
         }
-        catch (_b) {
-            return { projects: {}, version: 2 };
+        else {
+            if (d.projects === 'dependencies') {
+                depsInputs.push(d);
+            }
+            else {
+                selfInputs.push(d);
+            }
         }
     }
-    readNxJsonConfigFile(path) {
-        var _a;
-        try {
-            const res = (0, fileutils_1.readJsonFile)(path);
-            (_a = res.projects) !== null && _a !== void 0 ? _a : (res.projects = {});
-            return res;
+    return { depsInputs, selfInputs: expandSelfInputs(selfInputs, namedInputs) };
+}
+exports.splitInputsIntoSelfAndDependencies = splitInputsIntoSelfAndDependencies;
+function expandSelfInputs(inputs, namedInputs) {
+    const expanded = [];
+    for (const d of inputs) {
+        if (typeof d === 'string') {
+            if (d.startsWith('^'))
+                throw new Error(`namedInputs definitions cannot start with ^`);
+            if (namedInputs[d]) {
+                expanded.push(...expandNamedInput(d, namedInputs));
+            }
+            else {
+                expanded.push({ fileset: d });
+            }
         }
-        catch (_b) {
-            return {};
+        else {
+            if (d.fileset) {
+                expanded.push({ fileset: d.fileset });
+            }
+            else {
+                expanded.push(...expandNamedInput(d.input, namedInputs));
+            }
         }
     }
+    return expanded;
+}
+function expandNamedInput(input, namedInputs) {
+    if (input === 'default')
+        return [{ fileset: 'default' }];
+    namedInputs || (namedInputs = {});
+    if (!namedInputs[input])
+        throw new Error(`Input '${input}' is not defined`);
+    return expandSelfInputs(namedInputs[input], namedInputs);
 }
+exports.expandNamedInput = expandNamedInput;
 //# sourceMappingURL=hasher.js.map

package/src/hasher/hasher.js.map

@@ -1 +1 @@
-{"version":3,"file":"hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/hasher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/hasher.ts"],"names":[],"mappings":"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"}

package/src/project-graph/affected/affected-project-graph-models.d.ts

@@ -1,11 +1,12 @@
 import type { Change, FileChange } from '../file-utils';
 import { NxJsonConfiguration } from '../../config/nx-json';
-import { ProjectGraph } from '../../config/project-graph';
+import { ProjectGraph, ProjectGraphProjectNode } from '../../config/project-graph';
+import { ProjectConfiguration } from 'nx/src/config/workspace-json-project-json';
 export interface AffectedProjectGraphContext {
-    workspaceJson: any;
+    projectGraphNodes: Record<string, ProjectGraphProjectNode<ProjectConfiguration>>;
     nxJson: NxJsonConfiguration<string[]>;
     touchedProjects: string[];
 }
 export interface TouchedProjectLocator<T extends Change = Change> {
-    (fileChanges: FileChange<T>[], workspaceJson?: any, nxJson?: NxJsonConfiguration<string[]>, packageJson?: any, projectGraph?: ProjectGraph): string[];
+    (fileChanges: FileChange<T>[], projectGraphNodes?: Record<string, ProjectGraphProjectNode<ProjectConfiguration>>, nxJson?: NxJsonConfiguration<string[]>, packageJson?: any, projectGraph?: ProjectGraph): string[];
 }

package/src/project-graph/affected/affected-project-graph.d.ts

@@ -1,5 +1,5 @@
 import { FileChange } from '../file-utils';
 import { NxJsonConfiguration } from '../../config/nx-json';
 import { ProjectGraph } from '../../config/project-graph';
-import { ProjectsConfigurations } from '../../config/workspace-json-project-json';
-export declare function filterAffected(graph: ProjectGraph, touchedFiles: FileChange[], workspaceJson?: ProjectsConfigurations, nxJson?: NxJsonConfiguration, packageJson?: any): ProjectGraph;
+import { ProjectConfiguration } from '../../config/workspace-json-project-json';
+export declare function filterAffected(graph: ProjectGraph<ProjectConfiguration>, touchedFiles: FileChange[], nxJson?: NxJsonConfiguration, packageJson?: any): ProjectGraph;

package/src/project-graph/affected/affected-project-graph.js

@@ -10,8 +10,8 @@ const workspace_json_changes_1 = require("./locators/workspace-json-changes");
 const tsconfig_json_changes_1 = require("./locators/tsconfig-json-changes");
 const operators_1 = require("../operators");
 const configuration_1 = require("../../config/configuration");
-function filterAffected(graph, touchedFiles, workspaceJson = (0, configuration_1.readAllWorkspaceConfiguration)(), nxJson = (0, configuration_1.readNxJson)(), packageJson = (0, file_utils_1.readPackageJson)()) {
-    const normalizedNxJson = (0, normalize_nx_json_1.normalizeNxJson)(nxJson, Object.keys(workspaceJson.projects));
+function filterAffected(graph, touchedFiles, nxJson = (0, configuration_1.readNxJson)(), packageJson = (0, file_utils_1.readPackageJson)()) {
+    const normalizedNxJson = (0, normalize_nx_json_1.normalizeNxJson)(nxJson, Object.keys(graph.nodes));
     // Additional affected logic should be in this array.
     const touchedProjectLocators = [
         workspace_projects_1.getTouchedProjects,
@@ -22,10 +22,10 @@ function filterAffected(graph, touchedFiles, workspaceJson = (0, configuration_1
         tsconfig_json_changes_1.getTouchedProjectsFromTsConfig,
     ];
     const touchedProjects = touchedProjectLocators.reduce((acc, f) => {
-        return acc.concat(f(touchedFiles, workspaceJson, normalizedNxJson, packageJson, graph));
+        return acc.concat(f(touchedFiles, graph.nodes, normalizedNxJson, packageJson, graph));
     }, []);
     return filterAffectedProjects(graph, {
-        workspaceJson,
+        projectGraphNodes: graph.nodes,
         nxJson: normalizedNxJson,
         touchedProjects,
     });

package/src/project-graph/affected/affected-project-graph.js.map

@@ -1 +1 @@
-{"version":3,"file":"affected-project-graph.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/affected/affected-project-graph.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"affected-project-graph.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/affected/affected-project-graph.ts"],"names":[],"mappings":";;;AAAA,8CAA4D;AAC5D,sEAGuC;AACvC,0DAAgE;AAChE,4EAA6F;AAK7F,4DAAuD;AACvD,8EAAsF;AACtF,4EAAkF;AAGlF,4CAAuC;AAEvC,8DAAwD;AAExD,SAAgB,cAAc,CAC5B,KAAyC,EACzC,YAA0B,EAC1B,SAA8B,IAAA,0BAAU,GAAE,EAC1C,cAAmB,IAAA,4BAAe,GAAE;IAEpC,MAAM,gBAAgB,GAAG,IAAA,mCAAe,EAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3E,qDAAqD;IACrD,MAAM,sBAAsB,GAA4B;QACtD,uCAAkB;QAClB,iDAA4B;QAC5B,oCAAqB;QACrB,iEAAyC;QACzC,0DAAiC;QACjC,sDAA8B;KAC/B,CAAC;IACF,MAAM,eAAe,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QAC/D,OAAO,GAAG,CAAC,MAAM,CACf,CAAC,CAAC,YAAY,EAAE,KAAK,CAAC,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,KAAK,CAAC,CACnE,CAAC;IACJ,CAAC,EAAE,EAAc,CAAC,CAAC;IAEnB,OAAO,sBAAsB,CAAC,KAAK,EAAE;QACnC,iBAAiB,EAAE,KAAK,CAAC,KAAK;QAC9B,MAAM,EAAE,gBAAgB;QACxB,eAAe;KAChB,CAAC,CAAC;AACL,CAAC;AA3BD,wCA2BC;AAED,gFAAgF;AAEhF,SAAS,sBAAsB,CAC7B,KAAmB,EACnB,GAAgC;IAEhC,MAAM,MAAM,GAAiB;QAC3B,KAAK,EAAE,EAAE;QACT,aAAa,EAAE,EAAE;QACjB,YAAY,EAAE,EAAE;KACjB,CAAC;IACF,MAAM,QAAQ,GAAG,IAAA,mBAAO,EAAC,KAAK,CAAC,CAAC;IAChC,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAChC,gBAAgB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IACH,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAChC,uBAAuB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,gBAAgB,CACvB,eAAuB,EACvB,QAAsB,EACtB,MAAoB,EACpB,OAAiB;;IAEjB,IAAI,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAAE,OAAO;IAClD,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IACrD,MAAM,oBAAoB,GAAG,QAAQ,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;IACrE,IAAI,CAAC,YAAY,IAAI,CAAC,oBAAoB,EAAE;QAC1C,MAAM,IAAI,KAAK,CAAC,sCAAsC,eAAe,GAAG,CAAC,CAAC;KAC3E;IACD,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC9B,IAAI,YAAY,EAAE;QAChB,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,YAAY,CAAC;QAC7C,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC;KAC3C;SAAM;QACL,MAAM,CAAC,aAAa,CAAC,eAAe,CAAC,GAAG,oBAAoB,CAAC;KAC9D;IACD,MAAA,QAAQ,CAAC,YAAY,CAAC,eAAe,CAAC,0CAAE,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAC7D,gBAAgB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CACpD,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAC9B,eAAuB,EACvB,QAAsB,EACtB,MAAoB,EACpB,OAAiB;IAEjB,IAAI,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAAE,OAAO;IAClD,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC9B,IAAI,QAAQ,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE;QAC1C,QAAQ,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAC5D,uBAAuB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAC3D,CAAC;QACF,QAAQ,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,OAAO,CAC5C,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;YAC3B,wCAAwC;YACxC,oDAAoD;YACpD,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE;gBAChC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;aAClC;YACD,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;gBAC/B,IAAI;gBACJ,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;aACf,CAAC,CAAC;QACL,CAAC,CACF,CAAC;KACH;AACH,CAAC"}