slim-embedded-minify 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae5665cb9baa381cc6a7f9abef491e6bc9805c1d7a77af47428a16dd4cd1ce07
-  data.tar.gz: 7a38354fdb3dacb1ea4c034cce7129f3aa7c66e22d0c7326e685c9cc84d06f9a
+  metadata.gz: 14375e81992194bca2bc3c42733011ccb783db89cf89a3dffbb62ec3245f2184
+  data.tar.gz: 824370e31b97a05335c8d4c4a64c1bed55ea02ea9a678faa8609a4308c1657b6
 SHA512:
-  metadata.gz: a46495c0cf4e673ecf61693e04246d7bea875b2ff6dadddea29b68d94ed4e34a8417cc506243fdf81d9ce718e73b09fd12403edef342e2f4598c72306db93116
-  data.tar.gz: ea8111ae9eb161bfc10f5b5594cd1c207cc00b50a7c06f823b4b9ca6aabda4dd01ee6d3b68cad86d47fe11b02151a33b12942f55897a9ccacc29eb84d893aa80
+  metadata.gz: 947549a68e10777ab21e2779ac67491a7be49cdb54e800f08e8b0fa891138ee72dc249f3216bbe9ac8f2b9f1e3574f1592a156c2ef90fa3c751771b1237e317b
+  data.tar.gz: df9d4962e7ba6e74492306c5367ff7c44bb6c5a9527b77dd19514bd2104da0a0de0020cd0bac68e58ccdbe33de7cfe48bb3819eef2cb4c4fb2391a38540e69e4

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Unreleased
 
+## 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.
+
 ## 0.2.3 - 2023-07-27
 
 - Fix to not removing line when a block comment if it starts at the end of a line.

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

@@ -11,11 +11,41 @@ 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
+          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 == '"' && !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
       end
     end

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

@@ -13,43 +13,87 @@ 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.gsub!(/\/\*.*$/, '')
+                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.gsub!(/.*\*\//, '')
+                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]
+        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/, '')
+          line.last.gsub(/(['"]).*?\1/, "")
         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.3"
+  VERSION = "0.2.5"
 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.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Yudai Takada
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-26 00:00:00.000000000 Z
+date: 2023-07-27 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: