slim-embedded-minify 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f18ed0ba3778ee7349be7c14d9d3974077bff29611ecd20eddab983394b38eb3
-  data.tar.gz: 9956d7da18d3074e0b9209491db3a057c85fb015823b231d7db11a7c1bbb1c22
+  metadata.gz: a0acd763c9c3c2869fee898e2da36f1a26aa1aa2430d9cfe9c3008db35ecd442
+  data.tar.gz: b3d30f07bbf45aa062deac825d4e849958f495fc4cae6cb819362ebb32f8c53b
 SHA512:
-  metadata.gz: e9da11747c1bbe17719d9e7844d5f846a0eb28182c64f285dddf6f61fee5330cac386a33c490397ff770c205b38e7895e59961070f9b3110617c9321c539a193
-  data.tar.gz: c0b7c531155113b1d118212976dbd60bdd6ed887bca10939ab18c5f881ee98a599cfe329f3bdd6adda8c3a1161403b7cce7cd69a5972de92a44e859b89885cf8
+  metadata.gz: f7e085fd30ce3b514709e55e8999c919e2ab4f25fbdcc7c3b62617a8ee09e890d732af7d6c03064eda833b002fbc5b2cec9cccf3ef5afe7ab93a7c843b708ad5
+  data.tar.gz: 26466135a7c571e04eb572f49906f8f17d3ccc21ae1be8ca44e9a00c1da1ae591cb7583d16cbada24d34e0f324a7bf1dd32afc7b4248ac82afed387527fffd58

data/CHANGELOG.md

@@ -1,8 +1,16 @@
 ## Unreleased
 
+## 0.2.6 - 2023-08-01
+
+- Fix incorrect removing when using escaped quotation.
+
+## 0.2.5 - 2023-07-27
+
+- Fix to not delete anything other than comments.
+
 ## 0.2.4 - 2023-07-27
 
-- Fix deletion of strings when `/*` is present in the string
+- Fix deletion of strings when `/*` is present in the string.
 
 ## 0.2.3 - 2023-07-27
 

data/lib/slim/embedded/minify/javascript.rb

@@ -11,11 +11,46 @@ module Slim
           super(engine, minified_body, attrs)
         end
 
-        private
-
         def remove_comments!(line)
-          line.last.gsub!(/((?<!['"])\/\*.*?\*\/(?<!['"]))/, '')
-          line.last.gsub!(/((?<!['"])\/\/.*)/, '')
+          need_deletion = false
+          need_deletion_all = false
+          escaped = false
+          escaped_backslash = false
+          inside_char = nil
+          line[-1] = line.last.chars.each_with_index.map do |char, index|
+            next if need_deletion_all
+
+            if char == "/" && next_char(line, index) == "*" && inside_char.nil?
+              if remaining_string_range(line, index).include?("*/")
+                need_deletion = true
+                next
+              end
+            elsif char == "/" && prev_char(line, index) == "*" && inside_char.nil? && need_deletion
+              need_deletion = false
+              next
+            elsif char == "/" && next_char(line, index) == "/" && inside_char.nil? && !need_deletion
+              need_deletion_all = true
+              next
+            elsif char == "\\" && next_char(line, index) == "\\" && inside_char
+              escaped_backslash = true
+              next char
+            elsif char == "\\"
+              if ["'", '"'].include?(next_char(line, index)) && inside_char == next_char(line, index) && !escaped_backslash
+                escaped = true
+              end
+              escaped_backslash = false
+              next char
+            elsif ["'", '"'].include?(char) && !need_deletion
+              if inside_char == char
+                inside_char = nil unless escaped
+                escaped = false
+                next char
+              end
+
+              inside_char = char if inside_char.nil?
+            end
+            char if !need_deletion || inside_char
+          end&.compact&.join
         end
       end
     end

data/lib/slim/embedded/minify/tag.rb

@@ -13,43 +13,113 @@ module Slim
 
         def minify(body)
           multiline_comment = false
-          body.map do |line|
+          body.filter_map do |line|
             if line.instance_of?(Array) && line.first == :slim
               remove_comments!(line)
-              remove_whitespace!(line)
+              next if line.last.nil?
 
+              remove_whitespace!(line)
               stripped_quotes = stripped_quotes(line)
-              if stripped_quotes.match?(%r{/\*})
+              if stripped_quotes.include?("/*") && !multiline_comment
                 multiline_comment = true
-                line.last.sub!(/(?<!['"])\/\*.*$/, '')
+                line[-1] = line.last.reverse.sub(%r{.*?\*/}, "").reverse
               elsif multiline_comment
-                next unless stripped_quotes.match?(%r{\*/})
+                next unless stripped_quotes.include?("*/")
 
                 multiline_comment = false
-                line.last.sub!(/.*\*\/(?<!['"])/, '')
+                line.last.sub!(%r{.*\*/(?<!['"])}, "")
+              end
+              if stripped_quotes.include?("/*") && !multiline_comment
+                multiline_comment = true
+                line[-1] = line.last.reverse.sub(%r{.*?\*/}, "").reverse
               end
               next if empty_line?(line)
             end
             line
-          end.compact
+          end
         end
 
         def remove_comments!(line)
-          line.last.gsub!(/((?<!['"])\/\*.*?\*\/(?<!['"]))/, '')
+          need_deletion = false
+          inside_char = nil
+          line[-1] = line.last.chars.each_with_index.map do |char, index|
+            if char == "/" && next_char(line, index) == "*" && inside_char.nil?
+              if remaining_string_range(line, index).include?("*/")
+                need_deletion = true
+                next
+              end
+            elsif char == "/" && prev_char(line, index) == "*" && inside_char.nil? && need_deletion
+              need_deletion = false
+              next
+            elsif char == '"' && !need_deletion
+              if inside_char == '"'
+                inside_char = nil
+                next char
+              end
+
+              inside_char = '"' if inside_char.nil?
+            elsif char == "'" && !need_deletion
+              if inside_char == "'"
+                inside_char = nil
+                next char
+              end
+
+              inside_char = "'" if inside_char.nil?
+            end
+            char unless need_deletion
+          end&.compact&.join
+        end
+
+        def remaining_string_range(line, index)
+          line.last[index..]
+        end
+
+        def prev_char(line, index)
+          line.last[index - 1] if index.positive?
+        end
+
+        def next_char(line, index)
+          line.last[index + 1]
         end
 
         def remove_whitespace!(line)
-          if line.last.gsub(/\n/, '').match?(/^\s*$/)
-            line.last.gsub!(/^\s*$/, '')
-          end
+          return unless line.last.delete("\n").match?(/^\s*$/)
+
+          line.last.gsub!(/^\s*$/, "")
         end
 
         def stripped_quotes(line)
-          line.last.gsub(/(['"]).*?\1/, '')
+          inside_char = nil
+          escaped = false
+          escaped_backslash = false
+          line.last.chars.each_with_index.filter_map do |char, index|
+            if ["'", '"'].include?(char) && inside_char.nil?
+              inside_char = char
+              next
+            elsif char == "\\" && next_char(line, index) == "\\" && inside_char
+              escaped_backslash = true
+              next
+            elsif char == "\\"
+              if ["'",
+                  '"'].include?(next_char(line, index)) && inside_char == next_char(line, index) && !escaped_backslash
+                escaped = true
+              end
+              escaped_backslash = false
+              next
+            elsif char == inside_char && !inside_char.nil?
+              inside_char = nil unless escaped
+              escaped = false
+              next
+            elsif inside_char
+              next
+            else
+              char
+            end
+          end.join
         end
 
         def empty_line?(line)
-          line.last.gsub(/[\n\s]/, '').empty?
+          line.last.gsub(/[\n\s]/, "").empty?
         end
       end
     end

data/lib/slim/embedded/minify/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SlimEmbeddedMinify
-  VERSION = "0.2.4"
+  VERSION = "0.2.6"
 end

data/slim-embedded-minify.gemspec

@@ -27,5 +27,6 @@ Gem::Specification.new do |spec|
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.add_runtime_dependency 'slim', '~> 5.1'
+  spec.add_runtime_dependency "slim", "~> 5.1"
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim-embedded-minify
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Yudai Takada
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -49,6 +49,7 @@ metadata:
   homepage_uri: https://github.com/ydah/slim-embedded-minify
   source_code_uri: https://github.com/ydah/slim-embedded-minify
   changelog_uri: https://github.com/ydah/slim-embedded-minify/releases
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths: