blockly-fluid 1.3.11 → 1.3.13

package/index.js

@@ -264,16 +264,16 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
         };
 
         languageGenerator.forBlock[name] = (block) => (((code) => {
-          if (!output) return code;
+          if (!output) return dedent(code);
 
           return (Array.isArray(code)) ? [
-            (code[1]?.toLowerCase() !== "nugget") ? code[0] : `await (async () => {\n${code[0].split("\n").map((line) => "  " + line).join("\n")}\n})()`,
+            (code[1]?.toLowerCase() !== "nugget") ? dedent(code[0]) : `await (async () => {\n${dedent(code[0]).split("\n").map((line) => "  " + line).join("\n")}\n})()`,
             languageGenerator[`ORDER_${(code[1]?.toLowerCase().replaceAll("nugget", "") || "NONE").toUpperCase()}`]
           ] : [
-            code,
+            dedent(code),
             languageGenerator.ORDER_NONE
           ];
-        })(dedent((typeof blockGenerator === "function") ? blockGenerator(...[
+        })((typeof blockGenerator === "function") ? blockGenerator(...[
           ...((values) => {
             if (!Object.keys(values).length) return [];
 
@@ -297,7 +297,7 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
               } : {}
             }), {}),
           }), languageGenerator
-        ]) : blockGenerator)));
+        ]) : blockGenerator));
       });
 
       return true;

package/package.json

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

package/utils/dedent.js

@@ -1,15 +1,24 @@
-module.exports = (strings, ...values) => {
-  let text = String.raw({ raw: strings }, ...values);
+module.exports = (text) => {
+  const lines = text.split("\n");
 
-  text = text.replace(/^\n/, "").replace(/\n$/, "");
+  const firstLine = lines.find((line) => line.trim().length > 0);
 
-  const indent = text.match(/^[ \t]*(?=\S)/gm);
+  if (!firstLine) return text;
 
-  if (indent) {
-    const minimumIndent = Math.min(...indent.map(i => i.length));
+  const indentMatch = firstLine.match(/^[ \t]*/);
+  const indentSize = (indentMatch) ? indentMatch[0].length : 0;
 
-    text = text.replace(new RegExp(`^[ \\t]{${minimumIndent}}`, "gm"), "");
-  };
+  if (indentSize === 0) return text;
 
-  return text;
+  return (
+    lines
+      .map((line) => (
+        (line.startsWith(" ".repeat(indentSize)))
+          ? line.slice(indentSize)
+          : line
+      ))
+      .join("\n")
+      .replace(/^\n/, "")
+      .replace(/\n\s*$/, "")
+  );
 };