pi-hashline-edit-pro 4.2.11 → 4.3.0

package/src/replace.ts

@@ -90,7 +90,14 @@ export function hashSpan(hashes: string[], from: string, to: string): [number, n
   if (a < 0 || b < 0) return undefined;
   return [Math.min(a, b), Math.max(a, b)];
 }
-async function noteAnchorError(absolutePath: string, error: unknown, scopeHashes: string[], noPersist?: boolean): Promise<void> {
+
+export function spanForEdit(originalHashes: string[], from: string, to: string, resultContent: string): DiffSpan | undefined {
+  const span = hashSpan(originalHashes, from, to);
+  if (!span) return undefined;
+  const replacementCount = splitLines(resultContent).length - (originalHashes.length - (span[1] - span[0] + 1));
+  return { start: span[0], end: span[1], replacementCount };
+}
+async function noteAnchorError(absolutePath: string, error: unknown, noPersist?: boolean): Promise<void> {
   if (noPersist === true) return;
   if (error instanceof RangeStaleError) {
     adoptAnchors(absolutePath, error.rangeServedMap);
@@ -159,7 +166,7 @@ export async function execPipeline(
       strictBoundaryDedup,
     );
   } catch (error) {
-    await noteAnchorError(absolutePath, error, originalHashes, options?.noPersist);
+    await noteAnchorError(absolutePath, error, options?.noPersist);
     throw error;
   }
 
@@ -179,9 +186,8 @@ export async function execPipeline(
   );
 
   const sortedFixes = dedupRowsFromFixes(anchorResult.autoFixes ?? []);
-  const pipeSpan = isNoop ? undefined : hashSpan(originalHashes, edit.hash_bounds[0].hash, edit.hash_bounds[1].hash);
-  const pipeResultCount = splitLines(result).length;
-  const pipeSpans = pipeSpan ? [{ start: pipeSpan[0], end: pipeSpan[1], replacementCount: pipeResultCount - (originalHashes.length - (pipeSpan[1] - pipeSpan[0] + 1)) }] : undefined;
+  const pipeSpan = isNoop ? undefined : spanForEdit(originalHashes, edit.hash_bounds[0].hash, edit.hash_bounds[1].hash, result);
+  const pipeSpans = pipeSpan ? [pipeSpan] : undefined;
   return {
     path: displayPath,
     originalNormalized,

package/src/served.ts

@@ -1,6 +1,6 @@
 import { HASH_CLASS } from "./hashline/alphabet";
-import { hashSource } from "./hashline";
-import { contentChecksum } from "./hashline/hasher";
+import { lineChecksum } from "./hashline/hash";
+import { markServed } from "./anchor-registry";
 
 const SERVED_DIFF_ROW_RE = new RegExp(`^[+ ](${HASH_CLASS})│`);
 
@@ -26,7 +26,11 @@ export function buildServedMap(
   const entries: Array<[string, string]> = [];
   for (const hash of wantedHashes) {
     const idx = index.get(hash);
-    if (idx !== undefined) entries.push([hash, contentChecksum(hashSource(fileLines[idx]!))]);
+    if (idx !== undefined) entries.push([hash, lineChecksum(fileLines[idx]!)]);
   }
   return entries;
 }
+
+export function serveRows(path: string, fileHashes: string[], fileLines: string[], wantedHashes: string[]): void {
+  markServed(path, buildServedMap(fileHashes, fileLines, wantedHashes), new Set(fileHashes));
+}

package/src/utils.ts

@@ -22,14 +22,16 @@ export function normalizeAnchors(record: Record<string, unknown>): void {
   }
 }
 
+export function normalizeRequest(input: unknown): unknown {
+  if (!isRec(input)) return input;
+  const record: Record<string, unknown> = { ...input };
+  normalizeFilePath(record);
+  normalizeAnchors(record);
+  return record;
+}
+
 export function makePrepareArguments(): (args: unknown) => any {
-  return (args) => {
-    if (!isRec(args)) return args;
-    const record = { ...args };
-    normalizeFilePath(record);
-    normalizeAnchors(record);
-    return record;
-  };
+  return normalizeRequest;
 }
 
 export function splitLines(text: string): string[] {
@@ -293,7 +295,6 @@ export function decodeStringArray(value: unknown, warnings?: string[], label = "
 	if (candidate === undefined) return undefined;
 	const decoded = decodeArrayText(candidate);
 	if (decoded !== undefined) {
-		warnings?.push(`[W_BAD_SHAPE] Unwrapped JSON array syntax from a ${label} element.`);
 		return decoded;
 	}
 	if (looksLikeStringArray(candidate)) {

package/src/write-hook.ts

@@ -19,10 +19,6 @@ export function findServedHashEcho(content: string, served: ReadonlyMap<string,
   return searchEcho(splitLines(content), served);
 }
 
-export function findEditHashEcho(lines: string[], served: ReadonlyMap<string, string> | ReadonlySet<string>): { line: number; hash: string } | undefined {
-  return searchEcho(lines, served);
-}
-
 export async function servedHashEchoDenial(rawPath: string, content: string, cwd: string, signal?: AbortSignal): Promise<string | undefined> {
   abortIf(signal);
   const { resolved } = await resolveInCwd(rawPath, cwd);