blockly-fluid 1.3.9 → 1.3.11

package/index.js

@@ -1,7 +1,12 @@
+const dedent = require("./utils/dedent.js");
 const escapeXml = require("./utils/escapeXml.js");
 
 module.exports = (Blockly, { generator: languageGeneratorFallback, generators: languageGenerators = {}, translate = (text) => text } = {}) => {
   const Blocks = new Proxy({}, {
+    get(_, name) {
+      return Blockly.Blocks[name];
+    },
+
     set(_, name, configuration = {}) {
       if (typeof configuration === "function") (configuration = configuration());
 
@@ -268,7 +273,7 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
             code,
             languageGenerator.ORDER_NONE
           ];
-        })((typeof blockGenerator === "function") ? blockGenerator(...[
+        })(dedent((typeof blockGenerator === "function") ? blockGenerator(...[
           ...((values) => {
             if (!Object.keys(values).length) return [];
 
@@ -292,14 +297,10 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
               } : {}
             }), {}),
           }), languageGenerator
-        ]) : blockGenerator));
+        ]) : blockGenerator)));
       });
 
       return true;
-    },
-
-    get(_, name) {
-      return Blockly.Blocks[name];
     }
   });
 

package/package.json

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

package/utils/dedent.js

@@ -0,0 +1,15 @@
+module.exports = (strings, ...values) => {
+  let text = String.raw({ raw: strings }, ...values);
+
+  text = text.replace(/^\n/, "").replace(/\n$/, "");
+
+  const indent = text.match(/^[ \t]*(?=\S)/gm);
+
+  if (indent) {
+    const minimumIndent = Math.min(...indent.map(i => i.length));
+
+    text = text.replace(new RegExp(`^[ \\t]{${minimumIndent}}`, "gm"), "");
+  };
+
+  return text;
+};