@gitwand/core 1.6.0

package/dist/resolvers/lockfile-npm.js.map

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

package/dist/resolvers/lockfile-pnpm.d.ts

@@ -0,0 +1,44 @@
+/**
+ * GitWand — Résolveur sémantique pour pnpm-lock.yaml
+ *
+ * Format pnpm-lock.yaml :
+ *   lockfileVersion: '9.0'
+ *   settings:
+ *     ...
+ *   importers:
+ *     .:
+ *       dependencies:
+ *         react:
+ *           specifier: ^18.0.0
+ *           version: 18.2.0
+ *   packages:
+ *     /react@18.2.0:
+ *       resolution: {integrity: sha512-...}
+ *       ...
+ *   snapshots:
+ *     /react@18.2.0:
+ *       dependencies: ...
+ *
+ * Stratégie :
+ *  Le fichier est structuré en sections YAML top-level.
+ *  On fusionne chaque section indépendamment au niveau des entrées clé-valeur.
+ *  Les sections `packages` et `snapshots` ont des entrées par paquet résolvable.
+ *  La section `importers` décrit les dépendances directes.
+ *
+ *  Le merge 3-way utilise les lignes YAML indentées pour identifier les blocs.
+ */
+export interface PnpmLockMergeResult {
+    /** Contenu fusionné ou null si échec */
+    merged: string | null;
+    /** Raison de la résolution */
+    reason: string;
+    /** Nombre d'entrées fusionnées */
+    resolvedEntries: number;
+    /** Nombre de conflits */
+    conflicts: number;
+}
+/**
+ * Fusionne trois versions d'un pnpm-lock.yaml par section et sous-entrée.
+ */
+export declare function tryResolvePnpmLockConflict(baseLines: string[], oursLines: string[], theirsLines: string[]): PnpmLockMergeResult;
+//# sourceMappingURL=lockfile-pnpm.d.ts.map

package/dist/resolvers/lockfile-pnpm.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lockfile-pnpm.d.ts","sourceRoot":"","sources":["../../src/resolvers/lockfile-pnpm.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAIH,MAAM,WAAW,mBAAmB;IAClC,wCAAwC;IACxC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,8BAA8B;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,kCAAkC;IAClC,eAAe,EAAE,MAAM,CAAC;IACxB,yBAAyB;IACzB,SAAS,EAAE,MAAM,CAAC;CACnB;AA0KD;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,MAAM,EAAE,EACnB,SAAS,EAAE,MAAM,EAAE,EACnB,WAAW,EAAE,MAAM,EAAE,GACpB,mBAAmB,CAsGrB"}

package/dist/resolvers/lockfile-pnpm.js

@@ -0,0 +1,277 @@
+/**
+ * GitWand — Résolveur sémantique pour pnpm-lock.yaml
+ *
+ * Format pnpm-lock.yaml :
+ *   lockfileVersion: '9.0'
+ *   settings:
+ *     ...
+ *   importers:
+ *     .:
+ *       dependencies:
+ *         react:
+ *           specifier: ^18.0.0
+ *           version: 18.2.0
+ *   packages:
+ *     /react@18.2.0:
+ *       resolution: {integrity: sha512-...}
+ *       ...
+ *   snapshots:
+ *     /react@18.2.0:
+ *       dependencies: ...
+ *
+ * Stratégie :
+ *  Le fichier est structuré en sections YAML top-level.
+ *  On fusionne chaque section indépendamment au niveau des entrées clé-valeur.
+ *  Les sections `packages` et `snapshots` ont des entrées par paquet résolvable.
+ *  La section `importers` décrit les dépendances directes.
+ *
+ *  Le merge 3-way utilise les lignes YAML indentées pour identifier les blocs.
+ */
+/**
+ * Parse un fichier YAML en blocs top-level.
+ * Chaque bloc est identifié par une clé au niveau d'indentation 0.
+ */
+function parseTopLevelBlocks(lines) {
+    const preamble = [];
+    const blocks = new Map();
+    const blockOrder = [];
+    let currentKey = null;
+    let currentBody = [];
+    for (const line of lines) {
+        // Top-level key: starts at column 0, ends with ':'
+        const topLevelMatch = line.match(/^(\S[^:]*?):\s*(.*)?$/);
+        if (topLevelMatch && !line.startsWith(" ") && !line.startsWith("\t")) {
+            // Save previous block
+            if (currentKey !== null) {
+                blocks.set(currentKey, currentBody);
+                blockOrder.push(currentKey);
+            }
+            currentKey = topLevelMatch[1];
+            const inlineValue = topLevelMatch[2]?.trim();
+            // If there's an inline value (e.g., `lockfileVersion: '9.0'`), store as single line
+            currentBody = inlineValue ? [line] : [];
+        }
+        else if (currentKey === null) {
+            // Before any top-level key → preamble (comments, blank lines)
+            preamble.push(line);
+        }
+        else {
+            currentBody.push(line);
+        }
+    }
+    // Save last block
+    if (currentKey !== null) {
+        blocks.set(currentKey, currentBody);
+        blockOrder.push(currentKey);
+    }
+    return { preamble, blocks, blockOrder };
+}
+/**
+ * Pour une section comme `packages` ou `snapshots`, parse les sous-entrées
+ * (chaque clé indentée de 2 espaces avec son body).
+ */
+function parseSubEntries(bodyLines) {
+    const entries = new Map();
+    let currentKey = null;
+    let currentBody = [];
+    for (const line of bodyLines) {
+        // Sub-entry key: indented exactly 2 spaces (top-level sub-entries only), key ends with ':'
+        const subMatch = line.match(/^(\s{2})(\S[^:]*?):\s*$/);
+        const subInlineMatch = line.match(/^(\s{2})(\S[^:]*?):\s+(.+)$/);
+        if (subMatch || subInlineMatch) {
+            // Save previous sub-entry
+            if (currentKey !== null) {
+                entries.set(currentKey, currentBody.join("\n"));
+            }
+            if (subMatch) {
+                currentKey = subMatch[2].trim();
+                currentBody = [];
+            }
+            else if (subInlineMatch) {
+                currentKey = subInlineMatch[2].trim();
+                currentBody = [line];
+            }
+        }
+        else if (currentKey !== null) {
+            currentBody.push(line);
+        }
+    }
+    // Save last entry
+    if (currentKey !== null) {
+        entries.set(currentKey, currentBody.join("\n"));
+    }
+    return entries;
+}
+// ─── 3-way merge ─────────────────────────────────────────
+/**
+ * Merge 3-way d'une Map de sous-entrées.
+ */
+function mergeEntryMap(base, ours, theirs) {
+    const allKeys = new Set([...base.keys(), ...ours.keys(), ...theirs.keys()]);
+    const merged = new Map();
+    let resolved = 0;
+    let conflicts = 0;
+    for (const key of allKeys) {
+        const b = base.get(key);
+        const o = ours.get(key);
+        const t = theirs.get(key);
+        if (b === undefined) {
+            // New entry
+            if (o !== undefined && t !== undefined) {
+                merged.set(key, o === t ? o : t);
+            }
+            else if (o !== undefined) {
+                merged.set(key, o);
+            }
+            else if (t !== undefined) {
+                merged.set(key, t);
+            }
+            resolved++;
+            continue;
+        }
+        if (o === undefined && t === undefined) {
+            resolved++;
+            continue;
+        }
+        if (o === undefined) {
+            if (t === b) {
+                resolved++;
+                continue;
+            }
+            merged.set(key, t);
+            resolved++;
+            continue;
+        }
+        if (t === undefined) {
+            if (o === b) {
+                resolved++;
+                continue;
+            }
+            merged.set(key, o);
+            resolved++;
+            continue;
+        }
+        const oChanged = o !== b;
+        const tChanged = t !== b;
+        if (!oChanged && !tChanged) {
+            merged.set(key, b);
+        }
+        else if (!oChanged) {
+            merged.set(key, t);
+        }
+        else if (!tChanged) {
+            merged.set(key, o);
+        }
+        else if (o === t) {
+            merged.set(key, o);
+        }
+        else {
+            // Conflit → prefer theirs
+            merged.set(key, t);
+            conflicts++;
+        }
+        resolved++;
+    }
+    return { merged, resolved, conflicts };
+}
+/**
+ * Fusionne trois versions d'un pnpm-lock.yaml par section et sous-entrée.
+ */
+export function tryResolvePnpmLockConflict(baseLines, oursLines, theirsLines) {
+    const baseParsed = parseTopLevelBlocks(baseLines);
+    const oursParsed = parseTopLevelBlocks(oursLines);
+    const theirsParsed = parseTopLevelBlocks(theirsLines);
+    let totalResolved = 0;
+    let totalConflicts = 0;
+    // Merge section par section
+    const allSections = new Set([
+        ...baseParsed.blockOrder,
+        ...oursParsed.blockOrder,
+        ...theirsParsed.blockOrder,
+    ]);
+    const mergedSections = new Map();
+    // Preserve section order from ours
+    const sectionOrder = [...oursParsed.blockOrder];
+    for (const s of allSections) {
+        if (!sectionOrder.includes(s))
+            sectionOrder.push(s);
+    }
+    // Sections with sub-entries that should be merged at entry level
+    const entryLevelSections = new Set(["packages", "snapshots", "importers"]);
+    for (const section of allSections) {
+        const baseBody = baseParsed.blocks.get(section);
+        const oursBody = oursParsed.blocks.get(section);
+        const theirsBody = theirsParsed.blocks.get(section);
+        if (entryLevelSections.has(section) && baseBody && oursBody && theirsBody) {
+            // Merge at sub-entry level
+            const baseEntries = parseSubEntries(baseBody);
+            const oursEntries = parseSubEntries(oursBody);
+            const theirsEntries = parseSubEntries(theirsBody);
+            const { merged, resolved, conflicts } = mergeEntryMap(baseEntries, oursEntries, theirsEntries);
+            totalResolved += resolved;
+            totalConflicts += conflicts;
+            // Reconstruct section body
+            const body = [];
+            const sortedKeys = [...merged.keys()].sort();
+            for (const key of sortedKeys) {
+                const value = merged.get(key);
+                if (value.includes("\n") || value === "") {
+                    body.push(`  ${key}:`);
+                    if (value)
+                        body.push(...value.split("\n"));
+                }
+                else {
+                    // Inline value — reconstruct the line
+                    body.push(value);
+                }
+            }
+            mergedSections.set(section, body);
+        }
+        else {
+            // Simple section (scalar/header) — use 3-way text compare
+            const baseText = baseBody?.join("\n") ?? "";
+            const oursText = oursBody?.join("\n") ?? "";
+            const theirsText = theirsBody?.join("\n") ?? "";
+            if (oursText === theirsText || oursText === baseText) {
+                mergedSections.set(section, theirsBody ?? oursBody ?? []);
+            }
+            else if (theirsText === baseText) {
+                mergedSections.set(section, oursBody ?? []);
+            }
+            else {
+                // Both changed differently → prefer theirs
+                mergedSections.set(section, theirsBody ?? oursBody ?? []);
+                totalConflicts++;
+            }
+            totalResolved++;
+        }
+    }
+    // Reconstruct file
+    const outputLines = [...oursParsed.preamble];
+    for (const section of sectionOrder) {
+        const body = mergedSections.get(section);
+        if (!body)
+            continue;
+        if (body.length === 1 && body[0].startsWith(section + ":")) {
+            // Inline section (e.g., `lockfileVersion: '9.0'`)
+            outputLines.push(body[0]);
+        }
+        else {
+            outputLines.push(`${section}:`);
+            if (body.length > 0) {
+                outputLines.push(...body);
+            }
+        }
+        outputLines.push(""); // blank line between sections
+    }
+    const reason = totalConflicts > 0
+        ? `Fusion sémantique pnpm-lock.yaml : ${totalResolved} entrée(s), ${totalConflicts} conflit(s) résolu(s) (prefer-theirs).`
+        : `Fusion sémantique pnpm-lock.yaml réussie : ${totalResolved} entrée(s) fusionnée(s) sans conflit.`;
+    return {
+        merged: outputLines.join("\n"),
+        reason,
+        resolvedEntries: totalResolved,
+        conflicts: totalConflicts,
+    };
+}
+//# sourceMappingURL=lockfile-pnpm.js.map

package/dist/resolvers/lockfile-pnpm.js.map

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

package/dist/resolvers/lockfile-yarn.d.ts

@@ -0,0 +1,40 @@
+/**
+ * GitWand — Résolveur sémantique pour yarn.lock
+ *
+ * Format yarn.lock (v1) : blocs indépendants de la forme :
+ *
+ *   "package@^version":
+ *     version "1.2.3"
+ *     resolved "https://registry..."
+ *     integrity sha512-...
+ *     dependencies:
+ *       dep-a "^1.0"
+ *
+ * Chaque bloc est identifié par son header (la/les ligne(s) de clé).
+ * Le merge se fait par bloc.
+ *
+ * Stratégie :
+ *  1. Parser en blocs (header → body)
+ *  2. Merge 3-way par header :
+ *     - Ajouté d'un seul côté → prendre
+ *     - Supprimé d'un seul côté (pas modifié de l'autre) → supprimer
+ *     - Modifié d'un seul côté → prendre la modification
+ *     - Modifié des deux côtés, même résultat → ok
+ *     - Conflit → prefer theirs
+ *  3. Reconstruire le fichier trié
+ */
+export interface YarnLockMergeResult {
+    /** Contenu fusionné ou null si échec */
+    merged: string | null;
+    /** Raison de la résolution */
+    reason: string;
+    /** Nombre de blocs fusionnés */
+    resolvedBlocks: number;
+    /** Nombre de conflits de version */
+    versionConflicts: number;
+}
+/**
+ * Fusionne trois versions d'un yarn.lock par bloc de paquet.
+ */
+export declare function tryResolveYarnLockConflict(baseLines: string[], oursLines: string[], theirsLines: string[]): YarnLockMergeResult;
+//# sourceMappingURL=lockfile-yarn.d.ts.map

package/dist/resolvers/lockfile-yarn.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lockfile-yarn.d.ts","sourceRoot":"","sources":["../../src/resolvers/lockfile-yarn.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAIH,MAAM,WAAW,mBAAmB;IAClC,wCAAwC;IACxC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,8BAA8B;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,oCAAoC;IACpC,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAsED;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,MAAM,EAAE,EACnB,SAAS,EAAE,MAAM,EAAE,EACnB,WAAW,EAAE,MAAM,EAAE,GACpB,mBAAmB,CAiHrB"}

package/dist/resolvers/lockfile-yarn.js

@@ -0,0 +1,184 @@
+/**
+ * GitWand — Résolveur sémantique pour yarn.lock
+ *
+ * Format yarn.lock (v1) : blocs indépendants de la forme :
+ *
+ *   "package@^version":
+ *     version "1.2.3"
+ *     resolved "https://registry..."
+ *     integrity sha512-...
+ *     dependencies:
+ *       dep-a "^1.0"
+ *
+ * Chaque bloc est identifié par son header (la/les ligne(s) de clé).
+ * Le merge se fait par bloc.
+ *
+ * Stratégie :
+ *  1. Parser en blocs (header → body)
+ *  2. Merge 3-way par header :
+ *     - Ajouté d'un seul côté → prendre
+ *     - Supprimé d'un seul côté (pas modifié de l'autre) → supprimer
+ *     - Modifié d'un seul côté → prendre la modification
+ *     - Modifié des deux côtés, même résultat → ok
+ *     - Conflit → prefer theirs
+ *  3. Reconstruire le fichier trié
+ */
+/**
+ * Parse un yarn.lock en blocs indépendants.
+ * Retourne le commentaire d'en-tête et une Map<header, body>.
+ */
+function parseYarnLock(content) {
+    const lines = content.split("\n");
+    let preamble = "";
+    const blocks = new Map();
+    let i = 0;
+    // Preamble : commentaires en tête
+    while (i < lines.length && (lines[i].startsWith("#") || lines[i].trim() === "")) {
+        preamble += lines[i] + "\n";
+        i++;
+    }
+    // Parse blocks
+    while (i < lines.length) {
+        const line = lines[i];
+        // Skip blank lines between blocks
+        if (line.trim() === "") {
+            i++;
+            continue;
+        }
+        // A header line starts at column 0 and is not a comment
+        if (!line.startsWith(" ") && !line.startsWith("\t") && !line.startsWith("#")) {
+            const header = line;
+            i++;
+            // Collect body lines (indented)
+            const bodyLines = [];
+            while (i < lines.length && (lines[i].startsWith("  ") || lines[i].startsWith("\t") || lines[i].trim() === "")) {
+                // Stop at blank line that precedes next header
+                if (lines[i].trim() === "" && i + 1 < lines.length && !lines[i + 1].startsWith(" ") && !lines[i + 1].startsWith("\t") && lines[i + 1].trim() !== "") {
+                    break;
+                }
+                if (lines[i].trim() !== "") {
+                    bodyLines.push(lines[i]);
+                }
+                i++;
+            }
+            blocks.set(header, bodyLines.join("\n"));
+        }
+        else {
+            i++;
+        }
+    }
+    return { preamble, blocks };
+}
+// ─── 3-way merge ─────────────────────────────────────────
+/**
+ * Fusionne trois versions d'un yarn.lock par bloc de paquet.
+ */
+export function tryResolveYarnLockConflict(baseLines, oursLines, theirsLines) {
+    const baseParsed = parseYarnLock(baseLines.join("\n"));
+    const oursParsed = parseYarnLock(oursLines.join("\n"));
+    const theirsParsed = parseYarnLock(theirsLines.join("\n"));
+    if (!baseParsed || !oursParsed || !theirsParsed) {
+        return {
+            merged: null,
+            reason: "Impossible de parser une des versions du yarn.lock.",
+            resolvedBlocks: 0,
+            versionConflicts: 0,
+        };
+    }
+    const baseBlocks = baseParsed.blocks;
+    const oursBlocks = oursParsed.blocks;
+    const theirsBlocks = theirsParsed.blocks;
+    const allHeaders = new Set([...baseBlocks.keys(), ...oursBlocks.keys(), ...theirsBlocks.keys()]);
+    const mergedBlocks = new Map();
+    let resolvedBlocks = 0;
+    let versionConflicts = 0;
+    for (const header of allHeaders) {
+        const base = baseBlocks.get(header);
+        const ours = oursBlocks.get(header);
+        const theirs = theirsBlocks.get(header);
+        // Pas dans base → ajout
+        if (base === undefined) {
+            if (ours !== undefined && theirs !== undefined) {
+                mergedBlocks.set(header, ours === theirs ? ours : theirs);
+                resolvedBlocks++;
+            }
+            else if (ours !== undefined) {
+                mergedBlocks.set(header, ours);
+                resolvedBlocks++;
+            }
+            else if (theirs !== undefined) {
+                mergedBlocks.set(header, theirs);
+                resolvedBlocks++;
+            }
+            continue;
+        }
+        // Supprimé des deux → ok
+        if (ours === undefined && theirs === undefined) {
+            resolvedBlocks++;
+            continue;
+        }
+        // Supprimé d'un côté
+        if (ours === undefined) {
+            if (theirs === base) {
+                resolvedBlocks++; // pas modifié, supprimé par ours → ok
+            }
+            else {
+                mergedBlocks.set(header, theirs); // modifié par theirs → garder
+                resolvedBlocks++;
+            }
+            continue;
+        }
+        if (theirs === undefined) {
+            if (ours === base) {
+                resolvedBlocks++; // pas modifié, supprimé par theirs → ok
+            }
+            else {
+                mergedBlocks.set(header, ours); // modifié par ours → garder
+                resolvedBlocks++;
+            }
+            continue;
+        }
+        // Présent partout
+        const oursChanged = ours !== base;
+        const theirsChanged = theirs !== base;
+        if (!oursChanged && !theirsChanged) {
+            mergedBlocks.set(header, base);
+            resolvedBlocks++;
+        }
+        else if (!oursChanged) {
+            mergedBlocks.set(header, theirs);
+            resolvedBlocks++;
+        }
+        else if (!theirsChanged) {
+            mergedBlocks.set(header, ours);
+            resolvedBlocks++;
+        }
+        else if (ours === theirs) {
+            mergedBlocks.set(header, ours);
+            resolvedBlocks++;
+        }
+        else {
+            // Vrai conflit → prefer theirs
+            mergedBlocks.set(header, theirs);
+            versionConflicts++;
+            resolvedBlocks++;
+        }
+    }
+    // Reconstruire le fichier : preamble + blocs triés
+    const sortedHeaders = [...mergedBlocks.keys()].sort();
+    let output = oursParsed.preamble;
+    for (const header of sortedHeaders) {
+        output += `${header}\n`;
+        output += `${mergedBlocks.get(header)}\n\n`;
+    }
+    const reason = versionConflicts > 0
+        ? `Fusion sémantique yarn.lock : ${resolvedBlocks} bloc(s), ${versionConflicts} conflit(s) résolu(s) (prefer-theirs).`
+        : `Fusion sémantique yarn.lock réussie : ${resolvedBlocks} bloc(s) fusionné(s) sans conflit.`;
+    return {
+        merged: output,
+        reason,
+        resolvedBlocks,
+        versionConflicts,
+    };
+}
+//# sourceMappingURL=lockfile-yarn.js.map

package/dist/resolvers/lockfile-yarn.js.map

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

package/dist/resolvers/markdown.d.ts

@@ -0,0 +1,64 @@
+/**
+ * GitWand — Résolveur Markdown section-aware
+ *
+ * Résout les conflits dans les fichiers Markdown en identifiant
+ * la structure de sections (headings H1..H6) et en fusionnant
+ * section par section lorsque les modifications sont non-overlapping.
+ *
+ * Stratégie :
+ *  1. Détecter les headings dans les trois versions
+ *  2. Découper chaque version en sections (heading + contenu jusqu'au prochain heading de niveau ≤)
+ *  3. Pour chaque section :
+ *      a. Si identique dans ours et theirs → garder
+ *      b. Si modifiée d'un seul côté → accepter la modification
+ *      c. Si section ajoutée d'un côté → ajouter
+ *      d. Si modifiée des deux côtés différemment → conflit partiel (insert les deux versions)
+ *  4. Gestion du frontmatter YAML (entre --- au début du fichier) : traité séparément
+ *
+ * Limites :
+ *  - Ne pas résoudre les conflits intra-section (renvoyés au moteur textuel)
+ *  - Pas de merge sémantique du contenu riche (listes, tableaux, code)
+ */
+export interface MarkdownSection {
+    /** Heading complet (ex: "## Mon titre") ou null pour le bloc avant le 1er heading */
+    heading: string | null;
+    /** Niveau du heading (1..6) ou 0 pour le prologue */
+    level: number;
+    /** Lignes du contenu (sans le heading) */
+    lines: string[];
+    /** Index de début dans le tableau de lignes source */
+    startIdx: number;
+}
+/**
+ * Détecte et extrait le frontmatter YAML si présent (--- au début).
+ * Retourne { frontmatter: string[], rest: string[] }.
+ */
+export declare function extractFrontmatter(lines: string[]): {
+    frontmatter: string[];
+    rest: string[];
+};
+/**
+ * Découpe un tableau de lignes en sections Markdown.
+ * Chaque section commence par un heading ATX.
+ * Le contenu avant le premier heading forme une section "prologue" (level 0).
+ */
+export declare function parseSections(lines: string[]): MarkdownSection[];
+export interface MarkdownMergeResult {
+    /** Lignes fusionnées (null si conflit non résolvable) */
+    mergedLines: string[] | null;
+    /** Sections avec conflit non résolu */
+    conflictedSections: string[];
+    /** Nombre de sections fusionnées automatiquement */
+    resolvedSections: number;
+    /** Description de la fusion */
+    reason: string;
+}
+/**
+ * Fusionne deux versions Markdown section par section avec une base commune.
+ *
+ * @param baseLines  - Lignes de la version base
+ * @param oursLines  - Lignes de la version ours
+ * @param theirsLines - Lignes de la version theirs
+ */
+export declare function tryResolveMarkdownConflict(baseLines: string[], oursLines: string[], theirsLines: string[]): MarkdownMergeResult;
+//# sourceMappingURL=markdown.d.ts.map

package/dist/resolvers/markdown.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../src/resolvers/markdown.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAIH,MAAM,WAAW,eAAe;IAC9B,qFAAqF;IACrF,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,qDAAqD;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,0CAA0C;IAC1C,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,sDAAsD;IACtD,QAAQ,EAAE,MAAM,CAAC;CAClB;AAID;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG;IACnD,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,CAsBA;AAaD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,eAAe,EAAE,CA8BhE;AAuBD,MAAM,WAAW,mBAAmB;IAClC,yDAAyD;IACzD,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC7B,uCAAuC;IACvC,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,oDAAoD;IACpD,gBAAgB,EAAE,MAAM,CAAC;IACzB,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,MAAM,EAAE,EACnB,SAAS,EAAE,MAAM,EAAE,EACnB,WAAW,EAAE,MAAM,EAAE,GACpB,mBAAmB,CAwFrB"}