x-runtime-lib 0.8.189 → 0.8.190

package/dist/index.js

@@ -9857,64 +9857,29 @@ function unwrapSlotId(e) {
 }
 function makeTriggerId(e) {
 	let C = [e.type];
-	if (e.type === "elementProperty") C.push(e.nodeId, e.propertyKeys);
-	else if (e.type === "elementSlotProperty") C.push(e.nodeId, e.elementKey, e.slotKey, e.propertyKey);
-	else if (e.type === "multipleElementSlotProperty") C.push(e.nodeId, e.spec, e.elementKey, e.slotKey, e.propertyKey);
-	else if (e.type === "customSlotProperty") C.push(e.compId, e.slotId, e.propertyId);
-	else if (e.type === "multipleCustomSlotProperty") C.push(e.spec, e.compId, e.slotId, e.propertyId);
-	else if (e.type === "customProperty") C.push(e.propertyId);
+	if (e.type === "property") C.push(e.propertyId), e.spec && C.push(e.spec);
 	else if (e.type === "state") C.push(e.stateId);
 	else throw Error("not implemented trigger type");
-	return e.subKeys && C.push(e.subKeys), C.join("/");
+	return C.join("@");
 }
 function unwrapTriggerId(e) {
-	let C = e.split("/");
-	if (C.length <= 0) throw Error("unwrap trigger id failed");
+	let C = e.split("@");
+	if (C.length < 1) throw Error("unwrap trigger id failed");
 	let w = C[0];
-	if (w === "elementProperty") {
-		if (C.length < 3) throw Error("unwrap elementProperty trigger id failed");
-		return {
-			type: "elementProperty",
-			nodeId: C[1],
-			propertyKeys: C[2],
-			subKeys: C?.[3]
-		};
-	} else if (w === "elementSlotProperty") {
-		if (C.length < 5) throw Error("unwrap elementSlotProperty trigger id failed");
-		return {
-			type: "elementSlotProperty",
-			nodeId: C[1],
-			elementKey: C[2],
-			slotKey: C[3],
-			propertyKey: C[4],
-			subKeys: C?.[5]
-		};
-	} else if (w === "multipleElementSlotProperty") {
-		if (C.length < 6) throw Error("unwrap multipleElementSlotProperty trigger id failed");
-		return {
-			type: "multipleElementSlotProperty",
-			nodeId: C[1],
-			spec: C[2],
-			elementKey: C[3],
-			slotKey: C[4],
-			propertyKey: C[5],
-			subKeys: C?.[6]
-		};
-	} else if (w === "customProperty") {
-		if (C.length < 2) throw Error("unwrap customProperty trigger id failed");
+	if (w === "property") {
+		if (C.length < 2) throw Error("unwrap trigger id of property failed");
 		return {
-			type: "customProperty",
+			type: w,
 			propertyId: C[1],
-			subKeys: C?.[2]
+			spec: C[2]
 		};
 	} else if (w === "state") {
-		if (C.length < 2) throw Error("unwrap state trigger id failed");
+		if (C.length !== 2) throw Error("unwrap trigger id of state failed");
 		return {
-			type: "state",
-			stateId: C[1],
-			subKeys: C?.[2]
+			type: w,
+			stateId: C[1]
 		};
-	} else throw Error("not implemented trigger type");
+	} else throw Error("invalid trigger type");
 }
 async function triggerReactivity(e, C, w, T, E) {
 	await triggerWatchEffect(e, C, w), await triggerBind(e, C, w, T, E);
@@ -9927,58 +9892,55 @@ async function triggerWatchEffect(e, C, w) {
 	}
 }
 function isValidOfTrigger(e, C) {
-	if (C.type === "elementProperty") return e.isValidOfElementProperty(C.nodeId, C.propertyKeys);
-	if (C.type === "elementSlotProperty") return e.isValidOfElementSlotProperty(makePropertyId("elementSlotProperty", C.nodeId, makePropertyKeyOfElementSlot(C.elementKey, C.slotKey, C.propertyKey)));
-	if (C.type === "multipleElementSlotProperty") return e.isValidOfMultipleElementSlotProperty(makePropertyId("multipleElementSlotProperty", C.nodeId, makePropertyKeyOfElementSlot(C.elementKey, C.slotKey, C.propertyKey)));
-	if (C.type !== "customSlotProperty" && C.type !== "multipleCustomSlotProperty") {
-		if (C.type === "customProperty") return e.isValidOfCustomProperty(C.propertyId);
-		if (C.type === "state") return e.isValidOfState(C.stateId);
-		throw Error("not implemented trigger type");
-	}
-	return !1;
+	if (C.type === "property") {
+		let { kind: w, nodeId: T, propertyKey: E } = unwrapPropertyId(C.propertyId);
+		switch (w) {
+			case "elementProperty": return e.isValidOfElementProperty(T, E);
+			case "elementSlotProperty": return e.isValidOfElementSlotProperty(E);
+			case "multipleElementSlotProperty": return e.isValidOfMultipleElementSlotProperty(E);
+			case "customProperty": return e.isValidOfCustomProperty(E);
+			default: throw Error("not implemented");
+		}
+	} else if (C.type === "state") return e.isValidOfState(C.stateId);
+	else throw Error("invalid trigger type");
 }
 function getTriggerValue(e, C) {
-	let w;
-	if (C.type === "elementProperty") w = e.getElementProperty(C.nodeId, C.propertyKeys);
-	else if (C.type === "elementSlotProperty") w = e.getElementSlotProperty(makePropertyId("elementSlotProperty", C.nodeId, makePropertyKeyOfElementSlot(C.elementKey, C.slotKey, C.propertyKey)));
-	else if (C.type === "multipleElementSlotProperty") w = e.getMultipleElementSlotProperty(C.spec, makePropertyId("multipleElementSlotProperty", C.nodeId, makePropertyKeyOfElementSlot(C.elementKey, C.slotKey, C.propertyKey)));
-	else if (C.type === "customSlotProperty") w = e.getCustomSlotProperty(C.propertyId);
-	else if (C.type !== "multipleCustomSlotProperty") if (C.type === "customProperty") w = e.getCustomProperty(C.propertyId);
-	else if (C.type === "state") w = e.getState(C.stateId);
-	else throw Error("not implemented trigger type");
-	return w;
+	if (C.type === "property") {
+		let { kind: w, nodeId: T, propertyKey: E } = unwrapPropertyId(C.propertyId);
+		if (w === "elementProperty") return e.getElementProperty(T, E);
+		if (w === "elementSlotProperty") {
+			let w = e.children[`${T}/${C.spec}`];
+			if (w) return w.getElementSlotProperty(E);
+			throw Error("sandbox not found");
+		} else if (w === "multipleElementSlotProperty") {
+			let w = e.children[`${T}/${C.spec}`];
+			if (w) return w.getMultipleElementSlotProperty(C.spec, E);
+			throw Error("sandbox not found");
+		} else if (w === "customProperty") return e.getCustomProperty(E);
+		else throw Error("not implemented");
+	} else if (C.type === "state") return e.getState(C.stateId);
+	else throw Error("invalid trigger type");
 }
 function setTriggerValue(e, C, w) {
-	if (C.type === "elementProperty") e.setElementProperty(C.nodeId, C.propertyKeys.split("."), w);
-	else if (C.type === "elementSlotProperty") e.setElementSlotProperty(makePropertyId("elementSlotProperty", C.nodeId, makePropertyKeyOfElementSlot(C.elementKey, C.slotKey, C.propertyKey)), w);
-	else if (C.type === "multipleElementSlotProperty") e.setMultipeElementSlotProperty(C.spec, makePropertyId("multipleElementSlotProperty", C.nodeId, makePropertyKeyOfElementSlot(C.elementKey, C.slotKey, C.propertyKey)), w);
-	else if (C.type === "customSlotProperty") e.setCustomSlotProperty(makePropertyId("customSlotProperty", "globality", makePropertyKeyOfCustomSlot(C.compId, C.slotId, C.propertyId)), w);
-	else if (C.type !== "multipleCustomSlotProperty") if (C.type === "customProperty") e.setCustomProperty(makePropertyId("customProperty", "globality", C.propertyId), w);
-	else if (C.type === "state") e.setState(C.stateId, w);
-	else throw Error("not implemented trigger type");
+	if (C.type === "property") {
+		let { kind: T, nodeId: E, propertyKey: D } = unwrapPropertyId(C.propertyId);
+		if (T === "elementProperty") e.setElementProperty(E, D, w);
+		else if (T === "elementSlotProperty") if (e.children[`${E}/${C.spec}`]) e.setElementSlotProperty(D, w);
+		else throw Error("sandbox not found");
+		else if (T === "multipleElementSlotProperty") if (e.children[`${E}/${C.spec}`]) e.setMultipeElementSlotProperty(C.spec, D, w);
+		else throw Error("sandbox not found");
+		else if (T === "customProperty") e.setCustomProperty(D, w);
+		else throw Error("not implemented");
+	} else if (C.type === "state") e.setState(C.stateId, w);
+	else throw Error("not implemented");
 }
 async function triggerBind(e, C, w, D, O) {
-	let { bind: k } = C, A = k.triggers[w];
-	if (!A) return;
-	let j = unwrapTriggerId(w);
-	if (!isValidOfTrigger(e, j)) return;
-	if (j.subKeys) {
-		if (isEqual_default(getField(D, j.subKeys), getField(O, j.subKeys))) return;
-	} else if (isEqual_default(D, O)) return;
-	let M;
-	M = j.subKeys ? getField(D, j.subKeys) : D;
-	for (let C of A) {
+	let { bind: k } = C;
+	if (isEqual_default(D, O)) return;
+	let A = k.triggers[w];
+	if (A && isValidOfTrigger(e, unwrapTriggerId(w))) for (let C of A) {
 		let w = k.sets[C];
-		if (w) for (let C of w) if (C.subKeys) {
-			let w = getTriggerValue(e, C), D = getField(w, C.subKeys);
-			if (isEqual_default(M, D)) continue;
-			let O = cloneDeep_default(w);
-			setField(O, C.subKeys, cloneDeep_default(M)), setTriggerValue(e, C, O);
-		} else {
-			let w = getTriggerValue(e, C);
-			if (isEqual_default(M, w)) continue;
-			setTriggerValue(e, C, cloneDeep_default(M));
-		}
+		if (w) for (let C of w) isValidOfTrigger(e, C) && (isEqual_default(D, getTriggerValue(e, C)) || setTriggerValue(e, C, cloneDeep_default(D)));
 	}
 }
 function getImplementMethodName(e, C, w) {
@@ -10546,9 +10508,8 @@ function useSandbox(e, C, w, E, D, O, k) {
 				C ? C.compId = w : console.assert(!1);
 			}
 			await L.callFunctionAsync("__triggerEventV1__", makeEventId("elementPropertyChangeEvent", e, toDotString(C)), "", w, E ?? w), O.value?.code.reactivity && triggerReactivity(L, O.value.code.reactivity, makeTriggerId({
-				type: "elementProperty",
-				nodeId: e,
-				propertyKeys: toDotString(C)
+				type: "property",
+				propertyId: toDotString(C)
 			}), w, E);
 		}
 	}
@@ -10562,23 +10523,19 @@ function useSandbox(e, C, w, E, D, O, k) {
 	}
 	async function W(e, C, w) {
 		L.vm && O.value?.code.reactivity && triggerReactivity(L, O.value.code.reactivity, makeTriggerId({
-			type: "customSlotProperty",
-			compId: "placeholder",
-			slotId: "placeholder",
+			type: "property",
 			propertyId: e
 		}), C, w);
 	}
 	async function G(e, C, w, T) {
 		L.vm && O.value?.code.reactivity && triggerReactivity(L, O.value.code.reactivity, makeTriggerId({
-			type: "customSlotProperty",
-			compId: "placeholder",
-			slotId: "placeholder",
+			type: "property",
 			propertyId: C
 		}), w, T);
 	}
 	async function K(e, C, w) {
 		L.vm && (await L.callFunctionAsync("__triggerEventV1__", makeEventId("customPropertyChangeEvent", "globality", e), "", C, w ?? C), O.value?.code.reactivity && triggerReactivity(L, O.value.code.reactivity, makeTriggerId({
-			type: "customProperty",
+			type: "property",
 			propertyId: e
 		}), C, w), await L.parent.callFunctionAsync("__triggerEventV1__", makeEventId("refPropertyChangeEvent", L.nodeId, e), "", C, w ?? C), await L.parent.callFunctionAsync("__triggerEventV1__", makeEventId("multipleRefPropertyChangeEvent", L.nodeId, e), "", C, w ?? C));
 	}

package/dist/types/data.d.ts

@@ -29,50 +29,16 @@ export interface View {
         [key: string]: Node;
     };
 }
-interface TriggerElementProperty {
-    type: 'elementProperty';
-    nodeId: string;
-    propertyKeys: string;
-}
-interface TriggerElementSlotProperty {
-    type: 'elementSlotProperty';
-    nodeId: string;
-    elementKey: string;
-    slotKey: string;
-    propertyKey: string;
-}
-interface TriggerMultipleElementSlotProperty {
-    type: 'multipleElementSlotProperty';
-    nodeId: string;
-    spec: string;
-    elementKey: string;
-    slotKey: string;
-    propertyKey: string;
-}
-interface TriggerCustomSlotProperty {
-    type: 'customSlotProperty';
-    compId: string;
-    slotId: string;
-    propertyId: string;
-}
-interface TriggerMultipleCustomSlotProperty {
-    type: 'multipleCustomSlotProperty';
-    spec: string;
-    compId: string;
-    slotId: string;
-    propertyId: string;
-}
-interface TriggerCustomProperty {
-    type: 'customProperty';
+interface TriggerProperty {
+    type: 'property';
     propertyId: string;
+    spec?: string;
 }
 interface TriggerState {
     type: 'state';
     stateId: string;
 }
-export type Trigger = (TriggerElementProperty | TriggerElementSlotProperty | TriggerMultipleElementSlotProperty | TriggerCustomSlotProperty | TriggerMultipleCustomSlotProperty | TriggerCustomProperty | TriggerState) & {
-    subKeys?: string;
-};
+export type Trigger = TriggerProperty | TriggerState;
 export interface Reactivity {
     watchEffect: {
         [key: string]: string[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "x-runtime-lib",
   "private": false,
-  "version": "0.8.189",
+  "version": "0.8.190",
   "type": "module",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",