klenod-build 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca5f97eeee290b7aaa5a2aeb8df93c1dfcf755819bb4020b3921089afbd475cb
-  data.tar.gz: badcb6ea3b3e9cb821c1b363cc1956a8115c6af99f73900f2de10210dfd1df7c
+  metadata.gz: 58fe212ce18825d676c6661925007d46a8e7c68785f1c4b2af82e377fdc25f94
+  data.tar.gz: fa1abefa0576d6e2944bb240597f10abc979e19004af881c4c8bc90e261a3d5c
 SHA512:
-  metadata.gz: 6a1931ad0c0d24e94e78460018c0a7140506fde26775f1279ad022b1c5ddac0f0259ea9e4ce16d1247c5f788b3404b28abb0a507a834f91b864c86e8b8bebd37
-  data.tar.gz: dddc86229539dc0024dc1de113cad4abcec4fc41f48896874167db472600f7466d0aacb3b2ec70b1ca038300d01a4b66ab849990cb06859537f97ccb93f648d1
+  metadata.gz: d2178c1a71530cbc648000abf216ee1f72495006bf41626e0c9e592dda97985921fb41e4714c10ff08e87889b1d7ab6334815531922248d5ac51dcf155177732
+  data.tar.gz: 0ddc8e894a70a6cf94aa9100ded80f4833c1ce64824ea10557a1dcf1cb2f2e7aff89bb2084763222f81559b1a04d33229bda4bcd98bfedb537d73ea334cc0aa6

data/lib/klenod/build/plugins/haml_plugin/helper_source.rb

@@ -110,12 +110,6 @@ module Klenod
               end
             RUBY
           end
-
-          def haml_helper_needed?(source, styleable:)
-            return true if styleable
-
-            source.match?(STATIC_CLASS_SOURCE_PATTERN) || source.match?(/^\s*%slot\b/)
-          end
         end
       end
     end

data/lib/klenod/build/plugins/haml_plugin/transformer/ruby_builder.rb

@@ -427,6 +427,10 @@ module Klenod
               expression("HamlHelper.freeze_static(#{argument_source(value)})")
             end
 
+            def class_values(values)
+              source_expressions(values)
+            end
+
             def script_block(source, body, line_no: nil)
               source = rewrite_ruby_source(source, nil)
               ast_script_block(source, body) || raise_ruby_parse_error(source, line_no: line_no, context: "Could not build Ruby block from Haml script")
@@ -444,9 +448,26 @@ module Klenod
 
             def silent_script_with_children(source, body)
               source = rewrite_ruby_source(source, nil)
+              return_with_children = false
+
+              # A modifier return with an indented Haml block returns that block
+              # when the condition matches. Keeping the return and its children
+              # as sequential statements would instead evaluate the children
+              # after the modifier has fallen through.
+              if source == "return"
+                source = "return #{argument_source(body)}"
+                return_with_children = true
+              elsif (match = source.match(/\Areturn\s+(if|unless)\s+(.+)\z/))
+                branch, condition = match.captures
+                source = "#{branch} #{condition}\n#{indent("return #{argument_source(body)}", 2)}\nend"
+                return_with_children = true
+              end
+
               statements = parse_statements(source)
               return raise(ArgumentError, "Could not parse Haml silent script: #{source.inspect}") unless statements
 
+              return Fragment.new(source, statements) if return_with_children
+
               node = ast_begin([*statement_body_for(statements), *statement_body_for(body)])
               Fragment.new(["begin", indent(source, 2), indent(to_source(body), 2), "end"].join("\n"), node)
             end
@@ -595,12 +616,12 @@ module Klenod
               children = children.map { |child| expression_fragment(child) }
               props = props.dup
               attribute_splats = props.delete(:__klenod_attribute_splats__) || []
+              prop_sources = ["{#{keyword_props_source(props, mark: mark).join(", ")}}", *attribute_splats.map { |value| argument_source(value) }]
 
               source_parts = [
                 to_source(tag),
                 *children.map { |child| argument_source(child) },
-                *keyword_props_source(props, mark: mark),
-                *attribute_splats.map { |value| "**#{argument_source(value)}" }
+                "**HamlHelper.merge_props(self.class, #{prop_sources.join(", ")})"
               ].compact
               Fragment.new("#{to_source(factory)}[#{source_parts.join(", ")}]", nil)
             end
@@ -680,7 +701,7 @@ module Klenod
             def block_source(source, body)
               body_source = to_source(body)
 
-              if source.include?("{")
+              if source.include?("{") && !source.end_with?(" do")
                 "#{source} #{body_source} }"
               else
                 [source, indent(body_source, 2), "end"].join("\n")

data/lib/klenod/build/plugins/haml_plugin/transformer.rb

@@ -715,7 +715,7 @@ module Klenod
                 return
               end
 
-              props[:class] = builder.scoped_class_name(class_values)
+              props[:class] = builder.class_values(class_values)
             end
           end
 

data/lib/klenod/build/plugins/haml_plugin.rb

@@ -33,7 +33,6 @@ module Klenod
         I18N_OPTIONS = %i[class constant].freeze
         HAML_HELPER_SPECIFIER = "virtual:klenod/haml_helper"
         HAML_HELPER_MODULE_ID = ModuleId.new("#{HAML_HELPER_SPECIFIER}.rb", nil)
-        STATIC_CLASS_SOURCE_PATTERN = /^[ \t]*(?:%[-:\w]+)?(?:#[\w-]+)?\.[\w-]|[({][^)}\n]*\bclass\s*=/m
       end
 
       module HamlPlugin
@@ -51,7 +50,6 @@ module Klenod
           I18N_OPTIONS = HamlPlugin::I18N_OPTIONS
           HAML_HELPER_SPECIFIER = HamlPlugin::HAML_HELPER_SPECIFIER
           HAML_HELPER_MODULE_ID = HamlPlugin::HAML_HELPER_MODULE_ID
-          STATIC_CLASS_SOURCE_PATTERN = HamlPlugin::STATIC_CLASS_SOURCE_PATTERN
 
           def self.parse_haml(...)
             HamlPlugin.parse_haml(...)
@@ -170,9 +168,8 @@ module Klenod
             class_names_runtime_dependency = class_names_runtime_dependency(module_id)
             dependencies << class_names_runtime_dependency
             styles_source = styles_source_for(builder, style_dependencies, class_names_runtime_dependency: class_names_runtime_dependency)
-            haml_helper_needed = @cache_static_subtrees || haml_helper_needed?(code, styleable: !style_dependencies.empty?)
-            haml_helper_dependency = haml_helper_dependency(module_id) if haml_helper_needed
-            dependencies << haml_helper_dependency if haml_helper_dependency
+            haml_helper_dependency = haml_helper_dependency(module_id)
+            dependencies << haml_helper_dependency
             translations_source = builder.frozen_literal(translations_for(context, module_id)).source
             component_class_name = component_class_name(module_id)
             import_rewriter =

data/lib/klenod/build/version.rb

@@ -2,6 +2,6 @@
 
 module Klenod
   module Build
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klenod-build
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Andrés Alin
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement