x-block-lib 0.11.10 → 0.11.11

package/dist/index.d.ts

@@ -71,7 +71,7 @@ type __VLS_Props = {
 declare function load(state: any): void;
 declare function save(): any;
 declare function appendBlock(state: any): void;
-declare function generateCode(): string | undefined;
+declare function generateCode(): string;
 declare function generateReactivity(): import("x-runtime-lib").Reactivity;
 declare function fireStateChange(): void;
 type __VLS_ModelProps = {

package/dist/index.js

@@ -1,5 +1,5 @@
 (function(){try{document.getElementById(`x-block-lib`)?.remove();const e = document.createElement(`style`);e.setAttribute(`id`, `x-block-lib`);const t = document.createTextNode(`.ghost[data-v-x-block-lib-ca7316a0]{opacity:.4;pointer-events:none}.blocklyToolbox{width:56px;overflow-x:hidden}.blocklyMainBackground{stroke-width:0}.blocklyToolboxCategory{margin-bottom:12px!important}.blocklyToolboxCategoryIcon{display:none!important}.blocklyTreeRowContentContainer{place-items:center;height:28px;display:flex;overflow:hidden}.blocklyFlyout{z-index:21}pre code.hljs{padding:1em;display:block;overflow-x:auto}code.hljs{padding:3px 5px}.hljs{color:#444;background:#f3f3f3}.hljs-comment{color:#697070}.hljs-punctuation,.hljs-tag{color:#444a}.hljs-tag .hljs-attr,.hljs-tag .hljs-name{color:#444}.hljs-attribute,.hljs-doctag,.hljs-keyword,.hljs-meta .hljs-keyword,.hljs-name,.hljs-selector-tag{font-weight:700}.hljs-deletion,.hljs-number,.hljs-quote,.hljs-selector-class,.hljs-selector-id,.hljs-string,.hljs-template-tag,.hljs-type{color:#800}.hljs-section,.hljs-title{color:#800;font-weight:700}.hljs-link,.hljs-operator,.hljs-regexp,.hljs-selector-attr,.hljs-selector-pseudo,.hljs-symbol,.hljs-template-variable,.hljs-variable{color:#ab5656}.hljs-literal{color:#695}.hljs-addition,.hljs-built_in,.hljs-bullet,.hljs-code{color:#397300}.hljs-meta{color:#1f7199}.hljs-meta .hljs-string{color:#38a}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}`);e.appendChild(t);document.head.appendChild(e);}catch(e){console.error('rolldown-plugin-inject-css', e);}})()
-import { A as Names, B as defineBlocksWithJsonArray, C as FieldCheckbox, D as FieldNumber, E as FieldLabel, F as Themes, G as inject$1, H as getMainWorkspace, I as Variables, J as serialization, K as inputs, L as WorkspaceSvg, M as ShortcutItems, N as ShortcutRegistry, O as FieldTextInput, P as Theme, R as Xml, S as Extensions, T as FieldImage, U as getSelected, V as dialog, W as icons, X as svgResize, Y as setLocale$1, Z as utils, _ as javascriptGenerator, a as lo, b as ContextMenuRegistry, c as encodeString, d as snakeCase, f as parseInt$1, g as Order, h as cloneDeep, i as require_dist$2, j as Procedures, k as Msg, l as require_dist, m as debounce, n as o, o as useResizeObserver, p as isEqual, q as registry, r as core_default, s as require_dist$1, t as javascript, u as upperCase, v as Blocks, w as FieldDropdown, x as Events, y as ContextMenu, z as common } from "./vendor.eb5jfwqa.js";
+import { A as Names, B as constants, C as FieldCheckbox, D as FieldNumber, E as FieldLabel, F as Themes, G as icons, H as dialog, I as Variables, J as registry, K as inject$1, L as WorkspaceSvg, M as ShortcutItems, N as ShortcutRegistry, O as FieldTextInput, P as Theme, Q as utils, R as Xml, S as Extensions, T as FieldImage, U as getMainWorkspace, V as defineBlocksWithJsonArray, W as getSelected, X as setLocale$1, Y as serialization, Z as svgResize, _ as javascriptGenerator, a as lo, b as ContextMenuRegistry, c as encodeString, d as snakeCase, f as parseInt$1, g as Order, h as cloneDeep, i as require_dist$2, j as Procedures, k as Msg, l as require_dist, m as debounce, n as o, o as useResizeObserver, p as isEqual, q as inputs, r as core_default, s as require_dist$1, t as javascript, u as upperCase, v as Blocks, w as FieldDropdown, x as Events, y as ContextMenu, z as common } from "./vendor.lqnzhjrj.js";
 import { eventBus, globalObjects, messageWarning, openConfirmDlg, openPromptDlg, useColor, useSystem, useViewStack } from "x-essential-lib";
 import { globalState } from "x-state-lib";
 import { addIndent, finalProperties, getElement, getImplementMethodName, getItems, getTag, getTypes, makeEventId, makeEventKeyOfCustomSlot, makeEventKeyOfElementSlot, makeMethodId, makeMethodKeyOfCustomSlot, makeMethodKeyOfElementSlot, makePropertyId, makePropertyKeyOfCustomSlot, makePropertyKeyOfElementSlot, makeTriggerId, parseNumberUnit, pkgs, themeColors, toEventName, toMethodName, toPropertyName, unwrapEventId, unwrapEventKeyOfCustomSlot, unwrapEventKeyOfElementSlot, unwrapMethodId, unwrapMethodKeyOfCustomSlot, unwrapMethodKeyOfElementSlot, unwrapPropertyId, unwrapPropertyKeyOfCustomSlot, unwrapPropertyKeyOfElementSlot, unwrapSlotId } from "x-runtime-lib";
@@ -597,6 +597,9 @@ function ensureParameterBlockV1s(scope, params) {
 
 //#endregion
 //#region src/core/utils/common/shadow.ts
+function shadowOfJsonNullV1() {
+	return utils.xml.textToDom(`<shadow type="json_null_v1"></shadow>`);
+}
 function shadowOfTextV1(value) {
 	const text = `<shadow type="text_v1"><field name="TEXT">${value}</field></shadow>`;
 	return utils.xml.textToDom(text);
@@ -7892,7 +7895,7 @@ const JSON_ARRAY_V1 = {
 		this.appendDummyInput("CLOSE_BRACKET").appendField(" ] ");
 		this.setInputsInline(false);
 		this.setOutput(true, "JsonArray");
-		this.setColour(350);
+		this.setStyle("list_blocks");
 		this.setTooltip("");
 		this.setHelpUrl("");
 	},
@@ -7913,6 +7916,7 @@ const JSON_ARRAY_V1 = {
 		for (let i = 0; i < this.length; i++) {
 			const name = "ENTRY" + i;
 			const input = this.appendValueInput(name);
+			input.setShadowDom(shadowOfJsonNullV1());
 			input.appendField(new FieldImage(plusImage, 20, 20, void 0, () => {
 				if (this.isInFlyout) return;
 				this.addEntry_(input);
@@ -7934,6 +7938,7 @@ const JSON_ARRAY_V1 = {
 			input.fieldRow[1].setValue(i + 1);
 		}
 		const input = this.appendValueInput("ENTRY" + idx);
+		input.setShadowDom(shadowOfJsonNullV1());
 		input.appendField(new FieldImage(plusImage, 20, 20, void 0, () => {
 			if (this.isInFlyout) return;
 			this.addEntry_(input);
@@ -7968,7 +7973,7 @@ Blocks.json_array_v1 = JSON_ARRAY_V1;
 const JSON_BOOLEAN_V1 = { init: function() {
 	this.appendDummyInput().appendField(new FieldDropdown([["false", "false"], ["true", "true"]]), "VALUE");
 	this.setOutput(true, "JsonBoolean");
-	this.setColour(210);
+	this.setStyle("logic_blocks");
 } };
 Blocks.json_boolean_v1 = JSON_BOOLEAN_V1;
 
@@ -7986,7 +7991,7 @@ const JSON_MAP_V1 = {
 		this.appendDummyInput("CLOSE_BRACHET").appendField(" } ");
 		this.setInputsInline(false);
 		this.setOutput(true, "JsonMap");
-		this.setColour(120);
+		this.setStyle("object_blocks");
 		this.setTooltip("");
 		this.setHelpUrl("");
 	},
@@ -8017,6 +8022,7 @@ const JSON_MAP_V1 = {
 			const key = keys[i];
 			const name = "ENTRY" + i;
 			const input = this.appendValueInput(name);
+			input.setShadowDom(shadowOfJsonNullV1());
 			input.appendField(new FieldImage(plusImage, 20, 20, void 0, () => {
 				if (this.isInFlyout) return;
 				this.addEntry_(input);
@@ -8037,6 +8043,7 @@ const JSON_MAP_V1 = {
 			this.getInput("ENTRY" + i).name = "ENTRY" + (i + 1);
 		}
 		const input = this.appendValueInput("ENTRY" + idx);
+		input.setShadowDom(shadowOfJsonNullV1());
 		input.appendField(new FieldImage(plusImage, 20, 20, void 0, () => {
 			if (this.isInFlyout) return;
 			this.addEntry_(input);
@@ -8065,12 +8072,20 @@ const JSON_MAP_V1 = {
 };
 Blocks.json_map_v1 = JSON_MAP_V1;
 
+//#endregion
+//#region src/core/blocks/json/jsonNull/v1/index.ts
+const JSON_NULL_V1 = { init: function() {
+	this.appendDummyInput().appendField("null");
+	this.setOutput(true, "JsonNull");
+} };
+Blocks.json_null_v1 = JSON_NULL_V1;
+
 //#endregion
 //#region src/core/blocks/json/jsonNumber/v1/index.ts
 const JSON_NUMBER_V1 = { init: function() {
 	this.appendDummyInput().appendField(new FieldNumber(0), "VALUE");
 	this.setOutput(true, "JsonNumber");
-	this.setColour(230);
+	this.setStyle("math_blocks");
 } };
 Blocks.json_number_v1 = JSON_NUMBER_V1;
 
@@ -8078,9 +8093,13 @@ Blocks.json_number_v1 = JSON_NUMBER_V1;
 //#region src/core/blocks/json/jsonRoot/v1/index.ts
 const JSON_ROOT_V1 = { init: function() {
 	this.appendDummyInput().setAlign(inputs.Align.CENTRE).appendField("JSON");
-	this.appendValueInput("JSON").setCheck(["JsonMap", "JsonArray"]);
+	this.appendValueInput("JSON").setCheck([
+		"JsonMap",
+		"JsonArray",
+		"JsonNull"
+	]).setShadowDom(shadowOfJsonNullV1());
 	this.setDeletable(false);
-	this.setColour(250);
+	this.setStyle("variable_blocks");
 	this.setTooltip("");
 	this.setHelpUrl("");
 } };
@@ -8091,7 +8110,7 @@ Blocks.json_root_v1 = JSON_ROOT_V1;
 const JSON_STRING_V1 = { init: function() {
 	this.appendDummyInput().appendField("\"").appendField(new FieldTextInput(""), "VALUE").appendField("\"");
 	this.setOutput(true, "JsonString");
-	this.setColour(160);
+	this.setStyle("text_blocks");
 } };
 Blocks.json_string_v1 = JSON_STRING_V1;
 
@@ -11924,11 +11943,23 @@ var clean_default = index_vue_vue_type_script_setup_true_lang_default$7;
 
 //#endregion
 //#region src/components/blockly/jsonHelper.ts
+function getMeta(root, keys) {
+	let target = root;
+	for (const key of [...keys, "__meta__"]) {
+		if (!target || !target[key]) return;
+		target = target[key];
+	}
+	return target;
+}
+function applyMeta(block, meta) {
+	if (!meta) return;
+	if (meta["comment"]) block.setCommentText(meta["comment"]);
+	if (meta["inline"]) block.setInputsInline(true);
+	if (meta["collapsed"]) block.setCollapsed(true);
+	if (meta["disabled"]) block.setDisabledReason(true, constants.MANUALLY_DISABLED);
+}
 function loadFromJson(json, workspace) {
-	const root = workspace.newBlock("json_root_v1");
-	root.initSvg();
-	root.render();
-	const execNode = (node, parent) => {
+	const execNode = (node, keys, parent) => {
 		if (node === null) return;
 		let type;
 		if (node instanceof Array) type = "json_array_v1";
@@ -11944,47 +11975,91 @@ function loadFromJson(json, workspace) {
 		target.initSvg();
 		target.render();
 		parent.connect(target.outputConnection);
+		const m = getMeta(meta, keys);
+		if (m) applyMeta(target, m);
 		if (type === "json_map_v1") {
-			const keys = [];
-			for (const key in node) keys.push(key);
-			target.initData(keys);
-			for (let i = 0; i < keys.length; i++) {
-				const key = keys[i];
+			const fieldKeys = Object.keys(node);
+			target.initData(fieldKeys);
+			for (let i = 0; i < fieldKeys.length; i++) {
+				const fieldKey = fieldKeys[i];
 				const input = target.getInput("ENTRY" + i);
-				execNode(node[key], input.connection);
+				execNode(node[fieldKey], [...keys, fieldKey], input.connection);
 			}
 		} else if (type === "json_array_v1") {
 			target.initData(node.length);
-			for (let i = 0; i < node.length; i++) execNode(node[i], target.getInput("ENTRY" + i).connection);
+			for (let i = 0; i < node.length; i++) execNode(node[i], [...keys, i], target.getInput("ENTRY" + i).connection);
 		} else if (type === "json_string_v1") target.setFieldValue(node, "VALUE");
 		else if (type === "json_number_v1") target.setFieldValue(node, "VALUE");
 		else if (type === "json_boolean_v1") target.setFieldValue(node ? "true" : "false", "VALUE");
 	};
-	execNode(json, root.getInput("JSON").connection);
+	let data;
+	let meta;
+	if (json.__data__ || json.__meta__) {
+		data = json.__data__;
+		meta = json.__meta__;
+	} else data = json;
+	const root = workspace.newBlock("json_root_v1");
+	root.initSvg();
+	root.render();
+	const m = getMeta(meta, []);
+	if (m) applyMeta(root, m);
+	execNode(data, ["data"], root.getInput("JSON").connection);
 	Events.fire(new (Events.get(Events.FINISHED_LOADING))(workspace));
 }
+function toMeta(block) {
+	const meta = {};
+	const comment = block.getCommentText();
+	if (comment) meta["comment"] = comment;
+	if (block.getInputsInline()) meta["inline"] = true;
+	if (block.isCollapsed()) meta["collapsed"] = true;
+	if (!block.isEnabled()) meta["disabled"] = true;
+	block.isEnabled();
+	if (Object.keys(meta).length > 0) return meta;
+	else return null;
+}
+function mergeMeta(root, keys, meta) {
+	let target = root;
+	for (const key of [...keys, "__meta__"]) {
+		if (!target[key]) target[key] = {};
+		target = target[key];
+	}
+	if (meta["comment"]) target["comment"] = meta["comment"];
+	if (meta["inline"]) target["inline"] = true;
+	if (meta["collapsed"]) target["collapsed"] = true;
+	if (meta["disabled"]) target["disabled"] = true;
+}
 function saveToJson(workspace) {
-	const execNode = (block) => {
+	const meta = {};
+	const execNode = (block, keys) => {
 		if (!block) return null;
-		if (block.type === "json_root_v1") return execNode(block.getInputTargetBlock("JSON"));
+		const m = toMeta(block);
+		if (m) mergeMeta(meta, keys, m);
+		if (block.type === "json_root_v1") return execNode(block.getInputTargetBlock("JSON"), ["data"]);
 		else if (block.type === "json_map_v1") {
 			const values = {};
 			for (let i = 0; i < block.length; i++) {
 				const key = block.getFieldValue("KEY" + i);
-				values[key] = execNode(block.getInputTargetBlock("ENTRY" + i));
+				values[key] = execNode(block.getInputTargetBlock("ENTRY" + i), [...keys, key]);
 			}
 			return values;
 		} else if (block.type === "json_array_v1") {
 			const values = [];
-			for (let i = 0; i < block.length; i++) values.push(execNode(block.getInputTargetBlock("ENTRY" + i)));
+			for (let i = 0; i < block.length; i++) values.push(execNode(block.getInputTargetBlock("ENTRY" + i), [...keys, i]));
 			return values;
 		} else if (block.type === "json_string_v1") return block.getFieldValue("VALUE");
 		else if (block.type === "json_number_v1") return block.getFieldValue("VALUE");
 		else if (block.type === "json_boolean_v1") return block.getFieldValue("VALUE") === "true";
-		else console.assert(false);
+		else return null;
 	};
 	const blocks = workspace.getTopBlocks();
-	for (const block of blocks) if (block.type === "json_root_v1") return execNode(block);
+	for (const block of blocks) if (block.type === "json_root_v1") {
+		const data = execNode(block, []);
+		if (Object.keys(meta).length > 0) return {
+			__data__: data,
+			__meta__: meta
+		};
+		else return data;
+	}
 }
 
 //#endregion
@@ -12291,24 +12366,23 @@ var index_vue_vue_type_script_setup_true_lang_default$4 = /*@__PURE__*/ defineCo
 	setup(__props, { expose: __expose }) {
 		const open = useModel(__props, "modelValue");
 		const context = injectContext();
-		const update = () => {
+		function update() {
 			if (!context.workspace) {
 				console.assert(false);
 				return;
 			}
-		};
+		}
 		__expose({ update });
-		const onItemClick = (id) => {
-			const workspace = getMainWorkspace();
-			if (!workspace) {
+		function onItemClick(id) {
+			if (!context.workspace) {
 				console.assert(false);
 				return;
 			}
-			const block = workspace.getBlockById(id);
+			const block = context.workspace.getBlockById(id);
 			common.setSelected(block);
 			jumpTopBlock(id);
 			open.value = false;
-		};
+		}
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", { onClick: _cache[0] || (_cache[0] = ($event) => onItemClick("")) }, "blockTree");
 		};
@@ -13533,7 +13607,7 @@ const jsonToolboxV1 = {
 	contents: [{
 		kind: "category",
 		name: "%{BKY_CATEGORY_TYPE}",
-		colour: "330",
+		categorystyle: "misc_category",
 		contents: [
 			{
 				kind: "block",
@@ -13905,7 +13979,7 @@ var index_vue_vue_type_script_setup_true_lang_default$2 = /*@__PURE__*/ defineCo
 			serialization.blocks.append(state, context.workspace);
 		}
 		function generateCode() {
-			if (__props.type === "json") console.assert(false);
+			if (__props.type === "json") throw new Error(`no code in json`);
 			else return javascriptGenerator.workspaceToCode(context.workspace);
 		}
 		function generateReactivity() {

package/dist/{vendor.eb5jfwqa.js → vendor.lqnzhjrj.js}

@@ -36959,4 +36959,4 @@ function javascript(hljs) {
 }
 
 //#endregion
-export { Names as A, defineBlocksWithJsonArray as B, FieldCheckbox as C, FieldNumber as D, FieldLabel as E, Themes as F, inject$1 as G, getMainWorkspace as H, Variables as I, serialization as J, inputs as K, WorkspaceSvg as L, ShortcutItems as M, ShortcutRegistry as N, FieldTextInput as O, Theme as P, Xml as R, Extensions as S, FieldImage as T, getSelected as U, dialog as V, icons as W, svgResize as X, setLocale as Y, utils as Z, javascriptGenerator as _, lo as a, ContextMenuRegistry as b, encodeString as c, snakeCase as d, parseInt$1 as f, Order as g, cloneDeep as h, require_dist as i, Procedures as j, Msg as k, require_dist$2 as l, debounce as m, o as n, useResizeObserver as o, isEqual as p, registry as q, core_default as r, require_dist$1 as s, javascript as t, upperCase as u, Blocks as v, FieldDropdown as w, Events as x, ContextMenu as y, common as z };
+export { Names as A, constants as B, FieldCheckbox as C, FieldNumber as D, FieldLabel as E, Themes as F, icons as G, dialog as H, Variables as I, registry as J, inject$1 as K, WorkspaceSvg as L, ShortcutItems as M, ShortcutRegistry as N, FieldTextInput as O, Theme as P, utils as Q, Xml as R, Extensions as S, FieldImage as T, getMainWorkspace as U, defineBlocksWithJsonArray as V, getSelected as W, setLocale as X, serialization as Y, svgResize as Z, javascriptGenerator as _, lo as a, ContextMenuRegistry as b, encodeString as c, snakeCase as d, parseInt$1 as f, Order as g, cloneDeep as h, require_dist as i, Procedures as j, Msg as k, require_dist$2 as l, debounce as m, o as n, useResizeObserver as o, isEqual as p, inputs as q, core_default as r, require_dist$1 as s, javascript as t, upperCase as u, Blocks as v, FieldDropdown as w, Events as x, ContextMenu as y, common as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x-block-lib",
-  "version": "0.11.10",
+  "version": "0.11.11",
   "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.4",
+    "x-runtime-lib": "^0.10.5",
     "x-state-lib": "^0.4.5"
   }
 }