Skip to content
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

adds reconcileWithKeys #2280

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

adds reconcileWithKeys #2280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3836a8
adds `reconcileWithKeys`
titoBouzout Sep 12, 2024
febb603
fix the simple starting test
titoBouzout Sep 12, 2024
fc2d65a
add more tests, needs some cleanup and deduplication
titoBouzout Sep 13, 2024
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
42 changes: 35 additions & 7 deletions packages/solid/store/src/modifiers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,20 @@ export type ReconcileOptions = {
key?: string | null;
merge?: boolean;
};
export type ReconcileWithKeysOptions = {
keys?: object | null;
merge?: boolean;
};
const emptyKeys = /* #__PURE__*/ Object.create(null);

function applyState(
target: any,
parent: any,
property: PropertyKey,
merge: boolean | undefined,
key: string | null
key: string | null,
keys: object | null,
useKeys: boolean | null
) {
const previous = parent[property];
if (target === previous) return;
Expand Down Expand Up @@ -43,7 +50,7 @@ function applyState(
(key && previous[start] && target[start] && previous[start][key] === target[start][key]));
start++
) {
applyState(target[start], previous, start, merge, key);
applyState(target[start], previous, start, merge, key, keys, useKeys);
}

const temp = new Array(target.length),
Expand All @@ -65,7 +72,7 @@ function applyState(
for (j = start; j <= newEnd; j++) setProperty(previous, j, target[j]);
for (; j < target.length; j++) {
setProperty(previous, j, temp[j]);
applyState(target[j], previous, j, merge, key);
applyState(target[j], previous, j, merge, key, keys, useKeys);
}
if (previous.length > target.length) setProperty(previous, "length", target.length);
return;
Expand Down Expand Up @@ -95,12 +102,12 @@ function applyState(
for (j = start; j < target.length; j++) {
if (j in temp) {
setProperty(previous, j, temp[j]);
applyState(target[j], previous, j, merge, key);
applyState(target[j], previous, j, merge, key, keys, useKeys);
} else setProperty(previous, j, target[j]);
}
} else {
for (let i = 0, len = target.length; i < len; i++) {
applyState(target[i], previous, i, merge, key);
applyState(target[i], previous, i, merge, key, keys, useKeys);
}
}
if (previous.length > target.length) setProperty(previous, "length", target.length);
Expand All @@ -109,7 +116,15 @@ function applyState(

const targetKeys = Object.keys(target);
for (let i = 0, len = targetKeys.length; i < len; i++) {
applyState(target[targetKeys[i]], previous, targetKeys[i], merge, key);
applyState(
target[targetKeys[i]],
previous,
targetKeys[i],
merge,
!useKeys ? key : isArray ? (keys || emptyKeys)._key : keys[targetKeys[i]]?._key,
!useKeys ? null : isArray ? keys : keys[targetKeys[i]] || emptyKeys,
useKeys
);
}
const previousKeys = Object.keys(previous);
for (let i = 0, len = previousKeys.length; i < len; i++) {
Expand All @@ -126,7 +141,20 @@ export function reconcile<T extends U, U>(
v = unwrap(value);
return state => {
if (!isWrappable(state) || !isWrappable(v)) return v;
const res = applyState(v, { [$ROOT]: state }, $ROOT, merge, key);
const res = applyState(v, { [$ROOT]: state }, $ROOT, merge, key, null, null);
return res === undefined ? (state as T) : res;
};
}

export function reconcileWithKeys<T extends U, U>(
value: T,
options: ReconcileWithKeysOptions = {}
): (state: U) => T {
const { merge, keys = emptyKeys } = options,
v = unwrap(value);
return state => {
if (!isWrappable(state) || !isWrappable(v)) return v;
const res = applyState(v, { [$ROOT]: state }, $ROOT, merge, keys._key, keys, true);
return res === undefined ? (state as T) : res;
};
}
Expand Down
Loading
Loading