x-block-lib 0.9.32 → 0.9.34

package/dist/index.js

@@ -1006,55 +1006,67 @@ function getOnEventInfo(e) {
 			}
 		}
 	} else if (w === "customSlotEvent") {
-		if (isSlotNode(O.key) && y.type === "comp" && x.meta.slots) {
-			let { slotId: y, eventId: b } = unwrapEventKeyOfCustomSlot(E), S = x.meta.slots.find((e) => e.id === y);
-			if (S && S.events) {
-				let y = S.events.find((e) => e.id === b);
-				if (y) return {
-					id: e,
-					kind: w,
-					names: [S.name, y.name],
-					params: convertParams(y.params)
-				};
+		if (isSlotNode(O.key) && D.slot && y.type === "comp" && x.meta.slots) {
+			let { compId: y, slotId: b, eventId: S } = unwrapEventKeyOfCustomSlot(E);
+			if (x.id === y && D.slot === b) {
+				let y = x.meta.slots.find((e) => e.id === b);
+				if (y && y.events) {
+					let b = y.events.find((e) => e.id === S);
+					if (b) return {
+						id: e,
+						kind: w,
+						names: [y.name, b.name],
+						params: convertParams(b.params)
+					};
+				}
 			}
 		}
 	} else if (w === "customSlotPropertyChangeEvent") {
-		if (isSlotNode(O.key) && y.type === "comp" && x.meta.slots) {
-			let { slotId: y, eventId: b } = unwrapEventKeyOfCustomSlot(E), S = x.meta.slots.find((e) => e.id === y);
-			if (S && S.properties) {
-				let y = S.properties.find((e) => e.id === b);
-				if (y) return {
-					id: e,
-					kind: w,
-					names: [S.name, y.name],
-					params: makeChangeParams(y.type)
-				};
+		if (isSlotNode(O.key) && D.slot && y.type === "comp" && x.meta.slots) {
+			let { compId: y, slotId: b, eventId: S } = unwrapEventKeyOfCustomSlot(E);
+			if (x.id === y && D.slot === b) {
+				let y = x.meta.slots.find((e) => e.id === b);
+				if (y && y.properties) {
+					let b = y.properties.find((e) => e.id === S);
+					if (b) return {
+						id: e,
+						kind: w,
+						names: [y.name, b.name],
+						params: makeChangeParams(b.type)
+					};
+				}
 			}
 		}
-	} else if (w === "multipleSlotEvent") {
-		if (isMultipleSlotNode(O.key) && y.type === "comp" && x.meta.slots) {
-			let { slotId: y, eventId: b } = unwrapEventKeyOfCustomSlot(E), S = x.meta.slots.find((e) => e.id === y);
-			if (S && S.events) {
-				let y = S.events.find((e) => e.id === b);
-				if (y) return {
-					id: e,
-					kind: w,
-					names: [S.name, y.name],
-					params: convertParams(y.params)
-				};
+	} else if (w === "multipleCustomSlotEvent") {
+		if (isMultipleSlotNode(O.key) && D.slot && y.type === "comp" && x.meta.slots) {
+			let { compId: y, slotId: b, eventId: S } = unwrapEventKeyOfCustomSlot(E);
+			if (x.id === y && D.slot && b) {
+				let y = x.meta.slots.find((e) => e.id === b);
+				if (y && y.events) {
+					let b = y.events.find((e) => e.id === S);
+					if (b) return {
+						id: e,
+						kind: w,
+						names: [y.name, b.name],
+						params: convertParams(b.params)
+					};
+				}
 			}
 		}
-	} else if (w === "multipleSlotPropertyChangeEvent") {
-		if (isMultipleSlotNode(O.key) && y.type === "comp" && x.meta.slots) {
-			let { slotId: y, eventId: b } = unwrapEventKeyOfCustomSlot(E), S = x.meta.slots.find((e) => e.id === y);
-			if (S && S.properties) {
-				let y = S.properties.find((e) => e.id === b);
-				if (y) return {
-					id: e,
-					kind: w,
-					names: [S.name, y.name],
-					params: makeChangeParams(y.type)
-				};
+	} else if (w === "multipleCustomSlotPropertyChangeEvent") {
+		if (isMultipleSlotNode(O.key) && D.slot && y.type === "comp" && x.meta.slots) {
+			let { compId: y, slotId: b, eventId: S } = unwrapEventKeyOfCustomSlot(E);
+			if (x.id === y && D.slot === b) {
+				let y = x.meta.slots.find((e) => e.id === b);
+				if (y && y.properties) {
+					let b = y.properties.find((e) => e.id === S);
+					if (b) return {
+						id: e,
+						kind: w,
+						names: [y.name, b.name],
+						params: makeChangeParams(b.type)
+					};
+				}
 			}
 		}
 	} else if (w === "customEvent") {
@@ -1201,27 +1213,27 @@ function getAllTriggerEventInfos(e) {
 	if (!C) return console.assert(!1, "invalid element", S.key), x;
 	if (isSlotNode(C.key) && S.slot && y.type === "comp" && b.meta.slots) {
 		let y = b.meta.slots.find((e) => e.id === S.slot);
-		if (y && y.events) for (let { id: S, name: C, params: w } of y.events) x.push({
-			id: makeEventId("customSlotEvent", e, makeEventKeyOfCustomSlot(b.id, y.id, S)),
+		if (y && y.events) for (let S of y.events) x.push({
+			id: makeEventId("customSlotEvent", e, makeEventKeyOfCustomSlot(b.id, y.id, S.id)),
 			kind: "customSlotEvent",
-			names: [C],
-			params: convertParams(w)
+			names: [y.name, S.name],
+			params: convertParams(S.params)
 		});
 	}
 	if (isMultipleSlotNode(C.key) && S.slot && y.type === "comp" && b.meta.slots) {
 		let y = b.meta.slots.find((e) => e.id === S.slot);
-		if (y && y.events) for (let { id: S, name: C, params: w } of y.events) x.push({
-			id: makeEventId("multipleCustomSlotEvent", e, makeEventKeyOfCustomSlot(b.id, y.id, S)),
+		if (y && y.events) for (let S of y.events) x.push({
+			id: makeEventId("multipleCustomSlotEvent", e, makeEventKeyOfCustomSlot(b.id, y.id, S.id)),
 			kind: "multipleCustomSlotEvent",
-			names: [C],
-			params: convertParams(w)
+			names: [y.name, S.name],
+			params: convertParams(S.params)
 		});
 	}
-	if (isGlobalityNode(C.key) && y.type === "comp" && b.meta.events) for (let { id: e, name: y, params: S } of b.meta.events) x.push({
-		id: makeEventId("customEvent", "globality", e),
+	if (isGlobalityNode(C.key) && y.type === "comp" && b.meta.events) for (let e of b.meta.events) x.push({
+		id: makeEventId("customEvent", "globality", e.id),
 		kind: "customEvent",
-		names: [y],
-		params: convertParams(S)
+		names: [e.name],
+		params: convertParams(e.params)
 	});
 	return x;
 }
@@ -1235,29 +1247,35 @@ function getTriggerEventInfo(e) {
 		return;
 	}
 	if (x === "customSlotEvent") {
-		if (isSlotNode(T.key) && y.type === "comp" && b.meta.slots) {
-			let { slotId: y, eventId: S } = unwrapEventKeyOfCustomSlot(C), w = b.meta.slots.find((e) => e.id === y);
-			if (w && w.events) {
-				let y = w.events.find((e) => e.id === S);
-				if (y) return {
-					id: e,
-					kind: x,
-					names: [y.name],
-					params: convertParams(y.params)
-				};
+		if (isSlotNode(T.key) && w.slot && y.type === "comp" && b.meta.slots) {
+			let { compId: y, slotId: S, eventId: T } = unwrapEventKeyOfCustomSlot(C);
+			if (b.id === y && w.slot === S) {
+				let y = b.meta.slots.find((e) => e.id === S);
+				if (y && y.events) {
+					let b = y.events.find((e) => e.id === T);
+					if (b) return {
+						id: e,
+						kind: x,
+						names: [y.name, b.name],
+						params: convertParams(b.params)
+					};
+				}
 			}
 		}
-	} else if (x === "multipleSlotEvent") {
-		if (isMultipleSlotNode(T.key) && y.type === "comp" && b.meta.slots) {
-			let { slotId: y, eventId: S } = unwrapEventKeyOfCustomSlot(C), w = b.meta.slots.find((e) => e.id === y);
-			if (w && w.events) {
-				let y = w.events.find((e) => e.id === S);
-				if (y) return {
-					id: e,
-					kind: x,
-					names: [y.name],
-					params: convertParams(y.params)
-				};
+	} else if (x === "multipleCustomSlotEvent") {
+		if (isMultipleSlotNode(T.key) && w.slot && y.type === "comp" && b.meta.slots) {
+			let { compId: y, slotId: S, eventId: T } = unwrapEventKeyOfCustomSlot(C);
+			if (b.id === y && w.slot && S) {
+				let y = b.meta.slots.find((e) => e.id === S);
+				if (y && y.events) {
+					let b = y.events.find((e) => e.id === T);
+					if (b) return {
+						id: e,
+						kind: x,
+						names: [y.name, b.name],
+						params: convertParams(b.params)
+					};
+				}
 			}
 		}
 	} else if (x === "customEvent" && isGlobalityNode(T.key) && y.type === "comp" && b.meta.events) {
@@ -2102,14 +2120,14 @@ Blocks.app_bind_container_v1 = { init: function() {
 		if (this.kind = e, this.kind === "notSet") this.updateShape_();
 		else if (this.kind === "property") {
 			let e = this.getField("NODE");
-			if (e.getOptions(!1), y || !getNodeInfo(this.node.id)) {
+			if (e.getOptions(!1), y) {
 				let y = getAllNodeInfos("setProperty")?.[0];
 				e.setValue(y?.id ?? "");
 			}
 			this.onNodeChange_(e.getValue());
 		} else if (this.kind === "state") {
 			let e = this.getField("STATE");
-			if (e.getOptions(!1), y || !getStateInfo(this.state.id)) {
+			if (e.getOptions(!1), y) {
 				let y = getAllStateInfos()?.[0];
 				e.setValue(y?.id ?? "");
 			}
@@ -2122,10 +2140,10 @@ Blocks.app_bind_container_v1 = { init: function() {
 			console.assert(!1);
 			return;
 		}
-		let b = this.node?.key !== y.key;
+		let b = this.node?.id !== y.id;
 		this.node.id = y.id, this.node.key = y.key, this.node.alias = y.alias;
 		let x = this.getField("PROPERTY");
-		if (x.getOptions(!1), b || !this.property || !getPropertyInfo(this.property.id)) {
+		if (x.getOptions(!1), b) {
 			let e = getAllPropertyInfos(this.node.id, "write")?.[0];
 			x.setValue(e?.id ?? "");
 		}
@@ -2246,10 +2264,10 @@ Blocks.app_bind_container_v1 = { init: function() {
 			console.assert(!1);
 			return;
 		}
-		let b = this.node.key !== y.key;
+		let b = this.node.id !== y.id;
 		this.node.id = y.id, this.node.key = y.key, this.node.alias = y.alias;
 		let x = this.getField("EVENT");
-		if (x.getOptions(!1), b || !getOnEventInfo(this.event.id)) {
+		if (x.getOptions(!1), b) {
 			let e = getAllOnEventInfos(this.node.id)?.[0];
 			x.setValue(e?.id ?? "");
 		}
@@ -2402,10 +2420,10 @@ ${addIndent(x, 4)}${addIndent(S, 2)}  } catch (e) {
 			console.assert(!1);
 			return;
 		}
-		let b = this.node.key !== y.key;
+		let b = this.node.id !== y.id;
 		this.node.id = y.id, this.node.key = y.key, this.node.alias = y.alias;
 		let x = this.getField("EVENT");
-		if (x.getOptions(!1), b || !getTriggerEventInfo(this.event.id)) {
+		if (x.getOptions(!1), b) {
 			let e = getAllTriggerEventInfos(this.node.id)?.[0];
 			x.setValue(e?.id ?? "");
 		}
@@ -2673,10 +2691,10 @@ ${javascriptGenerator.statementToCode(e, "HANDLE")}}
 			console.assert(!1);
 			return;
 		}
-		let b = this.node.key !== y.key;
+		let b = this.node.id !== y.id;
 		this.node.id = y.id, this.node.key = y.key, this.node.alias = y.alias;
 		let x = this.getField("METHOD");
-		if (x.getOptions(!1), b || !getCallMethodInfo(this.method.id)) {
+		if (x.getOptions(!1), b) {
 			let e = getAllCallMethodInfos(this.node.id)?.[0];
 			x.setValue(e?.id ?? "");
 		}
@@ -2886,10 +2904,10 @@ ${w}${e}}
 			console.assert(!1);
 			return;
 		}
-		let b = this.node.key !== y.key;
+		let b = this.node.id !== y.id;
 		this.node.id = y.id, this.node.key = y.key, this.node.alias = y.alias;
 		let x = this.getField("METHOD");
-		if (x.getOptions(!1), b || !getImplementMethodInfo(this.method.id)) {
+		if (x.getOptions(!1), b) {
 			let e = getAllImplementMethodInfos(this.node.id)?.[0];
 			x.setValue(e?.id ?? "");
 		}
@@ -3047,10 +3065,10 @@ ${E}${y}return __outputs__;
 			console.assert(!1);
 			return;
 		}
-		let b = this.node.key !== y.key;
+		let b = this.node.id !== y.id;
 		this.node.id = y.id, this.node.key = y.key, this.node.alias = y.alias;
 		let x = this.getField("METHOD");
-		if (x.getOptions(!1), b || !getImplementMethodInfo(this.method.id)) {
+		if (x.getOptions(!1), b) {
 			let e = getAllImplementMethodInfos(this.node.id)?.[0];
 			x.setValue(e?.id ?? "");
 		}
@@ -3217,10 +3235,11 @@ ${E}${y}return __outputs__;
 		let b = this.app.id !== y.id;
 		this.app.id = y.id, this.app.name = y.name;
 		let x = this.getField("PAGE");
-		if (x.getOptions(!1), b || !getPageInfo(this.app.id, this.page.id)) {
-			let e = getAllPageInfos(this.app.id)?.[0]?.id ?? "";
-			x.setValue(e), this.page.id === e && this.onPageChange_(e);
+		if (x.getOptions(!1), b) {
+			let e = getAllPageInfos(this.app.id)?.[0];
+			x.setValue(e?.id ?? "");
 		}
+		this.onPageChange_(x.getValue());
 	},
 	onPageChange_: function(e) {
 		let y = getPageInfo(this.app.id, e);
@@ -3412,10 +3431,10 @@ ${E}${y}return __outputs__;
 			console.assert(!1);
 			return;
 		}
-		let b = this.node.key !== y.key;
+		let b = this.node.id !== y.id;
 		this.node.id = y.id, this.node.key = y.key, this.node.alias = y.alias;
 		let x = this.getField("PROPERTY");
-		if (x.getOptions(!1), b || !getPropertyInfo(this.property.id)) {
+		if (x.getOptions(!1), b) {
 			let e = getAllPropertyInfos(this.node.id, "read")?.[0];
 			x.setValue(e?.id ?? "");
 		}
@@ -3532,10 +3551,10 @@ ${E}${y}return __outputs__;
 			console.assert(!1);
 			return;
 		}
-		let b = this.node.key !== y.key;
+		let b = this.node.id !== y.id;
 		this.node.id = y.id, this.node.key = y.key, this.node.alias = y.alias;
 		let x = this.getField("PROPERTY");
-		if (x.getOptions(!1), b || !getPropertyInfo(this.property.id)) {
+		if (x.getOptions(!1), b) {
 			let e = getAllPropertyInfos(this.node.id, "write")?.[0];
 			x.setValue(e?.id ?? "");
 		}
@@ -4080,11 +4099,14 @@ Blocks.call_func_v1 = {
 			console.assert(!1);
 			return;
 		}
-		let b = !1;
-		if (y.id !== this.space.id && (b = !0), this.space.id = y.id, this.space.name = y.name, this.getField("FUNC").getOptions(!1), b || !getFuncInfo(this.space.id, this.func.id)) {
+		let b = y.id !== this.space.id;
+		this.space.id = y.id, this.space.name = y.name;
+		let x = this.getField("FUNC");
+		if (x.getOptions(!1), b) {
 			let e = getAllFuncInfos(this.space.id)?.[0];
-			this.setFieldValue(e?.id ?? "", "FUNC");
+			x.setValue(e?.id ?? "");
 		}
+		this.onFuncChange_(x.getValue());
 	},
 	onFuncChange_: function(e) {
 		let y = getFuncInfo(this.space.id, e);
@@ -4237,11 +4259,14 @@ ${E}${D}}
 			console.assert(!1);
 			return;
 		}
-		let b = !1;
-		if (y.id !== this.space.id && (b = !0), this.space.id = y.id, this.space.name = y.name, this.getField("FUNC").getOptions(!1), b || !getFuncInfo(this.space.id, this.func.id)) {
+		let b = y.id !== this.space.id;
+		this.space.id = y.id, this.space.name = y.name;
+		let x = this.getField("FUNC");
+		if (x.getOptions(!1), b) {
 			let e = getAllFuncInfos(this.space.id)?.[0];
-			e ? this.setFieldValue(e.id, "FUNC") : this.setFieldValue("", "FUNC");
+			x.setValue(e?.id ?? "");
 		}
+		this.onFuncChange_(x.getValue());
 	},
 	onFuncChange_: function(e) {
 		let y = getFuncInfo(this.space.id, e);
@@ -4738,10 +4763,13 @@ ${javascriptGenerator.statementToCode(e, "HANDLE")}}
 			return;
 		}
 		let b = y.id !== this.space.id;
-		if (this.space.id = y.id, this.space.name = y.name, b || !getTableInfo(this.space.id, this.table.id)) {
-			let e = getAllTableInfos(this.space.id)?.[0]?.id ?? "", y = this.getField("TABLE");
-			y.getOptions(!1), y.setValue(e, !1), this.onTableChange_(e);
+		this.space.id = y.id, this.space.name = y.name;
+		let x = this.getField("TABLE");
+		if (x.getOptions(!1), b) {
+			let e = getAllTableInfos(this.space.id)?.[0];
+			x.setValue(e?.id ?? "");
 		}
+		this.onTableChange_(x.getValue());
 	},
 	onTableChange_: function(e) {
 		let y = getTableInfo(this.space.id, e);
@@ -4750,10 +4778,13 @@ ${javascriptGenerator.statementToCode(e, "HANDLE")}}
 			return;
 		}
 		let b = y.id !== this.table.id;
-		if (this.table.id = y.id, this.table.name = y.name, b || !getColumnInfo(this.space.id, this.table.id, this.column.id)) {
-			let e = getAllColumnInfos(this.space.id, this.table.id)?.[0]?.id ?? "", y = this.getField("COLUMN");
-			y.getOptions(!1), y.setValue(e, !1), this.onColumnChange_(e);
+		this.table.id = y.id, this.table.name = y.name;
+		let x = this.getField("COLUMN");
+		if (x.getOptions(!1), b) {
+			let e = getAllColumnInfos(this.space.id, this.table.id)?.[0];
+			x.setValue(e?.id ?? "");
 		}
+		this.onColumnChange_(x.getValue());
 	},
 	onColumnChange_: function(e) {
 		let y = getColumnInfo(this.space.id, this.table.id, e);
@@ -5263,10 +5294,13 @@ ${javascriptGenerator.statementToCode(e, "HANDLE")}}
 			return;
 		}
 		let b = y.id !== this.space.id;
-		if (this.space.id = y.id, this.space.name = y.name, b || !getTableInfo(this.space.id, this.table.id)) {
-			let e = getAllTableInfos(this.space.id)?.[0]?.id ?? "", y = this.getField("TABLE");
-			y.getOptions(!1), y.setValue(e, !1), this.onTableChange_(e);
+		this.space.id = y.id, this.space.name = y.name;
+		let x = this.getField("TABLE");
+		if (x.getOptions(!1), b) {
+			let e = getAllTableInfos(this.space.id)?.[0];
+			x.setValue(e?.id ?? "");
 		}
+		this.onTableChange_(x.getValue());
 	},
 	onTableChange_: function(e) {
 		let y = getTableInfo(this.space.id, e);
@@ -5426,11 +5460,14 @@ ${javascriptGenerator.statementToCode(e, "HANDLE")}}
 			console.assert(!1);
 			return;
 		}
-		let b = !1;
-		if (y.id !== this.space.id && (b = !0), this.space.id = y.id, this.space.name = y.name, this.getField("TABLE").getOptions(!1), b || !getTableInfo(this.space.id, this.table.id)) {
+		let b = y.id !== this.space.id;
+		this.space.id = y.id, this.space.name = y.name;
+		let x = this.getField("TABLE");
+		if (x.getOptions(!1), b) {
 			let e = getAllTableInfos(this.space.id)?.[0];
-			e ? this.setFieldValue(e.id, "TABLE") : this.setFieldValue("", "TABLE");
+			x.setValue(e?.id ?? "");
 		}
+		this.onTableChange_(x.getValue());
 	},
 	onTableChange_: function(e) {
 		let y = getTableInfo(this.space.id, e);
@@ -5605,10 +5642,13 @@ ${y}}
 			return;
 		}
 		let b = y.id !== this.space.id;
-		if (this.space.id = y.id, this.space.name = y.name, b || !getTableInfo(this.space.id, this.table.id)) {
-			let e = getAllTableInfos(this.space.id)?.[0]?.id ?? "", y = this.getField("TABLE");
-			y.getOptions(!1), y.setValue(e, !1), this.onTableChange_(e);
+		this.space.id = y.id, this.space.name = y.name;
+		let x = this.getField("TABLE");
+		if (x.getOptions(!1), b) {
+			let e = getAllTableInfos(this.space.id)?.[0];
+			x.setValue(e?.id ?? "");
 		}
+		this.onTableChange_(x.getValue());
 	},
 	onTableChange_: function(e) {
 		let y = getTableInfo(this.space.id, e);

package/package.json

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