apply suggestion

pull/16617/head
ComputerGuy 3 weeks ago
parent 8e5f1db50c
commit fbf8a13d09

@ -26,7 +26,7 @@ export function inspect(get_value, inspector = console.log) {
return; return;
} }
var snap = snapshot(value, true, true); var snap = snapshot(value, true);
untrack(() => { untrack(() => {
inspector(initial ? 'init' : 'update', ...snap); inspector(initial ? 'init' : 'update', ...snap);
}); });

@ -15,15 +15,15 @@ const empty = [];
* @template T * @template T
* @param {T} value * @param {T} value
* @param {boolean} [skip_warning] * @param {boolean} [skip_warning]
* @param {boolean} [only_deproxy] * @param {boolean} [no_tojson]
* @returns {Snapshot<T>} * @returns {Snapshot<T>}
*/ */
export function snapshot(value, skip_warning = false, only_deproxy = false) { export function snapshot(value, skip_warning = false, no_tojson = false) {
if (DEV && !skip_warning) { if (DEV && !skip_warning) {
/** @type {string[]} */ /** @type {string[]} */
const paths = []; const paths = [];
const copy = clone(value, new Map(), '', paths); const copy = clone(value, new Map(), '', paths, null, no_tojson);
if (paths.length === 1 && paths[0] === '') { if (paths.length === 1 && paths[0] === '') {
// value could not be cloned // value could not be cloned
w.state_snapshot_uncloneable(); w.state_snapshot_uncloneable();
@ -41,7 +41,7 @@ export function snapshot(value, skip_warning = false, only_deproxy = false) {
return copy; return copy;
} }
return clone(value, new Map(), '', empty, null, only_deproxy); return clone(value, new Map(), '', empty, null, no_tojson);
} }
/** /**
@ -51,18 +51,16 @@ export function snapshot(value, skip_warning = false, only_deproxy = false) {
* @param {string} path * @param {string} path
* @param {string[]} paths * @param {string[]} paths
* @param {null | T} [original] The original value, if `value` was produced from a `toJSON` call * @param {null | T} [original] The original value, if `value` was produced from a `toJSON` call
* @param {boolean} [only_deproxy] Don't clone objects that aren't proxies * @param {boolean} [no_tojson]
* @returns {Snapshot<T>} * @returns {Snapshot<T>}
*/ */
function clone(value, cloned, path, paths, original = null, only_deproxy = false) { function clone(value, cloned, path, paths, original = null, no_tojson = false) {
if (typeof value === 'object' && value !== null) { if (typeof value === 'object' && value !== null) {
var unwrapped = cloned.get(value); var unwrapped = cloned.get(value);
if (unwrapped !== undefined) return unwrapped; if (unwrapped !== undefined) return unwrapped;
if (value instanceof Map) if (value instanceof Map) return /** @type {Snapshot<T>} */ (new Map(value));
return /** @type {Snapshot<T>} */ (only_deproxy ? value : new Map(value)); if (value instanceof Set) return /** @type {Snapshot<T>} */ (new Set(value));
if (value instanceof Set)
return /** @type {Snapshot<T>} */ (only_deproxy ? value : new Set(value));
if (is_array(value)) { if (is_array(value)) {
var copy = /** @type {Snapshot<any>} */ (Array(value.length)); var copy = /** @type {Snapshot<any>} */ (Array(value.length));
@ -75,7 +73,7 @@ function clone(value, cloned, path, paths, original = null, only_deproxy = false
for (var i = 0; i < value.length; i += 1) { for (var i = 0; i < value.length; i += 1) {
var element = value[i]; var element = value[i];
if (i in value) { if (i in value) {
copy[i] = clone(element, cloned, DEV ? `${path}[${i}]` : path, paths, null, only_deproxy); copy[i] = clone(element, cloned, DEV ? `${path}[${i}]` : path, paths, null, no_tojson);
} }
} }
@ -92,49 +90,26 @@ function clone(value, cloned, path, paths, original = null, only_deproxy = false
} }
for (var key in value) { for (var key in value) {
copy[key] = clone( // @ts-expect-error
// @ts-expect-error copy[key] = clone(value[key], cloned, DEV ? `${path}.${key}` : path, paths, null, no_tojson);
value[key],
cloned,
DEV ? `${path}.${key}` : path,
paths,
null,
only_deproxy
);
} }
return copy; return copy;
} }
if (value instanceof Date) { if (value instanceof Date) {
if (only_deproxy) { return /** @type {Snapshot<T>} */ (structuredClone(value));
structuredClone(value);
} else {
return /** @type {Snapshot<T>} */ (structuredClone(value));
}
} }
if (typeof (/** @type {T & { toJSON?: any } } */ (value).toJSON) === 'function') { if (typeof (/** @type {T & { toJSON?: any } } */ (value).toJSON) === 'function' && !no_tojson) {
if (!only_deproxy) { return clone(
return clone( /** @type {T & { toJSON(): any } } */ (value).toJSON(),
/** @type {T & { toJSON(): any } } */ (value).toJSON(), cloned,
cloned, DEV ? `${path}.toJSON()` : path,
DEV ? `${path}.toJSON()` : path, paths,
paths, // Associate the instance with the toJSON clone
// Associate the instance with the toJSON clone value
value );
);
} else {
// we still want to read each property
clone(
/** @type {T & { toJSON(): any } } */ (value).toJSON(),
cloned,
DEV ? `${path}.toJSON()` : path,
paths,
// Associate the instance with the toJSON clone
value
);
}
} }
} }
@ -143,13 +118,6 @@ function clone(value, cloned, path, paths, original = null, only_deproxy = false
return /** @type {Snapshot<T>} */ (value); return /** @type {Snapshot<T>} */ (value);
} }
if (only_deproxy) {
try {
structuredClone(value);
} catch {}
return /** @type {Snapshot<T>} */ (value);
}
try { try {
return /** @type {Snapshot<T>} */ (structuredClone(value)); return /** @type {Snapshot<T>} */ (structuredClone(value));
} catch (e) { } catch (e) {

Loading…
Cancel
Save