klenod-build 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca5f97eeee290b7aaa5a2aeb8df93c1dfcf755819bb4020b3921089afbd475cb
-  data.tar.gz: badcb6ea3b3e9cb821c1b363cc1956a8115c6af99f73900f2de10210dfd1df7c
+  metadata.gz: 971caae6ad82448ab179cd8dc98c0920ac4422a2eea50a11d9a67c1097ecda7c
+  data.tar.gz: 8b1e33ab86a8c09a8a659d3caf68cf093b5adb7f33b3c6d988a85913ca865bbd
 SHA512:
-  metadata.gz: 6a1931ad0c0d24e94e78460018c0a7140506fde26775f1279ad022b1c5ddac0f0259ea9e4ce16d1247c5f788b3404b28abb0a507a834f91b864c86e8b8bebd37
-  data.tar.gz: dddc86229539dc0024dc1de113cad4abcec4fc41f48896874167db472600f7466d0aacb3b2ec70b1ca038300d01a4b66ab849990cb06859537f97ccb93f648d1
+  metadata.gz: a664ddf7e161448788a7c5b3c8680acb07b12a16edeaccf9640cd260d8613457e096621ec2649ad3c7c6196364d353436bad856de1e390cb61a45142d6f7423e
+  data.tar.gz: eedab53d4360f66b32ff8397f280ce57b9d620d5a54fed5379a7aece96444cea1ef6a98219f5964fa2b7c931b5fce55f252ca62207f3a038bce9d314791e166f

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

@@ -216,7 +216,7 @@ module Klenod
             measure_compile(:haml_build_expression_list) { builder.expressions(expressions) }
           end
 
-          def compile_node_expressions(nodes, factory:, builder:, markdown_compiler:, styleable: false)
+          def compile_node_expressions(nodes, factory:, builder:, markdown_compiler:, styleable: false, join_adjacent_plain_text: false)
             expressions = []
             previous_node = nil
             index = 0
@@ -224,7 +224,21 @@ module Klenod
             while index < nodes.length
               node = nodes[index]
 
-              if script_node?(node) && !continuation?(node)
+              if join_adjacent_plain_text && node.type == :plain
+                plain_nodes = [node]
+                index += 1
+
+                while index < nodes.length && nodes[index].type == :plain
+                  plain_nodes << nodes[index]
+                  index += 1
+                end
+
+                text = plain_nodes.map { it.value.fetch(:text).strip }.reject(&:empty?).join(" ")
+                next if text.empty?
+
+                expression = builder.marked_expression(source_mark(plain_nodes.first, builder: builder), builder.literal(text))
+                node = plain_nodes.last
+              elsif script_node?(node) && !continuation?(node)
                 group = [node]
                 index += 1
 
@@ -453,7 +467,14 @@ module Klenod
             unless node.children.empty?
               children.concat(
                 measure_compile_detail(:haml_compile_tag_children) do
-                  compile_node_expressions(node.children, factory: factory, styleable: styleable, builder: builder, markdown_compiler: markdown_compiler)
+                  compile_node_expressions(
+                    node.children,
+                    factory: factory,
+                    styleable: styleable,
+                    builder: builder,
+                    markdown_compiler: markdown_compiler,
+                    join_adjacent_plain_text: true
+                  )
                 end
               )
             end
@@ -602,35 +623,40 @@ module Klenod
 
           def dynamic_attributes(node, builder:, props:)
             dynamic_attributes = node.value.fetch(:dynamic_attributes)
-            source = dynamic_attributes.old || dynamic_attributes.new
-            return {} unless source
+            sources = [dynamic_attributes.new, dynamic_attributes.old].compact
+            return {} if sources.empty?
 
             measure_compile(:haml_compile_dynamic_attributes) do
-              source = builder.line_rewritten_source(source, node.line)
-              simple = simple_dynamic_attributes(source, builder: builder) unless @event_handler
-              if simple
-                simple.each { |key, value| props[key] = value }
-                return simple
-              end
-
-              hash = builder.hash_expression(source, line_no: node.line)
-              unless hash
-                builder.ruby_parse_error(source, line_no: node.line, context: "Could not parse Haml dynamic attributes")
-              end
-
               dynamic = {}
-              hash.node.assocs.each do |assoc|
-                if assoc.is_a?(SyntaxTree::AssocSplat)
-                  splat_source = hash.source[assoc.value.location.start_char...assoc.value.location.end_char]
-                  props[ATTRIBUTE_SPLATS_KEY] ||= []
-                  props[ATTRIBUTE_SPLATS_KEY] << builder.expression(splat_source)
+              sources.each do |source|
+                source = builder.line_rewritten_source(source, node.line)
+                simple = simple_dynamic_attributes(source, builder: builder) unless @event_handler
+                if simple
+                  simple.each do |key, value|
+                    dynamic[key] = value
+                    props[key] = value
+                  end
                   next
                 end
 
-                key = attribute_key(assoc.key, builder: builder)
-                value = event_handler_value(key, assoc.value, builder: builder) || attribute_value(assoc, builder: builder)
-                dynamic[key] = value
-                props[key] = value
+                hash = builder.hash_expression(source, line_no: node.line)
+                unless hash
+                  builder.ruby_parse_error(source, line_no: node.line, context: "Could not parse Haml dynamic attributes")
+                end
+
+                hash.node.assocs.each do |assoc|
+                  if assoc.is_a?(SyntaxTree::AssocSplat)
+                    splat_source = hash.source[assoc.value.location.start_char...assoc.value.location.end_char]
+                    props[ATTRIBUTE_SPLATS_KEY] ||= []
+                    props[ATTRIBUTE_SPLATS_KEY] << builder.expression(splat_source)
+                    next
+                  end
+
+                  key = attribute_key(assoc.key, builder: builder)
+                  value = event_handler_value(key, assoc.value, builder: builder) || attribute_value(assoc, builder: builder)
+                  dynamic[key] = value
+                  props[key] = value
+                end
               end
               dynamic
             end
@@ -715,7 +741,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.11"
   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.11
 platform: ruby
 authors:
 - Andrés Alin
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.11
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement