wevu 6.16.20 → 6.16.22

package/dist/dev/{src-CJb8KQQ7.mjs → src-fYd456WG.mjs}

@@ -1,7 +1,7 @@
 import { A as track, C as effect, D as onScopeDispose, E as getCurrentScope, M as triggerEffects, N as nextTick, O as startBatch, P as queueJob, S as batch, T as endBatch, a as toValue, b as addMutationRecorder, c as isRaw, d as reactive, f as isShallowReactive, g as touchReactive, h as prelinkReactiveTree, i as ref, j as trigger, k as stop, l as isReactive, m as clearPatchIndices, n as isRef, o as unref, p as shallowReactive, r as markAsRef, s as getReactiveVersion, t as customRef, u as markRaw, v as isObject$1, w as effectScope, x as removeMutationRecorder, y as toRaw } from "./ref-DAstlXwV.mjs";
 import { i as computed, n as defineStore, r as createStore, t as storeToRefs } from "./store-Bazm64zK.mjs";
 import { $ as onUnhandledRejection, A as setGlobalProvidedValue, B as onPageNotFound, C as releaseCurrentPageInstance, D as attachRuntimeProvideContext, E as attachRuntimeLayoutProvideContext, F as onHide, G as onResize, H as onPullDownRefresh, I as onLaunch, J as onShareAppMessage, K as onRouteDone, L as onLoad, M as onAttached, N as onDetached, O as ensureRuntimeAppProvides, P as onError, Q as onThemeChange, R as onMemoryWarning, S as getCurrentPageInstance, T as runInPageScrollHook, U as onReachBottom, V as onPageScroll, W as onReady, X as onShow, Y as onShareTimeline, Z as onTabItemTap, _ as provide, _t as readonly, at as getCurrentSetupContext, b as ensureMiniProgramGlobalPatched, ct as setCurrentSetupContext, dt as getCurrentMiniProgramRuntimeCapabilities, et as onUnload, ft as getMiniProgramGlobalObject, g as injectGlobal, gt as isReadonly, h as inject, ht as isProxy, it as getCurrentInstance, j as onAddToFavorites, k as setRuntimeAppProvidedValue, lt as getCurrentMiniProgramHostConfig, m as hasInjectionContext, mt as supportsCurrentMiniProgramRuntimeCapability, n as useNativeRouter, nt as callHookList, ot as pushHook, pt as getScopedSlotHostGlobalObject, q as onSaveExitState, rt as callHookReturn, st as setCurrentInstance, t as useNativePageRouter, tt as assertInSetup, ut as getCurrentMiniProgramPages, v as provideGlobal, vt as shallowReadonly, w as resolvePageOptions, x as ensurePageShareMenus, y as bindCurrentPageInstance, z as onMoved } from "./router-D68ovdoh.mjs";
-import { WEVU_ATTRS_KEY, WEVU_EFFECT_SCOPE_KEY, WEVU_EXPOSED_KEY, WEVU_FUNCTION_PROP_PATHS_KEY, WEVU_HOOKS_KEY, WEVU_INLINE_HANDLER, WEVU_INLINE_MAP_KEY, WEVU_IS_APP_INSTANCE_KEY, WEVU_LAYOUT_BRIDGE_PAGE_KEYS, WEVU_LAYOUT_HOST_BRIDGE_KEY, WEVU_MODEL_HANDLER, WEVU_NATIVE_INSTANCE_KEY, WEVU_ON_BEFORE_UPDATE_HOOK, WEVU_ON_LOAD_CALLED_KEY, WEVU_ON_UPDATED_HOOK, WEVU_OWNER_HANDLER, WEVU_PAGE_LAYOUT_NAME_KEY, WEVU_PAGE_LAYOUT_NONE, WEVU_PAGE_LAYOUT_PROPS_KEY, WEVU_PAGE_LAYOUT_SETTER_KEY, WEVU_PAGE_SCROLL_HOOK_DEPTH_KEY, WEVU_PARENT_INSTANCE_KEY, WEVU_PENDING_PROP_VALUES_KEY, WEVU_PROPS_KEY, WEVU_PROP_KEYS_KEY, WEVU_PUBLIC_RUNTIME_KEY, WEVU_READY_CALLED_KEY, WEVU_RESERVED_METHOD_PREFIX, WEVU_ROUTE_DONE_CALLED_KEY, WEVU_ROUTE_DONE_IN_TICK_KEY, WEVU_RUNTIME_APP_KEY, WEVU_RUNTIME_KEY, WEVU_SCOPED_SLOT_CREATOR_KEY, WEVU_SCOPED_SLOT_OWNER_SEED_KEY, WEVU_SCOPED_SLOT_OWNER_STORE_KEY, WEVU_SETUP_CONTEXT_INSTANCE_KEY, WEVU_SLOT_NAMES_PROP, WEVU_SLOT_OWNER_ID_KEY, WEVU_SLOT_OWNER_ID_PROP, WEVU_SLOT_OWNER_KEY, WEVU_SLOT_OWNER_PROXY_KEY, WEVU_SLOT_PROPS_DATA_KEY, WEVU_SLOT_PROPS_KEY, WEVU_SLOT_SCOPE_KEY, WEVU_TEMPLATE_REFS_CALLBACKS_KEY, WEVU_TEMPLATE_REFS_KEY, WEVU_TEMPLATE_REFS_PENDING_KEY, WEVU_TEMPLATE_REF_MAP_KEY, WEVU_WATCH_STOPS_KEY } from "@weapp-core/constants";
+import { WEVU_ATTRS_KEY, WEVU_EFFECT_SCOPE_KEY, WEVU_EXPOSED_KEY, WEVU_FUNCTION_PROP_PATHS_KEY, WEVU_HOOKS_KEY, WEVU_INLINE_HANDLER, WEVU_INLINE_MAP_KEY, WEVU_IS_APP_INSTANCE_KEY, WEVU_LAYOUT_BRIDGE_PAGE_KEYS, WEVU_LAYOUT_HOST_BRIDGE_KEY, WEVU_MODEL_HANDLER, WEVU_NATIVE_INSTANCE_KEY, WEVU_ON_BEFORE_UPDATE_HOOK, WEVU_ON_LOAD_CALLED_KEY, WEVU_ON_UPDATED_HOOK, WEVU_OWNER_HANDLER, WEVU_PAGE_LAYOUT_NAME_KEY, WEVU_PAGE_LAYOUT_NONE, WEVU_PAGE_LAYOUT_PROPS_KEY, WEVU_PAGE_LAYOUT_SETTER_KEY, WEVU_PAGE_SCROLL_HOOK_DEPTH_KEY, WEVU_PARENT_INSTANCE_KEY, WEVU_PENDING_PROP_VALUES_KEY, WEVU_PROPS_ALIASES_KEY, WEVU_PROPS_DERIVED_KEYS_KEY, WEVU_PROPS_KEY, WEVU_PROP_KEYS_KEY, WEVU_PUBLIC_RUNTIME_KEY, WEVU_READY_CALLED_KEY, WEVU_RESERVED_METHOD_PREFIX, WEVU_ROUTE_DONE_CALLED_KEY, WEVU_ROUTE_DONE_IN_TICK_KEY, WEVU_RUNTIME_APP_KEY, WEVU_RUNTIME_KEY, WEVU_SCOPED_SLOT_CREATOR_KEY, WEVU_SCOPED_SLOT_OWNER_SEED_KEY, WEVU_SCOPED_SLOT_OWNER_STORE_KEY, WEVU_SETUP_CONTEXT_INSTANCE_KEY, WEVU_SETUP_STATE_KEY, WEVU_SLOT_NAMES_PROP, WEVU_SLOT_OWNER_ID_KEY, WEVU_SLOT_OWNER_ID_PROP, WEVU_SLOT_OWNER_KEY, WEVU_SLOT_OWNER_PROXY_KEY, WEVU_SLOT_PROPS_DATA_KEY, WEVU_SLOT_PROPS_KEY, WEVU_SLOT_SCOPE_KEY, WEVU_TEMPLATE_REFS_CALLBACKS_KEY, WEVU_TEMPLATE_REFS_KEY, WEVU_TEMPLATE_REFS_PENDING_KEY, WEVU_TEMPLATE_REF_MAP_KEY, WEVU_WATCH_STOPS_KEY } from "@weapp-core/constants";
 import { resolveMiniProgramPageKeys } from "@weapp-core/shared";
 import { wpi } from "@wevu/api";
 
@@ -478,7 +478,7 @@ function watchSyncEffect(effectFn, options = {}) {
 
 //#endregion
 //#region package.json
-var version$1 = "6.16.20";
+var version$1 = "6.16.22";
 
 //#endregion
 //#region src/version.ts
@@ -734,7 +734,7 @@ function createComputedAccessors(options) {
 //#endregion
 //#region src/runtime/app/context.ts
 function createRuntimeContext(options) {
-	const { state, computedDefs, methodDefs, appConfig, includeComputed, setDataStrategy } = options;
+	const { state, setupState, computedDefs, methodDefs, appConfig, includeComputed, setDataStrategy } = options;
 	const boundMethods = {};
 	const { computedRefs, computedSetters, dirtyComputedKeys, createTrackedComputed, computedProxy } = createComputedAccessors({
 		includeComputed,
@@ -775,6 +775,11 @@ function createRuntimeContext(options) {
 		get(target, key, receiver) {
 			if (typeof key === "string") {
 				setupMethodVersion.value;
+				if (hasOwn(setupState, key)) return Reflect.get(setupState, key, receiver);
+				if (key === "props") {
+					const props = target[WEVU_PROPS_KEY];
+					if (props && typeof props === "object") return props;
+				}
 				if (key === "data") return state;
 				if (key === "$state") return state;
 				if (key === "$computed") return computedProxy;
@@ -790,19 +795,31 @@ function createRuntimeContext(options) {
 					return nativeValue;
 				}
 			}
-			return Reflect.get(target, key, receiver);
+			const targetValue = Reflect.get(target, key, receiver);
+			if (typeof key === "string" && hasOwn(setupState, key)) return Reflect.get(setupState, key, receiver);
+			return targetValue;
 		},
 		set(target, key, value, receiver) {
 			if (typeof key === "string" && computedRefs[key]) {
 				setComputedValue(computedSetters, key, value);
 				return true;
 			}
+			if (hasOwn(setupState, key)) {
+				const existingValue = Reflect.get(setupState, key, receiver);
+				if (isRef(existingValue) && !isRef(value)) {
+					existingValue.value = value;
+					return true;
+				}
+				return Reflect.set(setupState, key, value, receiver);
+			}
 			if (Reflect.has(target, key)) {
+				var _WEVU_PROPS_KEY;
 				const existingValue = Reflect.get(target, key, receiver);
 				if (isRef(existingValue) && !isRef(value)) {
 					existingValue.value = value;
 					return true;
 				}
+				if (hasOwn((_WEVU_PROPS_KEY = target[WEVU_PROPS_KEY]) !== null && _WEVU_PROPS_KEY !== void 0 ? _WEVU_PROPS_KEY : {}, key)) return Reflect.set(setupState, key, value, receiver);
 				return Reflect.set(target, key, value, receiver);
 			}
 			const nativeInstance = resolveNativeInstance(target, receiver);
@@ -811,7 +828,7 @@ function createRuntimeContext(options) {
 		},
 		has(target, key) {
 			if (key === "data") return true;
-			if (typeof key === "string" && (computedRefs[key] || hasOwn(boundMethods, key))) return true;
+			if (typeof key === "string" && (hasOwn(setupState, key) || computedRefs[key] || hasOwn(boundMethods, key))) return true;
 			const nativeInstance = resolveNativeInstance(target, target);
 			if (nativeInstance && Reflect.has(nativeInstance, key)) return true;
 			return Reflect.has(target, key);
@@ -821,11 +838,15 @@ function createRuntimeContext(options) {
 			Reflect.ownKeys(target).forEach((key) => {
 				keys.add(key);
 			});
+			Reflect.ownKeys(setupState).forEach((key) => {
+				keys.add(key);
+			});
 			Object.keys(boundMethods).forEach((key) => keys.add(key));
 			Object.keys(computedRefs).forEach((key) => keys.add(key));
 			return [...keys];
 		},
 		getOwnPropertyDescriptor(target, key) {
+			if (typeof key === "string" && hasOwn(setupState, key)) return Object.getOwnPropertyDescriptor(setupState, key);
 			if (Reflect.has(target, key)) return Object.getOwnPropertyDescriptor(target, key);
 			if (typeof key === "string") {
 				if (key === "data") return {
@@ -944,7 +965,7 @@ function isPlainObject$1(value) {
 	const proto = Object.getPrototypeOf(value);
 	return proto === null || proto === Object.prototype;
 }
-function toPlainInternal(value, seen, cache, depth, budget, includeFunctions, functionPathSet, currentPath) {
+function toPlainInternal(value, seen, visiting, cache, depth, budget, includeFunctions, functionPathSet, currentPath) {
 	const unwrapped = unref(value);
 	if (typeof unwrapped === "bigint") {
 		const asNumber = Number(unwrapped);
@@ -962,23 +983,28 @@ function toPlainInternal(value, seen, cache, depth, budget, includeFunctions, fu
 		const cached = cacheRef.get(raw);
 		if (cached && cached.version === version) return cached.value;
 	}
+	if (visiting.has(raw)) return;
 	if (seen.has(raw)) return seen.get(raw);
 	if (raw instanceof Date) return raw.getTime();
 	if (raw instanceof RegExp) return raw.toString();
 	if (raw instanceof Map) {
 		const entries = [];
 		seen.set(raw, entries);
+		visiting.add(raw);
 		raw.forEach((mapValue, mapKey) => {
-			entries.push([toPlainInternal(mapKey, seen, void 0, Number.POSITIVE_INFINITY, { keys: Number.POSITIVE_INFINITY }, includeFunctions, void 0, ""), toPlainInternal(mapValue, seen, void 0, Number.POSITIVE_INFINITY, { keys: Number.POSITIVE_INFINITY }, includeFunctions, void 0, "")]);
+			entries.push([toPlainInternal(mapKey, seen, visiting, void 0, Number.POSITIVE_INFINITY, { keys: Number.POSITIVE_INFINITY }, includeFunctions, void 0, ""), toPlainInternal(mapValue, seen, visiting, void 0, Number.POSITIVE_INFINITY, { keys: Number.POSITIVE_INFINITY }, includeFunctions, void 0, "")]);
 		});
+		visiting.delete(raw);
 		return entries;
 	}
 	if (raw instanceof Set) {
 		const values = [];
 		seen.set(raw, values);
+		visiting.add(raw);
 		raw.forEach((setValue) => {
-			values.push(toPlainInternal(setValue, seen, void 0, Number.POSITIVE_INFINITY, { keys: Number.POSITIVE_INFINITY }, includeFunctions, void 0, ""));
+			values.push(toPlainInternal(setValue, seen, visiting, void 0, Number.POSITIVE_INFINITY, { keys: Number.POSITIVE_INFINITY }, includeFunctions, void 0, ""));
 		});
+		visiting.delete(raw);
 		return values;
 	}
 	if (typeof ArrayBuffer !== "undefined") {
@@ -988,7 +1014,7 @@ function toPlainInternal(value, seen, cache, depth, budget, includeFunctions, fu
 			if (typeof view[Symbol.iterator] === "function") {
 				const values = [...view];
 				seen.set(raw, values);
-				return values.map((item) => toPlainInternal(item, seen, void 0, Number.POSITIVE_INFINITY, { keys: Number.POSITIVE_INFINITY }, includeFunctions, void 0, ""));
+				return values.map((item) => toPlainInternal(item, seen, visiting, void 0, Number.POSITIVE_INFINITY, { keys: Number.POSITIVE_INFINITY }, includeFunctions, void 0, ""));
 			}
 			const bytes = [...new Uint8Array(view.buffer, view.byteOffset, view.byteLength)];
 			seen.set(raw, bytes);
@@ -1002,12 +1028,14 @@ function toPlainInternal(value, seen, cache, depth, budget, includeFunctions, fu
 	if (Array.isArray(raw)) {
 		const arr = [];
 		seen.set(raw, arr);
+		visiting.add(raw);
 		const nextDepth = depth - 1;
 		for (let index = 0; index < raw.length; index += 1) {
 			const childPath = currentPath ? `${currentPath}.${index}` : String(index);
-			const next = toPlainInternal(raw[index], seen, cache, nextDepth, budget, includeFunctions, functionPathSet, childPath);
+			const next = toPlainInternal(raw[index], seen, visiting, cache, nextDepth, budget, includeFunctions, functionPathSet, childPath);
 			arr[index] = next === void 0 ? null : next;
 		}
+		visiting.delete(raw);
 		if (cacheRef) cacheRef.set(raw, {
 			version: getReactiveVersion(raw),
 			value: arr
@@ -1016,14 +1044,16 @@ function toPlainInternal(value, seen, cache, depth, budget, includeFunctions, fu
 	}
 	const output = {};
 	seen.set(raw, output);
+	visiting.add(raw);
 	const nextDepth = depth - 1;
 	for (const key of Object.keys(raw)) {
 		budget.keys -= 1;
 		if (budget.keys <= 0) break;
 		const childPath = currentPath ? `${currentPath}.${key}` : key;
-		const next = toPlainInternal(raw[key], seen, cache, nextDepth, budget, includeFunctions, functionPathSet, childPath);
+		const next = toPlainInternal(raw[key], seen, visiting, cache, nextDepth, budget, includeFunctions, functionPathSet, childPath);
 		if (next !== void 0) output[key] = next;
 	}
+	visiting.delete(raw);
 	if (cacheRef) cacheRef.set(raw, {
 		version: getReactiveVersion(raw),
 		value: output
@@ -1035,7 +1065,7 @@ function toPlain(value, seen = /* @__PURE__ */ new WeakMap(), options) {
 	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 };
 	const functionPathSet = Array.isArray(options === null || options === void 0 ? void 0 : options.functionPaths) && options.functionPaths.length ? new Set(options.functionPaths) : void 0;
-	return toPlainInternal(value, seen, options === null || options === void 0 ? void 0 : options.cache, depth, budget, Boolean(options === null || options === void 0 ? void 0 : options.includeFunctions), functionPathSet, (_options$_path = options === null || options === void 0 ? void 0 : options._path) !== null && _options$_path !== void 0 ? _options$_path : "");
+	return toPlainInternal(value, seen, /* @__PURE__ */ new WeakSet(), options === null || options === void 0 ? void 0 : options.cache, depth, budget, Boolean(options === null || options === void 0 ? void 0 : options.includeFunctions), functionPathSet, (_options$_path = options === null || options === void 0 ? void 0 : options._path) !== null && _options$_path !== void 0 ? _options$_path : "");
 }
 function isArrayEqual(a, b, compare) {
 	if (a.length !== b.length) return false;
@@ -1325,12 +1355,14 @@ function applySnapshotUpdate(snapshot, path, value, op, options) {
 	else current[leaf] = cloneValue ? cloneSnapshotValue(value) : value;
 }
 function collectSnapshot(options) {
-	const { state, computedRefs, includeComputed, shouldIncludeKey, plainCache, toPlainMaxDepth, toPlainMaxKeys, includeFunctions = false, functionPaths = [] } = options;
+	const { state, setupState, computedRefs, includeComputed, shouldIncludeKey, plainCache, toPlainMaxDepth, toPlainMaxKeys, includeFunctions = false, functionPaths = [] } = options;
 	const seen = /* @__PURE__ */ new WeakMap();
 	const out = {};
 	const budget = Number.isFinite(toPlainMaxKeys) ? { keys: toPlainMaxKeys } : void 0;
 	const rawState = isReactive(state) ? toRaw(state) : state;
+	const rawSetupState = setupState && typeof setupState === "object" ? isReactive(setupState) ? toRaw(setupState) : setupState : void 0;
 	const stateKeys = Object.keys(rawState);
+	const setupStateKeys = rawSetupState ? Object.keys(rawSetupState) : [];
 	const computedKeys = includeComputed ? Object.keys(computedRefs) : [];
 	for (const key of stateKeys) {
 		if (!shouldIncludeKey(key)) continue;
@@ -1343,6 +1375,17 @@ function collectSnapshot(options) {
 			_path: key
 		});
 	}
+	for (const key of setupStateKeys) {
+		if (!shouldIncludeKey(key)) continue;
+		out[key] = toPlain(rawSetupState[key], seen, {
+			cache: plainCache,
+			maxDepth: toPlainMaxDepth,
+			includeFunctions,
+			functionPaths,
+			_budget: budget,
+			_path: key
+		});
+	}
 	for (const key of computedKeys) {
 		if (!shouldIncludeKey(key)) continue;
 		out[key] = toPlain(computedRefs[key].value, seen, {
@@ -1512,7 +1555,7 @@ function runPatchUpdate(options) {
 //#endregion
 //#region src/runtime/app/setData/scheduler.ts
 function createSetDataScheduler(options) {
-	const { state, computedRefs, dirtyComputedKeys, includeComputed, setDataStrategy, computedCompare, computedCompareMaxDepth, computedCompareMaxKeys, currentAdapter, shouldIncludeKey, maxPatchKeys, maxPayloadBytes, mergeSiblingThreshold, mergeSiblingMaxInflationRatio, mergeSiblingMaxParentBytes, mergeSiblingSkipArray, elevateTopKeyThreshold, toPlainMaxDepth, toPlainMaxKeys, includeFunctions = false, functionPaths, debug, debugWhen, debugSampleRate, runTracker, isMounted } = options;
+	const { state, setupState, computedRefs, dirtyComputedKeys, includeComputed, setDataStrategy, computedCompare, computedCompareMaxDepth, computedCompareMaxKeys, currentAdapter, shouldIncludeKey, maxPatchKeys, maxPayloadBytes, mergeSiblingThreshold, mergeSiblingMaxInflationRatio, mergeSiblingMaxParentBytes, mergeSiblingSkipArray, elevateTopKeyThreshold, toPlainMaxDepth, toPlainMaxKeys, includeFunctions = false, functionPaths, debug, debugWhen, debugSampleRate, runTracker, isMounted } = options;
 	const plainCache = /* @__PURE__ */ new WeakMap();
 	let latestSnapshot = {};
 	let latestComputedSnapshot = Object.create(null);
@@ -1565,9 +1608,10 @@ function createSetDataScheduler(options) {
 	};
 	const resolveTopKeysByRoot = (root) => {
 		const matches = [];
-		for (const key of Object.keys(state)) {
+		const rawSetupState = setupState && typeof setupState === "object" ? isReactive(setupState) ? toRaw(setupState) : setupState : void 0;
+		for (const key of new Set([...Object.keys(state), ...rawSetupState ? Object.keys(rawSetupState) : []])) {
 			if (!shouldIncludeKey(key)) continue;
-			const value = state[key];
+			const value = rawSetupState && hasOwn(rawSetupState, key) ? rawSetupState[key] : state[key];
 			const candidate = isRef(value) ? value.value : value;
 			if (!candidate || typeof candidate !== "object") continue;
 			if (toRaw(candidate) === root) matches.push(key);
@@ -1585,6 +1629,7 @@ function createSetDataScheduler(options) {
 	};
 	const collect = () => collectSnapshot({
 		state,
+		setupState,
 		computedRefs,
 		includeComputed,
 		shouldIncludeKey,
@@ -1596,18 +1641,20 @@ function createSetDataScheduler(options) {
 	});
 	const collectDiffSnapshot = () => {
 		const rawState = isReactive(state) ? toRaw(state) : state;
+		const rawSetupState = setupState && typeof setupState === "object" ? isReactive(setupState) ? toRaw(setupState) : setupState : void 0;
 		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)) {
+		for (const key of new Set([...Object.keys(rawState), ...rawSetupState ? Object.keys(rawSetupState) : []])) {
 			if (!shouldIncludeKey(key)) continue;
 			includedStateKeys.add(key);
-			const token = createValueToken(rawState[key]);
+			const source = rawSetupState && hasOwn(rawSetupState, key) ? rawSetupState : rawState;
+			const token = createValueToken(source[key]);
 			const previousToken = latestStateTokens[key];
 			if (previousToken && token && typeof previousToken === "object" && typeof token === "object" && hasOwn(previousToken, "raw") && hasOwn(token, "raw") && Array.isArray(previousToken.raw) && Array.isArray(token.raw) && previousToken.raw !== token.raw) replacedTopLevelKeys.add(key);
-			if (!isSameToken(previousToken, token) || !hasOwn(latestSnapshot, key)) nextSnapshot[key] = toPlain(rawState[key], seen, {
+			if (!isSameToken(previousToken, token) || !hasOwn(latestSnapshot, key)) nextSnapshot[key] = toPlain(source[key], seen, {
 				cache: plainCache,
 				maxDepth: toPlainMaxDepth,
 				maxKeys: toPlainMaxKeys,
@@ -1855,6 +1902,15 @@ function createRuntimeMount(options) {
 			});
 		} catch (_unused) {}
 		const state = reactive(rawState);
+		const setupState = reactive(Object.create(null));
+		if (rawState && typeof rawState === "object" && !hasOwn(rawState, WEVU_SETUP_STATE_KEY)) try {
+			Object.defineProperty(rawState, WEVU_SETUP_STATE_KEY, {
+				value: setupState,
+				configurable: true,
+				enumerable: false,
+				writable: false
+			});
+		} catch (_unused2) {}
 		const computedDefs = resolvedComputed;
 		const methodDefs = resolvedMethods;
 		let mounted = true;
@@ -1873,6 +1929,7 @@ function createRuntimeMount(options) {
 		const mergedDebugWhen = diagnostics === "always" ? "always" : debugWhen;
 		const { boundMethods, computedRefs, computedSetters, dirtyComputedKeys, computedProxy, publicInstance, touchSetupMethodsVersion } = createRuntimeContext({
 			state,
+			setupState,
 			computedDefs,
 			methodDefs,
 			appConfig,
@@ -1884,6 +1941,7 @@ function createRuntimeMount(options) {
 		let tracker;
 		const scheduler = createSetDataScheduler({
 			state,
+			setupState,
 			computedRefs,
 			dirtyComputedKeys,
 			includeComputed,
@@ -1919,8 +1977,8 @@ function createRuntimeMount(options) {
 			const runtimeAttrs = state[WEVU_ATTRS_KEY];
 			if (isReactive(runtimeAttrs)) touchReactive(runtimeAttrs);
 			trackedSetupReactiveKeys.forEach((key) => {
-				const v = state[key];
-				touchSetupBinding(v);
+				var _key;
+				touchSetupBinding((_key = setupState[key]) !== null && _key !== void 0 ? _key : state[key]);
 			});
 		}, {
 			lazy: true,
@@ -1954,7 +2012,7 @@ function createRuntimeMount(options) {
 			stopHandles.forEach((handle) => {
 				try {
 					handle();
-				} catch (_unused2) {}
+				} catch (_unused3) {}
 			});
 			stopHandles.length = 0;
 		};
@@ -1962,6 +2020,9 @@ function createRuntimeMount(options) {
 			get state() {
 				return state;
 			},
+			get setupState() {
+				return setupState;
+			},
 			get proxy() {
 				return publicInstance;
 			},
@@ -1986,7 +2047,7 @@ function createRuntimeMount(options) {
 				enumerable: false,
 				writable: false
 			});
-		} catch (_unused3) {
+		} catch (_unused4) {
 			runtimeInstance.__wevu_touchSetupMethodsVersion = touchSetupMethodsVersion;
 		}
 		try {
@@ -1996,7 +2057,7 @@ function createRuntimeMount(options) {
 				enumerable: false,
 				writable: false
 			});
-		} catch (_unused4) {
+		} catch (_unused5) {
 			runtimeInstance.__wevu_flushSetupSnapshotSync = job;
 		}
 		try {
@@ -2006,7 +2067,7 @@ function createRuntimeMount(options) {
 				enumerable: false,
 				writable: false
 			});
-		} catch (_unused5) {
+		} catch (_unused6) {
 			runtimeInstance.__wevu_cloneLatestSnapshot = scheduler.cloneLatestSnapshot;
 		}
 		try {
@@ -2018,7 +2079,7 @@ function createRuntimeMount(options) {
 				enumerable: false,
 				writable: false
 			});
-		} catch (_unused6) {
+		} catch (_unused7) {
 			runtimeInstance.__wevu_trackSetupReactiveKey = (key) => {
 				trackedSetupReactiveKeys.add(key);
 			};
@@ -3044,6 +3105,7 @@ function runSetupFunction(setup, props, context) {
 	const runtimeContext = (_context$runtime = context === null || context === void 0 ? void 0 : context.runtime) !== null && _context$runtime !== void 0 ? _context$runtime : {
 		methods: Object.create(null),
 		state: {},
+		setupState: {},
 		proxy: {},
 		watch: () => () => {},
 		bindModel: () => {}
@@ -3069,6 +3131,18 @@ function attachRuntimeProxyProps(state, props) {
 		state[WEVU_PROPS_KEY] = props;
 	}
 }
+function attachRuntimeSetupState(state, setupState) {
+	try {
+		Object.defineProperty(state, WEVU_SETUP_STATE_KEY, {
+			value: setupState,
+			configurable: true,
+			enumerable: false,
+			writable: false
+		});
+	} catch (_unused2) {
+		state[WEVU_SETUP_STATE_KEY] = setupState;
+	}
+}
 function attachNativeInstanceRef(state, instance) {
 	try {
 		Object.defineProperty(state, WEVU_NATIVE_INSTANCE_KEY, {
@@ -3077,7 +3151,7 @@ function attachNativeInstanceRef(state, instance) {
 			enumerable: false,
 			writable: true
 		});
-	} catch (_unused2) {
+	} catch (_unused3) {
 		state[WEVU_NATIVE_INSTANCE_KEY] = instance;
 	}
 }
@@ -3089,7 +3163,7 @@ function attachRuntimeRef(state, runtime) {
 			enumerable: false,
 			writable: true
 		});
-	} catch (_unused3) {
+	} catch (_unused4) {
 		state[WEVU_RUNTIME_KEY] = runtime;
 	}
 }
@@ -3101,10 +3175,10 @@ function attachRuntimeInstance(runtime, instance) {
 			enumerable: false,
 			writable: true
 		});
-	} catch (_unused4) {
+	} catch (_unused5) {
 		try {
 			runtime.instance = instance;
-		} catch (_unused5) {}
+		} catch (_unused6) {}
 	}
 }
 function resolveNativeSetData(instance) {
@@ -3135,7 +3209,7 @@ function syncRuntimeProps(props, mpProperties) {
 	const currentKeys = Object.keys(props);
 	for (const key of currentKeys) if (!hasOwn(mpProperties, key)) try {
 		delete props[key];
-	} catch (_unused6) {}
+	} catch (_unused7) {}
 	for (const [key, value] of Object.entries(mpProperties)) props[key] = value;
 }
 function ensureRuntimeProps(target, runtimeState, mpProperties = target.properties || {}) {
@@ -3150,7 +3224,7 @@ function ensureRuntimeProps(target, runtimeState, mpProperties = target.properti
 			enumerable: false,
 			writable: true
 		});
-	} catch (_unused7) {
+	} catch (_unused8) {
 		target[WEVU_PROPS_KEY] = props;
 	}
 	return props;
@@ -3162,6 +3236,7 @@ function normalizeEmitEventName(eventName) {
 	return eventName.includes(":") ? eventName.replaceAll(":", "-").toLowerCase() : eventName;
 }
 function runRuntimeSetupPhase(options) {
+	var _runtimeWithDefaults$;
 	const { target, runtime, runtimeWithDefaults, runtimeState, runtimeProxy, setup } = options;
 	const props = ensureRuntimeProps(target, runtimeState, target.properties || {});
 	const attrs = shallowReactive(Object.create(null));
@@ -3191,6 +3266,7 @@ function runRuntimeSetupPhase(options) {
 	}
 	const setupInstance = ensureSetupContextInstance(target, runtimeWithDefaults);
 	const slots = createSetupSlotsProxy(props);
+	attachRuntimeSetupState(runtimeState, (_runtimeWithDefaults$ = runtimeWithDefaults.setupState) !== null && _runtimeWithDefaults$ !== void 0 ? _runtimeWithDefaults$ : Object.create(null));
 	try {
 		Object.defineProperty(runtimeState, "$slots", {
 			value: slots,
@@ -3228,43 +3304,20 @@ function runRuntimeSetupPhase(options) {
 		const result = instanceScope.run(() => runSetupFunction(setup, props, context));
 		let methodsChanged = false;
 		if (result && typeof result === "object") {
-			const runtimeRawState = isReactive(runtime.state) ? toRaw(runtime.state) : runtime.state;
+			const runtimeSetupState = runtime.setupState && typeof runtime.setupState === "object" ? isReactive(runtime.setupState) ? toRaw(runtime.setupState) : runtime.setupState : Object.create(null);
 			Object.keys(result).forEach((key) => {
 				const val = result[key];
 				if (typeof val === "function") {
 					runtime.methods[key] = (...args) => val.apply(runtime.proxy, args);
+					runtime.state[key] = (...args) => val.apply(runtime.proxy, args);
 					methodsChanged = true;
 				} else {
 					if (hasTrackableSetupBinding(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 {
-							Object.defineProperty(runtimeRawState, key, {
-								configurable: true,
-								enumerable: false,
-								get() {
-									const propsSource = runtimeRawState[WEVU_PROPS_KEY];
-									if (propsSource && typeof propsSource === "object" && hasOwn(propsSource, key)) return propsSource[key];
-									return fallbackValue;
-								},
-								set(next) {
-									fallbackValue = next;
-									const propsSource = runtimeRawState[WEVU_PROPS_KEY];
-									if (!propsSource || typeof propsSource !== "object") return;
-									try {
-										propsSource[key] = next;
-									} catch (_unused3) {}
-								}
-							});
-						} catch (_unused4) {
-							runtime.state[key] = val;
-						}
-						return;
-					}
 					runtime.state[key] = val;
+					runtimeSetupState[key] = val;
 				}
 			});
 		}
@@ -3444,7 +3497,7 @@ function attachPageLayoutSetter(target) {
 * @internal
 */
 function mountRuntimeInstance(target, runtimeApp, watchMap, setup, options) {
-	var _wevuSetDataOptions, _wevuSetDataOptions2, _runtime$proxy, _runtime$state, _computed, _runtime$methods, _watch, _bindModel, _snapshot, _unmount;
+	var _wevuSetDataOptions, _wevuSetDataOptions2, _runtime$proxy, _runtime$state, _runtime$setupState, _computed, _runtime$methods, _watch, _bindModel, _snapshot, _unmount;
 	if (target.__wevu) return target.__wevu;
 	attachRuntimeProvideParentContext(target, runtimeApp);
 	safeMarkNoSetData(target);
@@ -3535,6 +3588,7 @@ function mountRuntimeInstance(target, runtimeApp, watchMap, setup, options) {
 	attachRuntimeInstance(runtime, target);
 	const runtimeProxy = (_runtime$proxy = runtime === null || runtime === void 0 ? void 0 : runtime.proxy) !== null && _runtime$proxy !== void 0 ? _runtime$proxy : {};
 	const runtimeState = (_runtime$state = runtime === null || runtime === void 0 ? void 0 : runtime.state) !== null && _runtime$state !== void 0 ? _runtime$state : {};
+	const runtimeSetupState = (_runtime$setupState = runtime === null || runtime === void 0 ? void 0 : runtime.setupState) !== null && _runtime$setupState !== void 0 ? _runtime$setupState : Object.create(null);
 	if (runtimeState && typeof runtimeState === "object") {
 		attachRuntimeRef(runtimeState, runtime);
 		attachNativeInstanceRef(runtimeState, target);
@@ -3549,6 +3603,7 @@ function mountRuntimeInstance(target, runtimeApp, watchMap, setup, options) {
 	const runtimeWithDefaults = {
 		...runtime !== null && runtime !== void 0 ? runtime : {},
 		state: runtimeState,
+		setupState: runtimeSetupState,
 		proxy: runtimeProxy,
 		methods: runtimeMethods,
 		computed: runtimeComputed,
@@ -3893,19 +3948,26 @@ function attachOptionalPageLifecycleHooks(pageLifecycleHooks, options) {
 //#endregion
 //#region src/runtime/register/component/lifecycle.ts
 function createPageLifecycleHooks(options) {
-	const { runtimeApp, watch, setup, userOnLoad, userOnUnload, userOnShow, userOnHide, userOnReady, isPage, enableOnSaveExitState, enableOnPullDownRefresh, enableOnReachBottom, enableOnPageScroll, enableOnRouteDone, enableOnRouteDoneFallback, enableOnTabItemTap, enableOnResize, enableOnShareAppMessage, enableOnShareTimeline, enableOnAddToFavorites, effectiveOnSaveExitState, effectiveOnPullDownRefresh, effectiveOnReachBottom, effectiveOnPageScroll, effectiveOnRouteDone, effectiveOnTabItemTap, effectiveOnResize, effectiveOnShareAppMessage, effectiveOnShareTimeline, effectiveOnAddToFavorites, hasHook } = options;
+	const { runtimeApp, watch, setup, userOnLoad, userOnUnload, userOnShow, userOnHide, userOnReady, isPage, enableOnSaveExitState, enableOnPullDownRefresh, enableOnReachBottom, enableOnPageScroll, enableOnRouteDone, enableOnRouteDoneFallback, enableOnTabItemTap, enableOnResize, enableOnShareAppMessage, enableOnShareTimeline, enableOnAddToFavorites, syncWevuPropsFromValues, effectiveOnSaveExitState, effectiveOnPullDownRefresh, effectiveOnReachBottom, effectiveOnPageScroll, effectiveOnRouteDone, effectiveOnTabItemTap, effectiveOnResize, effectiveOnShareAppMessage, effectiveOnShareTimeline, effectiveOnAddToFavorites, hasHook } = options;
+	const flushPageSnapshotIfPossible = (target) => {
+		var _wevu, _wevu$__wevu_flushSet;
+		(_wevu = target.__wevu) === null || _wevu === void 0 || (_wevu$__wevu_flushSet = _wevu.__wevu_flushSetupSnapshotSync) === null || _wevu$__wevu_flushSet === void 0 || _wevu$__wevu_flushSet.call(_wevu);
+	};
 	const pageLifecycleHooks = {
 		onLoad(...args) {
 			if (this[WEVU_ON_LOAD_CALLED_KEY]) return;
 			this[WEVU_ON_LOAD_CALLED_KEY] = true;
 			mountRuntimeInstance(this, runtimeApp, watch, setup);
+			const pageOptions = args[0] && typeof args[0] === "object" ? args[0] : resolvePageOptions(this);
+			syncWevuPropsFromValues === null || syncWevuPropsFromValues === void 0 || syncWevuPropsFromValues(this, pageOptions);
+			flushPageSnapshotIfPossible(this);
 			enableDeferredSetData(this);
 			if (isPage) ensurePageShareMenus({
 				enableOnShareAppMessage,
 				enableOnShareTimeline
 			});
 			callHookList(this, "onLoad", args);
-			if (typeof userOnLoad === "function") return userOnLoad.apply(this, args);
+			if (typeof userOnLoad === "function") return userOnLoad.apply(this, args.length ? args : [pageOptions]);
 		},
 		onUnload(...args) {
 			if (isPage) releaseCurrentPageInstance(this);
@@ -3917,6 +3979,8 @@ function createPageLifecycleHooks(options) {
 				ensureMiniProgramGlobalPatched();
 				bindCurrentPageInstance(this);
 				if (!this[WEVU_ON_LOAD_CALLED_KEY]) pageLifecycleHooks.onLoad.call(this, resolvePageOptions(this));
+				syncWevuPropsFromValues === null || syncWevuPropsFromValues === void 0 || syncWevuPropsFromValues(this, resolvePageOptions(this));
+				flushPageSnapshotIfPossible(this);
 				ensurePageShareMenus({
 					enableOnShareAppMessage,
 					enableOnShareTimeline
@@ -3936,6 +4000,8 @@ function createPageLifecycleHooks(options) {
 		onReady(...args) {
 			if (isPage) {
 				if (!this[WEVU_ON_LOAD_CALLED_KEY]) pageLifecycleHooks.onLoad.call(this, resolvePageOptions(this));
+				syncWevuPropsFromValues === null || syncWevuPropsFromValues === void 0 || syncWevuPropsFromValues(this, resolvePageOptions(this));
+				flushPageSnapshotIfPossible(this);
 				ensurePageShareMenus({
 					enableOnShareAppMessage,
 					enableOnShareTimeline
@@ -4136,6 +4202,8 @@ function prepareComponentOptions(mpOptions) {
 		"export",
 		"__wevuTemplateRefs",
 		"__wevuLayoutHosts",
+		WEVU_PROPS_ALIASES_KEY,
+		WEVU_PROPS_DERIVED_KEYS_KEY,
 		"setupLifecycle",
 		"features",
 		"__wevu_isPage"
@@ -4186,6 +4254,10 @@ function prepareComponentOptions(mpOptions) {
 	delete restOptions.__wevuTemplateRefs;
 	const layoutHosts = restOptions.__wevuLayoutHosts;
 	delete restOptions.__wevuLayoutHosts;
+	const propsAliases = restOptions[WEVU_PROPS_ALIASES_KEY];
+	delete restOptions[WEVU_PROPS_ALIASES_KEY];
+	const propsDerivedKeys = restOptions[WEVU_PROPS_DERIVED_KEYS_KEY];
+	delete restOptions[WEVU_PROPS_DERIVED_KEYS_KEY];
 	const userObservers = restOptions.observers;
 	const setupLifecycle = restOptions.setupLifecycle === "created" ? "created" : "attached";
 	delete restOptions.setupLifecycle;
@@ -4206,6 +4278,8 @@ function prepareComponentOptions(mpOptions) {
 		topLevelMethods,
 		templateRefs,
 		layoutHosts,
+		propsAliases,
+		propsDerivedKeys,
 		userObservers,
 		setupLifecycle,
 		legacyCreated,
@@ -4246,9 +4320,48 @@ function refreshOwnerSnapshotFromInstance(instance) {
 //#endregion
 //#region src/runtime/register/component/props.ts
 function createPropsSync(options) {
-	const { restOptions, userObservers } = options;
+	const { restOptions, propsAliases, propsDerivedKeys, userObservers } = options;
 	const propKeys = restOptions.properties && typeof restOptions.properties === "object" ? Object.keys(restOptions.properties) : [];
 	const propKeySet = new Set(propKeys);
+	const propsDerivedKeySet = new Set(propsDerivedKeys !== null && propsDerivedKeys !== void 0 ? propsDerivedKeys : []);
+	const aliasEntries = Object.entries(propsAliases !== null && propsAliases !== void 0 ? propsAliases : {}).filter(([alias, propName]) => alias && propName);
+	const syncedAliases = /* @__PURE__ */ new WeakMap();
+	const syncSetupStatePropsAliases = (instance, propsProxy) => {
+		var _syncedAliases$get;
+		if (!aliasEntries.length) return;
+		const runtime = instance.__wevu;
+		const setupState = runtime === null || runtime === void 0 ? void 0 : runtime.setupState;
+		const state = runtime === null || runtime === void 0 ? void 0 : runtime.state;
+		if (!setupState || typeof setupState !== "object") return;
+		const aliases = (_syncedAliases$get = syncedAliases.get(instance)) !== null && _syncedAliases$get !== void 0 ? _syncedAliases$get : /* @__PURE__ */ new Set();
+		syncedAliases.set(instance, aliases);
+		for (const [alias, propName] of aliasEntries) {
+			if (hasOwn(setupState, alias) && !aliases.has(alias)) continue;
+			const value = propsProxy[propName];
+			try {
+				setupState[alias] = value;
+				aliases.add(alias);
+			} catch (_unused) {}
+			if (state && typeof state === "object" && (!hasOwn(state, alias) || aliases.has(alias))) try {
+				state[alias] = value;
+			} catch (_unused2) {}
+		}
+	};
+	const syncPropsDerivedKeys = (instance, propsProxy) => {
+		if (!propsDerivedKeySet.size) return;
+		const runtime = instance.__wevu;
+		const setupState = runtime === null || runtime === void 0 ? void 0 : runtime.setupState;
+		if (!setupState || typeof setupState !== "object") return;
+		const aliasToPropName = new Map(aliasEntries);
+		for (const key of propsDerivedKeySet) {
+			var _aliasToPropName$get;
+			const propName = (_aliasToPropName$get = aliasToPropName.get(key)) !== null && _aliasToPropName$get !== void 0 ? _aliasToPropName$get : key;
+			if (!hasOwn(propsProxy, propName)) continue;
+			try {
+				setupState[key] = propsProxy[propName];
+			} catch (_unused3) {}
+		}
+	};
 	const attachWevuPropKeys = (instance) => {
 		try {
 			Object.defineProperty(instance, WEVU_PROP_KEYS_KEY, {
@@ -4257,7 +4370,7 @@ function createPropsSync(options) {
 				enumerable: false,
 				writable: false
 			});
-		} catch (_unused) {
+		} catch (_unused4) {
 			instance[WEVU_PROP_KEYS_KEY] = propKeys;
 		}
 	};
@@ -4274,7 +4387,7 @@ function createPropsSync(options) {
 		const currentKeys = Object.keys(attrsProxy);
 		for (const existingKey of currentKeys) if (!next || !hasOwn(next, existingKey) || propKeySet.has(existingKey) || hasRuntimeStateKey(existingKey)) try {
 			delete attrsProxy[existingKey];
-		} catch (_unused2) {}
+		} catch (_unused5) {}
 		if (!next) {
 			refreshOwnerSnapshotFromInstance(instance);
 			return;
@@ -4283,7 +4396,7 @@ function createPropsSync(options) {
 			if (propKeySet.has(key) || hasRuntimeStateKey(key)) continue;
 			try {
 				attrsProxy[key] = value;
-			} catch (_unused3) {}
+			} catch (_unused6) {}
 		}
 		refreshOwnerSnapshotFromInstance(instance);
 	};
@@ -4296,32 +4409,54 @@ function createPropsSync(options) {
 			const currentKeys = Object.keys(propsProxy);
 			for (const existingKey of currentKeys) if (!hasOwn(next, existingKey)) try {
 				delete propsProxy[existingKey];
-			} catch (_unused4) {}
+			} catch (_unused7) {}
 			for (const [k, v] of Object.entries(next)) {
 				const nextValue = pendingPropValues && hasOwn(pendingPropValues, k) ? pendingPropValues[k] : v;
 				try {
 					propsProxy[k] = nextValue;
-				} catch (_unused5) {}
+				} catch (_unused8) {}
 			}
 			if (pendingPropValues) {
 				for (const [k, v] of Object.entries(pendingPropValues)) if (!hasOwn(next, k)) try {
 					propsProxy[k] = v;
-				} catch (_unused6) {}
+				} catch (_unused9) {}
 			}
+			syncPropsDerivedKeys(instance, propsProxy);
+			syncSetupStatePropsAliases(instance, propsProxy);
 			refreshOwnerSnapshotFromInstance(instance);
 		}
 		if (pendingPropValues) delete instance[WEVU_PENDING_PROP_VALUES_KEY];
 		syncWevuAttrsFromInstance(instance);
 	};
+	const syncWevuPropsFromValues = (instance, values) => {
+		if (!values || typeof values !== "object") return;
+		const propsProxy = instance[WEVU_PROPS_KEY];
+		if (!propsProxy || typeof propsProxy !== "object") return;
+		let changed = false;
+		for (const key of propKeys) {
+			if (!hasOwn(values, key)) continue;
+			try {
+				propsProxy[key] = values[key];
+				changed = true;
+			} catch (_unused10) {}
+		}
+		if (!changed) return;
+		syncPropsDerivedKeys(instance, propsProxy);
+		syncSetupStatePropsAliases(instance, propsProxy);
+		refreshOwnerSnapshotFromInstance(instance);
+		syncWevuAttrsFromInstance(instance);
+	};
 	const syncWevuPropValue = (instance, key, value) => {
 		var _ref, _ref$WEVU_PENDING_PRO;
 		const propsProxy = instance[WEVU_PROPS_KEY];
 		if (!propsProxy || typeof propsProxy !== "object") return;
 		try {
 			propsProxy[key] = value;
-		} catch (_unused7) {}
+		} catch (_unused11) {}
 		const pendingPropValues = (_ref$WEVU_PENDING_PRO = (_ref = instance)[WEVU_PENDING_PROP_VALUES_KEY]) !== null && _ref$WEVU_PENDING_PRO !== void 0 ? _ref$WEVU_PENDING_PRO : _ref[WEVU_PENDING_PROP_VALUES_KEY] = Object.create(null);
 		pendingPropValues[key] = value;
+		syncPropsDerivedKeys(instance, propsProxy);
+		syncSetupStatePropsAliases(instance, propsProxy);
 		refreshOwnerSnapshotFromInstance(instance);
 		syncWevuAttrsFromInstance(instance);
 	};
@@ -4346,6 +4481,7 @@ function createPropsSync(options) {
 	return {
 		attachWevuPropKeys,
 		syncWevuPropsFromInstance,
+		syncWevuPropsFromValues,
 		finalObservers
 	};
 }
@@ -4739,7 +4875,7 @@ function registerComponentDefinition(options) {
 */
 function registerComponent(runtimeApp, methods, watch, setup, mpOptions) {
 	var _multipleSlots;
-	const { userMethods, userLifetimes, userPageLifetimes, userOptions, restOptions, topLevelMethods, templateRefs, layoutHosts, userObservers, setupLifecycle, legacyCreated, isPage, features, userOnLoad, userOnUnload, userOnShow, userOnHide, userOnReady, userOnSaveExitState, userOnPullDownRefresh, userOnReachBottom, userOnPageScroll, userOnRouteDone, userOnTabItemTap, userOnResize, userOnShareAppMessage, userOnShareTimeline, userOnAddToFavorites, applyExtraInstanceFields } = prepareComponentOptions(mpOptions);
+	const { userMethods, userLifetimes, userPageLifetimes, userOptions, restOptions, topLevelMethods, templateRefs, layoutHosts, propsAliases, propsDerivedKeys, userObservers, setupLifecycle, legacyCreated, isPage, features, userOnLoad, userOnUnload, userOnShow, userOnHide, userOnReady, userOnSaveExitState, userOnPullDownRefresh, userOnReachBottom, userOnPageScroll, userOnRouteDone, userOnTabItemTap, userOnResize, userOnShareAppMessage, userOnShareTimeline, userOnAddToFavorites, applyExtraInstanceFields } = prepareComponentOptions(mpOptions);
 	const { enableOnPullDownRefresh, enableOnReachBottom, enableOnPageScroll, enableOnRouteDone, enableOnRouteDoneFallback, enableOnTabItemTap, enableOnResize, enableOnShareAppMessage, enableOnShareTimeline, enableOnAddToFavorites, enableOnSaveExitState, effectiveOnSaveExitState, effectiveOnPullDownRefresh, effectiveOnReachBottom, effectiveOnPageScroll, effectiveOnRouteDone, effectiveOnTabItemTap, effectiveOnResize, effectiveOnShareAppMessage, effectiveOnShareTimeline, effectiveOnAddToFavorites } = resolveComponentFeatures({
 		features,
 		userOnSaveExitState,
@@ -4778,8 +4914,10 @@ function registerComponent(runtimeApp, methods, watch, setup, mpOptions) {
 		multipleSlots: (_multipleSlots = userOptions.multipleSlots) !== null && _multipleSlots !== void 0 ? _multipleSlots : true,
 		...userOptions
 	};
-	const { attachWevuPropKeys, syncWevuPropsFromInstance, finalObservers } = createPropsSync({
+	const { attachWevuPropKeys, syncWevuPropsFromInstance, syncWevuPropsFromValues, finalObservers } = createPropsSync({
 		restOptions,
+		propsAliases,
+		propsDerivedKeys,
 		userObservers
 	});
 	const { finalMethods } = createComponentMethods({
@@ -4815,6 +4953,7 @@ function registerComponent(runtimeApp, methods, watch, setup, mpOptions) {
 			enableOnShareAppMessage,
 			enableOnShareTimeline,
 			enableOnAddToFavorites,
+			syncWevuPropsFromValues,
 			effectiveOnSaveExitState,
 			effectiveOnPullDownRefresh,
 			effectiveOnReachBottom,
@@ -4838,6 +4977,7 @@ function registerComponent(runtimeApp, methods, watch, setup, mpOptions) {
 		attachWevuPropKeys,
 		setupLifecycle,
 		syncWevuPropsFromInstance,
+		syncWevuPropsFromValues,
 		isPage,
 		legacyCreated,
 		getRuntimeOwnerLabel
@@ -5169,7 +5309,7 @@ function flushScopedSlotComputedBindings(instance, computed) {
 	const payload = collectComputedPayload(instance, computed);
 	if (payload && Object.keys(payload).length > 0 && typeof (instance === null || instance === void 0 ? void 0 : instance.setData) === "function") instance.setData(payload);
 }
-function mergeSlotProps(instance, computed, override) {
+function syncSlotPropsData(instance, override) {
 	var _instance$properties, _instance$properties2, _instance$__wevu3;
 	const scopeSource = hasOwn(override !== null && override !== void 0 ? override : {}, WEVU_SLOT_SCOPE_KEY) ? override[WEVU_SLOT_SCOPE_KEY] : instance === null || instance === void 0 || (_instance$properties = instance.properties) === null || _instance$properties === void 0 ? void 0 : _instance$properties[WEVU_SLOT_SCOPE_KEY];
 	const propsSource = hasOwn(override !== null && override !== void 0 ? override : {}, WEVU_SLOT_PROPS_KEY) ? override[WEVU_SLOT_PROPS_KEY] : instance === null || instance === void 0 || (_instance$properties2 = instance.properties) === null || _instance$properties2 === void 0 ? void 0 : _instance$properties2[WEVU_SLOT_PROPS_KEY];
@@ -5179,8 +5319,13 @@ function mergeSlotProps(instance, computed, override) {
 		...scope,
 		...slotProps
 	};
+	instance[WEVU_SLOT_PROPS_DATA_KEY] = merged;
 	const runtimeState = instance === null || instance === void 0 || (_instance$__wevu3 = instance.__wevu) === null || _instance$__wevu3 === void 0 ? void 0 : _instance$__wevu3.state;
 	if (runtimeState && typeof runtimeState === "object") runtimeState[WEVU_SLOT_PROPS_DATA_KEY] = merged;
+	return merged;
+}
+function mergeSlotProps(instance, computed, override) {
+	const merged = syncSlotPropsData(instance, override);
 	if (typeof (instance === null || instance === void 0 ? void 0 : instance.setData) === "function") instance.setData({ [WEVU_SLOT_PROPS_DATA_KEY]: merged });
 	flushScopedSlotComputedBindings(instance, computed);
 }
@@ -5204,6 +5349,8 @@ function setOwnerProxy(instance, proxy) {
 function updateOwnerBindings(instance, snapshot, proxy, computed) {
 	var _instance$__wevu5;
 	setOwnerProxy(instance, proxy);
+	syncSlotPropsData(instance);
+	instance[WEVU_SLOT_OWNER_KEY] = snapshot || {};
 	const runtimeState = instance === null || instance === void 0 || (_instance$__wevu5 = instance.__wevu) === null || _instance$__wevu5 === void 0 ? void 0 : _instance$__wevu5.state;
 	if (runtimeState && typeof runtimeState === "object") runtimeState[WEVU_SLOT_OWNER_KEY] = snapshot || {};
 	if (typeof (instance === null || instance === void 0 ? void 0 : instance.setData) === "function") instance.setData({ [WEVU_SLOT_OWNER_KEY]: snapshot || {} });
@@ -5342,12 +5489,12 @@ function shouldExposeInSnapshot(value) {
 	return isPlainObject(value);
 }
 function applySetupResult(runtime, target, result, options) {
-	var _runtime$methods, _runtime$state;
+	var _runtime$methods, _runtime$state, _runtime$setupState;
 	const includeFunctionsInState = Boolean(options === null || options === void 0 ? void 0 : options.includeFunctionsInState);
 	const functionPropPaths = options === null || options === void 0 ? void 0 : options.functionPropPaths;
-	const declaredPropKeys = new Set(Array.isArray(target === null || target === void 0 ? void 0 : target[WEVU_PROP_KEYS_KEY]) ? target[WEVU_PROP_KEYS_KEY] : []);
 	const methods = (_runtime$methods = runtime === null || runtime === void 0 ? void 0 : runtime.methods) !== null && _runtime$methods !== void 0 ? _runtime$methods : Object.create(null);
 	const state = (_runtime$state = runtime === null || runtime === void 0 ? void 0 : runtime.state) !== null && _runtime$state !== void 0 ? _runtime$state : Object.create(null);
+	const setupState = (_runtime$setupState = runtime === null || runtime === void 0 ? void 0 : runtime.setupState) !== null && _runtime$setupState !== void 0 ? _runtime$setupState : Object.create(null);
 	const rawState = isReactive(state) ? toRaw(state) : state;
 	let methodsChanged = false;
 	if (runtime && !runtime.methods) try {
@@ -5356,6 +5503,9 @@ function applySetupResult(runtime, target, result, options) {
 	if (runtime && !runtime.state) try {
 		runtime.state = state;
 	} catch (_unused2) {}
+	if (runtime && !runtime.setupState) try {
+		runtime.setupState = setupState;
+	} catch (_unused3) {}
 	Object.keys(result).forEach((key) => {
 		const val = result[key];
 		if (typeof val === "function") {
@@ -5364,38 +5514,15 @@ function applySetupResult(runtime, target, result, options) {
 				return val.apply((_runtime$proxy = runtime === null || runtime === void 0 ? void 0 : runtime.proxy) !== null && _runtime$proxy !== void 0 ? _runtime$proxy : runtime, args);
 			};
 			methods[key] = bound;
-			if (includeFunctionsInState || (functionPropPaths === null || functionPropPaths === void 0 ? void 0 : functionPropPaths.has(key))) state[key] = bound;
+			state[key] = bound;
+			if (includeFunctionsInState || (functionPropPaths === null || functionPropPaths === void 0 ? void 0 : functionPropPaths.has(key))) setupState[key] = bound;
 			methodsChanged = true;
 		} else {
 			if (hasTrackableSetupBinding(val)) {
 				var _runtime$__wevu_track;
 				runtime === null || runtime === void 0 || (_runtime$__wevu_track = runtime.__wevu_trackSetupReactiveKey) === null || _runtime$__wevu_track === void 0 || _runtime$__wevu_track.call(runtime, key);
 			}
-			if (declaredPropKeys.has(key)) {
-				let fallbackValue = val;
-				try {
-					Object.defineProperty(rawState, key, {
-						configurable: true,
-						enumerable: false,
-						get() {
-							const propsSource = rawState[WEVU_PROPS_KEY];
-							if (propsSource && typeof propsSource === "object" && hasOwn(propsSource, key)) return propsSource[key];
-							return fallbackValue;
-						},
-						set(next) {
-							fallbackValue = next;
-							const propsSource = rawState[WEVU_PROPS_KEY];
-							if (!propsSource || typeof propsSource !== "object") return;
-							try {
-								propsSource[key] = next;
-							} catch (_unused3) {}
-						}
-					});
-				} catch (_unused4) {
-					state[key] = val;
-				}
-				return;
-			}
+			state[key] = val;
 			if (val === target || !shouldExposeInSnapshot(val)) try {
 				Object.defineProperty(rawState, key, {
 					value: val,
@@ -5403,10 +5530,8 @@ function applySetupResult(runtime, target, result, options) {
 					enumerable: false,
 					writable: true
 				});
-			} catch (_unused5) {
-				state[key] = val;
-			}
-			else state[key] = val;
+			} catch (_unused4) {}
+			setupState[key] = val;
 		}
 	});
 	if (runtime) {
@@ -5955,6 +6080,9 @@ function useScrollOffset(options = {}) {
 //#endregion
 //#region src/runtime/template.ts
 const hyphenateRE = /\B([A-Z])/g;
+function hasOwnProperty(target, key) {
+	return Object.prototype.hasOwnProperty.call(target, key);
+}
 function hyphenate(value) {
 	if (!value) return "";
 	if (value.startsWith("--")) return value;
@@ -6016,6 +6144,25 @@ function normalizeClass(value) {
 	}
 	return res;
 }
+function resolvePropValue(target, key, fallback, preferProps = false) {
+	if (target == null) return fallback;
+	const propsObject = unref(target.__wevuProps);
+	if (key === "data") {
+		if (propsObject != null && (propsObject[key] !== void 0 || hasOwnProperty(propsObject, key))) return propsObject[key];
+		return key in target ? target[key] : fallback;
+	}
+	const hasPropsValue = propsObject != null && (propsObject[key] !== void 0 || hasOwnProperty(propsObject, key));
+	if (preferProps) {
+		if (hasPropsValue) return propsObject[key];
+		if (key in target) return target[key];
+		return fallback;
+	}
+	const stateObject = unref(target.$state);
+	if (stateObject != null && hasOwnProperty(stateObject, key)) return target[key];
+	if (hasPropsValue) return propsObject[key];
+	if (!(key in target)) return fallback;
+	return target[key];
+}
 
 //#endregion
 //#region src/runtime/updatePerformance.ts
@@ -6237,5 +6384,5 @@ function useTemplateRef(name) {
 }
 
 //#endregion
-export { isNoSetData as $, createApp as A, waitForLayoutHost as B, usePageStack as C, shallowRef as Ct, createWevuComponent as D, useDisposables as E, __reExport as Et, resolveLayoutHost as F, runSetupFunction as G, mountRuntimeInstance as H, unregisterPageLayoutBridge as I, syncRuntimePageLayoutState as J, resolveRuntimePageLayoutName as K, unregisterRuntimeLayoutHosts as L, registerPageLayoutBridge as M, registerRuntimeLayoutHosts as N, createWevuScopedSlotComponent as O, resolveLayoutBridge as P, setWevuDefaults as Q, useLayoutBridge as R, useNavigationBarMetrics as S, isShallowRef as St, useElementIntersectionObserver as T, __exportAll as Tt, setRuntimeSetDataVisibility as U, registerApp as V, teardownRuntimeInstance as W, usePageLayout as X, syncRuntimePageLayoutStateFromRuntime as Y, resetWevuDefaults as Z, useSelectorQuery as _, onUnmounted as _t, useModel as a, watchSyncEffect as at, getCurrentPageStackSnapshot as b, toRef as bt, useSlots as c, callUpdateHooks as ct, useUpdatePerformanceListener as d, onBeforeUnmount as dt, markNoSetData as et, normalizeClass as f, onBeforeUpdate as ft, useSelectorFields as g, onServerPrefetch as gt, useScrollOffset as h, onMounted as ht, useChangeModel as i, watchPostEffect as it, registerComponent as j, defineComponent as k, defineAppSetup as l, onActivated as lt, useBoundingClientRect as m, onErrorCaptured as mt, mergeModels as n, watch as nt, useAttrs as o, getDeepWatchStrategy as ot, normalizeStyle as p, onDeactivated as pt, setPageLayout as q, useBindModel as r, watchEffect as rt, useNativeInstance as s, setDeepWatchStrategy as st, useTemplateRef as t, version as tt, use as u, onBeforeMount as ut, useAsyncPullDownRefresh as v, onUpdated as vt, useIntersectionObserver as w, triggerRef as wt, getNavigationBarMetrics as x, toRefs as xt, usePageScrollThrottle as y, traverse as yt, useLayoutHosts as z };
-//# sourceMappingURL=src-CJb8KQQ7.mjs.map
+export { setWevuDefaults as $, defineComponent as A, useLayoutHosts as B, useNavigationBarMetrics as C, isShallowRef as Ct, useDisposables as D, __reExport as Dt, useElementIntersectionObserver as E, __exportAll as Et, resolveLayoutBridge as F, teardownRuntimeInstance as G, registerApp as H, resolveLayoutHost as I, setPageLayout as J, runSetupFunction as K, unregisterPageLayoutBridge as L, registerComponent as M, registerPageLayoutBridge as N, createWevuComponent as O, registerRuntimeLayoutHosts as P, resetWevuDefaults as Q, unregisterRuntimeLayoutHosts as R, getNavigationBarMetrics as S, toRefs as St, useIntersectionObserver as T, triggerRef as Tt, mountRuntimeInstance as U, waitForLayoutHost as V, setRuntimeSetDataVisibility as W, syncRuntimePageLayoutStateFromRuntime as X, syncRuntimePageLayoutState as Y, usePageLayout as Z, useSelectorFields as _, onServerPrefetch as _t, useModel as a, watchPostEffect as at, usePageScrollThrottle as b, traverse as bt, useSlots as c, setDeepWatchStrategy as ct, useUpdatePerformanceListener as d, onBeforeMount as dt, isNoSetData as et, normalizeClass as f, onBeforeUnmount as ft, useScrollOffset as g, onMounted as gt, useBoundingClientRect as h, onErrorCaptured as ht, useChangeModel as i, watchEffect as it, createApp as j, createWevuScopedSlotComponent as k, defineAppSetup as l, callUpdateHooks as lt, resolvePropValue as m, onDeactivated as mt, mergeModels as n, version as nt, useAttrs as o, watchSyncEffect as ot, normalizeStyle as p, onBeforeUpdate as pt, resolveRuntimePageLayoutName as q, useBindModel as r, watch as rt, useNativeInstance as s, getDeepWatchStrategy as st, useTemplateRef as t, markNoSetData as tt, use as u, onActivated as ut, useSelectorQuery as v, onUnmounted as vt, usePageStack as w, shallowRef as wt, getCurrentPageStackSnapshot as x, toRef as xt, useAsyncPullDownRefresh as y, onUpdated as yt, useLayoutBridge as z };
+//# sourceMappingURL=src-fYd456WG.mjs.map