Fixes.

Author: gdotdesign

spec/compilers2/defer_2

@@ -0,0 +1,53 @@
+module Data {
+  const ITEMS = defer [ defer ITEM_1 ]
+  const ITEM_1 = "Hello"
+}
+
+component Main {
+  fun componentDidMount : Promise(String) {
+    let [item] = await Data.ITEMS or return ""
+    await item
+  }
+
+  fun render : Html {
+    <div>""</div>
+  }
+}
+--------------------------------------------------------------------------------
+---=== /index.js ===---
+import {
+  patternVariable as E,
+  createElement as F,
+  destructure as C,
+  useEffect as B,
+  load as D
+} from "runtime";
+
+export const
+  a = `/__mint__/d5f8d9aa357303a4ba78b554c55d598bd238f679b.js`,
+  A = () => {
+    B(() => {
+      (async () => {
+        const b = C(await D(a), [E]);
+        if (b === false) {
+          return ``
+        };
+        const [c] = b;
+        return await D(c)
+      })()
+    }, []);
+    return F(`div`, {}, [``])
+  };
+
+---=== /__mint__/d96571c631d11ed793b887a131e80107a65e05223.js ===---
+export const
+  a = `Hello`,
+  b = a;
+
+export default b;
+
+---=== /__mint__/d5f8d9aa357303a4ba78b554c55d598bd238f679b.js ===---
+export const a = [`/__mint__/d96571c631d11ed793b887a131e80107a65e05223.js`];
+
+export default a;
+

spec/compilers2/here_doc_markdown_escape

@@ -1,7 +1,10 @@
 component Main {
   fun render : Html {
     <<#MARKDOWN(highlight)
+    \#{name}
     ```mint
+    `Something`
+    "\#{name}"
     "First line" \
     "Second line" \
     "Third line"
@@ -16,35 +19,59 @@ import {
 } from "runtime";
 
 export const A = () => {
-  return B(C, {}, [B('pre', {}, [B('code', {
-    class: "language-mint"
-  }, [
-    B('span', {
-      className: "line"
+  return B(C, {}, [
+    B('p', {}, [`#{name}`]),
+    B('pre', {}, [B('code', {
+      class: "language-mint"
     }, [
       B('span', {
-        className: "string"
-      }, [`"First line" \\`]),
-      `
+        className: "line"
+      }, [`\`Something\`
+`]),
+      B('span', {
+        className: "line"
+      }, [
+        ``,
+        B('span', {
+          className: "string"
+        }, [`"#{`]),
+        B('span', {
+          className: "variable"
+        }, [`name`]),
+        B('span', {
+          className: "string"
+        }, [`}"`]),
+        `
 `
-    ]),
-    B('span', {
-      className: "line"
-    }, [
-      ``,
+      ]),
       B('span', {
-        className: "string"
-      }, [`"Second line" \\`]),
-      `
+        className: "line"
+      }, [
+        ``,
+        B('span', {
+          className: "string"
+        }, [`"First line" \`]),
+        `
 `
-    ]),
-    B('span', {
-      className: "line"
-    }, [
-      ``,
+      ]),
+      B('span', {
+        className: "line"
+      }, [
+        ``,
+        B('span', {
+          className: "string"
+        }, [`"Second line" \`]),
+        `
+`
+      ]),
       B('span', {
-        className: "string"
-      }, [`"Third line"`])
-    ])
-  ])])])
+        className: "line"
+      }, [
+        ``,
+        B('span', {
+          className: "string"
+        }, [`"Third line"`])
+      ])
+    ])])
+  ])
 };

spec/compilers2/store_with_get

@@ -11,6 +11,7 @@ component Main {
 
   fun render : String {
     xxx
+    Test.hello
   }
 }
 --------------------------------------------------------------------------------
@@ -22,6 +23,7 @@ export const
     return `hello`
   },
   B = () => {
-    return a.value
+    a.value;
+    return b()
   };
 

spec/compilers2/string_literal_escaped

@@ -5,5 +5,5 @@ component Main {
 }
 --------------------------------------------------------------------------------
 export const A = () => {
-  return `Hello There \"Joe\"`
+  return `Hello There "Joe"`
 };

spec/compilers2/string_literal_with_escaped_interpolation

@@ -0,0 +1,9 @@
+component Main {
+  fun render : String {
+    "Hello There \#{name}"
+  }
+}
+--------------------------------------------------------------------------------
+export const A = () => {
+  return `Hello There #{name}`
+};

src/compiler2/js.cr

@@ -26,7 +26,7 @@ module Mint
       end
 
       def string(value : String) : Compiled
-        ["`", Raw.new(value), "`"] of Item
+        ["`", Raw.new(value.gsub('`', "\\`").gsub("${", "\\${`")), "`"] of Item
       end
 
       # Renders an object destructuring.

src/compiler2/program.cr

@@ -13,6 +13,33 @@ module Mint
       end
     end
 
+    def self.dbg_name(node)
+      case x = node
+      when Ast::Component
+        "<#{x.name.value}>"
+      when Ast::Module, Ast::Store, Ast::Provider
+        x.name.value
+      when Ast::Function, Ast::Constant, Ast::Get, Ast::State
+        "#{dbg_name(x.parent)}.#{x.name.value}"
+      when Ast::Block
+        "{block}"
+      when Ast::Access
+        "{access .#{x.field.value}}"
+      when Ast::Statement
+        name =
+          case target = x.target
+          when Ast::Variable
+            " #{target.value}"
+          end
+
+        "{statement#{name}}"
+      when Ast::Route
+        "{route #{x.url}}"
+      else
+        x.class.name
+      end
+    end
+
     def self.program(
       artifacts : TypeChecker::Artifacts,
       config : Config
@@ -105,6 +132,25 @@ module Mint
           end
       end
 
+      # bundles.each do |node, items|
+      #   entities =
+      #     items.compact_map do |item|
+      #       if item[0] == node
+      #         next if node.is_a?(Ast::Defer)
+      #       else
+      #         next if item[0].is_a?(Ast::Component) &&
+      #                 item[0].as(Ast::Component).async?
+      #       end
+
+      #       dbg_name(item[0])
+      #     end
+
+      #   puts bundle_name(node)
+      #   entities.sort.each do |item|
+      #     puts " > #{item}"
+      #   end
+      # end
+
       # Add not already added items to the main bundle.
       bundles[nil].concat(compiler.compiled)
 

src/compiler2/utils.cr

@@ -59,14 +59,14 @@ module Mint
               parts.map do |item|
                 case item
                 in String
-                  ["`", Raw.new(item.escape_for_javascript), "`"] of Item
+                  js.string(item)
                 in Tuple(SemanticTokenizer::TokenType, String)
                   js.call(Builtin::CreateElement, [
                     [%("span")] of Item,
                     js.object({"className".as(Item) => [
                       %("#{item[0].to_s.underscore}"),
                     ] of Item}),
-                    js.array([["`", Raw.new(item[1].escape_for_javascript), "`"] of Item]),
+                    js.array([js.string(item[1])]),
                   ])
                 end
               end

src/compilers2/directives/format.cr

@@ -9,8 +9,6 @@ module Mint
           Formatter.new
             .format(node.content, Formatter::BlockFormat::Naked)
             .gsub('\\', "\\\\")
-            .gsub('`', "\\`")
-            .gsub("${", "\\${")
 
         js.array([content, js.string(formatted)])
       end

src/compilers2/env.cr

@@ -3,7 +3,7 @@ module Mint
     def compile(node : Ast::Env) : Compiled
       compile node do
         value =
-          MINT_ENV[node.name].to_s.gsub('`', "\\`")
+          MINT_ENV[node.name].to_s
 
         js.string(value)
       end