x-block-lib 0.9.27 → 0.9.29

package/dist/core/blocks/app/event/appBindEntry/v1/index.d.ts

@@ -1,10 +1,10 @@
 import * as Blockly from 'blockly/core';
 import { Type } from 'x-essential-lib';
 import { PropertyKind } from 'x-runtime-lib';
-import { BindType } from '@/core/utils/app';
+import { BindKind } from '@/core/utils/app';
 type AppBindEntryV1Type = typeof APP_BIND_ENTRY_V1;
 interface AppBindEntryV1 extends AppBindEntryV1Type {
-    bindType: BindType | '';
+    kind: BindKind;
     node: {
         id: string;
         key: string;
@@ -25,7 +25,7 @@ export type AppBindEntryBlockV1 = Blockly.BlockSvg & AppBindEntryV1;
 declare const APP_BIND_ENTRY_V1: {
     init: (this: AppBindEntryBlockV1) => void;
     saveExtraState: (this: AppBindEntryBlockV1) => {
-        bindType: "" | BindType;
+        kind: BindKind;
         node: {
             id: string;
             key: string;
@@ -43,12 +43,12 @@ declare const APP_BIND_ENTRY_V1: {
         };
     };
     loadExtraState: (this: AppBindEntryBlockV1, state: any) => void;
-    genBindTypeOpts_: (this: AppBindEntryBlockV1) => Blockly.MenuOption[];
+    genKindOpts_: (this: AppBindEntryBlockV1) => Blockly.MenuOption[];
     genNodeOpts_: (this: AppBindEntryBlockV1) => Blockly.MenuOption[];
     genPropertyOpts_: (this: AppBindEntryBlockV1) => Blockly.MenuOption[];
     genStateOpts_: (this: AppBindEntryBlockV1) => Blockly.MenuOption[];
     onchange: (this: AppBindEntryBlockV1, event: Blockly.Events.Abstract) => void;
-    onBindTypeChange_: (this: AppBindEntryBlockV1, value: string) => void;
+    onKindChange_: (this: AppBindEntryBlockV1, value: BindKind) => void;
     onNodeChange_: (this: AppBindEntryBlockV1, value: string) => void;
     onPropertyChange_: (this: AppBindEntryBlockV1, value: string) => void;
     onStateChange_: (this: AppBindEntryBlockV1, value: string) => void;

package/dist/core/utils/app/bind.d.ts

@@ -1,4 +1,4 @@
 import * as Blockly from 'blockly/core';
-export type BindType = 'property' | 'state';
-export declare function getAllBindTypes(): BindType[];
-export declare function genBindTypeOpts(): Blockly.MenuOption[];
+export type BindKind = 'notSet' | 'property' | 'state';
+export declare function getAllBindKinds(): BindKind[];
+export declare function genBindKindOpts(): Blockly.MenuOption[];

package/dist/core/utils/common/shadow.d.ts

@@ -10,5 +10,6 @@ export declare function shadowOfTypesV1(types: string): Element;
 export declare function shadowOfSelectCompV1(): Element;
 export declare function shadowOfSelectSlotV1(): Element;
 export declare function shadowOfColorPickerV1(value: string): Element;
+export declare function shadowOfAppBindEntryV1(): Element;
 export declare function genTypeShadowV1(type: Type): Element | null;
 export declare function genPropShadowV1(property: ZProperty): Element | null;

package/dist/index.js

@@ -163,6 +163,9 @@ function shadowOfColorPickerV1(e) {
 	let y = `<shadow type="color_picker_v1"><field name="COLOR">${e}</field></shadow>`;
 	return utils.xml.textToDom(y);
 }
+function shadowOfAppBindEntryV1() {
+	return utils.xml.textToDom("\n<shadow type=\"app_bind_entry_v1\">\n  <field name=\"KIND\">notSet</field>\n</shadow>");
+}
 function genTypeShadowV1(e) {
 	let y = null;
 	return e === "string" ? y = shadowOfTextV1("") : e === "number" ? y = shadowOfMathNumberV1(0) : e === "boolean" ? y = shadowOfLogicBooleanV1(!1) : e === "array" ? y = shadowOfListCreateV1() : e === "object" ? y = shadowOfObjectCreateV1() : e === "any" ? y = null : console.assert(!1), y;
@@ -644,12 +647,13 @@ function genStateOpts() {
 	for (let { id: b, name: x } of y) e.push([x, b]);
 	return ensureOpts(e);
 }
-function getAllBindTypes() {
-	let e = [];
+function getAllBindKinds() {
+	let e = ["notSet"];
 	return getAllNodeInfos("setProperty").length > 0 && e.push("property"), getAllStateInfos().length > 0 && e.push("state"), e;
 }
-function genBindTypeOpts() {
-	return ensureOpts(getAllBindTypes().map((e) => [localeMsg(`APP_${upperCase_default(e)}`), e]));
+function genBindKindOpts() {
+	let { i18n: e } = globalObjects;
+	return ensureOpts(getAllBindKinds().map((y) => y === "notSet" ? [e.global.t(`x-runtime-lib.${y}`), y] : [localeMsg(`APP_${upperCase_default(y)}`), y]));
 }
 function getAllCompInfos() {
 	let { activeApp: e } = globalState.app, y = [{
@@ -1907,50 +1911,6 @@ function genSlotOpts_() {
 	}
 	return ensureOpts(y);
 }
-function ensureBindEntryBlocks(e) {
-	if (!(getAllBindTypes().length <= 0)) for (let y = 0; e.getInput("ADD" + y); y++) {
-		let b = e.getInput("ADD" + y).connection;
-		b.targetBlock() || ensureBindEntryBlock(b, e.workspace);
-	}
-}
-function ensureBindEntryBlock(e, y) {
-	let b = {
-		bindType: "",
-		node: {
-			id: "",
-			key: "",
-			alias: ""
-		},
-		property: {
-			id: "",
-			kind: "",
-			names: []
-		},
-		state: {
-			id: "",
-			name: "",
-			type: "string"
-		}
-	}, x = {}, S = getAllBindTypes()?.[0];
-	if (!S) return;
-	if (b.bindType = S, x.BIND_TYPE = S, b.bindType === "property") {
-		let e = getAllNodeInfos("setProperty")?.[0];
-		if (e) {
-			b.node.id = e.id, b.node.key = e.key, b.node.alias = e.alias, x.NODE = e.id;
-			let y = getAllPropertyInfos(e.id, "write")?.[0];
-			y && (b.property.id = y.id, b.property.kind = y.kind, b.property.names = y.names, x.PROPERTY = y.id);
-		}
-	} else if (b.bindType === "state") {
-		let e = getAllStateInfos()?.[0];
-		e && (b.state.id = e.id, b.state.name = e.name, b.state.type = e.type, x.STATE = e.id);
-	}
-	let C = {
-		type: "app_bind_entry_v1",
-		extraState: b,
-		fields: x
-	}, w = serialization.blocks.append(C, y);
-	e.connect(w.outputConnection);
-}
 var xmlUtils$11 = utils.xml;
 Blocks.app_bind_container_v1 = { init: function() {
 	this.appendDummyInput().appendField("%{BKY_APP_V1_APP_BIND_CONTAINER_TITLE}"), this.appendStatementInput("STACK"), this.setStyle("event_blocks"), this.contextMenu = !1;
@@ -1968,16 +1928,16 @@ Blocks.app_bind_container_v1 = { init: function() {
 	},
 	domToMutation: function(e) {
 		let y = e.getAttribute("items") ?? "";
-		this.itemCount_ = parseInt(y, 0), this.updateShape_(), setTimeout(() => {
-			this.isInFlyout || (this.ensureBlocks_(), this.checkWarning_());
+		this.itemCount_ = parseInt(y, 0), this.updateShape_(), this.updateShadow_(), setTimeout(() => {
+			this.checkWarning_();
 		}, 0);
 	},
 	saveExtraState: function() {
 		return { itemCount: this.itemCount_ };
 	},
 	loadExtraState: function(e) {
-		this.itemCount_ = e.itemCount ?? 0, this.updateShape_(), setTimeout(() => {
-			this.isInFlyout || (this.ensureBlocks_(), this.checkWarning_());
+		this.itemCount_ = e.itemCount ?? 0, this.updateShape_(), this.updateShadow_(), setTimeout(() => {
+			this.checkWarning_();
 		}, 0);
 	},
 	decompose: function(e) {
@@ -2003,10 +1963,10 @@ Blocks.app_bind_container_v1 = { init: function() {
 			let y = this.getInput("ADD" + e).connection.targetConnection;
 			y && !b.includes(y) && y.disconnect();
 		}
-		this.itemCount_ = b.length, this.updateShape_();
+		this.itemCount_ = b.length, this.updateShape_(), this.updateShadow_();
 		for (let e = 0; e < this.itemCount_; e++) b[e]?.reconnect(this, "ADD" + e);
 		setTimeout(() => {
-			this.ensureBlocks_(), this.checkWarning_();
+			this.checkWarning_();
 		}, 0);
 	},
 	saveConnections: function(e) {
@@ -2028,8 +1988,8 @@ Blocks.app_bind_container_v1 = { init: function() {
 		for (let e = 0; e < this.itemCount_; e++) this.getInput("ADD" + e) || (this.appendValueInput("ADD" + e).setCheck("BindEntry"), e === 0 && this.getInput("ADD" + e).setAlign(inputs.Align.RIGHT).appendField("%{BKY_APP_V1_APP_BIND_TITLE}"));
 		for (let e = this.itemCount_; this.getInput("ADD" + e); e++) this.removeInput("ADD" + e);
 	},
-	ensureBlocks_: function() {
-		this.isInsertionMarker() || ensureBindEntryBlocks(this);
+	updateShadow_: function() {
+		if (!this.isInsertionMarker()) for (let e = 0; e < this.itemCount_; e++) this.getInput("ADD" + e).setCheck("BindEntry").setShadowDom(shadowOfAppBindEntryV1());
 	},
 	checkWarning_: function() {
 		let e;
@@ -2037,10 +1997,10 @@ Blocks.app_bind_container_v1 = { init: function() {
 			let b = this.getInput("ADD" + y)?.connection?.targetBlock();
 			if (!b) continue;
 			let x;
-			if (b.bindType === "property") {
+			if (b.kind === "property") {
 				let e = getPropertyInfo(b.property.id);
 				e && (x = e.meta.element ? getPropCheck(e.meta.raw) : getTypeCheck(e.meta.raw.type));
-			} else if (b.bindType === "state") {
+			} else if (b.kind === "state") {
 				let e = getStateInfo(b.state.id);
 				e && (x = getTypeCheck(e.type));
 			}
@@ -2055,7 +2015,7 @@ Blocks.app_bind_container_v1 = { init: function() {
 	return "";
 }, Blocks.app_bind_entry_v1 = {
 	init: function() {
-		this.bindType = "", this.node = {
+		this.kind = "notSet", this.node = {
 			id: "",
 			key: "",
 			alias: ""
@@ -2067,52 +2027,53 @@ Blocks.app_bind_container_v1 = { init: function() {
 			id: "",
 			name: "",
 			type: "string"
-		}, this.appendDummyInput().appendField(new FieldDropdown(() => this.genBindTypeOpts_()), "BIND_TYPE").appendField(new FieldDropdown(() => this.genNodeOpts_()), "NODE").appendField(new FieldDropdown(() => this.genPropertyOpts_()), "PROPERTY").appendField(new FieldDropdown(() => this.genStateOpts_()), "STATE"), this.setOutput(!0, "BindEntry");
+		}, this.appendDummyInput().appendField(new FieldDropdown(() => this.genKindOpts_()), "KIND").appendField(new FieldDropdown(() => this.genNodeOpts_()), "NODE").appendField(new FieldDropdown(() => this.genPropertyOpts_()), "PROPERTY").appendField(new FieldDropdown(() => this.genStateOpts_()), "STATE"), this.setOutput(!0, "BindEntry"), this.updateShape_();
 	},
 	saveExtraState: function() {
 		return {
-			bindType: this.bindType,
+			kind: this.kind,
 			node: this.node,
 			property: this.property,
 			state: this.state
 		};
 	},
 	loadExtraState: function(e) {
-		this.bindType = e.bindType ?? "", this.node.id = e.node?.id ?? "", this.node.key = e.node?.key ?? "", this.node.alias = e.node?.alias ?? "", this.property.id = e.property?.id ?? "", this.property.kind = e.property?.kind ?? "", this.property.names = e.property?.names ?? [], this.state.id = e.state?.id ?? "", this.state.name = e.state?.name ?? "", this.state.type = e.state?.type ?? "string", this.updateShape_(), setTimeout(() => {
+		this.kind = e.kind ?? "notSet", this.node.id = e.node?.id ?? "", this.node.key = e.node?.key ?? "", this.node.alias = e.node?.alias ?? "", this.property.id = e.property?.id ?? "", this.property.kind = e.property?.kind ?? "", this.property.names = e.property?.names ?? [], this.state.id = e.state?.id ?? "", this.state.name = e.state?.name ?? "", this.state.type = e.state?.type ?? "string", this.updateShape_(), setTimeout(() => {
 			this.checkWarning_();
 		}, 0);
 	},
-	genBindTypeOpts_: function() {
-		return genBindTypeOpts();
+	genKindOpts_: function() {
+		return genBindKindOpts();
 	},
 	genNodeOpts_: function() {
-		return this.bindType === "property" ? genNodeOpts("setProperty") : ensureOpts([]);
+		return this.kind === "property" ? genNodeOpts("setProperty") : ensureOpts([]);
 	},
 	genPropertyOpts_: function() {
-		return this.bindType === "property" ? genPropertyOpts(this.node.id, "write") : ensureOpts([]);
+		return this.kind === "property" ? genPropertyOpts(this.node.id, "write") : ensureOpts([]);
 	},
 	genStateOpts_: function() {
-		return this.bindType === "state" ? genStateOpts() : ensureOpts([]);
+		return this.kind === "state" ? genStateOpts() : ensureOpts([]);
 	},
 	onchange: function(e) {
 		if (e.type === CustomEventType.STATE_CHANGE) this.checkWarning_();
 		else if (e.type === Events.BLOCK_CHANGE) {
 			let y = e;
-			y.blockId === this.id && (y.element === "field" && (y.name === "BIND_TYPE" ? this.onBindTypeChange_(y.newValue) : y.name === "NODE" ? this.onNodeChange_(y.newValue) : y.name === "PROPERTY" ? this.onPropertyChange_(y.newValue) : y.name === "STATE" && this.onStateChange_(y.newValue)), setTimeout(() => {
+			y.blockId === this.id && (y.element === "field" && (y.name === "KIND" ? this.onKindChange_(y.newValue) : y.name === "NODE" ? this.onNodeChange_(y.newValue) : y.name === "PROPERTY" ? this.onPropertyChange_(y.newValue) : y.name === "STATE" && this.onStateChange_(y.newValue)), setTimeout(() => {
 				this.checkWarning_();
 			}));
 		}
 	},
-	onBindTypeChange_: function(e) {
-		let y = this.bindType !== e;
-		if (this.bindType = e, this.bindType === "property") {
+	onKindChange_: function(e) {
+		let y = this.kind !== e;
+		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)) {
 				let y = getAllNodeInfos("setProperty")?.[0];
 				e.setValue(y?.id ?? "");
 			}
 			this.onNodeChange_(e.getValue());
-		} else if (this.bindType === "state") {
+		} else if (this.kind === "state") {
 			let e = this.getField("STATE");
 			if (e.getOptions(!1), y || !getStateInfo(this.state.id)) {
 				let y = getAllStateInfos()?.[0];
@@ -2153,13 +2114,12 @@ Blocks.app_bind_container_v1 = { init: function() {
 		this.state.id = y.id, this.state.name = y.name, this.state.type = y.type, this.updateShape_();
 	},
 	updateShape_: function() {
-		let e = this.getFieldValue("BIND_TYPE");
-		e === "property" ? (this.setStyle("property_blocks"), this.getField("NODE").setVisible(!0), this.getField("PROPERTY").setVisible(!0), this.getField("STATE").setVisible(!1)) : e === "state" && (this.setStyle("state_blocks"), this.getField("NODE").setVisible(!1), this.getField("PROPERTY").setVisible(!1), this.getField("STATE").setVisible(!0)), setTimeout(() => {
+		this.kind === "notSet" ? (this.setStyle("event_blocks"), this.getField("NODE").setVisible(!1), this.getField("PROPERTY").setVisible(!1), this.getField("STATE").setVisible(!1)) : this.kind === "property" ? (this.setStyle("property_blocks"), this.getField("NODE").setVisible(!0), this.getField("PROPERTY").setVisible(!0), this.getField("STATE").setVisible(!1)) : this.kind === "state" && (this.setStyle("state_blocks"), this.getField("NODE").setVisible(!1), this.getField("PROPERTY").setVisible(!1), this.getField("STATE").setVisible(!0)), setTimeout(() => {
 			this.render();
 		}, 0);
 	},
 	checkWarning_: function() {
-		if (this.bindType === "property") {
+		if (this.kind === "property") {
 			let e = getNodeInfo(this.node.id);
 			if (!e) {
 				this.setWarningText(localeMsg("WARN_NODE_NOT_FOUND"));
@@ -2180,7 +2140,7 @@ Blocks.app_bind_container_v1 = { init: function() {
 				return;
 			}
 			isEqual_default(y.names, this.property.names) || (this.property.names = y.names);
-		} else if (this.bindType === "state") {
+		} else if (this.kind === "state") {
 			let e = getStateInfo(this.state.id);
 			if (!e) {
 				this.setWarningText(localeMsg("WARN_STATE_NOT_FOUND"));
@@ -8689,7 +8649,7 @@ function makeAppBindBlocks(e) {
 	for (let b of e) {
 		if (b.type !== "app_bind_entry_v1") continue;
 		let e = b;
-		e.bindType === "property" ? addUnique(y, makeTriggerId("propertyTrigger", e.property.id)) : e.bindType === "state" && addUnique(y, makeTriggerId("stateTrigger", e.state.id));
+		e.kind === "property" ? addUnique(y, makeTriggerId("propertyTrigger", e.property.id)) : e.kind === "state" && addUnique(y, makeTriggerId("stateTrigger", e.state.id));
 	}
 	return y;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "x-block-lib",
   "private": false,
-  "version": "0.9.27",
+  "version": "0.9.29",
   "type": "module",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -41,7 +41,7 @@
   },
   "peerDependencies": {
     "x-essential-lib": "^0.9.24",
-    "x-runtime-lib": "^0.8.202",
+    "x-runtime-lib": "^0.8.203",
     "x-state-lib": "^0.3.38"
   },
   "devDependencies": {