x-block-lib 0.9.20 → 0.9.22

package/dist/core/blocks/app/property/getAppProperty/v1/index.d.ts

@@ -1 +1,42 @@
+import * as Blockly from 'blockly/core';
+import { PropertyKind } from 'x-runtime-lib';
+type GetAppPropertyV1Type = typeof GET_APP_PROPERTY_V1;
+interface GetAppPropertyV1 extends GetAppPropertyV1Type {
+    node: {
+        id: string;
+        key: string;
+        alias: string;
+    };
+    property: {
+        id: string;
+        kind: PropertyKind | '';
+        names: string[];
+    };
+}
+export type GetAppPropertyBlockV1 = Blockly.Block & GetAppPropertyV1;
+declare const GET_APP_PROPERTY_V1: {
+    init: (this: GetAppPropertyBlockV1) => void;
+    initData_: (this: GetAppPropertyBlockV1) => void;
+    saveExtraState: (this: GetAppPropertyBlockV1) => {
+        node: {
+            id: string;
+            key: string;
+            alias: string;
+        };
+        property: {
+            id: string;
+            kind: PropertyKind | "";
+            names: string[];
+        };
+    };
+    loadExtraState: (this: GetAppPropertyBlockV1, state: any) => void;
+    genNodeOpts_: (this: GetAppPropertyBlockV1) => Blockly.MenuOption[];
+    genPropertyOpts_: (this: GetAppPropertyBlockV1) => Blockly.MenuOption[];
+    onchange: (this: GetAppPropertyBlockV1, event: Blockly.Events.Abstract) => void;
+    onNodeChange_: (this: GetAppPropertyBlockV1, value: string) => void;
+    onPropertyChange_: (this: GetAppPropertyBlockV1, value: string) => void;
+    updateShape_: (this: GetAppPropertyBlockV1) => void;
+    updateShadow_: (this: GetAppPropertyBlockV1) => void;
+    checkWarning_: (this: GetAppPropertyBlockV1) => void;
+};
 export {};

package/dist/core/blocks/app/state/getAppState/v1/index.d.ts

@@ -1 +1,28 @@
+import * as Blockly from 'blockly/core';
+import { Type } from 'x-essential-lib';
+type GetAppStateV1Type = typeof GET_APP_STATE_V1;
+interface GetAppStateV1 extends GetAppStateV1Type {
+    state: {
+        id: string;
+        name: string;
+        type: Type;
+    };
+}
+export type GetAppStateBlockV1 = Blockly.Block & GetAppStateV1;
+declare const GET_APP_STATE_V1: {
+    init: (this: GetAppStateBlockV1) => void;
+    initData_: (this: GetAppStateBlockV1) => void;
+    saveExtraState: (this: GetAppStateBlockV1) => {
+        state: {
+            id: string;
+            name: string;
+            type: Type;
+        };
+    };
+    loadExtraState: (this: GetAppStateBlockV1, state: any) => void;
+    genStateOpts_: (this: GetAppStateBlockV1) => Blockly.MenuOption[];
+    onchange: (this: GetAppStateBlockV1, event: Blockly.Events.Abstract) => void;
+    onStateChange_: (this: GetAppStateBlockV1, value: string) => void;
+    checkWarning_: (this: GetAppStateBlockV1) => void;
+};
 export {};

package/dist/index.js

@@ -2491,7 +2491,7 @@ ${addIndent(S, 2)}  } catch (e) {
 	tooltip: "%{BKY_APP_V1_WATCH_EFFECT_TOOLTIP}",
 	helpUrl: "%{BKY_APP_V1_WATCH_EFFECT_HELPURL}"
 }]), javascriptGenerator.forBlock.watch_effect_v1 = function(e) {
-	return `function __watchEffect$${encodeString(e.id)}__() {
+	return `async function __watchEffect$${encodeString(e.id)}__() {
 ${javascriptGenerator.statementToCode(e, "HANDLE")}};
 `;
 }, defineBlocksWithJsonArray([{
@@ -8649,44 +8649,31 @@ function setTheme(e) {
 			break;
 	}
 }
-var reactivity_types = ["get_app_property_v1", "get_app_state_v1"];
 function addUnique(e, y) {
-	return e.find((e) => e === y) === void 0 ? (e.push(y), !0) : !1;
+	e.find((e) => e === y) || e.push(y);
 }
+var watchEffectTypes = ["get_app_property_v1", "get_app_state_v1"];
 function gatherWatchEffectBlocks(e) {
 	let y = [];
 	function b(e) {
-		for (let x of e.getChildren(!0)) reactivity_types.includes(x.type) && y.push(x), b(x);
+		for (let x of e.getChildren(!0)) watchEffectTypes.includes(x.type) && y.push(x), b(x);
 	}
 	return b(e), y;
 }
 function makeWatchEffectBlocks(e) {
 	let y = [];
-	for (let b of e) if (b.type === "get_app_property_v1") {
-		let e = b;
-		addUnique(y, makeTriggerId({
-			type: "elementProperty",
-			nodeId: e.node.id,
-			propertyKeys: e.property.key
-		}));
-	} else b.type === "get_app_state_v1" ? addUnique(y, makeTriggerId({
-		type: "state",
-		stateId: b.state.id
-	})) : console.assert(!1);
+	for (let b of e) b.type === "get_app_property_v1" ? addUnique(y, makeTriggerId("propertyTrigger", b.property.id)) : b.type === "get_app_state_v1" ? addUnique(y, makeTriggerId("stateTrigger", b.state.id)) : console.assert(!1);
 	return y;
 }
-function gatherAppBindBlocks(e) {
+function makeAppBindBlocks(e) {
 	let y = [];
-	for (let b of e.getChildren(!0)) if (reactivity_types.includes(b.type)) y.push(b);
-	else if (b.type === "object_get_v1") {
-		let e = b.getInputTargetBlock("OBJECT");
-		e && reactivity_types.includes(e.type) && y.push(b);
+	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)) : console.assert(!1);
 	}
 	return y;
 }
-function makeAppBindBlocks(e) {
-	return console.assert(!!e), [];
-}
 function buildReactivity(e) {
 	let y = {
 		watchEffect: {},
@@ -8700,12 +8687,9 @@ function buildReactivity(e) {
 		let b = makeWatchEffectBlocks(gatherWatchEffectBlocks(e));
 		for (let x of b) y.watchEffect[x] || (y.watchEffect[x] = []), addUnique(y.watchEffect[x], e.id);
 	} else if (e.type === "app_bind_v1") {
-		let b = makeAppBindBlocks(gatherAppBindBlocks(e));
+		let b = makeAppBindBlocks(e.getChildren(!0));
 		y.bind.sets[e.id] = b;
-		for (let x of b) {
-			let b = makeTriggerId(x);
-			y.bind.triggers[b] || (y.bind.triggers[b] = []), addUnique(y.bind.triggers[b], e.id);
-		}
+		for (let x of b) y.bind.triggers[x] || (y.bind.triggers[x] = []), addUnique(y.bind.triggers[x], e.id);
 	}
 	return y;
 }

package/package.json

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