@gitkraken/core-gitlens 0.1.0

package/dist/git-cli/providers/contributors.js

@@ -0,0 +1,350 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
+    if (value !== null && value !== void 0) {
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+        var dispose, inner;
+        if (async) {
+            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+            dispose = value[Symbol.asyncDispose];
+        }
+        if (dispose === void 0) {
+            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+            dispose = value[Symbol.dispose];
+            if (async) inner = dispose;
+        }
+        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+        if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
+        env.stack.push({ value: value, dispose: dispose, async: async });
+    }
+    else if (async) {
+        env.stack.push({ async: true });
+    }
+    return value;
+};
+var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
+    return function (env) {
+        function fail(e) {
+            env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+            env.hasError = true;
+        }
+        var r, s = 0;
+        function next() {
+            while (r = env.stack.pop()) {
+                try {
+                    if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+                    if (r.dispose) {
+                        var result = r.dispose.call(r.value);
+                        if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                    }
+                    else s |= 1;
+                }
+                catch (e) {
+                    fail(e);
+                }
+            }
+            if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
+            if (env.hasError) throw env.error;
+        }
+        return next();
+    };
+})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+});
+import { GitContributor } from '../../git/models/contributor.js';
+import { calculateContributionScore } from '../../git/utils/contributor.utils.js';
+import { isUncommittedStaged } from '../../git/utils/revision.utils.js';
+import { isUserMatch } from '../../git/utils/user.utils.js';
+import { CancellationError, isCancellationError } from '../../utils/cancellation.js';
+import { debug } from '../../utils/decorators/log.js';
+import { createDisposable } from '../../utils/disposable.js';
+import { getScopedLogger } from '../../utils/logger.scoped.js';
+import { gitConfigsLog } from '../exec/git.js';
+import { getContributorsLogParser } from '../parsers/logParser.js';
+import { parseShortlog } from '../parsers/shortlogParser.js';
+export class ContributorsGitSubProvider {
+    _context;
+    git;
+    cache;
+    provider;
+    constructor(_context, git, cache, provider) {
+        this._context = _context;
+        this.git = git;
+        this.cache = cache;
+        this.provider = provider;
+    }
+    async getContributors(repoPath, rev, options, cancellation, timeout) {
+        if (!repoPath)
+            return { contributors: [] };
+        const scope = getScopedLogger();
+        const getCore = async (commonPath, cacheable, signal) => {
+            // Prefer the aggregate signal from the cache; fall back to the caller's cancellation.
+            signal ??= cancellation;
+            const contributors = new Map();
+            try {
+                const env_1 = { stack: [], error: void 0, hasError: false };
+                try {
+                    const currentUser = await this.provider.config.getCurrentUser(repoPath);
+                    if (signal?.aborted)
+                        throw new CancellationError();
+                    const parser = getContributorsLogParser(options?.stats);
+                    const args = [...parser.arguments, '--use-mailmap'];
+                    const merges = options?.merges ?? true;
+                    if (merges) {
+                        args.push(merges === 'first-parent' ? '--first-parent' : '--no-min-parents');
+                    }
+                    else {
+                        args.push('--no-merges');
+                    }
+                    if (options?.all) {
+                        args.push('--all', '--single-worktree');
+                    }
+                    if (options?.since) {
+                        args.push(`--since="${options.since}"`);
+                    }
+                    if (rev && !isUncommittedStaged(rev)) {
+                        args.push(rev);
+                    }
+                    if (options?.pathspec) {
+                        args.push('--', options.pathspec);
+                    }
+                    else {
+                        args.push('--');
+                    }
+                    const timeoutSignal = timeout ? AbortSignal.timeout(timeout) : undefined;
+                    const combinedSignal = signal && timeoutSignal ? AbortSignal.any([signal, timeoutSignal]) : (signal ?? timeoutSignal);
+                    const stream = this.git.stream({ cwd: repoPath, cancellation: combinedSignal, configs: gitConfigsLog }, 'log', ...args);
+                    const _streamDisposer = __addDisposableResource(env_1, createDisposable(() => void stream.return?.(undefined)), false);
+                    for await (const c of parser.parseAsync(stream)) {
+                        if (combinedSignal?.aborted) {
+                            cacheable?.invalidate();
+                            break;
+                        }
+                        const key = `${c.author}|${c.email}`;
+                        const timestamp = Number(c.date) * 1000;
+                        const date = new Date(timestamp);
+                        let contributor = contributors.get(key);
+                        if (contributor == null) {
+                            contributor = new GitContributor(commonPath, c.author, c.email, isUserMatch(currentUser, c.author, c.email), 1, [
+                                {
+                                    sha: c.sha,
+                                    date: date,
+                                    message: c.message,
+                                    files: c.stats?.files,
+                                    additions: c.stats?.additions,
+                                    deletions: c.stats?.deletions,
+                                },
+                            ], date, date, c.stats
+                                ? { ...c.stats, contributionScore: calculateContributionScore(c.stats, timestamp) }
+                                : undefined);
+                            contributors.set(key, contributor);
+                        }
+                        else {
+                            contributor.contributionCount++;
+                            if (date > contributor.latestCommitDate) {
+                                contributor.latestCommitDate = date;
+                            }
+                            if (date < contributor.firstCommitDate) {
+                                contributor.firstCommitDate = date;
+                            }
+                            contributor.contributions ??= [];
+                            contributor.contributions.push({
+                                sha: c.sha,
+                                date: date,
+                                message: c.message,
+                                files: c.stats?.files,
+                                additions: c.stats?.additions,
+                                deletions: c.stats?.deletions,
+                            });
+                            if (options?.stats && c.stats != null) {
+                                if (contributor.stats == null) {
+                                    contributor.stats = {
+                                        ...c.stats,
+                                        contributionScore: calculateContributionScore(c.stats, timestamp),
+                                    };
+                                }
+                                else {
+                                    contributor.stats = {
+                                        additions: contributor.stats.additions + c.stats.additions,
+                                        deletions: contributor.stats.deletions + c.stats.deletions,
+                                        files: contributor.stats.files + c.stats.files,
+                                        contributionScore: contributor.stats.contributionScore +
+                                            calculateContributionScore(c.stats, timestamp),
+                                    };
+                                }
+                            }
+                        }
+                    }
+                    return {
+                        contributors: [...contributors.values()],
+                        cancelled: timeoutSignal?.aborted
+                            ? { reason: 'timedout' }
+                            : signal?.aborted
+                                ? { reason: 'cancelled' }
+                                : undefined,
+                    };
+                }
+                catch (e_1) {
+                    env_1.error = e_1;
+                    env_1.hasError = true;
+                }
+                finally {
+                    __disposeResources(env_1);
+                }
+            }
+            catch (ex) {
+                cacheable?.invalidate();
+                scope?.error(ex);
+                if (!isCancellationError(ex))
+                    return { contributors: [] };
+                return { contributors: [...contributors.values()], cancelled: { reason: 'cancelled' } };
+            }
+        };
+        let customCacheTTL;
+        let cacheKey = rev ?? '';
+        if (options?.all) {
+            cacheKey += ':all';
+        }
+        if (options?.pathspec) {
+            cacheKey += `:pathspec=${options.pathspec}`;
+            customCacheTTL = 1000 * 60 * 5; // 5 minutes
+        }
+        if (options?.merges) {
+            cacheKey += `:merges=${String(options.merges)}`;
+        }
+        if (options?.since) {
+            cacheKey += `:since=${options.since}`;
+            customCacheTTL = 1000 * 60 * 5; // 5 minutes
+        }
+        if (options?.stats) {
+            cacheKey += ':stats';
+        }
+        if (timeout) {
+            cacheKey += `:timeout=${String(timeout)}`;
+            customCacheTTL = timeout * 2;
+        }
+        return this.cache.getContributors(repoPath, cacheKey, getCore, {
+            ...(customCacheTTL ? { accessTTL: customCacheTTL } : undefined),
+            cancellation: cancellation,
+        });
+    }
+    getContributorsLite(repoPath, rev, options, cancellation) {
+        if (!repoPath)
+            return Promise.resolve([]);
+        const scope = getScopedLogger();
+        if (!rev || isUncommittedStaged(rev)) {
+            rev = undefined;
+            options = { ...options, all: true };
+        }
+        const getCore = async (commonPath, cacheable, signal) => {
+            // Prefer the aggregate signal from the cache; fall back to the caller's cancellation.
+            signal ??= cancellation;
+            try {
+                // eventually support `--group=author --group=trailer:co-authored-by`
+                const args = ['shortlog', '-s', '-e', '-n'];
+                if (options?.all) {
+                    args.push('--all');
+                }
+                const merges = options?.merges ?? true;
+                if (merges) {
+                    args.push(merges === 'first-parent' ? '--first-parent' : '--no-min-parents');
+                }
+                else {
+                    args.push('--no-merges');
+                }
+                if (options?.since) {
+                    args.push(`--since=${options.since}`);
+                }
+                if (rev) {
+                    args.push(rev);
+                }
+                const currentUserPromise = this.provider.config.getCurrentUser(repoPath).catch(() => undefined);
+                const result = await this.git.exec({ cwd: repoPath, cancellation: signal }, ...args);
+                if (!result.stdout)
+                    return [];
+                const shortlog = parseShortlog(result.stdout, commonPath, await currentUserPromise);
+                return shortlog.contributors;
+            }
+            catch (ex) {
+                cacheable?.invalidate();
+                scope?.error(ex);
+                return [];
+            }
+        };
+        let customCacheTTL;
+        let cacheKey = `lite${rev ? `:${rev}` : ''}`;
+        if (options?.merges) {
+            cacheKey += `:merges=${String(options.merges)}`;
+        }
+        if (options?.since) {
+            cacheKey += `:since=${options.since}`;
+            customCacheTTL = 1000 * 60 * 5; // 5 minutes
+        }
+        return this.cache.getContributorsLite(repoPath, cacheKey, getCore, {
+            ...(customCacheTTL ? { accessTTL: customCacheTTL } : undefined),
+            cancellation: cancellation,
+        });
+    }
+    getContributorsStats(repoPath, options, cancellation, timeout) {
+        if (!repoPath)
+            return Promise.resolve(undefined);
+        const scope = getScopedLogger();
+        const getCore = async (commonPath) => {
+            try {
+                const args = ['shortlog', '-s', '--all'];
+                const merges = options?.merges ?? true;
+                if (merges) {
+                    args.push(merges === 'first-parent' ? '--first-parent' : '--no-min-parents');
+                }
+                else {
+                    args.push('--no-merges');
+                }
+                if (options?.since) {
+                    args.push(`--since=${options.since}`);
+                }
+                const result = await this.git.exec({ cwd: commonPath, cancellation: cancellation, timeout: timeout }, ...args);
+                if (!result.stdout)
+                    return undefined;
+                const contributions = result.stdout
+                    .split('\n')
+                    .map(line => parseInt(line.trim().split('\t', 1)[0], 10))
+                    .filter(c => !isNaN(c))
+                    .sort((a, b) => b - a);
+                return { count: contributions.length, contributions: contributions };
+            }
+            catch (ex) {
+                scope?.error(ex);
+                return undefined;
+            }
+        };
+        let customCacheTTL;
+        let cacheKey = 'stats';
+        if (options?.merges) {
+            cacheKey += `:merges=${String(options.merges)}`;
+        }
+        if (options?.since) {
+            cacheKey += `:since=${options.since}`;
+            customCacheTTL = 1000 * 60 * 5; // 5 minutes
+        }
+        if (timeout) {
+            cacheKey += `:timeout=${String(timeout)}`;
+            customCacheTTL = timeout * 2;
+        }
+        return this.cache.getContributorsStats(repoPath, cacheKey, getCore, customCacheTTL ? { accessTTL: customCacheTTL } : undefined);
+    }
+}
+__decorate([
+    debug()
+], ContributorsGitSubProvider.prototype, "getContributors", null);
+__decorate([
+    debug()
+], ContributorsGitSubProvider.prototype, "getContributorsLite", null);
+__decorate([
+    debug()
+], ContributorsGitSubProvider.prototype, "getContributorsStats", null);
+//# sourceMappingURL=contributors.js.map

package/dist/git-cli/providers/contributors.js.map

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

package/dist/git-cli/providers/diff.d.ts

@@ -0,0 +1,99 @@
+import type { Cache } from '../../git/cache.js';
+import type { GitServiceContext } from '../../git/context.js';
+import type { GitDiff, GitDiffFiles, GitDiffFilter, GitDiffShortStat, ParsedGitDiff, ParsedGitDiffHunks } from '../../git/models/diff.js';
+import type { GitFile } from '../../git/models/file.js';
+import type { GitRevisionRange, GitRevisionRangeNotation } from '../../git/models/revision.js';
+import type { GitDiffSubProvider, NextComparisonUrisResult, PreviousComparisonUrisResult, PreviousRangeComparisonUrisResult } from '../../git/providers/diff.js';
+import type { DisposableTemporaryGitIndex } from '../../git/providers/staging.js';
+import type { DiffRange } from '../../git/providers/types.js';
+import type { Uri } from '../../utils/uri.js';
+import type { CliGitProviderInternal } from '../cliGitProvider.js';
+import type { GitResult } from '../exec/exec.types.js';
+import type { Git } from '../exec/git.js';
+import type { LogParsedFile } from '../parsers/logParser.js';
+export declare class DiffGitSubProvider implements GitDiffSubProvider {
+    private readonly context;
+    private readonly git;
+    private readonly cache;
+    private readonly provider;
+    constructor(context: GitServiceContext, git: Git, cache: Cache, provider: CliGitProviderInternal);
+    getChangedFilesCount(repoPath: string, to?: string, from?: string, options?: {
+        uris?: (string | Uri)[];
+    }, _cancellation?: AbortSignal): Promise<GitDiffShortStat | undefined>;
+    getDiff(repoPath: string, to: string, from?: string, options?: {
+        context?: number;
+        index?: DisposableTemporaryGitIndex;
+        notation?: GitRevisionRangeNotation;
+        uris?: (string | Uri)[];
+    }, _cancellation?: AbortSignal): Promise<GitDiff | undefined>;
+    getParsedDiff(repoPath: string, to: string, from?: string, options?: {
+        context?: number;
+        notation?: GitRevisionRangeNotation;
+        uris?: (string | Uri)[];
+    }, cancellation?: AbortSignal): Promise<ParsedGitDiff | undefined>;
+    getDiffFiles(repoPath: string, contents: string, _cancellation?: AbortSignal): Promise<GitDiffFiles | undefined>;
+    getDiffStatus(repoPath: string, ref1OrRange: string | GitRevisionRange, ref2?: string, options?: {
+        filters?: GitDiffFilter[];
+        path?: string;
+        renameLimit?: number;
+        similarityThreshold?: number;
+    }): Promise<GitFile[] | undefined>;
+    getDiffTool(repoPath?: string): Promise<string | undefined>;
+    getNextComparisonUris(repoPath: string, pathOrUri: string | Uri, rev: string | undefined, skip?: number, options?: {
+        ordering?: 'date' | 'author-date' | 'topo' | null;
+    }, _cancellation?: AbortSignal): Promise<NextComparisonUrisResult | undefined>;
+    getPreviousComparisonUris(repoPath: string, pathOrUri: string | Uri, rev: string | undefined, skip?: number, unsaved?: boolean, options?: {
+        ordering?: 'date' | 'author-date' | 'topo' | null;
+    }, _cancellation?: AbortSignal): Promise<PreviousComparisonUrisResult | undefined>;
+    getPreviousComparisonUrisForRange(repoPath: string, pathOrUri: string | Uri, rev: string | undefined, range: DiffRange, options?: {
+        ordering?: 'date' | 'author-date' | 'topo' | null;
+        skipFirstRev?: boolean;
+    }, _cancellation?: AbortSignal): Promise<PreviousRangeComparisonUrisResult | undefined>;
+    /** Returns raw diff output for a file between two revisions. */
+    diff(repoPath: string, fileName: string, ref1?: string, ref2?: string, options?: {
+        encoding?: string;
+        filters?: GitDiffFilter[];
+        linesOfContext?: number;
+        renames?: boolean;
+        similarityThreshold?: number | null;
+    }): Promise<GitResult>;
+    /** Returns raw diff output comparing a file's revision with given contents via stdin. */
+    diffContents(repoPath: string, fileName: string, ref: string, contents: string, options?: {
+        encoding?: string;
+        filters?: GitDiffFilter[];
+        similarityThreshold?: number | null;
+    }): Promise<string>;
+    /** Returns parsed diff hunks for a file between two revisions. */
+    getDiffForFile(repoPath: string, fileName: string, ref1: string | undefined, ref2?: string, options?: {
+        encoding?: string;
+    }): Promise<ParsedGitDiffHunks | undefined>;
+    private getDiffForFileCore;
+    /** Returns parsed diff hunks comparing a file's revision with given contents via stdin. */
+    getDiffForFileContents(repoPath: string, fileName: string, ref: string, contents: string, options?: {
+        encoding?: string;
+    }): Promise<ParsedGitDiffHunks | undefined>;
+    private getDiffForFileContentsCore;
+    /** Finds the most recent commit where the given path was copied, renamed, or deleted. */
+    findPathStatusChanged(repoPath: string, pathspec: string, rev: string | undefined, options?: {
+        filters?: GitDiffFilter[];
+        ordering?: 'date' | 'author-date' | 'topo' | null;
+    }): Promise<{
+        sha: string;
+        file: LogParsedFile | undefined;
+    } | undefined>;
+    openDiffTool(repoPath: string, pathOrUri: string | Uri, options?: {
+        ref1?: string;
+        ref2?: string;
+        staged?: boolean;
+        tool?: string;
+    }): Promise<void>;
+    openDirectoryCompare(repoPath: string, ref1: string, ref2?: string, tool?: string): Promise<void>;
+}
+export declare function findPathStatusChanged(git: Git, repoPath: string, pathspec: string, rev: string | undefined, options?: {
+    filters?: GitDiffFilter[];
+    ordering?: 'date' | 'author-date' | 'topo' | null;
+}): Promise<{
+    sha: string;
+    file: LogParsedFile | undefined;
+} | undefined>;
+//# sourceMappingURL=diff.d.ts.map

package/dist/git-cli/providers/diff.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../src/providers/diff.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EACX,OAAO,EACP,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,aAAa,EACb,kBAAkB,EAClB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AASlG,OAAO,KAAK,EACX,kBAAkB,EAClB,wBAAwB,EACxB,4BAA4B,EAC5B,iCAAiC,EACjC,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,KAAK,EAAE,SAAS,EAAe,MAAM,iCAAiC,CAAC;AAa9E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAG7D,qBAAa,kBAAmB,YAAW,kBAAkB;IAE3D,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAHR,OAAO,EAAE,iBAAiB,EAC1B,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,sBAAsB;IAI5C,oBAAoB,CACzB,QAAQ,EAAE,MAAM,EAChB,EAAE,CAAC,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,GAAG,CAAC,EAAE,CAAA;KAAE,EACrC,aAAa,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAsClC,OAAO,CACZ,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,MAAM,EACV,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,CAAC,EAAE;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,2BAA2B,CAAC;QACpC,QAAQ,CAAC,EAAE,wBAAwB,CAAC;QACpC,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,GAAG,CAAC,EAAE,CAAC;KACxB,EACD,aAAa,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAuCzB,aAAa,CAClB,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,MAAM,EACV,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,CAAC,EAAE;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,QAAQ,CAAC,EAAE,wBAAwB,CAAC;QACpC,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,GAAG,CAAC,EAAE,CAAC;KACxB,EACD,YAAY,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAQ/B,YAAY,CACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,aAAa,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAkB9B,aAAa,CAClB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAAG,gBAAgB,EACtC,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,mBAAmB,CAAC,EAAE,MAAM,CAAA;KAAE,GACxG,OAAO,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC;IA8B3B,WAAW,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAQ3D,qBAAqB,CAC1B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAAG,GAAG,EACvB,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,IAAI,GAAE,MAAU,EAChB,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,EAC/D,aAAa,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,wBAAwB,GAAG,SAAS,CAAC;IAqI1C,yBAAyB,CAC9B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAAG,GAAG,EACvB,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,IAAI,GAAE,MAAU,EAChB,OAAO,CAAC,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,EAC/D,aAAa,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,4BAA4B,GAAG,SAAS,CAAC;IA2L9C,iCAAiC,CACtC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAAG,GAAG,EACvB,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,KAAK,EAAE,SAAS,EAChB,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,MAAM,GAAG,IAAI,CAAC;QAAC,YAAY,CAAC,EAAE,OAAO,CAAA;KAAE,EACvF,aAAa,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,iCAAiC,GAAG,SAAS,CAAC;IAkJzD,gEAAgE;IAC1D,IAAI,CACT,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,CAAC,EAAE;QACT,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;QAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACpC,GACC,OAAO,CAAC,SAAS,CAAC;IAgDrB,yFAAyF;IACnF,YAAY,CACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;QAAC,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAC7F,OAAO,CAAC,MAAM,CAAC;IAiDlB,kEAAkE;IAElE,cAAc,CACb,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAC7B,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;YAU5B,kBAAkB;IAmBhC,2FAA2F;IAE3F,sBAAsB,CACrB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAC7B,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;YAU5B,0BAA0B;IAexC,yFAAyF;IAEnF,qBAAqB,CAC1B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,GACxF,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,aAAa,GAAG,SAAS,CAAA;KAAE,GAAG,SAAS,CAAC;IAKlE,YAAY,CACjB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAAG,GAAG,EACvB,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GACzE,OAAO,CAAC,IAAI,CAAC;IAyCV,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BvG;AA4DD,wBAAsB,qBAAqB,CAC1C,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,MAAM,GAAG,IAAI,CAAA;CAAE,GACxF,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,aAAa,GAAG,SAAS,CAAA;CAAE,GAAG,SAAS,CAAC,CAuBvE"}