@pierre/diffs 1.1.2 → 1.1.3

package/dist/utils/resolveMergeConflict.js

@@ -1,30 +0,0 @@
-import { splitFileContents } from "./splitFileContents.js";
-import { getMergeConflictRegions } from "./getMergeConflictLineTypes.js";
-
-//#region src/utils/resolveMergeConflict.ts
-function resolveMergeConflict(contents, payload) {
-	const lines = splitFileContents(contents);
-	const conflict = getMergeConflictRegions(lines).find((region) => region.conflictIndex === payload.conflict.conflictIndex);
-	if (conflict == null) return contents;
-	return applyMergeConflictResolution(contents, lines, conflict, payload.resolution);
-}
-function applyMergeConflictResolution(contents, lines, conflict, resolution) {
-	if (!isConflictRegionValid(conflict, lines.length)) return contents;
-	const currentEnd = conflict.baseMarkerLineIndex ?? conflict.separatorLineIndex;
-	if (currentEnd <= conflict.startLineIndex || currentEnd > conflict.separatorLineIndex) return contents;
-	const currentLines = lines.slice(conflict.startLineIndex + 1, currentEnd);
-	const incomingLines = lines.slice(conflict.separatorLineIndex + 1, conflict.endLineIndex);
-	const mergedLines = resolution === "current" ? currentLines : resolution === "incoming" ? incomingLines : [...currentLines, ...incomingLines];
-	return [
-		...lines.slice(0, conflict.startLineIndex),
-		...mergedLines,
-		...lines.slice(conflict.endLineIndex + 1)
-	].join("");
-}
-function isConflictRegionValid(conflict, totalLines) {
-	return conflict.startLineIndex >= 0 && conflict.separatorLineIndex > conflict.startLineIndex && conflict.endLineIndex > conflict.separatorLineIndex && conflict.endLineIndex < totalLines;
-}
-
-//#endregion
-export { resolveMergeConflict };
-//# sourceMappingURL=resolveMergeConflict.js.map

package/dist/utils/resolveMergeConflict.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"resolveMergeConflict.js","names":[],"sources":["../../src/utils/resolveMergeConflict.ts"],"sourcesContent":["import type {\n  MergeConflictActionPayload,\n  MergeConflictRegion,\n  MergeConflictResolution,\n} from '../types';\nimport { getMergeConflictRegions } from './getMergeConflictLineTypes';\nimport { splitFileContents } from './splitFileContents';\n\nexport function resolveMergeConflict(\n  contents: string,\n  payload: MergeConflictActionPayload\n): string {\n  const lines = splitFileContents(contents);\n  const conflict = getMergeConflictRegions(lines).find(\n    (region) => region.conflictIndex === payload.conflict.conflictIndex\n  );\n  if (conflict == null) {\n    return contents;\n  }\n  return applyMergeConflictResolution(\n    contents,\n    lines,\n    conflict,\n    payload.resolution\n  );\n}\n\nfunction applyMergeConflictResolution(\n  contents: string,\n  lines: string[],\n  conflict: MergeConflictRegion,\n  resolution: MergeConflictResolution\n): string {\n  if (!isConflictRegionValid(conflict, lines.length)) {\n    return contents;\n  }\n\n  const currentEnd =\n    conflict.baseMarkerLineIndex ?? conflict.separatorLineIndex;\n  if (\n    currentEnd <= conflict.startLineIndex ||\n    currentEnd > conflict.separatorLineIndex\n  ) {\n    return contents;\n  }\n\n  const currentLines = lines.slice(conflict.startLineIndex + 1, currentEnd);\n  const incomingLines = lines.slice(\n    conflict.separatorLineIndex + 1,\n    conflict.endLineIndex\n  );\n\n  const mergedLines =\n    resolution === 'current'\n      ? currentLines\n      : resolution === 'incoming'\n        ? incomingLines\n        : [...currentLines, ...incomingLines];\n\n  return [\n    ...lines.slice(0, conflict.startLineIndex),\n    ...mergedLines,\n    ...lines.slice(conflict.endLineIndex + 1),\n  ].join('');\n}\n\nfunction isConflictRegionValid(\n  conflict: MergeConflictRegion,\n  totalLines: number\n): boolean {\n  return (\n    conflict.startLineIndex >= 0 &&\n    conflict.separatorLineIndex > conflict.startLineIndex &&\n    conflict.endLineIndex > conflict.separatorLineIndex &&\n    conflict.endLineIndex < totalLines\n  );\n}\n"],"mappings":";;;;AAQA,SAAgB,qBACd,UACA,SACQ;CACR,MAAM,QAAQ,kBAAkB,SAAS;CACzC,MAAM,WAAW,wBAAwB,MAAM,CAAC,MAC7C,WAAW,OAAO,kBAAkB,QAAQ,SAAS,cACvD;AACD,KAAI,YAAY,KACd,QAAO;AAET,QAAO,6BACL,UACA,OACA,UACA,QAAQ,WACT;;AAGH,SAAS,6BACP,UACA,OACA,UACA,YACQ;AACR,KAAI,CAAC,sBAAsB,UAAU,MAAM,OAAO,CAChD,QAAO;CAGT,MAAM,aACJ,SAAS,uBAAuB,SAAS;AAC3C,KACE,cAAc,SAAS,kBACvB,aAAa,SAAS,mBAEtB,QAAO;CAGT,MAAM,eAAe,MAAM,MAAM,SAAS,iBAAiB,GAAG,WAAW;CACzE,MAAM,gBAAgB,MAAM,MAC1B,SAAS,qBAAqB,GAC9B,SAAS,aACV;CAED,MAAM,cACJ,eAAe,YACX,eACA,eAAe,aACb,gBACA,CAAC,GAAG,cAAc,GAAG,cAAc;AAE3C,QAAO;EACL,GAAG,MAAM,MAAM,GAAG,SAAS,eAAe;EAC1C,GAAG;EACH,GAAG,MAAM,MAAM,SAAS,eAAe,EAAE;EAC1C,CAAC,KAAK,GAAG;;AAGZ,SAAS,sBACP,UACA,YACS;AACT,QACE,SAAS,kBAAkB,KAC3B,SAAS,qBAAqB,SAAS,kBACvC,SAAS,eAAe,SAAS,sBACjC,SAAS,eAAe"}