klenod-build 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d24b06569546f0b32ba9aebee8e17b989b9cd67198714952404b818dbae7d425
-  data.tar.gz: c61a9de1db41a5258cf2f9ae742ab9256c69fa06df0ef799035db39df89630f2
+  metadata.gz: b36ee8205987d239a6301d55da7f4ef92548303139d04b5bbc2246ba6e94e8e3
+  data.tar.gz: 8f6db6e13f72e4b290b91d115df9e38e8e907100db677baea5a5fec047bc6ae0
 SHA512:
-  metadata.gz: cb64e39cf3daedff82d30572bb92c136a3091118a843aa7e9180c40dd83e5e074be8a017867744fb4921a6a092eab366095a510639bacf8aba37a2859c013dd3
-  data.tar.gz: 9d9ad93cbfc302d0db9e4bddca0cb333929fe62480791bfadef0848bc09c4459fd6ed5145fa93f444ed077f1f7e63d172900a7065f81a6e0e24d7f0cf71c9eed
+  metadata.gz: d9572bdc8295bfa42c28a88057e6625d1b105cfb8b7c9f51bc7d426ffb0e090c472237f86f549258da64b1095931921e5259a78a41050590b4d67254c92590c5
+  data.tar.gz: e4b49528fe297b00c61d9f45bd8b780e88d485c9c3c4e1f37c1a28ce63ee128af0c64bccdaa68567197f0aa5beae51f568fd4371cb4d4a273c82ca7204a73b19

data/lib/klenod/build/graph.rb

@@ -556,7 +556,11 @@ module Klenod
           record
             .resolved_dependencies
             .reject { skip_asset_dependency?(it, type:) }
-            .map(&:module_id)
+        if type == :css
+          regular_dependencies, companion_styles = dependency_ids.partition { |dependency| dependency.dependency.kind != :companion_style }
+          dependency_ids = [*regular_dependencies, *companion_styles]
+        end
+        dependency_ids = dependency_ids.map(&:module_id)
 
         if module_id.extname == ".css"
           dependency_ids.flat_map { |dependency_id| ordered_module_ids_for_assets(dependency_id, seen, type: type) } + [module_id]

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

@@ -35,6 +35,20 @@ module Klenod
             result
           end
 
+          # Haml's parenthesized-attribute parser accepts only a bare variable
+          # after `=`. For example, it reads `video_id=video.id` as the value
+          # `video` plus a `.id` class. Extend that form to ordinary Ruby
+          # member and index expressions while leaving all other attributes on
+          # Haml's native parsing path.
+          def parse_new_attributes(text)
+            balanced, rest = ::Haml::Util.balance(text, "(", ")")
+            pairs = balanced && extended_attribute_pairs(balanced[1...-1])
+            return super unless pairs&.any? { |_name, value| value.match?(/[.\[]/) }
+
+            dynamic = pairs.reduce("{") { |source, (name, value)| "#{source}#{::Haml::Util.inspect_obj(name)} => #{value}," } << "}"
+            [[{}, dynamic], rest, @line.index + 1]
+          end
+
           def annotate_tag_nodes(root)
             queue = root.children.dup
             until queue.empty?
@@ -62,6 +76,59 @@ module Klenod
             {shorthand: shorthand, literal: literal}
           end
 
+          def extended_attribute_pairs(source)
+            pairs = []
+            index = 0
+
+            loop do
+              index += 1 while source[index]&.match?(/\s/)
+              break if index >= source.length
+
+              name = source[index..].match(/\A[-:@#\w.]+/)&.to_s
+              return nil unless name
+
+              index += name.length
+              index += 1 while source[index]&.match?(/\s/)
+              return nil unless source[index] == "="
+
+              index += 1
+              index += 1 while source[index]&.match?(/\s/)
+              value_start = index
+              depth = 0
+              quote = nil
+              escaped = false
+
+              while index < source.length
+                character = source[index]
+                if quote
+                  if escaped
+                    escaped = false
+                  elsif character == "\\"
+                    escaped = true
+                  elsif character == quote
+                    quote = nil
+                  end
+                else
+                  case character
+                  when "'", '"' then quote = character
+                  when "(", "[", "{" then depth += 1
+                  when ")", "]", "}" then depth -= 1
+                  when " ", "\t"
+                    break if depth.zero? && source[index..].match?(/\A\s+[-:@#\w.]+\s*=/)
+                  end
+                end
+                index += 1
+              end
+
+              value = source[value_start...index].strip
+              return nil if value.empty? || depth.negative? || quote
+
+              pairs << [name, value]
+            end
+
+            pairs
+          end
+
           def literal_class_names_from_old_attributes(source)
             parsed = ::Haml::AttributeParser.parse(source)
             return [] unless parsed&.key?("class")

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

@@ -489,7 +489,9 @@ module Klenod
             def render_ruby_filter(node)
               source = to_source(node)
               parsed = (node if node.is_a?(Fragment) && node.node?) || statements(source)
-              return statements("begin\n#{indent(source, 2)}\n  nil\nend") unless parsed
+              unless parsed&.node?
+                raise_ruby_parse_error(source, line_no: nil, context: "Could not parse Ruby filter")
+              end
 
               fragment(
                 ast_begin([
@@ -497,8 +499,6 @@ module Klenod
                   nil_node
                 ])
               )
-            rescue SyntaxTree::Parser::ParseError
-              statements("begin\n#{indent(source, 2)}\n  nil\nend")
             end
 
             def format_node(node)
@@ -575,16 +575,20 @@ module Klenod
               line_offsets = [0]
               source.each_line(chomp: false) { |line| line_offsets << line_offsets.last + line.length }
 
-              Ripper
-                .lex(source)
-                .filter_map do |(line, column), type, token, _state|
+              tokens = Ripper.lex(source)
+
+              tokens
+                .each_with_index
+                .filter_map do |((line, column), type, token, _state), index|
                   kind, prefix, pattern = VARIABLE_TOKEN_KINDS[type]
                   receiver = @variables[kind]
                   if type == :on_gvar && token == "$*" && receiver
                     [offset_for(line_offsets, line, column), token.length, receiver]
                   elsif receiver && token.match?(pattern)
                     name = token.delete_prefix(prefix)
-                    [offset_for(line_offsets, line, column), token.length, "(#{receiver})[#{symbol_source(name)}]"]
+                    replacement = "(#{receiver})[#{symbol_source(name)}]"
+                    replacement = "{#{replacement}}" if tokens[index - 1]&.fetch(1) == :on_embvar
+                    [offset_for(line_offsets, line, column), token.length, replacement]
                   end
                 end
                 .reverse_each

data/lib/klenod/build/version.rb

@@ -2,6 +2,6 @@
 
 module Klenod
   module Build
-    VERSION = "0.0.17"
+    VERSION = "0.0.18"
   end
 end

metadata

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