svelte-on-rails 19.2.2 → 19.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64fab65b35eaba112765f7d99ae3026a75bc25bb907618ca15b8b5f9fbf6f86e
-  data.tar.gz: 22e6c0907a069dab0f84f3a8391309bad6418cd0b996321bc1c2f9cdb9fd4ea4
+  metadata.gz: bdd155e6ec85bcd4e50bd36c110a259f3cbe4004331c947a486c976dcf36561f
+  data.tar.gz: c2a6b04173b9212f77c4262f26b27e2e0bf14b19f9ef5a109efeaf07690c23cb
 SHA512:
-  metadata.gz: c5c22b14278bebb7818730221a3508f3baaa87a411ff65dcd144bcf2472a676206ac15b245556a20fbb3e54297b22b71043552c0052dbdf345bb9583b4ac82c8
-  data.tar.gz: 306019a8aca724942b7460e4ba3d741eed67e211ee9dbb317768f06897940fc349c74bf2d764c791b16dd0eef682a59ab6afb1ce16e6ce005b2de685e7db3c29
+  metadata.gz: e78ba049e517ba2fcae3ae325a1d95a5153c1f20962d17d3a149c7b87133e2442123568ba6b985b6658116434906573133423c2c9bd0a73831092d97400be509
+  data.tar.gz: 83393c1c21f7f01aca3d1f071228171ab4b8ab289d7a68183cc5a17a765fa39295ff3629c39cd154b8c912ddc5e50cfc436dcd499abf3539f5b34c8b350bb75a

data/lib/svelte_on_rails/lib/view_helper_support.rb

@@ -4,7 +4,7 @@ module SvelteOnRails
   module Lib
     class ViewHelperSupport
 
-      UNCACHED_PROPS_PLACEHOLDER = "**UNCACHED_PROPS_PLACEHOLDER_VDKVUKCYPTHQ4R6Z4EJ**"
+      UNCACHED_PROPS_PLACEHOLDER = "**Uncached Props are available only after hydration**"
       RENDER_OPTIONS = { ssr: [true, false, :auto], hydrate: :bool, debug: :bool, cache_key: :string_array, expires_in: :integer, cached: :bool }
       attr_reader :conf
 
@@ -22,11 +22,11 @@ module SvelteOnRails
         @component_name = component
         @view_dir = view_dir
         @request = request
-        @props = if props.key?(:_uncached)
-                   props.merge(_uncached: UNCACHED_PROPS_PLACEHOLDER)
-                else
-                  props
-                end
+        @cached_props = if props.key?(:_uncached)
+                          props.merge(_uncached: UNCACHED_PROPS_PLACEHOLDER)
+                        else
+                          props
+                        end
         @html_options = html_options
 
         @ssr = resolve_ssr?(request)
@@ -157,6 +157,31 @@ module SvelteOnRails
         Rails.logger.info "  [SOR] #{component_paths[:name]}.svelte #{message} (#{ms.round(1)}ms)"
       end
 
+      def render_svelte(current_template)
+        caller_loc = Proc.new do
+          v_path = current_template.identifier
+          caller_locations.find { |loc| loc.to_s.include?(v_path) }.to_s.match(/^[\s\S]+(:[0-9]+(?=:in))/).to_s
+        end
+
+        r = if SvelteOnRails::SsrServer.instance.alive?
+              SvelteOnRails::SsrServer.instance.render(
+                component_paths,
+                cached_props,
+                debug?,
+                caller_loc
+              )
+            else
+              SvelteOnRails::Lib::FallbackRenderer.render(component_paths, cached_props, debug?)
+            end
+        if r[:success]
+          set_request_metrics(:rendered)
+        else
+          @skip_caching = true
+        end
+
+        r
+      end
+
       def render_cached(view_context, &block)
 
         # increase expired time
@@ -166,7 +191,7 @@ module SvelteOnRails
         # render
 
         res = if @cached_content
-                msg = "returned from cache#{", with uncached props" if @props.key?(:_uncached)}"
+                msg = "returned from cache#{", with uncached props" if @cached_props.key?(:_uncached)}"
                 @cached_content.html_safe
               else
                 msg = "Rendered"
@@ -208,8 +233,8 @@ module SvelteOnRails
 
       end
 
-      def props
-        @props ||= {}
+      def cached_props
+        @cached_props ||= {}
       end
 
       private
@@ -300,10 +325,9 @@ module SvelteOnRails
         @cache_key = begin
                        fingerprint = (@conf.watch_changes? ? @conf.fingerprint(component_paths[:path], debug?, component_paths[:name]) : '')
 
-                       cache_key_raw = @view_dir + @component_name +
-                                       @props.to_s + @options.to_s + @html_options.to_s +
-                                       @options[:cache_key].to_s +
-                                       fingerprint
+                       cache_key_raw = @view_dir + @component_name + @options.to_s +
+                                       @cached_props.to_s + fingerprint + @options[:cache_key].to_s +
+                                       (@cached_props.key?(:_uncached) ? "" : @html_options.to_s)
 
                        "#{@conf.redis_namespace}:#{Digest::XXH64.hexdigest(cache_key_raw)}"
                      end

data/lib/svelte_on_rails/view_helpers.rb

@@ -30,24 +30,52 @@ module SvelteOnRails
       )
 
       if support.ssr?
-        res = if config.watch_changes? && !config.build_status['passed']
-                sor_error_tag(support, wrapper_html, component_props, 'server-side-svelte-build-error', 'SVELTE BUILD FAILED')
-              elsif caching
-                support.set_request_metrics(:from_cache)
-                support.render_cached(self) do
-                  render_component(support, wrapper_html, component_props)
+        if config.watch_changes? && !config.build_status['passed']
+          sor_error_tag(support, wrapper_html, component_props, 'server-side-svelte-build-error', 'SVELTE BUILD FAILED')
+        elsif caching
+          support.set_request_metrics(:from_cache)
+          if component_props.key?(:_uncached)
+
+            # when we have uncached props, we do not cache the wrapper tag
+
+            attr = support.tag_attributes(wrapper_html, component_props)
+            content_tag(:div, attr) do
+              support.render_cached(self) do
+                res = support.render_svelte(@current_template)
+                if res[:success]
+                  concat(res[:head].html_safe)
+                  concat(res[:html].html_safe)
+                else
+                  sor_error_tag(support, wrapper_html, component_props, 'server-side-svelte-render-error', 'SVELTE RENDER FAILED')
+                end
+              end
+            end
+
+          else
+
+            # when all props are cached, we can cache the wrapper tag too
+            # ... but using only cached props for making sure we don't cache any dynamic content
+
+            support.render_cached(self) do
+              res = support.render_svelte(@current_template)
+              if res[:success]
+                attr = support.tag_attributes(wrapper_html, support.cached_props)
+                content_tag(:div, attr) do
+                  concat(res[:head].html_safe)
+                  concat(res[:html].html_safe)
                 end
               else
-                r = render_component(support, wrapper_html, component_props)
-                support.log_completed("Rendered #{'as empty element that will be mounted on the client side' unless support.ssr?}")
-                r
+                sor_error_tag(support, wrapper_html, component_props, 'server-side-svelte-render-error', 'SVELTE RENDER FAILED')
               end
-        if component_props.key?(:_uncached)
-          u_prp = CGI.escapeHTML(component_props[:_uncached].to_json)
-          res.sub(""**UNCACHED_PROPS_PLACEHOLDER_VDKVUKCYPTHQ4R6Z4EJ**"", u_prp).html_safe
+            end
+
+          end
         else
-          res
+          r = render_component(support, wrapper_html, component_props)
+          support.log_completed("Rendered #{'as empty element that will be mounted on the client side' unless support.ssr?}")
+          r
         end
+
       else
         render_empty_tag(support, wrapper_html, component_props)
       end
@@ -57,41 +85,34 @@ module SvelteOnRails
 
     def render_component(support, html_options, component_props)
 
-      if support.ssr?
-
-        caller_loc = Proc.new do
-          v_path = @current_template.identifier
-          caller_locations.find { |loc| loc.to_s.include?(v_path) }.to_s.match(/^[\s\S]+(:[0-9]+(?=:in))/).to_s
-        end
+      caller_loc = Proc.new do
+        v_path = @current_template.identifier
+        caller_locations.find { |loc| loc.to_s.include?(v_path) }.to_s.match(/^[\s\S]+(:[0-9]+(?=:in))/).to_s
+      end
 
-        ssr_result = if SvelteOnRails::SsrServer.instance.alive?
-                       SvelteOnRails::SsrServer.instance.render(
-                         support.component_paths,
-                         support.props,
-                         support.debug?,
-                         caller_loc
-                       )
-                     else
-                       SvelteOnRails::Lib::FallbackRenderer.render(support.component_paths, support.props, support.debug?)
-                     end
-
-        if ssr_result[:success]
-          support.set_request_metrics(:rendered)
-          attr = support.tag_attributes(html_options, support.props)
-          content_tag(:div, attr) do
-            concat(ssr_result[:head].html_safe)
-            concat(ssr_result[:html].html_safe)
-          end
-        else
-          support.instance_variable_set(:@skip_caching, true)
-          sor_error_tag(support, html_options, component_props, 'server-side-svelte-render-error', 'SVELTE RENDER FAILED')
+      ssr_result = if SvelteOnRails::SsrServer.instance.alive?
+                     SvelteOnRails::SsrServer.instance.render(
+                       support.component_paths,
+                       support.cached_props,
+                       support.debug?,
+                       caller_loc
+                     )
+                   else
+                     SvelteOnRails::Lib::FallbackRenderer.render(support.component_paths, support.cached_props, support.debug?)
+                   end
+
+      if ssr_result[:success]
+        support.set_request_metrics(:rendered)
+        attr = support.tag_attributes(html_options, component_props)
+        content_tag(:div, attr) do
+          concat(ssr_result[:head].html_safe)
+          concat(ssr_result[:html].html_safe)
         end
-
       else
-
-        render_empty_tag(support, html_options, component_props)
-
+        support.instance_variable_set(:@skip_caching, true)
+        sor_error_tag(support, html_options, component_props, 'server-side-svelte-render-error', 'SVELTE RENDER FAILED')
       end
+
     end
 
     def render_empty_tag(support, html_options, component_props)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svelte-on-rails
 version: !ruby/object:Gem::Version
-  version: 19.2.2
+  version: 19.2.3
 platform: ruby
 authors:
 - Christian Sedlmair