Skip to content

feat: support extending JSONFormatter #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: support extending JSONFormatter #414

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions packages/jsondiffpatch/src/formatters/jsonpatch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type {
Delta,
ModifiedDelta,
ObjectDelta,
TextDiffDelta,
} from "../types.js";
import { applyJsonPatchRFC6902 } from "./jsonpatch-apply.js";

Expand Down Expand Up @@ -40,6 +41,13 @@ export interface MoveOp {
export type Op = AddOp | RemoveOp | ReplaceOp | MoveOp;

class JSONFormatter {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
protected processTextDiff(ops: Op[], path: string, diff: string) { // changed
throw new Error(
"JSONPatch (RFC 6902) doesn't support text diffs, disable textDiff option",
);
}

format(delta: Delta): Op[] {
const ops: Op[] = [];

Expand Down Expand Up @@ -75,9 +83,7 @@ class JSONFormatter {
}
// text diff
if (current.delta[2] === 2) {
throw new Error(
"JSONPatch (RFC 6902) doesn't support text diffs, disable textDiff option",
);
this.processTextDiff(ops, current.path, current.delta[0] as string);
}
} else if (current.delta._t === "a") {
// array delta
Expand All @@ -89,7 +95,7 @@ class JSONFormatter {
const inserts: { to: number; value: unknown }[] = [];
const updates: {
to: number;
delta: ObjectDelta | ArrayDelta | ModifiedDelta;
delta: ObjectDelta | ArrayDelta | ModifiedDelta | TextDiffDelta;
}[] = [];

for (const key of Object.keys(arrayDelta)) {
Expand Down Expand Up @@ -118,10 +124,8 @@ class JSONFormatter {
} else if (itemDelta.length === 2) {
updates.push({ to: index, delta: itemDelta });
} else if (itemDelta.length === 3) {
if (itemDelta[2] === 3) {
throw new Error(
"JSONPatch (RFC 6902) doesn't support text diffs, disable textDiff option",
);
if (itemDelta[2] === 2) {
updates.push({ to: index, delta: itemDelta });
}
}
}
Expand Down Expand Up @@ -193,6 +197,8 @@ class JSONFormatter {
path: `${current.path}/${to}`,
value: delta[1],
});
} else {
this.processTextDiff(ops, `${current.path}/${to}`, delta[0]);
}
} else {
// nested delta (object or array)
Expand Down