condenser 1.3 → 1.5

data/lib/condenser/processors/js_analyzer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser::JSAnalyzer
 
   include Condenser::ParseHelpers
@@ -14,8 +16,10 @@ class Condenser::JSAnalyzer
     @sourcefile = input[:source_file]
     @source = input[:source]
     @stack =  [:main]
+    @previous = [[]]
 
-    input[:export_dependencies] ||= []
+    input[:linked_assets] ||= Set.new
+    input[:export_dependencies] ||= Set.new
 
     scan_until(/\A(\/\/[^\n]*(\n|\z))*/)
     if matched
@@ -28,6 +32,7 @@ class Condenser::JSAnalyzer
     end
     
     last_postion = nil
+    last_stack = nil
     while !eos?
       case @stack.last
 
@@ -35,14 +40,19 @@ class Condenser::JSAnalyzer
         scan_until(/(\$\{|\`)/)
         case matched
         when '`'
-          @stack.pop
+          @stack.pop if pre_match[-1] != "\\" && pre_match[-1] != "\\"
         when '${'
           @stack << :tick_statment
         end
 
       when :import
-        scan_until(/[\"\'\`]/)
-        input[:export_dependencies] << case matched
+        scan_until(/[\"\'\`\(]/)
+        dynamic = if matched == "("
+          scan_until(/[\"\'\`]/)
+          true
+        end
+        
+        filename = case matched
         when "\""
           double_quoted_value
         when "'"
@@ -50,66 +60,142 @@ class Condenser::JSAnalyzer
         when '`'
           tick_quoted_value
         end
-        scan_until(/(;|\n)/)
+
+        input[:type] = "module"
+        if dynamic
+          input[:process_dependencies] << filename
+          input[:linked_assets] << filename 
+        else
+          input[:export_dependencies] << filename
+        end
+        scan_until(/(;|\n|\))/)
         @stack.pop
 
+      when :export
+        input[:type] = "module"
+        input[:exports] = true;
+        input[:default_export] = true if gobble(/\s+default/)
+        gobble(/\s+/)
+
+        if gobble(/\{/)
+          @stack << :brackets
+          @previous << []
+        elsif gobble(/\*/)
+          @stack << :export_from
+        else
+          @stack.pop
+        end
+
+      when :export_from
+        if gobble(/\s+from\s+/)
+          scan_until(/\"|\'/)
+          input[:export_dependencies] <<  case matched
+          when '"'
+            double_quoted_value
+          when "'"
+            single_quoted_value
+          end
+        end
+        @stack.pop
+        @stack.pop
+        
       else
-        scan_until(/(\/\/|\/\*|\/|\(|\)|\{|\}|\"|\'|\`|export|import|\z)/)
+        scan_until(/(\/\/|\/\*|\/|\(|\)|\{|\}|\"|\'|\`|export(?![[:alnum:]])|import(?![[:alnum:]])|\z)/)
 
         case matched
         when '//'
           scan_until(/(\n|\z)/)
+          @previous.last << :single_line_comment
         when '/*'
           scan_until(/\*\//)
+          @previous.last << :multi_line_comment
         when '"'
           double_quoted_value
+          @previous.last << :double_quoted_value
         when "'"
           single_quoted_value
+          @previous.last << :single_quoted_value
         when '`'
           @stack << :tick_value
         when '/'
-          if match_index = @source.rindex(/(\w+|\)|\])\s*\//, @index)
-            match = @source.match(/(\w+|\)|\])\s*\//, match_index)
-            if match[0].length + match_index != @index
+          if pre_match.match(/(\W|\A)(void|typeof|return|export)\z/)
+            regex_value
+          elsif match_index = @source.rindex(/(\w+|\)|\])(\s*)\//m, @index)
+            match = @source.match(/(\w+|\)|\])(\s*)\//, match_index)
+            
+            x = @previous.last.dup
+            while match[2]&.index("\n") && [:single_line_comment, :multi_line_comment].include?(x.last)
+              case x.last
+              when :single_line_comment
+                match_index = @source.rindex(/[^\n]*\/\/[^\n]*\s*/m, match.begin(2))
+                match = @source.match(/(\w+|\)|\])\s*\//, match_index)
+              when :multi_line_comment
+                match_index = @source.rindex(/\/\*/m, match.begin(2))
+                match = @source.match(/(\w+|\)|\])\s*\//, match_index)
+              end
+            end
+
+            if @previous.last.last == :loop && match[1] =~ /\)\z/
+              regex_value
+            elsif %w(void typeof return export).include?(match[1])
+              regex_value
+            elsif match[0].length + match_index != @index
+              regex_value
+            elsif match[1].strip.empty?
               regex_value
             end
           else
             regex_value
           end
         when '('
-          @stack.push :parenthesis
+          @stack << if pre_match =~ /\W*(for|while)\s*\z/
+            :loop
+          else
+            :parenthesis
+          end
         when ')'
-          raise unexptected_token(")") if @stack.last != :parenthesis
-          @stack.pop
+          raise unexptected_token(")") if @stack.last != :parenthesis && @stack.last != :loop
+          @previous.last << @stack.pop
         when '{'
           @stack.push :brackets
+          @previous << []
         when '}'
           case @stack.last
-          when :brackets, :tick_statment
+          when :tick_statment
             @stack.pop
+          when :brackets
+            @stack.pop
+            @previous.pop
+            @previous.last << :brackets
+            if @stack.last == :export
+              @stack.pop
+              @stack << :export_from if peek(/\s+from/i)
+            end
           else
             raise unexptected_token("}")
           end
         when 'export'
           if @stack.last == :main
-            input[:exports] = true;
-            input[:default_export] = true if next_word == 'default'
+            @stack << :export
           end
         when 'import'
-          if @stack.last == :main
-            @stack << :import
-          end
+          @stack << :import
         else
           @stack.pop
         end
       end
 
-      if last_postion == @index
+      if last_postion == @index && last_stack == @stack.last
+        syntax_error = Condenser::SyntaxError.new("Error parsing JS file with JSAnalyzer")
+        syntax_error.instance_variable_set(:@path, @sourcefile)
         raise Condenser::SyntaxError, "Error parsing JS file with JSAnalyzer"
       else
         last_postion = @index
+        last_stack = @stack.last
       end
     end
+    
+    raise Condenser::SyntaxError, "Unexpected EOF" if !@stack.empty? && @stack.last != :main
   end
   
   def unexptected_token(token)
@@ -119,26 +205,26 @@ class Condenser::JSAnalyzer
 
     message = "Unexpected token #{token} #{@sourcefile} #{lineno.to_s.rjust(4)}:#{(@index-start)}"
     message << "\n#{lineno.to_s.rjust(4)}: " << @source[start..uptop]
-    message << "\n      #{'-'* (@index-1-start)}#{'^'*(@matched.length)}"
+    message << "\n      #{'-'* ([@index-1-start,1].max)}#{'^'*([@matched.length,1].max)}"
     message << "\n"
-    Condenser::SyntaxError.new(message)
+    
+    syntax_error = Condenser::SyntaxError.new(message)
+    syntax_error.instance_variable_set(:@path, @sourcefile)
+    syntax_error
   end
   
   def double_quoted_value
-    ret_value = ""
+    ret_value = String.new
 
-    while scan_until(/[\"\n]/)
-      if matched == "\n"
+    while scan_until(/[\"\n\\]/)
+      case matched
+      when "\n"
         raise unexptected_token("\\n")
-      elsif matched == "\""
-        if pre_match[-1] != "\\"
-          ret_value << pre_match
-          return ret_value
-        else
-          ret_value << pre_match << "\\\""
-        end
-
-        
+      when "\\"
+        ret_value << pre_match << matched << gobble(1)
+      when "\""
+        ret_value << pre_match
+        return ret_value
       else
         ret_value << match
       end
@@ -146,7 +232,7 @@ class Condenser::JSAnalyzer
   end
   
   def single_quoted_value
-    ret_value = ""
+    ret_value = String.new
 
     while scan_until(/[\'\n]/)
       if matched == "\n"
@@ -161,7 +247,7 @@ class Condenser::JSAnalyzer
   end
 
   def tick_quoted_value
-    ret_value = ""
+    ret_value = String.new
 
     while scan_until(/[\`]/)
       if matched == "\`" && pre_match[-1] != "\\"
@@ -174,16 +260,37 @@ class Condenser::JSAnalyzer
   end
   
   def regex_value
-    ret_value = ""
+    ret_value = String.new
 
-    while scan_until(/\//)
-      if matched == "/" && pre_match[-1] != "\\"
-        ret_value << pre_match
-        return ret_value
-      else
-        ret_value << pre_match
+    regex_stack =  ['/']
+    while !regex_stack.empty?
+      
+      scan_until(/[\/\[\]]/)
+      escaped = pre_match[-1] == "\\" && pre_match[-2] != "\\"
+      ret_value << pre_match
+      case matched
+      when "["
+        regex_stack << '[' if !escaped && regex_stack.last != "["
+        ret_value << matched
+      when "]"
+        regex_stack.pop if !escaped && regex_stack.last == "["
+        ret_value << matched
+      when "/"
+        # From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Character_class
+        # 
+        # The lexical grammar does a very rough parse of regex literals, so
+        # that it does not end the regex literal at a / character which appears
+        # within a character class. This means /[/]/ is valid without needing
+        # to escape the /.
+        if !escaped && regex_stack.last != "[" && regex_stack.pop != "/"
+          raise unexptected_token("/")
+        else
+          ret_value << matched
+        end
       end
     end
+
+    ret_value
   end
 
 end

data/lib/condenser/processors/node_processor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tempfile'
 require 'open3'
 
@@ -60,6 +62,7 @@ class Condenser
       lineno = lines[0][/\((\d+):\d+\)$/, 1] if lines[0]
       lineno ||= 1
       error.set_backtrace(["#{source_file}:#{lineno}"] + caller)
+      error.instance_variable_set(:@path, source_file)
       error
     end
     

data/lib/condenser/processors/purgecss_processor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 class Condenser::PurgeCSSProcessor < Condenser::NodeProcessor