x-block-lib 0.11.9 → 0.11.10

package/dist/{en.e929s12a.js → en.non7wgtb.js}

@@ -308,6 +308,7 @@ var en_default = {
 	CATEGORY_RESOURCE: "resource",
 	CATEGORY_TEXT: "text",
 	CATEGORY_TIME: "time",
+	CATEGORY_TYPE: "type",
 	CATEGORY_VARIABLE: "var",
 	LABEL_ARGUMENT: "Argument",
 	LABEL_BOOLEAN: "Boolean",

package/dist/index.js

@@ -9,8 +9,8 @@ import { useDisplay } from "vuetify";
 
 //#region src/core/locale/index.ts
 async function setLocale(locale) {
-	if (locale === "en") setLocale$1((await import("./en.e929s12a.js")).default);
-	else if (locale === "zhHans") setLocale$1((await import("./zhHans.c7mba28i.js")).default);
+	if (locale === "en") setLocale$1((await import("./en.non7wgtb.js")).default);
+	else if (locale === "zhHans") setLocale$1((await import("./zhHans.er5jfqth.js")).default);
 	else throw new Error(`invalid locale=${locale}`);
 }
 function localeMsg(key) {
@@ -457,7 +457,7 @@ function inWhiteList(type) {
 
 //#endregion
 //#region src/core/blocks/common/parameter/v1/index.ts
-const xmlUtils$11 = utils.xml;
+const xmlUtils$12 = utils.xml;
 const PARAMETER_V1 = {
 	init: function() {
 		this.key = "";
@@ -468,7 +468,7 @@ const PARAMETER_V1 = {
 		this.setColour(220);
 	},
 	mutationToDom: function() {
-		const container = xmlUtils$11.createElement("mutation");
+		const container = xmlUtils$12.createElement("mutation");
 		container.setAttribute("key", this.key);
 		container.setAttribute("name", this.name);
 		container.setAttribute("locale", this.locale ? "TRUE" : "FALSE");
@@ -2769,7 +2769,7 @@ javascriptGenerator.forBlock["app_bind_entry_v1"] = function() {
 
 //#endregion
 //#region src/core/blocks/app/event/appBind/v1/index.ts
-const xmlUtils$10 = utils.xml;
+const xmlUtils$11 = utils.xml;
 const APP_BIND_CONTAINER_V1 = { init: function() {
 	this.appendDummyInput().appendField("%{BKY_APP_V1_APP_BIND_CONTAINER_TITLE}");
 	this.appendStatementInput("STACK");
@@ -2797,7 +2797,7 @@ const APP_BIND_V1 = {
 		this.setHelpUrl("%{BKY_APP_V1_APP_BIND_HELPURL}");
 	},
 	mutationToDom: function() {
-		const container = xmlUtils$10.createElement("mutation");
+		const container = xmlUtils$11.createElement("mutation");
 		container.setAttribute("items", String(this.itemCount_));
 		return container;
 	},
@@ -7880,7 +7880,7 @@ ${javascriptGenerator.statementToCode(block, "HANDLE")}}
 
 //#endregion
 //#region src/core/blocks/json/jsonArray/v1/index.ts
-const xmlUtils$9 = utils.xml;
+const xmlUtils$10 = utils.xml;
 const JSON_ARRAY_V1 = {
 	init: function() {
 		this.length = 0;
@@ -7897,7 +7897,7 @@ const JSON_ARRAY_V1 = {
 		this.setHelpUrl("");
 	},
 	mutationToDom: function() {
-		const container = xmlUtils$9.createElement("mutation");
+		const container = xmlUtils$10.createElement("mutation");
 		container.setAttribute("items", String(this.length));
 		return container;
 	},
@@ -7974,7 +7974,7 @@ Blocks.json_boolean_v1 = JSON_BOOLEAN_V1;
 
 //#endregion
 //#region src/core/blocks/json/jsonMap/v1/index.ts
-const xmlUtils$8 = utils.xml;
+const xmlUtils$9 = utils.xml;
 const JSON_MAP_V1 = {
 	init: function() {
 		this.length = 0;
@@ -7991,9 +7991,9 @@ const JSON_MAP_V1 = {
 		this.setHelpUrl("");
 	},
 	mutationToDom: function() {
-		const container = xmlUtils$8.createElement("mutation");
+		const container = xmlUtils$9.createElement("mutation");
 		for (let i = 0; i < this.length; i++) {
-			const item = xmlUtils$8.createElement("item");
+			const item = xmlUtils$9.createElement("item");
 			item.setAttribute("key", this.getFieldValue("KEY" + i));
 			container.appendChild(item);
 		}
@@ -8097,7 +8097,7 @@ Blocks.json_string_v1 = JSON_STRING_V1;
 
 //#endregion
 //#region src/core/blocks/list/listCreate/v1/index.ts
-const xmlUtils$7 = utils.xml;
+const xmlUtils$8 = utils.xml;
 const LIST_CREATE_CONTAINER_V1 = { init: function() {
 	this.appendDummyInput().appendField("%{BKY_LIST_V1_CREATE_CONTAINER_TITLE}");
 	this.appendStatementInput("STACK");
@@ -8124,7 +8124,7 @@ const LIST_CREATE_V1 = {
 		this.updateShape_();
 	},
 	mutationToDom: function() {
-		const container = xmlUtils$7.createElement("mutation");
+		const container = xmlUtils$8.createElement("mutation");
 		container.setAttribute("items", String(this.itemCount_));
 		return container;
 	},
@@ -9738,7 +9738,7 @@ javascriptGenerator.forBlock["math_trig_v1"] = function(block) {
 
 //#endregion
 //#region src/core/blocks/object/objectCreate/v1/index.ts
-const xmlUtils$6 = utils.xml;
+const xmlUtils$7 = utils.xml;
 const OBJECT_CREATE_CONTAINER_V1 = { init: function() {
 	this.appendDummyInput().appendField("%{BKY_OBJECT_V1_CREATE_CONTAINER_TITLE}");
 	this.appendStatementInput("STACK");
@@ -9765,7 +9765,7 @@ const OBJECT_CREATE_V1 = {
 		this.setHelpUrl("%{BKY_OBJECT_V1_CREATE_HELPURL}");
 	},
 	mutationToDom: function() {
-		const container = xmlUtils$6.createElement("mutation");
+		const container = xmlUtils$7.createElement("mutation");
 		container.setAttribute("items", String(this.itemCount_));
 		return container;
 	},
@@ -10071,7 +10071,7 @@ javascriptGenerator.forBlock["object_to_json_v1"] = function(block) {
 
 //#endregion
 //#region src/core/blocks/procedure/procedureDef/v1/index.ts
-const xmlUtils$5 = utils.xml;
+const xmlUtils$6 = utils.xml;
 const PROCEDURE_DEF_CONTAINER_V1 = { init: function() {
 	this.appendDummyInput().appendField("%{BKY_PROCEDURE_V1_DEF_CONTAINER_TITLE}").appendField(new FieldCheckbox(false), "WITHRETURN");
 	this.appendStatementInput("STACK");
@@ -10122,10 +10122,10 @@ const PROCEDURE_DEF_V1 = {
 		this.setHelpUrl("%{BKY_PROCEDURE_V1_DEF_HELPURL}");
 	},
 	mutationToDom: function() {
-		const container = xmlUtils$5.createElement("mutation");
+		const container = xmlUtils$6.createElement("mutation");
 		container.setAttribute("withreturn", this.withReturn ? "TRUE" : "FALSE");
 		this.args.forEach((arg) => {
-			const child = xmlUtils$5.createElement("arg");
+			const child = xmlUtils$6.createElement("arg");
 			child.setAttribute("name", arg.name);
 			child.setAttribute("id", arg.id);
 			container.appendChild(child);
@@ -10241,6 +10241,137 @@ const PROCEDURE_DEF_V1 = {
 };
 Blocks.procedure_def_v1 = PROCEDURE_DEF_V1;
 
+//#endregion
+//#region src/core/blocks/procedure/procedureCall/v1/index.ts
+const xmlUtils$5 = utils.xml;
+const PROCEDURE_CALL_V1 = {
+	init: function() {
+		this.withReturn = false;
+		this.args = [];
+		this.quarkIds_ = [];
+		this.quarkConnections_ = {};
+		this.appendDummyInput().appendField("", "NAME");
+		this.setStyle("procedure_blocks");
+		this.setTooltip("%{BKY_PROCEDURE_V1_CALL_TOOLTIP}");
+		this.setHelpUrl("%{BKY_PROCEDURE_V1_CALL_HELPURL}");
+	},
+	mutationToDom: function() {
+		const container = xmlUtils$5.createElement("mutation");
+		container.setAttribute("name", this.getProcedureName_());
+		container.setAttribute("withreturn", this.withReturn ? "TRUE" : "FALSE");
+		this.args.forEach((arg) => {
+			const child = xmlUtils$5.createElement("arg");
+			child.setAttribute("name", arg);
+			container.appendChild(child);
+		});
+		return container;
+	},
+	domToMutation: function(xmlElement) {
+		const name = xmlElement.getAttribute("name") ?? "";
+		const withReturn = xmlElement.getAttribute("withreturn") === "TRUE" ? true : false;
+		const args = [];
+		for (let i = 0, childNode; childNode = xmlElement.childNodes[i]; i++) if (childNode.nodeName.toLowerCase() === "arg") args.push(childNode.getAttribute("name"));
+		this.setProcedureName_(name);
+		this.setProcedureReturnArgs_(withReturn, [], []);
+	},
+	saveExtraState: function() {},
+	loadExtraState: function() {},
+	getProcedureName_: function() {
+		return this.getFieldValue("NAME");
+	},
+	setProcedureName_: function(name) {
+		this.setFieldValue(name, "NAME");
+	},
+	setProcedureReturnArgs_: function(withReturn, argNames, argIds) {
+		if (argNames.length !== argIds.length) throw RangeError("argNames and argIds must be same length");
+		this.withReturn = withReturn;
+		const defBlock = Procedures.getDefinition(this.getProcedureName_(), this.workspace);
+		const mutatorIcon = defBlock && defBlock.getIcon(icons.MutatorIcon.TYPE);
+		const mutatorOpen = mutatorIcon && mutatorIcon.bubbleIsVisible();
+		if (mutatorOpen) this.setCollapsed(false);
+		else {
+			this.quarkIds_ = [];
+			this.quarkConnections_ = {};
+		}
+		if (argNames.join("\n") === this.args.join("\n")) {
+			this.quarkIds_ = argIds;
+			this.updateShape_();
+			return;
+		}
+		for (let i = 0; i < this.args.length; i++) {
+			const input = this.getInput("ARG" + i);
+			if (input) {
+				const connection = input.connection.targetConnection;
+				this.quarkConnections_[this.quarkIds_[i]] = connection;
+				if (connection && mutatorOpen && !argIds.includes(this.quarkIds_[i])) {
+					connection.disconnect();
+					connection.getSourceBlock().bumpNeighbours();
+				}
+			}
+		}
+		this.args = [...argNames];
+		this.updateShape_();
+		this.quarkIds_ = argIds;
+		for (let i = 0; i < this.args.length; i++) {
+			const quarkId = this.quarkIds_[i];
+			if (quarkId in this.quarkConnections_) {
+				if (!this.quarkConnections_[quarkId]?.reconnect(this, "ARG" + i)) delete this.quarkConnections_[quarkId];
+			}
+		}
+	},
+	onchange: function(event) {
+		if (!this.workspace || this.workspace.isFlyout) return;
+		if (event.type === Events.BLOCK_DELETE) {
+			if (!Procedures.getDefinition(this.getProcedureName_(), this.workspace)) this.dispose();
+		} else if (event.type === Events.BLOCK_CHANGE) {
+			const changeEvent = event;
+			if (!changeEvent.blockId) return;
+			const block = this.workspace.getBlockById(changeEvent.blockId);
+			if (!block) return;
+			if (changeEvent.element === "field" && changeEvent.name === "NAME") {
+				if (changeEvent.oldValue === this.getProcedureName_()) this.setProcedureName_(changeEvent.newValue);
+			}
+			const [name, args, withReturn] = block.getProcedureDef();
+			if (name !== this.getProcedureName_()) return;
+			if (changeEvent.element === "disabled") {
+				Events.setGroup(changeEvent.group);
+				this.setDisabledReason(!!changeEvent.newValue, "");
+				Events.setGroup(false);
+			}
+			if (this.withReturn !== withReturn) {
+				if (this.getParent()) this.unplug();
+			}
+			this.setProcedureReturnArgs_(withReturn, args, []);
+		}
+	},
+	updateShape_: function() {
+		if (this.withReturn) {
+			this.setOutput(true);
+			this.setPreviousStatement(false);
+			this.setNextStatement(false);
+		} else {
+			this.setOutput(false);
+			this.setPreviousStatement(true);
+			this.setNextStatement(true);
+		}
+		for (let i = 0; i < this.args.length; i++) {
+			const arg = this.args[i];
+			if (this.getInput("ARG" + i)) try {
+				Events.disable();
+				this.setFieldValue(arg, "ARGNAME");
+			} finally {
+				Events.enable();
+			}
+			else this.appendValueInput("ARG" + i).setAlign(inputs.Align.RIGHT).appendField(new FieldLabel(arg), "ARGNAME" + i);
+		}
+		for (let i = this.args.length; this.getInput("ARG" + i); i++) this.removeInput("ARG" + i);
+	}
+};
+Blocks.procedure_call_v1 = PROCEDURE_CALL_V1;
+javascriptGenerator.forBlock["procedure_call_v1"] = function() {
+	return "";
+};
+
 //#endregion
 //#region src/core/blocks/procedure/procedureReturn/v1/index.ts
 const xmlUtils$4 = utils.xml;
@@ -13401,7 +13532,7 @@ const jsonToolboxV1 = {
 	kind: "categoryToolbox",
 	contents: [{
 		kind: "category",
-		name: "%{BKY_CATEGORY_JSON}",
+		name: "%{BKY_CATEGORY_TYPE}",
 		colour: "330",
 		contents: [
 			{

package/dist/{zhHans.c7mba28i.js → zhHans.er5jfqth.js}

@@ -308,6 +308,7 @@ var zhHans_default = {
 	CATEGORY_RESOURCE: "资源",
 	CATEGORY_TEXT: "文本",
 	CATEGORY_TIME: "时间",
+	CATEGORY_TYPE: "类型",
 	CATEGORY_VARIABLE: "变量",
 	LABEL_ARGUMENT: "参数",
 	LABEL_BOOLEAN: "布尔",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x-block-lib",
-  "version": "0.11.9",
+  "version": "0.11.10",
   "files": [
     "dist"
   ],
@@ -52,7 +52,7 @@
     "vuetify": "^4.2.1",
     "x-error-lib": "^0.6.5",
     "x-essential-lib": "^0.10.40",
-    "x-runtime-lib": "^0.10.3",
+    "x-runtime-lib": "^0.10.4",
     "x-state-lib": "^0.4.5"
   }
 }