wevu 0.0.2-alpha.0 → 1.0.0-alpha.2

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { _ as computed, a as isRef, b as nextTick, c as isObject, d as isShallowReactive, f as markRaw, g as touchReactive, h as toRaw, i as customRef, l as isRaw, m as shallowReactive, n as defineStore, o as ref, p as reactive, r as createStore, s as unref, t as storeToRefs, u as isReactive, v as effect, x as queueJob, y as stop } from "./store-BcU7YVhB.mjs";
+import { C as onScopeDispose, D as queueJob, E as nextTick, S as getCurrentScope, T as stop, _ as computed, a as isRef, b as effectScope, c as isObject, d as isShallowReactive, f as markRaw, g as touchReactive, h as toRaw, i as customRef, l as isRaw, m as shallowReactive, n as defineStore, o as ref, p as reactive, r as createStore, s as unref, t as storeToRefs, u as isReactive, v as batch, w as startBatch, x as endBatch, y as effect } from "./store-2q4qcdBi.mjs";
 
 //#region src/reactivity/readonly.ts
 function readonly(target) {
@@ -155,10 +155,13 @@ function watch(source, cb, options = {}) {
 	});
 	if (options.immediate) job();
 	else oldValue = runner();
-	return () => {
+	const stopHandle = () => {
 		cleanup?.();
+		cleanup = void 0;
 		stop(runner);
 	};
+	onScopeDispose(stopHandle);
+	return stopHandle;
 }
 /**
 * watchEffect 注册一个响应式副作用，可选清理函数。
@@ -173,14 +176,20 @@ function watchEffect(effectFn) {
 		cleanup?.();
 		cleanup = void 0;
 		effectFn(onCleanup);
-	}, { scheduler: () => queueJob(() => {
-		if (runner.active) runner();
-	}) });
+	}, {
+		lazy: true,
+		scheduler: () => queueJob(() => {
+			if (runner.active) runner();
+		})
+	});
 	runner();
-	return () => {
+	const stopHandle = () => {
 		cleanup?.();
+		cleanup = void 0;
 		stop(runner);
 	};
+	onScopeDispose(stopHandle);
+	return stopHandle;
 }
 
 //#endregion
@@ -283,7 +292,7 @@ function createBindModel(publicInstance, state, computedRefs, computedSetters) {
 
 //#endregion
 //#region src/runtime/diff.ts
-function isPlainObject(value) {
+function isPlainObject$1(value) {
 	if (Object.prototype.toString.call(value) !== "[object Object]") return false;
 	const proto = Object.getPrototypeOf(value);
 	return proto === null || proto === Object.prototype;
@@ -311,7 +320,7 @@ function toPlain(value, seen = /* @__PURE__ */ new WeakMap()) {
 function isDeepEqual(a, b) {
 	if (Object.is(a, b)) return true;
 	if (Array.isArray(a) && Array.isArray(b)) return isArrayEqual(a, b);
-	if (isPlainObject(a) && isPlainObject(b)) return isPlainObjectEqual(a, b);
+	if (isPlainObject$1(a) && isPlainObject$1(b)) return isPlainObjectEqual(a, b);
 	return false;
 }
 function isArrayEqual(a, b) {
@@ -334,7 +343,7 @@ function normalizeSetDataValue(value) {
 }
 function assignNestedDiff(prev, next, path, output) {
 	if (isDeepEqual(prev, next)) return;
-	if (isPlainObject(prev) && isPlainObject(next)) {
+	if (isPlainObject$1(prev) && isPlainObject$1(next)) {
 		new Set([...Object.keys(prev), ...Object.keys(next)]).forEach((key) => {
 			if (!Object.prototype.hasOwnProperty.call(next, key)) {
 				output[`${path}.${key}`] = null;
@@ -546,6 +555,20 @@ function callUpdateHooks(target, phase) {
 
 //#endregion
 //#region src/runtime/register.ts
+function runInlineExpression(ctx, expr, event) {
+	const handlerName = typeof expr === "string" ? expr : void 0;
+	if (!handlerName) return;
+	const argsRaw = (event?.currentTarget)?.dataset?.wvArgs ?? (event?.target)?.dataset?.wvArgs;
+	let args = [];
+	if (typeof argsRaw === "string") try {
+		args = JSON.parse(argsRaw);
+	} catch {
+		args = [];
+	}
+	const resolvedArgs = args.map((item) => item === "$event" ? event : item);
+	const handler = ctx?.[handlerName];
+	if (typeof handler === "function") return handler.apply(ctx, resolvedArgs);
+}
 function runSetupFunction(setup, props, context) {
 	if (typeof setup !== "function") return;
 	const runtimeContext = context?.runtime ?? {
@@ -611,6 +634,7 @@ function registerWatches(runtime, watchMap, instance) {
 	return stops;
 }
 function mountRuntimeInstance(target, runtimeApp, watchMap, setup) {
+	if (target.__wevu) return target.__wevu;
 	const runtime = runtimeApp.mount({ setData(payload) {
 		if (typeof target.setData === "function") target.setData(payload);
 	} });
@@ -682,6 +706,7 @@ function mountRuntimeInstance(target, runtimeApp, watchMap, setup) {
 }
 function teardownRuntimeInstance(target) {
 	const runtime = target.__wevu;
+	if (runtime && target.__wevuHooks) callHookList(target, "onUnload", []);
 	if (target.__wevuHooks) target.__wevuHooks = void 0;
 	const stops = target.__wevuWatchStops;
 	if (Array.isArray(stops)) for (const stop$1 of stops) try {
@@ -697,6 +722,10 @@ function registerApp(runtimeApp, methods, watch$1, setup, mpOptions) {
 	const methodNames = Object.keys(methods ?? {});
 	const appOptions = { ...mpOptions };
 	appOptions.globalData = appOptions.globalData ?? {};
+	if (!appOptions.__weapp_vite_inline) appOptions.__weapp_vite_inline = function __weapp_vite_inline(event) {
+		const expr = event?.currentTarget?.dataset?.wvHandler ?? event?.target?.dataset?.wvHandler;
+		return runInlineExpression(this.__wevu?.proxy ?? this, expr, event);
+	};
 	const userOnLaunch = appOptions.onLaunch;
 	appOptions.onLaunch = function onLaunch(...args) {
 		mountRuntimeInstance(this, runtimeApp, watch$1, setup);
@@ -731,89 +760,38 @@ function registerApp(runtimeApp, methods, watch$1, setup, mpOptions) {
 	}
 	App(appOptions);
 }
-function registerPage(runtimeApp, methods, watch$1, setup, mpOptions, features) {
-	if (typeof Page !== "function") throw new TypeError("definePage requires the global Page constructor to be available");
-	const methodNames = Object.keys(methods ?? {});
-	const pageOptions = { ...mpOptions };
-	const userOnLoad = mpOptions.onLoad;
-	pageOptions.onLoad = function onLoad(...args) {
-		mountRuntimeInstance(this, runtimeApp, watch$1, setup);
-		callHookList(this, "onShow", args);
-		if (typeof userOnLoad === "function") userOnLoad.apply(this, args);
-	};
-	const userOnUnload = mpOptions.onUnload;
-	pageOptions.onUnload = function onUnload$1(...args) {
-		teardownRuntimeInstance(this);
-		if (typeof userOnUnload === "function") userOnUnload.apply(this, args);
+function registerComponent(runtimeApp, methods, watch$1, setup, mpOptions, features) {
+	const { methods: userMethods = {}, lifetimes: userLifetimes = {}, pageLifetimes: userPageLifetimes = {}, options: userOptions = {}, ...rest } = mpOptions;
+	const userOnLoad = rest.onLoad;
+	const userOnUnload = rest.onUnload;
+	const userOnShow = rest.onShow;
+	const userOnHide = rest.onHide;
+	const userOnReady = rest.onReady;
+	const userOnSaveExitState = rest.onSaveExitState;
+	const userOnPageScroll = rest.onPageScroll;
+	const userOnShareAppMessage = rest.onShareAppMessage;
+	const userOnShareTimeline = rest.onShareTimeline;
+	const userOnAddToFavorites = rest.onAddToFavorites;
+	const restOptions = { ...rest };
+	delete restOptions.onLoad;
+	delete restOptions.onUnload;
+	delete restOptions.onShow;
+	delete restOptions.onHide;
+	delete restOptions.onReady;
+	delete restOptions.onSaveExitState;
+	delete restOptions.onPageScroll;
+	delete restOptions.onShareAppMessage;
+	delete restOptions.onShareTimeline;
+	delete restOptions.onAddToFavorites;
+	const finalOptions = {
+		multipleSlots: userOptions.multipleSlots ?? true,
+		...userOptions
 	};
-	const userOnShow = mpOptions.onShow;
-	pageOptions.onShow = function onShow$1(...args) {
-		callHookList(this, "onShow", args);
-		if (typeof userOnShow === "function") userOnShow.apply(this, args);
-	};
-	const userOnHide = mpOptions.onHide;
-	pageOptions.onHide = function onHide$1(...args) {
-		callHookList(this, "onHide", args);
-		if (typeof userOnHide === "function") userOnHide.apply(this, args);
-	};
-	const userOnReady = mpOptions.onReady;
-	pageOptions.onReady = function onReady$1(...args) {
-		callHookList(this, "onReady", args);
-		if (typeof userOnReady === "function") return userOnReady.apply(this, args);
-	};
-	const userOnSaveExitState = mpOptions.onSaveExitState;
-	pageOptions.onSaveExitState = function onSaveExitState$1(...args) {
-		const ret = callHookReturn(this, "onSaveExitState", args);
-		if (ret !== void 0) return ret;
-		if (typeof userOnSaveExitState === "function") return userOnSaveExitState.apply(this, args);
-	};
-	if (features?.listenPageScroll) {
-		const userOnPageScroll = mpOptions.onPageScroll;
-		pageOptions.onPageScroll = function onPageScroll$1(...args) {
-			callHookList(this, "onPageScroll", args);
-			if (typeof userOnPageScroll === "function") return userOnPageScroll.apply(this, args);
-		};
-	}
-	if (features?.enableShareAppMessage) {
-		const userOnShare = mpOptions.onShareAppMessage;
-		pageOptions.onShareAppMessage = function pageOnShareAppMessage(...args) {
-			const ret = callHookReturn(this, "onShareAppMessage", args);
-			if (ret !== void 0) return ret;
-			if (typeof userOnShare === "function") return userOnShare.apply(this, args);
-		};
-	}
-	if (features?.enableShareTimeline) {
-		const userOnShareTimeline = mpOptions.onShareTimeline;
-		pageOptions.onShareTimeline = function pageOnShareTimeline(...args) {
-			const ret = callHookReturn(this, "onShareTimeline", args);
-			if (ret !== void 0) return ret;
-			if (typeof userOnShareTimeline === "function") return userOnShareTimeline.apply(this, args);
-		};
-	}
-	if (features?.enableAddToFavorites) {
-		const userOnAddToFavorites = mpOptions.onAddToFavorites;
-		pageOptions.onAddToFavorites = function pageOnAddToFavorites(...args) {
-			const ret = callHookReturn(this, "onAddToFavorites", args);
-			if (ret !== void 0) return ret;
-			if (typeof userOnAddToFavorites === "function") return userOnAddToFavorites.apply(this, args);
-		};
-	}
-	for (const methodName of methodNames) {
-		const userMethod = mpOptions[methodName];
-		pageOptions[methodName] = function runtimeMethod(...args) {
-			const runtime = this.__wevu;
-			let result;
-			const bound = runtime?.methods?.[methodName];
-			if (bound) result = bound.apply(runtime.proxy, args);
-			if (typeof userMethod === "function") return userMethod.apply(this, args);
-			return result;
-		};
-	}
-	Page(pageOptions);
-}
-function registerComponent(runtimeApp, methods, watch$1, setup, mpOptions) {
-	const { methods: userMethods = {}, lifetimes: userLifetimes = {}, pageLifetimes: userPageLifetimes = {}, ...rest } = mpOptions;
 	const finalMethods = { ...userMethods };
+	if (!finalMethods.__weapp_vite_inline) finalMethods.__weapp_vite_inline = function __weapp_vite_inline(event) {
+		const expr = event?.currentTarget?.dataset?.wvHandler ?? event?.target?.dataset?.wvHandler;
+		return runInlineExpression(this.__wevu?.proxy ?? this, expr, event);
+	};
 	const methodNames = Object.keys(methods ?? {});
 	for (const methodName of methodNames) {
 		const userMethod = finalMethods[methodName];
@@ -835,8 +813,58 @@ function registerComponent(runtimeApp, methods, watch$1, setup, mpOptions) {
 	};
 	wrapSpecial("onTabItemTap");
 	wrapSpecial("onRouteDone");
+	const pageLifecycleHooks = {
+		onLoad(...args) {
+			mountRuntimeInstance(this, runtimeApp, watch$1, setup);
+			if (typeof userOnLoad === "function") return userOnLoad.apply(this, args);
+		},
+		onUnload(...args) {
+			teardownRuntimeInstance(this);
+			if (typeof userOnUnload === "function") return userOnUnload.apply(this, args);
+		},
+		onShow(...args) {
+			callHookList(this, "onShow", args);
+			if (typeof userOnShow === "function") return userOnShow.apply(this, args);
+		},
+		onHide(...args) {
+			callHookList(this, "onHide", args);
+			if (typeof userOnHide === "function") return userOnHide.apply(this, args);
+		},
+		onReady(...args) {
+			if (!this.__wevuReadyCalled) {
+				this.__wevuReadyCalled = true;
+				callHookList(this, "onReady", args);
+			}
+			if (typeof userOnReady === "function") return userOnReady.apply(this, args);
+		},
+		onSaveExitState(...args) {
+			const ret = callHookReturn(this, "onSaveExitState", args);
+			if (ret !== void 0) return ret;
+			if (typeof userOnSaveExitState === "function") return userOnSaveExitState.apply(this, args);
+		}
+	};
+	if (features?.listenPageScroll) pageLifecycleHooks.onPageScroll = function onPageScroll$1(...args) {
+		callHookList(this, "onPageScroll", args);
+		if (typeof userOnPageScroll === "function") return userOnPageScroll.apply(this, args);
+	};
+	if (features?.enableShareAppMessage) pageLifecycleHooks.onShareAppMessage = function onShareAppMessage$1(...args) {
+		const ret = callHookReturn(this, "onShareAppMessage", args);
+		if (ret !== void 0) return ret;
+		if (typeof userOnShareAppMessage === "function") return userOnShareAppMessage.apply(this, args);
+	};
+	if (features?.enableShareTimeline) pageLifecycleHooks.onShareTimeline = function onShareTimeline$1(...args) {
+		const ret = callHookReturn(this, "onShareTimeline", args);
+		if (ret !== void 0) return ret;
+		if (typeof userOnShareTimeline === "function") return userOnShareTimeline.apply(this, args);
+	};
+	if (features?.enableAddToFavorites) pageLifecycleHooks.onAddToFavorites = function onAddToFavorites$1(...args) {
+		const ret = callHookReturn(this, "onAddToFavorites", args);
+		if (ret !== void 0) return ret;
+		if (typeof userOnAddToFavorites === "function") return userOnAddToFavorites.apply(this, args);
+	};
 	Component({
-		...rest,
+		...restOptions,
+		...pageLifecycleHooks,
 		lifetimes: {
 			...userLifetimes,
 			attached: function attached(...args) {
@@ -844,7 +872,10 @@ function registerComponent(runtimeApp, methods, watch$1, setup, mpOptions) {
 				if (typeof userLifetimes.attached === "function") userLifetimes.attached.apply(this, args);
 			},
 			ready: function ready(...args) {
-				callHookList(this, "onReady", args);
+				if (!this.__wevuReadyCalled) {
+					this.__wevuReadyCalled = true;
+					callHookList(this, "onReady", args);
+				}
 				if (typeof userLifetimes.ready === "function") userLifetimes.ready.apply(this, args);
 			},
 			detached: function detached(...args) {
@@ -863,7 +894,8 @@ function registerComponent(runtimeApp, methods, watch$1, setup, mpOptions) {
 				if (typeof userPageLifetimes.hide === "function") userPageLifetimes.hide.apply(this, args);
 			}
 		},
-		methods: finalMethods
+		methods: finalMethods,
+		options: finalOptions
 	});
 }
 
@@ -986,6 +1018,7 @@ function createApp(options) {
 			};
 			const job = () => {
 				if (!mounted) return;
+				tracker();
 				const snapshot = collectSnapshot();
 				const diff = diffSnapshots(latestSnapshot, snapshot);
 				latestSnapshot = snapshot;
@@ -995,10 +1028,18 @@ function createApp(options) {
 					if (result && typeof result.then === "function") result.catch(() => {});
 				}
 			};
-			const tracker = effect(() => {
+			let tracker;
+			tracker = effect(() => {
 				touchReactive(state);
+				Object.keys(state).forEach((key) => {
+					const v = state[key];
+					if (isRef(v)) v.value;
+				});
 				Object.keys(computedRefs).forEach((key) => computedRefs[key].value);
-			}, { scheduler: () => queueJob(job) });
+			}, {
+				lazy: true,
+				scheduler: () => queueJob(job)
+			});
 			job();
 			stopHandles.push(() => stop(tracker));
 			function registerWatch(source, cb, watchOptions) {
@@ -1065,7 +1106,9 @@ function setComputedValue(setters, key, value) {
 //#endregion
 //#region src/runtime/define.ts
 /**
-* 按 Vue 3 风格定义一个小程序组件（始终注册为 Component，页面请用 definePage）。
+* 按 Vue 3 风格定义一个小程序组件/页面。
+*
+* - 统一注册为 `Component()`
 *
 * @param options 组件定义项
 * @returns 可手动注册的组件定义
@@ -1079,57 +1122,19 @@ function setComputedValue(setters, key, value) {
 *   }
 * })
 * ```
-*/
-function defineComponent(options) {
-	const { data, computed: computed$1, methods, watch: watch$1, setup, props, ...mpOptions } = options;
-	const mpOptionsWithProps = normalizeProps(mpOptions, props);
-	const runtimeApp = createApp({
-		data,
-		computed: computed$1,
-		methods
-	});
-	const setupWrapper = (ctx) => {
-		const result = runSetupFunction(setup, ctx?.props ?? {}, ctx);
-		if (result) applySetupResult(ctx.runtime, ctx.instance, result);
-	};
-	const componentOptions = {
-		data,
-		computed: computed$1,
-		methods,
-		watch: watch$1,
-		setup: setupWrapper,
-		mpOptions: mpOptionsWithProps
-	};
-	registerComponent(runtimeApp, methods ?? {}, watch$1, setupWrapper, mpOptionsWithProps);
-	return {
-		__wevu_runtime: runtimeApp,
-		__wevu_options: componentOptions
-	};
-}
-/**
-* 按 Vue 3 风格定义一个小程序页面
-*
-* @param options 页面定义
-* @param features 页面特性（例如 listenPageScroll、enableShareAppMessage 等）
-* @returns 页面定义
 *
 * @example
 * ```ts
-* definePage({
-*   data: () => ({ count: 0 }),
+* defineComponent({
+*   features: { listenPageScroll: true },
 *   setup() {
-*     const count = ref(0)
-*     onMounted(() => console.log('page mounted'))
-*     return { count }
+*     onPageScroll(() => {})
 *   }
-* }, {
-*   listenPageScroll: true,
-*   enableShareAppMessage: true
 * })
 * ```
 */
-function definePage(options, features) {
-	const { data, computed: computed$1, methods, watch: watch$1, setup, props: _props, ...mpOptions } = options;
+function defineComponent(options) {
+	const { features, data, computed: computed$1, methods, watch: watch$1, setup, props, ...mpOptions } = options;
 	const runtimeApp = createApp({
 		data,
 		computed: computed$1,
@@ -1139,19 +1144,18 @@ function definePage(options, features) {
 		const result = runSetupFunction(setup, ctx?.props ?? {}, ctx);
 		if (result) applySetupResult(ctx.runtime, ctx.instance, result);
 	};
+	const mpOptionsWithProps = normalizeProps(mpOptions, props);
 	const componentOptions = {
-		type: "page",
 		data,
 		computed: computed$1,
 		methods,
 		watch: watch$1,
 		setup: setupWrapper,
-		mpOptions,
+		mpOptions: mpOptionsWithProps,
 		features
 	};
-	registerPage(runtimeApp, methods ?? {}, watch$1, setupWrapper, mpOptions, features);
+	registerComponent(runtimeApp, methods ?? {}, watch$1, setupWrapper, mpOptionsWithProps, features);
 	return {
-		mount: () => {},
 		__wevu_runtime: runtimeApp,
 		__wevu_options: componentOptions
 	};
@@ -1159,6 +1163,7 @@ function definePage(options, features) {
 function applySetupResult(runtime, _target, result) {
 	const methods = runtime?.methods ?? Object.create(null);
 	const state = runtime?.state ?? Object.create(null);
+	const rawState = isReactive(state) ? toRaw(state) : state;
 	if (runtime && !runtime.methods) try {
 		runtime.methods = methods;
 	} catch {}
@@ -1168,6 +1173,16 @@ function applySetupResult(runtime, _target, result) {
 	Object.keys(result).forEach((key) => {
 		const val = result[key];
 		if (typeof val === "function") methods[key] = (...args) => val.apply(runtime?.proxy ?? runtime, args);
+		else if (val === _target || !shouldExposeInSnapshot(val)) try {
+			Object.defineProperty(rawState, key, {
+				value: val,
+				configurable: true,
+				enumerable: false,
+				writable: true
+			});
+		} catch {
+			state[key] = val;
+		}
 		else state[key] = val;
 	});
 	if (runtime) {
@@ -1175,6 +1190,18 @@ function applySetupResult(runtime, _target, result) {
 		runtime.state = runtime.state ?? state;
 	}
 }
+function isPlainObject(value) {
+	if (Object.prototype.toString.call(value) !== "[object Object]") return false;
+	const proto = Object.getPrototypeOf(value);
+	return proto === null || proto === Object.prototype;
+}
+function shouldExposeInSnapshot(value) {
+	if (value == null) return true;
+	if (typeof value !== "object") return true;
+	if (isRef(value) || isReactive(value)) return true;
+	if (Array.isArray(value)) return true;
+	return isPlainObject(value);
+}
 /**
 * 从 Vue SFC 选项创建 wevu 组件，供 weapp-vite 编译产物直接调用的兼容入口。
 *
@@ -1287,4 +1314,4 @@ function injectGlobal(key, defaultValue) {
 }
 
 //#endregion
-export { callHookList, callHookReturn, callUpdateHooks, computed, createApp, createStore, createWevuComponent, defineComponent, definePage, defineStore, effect, getCurrentInstance, getDeepWatchStrategy, inject, injectGlobal, isRaw, isReactive, isRef, isShallowReactive, isShallowRef, markRaw, mountRuntimeInstance, nextTick, onActivated, onAddToFavorites, onAppError, onAppHide, onAppShow, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onHide, onMounted, onPageScroll, onReady, onRouteDone, onSaveExitState, onServerPrefetch, onShareAppMessage, onShareTimeline, onShow, onTabItemTap, onUnload, onUnmounted, onUpdated, provide, provideGlobal, reactive, readonly, ref, registerApp, registerComponent, registerPage, runSetupFunction, setCurrentInstance, setDeepWatchStrategy, shallowReactive, shallowRef, stop, storeToRefs, teardownRuntimeInstance, toRaw, toRef, toRefs, touchReactive, traverse, triggerRef, unref, watch, watchEffect };
+export { batch, callHookList, callHookReturn, callUpdateHooks, computed, createApp, createStore, createWevuComponent, defineComponent, defineStore, effect, effectScope, endBatch, getCurrentInstance, getCurrentScope, getDeepWatchStrategy, inject, injectGlobal, isRaw, isReactive, isRef, isShallowReactive, isShallowRef, markRaw, mountRuntimeInstance, nextTick, onActivated, onAddToFavorites, onAppError, onAppHide, onAppShow, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onHide, onMounted, onPageScroll, onReady, onRouteDone, onSaveExitState, onScopeDispose, onServerPrefetch, onShareAppMessage, onShareTimeline, onShow, onTabItemTap, onUnload, onUnmounted, onUpdated, provide, provideGlobal, reactive, readonly, ref, registerApp, registerComponent, runSetupFunction, setCurrentInstance, setDeepWatchStrategy, shallowReactive, shallowRef, startBatch, stop, storeToRefs, teardownRuntimeInstance, toRaw, toRef, toRefs, touchReactive, traverse, triggerRef, unref, watch, watchEffect };

package/dist/{store-BcU7YVhB.mjs → store-2q4qcdBi.mjs}

@@ -24,6 +24,85 @@ function nextTick(fn) {
 const targetMap = /* @__PURE__ */ new WeakMap();
 let activeEffect = null;
 const effectStack = [];
+let batchDepth = 0;
+const batchedEffects = /* @__PURE__ */ new Set();
+function startBatch() {
+	batchDepth++;
+}
+function endBatch() {
+	if (batchDepth === 0) return;
+	batchDepth--;
+	if (batchDepth === 0) flushBatchedEffects();
+}
+function batch(fn) {
+	startBatch();
+	try {
+		return fn();
+	} finally {
+		endBatch();
+	}
+}
+function flushBatchedEffects() {
+	while (batchedEffects.size) {
+		const effects = Array.from(batchedEffects);
+		batchedEffects.clear();
+		for (const ef of effects) ef();
+	}
+}
+let activeEffectScope;
+var EffectScopeImpl = class {
+	active = true;
+	effects = [];
+	cleanups = [];
+	parent;
+	scopes;
+	constructor(detached = false) {
+		this.detached = detached;
+		if (!detached && activeEffectScope) {
+			this.parent = activeEffectScope;
+			(activeEffectScope.scopes ||= []).push(this);
+		}
+	}
+	run(fn) {
+		if (!this.active) return;
+		const prev = activeEffectScope;
+		activeEffectScope = this;
+		try {
+			return fn();
+		} finally {
+			activeEffectScope = prev;
+		}
+	}
+	stop() {
+		if (!this.active) return;
+		this.active = false;
+		for (const effect$1 of this.effects) stop(effect$1);
+		this.effects.length = 0;
+		for (const cleanup of this.cleanups) cleanup();
+		this.cleanups.length = 0;
+		if (this.scopes) {
+			for (const scope of this.scopes) scope.stop();
+			this.scopes.length = 0;
+		}
+		if (this.parent?.scopes) {
+			const index = this.parent.scopes.indexOf(this);
+			if (index >= 0) this.parent.scopes.splice(index, 1);
+		}
+		this.parent = void 0;
+	}
+};
+function effectScope(detached = false) {
+	return new EffectScopeImpl(detached);
+}
+function getCurrentScope() {
+	return activeEffectScope;
+}
+function onScopeDispose(fn) {
+	if (activeEffectScope?.active) activeEffectScope.cleanups.push(fn);
+}
+function recordEffectScope(effect$1) {
+	if (activeEffectScope?.active) activeEffectScope.effects.push(effect$1);
+}
 function cleanupEffect(effect$1) {
 	const { deps } = effect$1;
 	for (let i = 0; i < deps.length; i++) deps[i].delete(effect$1);
@@ -32,26 +111,30 @@ function cleanupEffect(effect$1) {
 function createReactiveEffect(fn, options = {}) {
 	const effect$1 = function reactiveEffect() {
 		if (!effect$1.active) return fn();
-		if (effectStack.includes(effect$1)) return fn();
+		if (effect$1._running) return fn();
 		cleanupEffect(effect$1);
 		try {
+			effect$1._running = true;
 			effectStack.push(effect$1);
 			activeEffect = effect$1;
 			return fn();
 		} finally {
 			effectStack.pop();
 			activeEffect = effectStack[effectStack.length - 1] ?? null;
+			effect$1._running = false;
 		}
 	};
 	effect$1.deps = [];
 	effect$1.scheduler = options.scheduler;
 	effect$1.onStop = options.onStop;
 	effect$1.active = true;
+	effect$1._running = false;
 	effect$1._fn = fn;
 	return effect$1;
 }
 function effect(fn, options = {}) {
 	const _effect = createReactiveEffect(fn, options);
+	recordEffectScope(_effect);
 	if (!options.lazy) _effect();
 	return _effect;
 }
@@ -87,10 +170,7 @@ function trigger(target, key) {
 	effects.forEach((ef) => {
 		if (ef !== activeEffect) effectsToRun.add(ef);
 	});
-	effectsToRun.forEach((ef) => {
-		if (ef.scheduler) ef.scheduler();
-		else ef();
-	});
+	effectsToRun.forEach(scheduleEffect);
 }
 function trackEffects(dep) {
 	if (!activeEffect) return;
@@ -100,10 +180,18 @@ function trackEffects(dep) {
 	}
 }
 function triggerEffects(dep) {
-	dep.forEach((ef) => {
-		if (ef.scheduler) ef.scheduler();
-		else ef();
-	});
+	dep.forEach(scheduleEffect);
+}
+function scheduleEffect(ef) {
+	if (ef.scheduler) {
+		ef.scheduler();
+		return;
+	}
+	if (batchDepth > 0) {
+		batchedEffects.add(ef);
+		return;
+	}
+	ef();
 }
 
 //#endregion
@@ -365,7 +453,7 @@ var RefImpl = class {
 };
 function ref(value) {
 	if (isRef(value)) return value;
-	return new RefImpl(value);
+	return markRaw(new RefImpl(value));
 }
 function unref(value) {
 	return isRef(value) ? value.value : value;
@@ -389,7 +477,7 @@ var CustomRefImpl = class {
 	}
 };
 function customRef(factory, defaultValue) {
-	return new CustomRefImpl(factory, defaultValue);
+	return markRaw(new CustomRefImpl(factory, defaultValue));
 }
 
 //#endregion
@@ -635,4 +723,4 @@ function storeToRefs(store) {
 }
 
 //#endregion
-export { computed as _, isRef as a, nextTick as b, isObject$1 as c, isShallowReactive as d, markRaw as f, touchReactive as g, toRaw as h, customRef as i, isRaw as l, shallowReactive as m, defineStore as n, ref as o, reactive as p, createStore as r, unref as s, storeToRefs as t, isReactive as u, effect as v, queueJob as x, stop as y };
+export { onScopeDispose as C, queueJob as D, nextTick as E, getCurrentScope as S, stop as T, computed as _, isRef as a, effectScope as b, isObject$1 as c, isShallowReactive as d, markRaw as f, touchReactive as g, toRaw as h, customRef as i, isRaw as l, shallowReactive as m, defineStore as n, ref as o, reactive as p, createStore as r, unref as s, storeToRefs as t, isReactive as u, batch as v, startBatch as w, endBatch as x, effect as y };