hot_module 1.0.0.alpha1 → 1.0.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 945191f12e89ec2f10631dd0cbf2292a6f01084f6eb111a2ba3692f2f847314e
-  data.tar.gz: b3cc68afcc453e60cda43d5eed8dfedda5bc0b33a5a6618a4f999a55a05e3e49
+  metadata.gz: 213948e4061c8dfb1da32e9621365caaa4d5594125f03c63802ff3fb53aa3b24
+  data.tar.gz: b4077c814479ea1d65d2143eaf6f6b7abba996787408846474c3933ffccf1fa9
 SHA512:
-  metadata.gz: cc78a6dab31349eaf65ce29644701766d1a8bfce8ae4cc8e196830068e4df43c78a19db85907d91b265c50abe64555e3d77968450fe8a99941314852dea820bb
-  data.tar.gz: 8f58833d468c5ad03fdf9e81a020bb36b1ac8c9b7f937bca1e9625302b408477e0e17f8ecbf0792aed5097fda1177bd7fa40b4805c84982beb8e82c0ae59d44a
+  metadata.gz: 76b4783da63ac259d17c0fa78c1a30b51f2919fbbbe1a5e007c315d3facb3249ffab2c0538d42322654868faf5b45f342a70b79f4b91c64ee67638644583a283
+  data.tar.gz: 00c1db27bd91bc5ea110af3bc26db58dc254b43960b182f327f938ea2f6e1eb440cde6ff4c9e40c2732d215600d671c0e73eeb005178174aa9005e6a3bdfb746

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    hot_module (1.0.0.alpha1)
-      nokogiri (~> 1.13)
+    hot_module (1.0.0.alpha2)
+      nokolexbor (~> 0.3)
 
 GEM
   remote: https://rubygems.org/
@@ -33,6 +33,7 @@ GEM
       racc (~> 1.4)
     nokogiri (1.13.8-x86_64-linux)
       racc (~> 1.4)
+    nokolexbor (0.3.7-arm64-darwin)
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)

data/benchmark.rb

@@ -0,0 +1,14 @@
+$LOAD_PATH.unshift File.expand_path("lib", __dir__)
+require "hot_module"
+
+require_relative "test/fixtures/classes"
+
+require "benchmark"
+
+Benchmark.bmbm do |x|
+  x.report("render") do
+    1000.times do |i|
+      Templated.new(name: i.to_s).()
+    end
+  end
+end

data/hot_module.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "nokogiri", "~> 1.13"
+  spec.add_dependency "nokolexbor", "~> 0.3"
 
   spec.add_development_dependency "hash_with_dot_access", "~> 1.2"
 end

data/lib/hot_module/fragment.rb

@@ -22,15 +22,17 @@ module HoTModuLe
       end
     end
 
-    def process_attribute_bindings(node)
+    def process_attribute_bindings(node) # rubocop:todo Metrics
       node.attributes.each do |name, attr_node|
         @attribute_bindings.each do |attribute_binding|
+          next if attribute_binding.only_for_tag && node.name != attribute_binding.only_for_tag.to_s
           next unless attribute_binding.matcher.match?(name)
+          next if attribute_binding.method.receiver._check_stack(node)
 
           break unless attribute_binding.method.(attribute: attr_node, node: node)
         end
       rescue Exception => e # rubocop:disable Lint/RescueException
-        raise e.class, e.message.lines.first, ["#{@html_module}:#{attr_node.line}", *e.backtrace]
+        raise e.class, e.message.lines.first, ["#{@html_module}:#{attr_node}", *e.backtrace]
       end
     end
   end

data/lib/hot_module/petite.rb

@@ -2,95 +2,41 @@
 
 require "hot_module"
 
-module JSStrings
-  refine Kernel do
-    def `(str)
-      str
-    end
-  end
-  refine String do
-    def underscore
-      gsub(/([A-Z]+)(?=[A-Z][a-z])|([a-z\d])(?=[A-Z])/) do
-        (::Regexp.last_match(1) || ::Regexp.last_match(2)) << "_"
-      end.tr("-", "_").downcase
-    end
-  end
-end
-
 module HoTModuLe
   module Petite
-    using JSStrings
-
     # @param klass [Class]
     # @return [void]
     def self.included(klass)
-      klass.attribute_binding "v-for", :_for_binding
-      klass.attribute_binding "v-text", :_text_binding
-      klass.attribute_binding "v-html", :_html_binding
-      klass.attribute_binding "v-bind", :_handle_bound_attribute
-      klass.attribute_binding %r{^:}, :_handle_bound_attribute
+      klass.attribute_binding "v-for", :_petite_for_binding, only: :template
+      klass.attribute_binding "v-text", :_petite_text_binding
+      klass.attribute_binding "v-html", :_petite_html_binding
+      klass.attribute_binding "v-bind", :_petite_bound_attribute
+      klass.attribute_binding %r{^:}, :_petite_bound_attribute
     end
 
     protected
 
-    def evaluate_attribute_expression(attribute, eval_code = attribute.value) # rubocop:disable Metrics/AbcSize
-      eval_code = eval_code.gsub(/\${(.*)}/, "\#{\\1}")
-      @_locals ||= {}
-      @_locals.keys.reverse_each do |name|
-        eval_code = "#{name} = @_locals[\"#{name}\"];" + eval_code
-      end
-      instance_eval(eval_code, self.class.html_module, attribute.line)
-    rescue NameError => e
-      bad_name = e.message.match(/`(.*?)'/)[1]
-      suggestion = bad_name.underscore
-      eval_code.gsub!(bad_name, suggestion)
-      instance_eval(eval_code, self.class.html_module, attribute.line)
-    end
-
-    def _locals_stack
-      @_locals_stack ||= []
-    end
-
-    def _check_stack(node) # rubocop:disable Metrics/AbcSize
-      node_and_ancestors = [node, *node.ancestors.to_a]
-      stack_misses = 0
-
-      stack_nodes = _locals_stack.map { _1[:node] }
-      stack_nodes.each do |stack_node|
-        if node_and_ancestors.none? { _1["v-if"] == "!hydrated" } && node_and_ancestors.none? { _1 == stack_node }
-          stack_misses += 1
-        end
-      end
-
-      stack_misses.times { _locals_stack.pop }
-
-      !((node_and_ancestors & _locals_stack.map { _1[:node] }).empty?) # rubocop:disable Style/RedundantParentheses
-    end
-
-    def _for_binding(attribute:, node:)
-      return unless node.name == "template"
-
-      return if _check_stack(node)
+    def _petite_for_binding(attribute:, node:)
+      delimiter = node["v-for"].include?(" of ") ? " of " : " in "
+      expression = node["v-for"].split(delimiter)
 
-      @_locals_stack.push({ node: node })
-      _process_list(attribute: attribute, node: node)
+      process_list(
+        attribute: attribute,
+        node: node,
+        item_node: node.children[0].children.find(&:element?),
+        for_in: expression
+      )
     end
 
-    def _text_binding(attribute:, node:)
-      return if _check_stack(node)
-
-      node.content = evaluate_attribute_expression(attribute)
+    def _petite_text_binding(attribute:, node:)
+      node.content = evaluate_attribute_expression(attribute).to_s
     end
 
-    def _html_binding(attribute:, node:)
-      return if _check_stack(node)
-
-      node.content = evaluate_attribute_expression(attribute)
+    def _petite_html_binding(attribute:, node:)
+      node.inner_html = evaluate_attribute_expression(attribute).to_s
     end
 
-    def _handle_bound_attribute(attribute:, node:) # rubocop:disable Metrics
-      return if _check_stack(node)
-
+    def _petite_bound_attribute(attribute:, node:) # rubocop:disable Metrics
       return if attribute.name == ":key"
 
       real_attribute = if attribute.name.start_with?(":")
@@ -102,60 +48,10 @@ module HoTModuLe
       obj = evaluate_attribute_expression(attribute)
 
       if real_attribute == "class"
-        class_names = case obj
-                      when Hash
-                        obj.filter { |_k, v| v == true }.keys
-                      when Array
-                        # TODO: handle objects inside of an array
-                        obj
-                      else
-                        Array[obj]
-                      end
-        node[real_attribute] = class_names.join(" ")
+        node[real_attribute] = class_list_for(obj)
       elsif real_attribute != "style" # style bindings aren't SSRed
         node[real_attribute] = obj if obj
       end
     end
-
-    def _process_list(attribute:, node:) # rubocop:disable Metrics
-      item_node = node.element_children.first
-
-      delimiter = node["v-for"].include?(" of ") ? " of " : " in "
-      expression = node["v-for"].split(delimiter)
-      lh = expression[0].strip.delete_prefix("(").delete_suffix(")").split(",").map!(&:strip)
-      rh = expression[1].strip
-
-      list_items = evaluate_attribute_expression(attribute, rh)
-
-      # TODO: handle object style
-      # https://vuejs.org/guide/essentials/list.html#v-for-with-an-object
-
-      return unless list_items
-
-      _in_locals_stack do
-        list_items.each_with_index do |list_item, index|
-          new_node = item_node.clone
-          node.parent << new_node
-          new_node["v-if"] = "!hydrated"
-
-          local_items = { **(prev_items || {}) }
-          local_items[lh[0]] = list_item
-          local_items[lh[1]] = index if lh[1]
-
-          @_locals = local_items
-
-          Fragment.new(
-            new_node, self.class.attribute_bindings,
-            html_module: self.class.html_module
-          ).process
-        end
-      end
-    end
-
-    def _in_locals_stack
-      prev_items = @_locals
-      yield
-      @_locals = prev_items
-    end
   end
 end

data/lib/hot_module/query_selection.rb

@@ -12,5 +12,6 @@ module HoTModuLe
     def query_selector_all(selector) = css(selector)
   end
 
-  Nokogiri::XML::Node.include QuerySelection unless Nokogiri::XML::Node.instance_methods.include?(:query_selector)
+  # TODO: do we need this, or no?
+  #  Nokogiri::XML::Node.include QuerySelection unless Nokogiri::XML::Node.instance_methods.include?(:query_selector)
 end

data/lib/hot_module/version.rb

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

data/lib/hot_module.rb

@@ -2,16 +2,26 @@
 
 require_relative "hot_module/version"
 
-require "nokogiri"
+require "nokolexbor"
 
 # Include this module into your own component class
 module HoTModuLe
   class Error < StandardError; end
 
-  AttributeBinding = Struct.new(:matcher, :method_name, :method, keyword_init: true) # rubocop:disable Lint/StructNewOverride
+  module JSTemplateLiterals
+    refine Kernel do
+      def `(str)
+        str
+      end
+    end
+  end
+
+  using JSTemplateLiterals
+
+  AttributeBinding = Struct.new(:matcher, :method_name, :method, :only_for_tag, keyword_init: true) # rubocop:disable Lint/StructNewOverride
 
   require_relative "hot_module/fragment"
-  require_relative "hot_module/query_selection"
+  # require_relative "hot_module/query_selection"
 
   # @param klass [Class]
   # @return [void]
@@ -25,7 +35,11 @@ module HoTModuLe
 
   # Extends the component class
   module ClassMethods
-    def html_file_extensions = %w[tmpl.html html].freeze
+    def camelcased(method_symbol)
+      alias_method(method_symbol.to_s.gsub(/(?!^)_[a-z0-9]/) { |match| match[1].upcase }, method_symbol)
+    end
+
+    def html_file_extensions = %w[module.html tmpl.html html].freeze
     def processed_css_extension = "css-local"
 
     # @param tag_name [String]
@@ -76,19 +90,20 @@ module HoTModuLe
 
     # @return [Nokogiri::XML::Element]
     def doc
-      @doc ||= Nokogiri::HTML5.fragment(
-        "<#{tag_name}>#{File.read(html_module)}</#{tag_name}>"
-      ).first_element_child
+      @doc ||= Nokolexbor::DocumentFragment.parse(
+        "<#{tag_name}>#{File.read(html_module).strip}</#{tag_name}>"
+      ).children.find(&:element?)
     end
 
     def attribute_bindings
       @attribute_bindings ||= []
     end
 
-    def attribute_binding(matcher, method_name)
+    def attribute_binding(matcher, method_name, only: nil)
       attribute_bindings << AttributeBinding.new(
         matcher: Regexp.new(matcher),
-        method_name: method_name
+        method_name: method_name,
+        only_for_tag: only
       )
     end
   end
@@ -110,12 +125,24 @@ module HoTModuLe
   # @param return_node [Boolean]
   def render_element(attributes: self.attributes, content: self.content, return_node: false) # rubocop:disable Metrics
     doc = self.class.doc.clone
+
+    # NOTE: have to fix cloned templates
+    doc.css("template").each do |bad_tmpl|
+      frag = bad_tmpl.children.last
+      new_tmpl = doc.document.create_element("template")
+      bad_tmpl.attributes.each do |k, v|
+        new_tmpl[k] = v
+      end
+      new_tmpl.children[0].children = frag
+      bad_tmpl.swap(new_tmpl)
+    end
+
     tmpl_el = doc.css("> template").find { _1.attributes.length.zero? }
 
     unless tmpl_el
       tmpl_el = doc.document.create_element("template")
       immediate_children = doc.css("> :not(style):not(script)")
-      tmpl_el << immediate_children
+      tmpl_el.children[0] << immediate_children
       doc.prepend_child(tmpl_el)
     end
 
@@ -123,7 +150,7 @@ module HoTModuLe
     process_fragment(tmpl_el)
 
     # Set attributes on the custom element
-    attributes.each { |k, v| doc[k.to_s.tr("_", "-")] = v }
+    attributes.each { |k, v| doc[k.to_s.tr("_", "-")] = value_to_attribute(v) if v }
 
     # Look for external and internal styles
     output_styles = ""
@@ -160,13 +187,13 @@ module HoTModuLe
 
     if self.class.shadow_root
       # Guess what? We can reuse the same template tag! =)
-      tmpl_el["shadowroot"] = "open"
-      tmpl_el << style_tag if style_tag
+      tmpl_el["shadowrootmode"] = "open"
+      tmpl_el.children[0] << style_tag if style_tag
       doc << content if content
     else
-      tmpl_el << style_tag if style_tag
-      tmpl_el.at_css("slot:not([name])")&.swap(content) if content
-      tmpl_el.children.each do |node|
+      tmpl_el.children[0] << style_tag if style_tag
+      tmpl_el.children[0].at_css("slot:not([name])")&.swap(content) if content
+      tmpl_el.children[0].children.each do |node|
         doc << node
       end
       tmpl_el.remove
@@ -180,6 +207,21 @@ module HoTModuLe
     render_element(...)
   end
 
+  def inspect
+    "#<#{self.class.name} #{attributes}>"
+  end
+
+  def value_to_attribute(val)
+    case val
+    when String, Numeric
+      val
+    when TrueClass
+      ""
+    else
+      val.to_json
+    end
+  end
+
   # Override in component if need be, otherwise we'll use the node walker/binding pipeline
   #
   # @param fragment [Nokogiri::XML::Element]
@@ -191,7 +233,95 @@ module HoTModuLe
     ).process
   end
 
-  def inspect
-    "#<#{self.class.name} #{attributes}>"
+  def process_list(attribute:, node:, item_node:, for_in:) # rubocop:disable Metrics
+    _context_nodes.push(node)
+
+    lh = for_in[0].strip.delete_prefix("(").delete_suffix(")").split(",").map!(&:strip)
+    rh = for_in[1].strip
+
+    list_items = evaluate_attribute_expression(attribute, rh)
+
+    # TODO: handle object style
+    # https://vuejs.org/guide/essentials/list.html#v-for-with-an-object
+
+    return unless list_items
+
+    _in_context_nodes do |previous_context|
+      list_items.each_with_index do |list_item, index|
+        new_node = item_node.clone
+
+        # NOTE: have to fix cloned templates
+        new_node.css("template").each do |bad_tmpl|
+          frag = bad_tmpl.children.last
+          new_tmpl = item_node.document.create_element("template")
+          bad_tmpl.attributes.each do |k, v|
+            new_tmpl[k] = v
+          end
+          new_tmpl.children[0].children = frag
+          bad_tmpl.swap(new_tmpl)
+        end
+
+        node.parent << new_node
+        new_node["hmod-added"] = ""
+
+        @_context_locals = { **(previous_context || {}) }
+        _context_locals[lh[0]] = list_item
+        _context_locals[lh[1]] = index if lh[1]
+
+        Fragment.new(
+          new_node, self.class.attribute_bindings,
+          html_module: self.class.html_module
+        ).process
+      end
+    end
+  end
+
+  def evaluate_attribute_expression(attribute, eval_code = attribute.value)
+    eval_code = eval_code.gsub(/\${(.*)}/, "\#{\\1}")
+    _context_locals.keys.reverse_each do |name|
+      eval_code = "#{name} = _context_locals[\"#{name}\"];" + eval_code
+    end
+    instance_eval(eval_code, self.class.html_module) # , attribute.line)
+  end
+
+  def class_list_for(obj)
+    case obj
+    when Hash
+      obj.filter { |_k, v| v }.keys
+    when Array
+      # TODO: handle objects inside of an array?
+      obj
+    else
+      Array[obj]
+    end.join(" ")
+  end
+
+  def _context_nodes
+    @_context_nodes ||= []
+  end
+
+  def _context_locals
+    @_context_locals ||= {}
+  end
+
+  def _check_stack(node)
+    node_and_ancestors = [node, *node.ancestors.to_a]
+    stack_misses = 0
+
+    _context_nodes.each do |stack_node|
+      if node_and_ancestors.none? { _1["hmod-added"] } && node_and_ancestors.none? { _1 == stack_node }
+        stack_misses += 1
+      end
+    end
+
+    stack_misses.times { _context_nodes.pop }
+
+    node_and_ancestors.any? { _context_nodes.include?(_1) }
+  end
+
+  def _in_context_nodes
+    previous_context = _context_locals
+    yield previous_context
+    @_context_locals = previous_context
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hot_module
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha1
+  version: 1.0.0.alpha2
 platform: ruby
 authors:
 - Jared White
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-15 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: nokolexbor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: hash_with_dot_access
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +53,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmark.rb
 - hot_module.gemspec
 - lib/hot_module.rb
 - lib/hot_module/fragment.rb