@fern-api/replay 0.6.0 → 0.6.1

package/dist/ReplayService.js

@@ -1,596 +0,0 @@
-import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-import { minimatch } from "minimatch";
-import { GitClient } from "./git/GitClient.js";
-import { LockfileManager } from "./LockfileManager.js";
-import { ReplayApplicator } from "./ReplayApplicator.js";
-import { ReplayCommitter } from "./ReplayCommitter.js";
-import { ReplayDetector } from "./ReplayDetector.js";
-export class ReplayService {
-    git;
-    detector;
-    applicator;
-    committer;
-    lockManager;
-    outputDir;
-    constructor(outputDir, _config) {
-        const git = new GitClient(outputDir);
-        this.git = git;
-        this.outputDir = outputDir;
-        this.lockManager = new LockfileManager(outputDir);
-        this.detector = new ReplayDetector(git, this.lockManager, outputDir);
-        this.applicator = new ReplayApplicator(git, this.lockManager, outputDir);
-        this.committer = new ReplayCommitter(git, outputDir);
-    }
-    async runReplay(options) {
-        if (options?.skipApplication) {
-            return this.handleSkipApplication(options);
-        }
-        const flow = this.determineFlow();
-        switch (flow) {
-            case "first-generation":
-                return this.handleFirstGeneration(options);
-            case "no-patches":
-                return this.handleNoPatchesRegeneration(options);
-            case "normal-regeneration":
-                return this.handleNormalRegeneration(options);
-        }
-    }
-    /**
-     * Sync the lockfile after a divergent PR was squash-merged.
-     * Call this BEFORE runReplay() when the CLI detects a merged divergent PR.
-     *
-     * After updating the generation record, re-detects customer patches via
-     * tree diff between the generation tag (pure generation tree) and HEAD
-     * (which includes customer customizations after squash merge). This ensures
-     * patches survive the squash merge → regenerate cycle even when the lockfile
-     * was restored from the base branch during conflict PR creation.
-     */
-    async syncFromDivergentMerge(generationCommitSha, options) {
-        const treeHash = await this.git.getTreeHash(generationCommitSha);
-        const timestamp = (await this.git.exec(["log", "-1", "--format=%aI", generationCommitSha])).trim();
-        const record = {
-            commit_sha: generationCommitSha,
-            tree_hash: treeHash,
-            timestamp,
-            cli_version: options?.cliVersion ?? "unknown",
-            generator_versions: options?.generatorVersions ?? {},
-            base_branch_head: options?.baseBranchHead
-        };
-        if (!this.lockManager.exists()) {
-            this.lockManager.initializeInMemory(record);
-        }
-        else {
-            this.lockManager.read();
-            this.lockManager.addGeneration(record);
-            this.lockManager.clearPatches();
-        }
-        this.lockManager.save();
-        // Re-detect customer patches via tree diff. The generation tag has the
-        // pure generation tree, so any differences between it and HEAD represent
-        // customer customizations that survived the squash merge.
-        try {
-            const redetectedPatches = await this.detector.detectNewPatches();
-            if (redetectedPatches.length > 0) {
-                for (const patch of redetectedPatches) {
-                    this.lockManager.addPatch(patch);
-                }
-                this.lockManager.save();
-            }
-        }
-        catch {
-            // If re-detection fails, proceed without patches.
-            // The normal replay flow will still attempt detection.
-        }
-    }
-    determineFlow() {
-        if (!this.lockManager.exists()) {
-            return "first-generation";
-        }
-        const lock = this.lockManager.read();
-        if (lock.patches.length === 0) {
-            return "no-patches";
-        }
-        return "normal-regeneration";
-    }
-    async handleFirstGeneration(options) {
-        if (options?.dryRun) {
-            return {
-                flow: "first-generation",
-                patchesDetected: 0,
-                patchesApplied: 0,
-                patchesWithConflicts: 0,
-                patchesSkipped: 0,
-                conflicts: []
-            };
-        }
-        const commitOpts = options
-            ? {
-                cliVersion: options.cliVersion ?? "unknown",
-                generatorVersions: options.generatorVersions ?? {},
-                baseBranchHead: options.baseBranchHead
-            }
-            : undefined;
-        await this.committer.commitGeneration("Initial SDK generation", commitOpts);
-        const genRecord = await this.committer.createGenerationRecord(commitOpts);
-        this.lockManager.initialize(genRecord);
-        return {
-            flow: "first-generation",
-            patchesDetected: 0,
-            patchesApplied: 0,
-            patchesWithConflicts: 0,
-            patchesSkipped: 0,
-            conflicts: []
-        };
-    }
-    /**
-     * Skip-application mode: commit the generation and update the lockfile
-     * but don't detect or apply patches. Sets a marker so the next normal
-     * run skips revert detection in preGenerationRebase().
-     */
-    async handleSkipApplication(options) {
-        const commitOpts = options
-            ? {
-                cliVersion: options.cliVersion ?? "unknown",
-                generatorVersions: options.generatorVersions ?? {},
-                baseBranchHead: options.baseBranchHead
-            }
-            : undefined;
-        await this.committer.commitGeneration("Update SDK (replay skipped)", commitOpts);
-        const genRecord = await this.committer.createGenerationRecord(commitOpts);
-        if (this.lockManager.exists()) {
-            this.lockManager.read();
-            this.lockManager.addGeneration(genRecord);
-        }
-        else {
-            this.lockManager.initializeInMemory(genRecord);
-        }
-        this.lockManager.setReplaySkippedAt(new Date().toISOString());
-        this.lockManager.save();
-        // Commit the lockfile update so it's pushed with the branch.
-        // Without this, the marker and generation record stay in the
-        // working tree and are lost when GithubStep pushes.
-        if (!options?.stageOnly) {
-            await this.committer.commitReplay(0);
-        }
-        else {
-            await this.committer.stageAll();
-        }
-        return {
-            flow: "skip-application",
-            patchesDetected: 0,
-            patchesApplied: 0,
-            patchesWithConflicts: 0,
-            patchesSkipped: 0,
-            conflicts: []
-        };
-    }
-    async handleNoPatchesRegeneration(options) {
-        const newPatches = await this.detector.detectNewPatches();
-        const warnings = [...this.detector.warnings];
-        if (options?.dryRun) {
-            return {
-                flow: "no-patches",
-                patchesDetected: newPatches.length,
-                patchesApplied: 0,
-                patchesWithConflicts: 0,
-                patchesSkipped: 0,
-                conflicts: [],
-                wouldApply: newPatches,
-                warnings: warnings.length > 0 ? warnings : undefined
-            };
-        }
-        const commitOpts = options
-            ? {
-                cliVersion: options.cliVersion ?? "unknown",
-                generatorVersions: options.generatorVersions ?? {},
-                baseBranchHead: options.baseBranchHead
-            }
-            : undefined;
-        await this.committer.commitGeneration("Update SDK", commitOpts);
-        const genRecord = await this.committer.createGenerationRecord(commitOpts);
-        // Add generation to lockfile BEFORE applying patches so the applicator
-        // can read the current generation's tree hash for rename detection.
-        this.lockManager.addGeneration(genRecord);
-        let results = [];
-        if (newPatches.length > 0) {
-            results = await this.applicator.applyPatches(newPatches);
-        }
-        // Rebase cleanly applied patches to the current generation.
-        // This prevents recurring conflicts on subsequent regenerations.
-        const rebaseCounts = await this.rebasePatches(results, genRecord.commit_sha);
-        // Save lockfile BEFORE commit — lockfile is source of truth.
-        for (const patch of newPatches) {
-            if (!rebaseCounts.absorbedPatchIds.has(patch.id)) {
-                this.lockManager.addPatch(patch);
-            }
-        }
-        this.lockManager.save();
-        if (newPatches.length > 0) {
-            if (!options?.stageOnly) {
-                const appliedCount = results.filter((r) => r.status === "applied" || r.status === "conflict").length;
-                if (appliedCount > 0) {
-                    await this.committer.commitReplay(appliedCount, newPatches);
-                }
-            }
-            else {
-                await this.committer.stageAll();
-            }
-        }
-        return this.buildReport("no-patches", newPatches, results, options, warnings, rebaseCounts);
-    }
-    async handleNormalRegeneration(options) {
-        if (options?.dryRun) {
-            const existingPatches = this.lockManager.getPatches();
-            const newPatches = await this.detector.detectNewPatches();
-            const warnings = [...this.detector.warnings];
-            const allPatches = [...existingPatches, ...newPatches];
-            return {
-                flow: "normal-regeneration",
-                patchesDetected: allPatches.length,
-                patchesApplied: 0,
-                patchesWithConflicts: 0,
-                patchesSkipped: 0,
-                conflicts: [],
-                wouldApply: allPatches,
-                warnings: warnings.length > 0 ? warnings : undefined
-            };
-        }
-        // Pre-generation rebase: update stale/modified patches while HEAD has customer code.
-        let existingPatches = this.lockManager.getPatches();
-        const preRebaseCounts = await this.preGenerationRebase(existingPatches);
-        // Dedup patches by content hash after pre-generation rebase.
-        existingPatches = this.lockManager.getPatches();
-        const seenHashes = new Set();
-        for (const p of existingPatches) {
-            if (seenHashes.has(p.content_hash)) {
-                this.lockManager.removePatch(p.id);
-            }
-            else {
-                seenHashes.add(p.content_hash);
-            }
-        }
-        existingPatches = this.lockManager.getPatches();
-        const newPatches = await this.detector.detectNewPatches();
-        const warnings = [...this.detector.warnings];
-        const allPatches = [...existingPatches, ...newPatches];
-        const commitOpts = options
-            ? {
-                cliVersion: options.cliVersion ?? "unknown",
-                generatorVersions: options.generatorVersions ?? {},
-                baseBranchHead: options.baseBranchHead
-            }
-            : undefined;
-        await this.committer.commitGeneration("Update SDK", commitOpts);
-        const genRecord = await this.committer.createGenerationRecord(commitOpts);
-        // Add generation to lockfile BEFORE applying patches so the applicator
-        // can read the current generation's tree hash for rename detection.
-        this.lockManager.addGeneration(genRecord);
-        const results = await this.applicator.applyPatches(allPatches);
-        // Rebase cleanly applied patches to the current generation.
-        const rebaseCounts = await this.rebasePatches(results, genRecord.commit_sha);
-        // Save lockfile BEFORE commit — lockfile is source of truth.
-        for (const patch of newPatches) {
-            if (!rebaseCounts.absorbedPatchIds.has(patch.id)) {
-                this.lockManager.addPatch(patch);
-            }
-        }
-        this.lockManager.save();
-        if (options?.stageOnly) {
-            await this.committer.stageAll();
-        }
-        else {
-            const appliedCount = results.filter((r) => r.status === "applied" || r.status === "conflict").length;
-            if (appliedCount > 0) {
-                await this.committer.commitReplay(appliedCount, allPatches);
-            }
-        }
-        return this.buildReport("normal-regeneration", allPatches, results, options, warnings, rebaseCounts, preRebaseCounts);
-    }
-    /**
-     * Rebase cleanly applied patches so they are relative to the current generation.
-     * This prevents recurring conflicts on subsequent regenerations.
-     * Returns the number of patches rebased.
-     */
-    async rebasePatches(results, currentGenSha) {
-        let absorbed = 0;
-        let repointed = 0;
-        let contentRebased = 0;
-        let keptAsUserOwned = 0;
-        // Track content hashes to deduplicate converging incremental patches.
-        const seenContentHashes = new Set();
-        const absorbedPatchIds = new Set();
-        // Pre-pass: Update patch.files with resolved (renamed) paths from application.
-        // This ensures downstream operations (user-owned check, git diff, git show)
-        // use the current file paths rather than stale pre-rename paths.
-        for (const result of results) {
-            if (result.resolvedFiles && Object.keys(result.resolvedFiles).length > 0) {
-                const patch = result.patch;
-                const updatedFiles = patch.files.map((f) => result.resolvedFiles[f] ?? f);
-                patch.files = updatedFiles;
-                try {
-                    this.lockManager.updatePatch(patch.id, { files: updatedFiles });
-                }
-                catch {
-                    // New patches aren't in lockfile yet — in-memory update sufficient
-                }
-            }
-        }
-        for (const result of results) {
-            if (result.status === "conflict" && result.fileResults) {
-                // For conflict patches with mixed results, trim any clean files
-                // that were absorbed by the generator. This prevents absorbed files
-                // from poisoning the pre-generation rebase conflict marker check.
-                await this.trimAbsorbedFiles(result, currentGenSha);
-                continue;
-            }
-            // Only rebase cleanly applied patches.
-            // Conflicted patches keep their old base_generation so they retry.
-            if (result.status !== "applied")
-                continue;
-            const patch = result.patch;
-            // Skip if already based on the current generation
-            if (patch.base_generation === currentGenSha)
-                continue;
-            try {
-                // Check if any files are user-owned (new, .fernignore-protected, or .fernignore itself).
-                const fernignorePatterns = this.readFernignorePatterns();
-                const isUserOwned = await Promise.all(patch.files.map(async (file) => {
-                    // .fernignore itself is always user-owned
-                    if (file === ".fernignore") {
-                        return true;
-                    }
-                    // Check .fernignore patterns (cheaper than git)
-                    if (fernignorePatterns.some((p) => file === p || minimatch(file, p))) {
-                        return true;
-                    }
-                    // Check if file exists in the generation commit tree
-                    const content = await this.git.showFile(currentGenSha, file);
-                    return content === null;
-                }));
-                const hasUserOwnedFiles = isUserOwned.some(Boolean);
-                if (hasUserOwnedFiles) {
-                    // Patch contains user-owned files — just update base_generation
-                    // to prevent re-evaluation. Keep patch_content as-is since
-                    // these files aren't produced by the generator.
-                    this.lockManager.updatePatch(patch.id, {
-                        base_generation: currentGenSha
-                    });
-                    keptAsUserOwned++;
-                    continue;
-                }
-                // All files exist in generation — safe to use git diff for
-                // absorption check and patch rebasing.
-                const diff = await this.git.exec(["diff", currentGenSha, "--", ...patch.files]).catch(() => null);
-                if (!diff || !diff.trim()) {
-                    // Patch is now empty — customization was absorbed by the generator.
-                    this.lockManager.removePatch(patch.id);
-                    absorbedPatchIds.add(patch.id);
-                    absorbed++;
-                    continue;
-                }
-                const newContentHash = this.detector.computeContentHash(diff);
-                // If another patch already captured this exact diff, this patch
-                // is redundant (e.g., incremental patches that both resolve to
-                // the same cumulative state after rebase).
-                if (seenContentHashes.has(newContentHash)) {
-                    this.lockManager.removePatch(patch.id);
-                    absorbedPatchIds.add(patch.id);
-                    absorbed++;
-                    continue;
-                }
-                seenContentHashes.add(newContentHash);
-                this.lockManager.updatePatch(patch.id, {
-                    base_generation: currentGenSha,
-                    patch_content: diff,
-                    content_hash: newContentHash
-                });
-                contentRebased++;
-            }
-            catch {
-                // If rebasing fails for any reason, keep the original patch unchanged
-            }
-        }
-        return { absorbed, repointed, contentRebased, keptAsUserOwned, absorbedPatchIds };
-    }
-    /**
-     * For conflict patches with mixed results (some files merged, some conflicted),
-     * check if the cleanly merged files were absorbed by the generator (empty diff).
-     * If so, remove them from patch.files so they don't pollute the pre-generation
-     * rebase conflict marker check (`git grep <<<<<<< -- ...patch.files`).
-     *
-     * Non-absorbed clean files stay in patch.files — removing them would lose
-     * the customization on the next generation.
-     */
-    async trimAbsorbedFiles(result, currentGenSha) {
-        const cleanFiles = result.fileResults.filter((f) => f.status === "merged").map((f) => f.file);
-        if (cleanFiles.length === 0)
-            return;
-        const patch = result.patch;
-        const fernignorePatterns = this.readFernignorePatterns();
-        // Filter to only generator-produced clean files (not user-owned)
-        const generatorCleanFiles = [];
-        for (const file of cleanFiles) {
-            if (file === ".fernignore")
-                continue;
-            if (fernignorePatterns.some((p) => file === p || minimatch(file, p)))
-                continue;
-            const content = await this.git.showFile(currentGenSha, file);
-            if (content === null)
-                continue; // user-owned new file
-            generatorCleanFiles.push(file);
-        }
-        if (generatorCleanFiles.length === 0)
-            return;
-        // Check which clean files have an empty diff (absorbed by generator)
-        const absorbedFiles = new Set();
-        for (const file of generatorCleanFiles) {
-            try {
-                const diff = await this.git.exec(["diff", currentGenSha, "--", file]).catch(() => null);
-                if (!diff || !diff.trim()) {
-                    absorbedFiles.add(file);
-                }
-            }
-            catch {
-                // If diff fails, leave the file in the patch
-            }
-        }
-        if (absorbedFiles.size === 0)
-            return;
-        // Remove absorbed files from the patch's file list
-        const remainingFiles = patch.files.filter((f) => !absorbedFiles.has(f));
-        if (remainingFiles.length === patch.files.length)
-            return; // nothing changed
-        try {
-            this.lockManager.updatePatch(patch.id, { files: remainingFiles });
-        }
-        catch {
-            // New patches aren't in lockfile yet — update in-memory only
-            patch.files = remainingFiles;
-        }
-    }
-    /**
-     * Pre-generation rebase: update patches using the customer's current state.
-     * Called BEFORE commitGeneration() while HEAD has customer code.
-     */
-    async preGenerationRebase(patches) {
-        const lock = this.lockManager.read();
-        const currentGen = lock.current_generation;
-        // If the previous run was skip-application, clear the marker and
-        // skip all revert detection. Patches are preserved as-is.
-        if (this.lockManager.isReplaySkipped()) {
-            this.lockManager.clearReplaySkippedAt();
-            return { conflictResolved: 0, conflictAbsorbed: 0, contentRefreshed: 0 };
-        }
-        let conflictResolved = 0;
-        let conflictAbsorbed = 0;
-        let contentRefreshed = 0;
-        for (const patch of patches) {
-            if (patch.base_generation === currentGen) {
-                // Content refresh: check if user modified their customization
-                // since the last replay commit.
-                try {
-                    const diff = await this.git
-                        .exec(["diff", currentGen, "HEAD", "--", ...patch.files])
-                        .catch(() => null);
-                    if (diff === null)
-                        continue;
-                    if (!diff.trim()) {
-                        // User reverted all customizations in this patch
-                        this.lockManager.removePatch(patch.id);
-                        contentRefreshed++;
-                        continue;
-                    }
-                    const newContentHash = this.detector.computeContentHash(diff);
-                    if (newContentHash !== patch.content_hash) {
-                        // User changed their customization — update patch content
-                        // and recalculate the files list (some files may no longer differ)
-                        const filesOutput = await this.git
-                            .exec(["diff", "--name-only", currentGen, "HEAD", "--", ...patch.files])
-                            .catch(() => null);
-                        const newFiles = filesOutput
-                            ? filesOutput
-                                .trim()
-                                .split("\n")
-                                .filter(Boolean)
-                                .filter((f) => !f.startsWith(".fern/"))
-                            : patch.files;
-                        if (newFiles.length === 0) {
-                            this.lockManager.removePatch(patch.id);
-                        }
-                        else {
-                            this.lockManager.updatePatch(patch.id, {
-                                patch_content: diff,
-                                content_hash: newContentHash,
-                                files: newFiles
-                            });
-                        }
-                        contentRefreshed++;
-                    }
-                }
-                catch {
-                    // If anything fails, leave the patch unchanged
-                }
-                continue;
-            }
-            try {
-                // Check for unresolved conflict markers in HEAD
-                const markerFiles = await this.git
-                    .exec(["grep", "-l", "<<<<<<<", "HEAD", "--", ...patch.files])
-                    .catch(() => "");
-                if (markerFiles.trim())
-                    continue;
-                // Compute customer's resolved state relative to current generation
-                const diff = await this.git.exec(["diff", currentGen, "HEAD", "--", ...patch.files]).catch(() => null);
-                // Diff command failed (e.g., invalid SHA) — skip this patch
-                if (diff === null)
-                    continue;
-                if (!diff.trim()) {
-                    // Empty diff — customer reverted their customization
-                    this.lockManager.removePatch(patch.id);
-                    conflictAbsorbed++;
-                    continue;
-                }
-                // Update the patch with the resolved content
-                const newContentHash = this.detector.computeContentHash(diff);
-                this.lockManager.updatePatch(patch.id, {
-                    base_generation: currentGen,
-                    patch_content: diff,
-                    content_hash: newContentHash
-                });
-                conflictResolved++;
-            }
-            catch {
-                // If anything fails, leave the patch unchanged
-            }
-        }
-        return { conflictResolved, conflictAbsorbed, contentRefreshed };
-    }
-    readFernignorePatterns() {
-        const fernignorePath = join(this.outputDir, ".fernignore");
-        if (!existsSync(fernignorePath))
-            return [];
-        return readFileSync(fernignorePath, "utf-8")
-            .split("\n")
-            .map((line) => line.trim())
-            .filter((line) => line && !line.startsWith("#"));
-    }
-    buildReport(flow, patches, results, options, warnings, rebaseCounts, preRebaseCounts) {
-        const conflictResults = results.filter((r) => r.status === "conflict");
-        const conflictDetails = conflictResults
-            .map((r) => {
-            const conflictFiles = r.fileResults?.filter((f) => f.status === "conflict") ?? [];
-            const cleanFiles = r.fileResults?.filter((f) => f.status === "merged").map((f) => f.file) ?? [];
-            return {
-                patchId: r.patch.id,
-                patchMessage: r.patch.original_message,
-                reason: r.conflictReason,
-                files: conflictFiles,
-                cleanFiles: cleanFiles.length > 0 ? cleanFiles : undefined
-            };
-        })
-            .filter((d) => d.files.length > 0);
-        const partialCount = conflictDetails.filter((d) => d.cleanFiles && d.cleanFiles.length > 0).length;
-        return {
-            flow,
-            patchesDetected: patches.length,
-            patchesApplied: results.filter((r) => r.status === "applied").length,
-            patchesWithConflicts: conflictResults.length,
-            patchesSkipped: results.filter((r) => r.status === "skipped").length,
-            patchesPartiallyApplied: partialCount > 0 ? partialCount : undefined,
-            patchesAbsorbed: rebaseCounts && rebaseCounts.absorbed > 0 ? rebaseCounts.absorbed : undefined,
-            patchesRepointed: rebaseCounts && rebaseCounts.repointed > 0 ? rebaseCounts.repointed : undefined,
-            patchesContentRebased: rebaseCounts && rebaseCounts.contentRebased > 0 ? rebaseCounts.contentRebased : undefined,
-            patchesKeptAsUserOwned: rebaseCounts && rebaseCounts.keptAsUserOwned > 0 ? rebaseCounts.keptAsUserOwned : undefined,
-            patchesConflictResolved: preRebaseCounts && preRebaseCounts.conflictResolved + preRebaseCounts.conflictAbsorbed > 0
-                ? preRebaseCounts.conflictResolved + preRebaseCounts.conflictAbsorbed
-                : undefined,
-            patchesRefreshed: preRebaseCounts && preRebaseCounts.contentRefreshed > 0 ? preRebaseCounts.contentRefreshed : undefined,
-            conflicts: conflictResults.flatMap((r) => r.fileResults?.filter((f) => f.status === "conflict") ?? []),
-            conflictDetails: conflictDetails.length > 0 ? conflictDetails : undefined,
-            wouldApply: options?.dryRun ? patches : undefined,
-            warnings: warnings && warnings.length > 0 ? warnings : undefined
-        };
-    }
-}
-//# sourceMappingURL=ReplayService.js.map

package/dist/ReplayService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ReplayService.js","sourceRoot":"","sources":["../src/ReplayService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA8CrD,MAAM,OAAO,aAAa;IACd,GAAG,CAAY;IACf,QAAQ,CAAiB;IACzB,UAAU,CAAmB;IAC7B,SAAS,CAAkB;IAC3B,WAAW,CAAkB;IAC7B,SAAS,CAAS;IAE1B,YAAY,SAAiB,EAAE,OAAqB;QAChD,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,WAAW,GAAG,IAAI,eAAe,CAAC,SAAS,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACrE,IAAI,CAAC,UAAU,GAAG,IAAI,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACzE,IAAI,CAAC,SAAS,GAAG,IAAI,eAAe,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAuB;QACnC,IAAI,OAAO,EAAE,eAAe,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;QAC/C,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QAElC,QAAQ,IAAI,EAAE,CAAC;YACX,KAAK,kBAAkB;gBACnB,OAAO,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;YAC/C,KAAK,YAAY;gBACb,OAAO,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;YACrD,KAAK,qBAAqB;gBACtB,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;QACtD,CAAC;IACL,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,sBAAsB,CACxB,mBAA2B,EAC3B,OAAsG;QAEtG,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;QACjE,MAAM,SAAS,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAEnG,MAAM,MAAM,GAAqB;YAC7B,UAAU,EAAE,mBAAmB;YAC/B,SAAS,EAAE,QAAQ;YACnB,SAAS;YACT,WAAW,EAAE,OAAO,EAAE,UAAU,IAAI,SAAS;YAC7C,kBAAkB,EAAE,OAAO,EAAE,iBAAiB,IAAI,EAAE;YACpD,gBAAgB,EAAE,OAAO,EAAE,cAAc;SAC5C,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;YAC7B,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YACxB,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YACvC,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAExB,uEAAuE;QACvE,yEAAyE;QACzE,0DAA0D;QAC1D,IAAI,CAAC;YACD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC;YACjE,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE,CAAC;oBACpC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACrC,CAAC;gBACD,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YAC5B,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACL,kDAAkD;YAClD,uDAAuD;QAC3D,CAAC;IACL,CAAC;IAEO,aAAa;QACjB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;YAC7B,OAAO,kBAAkB,CAAC;QAC9B,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACrC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,YAAY,CAAC;QACxB,CAAC;QAED,OAAO,qBAAqB,CAAC;IACjC,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,OAAuB;QACvD,IAAI,OAAO,EAAE,MAAM,EAAE,CAAC;YAClB,OAAO;gBACH,IAAI,EAAE,kBAAkB;gBACxB,eAAe,EAAE,CAAC;gBAClB,cAAc,EAAE,CAAC;gBACjB,oBAAoB,EAAE,CAAC;gBACvB,cAAc,EAAE,CAAC;gBACjB,SAAS,EAAE,EAAE;aAChB,CAAC;QACN,CAAC;QAED,MAAM,UAAU,GAAG,OAAO;YACtB,CAAC,CAAC;gBACI,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,SAAS;gBAC3C,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,IAAI,EAAE;gBAClD,cAAc,EAAE,OAAO,CAAC,cAAc;aACzC;YACH,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC;QAC5E,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC1E,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAEvC,OAAO;YACH,IAAI,EAAE,kBAAkB;YACxB,eAAe,EAAE,CAAC;YAClB,cAAc,EAAE,CAAC;YACjB,oBAAoB,EAAE,CAAC;YACvB,cAAc,EAAE,CAAC;YACjB,SAAS,EAAE,EAAE;SAChB,CAAC;IACN,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,qBAAqB,CAAC,OAAuB;QACvD,MAAM,UAAU,GAAG,OAAO;YACtB,CAAC,CAAC;gBACI,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,SAAS;gBAC3C,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,IAAI,EAAE;gBAClD,cAAc,EAAE,OAAO,CAAC,cAAc;aACzC;YACH,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,6BAA6B,EAAE,UAAU,CAAC,CAAC;QACjF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAE1E,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;YAC5B,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YACxB,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAExB,6DAA6D;QAC7D,6DAA6D;QAC7D,oDAAoD;QACpD,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC;YACtB,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QACpC,CAAC;QAED,OAAO;YACH,IAAI,EAAE,kBAAkB;YACxB,eAAe,EAAE,CAAC;YAClB,cAAc,EAAE,CAAC;YACjB,oBAAoB,EAAE,CAAC;YACvB,cAAc,EAAE,CAAC;YACjB,SAAS,EAAE,EAAE;SAChB,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,2BAA2B,CAAC,OAAuB;QAC7D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC;QAC1D,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAE7C,IAAI,OAAO,EAAE,MAAM,EAAE,CAAC;YAClB,OAAO;gBACH,IAAI,EAAE,YAAY;gBAClB,eAAe,EAAE,UAAU,CAAC,MAAM;gBAClC,cAAc,EAAE,CAAC;gBACjB,oBAAoB,EAAE,CAAC;gBACvB,cAAc,EAAE,CAAC;gBACjB,SAAS,EAAE,EAAE;gBACb,UAAU,EAAE,UAAU;gBACtB,QAAQ,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;aACvD,CAAC;QACN,CAAC;QAED,MAAM,UAAU,GAAG,OAAO;YACtB,CAAC,CAAC;gBACI,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,SAAS;gBAC3C,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,IAAI,EAAE;gBAClD,cAAc,EAAE,OAAO,CAAC,cAAc;aACzC;YACH,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAChE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAE1E,uEAAuE;QACvE,oEAAoE;QACpE,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAE1C,IAAI,OAAO,GAAmB,EAAE,CAAC;QACjC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAC7D,CAAC;QAED,4DAA4D;QAC5D,iEAAiE;QACjE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QAE7E,6DAA6D;QAC7D,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;YAC7B,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC/C,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACrC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAExB,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC;gBACtB,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,MAAM,CAAC;gBACrG,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;oBACnB,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YACpC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;IAChG,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAAC,OAAuB;QAC1D,IAAI,OAAO,EAAE,MAAM,EAAE,CAAC;YAClB,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;YACtD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC;YAC1D,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC7C,MAAM,UAAU,GAAG,CAAC,GAAG,eAAe,EAAE,GAAG,UAAU,CAAC,CAAC;YACvD,OAAO;gBACH,IAAI,EAAE,qBAAqB;gBAC3B,eAAe,EAAE,UAAU,CAAC,MAAM;gBAClC,cAAc,EAAE,CAAC;gBACjB,oBAAoB,EAAE,CAAC;gBACvB,cAAc,EAAE,CAAC;gBACjB,SAAS,EAAE,EAAE;gBACb,UAAU,EAAE,UAAU;gBACtB,QAAQ,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;aACvD,CAAC;QACN,CAAC;QAED,qFAAqF;QACrF,IAAI,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QACpD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;QAExE,6DAA6D;QAC7D,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QAChD,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QACrC,KAAK,MAAM,CAAC,IAAI,eAAe,EAAE,CAAC;YAC9B,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC;gBACjC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACvC,CAAC;iBAAM,CAAC;gBACJ,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;YACnC,CAAC;QACL,CAAC;QACD,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QAEhD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC;QAC1D,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,UAAU,GAAG,CAAC,GAAG,eAAe,EAAE,GAAG,UAAU,CAAC,CAAC;QAEvD,MAAM,UAAU,GAAG,OAAO;YACtB,CAAC,CAAC;gBACI,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,SAAS;gBAC3C,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,IAAI,EAAE;gBAClD,cAAc,EAAE,OAAO,CAAC,cAAc;aACzC;YACH,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAChE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAE1E,uEAAuE;QACvE,oEAAoE;QACpE,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAE1C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAE/D,4DAA4D;QAC5D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QAE7E,6DAA6D;QAC7D,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;YAC7B,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC/C,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACrC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAExB,IAAI,OAAO,EAAE,SAAS,EAAE,CAAC;YACrB,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QACpC,CAAC;aAAM,CAAC;YACJ,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,MAAM,CAAC;YACrG,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;gBACnB,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;YAChE,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CACnB,qBAAqB,EACrB,UAAU,EACV,OAAO,EACP,OAAO,EACP,QAAQ,EACR,YAAY,EACZ,eAAe,CAClB,CAAC;IACN,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,aAAa,CACvB,OAAuB,EACvB,aAAqB;QAQrB,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,IAAI,cAAc,GAAG,CAAC,CAAC;QACvB,IAAI,eAAe,GAAG,CAAC,CAAC;QACxB,sEAAsE;QACtE,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;QAC5C,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;QAE3C,+EAA+E;QAC/E,4EAA4E;QAC5E,iEAAiE;QACjE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,IAAI,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;gBAC3B,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,aAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC3E,KAAK,CAAC,KAAK,GAAG,YAAY,CAAC;gBAC3B,IAAI,CAAC;oBACD,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;gBACpE,CAAC;gBAAC,MAAM,CAAC;oBACL,mEAAmE;gBACvE,CAAC;YACL,CAAC;QACL,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;gBACrD,gEAAgE;gBAChE,oEAAoE;gBACpE,kEAAkE;gBAClE,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;gBACpD,SAAS;YACb,CAAC;YAED,uCAAuC;YACvC,mEAAmE;YACnE,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS;gBAAE,SAAS;YAE1C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;YAE3B,kDAAkD;YAClD,IAAI,KAAK,CAAC,eAAe,KAAK,aAAa;gBAAE,SAAS;YAEtD,IAAI,CAAC;gBACD,yFAAyF;gBACzF,MAAM,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBACzD,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;oBAC3B,0CAA0C;oBAC1C,IAAI,IAAI,KAAK,aAAa,EAAE,CAAC;wBACzB,OAAO,IAAI,CAAC;oBAChB,CAAC;oBACD,gDAAgD;oBAChD,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBACnE,OAAO,IAAI,CAAC;oBAChB,CAAC;oBACD,qDAAqD;oBACrD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;oBAC7D,OAAO,OAAO,KAAK,IAAI,CAAC;gBAC5B,CAAC,CAAC,CACL,CAAC;gBACF,MAAM,iBAAiB,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEpD,IAAI,iBAAiB,EAAE,CAAC;oBACpB,gEAAgE;oBAChE,2DAA2D;oBAC3D,gDAAgD;oBAChD,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,EAAE;wBACnC,eAAe,EAAE,aAAa;qBACjC,CAAC,CAAC;oBACH,eAAe,EAAE,CAAC;oBAClB,SAAS;gBACb,CAAC;gBAED,2DAA2D;gBAC3D,uCAAuC;gBACvC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;gBAElG,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;oBACxB,oEAAoE;oBACpE,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBACvC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBAC/B,QAAQ,EAAE,CAAC;oBACX,SAAS;gBACb,CAAC;gBAED,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBAE9D,gEAAgE;gBAChE,+DAA+D;gBAC/D,2CAA2C;gBAC3C,IAAI,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;oBACxC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBACvC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBAC/B,QAAQ,EAAE,CAAC;oBACX,SAAS;gBACb,CAAC;gBACD,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;gBAEtC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,EAAE;oBACnC,eAAe,EAAE,aAAa;oBAC9B,aAAa,EAAE,IAAI;oBACnB,YAAY,EAAE,cAAc;iBAC/B,CAAC,CAAC;gBACH,cAAc,EAAE,CAAC;YACrB,CAAC;YAAC,MAAM,CAAC;gBACL,sEAAsE;YAC1E,CAAC;QACL,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,cAAc,EAAE,eAAe,EAAE,gBAAgB,EAAE,CAAC;IACtF,CAAC;IAED;;;;;;;;OAQG;IACK,KAAK,CAAC,iBAAiB,CAAC,MAAoB,EAAE,aAAqB;QACvE,MAAM,UAAU,GAAG,MAAM,CAAC,WAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC/F,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEpC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC3B,MAAM,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAEzD,iEAAiE;QACjE,MAAM,mBAAmB,GAAa,EAAE,CAAC;QACzC,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YAC5B,IAAI,IAAI,KAAK,aAAa;gBAAE,SAAS;YACrC,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAAE,SAAS;YAC/E,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;YAC7D,IAAI,OAAO,KAAK,IAAI;gBAAE,SAAS,CAAC,sBAAsB;YACtD,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAE7C,qEAAqE;QACrE,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;QACxC,KAAK,MAAM,IAAI,IAAI,mBAAmB,EAAE,CAAC;YACrC,IAAI,CAAC;gBACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;gBACxF,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;oBACxB,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC5B,CAAC;YACL,CAAC;YAAC,MAAM,CAAC;gBACL,6CAA6C;YACjD,CAAC;QACL,CAAC;QACD,IAAI,aAAa,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO;QAErC,mDAAmD;QACnD,MAAM,cAAc,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACxE,IAAI,cAAc,CAAC,MAAM,KAAK,KAAK,CAAC,KAAK,CAAC,MAAM;YAAE,OAAO,CAAC,kBAAkB;QAE5E,IAAI,CAAC;YACD,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;QACtE,CAAC;QAAC,MAAM,CAAC;YACL,6DAA6D;YAC7D,KAAK,CAAC,KAAK,GAAG,cAAc,CAAC;QACjC,CAAC;IACL,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,mBAAmB,CAC7B,OAAsB;QAEtB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACrC,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC;QAE3C,iEAAiE;QACjE,0DAA0D;QAC1D,IAAI,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,EAAE,CAAC;YACrC,IAAI,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAC;YACxC,OAAO,EAAE,gBAAgB,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,CAAC;QAC7E,CAAC;QAED,IAAI,gBAAgB,GAAG,CAAC,CAAC;QACzB,IAAI,gBAAgB,GAAG,CAAC,CAAC;QACzB,IAAI,gBAAgB,GAAG,CAAC,CAAC;QAEzB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC1B,IAAI,KAAK,CAAC,eAAe,KAAK,UAAU,EAAE,CAAC;gBACvC,8DAA8D;gBAC9D,gCAAgC;gBAChC,IAAI,CAAC;oBACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG;yBACtB,IAAI,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;yBACxD,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;oBAEvB,IAAI,IAAI,KAAK,IAAI;wBAAE,SAAS;oBAE5B,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;wBACf,iDAAiD;wBACjD,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;wBACvC,gBAAgB,EAAE,CAAC;wBACnB,SAAS;oBACb,CAAC;oBAED,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;oBAC9D,IAAI,cAAc,KAAK,KAAK,CAAC,YAAY,EAAE,CAAC;wBACxC,0DAA0D;wBAC1D,mEAAmE;wBACnE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG;6BAC7B,IAAI,CAAC,CAAC,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;6BACvE,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;wBAEvB,MAAM,QAAQ,GAAG,WAAW;4BACxB,CAAC,CAAC,WAAW;iCACN,IAAI,EAAE;iCACN,KAAK,CAAC,IAAI,CAAC;iCACX,MAAM,CAAC,OAAO,CAAC;iCACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;4BAC7C,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;wBAElB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;4BACxB,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;wBAC3C,CAAC;6BAAM,CAAC;4BACJ,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,EAAE;gCACnC,aAAa,EAAE,IAAI;gCACnB,YAAY,EAAE,cAAc;gCAC5B,KAAK,EAAE,QAAQ;6BAClB,CAAC,CAAC;wBACP,CAAC;wBACD,gBAAgB,EAAE,CAAC;oBACvB,CAAC;gBACL,CAAC;gBAAC,MAAM,CAAC;oBACL,+CAA+C;gBACnD,CAAC;gBACD,SAAS;YACb,CAAC;YAED,IAAI,CAAC;gBACD,gDAAgD;gBAChD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG;qBAC7B,IAAI,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;qBAC7D,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;gBAErB,IAAI,WAAW,CAAC,IAAI,EAAE;oBAAE,SAAS;gBAEjC,mEAAmE;gBACnE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;gBAEvG,4DAA4D;gBAC5D,IAAI,IAAI,KAAK,IAAI;oBAAE,SAAS;gBAE5B,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;oBACf,qDAAqD;oBACrD,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBACvC,gBAAgB,EAAE,CAAC;oBACnB,SAAS;gBACb,CAAC;gBAED,6CAA6C;gBAC7C,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBAC9D,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,EAAE;oBACnC,eAAe,EAAE,UAAU;oBAC3B,aAAa,EAAE,IAAI;oBACnB,YAAY,EAAE,cAAc;iBAC/B,CAAC,CAAC;gBACH,gBAAgB,EAAE,CAAC;YACvB,CAAC;YAAC,MAAM,CAAC;gBACL,+CAA+C;YACnD,CAAC;QACL,CAAC;QAED,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,CAAC;IACpE,CAAC;IAEO,sBAAsB;QAC1B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QAC3D,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC;YAAE,OAAO,EAAE,CAAC;QAC3C,OAAO,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC;aACvC,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;aAC1B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IACzD,CAAC;IAEO,WAAW,CACf,IAAoF,EACpF,OAAsB,EACtB,OAAuB,EACvB,OAAuB,EACvB,QAAmB,EACnB,YAMC,EACD,eAAkG;QAElG,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC;QACvE,MAAM,eAAe,GAAG,eAAe;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACP,MAAM,aAAa,GAAG,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;YAClF,MAAM,UAAU,GAAG,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAChG,OAAO;gBACH,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;gBACnB,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,gBAAgB;gBACtC,MAAM,EAAE,CAAC,CAAC,cAAc;gBACxB,KAAK,EAAE,aAAa;gBACpB,UAAU,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;aAC7D,CAAC;QACN,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACvC,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;QAEnG,OAAO;YACH,IAAI;YACJ,eAAe,EAAE,OAAO,CAAC,MAAM;YAC/B,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,MAAM;YACpE,oBAAoB,EAAE,eAAe,CAAC,MAAM;YAC5C,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,MAAM;YACpE,uBAAuB,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS;YACpE,eAAe,EAAE,YAAY,IAAI,YAAY,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;YAC9F,gBAAgB,EAAE,YAAY,IAAI,YAAY,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YACjG,qBAAqB,EACjB,YAAY,IAAI,YAAY,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS;YAC7F,sBAAsB,EAClB,YAAY,IAAI,YAAY,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS;YAC/F,uBAAuB,EACnB,eAAe,IAAI,eAAe,CAAC,gBAAgB,GAAG,eAAe,CAAC,gBAAgB,GAAG,CAAC;gBACtF,CAAC,CAAC,eAAe,CAAC,gBAAgB,GAAG,eAAe,CAAC,gBAAgB;gBACrE,CAAC,CAAC,SAAS;YACnB,gBAAgB,EACZ,eAAe,IAAI,eAAe,CAAC,gBAAgB,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS;YAC1G,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;YACtG,eAAe,EAAE,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS;YACzE,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;YACjD,QAAQ,EAAE,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;SACnE,CAAC;IACN,CAAC;CACJ"}

package/dist/ThreeWayMerge.d.ts

@@ -1,11 +0,0 @@
-import type { MergeResult } from "./types.js";
-/**
- * Performs a 3-way merge using the diff3 algorithm.
- *
- * @param base - The common ancestor (pristine generated state user edited against)
- * @param ours - The new generated version
- * @param theirs - The user's customized version
- * @returns MergeResult with content, conflict flag, and conflict regions
- */
-export declare function threeWayMerge(base: string, ours: string, theirs: string): MergeResult;
-//# sourceMappingURL=ThreeWayMerge.d.ts.map

package/dist/ThreeWayMerge.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ThreeWayMerge.d.ts","sourceRoot":"","sources":["../src/ThreeWayMerge.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAkB,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9D;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CA2CrF"}