heartml 1.0.0.beta17 → 1.0.0.beta18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 472d4b41b5c7e6b3642f760e372a526cfcd616aa46ac73e1293937035fd5b91f
-  data.tar.gz: c96192107e486944439b83976b6ce79f846fdae544b3a0ae7cfcceecaab7f538
+  metadata.gz: 6b5bbe4c65f744b46c84b6fb6949994e9ebe78301f6e73fcb0ce91590d37a128
+  data.tar.gz: acfe3bf54d39db1737d5a46a86c9aabfd06437c2287b13bbe1b59634049acdae
 SHA512:
-  metadata.gz: 2940a6ecd8eebd9b24a7dd1f30da984569aa11c9b5f77e679847a5668e5717e257aa121546e2e59338625a0464631207158c3d79dff6b92a2186a05edcf2d760
-  data.tar.gz: 956b7f57627c4dc972985e3ba37095bc50329f7b8a4cf6b1519a3e77c216588ac43da9392304814fc031d0efd0357d4941d94de57fa12f6257f8f1d08ec74654
+  metadata.gz: ddca7cfd38b3ddb634a3791cfbf4fb0425a24f222f58139a5d5f67388503f0afb0654a1c663f600b1fe1eeb64affe71a9d60f9ea047001486baf580e38cdedc3
+  data.tar.gz: 0ae6a4dd6e06c6e3bf6fb4ec9eafe482d76fea77b346a6493f96a7f6b39cad06a7e2774b8c8457cca438c58914bf1ce86d91f53bf17fbb0e9aea225fc7895edc

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [1.0.0.beta18] — 2024-11-27
+
+- Simplifications and improvements to server directive syntax and CSS handling [#1]
+
 ## [1.0.0.beta17] — 2024-10-27
 
 - Add `.` effect shortcut for `@textContent = .`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heartml (1.0.0.beta17)
+    heartml (1.0.0.beta18)
       concurrent-ruby (~> 1.2)
       nokolexbor (>= 0.4.2)
 

data/README.md

@@ -1,8 +1,8 @@
-# Heartml: Ruby (WIP)
+# Heartml: Ruby Web Components (WIP)
 
-Server-rendered web components in Ruby using a SFC (Single-File Component) format loosely based on [HTML Modules](https://github.com/WICG/webcomponents/blob/gh-pages/proposals/html-modules-explainer.md). Logic on the server-side is analogous to client-side logic provided by the Heartml web component library written in JavaScript.
+Server-rendered custom elements in Ruby using a SFC (Single-File Component) format loosely based on [HTML Modules](https://github.com/WICG/webcomponents/blob/gh-pages/proposals/html-modules-explainer.md). Logic on the server-side is analogous to client-side logic provided by the [Heartml JavaScript library](https://github.com/heartml/heartml).
 
-Great for pairing with [esbuild-plugin-html-modules](https://github.com/hotmodule/esbuild-plugin-html-modules) for a full-stack component rendering pipeline.
+Great for pairing with [esbuild-plugin-html-modules](https://github.com/whitefusionhq/esbuild-plugin-html-modules) for a full-stack component rendering pipeline.
 
 ## Installation
 

data/lib/heartml/server_effects.rb

@@ -58,6 +58,16 @@ module Heartml
         directive :attribute, ->(_, node, name, value) {
           node[name] = value if name.match?(%r{^aria[A-Z-]}) || value
         }
+
+        directive :appendUnsafe, ->(_, node, value) {
+          node.swap(value.is_a?(Nokolexbor::Node) ? value : value.to_s)
+        }
+
+        directive :append, ->(_, node, value) {
+          span = node.document.create_element("span")
+          span.content = value.to_s
+          node.swap(span.inner_html)
+        }
       end
     end
 

data/lib/heartml/version.rb

@@ -2,5 +2,5 @@
 
 module Heartml
   # @return [String]
-  VERSION = "1.0.0.beta17"
+  VERSION = "1.0.0.beta18"
 end

data/lib/heartml.rb

@@ -52,9 +52,7 @@ module Heartml
   def self.included(klass)
     klass.extend ClassMethods
 
-    klass.attribute_binding "server-children", :_server_children, only: :template
-    klass.attribute_binding "server-content", :_server_content, only: :template
-    klass.attribute_binding "server-unsafe-eval", :_server_unsafe_eval
+    klass.attribute_binding "hl-content", :_server_content, only: :template
 
     # Don't stomp on a superclass's `content` method
     has_content_method = begin
@@ -82,8 +80,6 @@ module Heartml
 
     def html_file_extensions = %w[module.html mod.html heartml].freeze
 
-    def processed_css_extension = "css-local"
-
     # @param tag_name [String]
     # @param heart_module [String] if not provided, a class method called `source_location` must be
     #   available with the absolute path of the Ruby file
@@ -194,13 +190,20 @@ module Heartml
 
     tmpl_el = doc.css("> template").find do |node|
       node.attributes.empty? ||
-        (node.attributes.count == 1 && node.attributes.any? { |k| k[0].start_with?("data-") })
+        (node.attributes.count == 1 && node.attributes.any? { |k| k[0] == "data-ssr-only" })
     end
 
-    unless tmpl_el
+    if tmpl_el
+      # Hoist light DOM children templates, if need be
+      doc.css("> template[hl-content]").each do |node|
+        tmpl_el.children[0] << node
+      end
+    else
+      # No top-level template, so we create one
       tmpl_el = doc.document.create_element("template")
       immediate_children = doc.css("> :not(style):not(script)")
       tmpl_el.children[0] << immediate_children
+      tmpl_el.children[0] << doc.css("> style[server-effect]")
       doc.prepend_child(tmpl_el)
     end
 
@@ -210,26 +213,8 @@ module Heartml
     # Set attributes on the custom element
     attributes.each { |k, v| doc[k.to_s.tr("_", "-")] = value_to_attribute(v) if v }
 
-    # Look for external and internal styles
-    output_styles = ""
-    external_styles = doc.css("link[rel=stylesheet]")
-    external_styles.each do |external_style|
-      next unless external_style["server-process"]
-
-      output_styles += File.read(File.expand_path(external_style["href"], File.dirname(self.class.heart_module)))
-      external_style.remove
-    rescue StandardError => e
-      raise e.class, e.message.lines.first,
-            ["#{self.class.heart_module}:#{external_style.line}", *e.backtrace]
-    end
-    sidecar_file = "#{File.join(
-      File.dirname(self.class.heart_module), File.basename(self.class.heart_module, ".*")
-    )}.#{self.class.processed_css_extension}"
-    output_styles += if File.exist?(sidecar_file)
-                       File.read(sidecar_file)
-                     else
-                       doc.css("> style:not([scope])").map(&:content).join
-                     end
+    # Look for internal styles
+    output_styles = doc.css("> style:not([scope])").map(&:content).join
 
     # Now remove all nodes *except* the template
     doc.children.each do |node|
@@ -248,10 +233,11 @@ module Heartml
       # Guess what? We can reuse the same template tag! =)
       tmpl_el["shadowrootmode"] = "open"
       tmpl_el.children[0] << style_tag if style_tag
+      child_content.at_css("hl-slot")&.swap(content) if @_replaced_content.is_a?(Nokolexbor::Node) && content
       doc << child_content if child_content
     else
       tmpl_el.children[0] << style_tag if style_tag
-      tmpl_el.children[0].at_css("slot:not([name])")&.swap(child_content) if child_content
+      tmpl_el.children[0].at_css("hl-slot")&.swap(child_content) if child_content
       tmpl_el.children[0].children.each do |node|
         doc << node
       end
@@ -376,28 +362,10 @@ module Heartml
     @_context_locals = previous_context
   end
 
-  def _server_children(attribute:, node:) # rubocop:disable Lint/UnusedMethodArgument
+  def _server_content(attribute:, node:) # rubocop:disable Lint/UnusedMethodArgument
     self.replaced_content = node.children[0]
     node.remove
   end
-
-  def _server_unsafe_eval(attribute:, node:)
-    node_name = node.name
-    correct_node = node_name == "template" ? node.children[0] : node
-    result = node_or_string(evaluate_attribute_expression(attribute, correct_node.inner_html))
-
-    if node_name == "template"
-      node.swap(result)
-    else
-      node.inner_html = result
-      attribute.parent.delete(attribute.name)
-    end
-  end
-
-  def _server_content(attribute:, node:)
-    result = evaluate_attribute_expression(attribute, "content")
-    node.swap(result)
-  end
 end
 
 require_relative "heartml/template_renderer"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heartml
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta17
+  version: 1.0.0.beta18
 platform: ruby
 authors:
 - Jared White
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-27 00:00:00.000000000 Z
+date: 2024-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby