x-runtime-lib 0.8.195 → 0.8.197

package/dist/index.js

@@ -10150,29 +10150,6 @@ function provideNode(e) {
 function injectNode() {
 	return inject(nodeKey);
 }
-async function triggerReactivity(e, p, m, g, _) {
-	await triggerWatchEffect(e, p, m), await triggerBind(e, p, m, g, _);
-}
-async function triggerWatchEffect(e, p, m) {
-	let { watchEffect: g } = p;
-	if (g[m]) for (let p of g[m]) {
-		let m = encodeString(p);
-		await e.callFunctionAsync(`__watchEffect$${m}__`);
-	}
-}
-async function triggerBind(e, p, m, _, v) {
-	let { bind: y } = p;
-	if (isEqual_default(_, v)) return;
-	let b = y.triggers[m];
-	if (b) for (let p of b) {
-		let m = y.sets[p];
-		if (m) for (let p of m) p.type === "property" ? await e.setProperty(p.propertyId, _) : p.type === "state" ? await e.setState(p.stateId, _) : console.assert(!1, "not implemented trigger type");
-	}
-}
-function getImplementMethodName(e, p, m) {
-	let g = [e, p], _ = m.split(".");
-	return _.length > 1 ? g.push(..._.slice(1)) : g.push(m), `__implementMethod$${g.join("$")}__`;
-}
 function makePropertyId(e, p, m) {
 	return `${e}/${p}/${m}`;
 }
@@ -10293,30 +10270,42 @@ function unwrapSlotId(e) {
 		slotKey: p[2]
 	};
 }
-function makeTriggerId(e) {
-	let p = [e.type];
-	if (e.type === "property") p.push(e.propertyId);
-	else if (e.type === "state") p.push(e.stateId);
-	else throw Error("not implemented trigger type");
-	return p.join("@");
+function makeTriggerId(e, p) {
+	return `${e}@${p}`;
 }
 function unwrapTriggerId(e) {
 	let p = e.split("@");
-	if (p.length < 1) throw Error("unwrap trigger id failed");
-	let m = p[0];
-	if (m === "property") {
-		if (p.length !== 2) throw Error("unwrap trigger id of property failed");
-		return {
-			type: m,
-			propertyId: p[1]
-		};
-	} else if (m === "state") {
-		if (p.length !== 2) throw Error("unwrap trigger id of state failed");
-		return {
-			type: m,
-			stateId: p[1]
-		};
-	} else throw Error("invalid trigger type");
+	if (p.length !== 2) throw Error("unwrap trigger id failed");
+	return {
+		kind: p[0],
+		triggerKey: p[1]
+	};
+}
+async function triggerReactivity(e, p, m, g, _) {
+	await triggerWatchEffect(e, p, m), await triggerBind(e, p, m, g, _);
+}
+async function triggerWatchEffect(e, p, m) {
+	let { watchEffect: g } = p;
+	if (g[m]) for (let p of g[m]) {
+		let m = encodeString(p);
+		await e.callFunctionAsync(`__watchEffect$${m}__`);
+	}
+}
+async function triggerBind(e, p, m, _, v) {
+	let { bind: y } = p;
+	if (isEqual_default(_, v)) return;
+	let b = y.triggers[m];
+	if (b) for (let p of b) {
+		let m = y.sets[p];
+		if (m) for (let p of m) {
+			let { kind: m, triggerKey: g } = unwrapTriggerId(p);
+			m === "propertyTrigger" ? await e.setProperty(g, _) : m === "stateTrigger" ? await e.setState(g, _) : console.assert(!1);
+		}
+	}
+}
+function getImplementMethodName(e, p, m) {
+	let g = [e, p], _ = m.split(".");
+	return _.length > 1 ? g.push(..._.slice(1)) : g.push(m), `__implementMethod$${g.join("$")}__`;
 }
 function useDepend(e, p, m) {
 	let g = injectDepends(), v = ref(-1), y = ref(-1);
@@ -10537,11 +10526,11 @@ function bindView(e) {
 		let v = p.getString(m), y = p.getString(g), b = p.dump(_), { promise: x, resolve: S, reject: C } = e.promiseManager.create();
 		return e.callMethod(v, y, b).then((e) => S(e), (e) => C(e)), x.settled.then(p.runtime.executePendingJobs), x.handle;
 	}).consume((e) => p.setProp(p.global, "__callMethodV1__", e)), p.newFunction("__getStateV1__", (m) => {
-		let g = p.getString(m);
-		return newAny(p, e.getState(g));
+		let g = p.getString(m), { promise: _, resolve: v, reject: y } = e.promiseManager.create();
+		return e.getState(g).then((e) => v(e), (e) => y(e)), _.settled.then(p.runtime.executePendingJobs), _.handle;
 	}).consume((e) => p.setProp(p.global, "__getStateV1__", e)), p.newFunction("__setStateV1__", (m, g) => {
-		let _ = p.getString(m), v = p.dump(g);
-		e.setState(_, v);
+		let _ = p.getString(m), v = p.dump(g), { promise: y, resolve: b, reject: x } = e.promiseManager.create();
+		return e.setState(_, v).then((e) => b(e), (e) => x(e)), y.settled.then(p.runtime.executePendingJobs), y.handle;
 	}).consume((e) => p.setProp(p.global, "__setStateV1__", e)), p.newFunction("__navigateToV1__", (m, g) => {
 		let _ = p.getString(m), v = p.getString(g);
 		if (e.mode === "runtime") {
@@ -10749,7 +10738,6 @@ var PromiseManager = class {
 		return !m || !m.properties ? !1 : !!m.properties.find((e) => e.id === p);
 	}
 	async getProperty(e, p) {
-		this.debugTrace(makeFuncInfo("getProperty", e, p ?? ""));
 		let { kind: m, nodeId: g, propertyKey: _ } = unwrapPropertyId(e), v = this.data.value?.view.nodes[g];
 		if (!v) throw Error("node not found");
 		if (m === "elementProperty") return await this.getElementProperty(e, v, _);
@@ -10827,7 +10815,6 @@ var PromiseManager = class {
 		return this.customSlotProperties[g];
 	}
 	async setProperty(e, p, m) {
-		this.debugTrace(makeFuncInfo("setProperty", e, p, m ?? ""));
 		let { kind: g, nodeId: v, propertyKey: y } = unwrapPropertyId(e), b = this.data.value?.view.nodes[v];
 		if (!b) throw Error("node not found");
 		if (p = cloneDeep_default(p), g === "elementProperty") await this.setElementProperty(e, p, y, b);
@@ -11055,10 +11042,7 @@ function useSandbox(e, p, m, _, v, y, b, x) {
 	async function N(e, p, m, _) {
 		if (!k.vm) return;
 		let { kind: v, nodeId: y, propertyKey: x } = unwrapPropertyId(e);
-		if (await k.triggerEvent(makeEventId(`${v}ChangeEvent`, y, x), _ ?? "", p, m), b.value?.code.reactivity && triggerReactivity(k, b.value.code.reactivity, makeTriggerId({
-			type: "property",
-			propertyId: e
-		}), p, m), v === "elementProperty") {
+		if (await k.triggerEvent(makeEventId(`${v}ChangeEvent`, y, x), _ ?? "", p, m), b.value?.code.reactivity && triggerReactivity(k, b.value.code.reactivity, makeTriggerId("propertyTrigger", e), p, m), v === "elementProperty") {
 			if (isEqual_default(x, toDotString(["settings", "slot"]))) {
 				let e = b.value?.view.nodeLites.find((e) => e.id === y);
 				e ? e.slotId = p : console.assert(!1);
@@ -11070,10 +11054,7 @@ function useSandbox(e, p, m, _, v, y, b, x) {
 		}
 	}
 	async function P(e, p, m) {
-		k.vm && (await k.triggerEvent(makeEventId("stateChangeEvent", "globality", e), "", p, m), b.value?.code.reactivity && triggerReactivity(k, b.value.code.reactivity, makeTriggerId({
-			type: "state",
-			stateId: e
-		}), p, m));
+		k.vm && (await k.triggerEvent(makeEventId("stateChangeEvent", "globality", e), "", p, m), b.value?.code.reactivity && triggerReactivity(k, b.value.code.reactivity, makeTriggerId("stateTrigger", e), p, m));
 	}
 	watch(E, async (e, p) => {
 		if (!k.vm) return;

package/dist/types/data.d.ts

@@ -44,7 +44,7 @@ export interface Reactivity {
     };
     bind: {
         sets: {
-            [key: string]: Trigger[];
+            [key: string]: string[];
         };
         triggers: {
             [key: string]: string[];

package/dist/types/kind.d.ts

@@ -3,3 +3,4 @@ export type SlotKind = 'elementSlot' | 'multipleElementSlot' | 'customSlot' | 'm
 export type PropertyKind = 'elementProperty' | 'elementSlotProperty' | 'multipleElementSlotProperty' | 'refProperty' | 'multipleRefProperty' | 'customSlotProperty' | 'multipleCustomSlotProperty' | 'customProperty' | 'elementAdaptSlotProperty' | 'customAdaptSlotProperty';
 export type MethodKind = 'elementMethod' | 'elementSlotMethod' | 'multipeElementSlotMethod' | 'refMethod' | 'multipleRefMethod' | 'customSlotMethod' | 'multipleCustomSlotMethod' | 'customMethod' | 'elementAdaptSlotMethod' | 'customAdaptSlotMethod';
 export type EventKind = 'elementEvent' | 'elementPropertyChangeEvent' | 'elementSlotEvent' | 'elementSlotPropertyChangeEvent' | 'multipleElementSlotEvent' | 'multipleElementSlotPropertyChangeEvent' | 'refEvent' | 'refPropertyChangeEvent' | 'multipleRefEvent' | 'multipleRefPropertyChangeEvent' | 'customSlotEvent' | 'customSlotPropertyChangeEvent' | 'multipleCustomSlotEvent' | 'multipleCustomSlotPropertyChangeEvent' | 'customEvent' | 'customPropertyChangeEvent' | 'elementAdaptSlotEvent' | 'elementAdaptSlotPropertyChangeEvent' | 'customAdaptSlotEvent' | 'customAdaptSlotPropertyChangeEvent' | 'stateChangeEvent';
+export type TriggerKind = 'propertyTrigger' | 'stateTrigger';

package/dist/utils/unifiedId.d.ts

@@ -1,4 +1,4 @@
-import { EventKind, MethodKind, PropertyKind, SlotKind, Trigger } from '@/types';
+import { EventKind, MethodKind, PropertyKind, SlotKind, TriggerKind } from '@/types';
 export declare function makePropertyId(kind: PropertyKind, nodeId: string, propertyKey: string): string;
 export declare function unwrapPropertyId(id: string): {
     kind: PropertyKind;
@@ -59,5 +59,8 @@ export declare function unwrapSlotId(id: string): {
     mainKey: string;
     slotKey: string;
 };
-export declare function makeTriggerId(trigger: Trigger): string;
-export declare function unwrapTriggerId(id: string): Trigger;
+export declare function makeTriggerId(kind: TriggerKind, triggerKey: string): string;
+export declare function unwrapTriggerId(id: string): {
+    kind: TriggerKind;
+    triggerKey: string;
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "x-runtime-lib",
   "private": false,
-  "version": "0.8.195",
+  "version": "0.8.197",
   "type": "module",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -33,7 +33,8 @@
     "three": "^0.182.0",
     "vue": "^3.5.27",
     "vue-i18n": "^11.2.8",
-    "vuetify": "^3.11.7"
+    "vuetify": "^3.11.7",
+    "x-block-lib": "link:../x-block-lib"
   },
   "peerDependencies": {
     "x-error-lib": "^0.5.13",