wevu 6.12.1 → 6.12.3

package/dist/index.mjs

@@ -802,8 +802,7 @@ function isPlainObject$1(value) {
 	const proto = Object.getPrototypeOf(value);
 	return proto === null || proto === Object.prototype;
 }
-function toPlain(value, seen = /* @__PURE__ */ new WeakMap(), options) {
-	var _options$_depth, _options$_budget;
+function toPlainInternal(value, seen, cache, depth, budget) {
 	const unwrapped = unref(value);
 	if (typeof unwrapped === "bigint") {
 		const asNumber = Number(unwrapped);
@@ -814,10 +813,7 @@ function toPlain(value, seen = /* @__PURE__ */ new WeakMap(), options) {
 	if (typeof unwrapped !== "object" || unwrapped === null) return unwrapped;
 	if (isNoSetData(unwrapped)) return;
 	const raw = isReactive(unwrapped) ? toRaw(unwrapped) : unwrapped;
-	const depth = (_options$_depth = options === null || options === void 0 ? void 0 : options._depth) !== null && _options$_depth !== void 0 ? _options$_depth : typeof (options === null || options === void 0 ? void 0 : options.maxDepth) === "number" ? Math.max(0, Math.floor(options.maxDepth)) : Number.POSITIVE_INFINITY;
-	const budget = (_options$_budget = options === null || options === void 0 ? void 0 : options._budget) !== null && _options$_budget !== void 0 ? _options$_budget : typeof (options === null || options === void 0 ? void 0 : options.maxKeys) === "number" ? { keys: Math.max(0, Math.floor(options.maxKeys)) } : { keys: Number.POSITIVE_INFINITY };
 	if (depth <= 0 || budget.keys <= 0) return raw;
-	const cache = options === null || options === void 0 ? void 0 : options.cache;
 	if (cache) {
 		const version = getReactiveVersion(raw);
 		const cached = cache.get(raw);
@@ -830,7 +826,7 @@ function toPlain(value, seen = /* @__PURE__ */ new WeakMap(), options) {
 		const entries = [];
 		seen.set(raw, entries);
 		raw.forEach((mapValue, mapKey) => {
-			entries.push([toPlain(mapKey, seen), toPlain(mapValue, seen)]);
+			entries.push([toPlainInternal(mapKey, seen, void 0, Number.POSITIVE_INFINITY, { keys: Number.POSITIVE_INFINITY }), toPlainInternal(mapValue, seen, void 0, Number.POSITIVE_INFINITY, { keys: Number.POSITIVE_INFINITY })]);
 		});
 		return entries;
 	}
@@ -838,7 +834,7 @@ function toPlain(value, seen = /* @__PURE__ */ new WeakMap(), options) {
 		const values = [];
 		seen.set(raw, values);
 		raw.forEach((setValue) => {
-			values.push(toPlain(setValue, seen));
+			values.push(toPlainInternal(setValue, seen, void 0, Number.POSITIVE_INFINITY, { keys: Number.POSITIVE_INFINITY }));
 		});
 		return values;
 	}
@@ -849,7 +845,7 @@ function toPlain(value, seen = /* @__PURE__ */ new WeakMap(), options) {
 			if (typeof view[Symbol.iterator] === "function") {
 				const values = [...view];
 				seen.set(raw, values);
-				return values.map((item) => toPlain(item, seen));
+				return values.map((item) => toPlainInternal(item, seen, void 0, Number.POSITIVE_INFINITY, { keys: Number.POSITIVE_INFINITY }));
 			}
 			const bytes = [...new Uint8Array(view.buffer, view.byteOffset, view.byteLength)];
 			seen.set(raw, bytes);
@@ -863,14 +859,11 @@ function toPlain(value, seen = /* @__PURE__ */ new WeakMap(), options) {
 	if (Array.isArray(raw)) {
 		const arr = [];
 		seen.set(raw, arr);
-		raw.forEach((item, index) => {
-			const next = toPlain(item, seen, {
-				...options,
-				_depth: depth - 1,
-				_budget: budget
-			});
+		const nextDepth = depth - 1;
+		for (let index = 0; index < raw.length; index += 1) {
+			const next = toPlainInternal(raw[index], seen, cache, nextDepth, budget);
 			arr[index] = next === void 0 ? null : next;
-		});
+		}
 		if (cache) cache.set(raw, {
 			version: getReactiveVersion(raw),
 			value: arr
@@ -879,22 +872,25 @@ function toPlain(value, seen = /* @__PURE__ */ new WeakMap(), options) {
 	}
 	const output = {};
 	seen.set(raw, output);
-	Object.keys(raw).forEach((key) => {
+	const nextDepth = depth - 1;
+	for (const key of Object.keys(raw)) {
 		budget.keys -= 1;
-		if (budget.keys <= 0) return;
-		const next = toPlain(raw[key], seen, {
-			...options,
-			_depth: depth - 1,
-			_budget: budget
-		});
+		if (budget.keys <= 0) break;
+		const next = toPlainInternal(raw[key], seen, cache, nextDepth, budget);
 		if (next !== void 0) output[key] = next;
-	});
+	}
 	if (cache) cache.set(raw, {
 		version: getReactiveVersion(raw),
 		value: output
 	});
 	return output;
 }
+function toPlain(value, seen = /* @__PURE__ */ new WeakMap(), options) {
+	var _options$_depth, _options$_budget;
+	const depth = (_options$_depth = options === null || options === void 0 ? void 0 : options._depth) !== null && _options$_depth !== void 0 ? _options$_depth : typeof (options === null || options === void 0 ? void 0 : options.maxDepth) === "number" ? Math.max(0, Math.floor(options.maxDepth)) : Number.POSITIVE_INFINITY;
+	const budget = (_options$_budget = options === null || options === void 0 ? void 0 : options._budget) !== null && _options$_budget !== void 0 ? _options$_budget : typeof (options === null || options === void 0 ? void 0 : options.maxKeys) === "number" ? { keys: Math.max(0, Math.floor(options.maxKeys)) } : { keys: Number.POSITIVE_INFINITY };
+	return toPlainInternal(value, seen, options === null || options === void 0 ? void 0 : options.cache, depth, budget);
+}
 function isArrayEqual(a, b, compare) {
 	if (a.length !== b.length) return false;
 	for (let i = 0; i < a.length; i++) if (!compare(a[i], b[i])) return false;
@@ -938,10 +934,17 @@ function assignNestedDiff(prev, next, path, output) {
 	}
 	output[path] = normalizeSetDataValue$1(next);
 }
-function diffSnapshots(prev, next) {
+function diffSnapshots(prev, next, options) {
 	const diff = {};
-	for (const key of Object.keys(next)) assignNestedDiff(prev[key], next[key], key, diff);
-	for (const key of Object.keys(prev)) if (!Object.hasOwn(next, key)) diff[key] = null;
+	const skipKeys = options === null || options === void 0 ? void 0 : options.skipKeys;
+	for (const key of Object.keys(next)) {
+		if (skipKeys === null || skipKeys === void 0 ? void 0 : skipKeys.has(key)) continue;
+		assignNestedDiff(prev[key], next[key], key, diff);
+	}
+	for (const key of Object.keys(prev)) {
+		if (skipKeys === null || skipKeys === void 0 ? void 0 : skipKeys.has(key)) continue;
+		if (!Object.hasOwn(next, key)) diff[key] = null;
+	}
 	return diff;
 }
 //#endregion
@@ -1102,6 +1105,11 @@ function mergeSiblingPayload(options) {
 }
 //#endregion
 //#region src/runtime/app/setData/snapshot.ts
+function isPlainObjectLike(value) {
+	if (value == null || typeof value !== "object") return false;
+	const proto = Object.getPrototypeOf(value);
+	return proto === Object.prototype || proto === null;
+}
 function normalizeSetDataValue(value) {
 	return value === void 0 ? null : value;
 }
@@ -1112,11 +1120,6 @@ function cloneSnapshotValue(value) {
 	for (const key of Object.keys(value)) out[key] = cloneSnapshotValue(value[key]);
 	return out;
 }
-function isPlainObjectLike(value) {
-	if (value == null || typeof value !== "object") return false;
-	const proto = Object.getPrototypeOf(value);
-	return proto === Object.prototype || proto === null;
-}
 function isShallowEqualValue(a, b) {
 	if (Object.is(a, b)) return true;
 	if (Array.isArray(a) && Array.isArray(b)) {
@@ -1154,7 +1157,9 @@ function isDeepEqualValue(a, b, depth, budget) {
 	}
 	return true;
 }
-function applySnapshotUpdate(snapshot, path, value, op) {
+function applySnapshotUpdate(snapshot, path, value, op, options) {
+	var _options$cloneValue;
+	const cloneValue = (_options$cloneValue = options === null || options === void 0 ? void 0 : options.cloneValue) !== null && _options$cloneValue !== void 0 ? _options$cloneValue : true;
 	const segments = path.split(".").filter(Boolean);
 	if (!segments.length) return;
 	let current = snapshot;
@@ -1169,7 +1174,7 @@ function applySnapshotUpdate(snapshot, path, value, op) {
 	} catch (_unused) {
 		current[leaf] = null;
 	}
-	else current[leaf] = cloneSnapshotValue(value);
+	else current[leaf] = cloneValue ? cloneSnapshotValue(value) : value;
 }
 function collectSnapshot(options) {
 	const { state, computedRefs, includeComputed, shouldIncludeKey, plainCache, toPlainMaxDepth, toPlainMaxKeys } = options;
@@ -1328,11 +1333,11 @@ function runPatchUpdate(options) {
 	if (!Object.keys(collapsedPayload).length) return;
 	for (const [path, value] of Object.entries(collapsedPayload)) {
 		const entry = entryMap.get(path);
-		if (entry) applySnapshotUpdate(latestSnapshot, path, value, entry.kind === "array" ? "set" : entry.op);
-		else applySnapshotUpdate(latestSnapshot, path, value, "set");
+		if (entry) applySnapshotUpdate(latestSnapshot, path, value, entry.kind === "array" ? "set" : entry.op, { cloneValue: false });
+		else applySnapshotUpdate(latestSnapshot, path, value, "set", { cloneValue: false });
 	}
 	if (typeof currentAdapter.setData === "function") {
-		const result = currentAdapter.setData(cloneSnapshotValue(collapsedPayload));
+		const result = currentAdapter.setData(collapsedPayload);
 		if (result && typeof result.then === "function") result.catch(() => {});
 	}
 	emitDebug({
@@ -1349,9 +1354,25 @@ function createSetDataScheduler(options) {
 	const plainCache = /* @__PURE__ */ new WeakMap();
 	let latestSnapshot = {};
 	let latestComputedSnapshot = Object.create(null);
+	const latestStateTokens = Object.create(null);
+	const latestComputedTokens = Object.create(null);
 	const needsFullSnapshot = { value: setDataStrategy === "patch" };
 	const pendingPatches = /* @__PURE__ */ new Map();
 	const fallbackTopKeys = /* @__PURE__ */ new Set();
+	const createValueToken = (value) => {
+		const candidate = isRef(value) ? value.value : value;
+		if (candidate == null || typeof candidate !== "object") return candidate;
+		const raw = isReactive(candidate) ? toRaw(candidate) : candidate;
+		return {
+			raw,
+			version: getReactiveVersion(raw)
+		};
+	};
+	const isSameToken = (left, right) => {
+		if (Object.is(left, right)) return true;
+		if (!left || !right || typeof left !== "object" || typeof right !== "object" || !Object.hasOwn(left, "raw") || !Object.hasOwn(right, "raw")) return false;
+		return left.raw === right.raw && left.version === right.version;
+	};
 	const resolveTopKeysByRoot = (root) => {
 		const matches = [];
 		for (const key of Object.keys(state)) {
@@ -1381,10 +1402,71 @@ function createSetDataScheduler(options) {
 		toPlainMaxDepth,
 		toPlainMaxKeys
 	});
+	const collectDiffSnapshot = () => {
+		const rawState = isReactive(state) ? toRaw(state) : state;
+		const nextSnapshot = { ...latestSnapshot };
+		const seen = /* @__PURE__ */ new WeakMap();
+		const includedStateKeys = /* @__PURE__ */ new Set();
+		const includedComputedKeys = /* @__PURE__ */ new Set();
+		const replacedTopLevelKeys = /* @__PURE__ */ new Set();
+		for (const key of Object.keys(rawState)) {
+			if (!shouldIncludeKey(key)) continue;
+			includedStateKeys.add(key);
+			const token = createValueToken(rawState[key]);
+			const previousToken = latestStateTokens[key];
+			if (previousToken && token && typeof previousToken === "object" && typeof token === "object" && Object.hasOwn(previousToken, "raw") && Object.hasOwn(token, "raw") && Array.isArray(previousToken.raw) && Array.isArray(token.raw) && previousToken.raw !== token.raw) replacedTopLevelKeys.add(key);
+			if (!isSameToken(previousToken, token) || !Object.hasOwn(latestSnapshot, key)) nextSnapshot[key] = toPlain(rawState[key], seen, {
+				cache: plainCache,
+				maxDepth: toPlainMaxDepth,
+				maxKeys: toPlainMaxKeys
+			});
+			latestStateTokens[key] = token;
+		}
+		for (const key of Object.keys(latestStateTokens)) if (!includedStateKeys.has(key)) {
+			delete latestStateTokens[key];
+			if (!includeComputed || !Object.hasOwn(computedRefs, key)) delete nextSnapshot[key];
+		}
+		if (!includeComputed) {
+			for (const key of Object.keys(latestComputedTokens)) delete latestComputedTokens[key];
+			return {
+				snapshot: nextSnapshot,
+				replacedTopLevelKeys
+			};
+		}
+		for (const key of Object.keys(computedRefs)) {
+			if (!shouldIncludeKey(key)) continue;
+			includedComputedKeys.add(key);
+			const value = computedRefs[key].value;
+			const token = createValueToken(value);
+			if (!isSameToken(latestComputedTokens[key], token) || !Object.hasOwn(latestSnapshot, key)) nextSnapshot[key] = toPlain(value, seen, {
+				cache: plainCache,
+				maxDepth: toPlainMaxDepth,
+				maxKeys: toPlainMaxKeys
+			});
+			latestComputedTokens[key] = token;
+		}
+		for (const key of Object.keys(latestComputedTokens)) if (!includedComputedKeys.has(key)) {
+			delete latestComputedTokens[key];
+			if (!Object.hasOwn(rawState, key) || !shouldIncludeKey(key)) delete nextSnapshot[key];
+		}
+		return {
+			snapshot: nextSnapshot,
+			replacedTopLevelKeys
+		};
+	};
 	const runDiffUpdate = (reason = "diff") => {
-		const snapshot = collect();
-		const diff = diffSnapshots(latestSnapshot, snapshot);
-		latestSnapshot = cloneSnapshotValue(snapshot);
+		var _diffCollection$snaps;
+		const diffCollection = setDataStrategy === "diff" ? collectDiffSnapshot() : void 0;
+		const snapshot = (_diffCollection$snaps = diffCollection === null || diffCollection === void 0 ? void 0 : diffCollection.snapshot) !== null && _diffCollection$snaps !== void 0 ? _diffCollection$snaps : collect();
+		const diff = diffCollection ? (() => {
+			const fastDiff = {};
+			for (const key of diffCollection.replacedTopLevelKeys) fastDiff[key] = snapshot[key];
+			return {
+				...diffSnapshots(latestSnapshot, snapshot, { skipKeys: diffCollection.replacedTopLevelKeys }),
+				...fastDiff
+			};
+		})() : diffSnapshots(latestSnapshot, snapshot);
+		latestSnapshot = snapshot;
 		needsFullSnapshot.value = false;
 		pendingPatches.clear();
 		if (setDataStrategy === "patch" && includeComputed) {
@@ -1397,7 +1479,7 @@ function createSetDataScheduler(options) {
 		}
 		if (!Object.keys(diff).length) return;
 		if (typeof currentAdapter.setData === "function") {
-			const result = currentAdapter.setData(cloneSnapshotValue(diff));
+			const result = currentAdapter.setData(diff);
 			if (result && typeof result.then === "function") result.catch(() => {});
 		}
 		emitDebug({
@@ -1465,10 +1547,12 @@ function createSetDataScheduler(options) {
 		} else runDiffUpdate(needsFullSnapshot.value ? "needsFullSnapshot" : "diff");
 	};
 	const snapshot = () => setDataStrategy === "patch" ? collect() : { ...latestSnapshot };
+	const cloneLatestSnapshot = () => ({ ...latestSnapshot });
 	return {
 		job,
 		mutationRecorder,
 		snapshot,
+		cloneLatestSnapshot,
 		getLatestSnapshot: () => latestSnapshot
 	};
 }
@@ -1569,6 +1653,11 @@ function createRuntimeMount(options) {
 		const methodDefs = resolvedMethods;
 		let mounted = true;
 		const stopHandles = [];
+		const trackedSetupReactiveKeys = /* @__PURE__ */ new Set();
+		Object.keys(state).forEach((key) => {
+			const value = state[key];
+			if (isRef(value) || isReactive(value)) trackedSetupReactiveKeys.add(key);
+		});
 		const { includeComputed, setDataStrategy, maxPatchKeys, maxPayloadBytes, mergeSiblingThreshold, mergeSiblingMaxInflationRatio, mergeSiblingMaxParentBytes, mergeSiblingSkipArray, computedCompare, computedCompareMaxDepth, computedCompareMaxKeys, prelinkMaxDepth, prelinkMaxKeys, debug, diagnostics, debugWhen, debugSampleRate, elevateTopKeyThreshold, toPlainMaxDepth, toPlainMaxKeys, shouldIncludeKey } = resolveSetDataOptions(setDataOptions);
 		const diagnosticsLogger = createDiagnosticsLogger(diagnostics);
 		const mergedDebug = debug || diagnosticsLogger ? (info) => {
@@ -1621,7 +1710,7 @@ function createRuntimeMount(options) {
 			if (isReactive(runtimeProps)) touchReactive(runtimeProps);
 			const runtimeAttrs = state.__wevuAttrs;
 			if (isReactive(runtimeAttrs)) touchReactive(runtimeAttrs);
-			Object.keys(state).forEach((key) => {
+			trackedSetupReactiveKeys.forEach((key) => {
 				const v = state[key];
 				if (isRef(v)) {
 					const inner = v.value;
@@ -1705,6 +1794,30 @@ function createRuntimeMount(options) {
 		} catch (_unused4) {
 			runtimeInstance.__wevu_flushSetupSnapshotSync = job;
 		}
+		try {
+			Object.defineProperty(runtimeInstance, "__wevu_cloneLatestSnapshot", {
+				value: scheduler.cloneLatestSnapshot,
+				configurable: true,
+				enumerable: false,
+				writable: false
+			});
+		} catch (_unused5) {
+			runtimeInstance.__wevu_cloneLatestSnapshot = scheduler.cloneLatestSnapshot;
+		}
+		try {
+			Object.defineProperty(runtimeInstance, "__wevu_trackSetupReactiveKey", {
+				value: (key) => {
+					trackedSetupReactiveKeys.add(key);
+				},
+				configurable: true,
+				enumerable: false,
+				writable: false
+			});
+		} catch (_unused6) {
+			runtimeInstance.__wevu_trackSetupReactiveKey = (key) => {
+				trackedSetupReactiveKeys.add(key);
+			};
+		}
 		return runtimeInstance;
 	};
 }
@@ -2083,6 +2196,11 @@ function getOwnerSnapshot(ownerId) {
 	var _ownerStore$get4;
 	return (_ownerStore$get4 = ownerStore.get(ownerId)) === null || _ownerStore$get4 === void 0 ? void 0 : _ownerStore$get4.snapshot;
 }
+function resolveOwnerSnapshot(runtime) {
+	const fastSnapshot = runtime.__wevu_cloneLatestSnapshot;
+	if (typeof fastSnapshot === "function") return fastSnapshot();
+	return typeof runtime.snapshot === "function" ? runtime.snapshot() : {};
+}
 function attachOwnerSnapshot(target, runtime, ownerId) {
 	var _wevuProps;
 	try {
@@ -2091,7 +2209,7 @@ function attachOwnerSnapshot(target, runtime, ownerId) {
 	try {
 		target.__wvOwnerId = ownerId;
 	} catch (_unused3) {}
-	const snapshot = typeof runtime.snapshot === "function" ? runtime.snapshot() : {};
+	const snapshot = resolveOwnerSnapshot(runtime);
 	const propsSource = (_wevuProps = target.__wevuProps) !== null && _wevuProps !== void 0 ? _wevuProps : target.properties;
 	if (propsSource && typeof propsSource === "object") for (const [key, value] of Object.entries(propsSource)) snapshot[key] = value;
 	updateOwnerSnapshot(ownerId, snapshot, runtime.proxy);
@@ -2737,6 +2855,10 @@ function runRuntimeSetupPhase(options) {
 					runtime.methods[key] = (...args) => val.apply(runtime.proxy, args);
 					methodsChanged = true;
 				} else {
+					if (isRef(val) || isReactive(val)) {
+						var _wevu_trackSetupReact;
+						(_wevu_trackSetupReact = runtime.__wevu_trackSetupReactiveKey) === null || _wevu_trackSetupReact === void 0 || _wevu_trackSetupReact.call(runtime, key);
+					}
 					if (declaredPropKeys.has(key)) {
 						let fallbackValue = val;
 						try {
@@ -3078,8 +3200,7 @@ function mountRuntimeInstance(target, runtimeApp, watchMap, setup, options) {
 	const refreshOwnerSnapshot = () => {
 		var _wevuProps;
 		if (!runtimeRef) return;
-		if (typeof runtimeRef.snapshot !== "function") return;
-		const snapshot = runtimeRef.snapshot();
+		const snapshot = resolveOwnerSnapshot(runtimeRef);
 		const propsSource = (_wevuProps = target.__wevuProps) !== null && _wevuProps !== void 0 ? _wevuProps : target.properties;
 		if (propsSource && typeof propsSource === "object") for (const [key, value] of Object.entries(propsSource)) snapshot[key] = value;
 		updateOwnerSnapshot(ownerId, snapshot, runtimeRef.proxy);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wevu",
   "type": "module",
-  "version": "6.12.1",
+  "version": "6.12.3",
   "description": "Vue 3 风格的小程序运行时，包含响应式、diff+setData 与轻量状态管理",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -96,7 +96,7 @@
   "dependencies": {
     "vue": "^3.5.31",
     "@wevu/api": "0.2.2",
-    "@wevu/compiler": "6.12.1"
+    "@wevu/compiler": "6.12.3"
   },
   "scripts": {
     "dev": "tsdown -w",