wevu 1.0.0-alpha.4 → 1.0.0-alpha.5

package/dist/index.cjs

@@ -705,7 +705,11 @@ function setByPath(state, computedRefs, computedSetters, segments, value) {
 	const [head, ...rest] = segments;
 	if (!rest.length) {
 		if (computedRefs[head]) setComputedValue$1(computedSetters, head, value);
-		else state[head] = value;
+		else {
+			const current = state[head];
+			if (isRef(current)) current.value = value;
+			else state[head] = value;
+		}
 		return;
 	}
 	if (computedRefs[head]) {
@@ -1067,6 +1071,17 @@ function callUpdateHooks(target, phase) {
 
 //#endregion
 //#region src/runtime/register.ts
+function decodeWxmlEntities(value) {
+	return value.replace(/&amp;/g, "&").replace(/&quot;/g, "\"").replace(/&#34;/g, "\"").replace(/&apos;/g, "'").replace(/&#39;/g, "'").replace(/&lt;/g, "<").replace(/&gt;/g, ">");
+}
+function parseModelEventValue(event) {
+	if (event == null) return event;
+	if (typeof event === "object") {
+		if ("detail" in event && event.detail && "value" in event.detail) return event.detail.value;
+		if ("target" in event && event.target && "value" in event.target) return event.target.value;
+	}
+	return event;
+}
 function runInlineExpression(ctx, expr, event) {
 	const handlerName = typeof expr === "string" ? expr : void 0;
 	if (!handlerName) return;
@@ -1075,8 +1090,13 @@ function runInlineExpression(ctx, expr, event) {
 	if (typeof argsRaw === "string") try {
 		args = JSON.parse(argsRaw);
 	} catch {
-		args = [];
+		try {
+			args = JSON.parse(decodeWxmlEntities(argsRaw));
+		} catch {
+			args = [];
+		}
 	}
+	if (!Array.isArray(args)) args = [];
 	const resolvedArgs = args.map((item) => item === "$event" ? event : item);
 	const handler = ctx?.[handlerName];
 	if (typeof handler === "function") return handler.apply(ctx, resolvedArgs);
@@ -1202,7 +1222,17 @@ function mountRuntimeInstance(target, runtimeApp, watchMap, setup, options) {
 		if (stops.length) target.__wevuWatchStops = stops;
 	}
 	if (setup) {
-		const props = target.properties || {};
+		const props = shallowReactive({ ...target.properties || {} });
+		try {
+			Object.defineProperty(target, "__wevuProps", {
+				value: props,
+				configurable: true,
+				enumerable: false,
+				writable: false
+			});
+		} catch {
+			target.__wevuProps = props;
+		}
 		const context = {
 			props,
 			runtime: runtimeWithDefaults,
@@ -1322,6 +1352,7 @@ function registerComponent(runtimeApp, methods, watch$1, setup, mpOptions) {
 	const userOnAddToFavorites = rest.onAddToFavorites;
 	const features = rest.features ?? {};
 	const restOptions = { ...rest };
+	const userObservers = restOptions.observers;
 	const legacyCreated = restOptions.created;
 	delete restOptions.features;
 	delete restOptions.created;
@@ -1377,11 +1408,56 @@ function registerComponent(runtimeApp, methods, watch$1, setup, mpOptions) {
 		multipleSlots: userOptions.multipleSlots ?? true,
 		...userOptions
 	};
+	const syncWevuPropsFromInstance = (instance) => {
+		const propsProxy = instance.__wevuProps;
+		const properties = instance.properties;
+		if (!propsProxy || typeof propsProxy !== "object") return;
+		if (!properties || typeof properties !== "object") return;
+		const next = properties;
+		const currentKeys = Object.keys(propsProxy);
+		for (const existingKey of currentKeys) if (!Object.prototype.hasOwnProperty.call(next, existingKey)) try {
+			delete propsProxy[existingKey];
+		} catch {}
+		for (const [k, v] of Object.entries(next)) try {
+			propsProxy[k] = v;
+		} catch {}
+	};
+	const syncWevuPropValue = (instance, key, value) => {
+		const propsProxy = instance.__wevuProps;
+		if (!propsProxy || typeof propsProxy !== "object") return;
+		try {
+			propsProxy[key] = value;
+		} catch {}
+	};
+	const propKeys = restOptions.properties && typeof restOptions.properties === "object" ? Object.keys(restOptions.properties) : [];
+	const injectedObservers = {};
+	if (propKeys.length) for (const key of propKeys) injectedObservers[key] = function __wevu_prop_observer(newValue) {
+		syncWevuPropValue(this, key, newValue);
+	};
+	const finalObservers = { ...userObservers ?? {} };
+	for (const [key, injected] of Object.entries(injectedObservers)) {
+		const existing = finalObservers[key];
+		if (typeof existing === "function") finalObservers[key] = function chainedObserver(...args) {
+			existing.apply(this, args);
+			injected.apply(this, args);
+		};
+		else finalObservers[key] = injected;
+	}
 	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);
 	};
+	if (!finalMethods.__weapp_vite_model) finalMethods.__weapp_vite_model = function __weapp_vite_model(event) {
+		const path = event?.currentTarget?.dataset?.wvModel ?? event?.target?.dataset?.wvModel;
+		if (typeof path !== "string" || !path) return;
+		const runtime = this.__wevu;
+		if (!runtime || typeof runtime.bindModel !== "function") return;
+		const value = parseModelEventValue(event);
+		try {
+			runtime.bindModel(path).update(value);
+		} catch {}
+	};
 	const methodNames = Object.keys(methods ?? {});
 	for (const methodName of methodNames) {
 		const userMethod = finalMethods[methodName];
@@ -1468,10 +1544,12 @@ function registerComponent(runtimeApp, methods, watch$1, setup, mpOptions) {
 	Component({
 		...restOptions,
 		...pageLifecycleHooks,
+		observers: finalObservers,
 		lifetimes: {
 			...userLifetimes,
 			created: function created(...args) {
 				mountRuntimeInstance(this, runtimeApp, watch$1, setup, { deferSetData: true });
+				syncWevuPropsFromInstance(this);
 				if (typeof legacyCreated === "function") legacyCreated.apply(this, args);
 				if (typeof userLifetimes.created === "function") userLifetimes.created.apply(this, args);
 			},
@@ -1481,12 +1559,14 @@ function registerComponent(runtimeApp, methods, watch$1, setup, mpOptions) {
 			},
 			attached: function attached(...args) {
 				mountRuntimeInstance(this, runtimeApp, watch$1, setup);
+				syncWevuPropsFromInstance(this);
 				enableDeferredSetData(this);
 				if (typeof userLifetimes.attached === "function") userLifetimes.attached.apply(this, args);
 			},
 			ready: function ready(...args) {
 				if (!this.__wevuReadyCalled) {
 					this.__wevuReadyCalled = true;
+					syncWevuPropsFromInstance(this);
 					callHookList(this, "onReady", args);
 				}
 				if (typeof userLifetimes.ready === "function") userLifetimes.ready.apply(this, args);
@@ -1655,6 +1735,7 @@ function createApp(options) {
 				Object.keys(state).forEach((key) => {
 					const v = state[key];
 					if (isRef(v)) v.value;
+					else if (isReactive(v)) touchReactive(v);
 				});
 				Object.keys(computedRefs).forEach((key) => computedRefs[key].value);
 			}, {

package/dist/index.d.cts

@@ -1,9 +1,7 @@
+import { Ref as Ref$1 } from "@vue/reactivity";
+
 //#region src/reactivity/ref.d.ts
-interface Ref<T$1 = any, S = T$1> {
-  get value(): T$1;
-  set value(_: S);
-  [key: symbol]: any;
-}
+type Ref<T$1 = any, S = T$1> = Ref$1<T$1, S>;
 declare function isRef(value: unknown): value is Ref<any>;
 declare function ref<T$1>(value: T$1): Ref<T$1>;
 declare function unref<T$1>(value: T$1 | Ref<T$1>): T$1;

package/dist/index.d.mts

@@ -1,9 +1,7 @@
+import { Ref as Ref$1 } from "@vue/reactivity";
+
 //#region src/reactivity/ref.d.ts
-interface Ref<T$1 = any, S = T$1> {
-  get value(): T$1;
-  set value(_: S);
-  [key: symbol]: any;
-}
+type Ref<T$1 = any, S = T$1> = Ref$1<T$1, S>;
 declare function isRef(value: unknown): value is Ref<any>;
 declare function ref<T$1>(value: T$1): Ref<T$1>;
 declare function unref<T$1>(value: T$1 | Ref<T$1>): T$1;

package/dist/index.mjs

@@ -704,7 +704,11 @@ function setByPath(state, computedRefs, computedSetters, segments, value) {
 	const [head, ...rest] = segments;
 	if (!rest.length) {
 		if (computedRefs[head]) setComputedValue$1(computedSetters, head, value);
-		else state[head] = value;
+		else {
+			const current = state[head];
+			if (isRef(current)) current.value = value;
+			else state[head] = value;
+		}
 		return;
 	}
 	if (computedRefs[head]) {
@@ -1066,6 +1070,17 @@ function callUpdateHooks(target, phase) {
 
 //#endregion
 //#region src/runtime/register.ts
+function decodeWxmlEntities(value) {
+	return value.replace(/&amp;/g, "&").replace(/&quot;/g, "\"").replace(/&#34;/g, "\"").replace(/&apos;/g, "'").replace(/&#39;/g, "'").replace(/&lt;/g, "<").replace(/&gt;/g, ">");
+}
+function parseModelEventValue(event) {
+	if (event == null) return event;
+	if (typeof event === "object") {
+		if ("detail" in event && event.detail && "value" in event.detail) return event.detail.value;
+		if ("target" in event && event.target && "value" in event.target) return event.target.value;
+	}
+	return event;
+}
 function runInlineExpression(ctx, expr, event) {
 	const handlerName = typeof expr === "string" ? expr : void 0;
 	if (!handlerName) return;
@@ -1074,8 +1089,13 @@ function runInlineExpression(ctx, expr, event) {
 	if (typeof argsRaw === "string") try {
 		args = JSON.parse(argsRaw);
 	} catch {
-		args = [];
+		try {
+			args = JSON.parse(decodeWxmlEntities(argsRaw));
+		} catch {
+			args = [];
+		}
 	}
+	if (!Array.isArray(args)) args = [];
 	const resolvedArgs = args.map((item) => item === "$event" ? event : item);
 	const handler = ctx?.[handlerName];
 	if (typeof handler === "function") return handler.apply(ctx, resolvedArgs);
@@ -1201,7 +1221,17 @@ function mountRuntimeInstance(target, runtimeApp, watchMap, setup, options) {
 		if (stops.length) target.__wevuWatchStops = stops;
 	}
 	if (setup) {
-		const props = target.properties || {};
+		const props = shallowReactive({ ...target.properties || {} });
+		try {
+			Object.defineProperty(target, "__wevuProps", {
+				value: props,
+				configurable: true,
+				enumerable: false,
+				writable: false
+			});
+		} catch {
+			target.__wevuProps = props;
+		}
 		const context = {
 			props,
 			runtime: runtimeWithDefaults,
@@ -1321,6 +1351,7 @@ function registerComponent(runtimeApp, methods, watch$1, setup, mpOptions) {
 	const userOnAddToFavorites = rest.onAddToFavorites;
 	const features = rest.features ?? {};
 	const restOptions = { ...rest };
+	const userObservers = restOptions.observers;
 	const legacyCreated = restOptions.created;
 	delete restOptions.features;
 	delete restOptions.created;
@@ -1376,11 +1407,56 @@ function registerComponent(runtimeApp, methods, watch$1, setup, mpOptions) {
 		multipleSlots: userOptions.multipleSlots ?? true,
 		...userOptions
 	};
+	const syncWevuPropsFromInstance = (instance) => {
+		const propsProxy = instance.__wevuProps;
+		const properties = instance.properties;
+		if (!propsProxy || typeof propsProxy !== "object") return;
+		if (!properties || typeof properties !== "object") return;
+		const next = properties;
+		const currentKeys = Object.keys(propsProxy);
+		for (const existingKey of currentKeys) if (!Object.prototype.hasOwnProperty.call(next, existingKey)) try {
+			delete propsProxy[existingKey];
+		} catch {}
+		for (const [k, v] of Object.entries(next)) try {
+			propsProxy[k] = v;
+		} catch {}
+	};
+	const syncWevuPropValue = (instance, key, value) => {
+		const propsProxy = instance.__wevuProps;
+		if (!propsProxy || typeof propsProxy !== "object") return;
+		try {
+			propsProxy[key] = value;
+		} catch {}
+	};
+	const propKeys = restOptions.properties && typeof restOptions.properties === "object" ? Object.keys(restOptions.properties) : [];
+	const injectedObservers = {};
+	if (propKeys.length) for (const key of propKeys) injectedObservers[key] = function __wevu_prop_observer(newValue) {
+		syncWevuPropValue(this, key, newValue);
+	};
+	const finalObservers = { ...userObservers ?? {} };
+	for (const [key, injected] of Object.entries(injectedObservers)) {
+		const existing = finalObservers[key];
+		if (typeof existing === "function") finalObservers[key] = function chainedObserver(...args) {
+			existing.apply(this, args);
+			injected.apply(this, args);
+		};
+		else finalObservers[key] = injected;
+	}
 	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);
 	};
+	if (!finalMethods.__weapp_vite_model) finalMethods.__weapp_vite_model = function __weapp_vite_model(event) {
+		const path = event?.currentTarget?.dataset?.wvModel ?? event?.target?.dataset?.wvModel;
+		if (typeof path !== "string" || !path) return;
+		const runtime = this.__wevu;
+		if (!runtime || typeof runtime.bindModel !== "function") return;
+		const value = parseModelEventValue(event);
+		try {
+			runtime.bindModel(path).update(value);
+		} catch {}
+	};
 	const methodNames = Object.keys(methods ?? {});
 	for (const methodName of methodNames) {
 		const userMethod = finalMethods[methodName];
@@ -1467,10 +1543,12 @@ function registerComponent(runtimeApp, methods, watch$1, setup, mpOptions) {
 	Component({
 		...restOptions,
 		...pageLifecycleHooks,
+		observers: finalObservers,
 		lifetimes: {
 			...userLifetimes,
 			created: function created(...args) {
 				mountRuntimeInstance(this, runtimeApp, watch$1, setup, { deferSetData: true });
+				syncWevuPropsFromInstance(this);
 				if (typeof legacyCreated === "function") legacyCreated.apply(this, args);
 				if (typeof userLifetimes.created === "function") userLifetimes.created.apply(this, args);
 			},
@@ -1480,12 +1558,14 @@ function registerComponent(runtimeApp, methods, watch$1, setup, mpOptions) {
 			},
 			attached: function attached(...args) {
 				mountRuntimeInstance(this, runtimeApp, watch$1, setup);
+				syncWevuPropsFromInstance(this);
 				enableDeferredSetData(this);
 				if (typeof userLifetimes.attached === "function") userLifetimes.attached.apply(this, args);
 			},
 			ready: function ready(...args) {
 				if (!this.__wevuReadyCalled) {
 					this.__wevuReadyCalled = true;
+					syncWevuPropsFromInstance(this);
 					callHookList(this, "onReady", args);
 				}
 				if (typeof userLifetimes.ready === "function") userLifetimes.ready.apply(this, args);
@@ -1654,6 +1734,7 @@ function createApp(options) {
 				Object.keys(state).forEach((key) => {
 					const v = state[key];
 					if (isRef(v)) v.value;
+					else if (isReactive(v)) touchReactive(v);
 				});
 				Object.keys(computedRefs).forEach((key) => computedRefs[key].value);
 			}, {

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "wevu",
   "type": "module",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-alpha.5",
   "description": "Vue 3 风格的小程序运行时，包含响应式、diff+setData 与轻量状态管理",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
-  "homepage": "https://github.com/weapp-vite/weapp-vite/tree/main/packages/wevu",
+  "homepage": "https://vite.icebreaker.top/wevu/",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/weapp-vite/weapp-vite.git",