blockly-fluid 1.2.18 → 1.3.1

package/index.js

@@ -1,3 +1,5 @@
+const escapeXml = require("./utils/escapeXml.js");
+
 module.exports = (Blockly, { generator: languageGeneratorFallback, generators: languageGenerators = {}, translate = (text) => text } = {}) => {
   const Blocks = new Proxy({}, {
     set(_, name, configuration = {}) {
@@ -59,10 +61,10 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
                   if (typeof input.default === "function") (input.default = input.default());
                   if (typeof input.options === "function") (input.options = input.options());
 
-                  const dropdownId = encodeURIComponent(JSON.stringify([color, input.default, ...((Array.isArray(input.options)) ? input.options.map((option) => [option, option]) : Object.entries(input.options)).map(([name, text]) => [translate((typeof text === "function") ? text() : text), (typeof name === "function") ? name() : name])]));
+                  const shadowDropdownName = `shadow_dropdown_${name.length}_${name}_${token.length}_${token}`;
 
-                  if (!Blocks[`shadow_dropdown_${dropdownId}`]) {
-                    Blocks[`shadow_dropdown_${dropdownId}`] = {
+                  if (!Blocks[shadowDropdownName]) {
+                    Blocks[shadowDropdownName] = {
                       layout: "DROPDOWN",
                       fields: {
                         DROPDOWN: {
@@ -81,14 +83,16 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
                     };
                   };
 
-                  valueInput.connection.setShadowDom(new DOMParser().parseFromString(`<shadow type="shadow_dropdown_${dropdownId}"></shadow>`, "text/xml").firstChild);
+                  valueInput.connection.setShadowDom(new DOMParser().parseFromString(`<shadow type="${escapeXml(shadowDropdownName)}}"></shadow>`, "text/xml").firstChild);
                 };
 
                 if (input.variable) {
                   if (typeof input.variable === "function") (input.variable = input.variable());
 
-                  if (!Blocks[`shadow_variable_${encodeURIComponent(color)}`]) {
-                    Blocks[`shadow_variable_${encodeURIComponent(color)}`] = {
+                  const shadowVariableName = `shadow_variable_${name.length}_${name}_${token.length}_${token}`;
+
+                  if (!Blocks[shadowVariableName]) {
+                    Blocks[shadowVariableName] = {
                       layout: "VARIABLE",
                       fields: {
                         VARIABLE: {
@@ -105,13 +109,13 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
                     };
                   };
 
-                  valueInput.connection.setShadowDom(new DOMParser().parseFromString(`<shadow type="shadow_variable_${encodeURIComponent(color)}"><field name="VARIABLE">${input.variable}</field></shadow>`, "text/xml").firstChild);
+                  valueInput.connection.setShadowDom(new DOMParser().parseFromString(`<shadow type="${escapeXml(shadowVariableName)}"><field name="VARIABLE">${input.variable}</field></shadow>`, "text/xml").firstChild);
                 };
 
                 if (input.shadow) {
                   if (typeof input.shadow === "function") (input.shadow = input.shadow());
 
-                  valueInput.connection.setShadowDom(new DOMParser().parseFromString(`<shadow type="shadow_${((typeof input.shadow.type === "function") ? input.shadow.type() : (input.shadow.type || "text")).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;")}">${(typeof input.shadow.content === "function") ? input.shadow.content() : (input.shadow.content || "")}</shadow>`, "text/xml").firstChild);
+                  valueInput.connection.setShadowDom(new DOMParser().parseFromString(`<shadow type="shadow_${escapeXml((typeof input.shadow.type === "function") ? input.shadow.type() : (input.shadow.type || "text"))}">${(typeof input.shadow.content === "function") ? input.shadow.content() : (input.shadow.content || "")}</shadow>`, "text/xml").firstChild);
                 };
               } else if (field) {
                 const dummy = this.appendDummyInput();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockly-fluid",
-  "version": "1.2.18",
+  "version": "1.3.1",
   "description": "A flexible proxy wrapper for Blockly blocks.",
   "main": "index.js",
   "scripts": {

package/utils/escapeXml.js

@@ -0,0 +1,8 @@
+module.exports = (string) => {
+  return string
+    .replace(/&/g, "&")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&apos;");
+};