hot_module 1.0.0.alpha12 → 1.0.0.alpha14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51da117a031a9b9ad3c16a35b4b5276928874e742bf72e90bc9e1089f4b856a1
-  data.tar.gz: b1bb49f906b3dbc82671ec7a4850baac1899c93ce3237cc88c8bb3c69dff75f3
+  metadata.gz: 8c807341a2b68711682e37e62045bae062a490402b33da6d52dfe38ec2472b85
+  data.tar.gz: 06e4b4cafe75ea650c4d57a5b39df40cad4596901294a8853f7a5ff40944b776
 SHA512:
-  metadata.gz: 0b6b8661ec4ee9f416eff3373a049c126a744e5bd280ddf88fac6d896f58df1f844f170ddc85d5addbd099e70e5fc8f5d3421a966ea5b13bba2f568eb2bc8f86
-  data.tar.gz: d50b1b02e71f78e14ebde1c8c08abcd80eb79911fd1fafcf15de6a89ea5c412db50ddeecc23e804f05acee61b8d75d1be8ca5bef38937105b779f32b39b4e6e4
+  metadata.gz: df99852ada0457075b72bd89e8291abe21a94ae2043ea469cca16eeeecf771c46b2d02c16b1fb1d9c6940e1edcdd5590e46fc7849297087222d7e3d44aceb5f3
+  data.tar.gz: ff133ae7e218263f64803c367177583b303091ebc31661e628dca3ffde0bdfa5d83f50e023f36b2a4385e4a69937d980f4ade41d015f57eaee794f9d475efbe1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot_module (1.0.0.alpha12)
+    hot_module (1.0.0.alpha14)
       concurrent-ruby (~> 1.2)
       nokolexbor (>= 0.4.2)
 

data/lib/hot_module/component_renderer.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 module HoTModuLe
-  class View < Bridgetown::ERBView
-    attr_accessor :child_nodes
-  end
-
   class ComponentRenderer < Bridgetown::Builder
     def build
       render_html_modules
@@ -13,13 +9,13 @@ module HoTModuLe
     # rubocop:todo Metrics
     def render_html_modules
       inspect_html do |doc, resource|
-        view_context = HoTModuLe::View.new(resource)
+        view_context = Bridgetown::ERBView.new(resource)
 
         HoTModuLe.registered_elements.each do |component|
           tag_name = component.tag_name
           doc.xpath("//#{tag_name}").reverse.each do |node|
             if node["hmod:ignore"]
-              node.attribute("hmod:ignore").remove
+              node.remove_attribute("hmod:ignore")
               next
             end
 
@@ -37,11 +33,10 @@ module HoTModuLe
             attrs.merge!(new_attrs)
             attrs.transform_keys!(&:to_sym)
 
-            view_context.child_nodes = node.children
             new_node = node.replace(
-              component.new(**attrs).render_in(view_context) { node.children.to_html.html_safe }
+              component.new(**attrs).render_in(view_context, rendering_mode: :node) { node.children }
             )
-            new_node.first.attribute("hmod:ignore")&.remove
+            new_node.remove_attribute("hmod:ignore")
           end
         rescue StandardError => e
           Bridgetown.logger.error "Unable to render <#{tag_name}> (#{component}) in #{resource.path}"

data/lib/hot_module/version.rb

@@ -2,5 +2,5 @@
 
 module HoTModuLe
   # @return [String]
-  VERSION = "1.0.0.alpha12"
+  VERSION = "1.0.0.alpha14"
 end

data/lib/hot_module.rb

@@ -145,19 +145,34 @@ module HoTModuLe
     def content = @_content
   end
 
+  def replaced_content=(new_content)
+    @_replaced_content = new_content
+  end
+
   # Override in component
   #
   # @return [Hash]
   def attributes = {}
 
+  def rendering_mode = @_rendering_mode || :node
+
+  def rendering_mode=(mode)
+    @_rendering_mode = case mode
+                       when :node, :string
+                         mode
+                       end
+  end
+
   # @param attributes [Hash]
   # @param content [String, Nokolexbor::Element]
-  # @param return_node [Boolean]
-  def render_element(attributes: self.attributes, content: self.content, return_node: false) # rubocop:disable Metrics
+  def render_element(attributes: self.attributes, content: self.content) # rubocop:disable Metrics
     doc = self.class.doc.clone
     @_content = content
 
-    tmpl_el = doc.css("> template").find { _1.attributes.empty? }
+    tmpl_el = doc.css("> template").find do |node|
+      node.attributes.empty? ||
+        (node.attributes.count == 1 && node.attributes.any? { |k| k[0].start_with?("data-") })
+    end
 
     unless tmpl_el
       tmpl_el = doc.document.create_element("template")
@@ -172,7 +187,7 @@ module HoTModuLe
     HoTModuLe.registered_elements.each do |component|
       tmpl_el.children[0].css(component.tag_name).reverse.each do |node|
         if node["hmod:ignore"]
-          node.attribute("hmod:ignore").remove
+          node.remove_attribute("hmod:ignore")
           next
         end
 
@@ -192,7 +207,7 @@ module HoTModuLe
         new_node = node.replace(
           component.new(**attrs).render_element(content: node.children)
         )
-        new_node.first.attribute("hmod:ignore")&.remove
+        new_node.remove_attribute("hmod:ignore")
       end
     end
 
@@ -232,7 +247,7 @@ module HoTModuLe
       style_tag.content = output_styles
     end
 
-    child_content = @_replaced_children || content
+    child_content = @_replaced_content || content
     if self.class.shadow_root
       # Guess what? We can reuse the same template tag! =)
       tmpl_el["shadowrootmode"] = "open"
@@ -247,8 +262,7 @@ module HoTModuLe
       tmpl_el.remove
     end
 
-    # And that is that.
-    return_node ? doc : doc.to_html
+    rendering_mode == :node ? doc : doc.to_html
   end
 
   def call(...) = render_element(...)
@@ -350,7 +364,7 @@ module HoTModuLe
   end
 
   def _hmod_children_binding(attribute:, node:) # rubocop:disable Lint/UnusedMethodArgument
-    @_replaced_children = node.children[0]
+    self.replaced_content = node.children[0]
     node.remove
   end
 
@@ -380,9 +394,10 @@ if defined?(Bridgetown)
     Bridgetown::Component.extend ActiveSupport::DescendantsTracker
 
     HoTModuLe.module_eval do
-      def render_in(*)
+      def render_in(view_context, rendering_mode = :string, &block)
         @attributes&.[]=("hmod:ignore", "")
-        super
+        self.rendering_mode = rendering_mode
+        super(view_context, &block)
       end
     end
 
@@ -393,6 +408,7 @@ if defined?(Bridgetown)
       end
     end
 
+    config.html_inspector_parser "nokolexbor"
     require_relative "hot_module/component_renderer"
     config.builder HoTModuLe::ComponentRenderer
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot_module
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha12
+  version: 1.0.0.alpha14
 platform: ruby
 authors:
 - Jared White
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-08 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby