@gitkraken/conflict-tools 0.2.4-beta.9 → 0.4.0

package/dist/validation/markers.d.ts

@@ -0,0 +1,11 @@
+import { Issue } from "../types/issue.js";
+
+//#region src/validation/markers.d.ts
+interface VerificationResult {
+  valid: boolean;
+  issues?: Issue[];
+}
+declare const CONFLICT_MARKER_PATTERNS: readonly [RegExp, RegExp, RegExp, RegExp];
+declare function checkResidualMarkers(_filePath: string, content: string): VerificationResult;
+//#endregion
+export { CONFLICT_MARKER_PATTERNS, VerificationResult, checkResidualMarkers };

package/dist/{ports/verify.js → validation/markers.js}

@@ -1,2 +1,2 @@
 const e=[/^<{7}(\s|$)/,/^\|{7}(\s|$)/,/^={7}(\s|$)/,/^>{7}(\s|$)/];function t(t,n){let r=n.split(`
-`),i=[];for(let t=0;t<r.length;t++){let n=r[t]??``;for(let r of e)if(r.test(n)){i.push(t+1);break}}return i.length===0?{valid:!0}:{valid:!1,issues:[{severity:`error`,message:`Residual conflict markers found at line(s) ${i.join(`, `)}.`}]}}export{t as checkResidualMarkers};
+`),i=[];for(let t=0;t<r.length;t++){let n=r[t]??``;for(let r of e)if(r.test(n)){i.push(t+1);break}}return i.length===0?{valid:!0}:{valid:!1,issues:[{severity:`error`,message:`Residual conflict markers found at line(s) ${i.join(`, `)}.`}]}}export{e as CONFLICT_MARKER_PATTERNS,t as checkResidualMarkers};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitkraken/conflict-tools",
-  "version": "0.2.4-beta.9",
+  "version": "0.4.0",
   "description": "AI-powered git conflict resolution.",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Axosoft, LLC dba GitKraken",

package/dist/ports/verify.d.ts

@@ -1,30 +0,0 @@
-import { SourceOverlay } from "./parser.js";
-import { Issue } from "../types/issue.js";
-
-//#region src/ports/verify.d.ts
-interface VerificationResult {
-  valid: boolean;
-  issues?: Issue[];
-}
-interface ValidatorFinding {
-  /** Open category string set by the consumer (e.g. `'type-error'`, `'lint:no-console'`). */
-  category: string;
-  severity: 'error' | 'warning';
-  file: string;
-  /** 1-indexed. */
-  line?: number;
-  message: string;
-}
-/**
- * The consumer's validation port (RFC stages 5/7). Plug in any checks — syntax, real import
- * resolution, types, lint, project rules. **Non-blocking**: runs post-refine over an overlay (one file
- * for per-file validation, or the whole touched set for cross-file); its findings are advisory (folded
- * into the operation's findings and verdict), never a re-resolve. The only blocking gate is residual
- * conflict markers, checked built-in by the resolver ({@link checkResidualMarkers}) — not this port.
- */
-interface Validator {
-  validate(sources: SourceOverlay): Promise<ValidatorFinding[]>;
-}
-declare function checkResidualMarkers(_filePath: string, content: string): VerificationResult;
-//#endregion
-export { Validator, ValidatorFinding, VerificationResult, checkResidualMarkers };