Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@maxjay/patchwork",
"version": "0.17.0",
"version": "0.17.1",
"description": "A JSON editing engine with base/draft, diff, undo, and scoped lenses.",
"type": "module",
"main": "dist/index.js",
Expand Down
85 changes: 85 additions & 0 deletions src/engine.array-semantics.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -489,3 +489,88 @@ describe('edge cases', () => {
expect(ops.some(op => op.op === OpType.Remove && (op as any).identity === 'us')).toBe(true);
});
});

// ---------------------------------------------------------------------------
// diff — includeUnchanged propagation into nested keyed arrays
//
// Schema anatomy: orders (keyed by ref) → each order has lineItems (keyed by sku).
// When diff() is called with includeUnchanged: true for a specific lineItems path,
// it should return Unchanged ops for every unmodified line item.
// Bug: diffArrayByKey hard-coded includeUnchanged: false when recursing into
// matched element pairs, so nested Unchanged ops were never emitted.
// ---------------------------------------------------------------------------

const ordersSchema = makeNestedSchema('ref', 'sku');

// Convenience: build an engine with one order that has three line items.
function makeOrdersEngine() {
return new Engine<any>(
{
items: [
{
ref: 'ORD-1',
label: 'First order',
children: [
{ sku: 'ALPHA', qty: 1 },
{ sku: 'BETA', qty: 2 },
{ sku: 'GAMMA', qty: 5 },
],
},
{
ref: 'ORD-2',
label: 'Second order',
children: [
{ sku: 'DELTA', qty: 3 },
],
},
],
},
{ schema: ordersSchema },
);
}

describe('diff — includeUnchanged propagation into nested keyed arrays', () => {
it('no changes: diff on child path with includeUnchanged returns Unchanged for every child', () => {
const e = makeOrdersEngine();
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops).toHaveLength(3);
expect(ops.every(o => o.op === OpType.Unchanged)).toBe(true);
expect(ops.map((o: any) => o.identity).sort()).toEqual(['ALPHA', 'BETA', 'GAMMA']);
});

it('one child removed: diff returns Remove + Unchanged for remaining children', () => {
const e = makeOrdersEngine();
e.delete('$.items[0].children[0]'); // remove ALPHA
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops.some(o => o.op === OpType.Remove && (o as any).identity === 'ALPHA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'BETA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'GAMMA')).toBe(true);
expect(ops).toHaveLength(3);
});

it('one child added: diff returns Add + Unchanged for existing children', () => {
const e = makeOrdersEngine();
e.add('$.items[0].children[3]', { sku: 'DELTA-NEW', qty: 9 });
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops.some(o => o.op === OpType.Add && (o as any).identity === 'DELTA-NEW')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'ALPHA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'BETA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'GAMMA')).toBe(true);
});

it('parent field changed (not the child array): child diff still returns Unchanged for children', () => {
const e = makeOrdersEngine();
e.replace('$.items[0].label', 'Updated label'); // change parent, not children
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops).toHaveLength(3);
expect(ops.every(o => o.op === OpType.Unchanged)).toBe(true);
});

it('second order children are unaffected when only first order changes', () => {
const e = makeOrdersEngine();
e.delete('$.items[0].children[0]'); // mutate ORD-1 only
const ops = e.diff("$.items[1].children", { includeUnchanged: true });
expect(ops).toHaveLength(1);
expect(ops[0]).toMatchObject({ op: OpType.Unchanged, identity: 'DELTA' });
});
});
21 changes: 18 additions & 3 deletions src/engine.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,7 +447,19 @@ export class Engine<T extends JsonValue = JsonValue> {
this.diffNode(this.base, this.draft, '$', ops, includeUnchanged, cascade, false);
if (!path) return ops;
const prefixes = [...new Set([...paths(this.draft, path), ...paths(this.base, path)])];
return ops.filter(op => prefixes.some(p => isUnderPrefix(opPath(op), p)));
// Flatten Replace.changes recursively so path filters can reach ops nested inside
// changed parent elements (e.g. querying a child keyed array when its parent changed).
return this.flattenOpsForFilter(ops).filter(op => prefixes.some(p => isUnderPrefix(opPath(op), p)));
}

private flattenOpsForFilter(ops: DiffOp[]): DiffOp[] {
const flat: DiffOp[] = [];
for (const op of ops) {
flat.push(op);
if (op.op === OpType.Replace && op.changes?.length)
flat.push(...this.flattenOpsForFilter(op.changes));
}
return flat;
}

private moveOrCopy(from: string, to: string, isMove: boolean): void {
Expand DownExpand Up@@ -635,9 +647,9 @@ export class Engine<T extends JsonValue = JsonValue> {
const displacement = ordered ? bIndex - aIndex : 0;

const fieldOps: DiffOp[] = [];
this.diffNode(aItem, bItem, `${path}[${bIndex}]`, fieldOps, false, cascade, true);
this.diffNode(aItem, bItem, `${path}[${bIndex}]`, fieldOps, includeUnchanged, cascade, true);

const fieldsChanged = fieldOps.length > 0;
const fieldsChanged = fieldOps.some(op => op.op !== OpType.Unchanged);
const displaced = displacement !== 0;

if (fieldsChanged) {
Expand All@@ -654,6 +666,9 @@ export class Engine<T extends JsonValue = JsonValue> {
ops.push({ op: OpType.Move, from: `${path}[${aIndex}]`, to: `${path}[${bIndex}]`, identity: id });
} else if (includeUnchanged) {
ops.push({ op: OpType.Unchanged, path: `${path}[${bIndex}]`, identity: id, value: bItem, displacement: 0 });
// Push nested ops directly so path-filtered queries can reach children
// (e.g. diff('$.orders[0].lineItems', {includeUnchanged:true}) when the order itself is unchanged)
if (fieldOps.length > 0) ops.push(...fieldOps);
}
}
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@maxjay/patchwork",
"version": "0.17.0",
"version": "0.17.1",
"description": "A JSON editing engine with base/draft, diff, undo, and scoped lenses.",
"type": "module",
"main": "dist/index.js",
Expand Down
85 changes: 85 additions & 0 deletions src/engine.array-semantics.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -489,3 +489,88 @@ describe('edge cases', () => {
expect(ops.some(op => op.op === OpType.Remove && (op as any).identity === 'us')).toBe(true);
});
});

// ---------------------------------------------------------------------------
// diff — includeUnchanged propagation into nested keyed arrays
//
// Schema anatomy: orders (keyed by ref) → each order has lineItems (keyed by sku).
// When diff() is called with includeUnchanged: true for a specific lineItems path,
// it should return Unchanged ops for every unmodified line item.
// Bug: diffArrayByKey hard-coded includeUnchanged: false when recursing into
// matched element pairs, so nested Unchanged ops were never emitted.
// ---------------------------------------------------------------------------

const ordersSchema = makeNestedSchema('ref', 'sku');

// Convenience: build an engine with one order that has three line items.
function makeOrdersEngine() {
return new Engine<any>(
{
items: [
{
ref: 'ORD-1',
label: 'First order',
children: [
{ sku: 'ALPHA', qty: 1 },
{ sku: 'BETA', qty: 2 },
{ sku: 'GAMMA', qty: 5 },
],
},
{
ref: 'ORD-2',
label: 'Second order',
children: [
{ sku: 'DELTA', qty: 3 },
],
},
],
},
{ schema: ordersSchema },
);
}

describe('diff — includeUnchanged propagation into nested keyed arrays', () => {
it('no changes: diff on child path with includeUnchanged returns Unchanged for every child', () => {
const e = makeOrdersEngine();
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops).toHaveLength(3);
expect(ops.every(o => o.op === OpType.Unchanged)).toBe(true);
expect(ops.map((o: any) => o.identity).sort()).toEqual(['ALPHA', 'BETA', 'GAMMA']);
});

it('one child removed: diff returns Remove + Unchanged for remaining children', () => {
const e = makeOrdersEngine();
e.delete('$.items[0].children[0]'); // remove ALPHA
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops.some(o => o.op === OpType.Remove && (o as any).identity === 'ALPHA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'BETA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'GAMMA')).toBe(true);
expect(ops).toHaveLength(3);
});

it('one child added: diff returns Add + Unchanged for existing children', () => {
const e = makeOrdersEngine();
e.add('$.items[0].children[3]', { sku: 'DELTA-NEW', qty: 9 });
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops.some(o => o.op === OpType.Add && (o as any).identity === 'DELTA-NEW')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'ALPHA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'BETA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'GAMMA')).toBe(true);
});

it('parent field changed (not the child array): child diff still returns Unchanged for children', () => {
const e = makeOrdersEngine();
e.replace('$.items[0].label', 'Updated label'); // change parent, not children
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops).toHaveLength(3);
expect(ops.every(o => o.op === OpType.Unchanged)).toBe(true);
});

it('second order children are unaffected when only first order changes', () => {
const e = makeOrdersEngine();
e.delete('$.items[0].children[0]'); // mutate ORD-1 only
const ops = e.diff("$.items[1].children", { includeUnchanged: true });
expect(ops).toHaveLength(1);
expect(ops[0]).toMatchObject({ op: OpType.Unchanged, identity: 'DELTA' });
});
});
21 changes: 18 additions & 3 deletions src/engine.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,7 +447,19 @@ export class Engine<T extends JsonValue = JsonValue> {
this.diffNode(this.base, this.draft, '$', ops, includeUnchanged, cascade, false);
if (!path) return ops;
const prefixes = [...new Set([...paths(this.draft, path), ...paths(this.base, path)])];
return ops.filter(op => prefixes.some(p => isUnderPrefix(opPath(op), p)));
// Flatten Replace.changes recursively so path filters can reach ops nested inside
// changed parent elements (e.g. querying a child keyed array when its parent changed).
return this.flattenOpsForFilter(ops).filter(op => prefixes.some(p => isUnderPrefix(opPath(op), p)));
}

private flattenOpsForFilter(ops: DiffOp[]): DiffOp[] {
const flat: DiffOp[] = [];
for (const op of ops) {
flat.push(op);
if (op.op === OpType.Replace && op.changes?.length)
flat.push(...this.flattenOpsForFilter(op.changes));
}
return flat;
}

private moveOrCopy(from: string, to: string, isMove: boolean): void {
Expand DownExpand Up@@ -635,9 +647,9 @@ export class Engine<T extends JsonValue = JsonValue> {
const displacement = ordered ? bIndex - aIndex : 0;

const fieldOps: DiffOp[] = [];
this.diffNode(aItem, bItem, `${path}[${bIndex}]`, fieldOps, false, cascade, true);
this.diffNode(aItem, bItem, `${path}[${bIndex}]`, fieldOps, includeUnchanged, cascade, true);

const fieldsChanged = fieldOps.length > 0;
const fieldsChanged = fieldOps.some(op => op.op !== OpType.Unchanged);
const displaced = displacement !== 0;

if (fieldsChanged) {
Expand All@@ -654,6 +666,9 @@ export class Engine<T extends JsonValue = JsonValue> {
ops.push({ op: OpType.Move, from: `${path}[${aIndex}]`, to: `${path}[${bIndex}]`, identity: id });
} else if (includeUnchanged) {
ops.push({ op: OpType.Unchanged, path: `${path}[${bIndex}]`, identity: id, value: bItem, displacement: 0 });
// Push nested ops directly so path-filtered queries can reach children
// (e.g. diff('$.orders[0].lineItems', {includeUnchanged:true}) when the order itself is unchanged)
if (fieldOps.length > 0) ops.push(...fieldOps);
}
}
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@maxjay/patchwork",
"version": "0.17.0",
"version": "0.17.1",
"description": "A JSON editing engine with base/draft, diff, undo, and scoped lenses.",
"type": "module",
"main": "dist/index.js",
Expand Down
85 changes: 85 additions & 0 deletions src/engine.array-semantics.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -489,3 +489,88 @@ describe('edge cases', () => {
expect(ops.some(op => op.op === OpType.Remove && (op as any).identity === 'us')).toBe(true);
});
});

// ---------------------------------------------------------------------------
// diff — includeUnchanged propagation into nested keyed arrays
//
// Schema anatomy: orders (keyed by ref) → each order has lineItems (keyed by sku).
// When diff() is called with includeUnchanged: true for a specific lineItems path,
// it should return Unchanged ops for every unmodified line item.
// Bug: diffArrayByKey hard-coded includeUnchanged: false when recursing into
// matched element pairs, so nested Unchanged ops were never emitted.
// ---------------------------------------------------------------------------

const ordersSchema = makeNestedSchema('ref', 'sku');

// Convenience: build an engine with one order that has three line items.
function makeOrdersEngine() {
return new Engine<any>(
{
items: [
{
ref: 'ORD-1',
label: 'First order',
children: [
{ sku: 'ALPHA', qty: 1 },
{ sku: 'BETA', qty: 2 },
{ sku: 'GAMMA', qty: 5 },
],
},
{
ref: 'ORD-2',
label: 'Second order',
children: [
{ sku: 'DELTA', qty: 3 },
],
},
],
},
{ schema: ordersSchema },
);
}

describe('diff — includeUnchanged propagation into nested keyed arrays', () => {
it('no changes: diff on child path with includeUnchanged returns Unchanged for every child', () => {
const e = makeOrdersEngine();
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops).toHaveLength(3);
expect(ops.every(o => o.op === OpType.Unchanged)).toBe(true);
expect(ops.map((o: any) => o.identity).sort()).toEqual(['ALPHA', 'BETA', 'GAMMA']);
});

it('one child removed: diff returns Remove + Unchanged for remaining children', () => {
const e = makeOrdersEngine();
e.delete('$.items[0].children[0]'); // remove ALPHA
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops.some(o => o.op === OpType.Remove && (o as any).identity === 'ALPHA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'BETA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'GAMMA')).toBe(true);
expect(ops).toHaveLength(3);
});

it('one child added: diff returns Add + Unchanged for existing children', () => {
const e = makeOrdersEngine();
e.add('$.items[0].children[3]', { sku: 'DELTA-NEW', qty: 9 });
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops.some(o => o.op === OpType.Add && (o as any).identity === 'DELTA-NEW')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'ALPHA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'BETA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'GAMMA')).toBe(true);
});

it('parent field changed (not the child array): child diff still returns Unchanged for children', () => {
const e = makeOrdersEngine();
e.replace('$.items[0].label', 'Updated label'); // change parent, not children
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops).toHaveLength(3);
expect(ops.every(o => o.op === OpType.Unchanged)).toBe(true);
});

it('second order children are unaffected when only first order changes', () => {
const e = makeOrdersEngine();
e.delete('$.items[0].children[0]'); // mutate ORD-1 only
const ops = e.diff("$.items[1].children", { includeUnchanged: true });
expect(ops).toHaveLength(1);
expect(ops[0]).toMatchObject({ op: OpType.Unchanged, identity: 'DELTA' });
});
});
21 changes: 18 additions & 3 deletions src/engine.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,7 +447,19 @@ export class Engine<T extends JsonValue = JsonValue> {
this.diffNode(this.base, this.draft, '$', ops, includeUnchanged, cascade, false);
if (!path) return ops;
const prefixes = [...new Set([...paths(this.draft, path), ...paths(this.base, path)])];
return ops.filter(op => prefixes.some(p => isUnderPrefix(opPath(op), p)));
// Flatten Replace.changes recursively so path filters can reach ops nested inside
// changed parent elements (e.g. querying a child keyed array when its parent changed).
return this.flattenOpsForFilter(ops).filter(op => prefixes.some(p => isUnderPrefix(opPath(op), p)));
}

private flattenOpsForFilter(ops: DiffOp[]): DiffOp[] {
const flat: DiffOp[] = [];
for (const op of ops) {
flat.push(op);
if (op.op === OpType.Replace && op.changes?.length)
flat.push(...this.flattenOpsForFilter(op.changes));
}
return flat;
}

private moveOrCopy(from: string, to: string, isMove: boolean): void {
Expand DownExpand Up@@ -635,9 +647,9 @@ export class Engine<T extends JsonValue = JsonValue> {
const displacement = ordered ? bIndex - aIndex : 0;

const fieldOps: DiffOp[] = [];
this.diffNode(aItem, bItem, `${path}[${bIndex}]`, fieldOps, false, cascade, true);
this.diffNode(aItem, bItem, `${path}[${bIndex}]`, fieldOps, includeUnchanged, cascade, true);

const fieldsChanged = fieldOps.length > 0;
const fieldsChanged = fieldOps.some(op => op.op !== OpType.Unchanged);
const displaced = displacement !== 0;

if (fieldsChanged) {
Expand All@@ -654,6 +666,9 @@ export class Engine<T extends JsonValue = JsonValue> {
ops.push({ op: OpType.Move, from: `${path}[${aIndex}]`, to: `${path}[${bIndex}]`, identity: id });
} else if (includeUnchanged) {
ops.push({ op: OpType.Unchanged, path: `${path}[${bIndex}]`, identity: id, value: bItem, displacement: 0 });
// Push nested ops directly so path-filtered queries can reach children
// (e.g. diff('$.orders[0].lineItems', {includeUnchanged:true}) when the order itself is unchanged)
if (fieldOps.length > 0) ops.push(...fieldOps);
}
}
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@maxjay/patchwork",
"version": "0.17.0",
"version": "0.17.1",
"description": "A JSON editing engine with base/draft, diff, undo, and scoped lenses.",
"type": "module",
"main": "dist/index.js",
Expand Down
85 changes: 85 additions & 0 deletions src/engine.array-semantics.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -489,3 +489,88 @@ describe('edge cases', () => {
expect(ops.some(op => op.op === OpType.Remove && (op as any).identity === 'us')).toBe(true);
});
});

// ---------------------------------------------------------------------------
// diff — includeUnchanged propagation into nested keyed arrays
//
// Schema anatomy: orders (keyed by ref) → each order has lineItems (keyed by sku).
// When diff() is called with includeUnchanged: true for a specific lineItems path,
// it should return Unchanged ops for every unmodified line item.
// Bug: diffArrayByKey hard-coded includeUnchanged: false when recursing into
// matched element pairs, so nested Unchanged ops were never emitted.
// ---------------------------------------------------------------------------

const ordersSchema = makeNestedSchema('ref', 'sku');

// Convenience: build an engine with one order that has three line items.
function makeOrdersEngine() {
return new Engine<any>(
{
items: [
{
ref: 'ORD-1',
label: 'First order',
children: [
{ sku: 'ALPHA', qty: 1 },
{ sku: 'BETA', qty: 2 },
{ sku: 'GAMMA', qty: 5 },
],
},
{
ref: 'ORD-2',
label: 'Second order',
children: [
{ sku: 'DELTA', qty: 3 },
],
},
],
},
{ schema: ordersSchema },
);
}

describe('diff — includeUnchanged propagation into nested keyed arrays', () => {
it('no changes: diff on child path with includeUnchanged returns Unchanged for every child', () => {
const e = makeOrdersEngine();
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops).toHaveLength(3);
expect(ops.every(o => o.op === OpType.Unchanged)).toBe(true);
expect(ops.map((o: any) => o.identity).sort()).toEqual(['ALPHA', 'BETA', 'GAMMA']);
});

it('one child removed: diff returns Remove + Unchanged for remaining children', () => {
const e = makeOrdersEngine();
e.delete('$.items[0].children[0]'); // remove ALPHA
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops.some(o => o.op === OpType.Remove && (o as any).identity === 'ALPHA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'BETA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'GAMMA')).toBe(true);
expect(ops).toHaveLength(3);
});

it('one child added: diff returns Add + Unchanged for existing children', () => {
const e = makeOrdersEngine();
e.add('$.items[0].children[3]', { sku: 'DELTA-NEW', qty: 9 });
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops.some(o => o.op === OpType.Add && (o as any).identity === 'DELTA-NEW')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'ALPHA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'BETA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'GAMMA')).toBe(true);
});

it('parent field changed (not the child array): child diff still returns Unchanged for children', () => {
const e = makeOrdersEngine();
e.replace('$.items[0].label', 'Updated label'); // change parent, not children
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops).toHaveLength(3);
expect(ops.every(o => o.op === OpType.Unchanged)).toBe(true);
});

it('second order children are unaffected when only first order changes', () => {
const e = makeOrdersEngine();
e.delete('$.items[0].children[0]'); // mutate ORD-1 only
const ops = e.diff("$.items[1].children", { includeUnchanged: true });
expect(ops).toHaveLength(1);
expect(ops[0]).toMatchObject({ op: OpType.Unchanged, identity: 'DELTA' });
});
});
21 changes: 18 additions & 3 deletions src/engine.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,7 +447,19 @@ export class Engine<T extends JsonValue = JsonValue> {
this.diffNode(this.base, this.draft, '$', ops, includeUnchanged, cascade, false);
if (!path) return ops;
const prefixes = [...new Set([...paths(this.draft, path), ...paths(this.base, path)])];
return ops.filter(op => prefixes.some(p => isUnderPrefix(opPath(op), p)));
// Flatten Replace.changes recursively so path filters can reach ops nested inside
// changed parent elements (e.g. querying a child keyed array when its parent changed).
return this.flattenOpsForFilter(ops).filter(op => prefixes.some(p => isUnderPrefix(opPath(op), p)));
}

private flattenOpsForFilter(ops: DiffOp[]): DiffOp[] {
const flat: DiffOp[] = [];
for (const op of ops) {
flat.push(op);
if (op.op === OpType.Replace && op.changes?.length)
flat.push(...this.flattenOpsForFilter(op.changes));
}
return flat;
}

private moveOrCopy(from: string, to: string, isMove: boolean): void {
Expand DownExpand Up@@ -635,9 +647,9 @@ export class Engine<T extends JsonValue = JsonValue> {
const displacement = ordered ? bIndex - aIndex : 0;

const fieldOps: DiffOp[] = [];
this.diffNode(aItem, bItem, `${path}[${bIndex}]`, fieldOps, false, cascade, true);
this.diffNode(aItem, bItem, `${path}[${bIndex}]`, fieldOps, includeUnchanged, cascade, true);

const fieldsChanged = fieldOps.length > 0;
const fieldsChanged = fieldOps.some(op => op.op !== OpType.Unchanged);
const displaced = displacement !== 0;

if (fieldsChanged) {
Expand All@@ -654,6 +666,9 @@ export class Engine<T extends JsonValue = JsonValue> {
ops.push({ op: OpType.Move, from: `${path}[${aIndex}]`, to: `${path}[${bIndex}]`, identity: id });
} else if (includeUnchanged) {
ops.push({ op: OpType.Unchanged, path: `${path}[${bIndex}]`, identity: id, value: bItem, displacement: 0 });
// Push nested ops directly so path-filtered queries can reach children
// (e.g. diff('$.orders[0].lineItems', {includeUnchanged:true}) when the order itself is unchanged)
if (fieldOps.length > 0) ops.push(...fieldOps);
}
}
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@maxjay/patchwork",
"version": "0.17.0",
"version": "0.17.1",
"description": "A JSON editing engine with base/draft, diff, undo, and scoped lenses.",
"type": "module",
"main": "dist/index.js",
Expand Down
85 changes: 85 additions & 0 deletions src/engine.array-semantics.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -489,3 +489,88 @@ describe('edge cases', () => {
expect(ops.some(op => op.op === OpType.Remove && (op as any).identity === 'us')).toBe(true);
});
});

// ---------------------------------------------------------------------------
// diff — includeUnchanged propagation into nested keyed arrays
//
// Schema anatomy: orders (keyed by ref) → each order has lineItems (keyed by sku).
// When diff() is called with includeUnchanged: true for a specific lineItems path,
// it should return Unchanged ops for every unmodified line item.
// Bug: diffArrayByKey hard-coded includeUnchanged: false when recursing into
// matched element pairs, so nested Unchanged ops were never emitted.
// ---------------------------------------------------------------------------

const ordersSchema = makeNestedSchema('ref', 'sku');

// Convenience: build an engine with one order that has three line items.
function makeOrdersEngine() {
return new Engine<any>(
{
items: [
{
ref: 'ORD-1',
label: 'First order',
children: [
{ sku: 'ALPHA', qty: 1 },
{ sku: 'BETA', qty: 2 },
{ sku: 'GAMMA', qty: 5 },
],
},
{
ref: 'ORD-2',
label: 'Second order',
children: [
{ sku: 'DELTA', qty: 3 },
],
},
],
},
{ schema: ordersSchema },
);
}

describe('diff — includeUnchanged propagation into nested keyed arrays', () => {
it('no changes: diff on child path with includeUnchanged returns Unchanged for every child', () => {
const e = makeOrdersEngine();
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops).toHaveLength(3);
expect(ops.every(o => o.op === OpType.Unchanged)).toBe(true);
expect(ops.map((o: any) => o.identity).sort()).toEqual(['ALPHA', 'BETA', 'GAMMA']);
});

it('one child removed: diff returns Remove + Unchanged for remaining children', () => {
const e = makeOrdersEngine();
e.delete('$.items[0].children[0]'); // remove ALPHA
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops.some(o => o.op === OpType.Remove && (o as any).identity === 'ALPHA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'BETA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'GAMMA')).toBe(true);
expect(ops).toHaveLength(3);
});

it('one child added: diff returns Add + Unchanged for existing children', () => {
const e = makeOrdersEngine();
e.add('$.items[0].children[3]', { sku: 'DELTA-NEW', qty: 9 });
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops.some(o => o.op === OpType.Add && (o as any).identity === 'DELTA-NEW')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'ALPHA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'BETA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'GAMMA')).toBe(true);
});

it('parent field changed (not the child array): child diff still returns Unchanged for children', () => {
const e = makeOrdersEngine();
e.replace('$.items[0].label', 'Updated label'); // change parent, not children
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops).toHaveLength(3);
expect(ops.every(o => o.op === OpType.Unchanged)).toBe(true);
});

it('second order children are unaffected when only first order changes', () => {
const e = makeOrdersEngine();
e.delete('$.items[0].children[0]'); // mutate ORD-1 only
const ops = e.diff("$.items[1].children", { includeUnchanged: true });
expect(ops).toHaveLength(1);
expect(ops[0]).toMatchObject({ op: OpType.Unchanged, identity: 'DELTA' });
});
});
21 changes: 18 additions & 3 deletions src/engine.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,7 +447,19 @@ export class Engine<T extends JsonValue = JsonValue> {
this.diffNode(this.base, this.draft, '$', ops, includeUnchanged, cascade, false);
if (!path) return ops;
const prefixes = [...new Set([...paths(this.draft, path), ...paths(this.base, path)])];
return ops.filter(op => prefixes.some(p => isUnderPrefix(opPath(op), p)));
// Flatten Replace.changes recursively so path filters can reach ops nested inside
// changed parent elements (e.g. querying a child keyed array when its parent changed).
return this.flattenOpsForFilter(ops).filter(op => prefixes.some(p => isUnderPrefix(opPath(op), p)));
}

private flattenOpsForFilter(ops: DiffOp[]): DiffOp[] {
const flat: DiffOp[] = [];
for (const op of ops) {
flat.push(op);
if (op.op === OpType.Replace && op.changes?.length)
flat.push(...this.flattenOpsForFilter(op.changes));
}
return flat;
}

private moveOrCopy(from: string, to: string, isMove: boolean): void {
Expand DownExpand Up@@ -635,9 +647,9 @@ export class Engine<T extends JsonValue = JsonValue> {
const displacement = ordered ? bIndex - aIndex : 0;

const fieldOps: DiffOp[] = [];
this.diffNode(aItem, bItem, `${path}[${bIndex}]`, fieldOps, false, cascade, true);
this.diffNode(aItem, bItem, `${path}[${bIndex}]`, fieldOps, includeUnchanged, cascade, true);

const fieldsChanged = fieldOps.length > 0;
const fieldsChanged = fieldOps.some(op => op.op !== OpType.Unchanged);
const displaced = displacement !== 0;

if (fieldsChanged) {
Expand All@@ -654,6 +666,9 @@ export class Engine<T extends JsonValue = JsonValue> {
ops.push({ op: OpType.Move, from: `${path}[${aIndex}]`, to: `${path}[${bIndex}]`, identity: id });
} else if (includeUnchanged) {
ops.push({ op: OpType.Unchanged, path: `${path}[${bIndex}]`, identity: id, value: bItem, displacement: 0 });
// Push nested ops directly so path-filtered queries can reach children
// (e.g. diff('$.orders[0].lineItems', {includeUnchanged:true}) when the order itself is unchanged)
if (fieldOps.length > 0) ops.push(...fieldOps);
}
}
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@maxjay/patchwork",
"version": "0.17.0",
"version": "0.17.1",
"description": "A JSON editing engine with base/draft, diff, undo, and scoped lenses.",
"type": "module",
"main": "dist/index.js",
Expand Down
85 changes: 85 additions & 0 deletions src/engine.array-semantics.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -489,3 +489,88 @@ describe('edge cases', () => {
expect(ops.some(op => op.op === OpType.Remove && (op as any).identity === 'us')).toBe(true);
});
});

// ---------------------------------------------------------------------------
// diff — includeUnchanged propagation into nested keyed arrays
//
// Schema anatomy: orders (keyed by ref) → each order has lineItems (keyed by sku).
// When diff() is called with includeUnchanged: true for a specific lineItems path,
// it should return Unchanged ops for every unmodified line item.
// Bug: diffArrayByKey hard-coded includeUnchanged: false when recursing into
// matched element pairs, so nested Unchanged ops were never emitted.
// ---------------------------------------------------------------------------

const ordersSchema = makeNestedSchema('ref', 'sku');

// Convenience: build an engine with one order that has three line items.
function makeOrdersEngine() {
return new Engine<any>(
{
items: [
{
ref: 'ORD-1',
label: 'First order',
children: [
{ sku: 'ALPHA', qty: 1 },
{ sku: 'BETA', qty: 2 },
{ sku: 'GAMMA', qty: 5 },
],
},
{
ref: 'ORD-2',
label: 'Second order',
children: [
{ sku: 'DELTA', qty: 3 },
],
},
],
},
{ schema: ordersSchema },
);
}

describe('diff — includeUnchanged propagation into nested keyed arrays', () => {
it('no changes: diff on child path with includeUnchanged returns Unchanged for every child', () => {
const e = makeOrdersEngine();
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops).toHaveLength(3);
expect(ops.every(o => o.op === OpType.Unchanged)).toBe(true);
expect(ops.map((o: any) => o.identity).sort()).toEqual(['ALPHA', 'BETA', 'GAMMA']);
});

it('one child removed: diff returns Remove + Unchanged for remaining children', () => {
const e = makeOrdersEngine();
e.delete('$.items[0].children[0]'); // remove ALPHA
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops.some(o => o.op === OpType.Remove && (o as any).identity === 'ALPHA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'BETA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'GAMMA')).toBe(true);
expect(ops).toHaveLength(3);
});

it('one child added: diff returns Add + Unchanged for existing children', () => {
const e = makeOrdersEngine();
e.add('$.items[0].children[3]', { sku: 'DELTA-NEW', qty: 9 });
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops.some(o => o.op === OpType.Add && (o as any).identity === 'DELTA-NEW')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'ALPHA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'BETA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'GAMMA')).toBe(true);
});

it('parent field changed (not the child array): child diff still returns Unchanged for children', () => {
const e = makeOrdersEngine();
e.replace('$.items[0].label', 'Updated label'); // change parent, not children
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops).toHaveLength(3);
expect(ops.every(o => o.op === OpType.Unchanged)).toBe(true);
});

it('second order children are unaffected when only first order changes', () => {
const e = makeOrdersEngine();
e.delete('$.items[0].children[0]'); // mutate ORD-1 only
const ops = e.diff("$.items[1].children", { includeUnchanged: true });
expect(ops).toHaveLength(1);
expect(ops[0]).toMatchObject({ op: OpType.Unchanged, identity: 'DELTA' });
});
});
21 changes: 18 additions & 3 deletions src/engine.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,7 +447,19 @@ export class Engine<T extends JsonValue = JsonValue> {
this.diffNode(this.base, this.draft, '$', ops, includeUnchanged, cascade, false);
if (!path) return ops;
const prefixes = [...new Set([...paths(this.draft, path), ...paths(this.base, path)])];
return ops.filter(op => prefixes.some(p => isUnderPrefix(opPath(op), p)));
// Flatten Replace.changes recursively so path filters can reach ops nested inside
// changed parent elements (e.g. querying a child keyed array when its parent changed).
return this.flattenOpsForFilter(ops).filter(op => prefixes.some(p => isUnderPrefix(opPath(op), p)));
}

private flattenOpsForFilter(ops: DiffOp[]): DiffOp[] {
const flat: DiffOp[] = [];
for (const op of ops) {
flat.push(op);
if (op.op === OpType.Replace && op.changes?.length)
flat.push(...this.flattenOpsForFilter(op.changes));
}
return flat;
}

private moveOrCopy(from: string, to: string, isMove: boolean): void {
Expand DownExpand Up@@ -635,9 +647,9 @@ export class Engine<T extends JsonValue = JsonValue> {
const displacement = ordered ? bIndex - aIndex : 0;

const fieldOps: DiffOp[] = [];
this.diffNode(aItem, bItem, `${path}[${bIndex}]`, fieldOps, false, cascade, true);
this.diffNode(aItem, bItem, `${path}[${bIndex}]`, fieldOps, includeUnchanged, cascade, true);

const fieldsChanged = fieldOps.length > 0;
const fieldsChanged = fieldOps.some(op => op.op !== OpType.Unchanged);
const displaced = displacement !== 0;

if (fieldsChanged) {
Expand All@@ -654,6 +666,9 @@ export class Engine<T extends JsonValue = JsonValue> {
ops.push({ op: OpType.Move, from: `${path}[${aIndex}]`, to: `${path}[${bIndex}]`, identity: id });
} else if (includeUnchanged) {
ops.push({ op: OpType.Unchanged, path: `${path}[${bIndex}]`, identity: id, value: bItem, displacement: 0 });
// Push nested ops directly so path-filtered queries can reach children
// (e.g. diff('$.orders[0].lineItems', {includeUnchanged:true}) when the order itself is unchanged)
if (fieldOps.length > 0) ops.push(...fieldOps);
}
}
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@maxjay/patchwork",
"version": "0.17.0",
"version": "0.17.1",
"description": "A JSON editing engine with base/draft, diff, undo, and scoped lenses.",
"type": "module",
"main": "dist/index.js",
Expand Down
85 changes: 85 additions & 0 deletions src/engine.array-semantics.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -489,3 +489,88 @@ describe('edge cases', () => {
expect(ops.some(op => op.op === OpType.Remove && (op as any).identity === 'us')).toBe(true);
});
});

// ---------------------------------------------------------------------------
// diff — includeUnchanged propagation into nested keyed arrays
//
// Schema anatomy: orders (keyed by ref) → each order has lineItems (keyed by sku).
// When diff() is called with includeUnchanged: true for a specific lineItems path,
// it should return Unchanged ops for every unmodified line item.
// Bug: diffArrayByKey hard-coded includeUnchanged: false when recursing into
// matched element pairs, so nested Unchanged ops were never emitted.
// ---------------------------------------------------------------------------

const ordersSchema = makeNestedSchema('ref', 'sku');

// Convenience: build an engine with one order that has three line items.
function makeOrdersEngine() {
return new Engine<any>(
{
items: [
{
ref: 'ORD-1',
label: 'First order',
children: [
{ sku: 'ALPHA', qty: 1 },
{ sku: 'BETA', qty: 2 },
{ sku: 'GAMMA', qty: 5 },
],
},
{
ref: 'ORD-2',
label: 'Second order',
children: [
{ sku: 'DELTA', qty: 3 },
],
},
],
},
{ schema: ordersSchema },
);
}

describe('diff — includeUnchanged propagation into nested keyed arrays', () => {
it('no changes: diff on child path with includeUnchanged returns Unchanged for every child', () => {
const e = makeOrdersEngine();
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops).toHaveLength(3);
expect(ops.every(o => o.op === OpType.Unchanged)).toBe(true);
expect(ops.map((o: any) => o.identity).sort()).toEqual(['ALPHA', 'BETA', 'GAMMA']);
});

it('one child removed: diff returns Remove + Unchanged for remaining children', () => {
const e = makeOrdersEngine();
e.delete('$.items[0].children[0]'); // remove ALPHA
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops.some(o => o.op === OpType.Remove && (o as any).identity === 'ALPHA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'BETA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'GAMMA')).toBe(true);
expect(ops).toHaveLength(3);
});

it('one child added: diff returns Add + Unchanged for existing children', () => {
const e = makeOrdersEngine();
e.add('$.items[0].children[3]', { sku: 'DELTA-NEW', qty: 9 });
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops.some(o => o.op === OpType.Add && (o as any).identity === 'DELTA-NEW')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'ALPHA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'BETA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'GAMMA')).toBe(true);
});

it('parent field changed (not the child array): child diff still returns Unchanged for children', () => {
const e = makeOrdersEngine();
e.replace('$.items[0].label', 'Updated label'); // change parent, not children
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops).toHaveLength(3);
expect(ops.every(o => o.op === OpType.Unchanged)).toBe(true);
});

it('second order children are unaffected when only first order changes', () => {
const e = makeOrdersEngine();
e.delete('$.items[0].children[0]'); // mutate ORD-1 only
const ops = e.diff("$.items[1].children", { includeUnchanged: true });
expect(ops).toHaveLength(1);
expect(ops[0]).toMatchObject({ op: OpType.Unchanged, identity: 'DELTA' });
});
});
21 changes: 18 additions & 3 deletions src/engine.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,7 +447,19 @@ export class Engine<T extends JsonValue = JsonValue> {
this.diffNode(this.base, this.draft, '$', ops, includeUnchanged, cascade, false);
if (!path) return ops;
const prefixes = [...new Set([...paths(this.draft, path), ...paths(this.base, path)])];
return ops.filter(op => prefixes.some(p => isUnderPrefix(opPath(op), p)));
// Flatten Replace.changes recursively so path filters can reach ops nested inside
// changed parent elements (e.g. querying a child keyed array when its parent changed).
return this.flattenOpsForFilter(ops).filter(op => prefixes.some(p => isUnderPrefix(opPath(op), p)));
}

private flattenOpsForFilter(ops: DiffOp[]): DiffOp[] {
const flat: DiffOp[] = [];
for (const op of ops) {
flat.push(op);
if (op.op === OpType.Replace && op.changes?.length)
flat.push(...this.flattenOpsForFilter(op.changes));
}
return flat;
}

private moveOrCopy(from: string, to: string, isMove: boolean): void {
Expand DownExpand Up@@ -635,9 +647,9 @@ export class Engine<T extends JsonValue = JsonValue> {
const displacement = ordered ? bIndex - aIndex : 0;

const fieldOps: DiffOp[] = [];
this.diffNode(aItem, bItem, `${path}[${bIndex}]`, fieldOps, false, cascade, true);
this.diffNode(aItem, bItem, `${path}[${bIndex}]`, fieldOps, includeUnchanged, cascade, true);

const fieldsChanged = fieldOps.length > 0;
const fieldsChanged = fieldOps.some(op => op.op !== OpType.Unchanged);
const displaced = displacement !== 0;

if (fieldsChanged) {
Expand All@@ -654,6 +666,9 @@ export class Engine<T extends JsonValue = JsonValue> {
ops.push({ op: OpType.Move, from: `${path}[${aIndex}]`, to: `${path}[${bIndex}]`, identity: id });
} else if (includeUnchanged) {
ops.push({ op: OpType.Unchanged, path: `${path}[${bIndex}]`, identity: id, value: bItem, displacement: 0 });
// Push nested ops directly so path-filtered queries can reach children
// (e.g. diff('$.orders[0].lineItems', {includeUnchanged:true}) when the order itself is unchanged)
if (fieldOps.length > 0) ops.push(...fieldOps);
}
}
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@maxjay/patchwork",
"version": "0.17.0",
"version": "0.17.1",
"description": "A JSON editing engine with base/draft, diff, undo, and scoped lenses.",
"type": "module",
"main": "dist/index.js",
Expand Down
85 changes: 85 additions & 0 deletions src/engine.array-semantics.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -489,3 +489,88 @@ describe('edge cases', () => {
expect(ops.some(op => op.op === OpType.Remove && (op as any).identity === 'us')).toBe(true);
});
});

// ---------------------------------------------------------------------------
// diff — includeUnchanged propagation into nested keyed arrays
//
// Schema anatomy: orders (keyed by ref) → each order has lineItems (keyed by sku).
// When diff() is called with includeUnchanged: true for a specific lineItems path,
// it should return Unchanged ops for every unmodified line item.
// Bug: diffArrayByKey hard-coded includeUnchanged: false when recursing into
// matched element pairs, so nested Unchanged ops were never emitted.
// ---------------------------------------------------------------------------

const ordersSchema = makeNestedSchema('ref', 'sku');

// Convenience: build an engine with one order that has three line items.
function makeOrdersEngine() {
return new Engine<any>(
{
items: [
{
ref: 'ORD-1',
label: 'First order',
children: [
{ sku: 'ALPHA', qty: 1 },
{ sku: 'BETA', qty: 2 },
{ sku: 'GAMMA', qty: 5 },
],
},
{
ref: 'ORD-2',
label: 'Second order',
children: [
{ sku: 'DELTA', qty: 3 },
],
},
],
},
{ schema: ordersSchema },
);
}

describe('diff — includeUnchanged propagation into nested keyed arrays', () => {
it('no changes: diff on child path with includeUnchanged returns Unchanged for every child', () => {
const e = makeOrdersEngine();
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops).toHaveLength(3);
expect(ops.every(o => o.op === OpType.Unchanged)).toBe(true);
expect(ops.map((o: any) => o.identity).sort()).toEqual(['ALPHA', 'BETA', 'GAMMA']);
});

it('one child removed: diff returns Remove + Unchanged for remaining children', () => {
const e = makeOrdersEngine();
e.delete('$.items[0].children[0]'); // remove ALPHA
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops.some(o => o.op === OpType.Remove && (o as any).identity === 'ALPHA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'BETA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'GAMMA')).toBe(true);
expect(ops).toHaveLength(3);
});

it('one child added: diff returns Add + Unchanged for existing children', () => {
const e = makeOrdersEngine();
e.add('$.items[0].children[3]', { sku: 'DELTA-NEW', qty: 9 });
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops.some(o => o.op === OpType.Add && (o as any).identity === 'DELTA-NEW')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'ALPHA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'BETA')).toBe(true);
expect(ops.some(o => o.op === OpType.Unchanged && (o as any).identity === 'GAMMA')).toBe(true);
});

it('parent field changed (not the child array): child diff still returns Unchanged for children', () => {
const e = makeOrdersEngine();
e.replace('$.items[0].label', 'Updated label'); // change parent, not children
const ops = e.diff("$.items[0].children", { includeUnchanged: true });
expect(ops).toHaveLength(3);
expect(ops.every(o => o.op === OpType.Unchanged)).toBe(true);
});

it('second order children are unaffected when only first order changes', () => {
const e = makeOrdersEngine();
e.delete('$.items[0].children[0]'); // mutate ORD-1 only
const ops = e.diff("$.items[1].children", { includeUnchanged: true });
expect(ops).toHaveLength(1);
expect(ops[0]).toMatchObject({ op: OpType.Unchanged, identity: 'DELTA' });
});
});
21 changes: 18 additions & 3 deletions src/engine.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,7 +447,19 @@ export class Engine<T extends JsonValue = JsonValue> {
this.diffNode(this.base, this.draft, '$', ops, includeUnchanged, cascade, false);
if (!path) return ops;
const prefixes = [...new Set([...paths(this.draft, path), ...paths(this.base, path)])];
return ops.filter(op => prefixes.some(p => isUnderPrefix(opPath(op), p)));
// Flatten Replace.changes recursively so path filters can reach ops nested inside
// changed parent elements (e.g. querying a child keyed array when its parent changed).
return this.flattenOpsForFilter(ops).filter(op => prefixes.some(p => isUnderPrefix(opPath(op), p)));
}

private flattenOpsForFilter(ops: DiffOp[]): DiffOp[] {
const flat: DiffOp[] = [];
for (const op of ops) {
flat.push(op);
if (op.op === OpType.Replace && op.changes?.length)
flat.push(...this.flattenOpsForFilter(op.changes));
}
return flat;
}

private moveOrCopy(from: string, to: string, isMove: boolean): void {
Expand DownExpand Up@@ -635,9 +647,9 @@ export class Engine<T extends JsonValue = JsonValue> {
const displacement = ordered ? bIndex - aIndex : 0;

const fieldOps: DiffOp[] = [];
this.diffNode(aItem, bItem, `${path}[${bIndex}]`, fieldOps, false, cascade, true);
this.diffNode(aItem, bItem, `${path}[${bIndex}]`, fieldOps, includeUnchanged, cascade, true);

const fieldsChanged = fieldOps.length > 0;
const fieldsChanged = fieldOps.some(op => op.op !== OpType.Unchanged);
const displaced = displacement !== 0;

if (fieldsChanged) {
Expand All@@ -654,6 +666,9 @@ export class Engine<T extends JsonValue = JsonValue> {
ops.push({ op: OpType.Move, from: `${path}[${aIndex}]`, to: `${path}[${bIndex}]`, identity: id });
} else if (includeUnchanged) {
ops.push({ op: OpType.Unchanged, path: `${path}[${bIndex}]`, identity: id, value: bItem, displacement: 0 });
// Push nested ops directly so path-filtered queries can reach children
// (e.g. diff('$.orders[0].lineItems', {includeUnchanged:true}) when the order itself is unchanged)
if (fieldOps.length > 0) ops.push(...fieldOps);
}
}
}
Expand Down
Loading