Fix js_str interpolation broken by changing JSON.lower(::JSString) and cleanup some other ugliness.

Author: twavv

src/node.jl

@@ -93,26 +93,21 @@ function JSON.lower(n::Node)
         "type" => "node",
         "nodeType" => nodetype(n),
         "instanceArgs" => JSON.lower(n.instanceof),
-        "children" => map!(renderPreferScopeJSON,
+        "children" => map!(render_internal,
                            Vector{Any}(undef, length(children(n))),
                            children(n)),
         "props" => props(n),
     )
     return result
 end
 
-## TODO -- optimize
-function escapeHTML(i::String)
-    # Refer to http://stackoverflow.com/a/7382028/3822752 for spec. links
-    o = replace(i, "&" => "&")
-    o = replace(o, "\"" => """)
-    o = replace(o, "'" => "'")
-    o = replace(o, "<" => "&lt;")
-    o = replace(o, ">" => "&gt;")
-    return o
-end
-
-function escapeJSONForScriptTag(s::String)
+"""
+Escape characters for a "safe" representation of JSON.
+In particular, we escape '/' characters to avoid the presence of "</" (and
+especially "</script>") which cause the browser to break out of the current
+<script /> tag.
+"""
+function escape_json(s::String)
     # Replace all "/" with "\/"'s.
     # This prevents the browser from interpreting "</" as a close tag; since
     # everything within the string is JSON, any appearances of "/" should be
@@ -121,24 +116,17 @@ function escapeJSONForScriptTag(s::String)
     return replace(s, "/" => "\\/")
 end
 
+escape_json(x::Any) = escape_json(JSON.json(x))
+
 function Base.show(io::IO, m::MIME"text/html", x::Node)
-    # write(io, "<div class='display:none'></div>" *
-    #       """<unsafe-script style='display:none'>
-    #       WebIO.mount(this.previousSibling,""")
-    # # NOTE: do NOT add space between </div> and <unsafe-script>
-    # write(io, sprint(s->jsexpr(s, x)))
-    # write(io, ")</unsafe-script>")
-    println("=== Base.show(::IO, text/html, ::Node)")
-    println("=== Base.show: Node: $x")
     jsrepr = jsexpr(x)
-    println("===jsexpr(Node): $jsrepr")
     write(
         io,
         """
         <div class=\"webio-connected\"><script defer>
             WebIO.mount(
                 document.currentScript.parentElement,
-                $(escapeJSONForScriptTag(JSON.json(x))),
+                $(escape_json(x)),
             )
         </script></div>
         """

src/render.jl

@@ -77,20 +77,17 @@ end
 htmlstring(val::AbstractString) = val
 
 # TODO: this is awkward
-function renderPreferScopeJSON(child)
-    println("renderPreferScopeJSON(::Any/$(typeof(child)))")
+function render_internal(child)
     render(child)
 end
-function renderPreferScopeJSON(child::Observable)
-    warn("renderPreferScopeJSON(::$(typeof(child)))")
+function render_internal(child::Observable)
     # show(STDOUT, "text/plain", stacktrace())
-    renderPreferScopeJSON(observable_to_scope(child))
+    render_internal(observable_to_scope(child))
 end
-function renderPreferScopeJSON(child::Node)
-    println("renderPreferScopeJSON(::$(typeof(child)))")
+function render_internal(child::Node)
     return JSON.lower(child)
 end
-renderPreferScopeJSON(child::Scope) = renderPreferScopeJSON(node(child, child.dom))
+render_internal(child::Scope) = render_internal(node(child, child.dom))
 
 function observable_to_scope(obs::Observable)
 

src/syntax.jl

@@ -75,9 +75,18 @@ function str_interpolate(s, i0 = firstindex(s))
     strs
 end
 
+"""
+Generate a js_str representation for an object.
+"""
+function js_str_repr end
+js_str_repr(io, x::Any) = jsexpr(io, x)
+js_str_repr(io, x::String) = print(io, x)
+js_str_repr(io, x::JSString) = print(io, x.s)
+
 macro js_str(s)
-    writes = [x isa String ? :(print(io, $(esc(x)))) : :(jsexpr(io, $(esc(x))))
-              for x in str_interpolate(s)]
+    writes = [:(js_str_repr(io, $(esc(x)))) for x in str_interpolate(s)]
+    # writes = [x isa String ? :(print(io, $(esc(x)))) : :(jsexpr(io, $(esc(x))))
+    #           for x in str_interpolate(s)]
 
     :(JSString(sprint() do io
                    $(writes...)