@gitwand/core 1.6.0

package/dist/resolvers/dispatcher.js

@@ -0,0 +1,290 @@
+/**
+ * GitWand — Dispatcher de résolveurs par format
+ *
+ * Point d'entrée pour la résolution format-aware.
+ * Détecte le type de fichier à partir de son chemin et tente une
+ * résolution spécialisée avant de tomber en fallback sur le moteur textuel.
+ *
+ * Architecture :
+ *
+ *   resolver.ts
+ *     └─ tryFormatAwareResolve(hunk, filePath)
+ *          ├─ isJsonFile(filePath)    → tryResolveJsonConflict()
+ *          ├─ isMarkdownFile(filePath) → tryResolveMarkdownConflict()
+ *          ├─ isYamlFile(filePath)    → tryResolveYamlConflict()
+ *          ├─ isImportFile(filePath)  → tryResolveImportConflict() (si bloc d'imports)
+ *          ├─ isVueFile(filePath)     → tryResolveVueConflict()
+ *          ├─ isCssFile(filePath)     → tryResolveCssConflict()
+ *          └─ null → moteur textuel standard (resolver.ts switch)
+ *
+ * Chaque résolveur spécialisé retourne des lignes résolues ou null
+ * (null = le résolveur ne sait pas → fallback).
+ *
+ * Phase 7.3b — Nouveaux résolveurs :
+ *   - YAML (.yaml / .yml)
+ *   - TS/JS imports (.ts / .js / .tsx / .jsx / .mjs / .cjs)
+ *   - Vue SFC (.vue)
+ *   - CSS/SCSS/Less (.css / .scss / .less)
+ */
+import { tryResolveJsonConflict } from "./json.js";
+import { tryResolveMarkdownConflict } from "./markdown.js";
+import { tryResolveYamlConflict } from "./yaml.js";
+import { tryResolveImportConflict, isImportBlock } from "./imports.js";
+import { tryResolveVueConflict } from "./vue.js";
+import { tryResolveCssConflict } from "./css.js";
+import { tryResolveLockfileNpmConflict } from "./lockfile-npm.js";
+import { tryResolveYarnLockConflict } from "./lockfile-yarn.js";
+import { tryResolvePnpmLockConflict } from "./lockfile-pnpm.js";
+import { tryResolveCargoConflict } from "./cargo.js";
+import { tryResolveDotenvConflict } from "./dotenv.js";
+import { tryResolveDockerfileConflict } from "./dockerfile.js";
+// ─── Type detection ───────────────────────────────────────
+/** Vérifie si le fichier est JSON ou JSONC */
+export function isJsonFile(filePath) {
+    return /\.(json|jsonc)$/i.test(filePath);
+}
+/** Vérifie si le fichier est Markdown */
+export function isMarkdownFile(filePath) {
+    return /\.(md|mdx|markdown)$/i.test(filePath);
+}
+/** Vérifie si le fichier est YAML */
+export function isYamlFile(filePath) {
+    return /\.(ya?ml)$/i.test(filePath);
+}
+/** Vérifie si le fichier est un module TS/JS/JSX/TSX */
+export function isJsFile(filePath) {
+    return /\.(ts|tsx|js|jsx|mjs|cjs)$/i.test(filePath);
+}
+/** Vérifie si le fichier est un composant Vue SFC */
+export function isVueFile(filePath) {
+    return /\.vue$/i.test(filePath);
+}
+/** Vérifie si le fichier est CSS, SCSS ou Less */
+export function isCssFile(filePath) {
+    return /\.(css|scss|less|sass)$/i.test(filePath);
+}
+/** Vérifie si le fichier est un lockfile npm (package-lock.json) */
+export function isNpmLockfile(filePath) {
+    return /package-lock\.json$/i.test(filePath);
+}
+/** Vérifie si le fichier est un lockfile yarn (yarn.lock) */
+export function isYarnLockfile(filePath) {
+    return /yarn\.lock$/i.test(filePath);
+}
+/** Vérifie si le fichier est un lockfile pnpm (pnpm-lock.yaml) */
+export function isPnpmLockfile(filePath) {
+    return /pnpm-lock\.ya?ml$/i.test(filePath);
+}
+/** Vérifie si le fichier est un lockfile quelconque */
+export function isLockfile(filePath) {
+    return isNpmLockfile(filePath) || isYarnLockfile(filePath) || isPnpmLockfile(filePath);
+}
+/** Vérifie si le fichier est un Cargo.toml ou Cargo.lock */
+export function isCargoFile(filePath) {
+    return /Cargo\.(toml|lock)$/i.test(filePath);
+}
+/** Vérifie si le fichier est un .env, .env.*, ou *.env */
+export function isDotenvFile(filePath) {
+    return /(?:^|[\\/])\.env(?:\.|$)|\.env$/i.test(filePath);
+}
+/** Vérifie si le fichier est un Dockerfile */
+export function isDockerfile(filePath) {
+    return /(?:^|[\\/])Dockerfile(?:\.|$)|\.dockerfile$/i.test(filePath);
+}
+// ─── Main dispatcher ──────────────────────────────────────
+/**
+ * Tente de résoudre un hunk de conflit avec le résolveur approprié
+ * selon le type de fichier.
+ *
+ * Retourne `lines !== null` si le résolveur a réussi, `null` sinon.
+ * Dans tous les cas, `reason` décrit ce qui s'est passé.
+ *
+ * @param hunk - Le hunk de conflit à résoudre
+ * @param filePath - Le chemin du fichier (pour déterminer le résolveur)
+ */
+export function tryFormatAwareResolve(hunk, filePath) {
+    // ── Cargo.toml / Cargo.lock (avant JSON) ──────────────────
+    if (isCargoFile(filePath)) {
+        const result = tryResolveCargoConflict(filePath, hunk.baseLines, hunk.oursLines, hunk.theirsLines);
+        if (result.lines !== null) {
+            return { lines: result.lines, reason: `[cargo] ${result.reason}`, resolverUsed: "cargo" };
+        }
+        return { lines: null, reason: `[cargo] ${result.reason}`, resolverUsed: "cargo" };
+    }
+    // ── .env / .env.* ─────────────────────────────────────────
+    if (isDotenvFile(filePath)) {
+        const result = tryResolveDotenvConflict(hunk.baseLines, hunk.oursLines, hunk.theirsLines);
+        if (result.lines !== null) {
+            return { lines: result.lines, reason: `[dotenv] ${result.reason}`, resolverUsed: "dotenv" };
+        }
+        return { lines: null, reason: `[dotenv] ${result.reason}`, resolverUsed: "dotenv" };
+    }
+    // ── Dockerfile ────────────────────────────────────────────
+    if (isDockerfile(filePath)) {
+        const result = tryResolveDockerfileConflict(hunk.baseLines, hunk.oursLines, hunk.theirsLines);
+        if (result.lines !== null) {
+            return { lines: result.lines, reason: `[dockerfile] ${result.reason}`, resolverUsed: "dockerfile" };
+        }
+        return { lines: null, reason: `[dockerfile] ${result.reason}`, resolverUsed: "dockerfile" };
+    }
+    // ── Lockfiles (avant JSON car package-lock.json est un .json) ──
+    if (isNpmLockfile(filePath)) {
+        const result = tryResolveLockfileNpmConflict(hunk.baseLines, hunk.oursLines, hunk.theirsLines);
+        if (result.merged !== null) {
+            return {
+                lines: result.merged.split("\n"),
+                reason: `[lockfile-npm] ${result.reason}`,
+                resolverUsed: "lockfile-npm",
+            };
+        }
+        return {
+            lines: null,
+            reason: `[lockfile-npm] ${result.reason}`,
+            resolverUsed: "lockfile-npm",
+        };
+    }
+    if (isYarnLockfile(filePath)) {
+        const result = tryResolveYarnLockConflict(hunk.baseLines, hunk.oursLines, hunk.theirsLines);
+        if (result.merged !== null) {
+            return {
+                lines: result.merged.split("\n"),
+                reason: `[lockfile-yarn] ${result.reason}`,
+                resolverUsed: "lockfile-yarn",
+            };
+        }
+        return {
+            lines: null,
+            reason: `[lockfile-yarn] ${result.reason}`,
+            resolverUsed: "lockfile-yarn",
+        };
+    }
+    if (isPnpmLockfile(filePath)) {
+        const result = tryResolvePnpmLockConflict(hunk.baseLines, hunk.oursLines, hunk.theirsLines);
+        if (result.merged !== null) {
+            return {
+                lines: result.merged.split("\n"),
+                reason: `[lockfile-pnpm] ${result.reason}`,
+                resolverUsed: "lockfile-pnpm",
+            };
+        }
+        return {
+            lines: null,
+            reason: `[lockfile-pnpm] ${result.reason}`,
+            resolverUsed: "lockfile-pnpm",
+        };
+    }
+    // ── JSON / JSONC ──────────────────────────────────────
+    if (isJsonFile(filePath)) {
+        const result = tryResolveJsonConflict(hunk.baseLines, hunk.oursLines, hunk.theirsLines);
+        if (result.merged !== null) {
+            const mergedText = typeof result.merged === "string"
+                ? result.merged
+                : JSON.stringify(result.merged, null, 2);
+            return {
+                lines: mergedText.split("\n"),
+                reason: `[json] ${result.reason}`,
+                resolverUsed: "json",
+            };
+        }
+        return {
+            lines: null,
+            reason: `[json] ${result.reason}`,
+            resolverUsed: "json",
+        };
+    }
+    // ── Markdown ──────────────────────────────────────────
+    if (isMarkdownFile(filePath)) {
+        const result = tryResolveMarkdownConflict(hunk.baseLines, hunk.oursLines, hunk.theirsLines);
+        if (result.mergedLines !== null) {
+            return {
+                lines: result.mergedLines,
+                reason: `[markdown] ${result.reason}`,
+                resolverUsed: "markdown",
+            };
+        }
+        return {
+            lines: null,
+            reason: `[markdown] ${result.reason}`,
+            resolverUsed: "markdown",
+        };
+    }
+    // ── YAML ──────────────────────────────────────────────
+    if (isYamlFile(filePath)) {
+        const result = tryResolveYamlConflict(hunk.baseLines, hunk.oursLines, hunk.theirsLines);
+        if (result.mergedLines !== null) {
+            return {
+                lines: result.mergedLines,
+                reason: `[yaml] ${result.reason}`,
+                resolverUsed: "yaml",
+            };
+        }
+        return {
+            lines: null,
+            reason: `[yaml] ${result.reason}`,
+            resolverUsed: "yaml",
+        };
+    }
+    // ── Vue SFC ───────────────────────────────────────────
+    if (isVueFile(filePath)) {
+        const result = tryResolveVueConflict(hunk.baseLines, hunk.oursLines, hunk.theirsLines);
+        if (result.mergedLines !== null) {
+            return {
+                lines: result.mergedLines,
+                reason: `[vue] ${result.reason}`,
+                resolverUsed: "vue",
+            };
+        }
+        return {
+            lines: null,
+            reason: `[vue] ${result.reason}`,
+            resolverUsed: "vue",
+        };
+    }
+    // ── CSS / SCSS / Less ─────────────────────────────────
+    if (isCssFile(filePath)) {
+        const result = tryResolveCssConflict(hunk.baseLines, hunk.oursLines, hunk.theirsLines);
+        if (result.mergedLines !== null) {
+            return {
+                lines: result.mergedLines,
+                reason: `[css] ${result.reason}`,
+                resolverUsed: "css",
+            };
+        }
+        return {
+            lines: null,
+            reason: `[css] ${result.reason}`,
+            resolverUsed: "css",
+        };
+    }
+    // ── TS/JS/TSX/JSX — résolveur d'imports ──────────────
+    // Uniquement si le bloc entier est composé d'import statements,
+    // et uniquement si les deux côtés sont différents (si ours === theirs,
+    // le moteur same_change gère la résolution sans réordonner les imports).
+    if (isJsFile(filePath)) {
+        if (isImportBlock(hunk.oursLines) &&
+            isImportBlock(hunk.theirsLines) &&
+            hunk.oursLines.join("\n") !== hunk.theirsLines.join("\n")) {
+            const result = tryResolveImportConflict(hunk.baseLines, hunk.oursLines, hunk.theirsLines);
+            if (result.mergedLines !== null) {
+                return {
+                    lines: result.mergedLines,
+                    reason: `[imports] ${result.reason}`,
+                    resolverUsed: "imports",
+                };
+            }
+            return {
+                lines: null,
+                reason: `[imports] ${result.reason}`,
+                resolverUsed: "imports",
+            };
+        }
+        // Bloc non-import → pas de résolveur spécialisé pour TS/JS (fallback textuel)
+    }
+    // ── Pas de résolveur spécialisé ───────────────────────
+    return {
+        lines: null,
+        reason: "Aucun résolveur spécialisé pour ce type de fichier.",
+        resolverUsed: "none",
+    };
+}
+//# sourceMappingURL=dispatcher.js.map

package/dist/resolvers/dispatcher.js.map

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

package/dist/resolvers/dockerfile.d.ts

@@ -0,0 +1,24 @@
+/**
+ * GitWand — Resolver Dockerfile (v1.4)
+ *
+ * Merge sémantique de Dockerfiles, avec support multi-stage.
+ * Zéro dépendance externe.
+ *
+ * Stratégies par instruction :
+ * - FROM   : prefer theirs (image de base plus récente)
+ * - ENV/ARG : merge par clé (union, prefer theirs)
+ * - COPY/ADD : merge si destinations distinctes ; conflit si même dest
+ * - RUN    : conservatif — fallback si conflit
+ * - WORKDIR, EXPOSE, USER : prefer theirs si conflit
+ * - COMMENT, BLANK : préserver depuis theirs
+ */
+type FormatResult = {
+    lines: string[] | null;
+    reason: string;
+};
+/**
+ * Tente de résoudre un conflit dans un Dockerfile.
+ */
+export declare function tryResolveDockerfileConflict(_baseLines: string[], oursLines: string[], theirsLines: string[]): FormatResult;
+export {};
+//# sourceMappingURL=dockerfile.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dockerfile.d.ts","sourceRoot":"","sources":["../../src/resolvers/dockerfile.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AA4BH,KAAK,YAAY,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAuK/D;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,MAAM,EAAE,EACpB,SAAS,EAAE,MAAM,EAAE,EACnB,WAAW,EAAE,MAAM,EAAE,GACpB,YAAY,CAoEd"}

package/dist/resolvers/dockerfile.js

@@ -0,0 +1,221 @@
+/**
+ * GitWand — Resolver Dockerfile (v1.4)
+ *
+ * Merge sémantique de Dockerfiles, avec support multi-stage.
+ * Zéro dépendance externe.
+ *
+ * Stratégies par instruction :
+ * - FROM   : prefer theirs (image de base plus récente)
+ * - ENV/ARG : merge par clé (union, prefer theirs)
+ * - COPY/ADD : merge si destinations distinctes ; conflit si même dest
+ * - RUN    : conservatif — fallback si conflit
+ * - WORKDIR, EXPOSE, USER : prefer theirs si conflit
+ * - COMMENT, BLANK : préserver depuis theirs
+ */
+// ─── Parser ──────────────────────────────────────────────────
+const DOCKERFILE_INSTRUCTIONS = new Set([
+    "FROM", "RUN", "CMD", "LABEL", "EXPOSE", "ENV", "ADD", "COPY",
+    "ENTRYPOINT", "VOLUME", "USER", "WORKDIR", "ARG", "ONBUILD",
+    "STOPSIGNAL", "HEALTHCHECK", "SHELL",
+]);
+function parseDockerfileInstructions(lines) {
+    const instructions = [];
+    let i = 0;
+    while (i < lines.length) {
+        const line = lines[i];
+        const trimmed = line.trim();
+        // Ligne vide
+        if (!trimmed) {
+            instructions.push({ kind: "BLANK", raw: [line] });
+            i++;
+            continue;
+        }
+        // Commentaire
+        if (trimmed.startsWith("#")) {
+            instructions.push({ kind: "COMMENT", raw: [line] });
+            i++;
+            continue;
+        }
+        // Instruction Dockerfile
+        const firstWord = trimmed.split(/\s+/)[0].toUpperCase();
+        if (DOCKERFILE_INSTRUCTIONS.has(firstWord)) {
+            // Collecter les lignes de continuation (\)
+            const rawLines = [line];
+            while (lines[i]?.endsWith("\\") && i + 1 < lines.length) {
+                i++;
+                rawLines.push(lines[i]);
+            }
+            i++;
+            const fullLine = rawLines.map((l) => l.replace(/\\\s*$/, "").trim()).join(" ");
+            const rest = fullLine.slice(firstWord.length).trim();
+            let instr = { kind: firstWord, raw: rawLines };
+            if (firstWord === "FROM") {
+                const asPart = rest.match(/\bAS\s+(\S+)/i);
+                instr.key = asPart?.[1]; // alias
+                instr.value = rest.replace(/\s+AS\s+\S+/i, "").trim();
+            }
+            else if (firstWord === "ENV" || firstWord === "ARG") {
+                const eqIdx = rest.indexOf("=");
+                if (eqIdx > 0) {
+                    instr.key = rest.slice(0, eqIdx).trim();
+                    instr.value = rest.slice(eqIdx + 1).trim();
+                }
+                else {
+                    instr.key = rest.split(/\s+/)[0];
+                    instr.value = rest.slice(instr.key.length).trim();
+                }
+            }
+            else if (firstWord === "COPY" || firstWord === "ADD") {
+                // Dernier token est la destination
+                const parts = rest.split(/\s+/);
+                instr.key = parts[parts.length - 1]; // dest
+            }
+            else if (firstWord === "WORKDIR") {
+                instr.key = rest;
+            }
+            instructions.push(instr);
+        }
+        else {
+            instructions.push({ kind: "OTHER", raw: [line] });
+            i++;
+        }
+    }
+    return instructions;
+}
+// ─── Merge d'un stage ─────────────────────────────────────────
+/**
+ * Fusionne deux listes d'instructions d'un même stage Dockerfile.
+ * Retourne les lignes fusionnées ou null si un conflit irréductible est détecté.
+ */
+function mergeStage(oursInstructions, theirsInstructions) {
+    // Indexer theirs par (kind, key)
+    const theirsMap = new Map();
+    for (const instr of theirsInstructions) {
+        const mapKey = instr.key ? `${instr.kind}:${instr.key}` : instr.kind;
+        theirsMap.set(mapKey, instr);
+    }
+    const result = [];
+    const seen = new Set();
+    for (const oursInstr of oursInstructions) {
+        const mapKey = oursInstr.key ? `${oursInstr.kind}:${oursInstr.key}` : oursInstr.kind;
+        const theirsInstr = theirsMap.get(mapKey);
+        if (!theirsInstr) {
+            // Instruction seulement dans ours → inclure
+            result.push(...oursInstr.raw);
+            seen.add(mapKey);
+            continue;
+        }
+        seen.add(mapKey);
+        const oursRaw = oursInstr.raw.join("\n");
+        const theirsRaw = theirsInstr.raw.join("\n");
+        if (oursRaw === theirsRaw) {
+            // Identiques → inclure une fois
+            result.push(...oursInstr.raw);
+            continue;
+        }
+        // Conflit : stratégie par instruction
+        switch (oursInstr.kind) {
+            case "FROM":
+                // prefer theirs (image de base plus récente)
+                result.push(...theirsInstr.raw);
+                break;
+            case "ENV":
+            case "ARG":
+                // prefer theirs (valeur entrante)
+                result.push(...theirsInstr.raw);
+                break;
+            case "WORKDIR":
+            case "EXPOSE":
+            case "USER":
+                // prefer theirs
+                result.push(...theirsInstr.raw);
+                break;
+            case "COPY":
+            case "ADD":
+                // Même destination → conflit irréductible
+                return null;
+            case "RUN":
+            case "CMD":
+            case "ENTRYPOINT":
+                // Conservatif → fallback
+                return null;
+            default:
+                // prefer theirs
+                result.push(...theirsInstr.raw);
+        }
+    }
+    // Instructions seulement dans theirs
+    for (const [mapKey, instr] of theirsMap) {
+        if (!seen.has(mapKey)) {
+            result.push(...instr.raw);
+        }
+    }
+    return result;
+}
+// ─── Résolution ──────────────────────────────────────────────
+/**
+ * Tente de résoudre un conflit dans un Dockerfile.
+ */
+export function tryResolveDockerfileConflict(_baseLines, oursLines, theirsLines) {
+    const oursInstructions = parseDockerfileInstructions(oursLines);
+    const theirsInstructions = parseDockerfileInstructions(theirsLines);
+    // Détecter les stages FROM…AS
+    const splitByStage = (instructions) => {
+        const stages = [];
+        let current = [];
+        for (const instr of instructions) {
+            if (instr.kind === "FROM" && current.length > 0) {
+                stages.push(current);
+                current = [];
+            }
+            current.push(instr);
+        }
+        if (current.length > 0)
+            stages.push(current);
+        return stages;
+    };
+    const oursStages = splitByStage(oursInstructions);
+    const theirsStages = splitByStage(theirsInstructions);
+    // Indexer les stages theirs par alias FROM
+    const getStageKey = (stage) => {
+        const from = stage.find((i) => i.kind === "FROM");
+        return from?.key ?? from?.value ?? `__stage_${Math.random()}`;
+    };
+    const theirsStageMap = new Map();
+    for (const stage of theirsStages) {
+        theirsStageMap.set(getStageKey(stage), stage);
+    }
+    const resultLines = [];
+    const seenStages = new Set();
+    for (const oursStage of oursStages) {
+        const key = getStageKey(oursStage);
+        const theirsStage = theirsStageMap.get(key);
+        seenStages.add(key);
+        if (!theirsStage) {
+            // Stage seulement dans ours → inclure
+            for (const instr of oursStage)
+                resultLines.push(...instr.raw);
+            continue;
+        }
+        const merged = mergeStage(oursStage, theirsStage);
+        if (!merged) {
+            return {
+                lines: null,
+                reason: "[dockerfile] Conflit irréductible dans un stage — fallback textuel.",
+            };
+        }
+        resultLines.push(...merged);
+    }
+    // Stages seulement dans theirs → les ajouter
+    for (const [key, stage] of theirsStageMap) {
+        if (!seenStages.has(key)) {
+            for (const instr of stage)
+                resultLines.push(...instr.raw);
+        }
+    }
+    return {
+        lines: resultLines,
+        reason: "Dockerfile — merge par stage et instruction (FROM prefer-theirs, ENV/ARG par clé, RUN conservatif).",
+    };
+}
+//# sourceMappingURL=dockerfile.js.map

package/dist/resolvers/dockerfile.js.map

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

package/dist/resolvers/dotenv.d.ts

@@ -0,0 +1,27 @@
+/**
+ * GitWand — Resolver .env (v1.4)
+ *
+ * Merge de fichiers .env, .env.*, *.env par clé.
+ * Zéro dépendance externe.
+ *
+ * Grammaire supportée :
+ *   LINE = COMMENT | BLANK | EXPORT? KEY '=' VALUE
+ *   COMMENT = '#' ...
+ *   EXPORT  = 'export '
+ *   KEY     = [A-Z_][A-Z0-9_]*  (insensible à la casse pour la détection)
+ *   VALUE   = QUOTED | UNQUOTED
+ *
+ * Limitations :
+ * - Valeurs multilignes (backslash continuation) → fallback textuel
+ * - Nested quotes complexes → fallback textuel
+ */
+type FormatResult = {
+    lines: string[] | null;
+    reason: string;
+};
+/**
+ * Tente de résoudre un conflit dans un fichier .env.
+ */
+export declare function tryResolveDotenvConflict(_baseLines: string[], oursLines: string[], theirsLines: string[]): FormatResult;
+export {};
+//# sourceMappingURL=dotenv.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dotenv.d.ts","sourceRoot":"","sources":["../../src/resolvers/dotenv.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAcH,KAAK,YAAY,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AA2D/D;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,MAAM,EAAE,EACpB,SAAS,EAAE,MAAM,EAAE,EACnB,WAAW,EAAE,MAAM,EAAE,GACpB,YAAY,CAiDd"}