in work

Author: waralex

Project.toml

@@ -13,6 +13,7 @@ DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 JSON2 = "2535ab7d-5cd8-5a07-80ac-9b1792aadce3"
+JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
 MD5 = "6ac74813-4b46-53a4-afec-0b5dc9d7885c"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
@@ -33,8 +34,8 @@ JSON = "0.21"
 JSON2 = "0.3"
 MD5 = "0.2"
 PlotlyBase = "0.8.5, 0.8.6"
-julia = "1.3"
 YAML = "0.4.7"
+julia = "1.3"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

src/Dash.jl

@@ -1,6 +1,6 @@
 module Dash
 using DashBase
-import HTTP, JSON2, CodecZlib, MD5
+import HTTP, JSON2, JSON3, CodecZlib, MD5
 using Sockets
 using Pkg.Artifacts
 const ROOT_PATH = realpath(joinpath(@__DIR__, ".."))
@@ -107,6 +107,7 @@ function __init__()
 end
 
 
-
+JSON3.StructTypes.StructType(::Type{DashBase.Component}) = JSON3.StructTypes.Struct()
+JSON3.StructTypes.excludes(::Type{DashBase.Component}) = (:name, :available_props, :wildcard_regex)
 
 end # module

src/app/supporttypes.jl

@@ -2,7 +2,9 @@ struct Wildcard
     type ::Symbol
 end
 
-JSON2.write(io::IO, wild::Wildcard; kwargs...) = Base.write(io, "[\"", wild.type, "\"]")
+JSON3.StructTypes.StructType(::Type{Wildcard}) = JSON3.RawType()
+
+JSON3.rawbytes(wild::Wildcard) = string("[\"", wild.type, "\"]")
 
 const MATCH = Wildcard(:MATCH)
 const ALL = Wildcard(:ALL)
@@ -30,6 +32,8 @@ const Input = Dependency{TraitInput}
 const State = Dependency{TraitState}
 const Output = Dependency{TraitOutput}
 
+JSON3.StructTypes.StructType(::Type{<:Dependency}) = JSON3.StructTypes.Struct()
+
 """
     Base.==(a::Dependency, b::Dependency)
 
@@ -97,6 +101,9 @@ struct ClientsideFunction
     namespace ::String
     function_name ::String
 end
+
+JSON3.StructTypes.StructType(::Type{ClientsideFunction}) = JSON3.StructTypes.Struct()
+
 struct Callback
     func ::Union{Function, ClientsideFunction}
     dependencies ::CallbackDeps

src/handler/callback_context.jl

@@ -19,30 +19,30 @@ end
 
 const _callback_context_storage = TaskContextStorage()
 
-function with_callback_context(f, context::CallbackContext) 
+function with_callback_context(f, context::CallbackContext)
     return with_context(f, _callback_context_storage, context)
-end 
+end
 
 """
     callback_context()::CallbackContext
 
     Get context of current callback, available only inside callback processing function
 """
-function callback_context() 
+function callback_context()
     !has_context(_callback_context_storage) && error("callback_context() is only available from a callback processing function")
     return get_context(_callback_context_storage)
 end
 
-function inputs_list_to_dict(list::Vector{Any})
+function inputs_list_to_dict(list::AbstractVector)
     result = Dict{String, Any}()
     _item_to_dict!.(Ref(result), list)
     return result
 end
 
-dep_id_string(id::NamedTuple) = sorted_json(id)
+dep_id_string(id::AbstractDict) = sorted_json(id)
 dep_id_string(id::AbstractString) = String(id)
 function _item_to_dict!(target::Dict{String, Any}, item)
     target["$(dep_id_string(item.id)).$(item.property)"] = get(item, :value, nothing)
 end
 
-_item_to_dict!(target::Dict{String, Any}, item::Vector) =  _item_to_dict!.(Ref(target), item)
+_item_to_dict!(target::Dict{String, Any}, item::AbstractVector) =  _item_to_dict!.(Ref(target), item)

src/handler/index_page.jl

@@ -1,10 +1,10 @@
-function resource_url(app::DashApp, resource::AppRelativeResource) 
+function resource_url(app::DashApp, resource::AppRelativeResource)
     prefix = get_setting(app, :requests_pathname_prefix)
     return string(prefix,
          "_dash-component-suites/",
          resource.namespace,
          "/",
-         build_fingerprint(resource.relative_path, resource.version, resource.ts) 
+         build_fingerprint(resource.relative_path, resource.version, resource.ts)
      )
 end
 
@@ -19,7 +19,7 @@ function asset_path(app::DashApp, path::AbstractString)
 end
 
 resource_url(app::DashApp, resource::AppExternalResource) = resource.url
-function resource_url(app::DashApp, resource::AppAssetResource) 
+function resource_url(app::DashApp, resource::AppAssetResource)
     return string(
         asset_path(app, resource.path),
         "?m=", resource.ts
@@ -42,7 +42,7 @@ function metas_html(app::DashApp)
         get(tag, "http-equiv", "") == "X-UA-Compatible"
     end
     has_charset = any(tag -> haskey(tag, "charset"), meta_tags)
-    
+
     result = String[]
     !has_ie_compat && push!(result, "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">")
     !has_charset && push!(result, "<meta charset=\"UTF-8\">")
@@ -52,7 +52,7 @@ function metas_html(app::DashApp)
 
 end
 
-function css_html(app::DashApp, resources::ApplicationResources) 
+function css_html(app::DashApp, resources::ApplicationResources)
      join(
          make_css_tag.(Ref(app), resources.css), "\n       "
          )
@@ -77,7 +77,7 @@ app_entry_html() = """
 </div>
 """
 
-function config_html(app::DashApp) 
+function config_html(app::DashApp)
     config = Dict{Symbol, Any}(
         :url_base_pathname => get_setting(app, :url_base_pathname),
         :requests_pathname_prefix => get_setting(app, :requests_pathname_prefix),
@@ -93,17 +93,17 @@ function config_html(app::DashApp)
             max_retry = get_devsetting(app, :hot_reload_max_retry)
         )
     end
-    return """<script id="_dash-config" type="application/json">$(JSON2.write(config))</script>"""
-end 
+    return """<script id="_dash-config" type="application/json">$(JSON3.write(config))</script>"""
+end
 
 
 renderer_html() = """<script id="_dash-renderer" type="application/javascript">var renderer = new DashRenderer();</script>"""
 
-favicon_html(app::DashApp) = "" 
+favicon_html(app::DashApp) = ""
+
 
+function index_page(app::DashApp, resources::ApplicationResources)
 
-function index_page(app::DashApp, resources::ApplicationResources)    
-    
     result = interpolate_string(app.index_string,
         metas = metas_html(app),
         title = app.title,
@@ -121,7 +121,7 @@ function index_page(app::DashApp, resources::ApplicationResources)
             "#_dash_config" => r"id=\"_dash-config\"",
             "dash-renderer" => r"src=\"[^\"]*dash[-_]renderer[^\"]*\"",
             "new DashRenderer" => r"id=\"_dash-renderer",
-        ] 
+        ]
     )
     return result
 end

src/handler/processors/callback.jl

@@ -9,14 +9,14 @@ function split_callback_id(callback_id::AbstractString)
 end
 
 input_to_arg(input) = get(input, :value, nothing)
-input_to_arg(input::Vector) = input_to_arg.(input)
+input_to_arg(input::AbstractVector) = input_to_arg.(input)
 
 make_args(inputs, state) = vcat(input_to_arg(inputs), input_to_arg(state))
 
 res_to_vector(res) = res
 res_to_vector(res::Vector) = res
 
-function _push_to_res!(res, value, out::Vector)
+function _push_to_res!(res, value, out::AbstractVector)
     _push_to_res!.(Ref(res), value, out)
 end
 function _push_to_res!(res, value, out)
@@ -44,20 +44,21 @@ function process_callback_call(app, callback_id, outputs, inputs, state)
 
     _push_to_res!(response, res_vector, outputs)
 
+
     if length(response) == 0
         throw(PreventUpdate())
     end
     return Dict(:response=>response, :multi=>true)
 end
 
-outputs_to_vector(out::Vector) = out
+outputs_to_vector(out::AbstractVector) = out
 outputs_to_vector(out) = [out]
 
 function process_callback(request::HTTP.Request, state::HandlerState)
     app = state.app
     response = HTTP.Response(200, ["Content-Type" => "application/json"])
 
-    params = JSON2.read(String(request.body))
+    params = JSON3.read(String(request.body))
     inputs = get(params, :inputs, [])
     state = get(params, :state, [])
     output = Symbol(params[:output])
@@ -69,7 +70,7 @@ function process_callback(request::HTTP.Request, state::HandlerState)
         cb_result = with_callback_context(context) do
             process_callback_call(app, output, outputs_list, inputs, state)
         end
-        response.body = Vector{UInt8}(JSON2.write(cb_result))
+        response.body = Vector{UInt8}(JSON3.write(cb_result))
     catch e
         if isa(e,PreventUpdate)
             return HTTP.Response(204)

src/handler/processors/layout.jl

@@ -4,6 +4,6 @@ function process_layout(request::HTTP.Request, state::HandlerState)
     return HTTP.Response(
         200,
         ["Content-Type" => "application/json"],
-        body = JSON2.write(layout_data(state.app.layout))
+        body = JSON3.write(layout_data(state.app.layout))
     )
 end

src/handler/processors/reload_hash.jl

@@ -4,9 +4,9 @@ function process_reload_hash(request::HTTP.Request, state::HandlerState)
         hard = state.reload.hard,
         packages = keys(state.cache.resources.files),
         files = state.reload.changed_assets
-    ) 
+    )
     state.reload.hard = false
     state.reload.changed_assets = []
-    return HTTP.Response(200, ["Content-Type" => "application/json"], body = JSON2.write(reload_tuple))
+    return HTTP.Response(200, ["Content-Type" => "application/json"], body = JSON3.write(reload_tuple))
 
 end

src/handler/state.jl

@@ -31,7 +31,7 @@ function _dependencies_json(app::DashApp)
             prevent_initial_call = callback.prevent_initial_call
         )
     end
-    return JSON2.write(result)
+    return JSON3.write(result)
 end
 
 function _cache_tuple(app::DashApp, registry::ResourcesRegistry)

src/utils/misc.jl

@@ -10,7 +10,7 @@ function format_tag(name ::String, attributes::Dict{String, String}, inner::Stri
         tag *= "/>"
     elseif opened
         tag *= ">"
-    else 
+    else
         tag *= ">$inner</$name>"
     end
 end
@@ -32,7 +32,7 @@ function validate_index(name::AbstractString, index::AbstractString, checks::Vec
             string(
                 "Missing item", (length(missings)>1 ? "s" : ""), " ",
                 join(getindex.(missings, 1), ", "),
-                " in ", name 
+                " in ", name
             )
         )
     end
@@ -43,26 +43,26 @@ macro var_str(s)
 end
 
 function parse_props(s)
-    function make_prop(part) 
+    function make_prop(part)
         m = match(r"^(?<id>[A-Za-z]+[\w\-\:\.]*)\.(?<prop>[A-Za-z]+[\w\-\:\.]*)$", strip(part))
         if isnothing(m)
             error("expected <id>.<property>[,<id>.<property>...] in $(part)")
         end
-        
+
         return (Symbol(m[:id]), Symbol(m[:prop]))
-    end    
+    end
 
     props_parts = split(s, ",", keepempty = false)
-    
+
     return map(props_parts) do part
         return make_prop(part)
-    end    
+    end
 end
 
 function generate_hash()
-    return strip(string(UUIDs.uuid4()), '-')    
+    return strip(string(UUIDs.uuid4()), '-')
 end
 
-sort_by_keys(data::NamedTuple) =  (;sort!(collect(pairs(data)), by = (x)->x[1])...,)
+sort_by_keys(data) =  (;sort!(collect(pairs(data)), by = (x)->x[1])...,)
 
-sorted_json(data::NamedTuple) = JSON2.write(sort_by_keys(data))
+sorted_json(data) = JSON3.write(sort_by_keys(data))