condenser 1.2 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2b1dab33dd825d2bf0902e871c68c0334d49ee7af48ee0875132f39adce20d2
-  data.tar.gz: a3c40f6f19722d0cea00e28592cd2049db5185057b299bf697fc169c9a19c89a
+  metadata.gz: 171baa1e5cd8016c4b2e7f142147d174410085ede075c101da43b743a4ad6fec
+  data.tar.gz: 9c97b58fb2bf540b335f6504997da99fac72891f61a0a0631639ae3fd9f28482
 SHA512:
-  metadata.gz: c1ca10d2f7dff116d1b4d4daeba50302509c7faffed458e2312d40c391b84a407d596487102a4e306abd9a96bd435c39d0fb23add68a3608aa64014b3fffe0d7
-  data.tar.gz: 3f530d21b0ec272d51aabd96f0218dfc1a02dbb8845dbefd3d92cf1517447bc436785a102415ad9fda696df26d9769f67485f8530445eb66b48dc3318ffd8e72
+  metadata.gz: decc8b993d0e99c5212f3c0b1d4be88de43d49ab1386f32936a0dae482fc9b45de55cbbc51d99eafce58bcd68809a20fd27267ef0fe62d3aa3a244e33e68992e
+  data.tar.gz: e39a90c28c7beab789885e53e35ae0ad43340ff4009f81ad1586ac16eb0073dbaf999b69a94f78e796f5bfe5e93a16e0a45481e76b706d0e496dfbe5435b4966

data/lib/condenser/asset.rb

@@ -65,33 +65,31 @@ class Condenser
     def process_dependencies
       deps = @environment.cache.fetch "direct-deps/#{cache_key}" do
         process
-        @process_dependencies
+        @process_dependencies.map { |fn| [normalize_filename_base(fn[0]), fn[1]] }
       end
     
-      d = []
-      deps.each do |i|
-        i = [i, @content_types] if i.is_a?(String)
+      deps.inject([]) do |memo, i|
+        i[0] = File.join(@environment.base, i[0].delete_prefix('!')) if i[0].start_with?('!') && @environment.base
         @environment.resolve(i[0], File.dirname(@source_file), accept: i[1]).each do |asset|
-          d << asset
+          memo << asset
         end
+        memo
       end
-      d
     end
     
     def export_dependencies
       deps = @environment.cache.fetch "export-deps/#{cache_key}" do
         process
-        @export_dependencies + @process_dependencies
+        (@export_dependencies + @process_dependencies).map { |fn| [normalize_filename_base(fn[0]), fn[1]] }
       end
       
-      d = []
-      deps.each do |i|
-        i = [i, @content_types] if i.is_a?(String)
+      deps.inject([]) do |memo, i|
+        i[0] = File.join(@environment.base, i[0].delete_prefix('!')) if i[0].start_with?('!') && @environment.base
         @environment.resolve(i[0], File.dirname(@source_file), accept: i[1]).each do |asset|
-          d << asset
+          memo << asset
         end
+        memo
       end
-      d
     end
     
     def has_default_export?
@@ -123,17 +121,27 @@ class Condenser
       end
     end
     
-    def all_process_dependencies
-      f = [@source_file]
-      all_dependenies(process_dependencies, [], :process_dependencies) do |dep|
+    def all_process_dependencies(visited = Set.new)
+      f = []
+      if !visited.include?(@source_file)
+        f << @source_file
+        visited << self.source_file
+      end
+      
+      all_dependenies(process_dependencies, visited, :process_dependencies) do |dep|
         f << dep.source_file
       end
       f
     end
     
-    def all_export_dependencies
-      f = [@source_file]
-      all_dependenies(export_dependencies, [], :export_dependencies) do |dep|
+    def all_export_dependencies(visited = Set.new)
+      f = []
+      if !visited.include?(@source_file)
+        f << @source_file
+        visited << self.source_file
+      end
+      
+      all_dependenies(export_dependencies, visited, :export_dependencies) do |dep|
         f << dep.source_file
       end
       f
@@ -143,19 +151,29 @@ class Condenser
       @cache_key ||= Digest::SHA1.base64digest(JSON.generate([
         Condenser::VERSION,
         @environment.pipline_digest,
-        @environment.base ? @source_file.delete_prefix(@environment.base) : @source_file,
+        normalize_filename_base(@source_file),
         Digest::SHA256.file(@source_file).hexdigest,
         @content_types_digest
       ]))
     end
     
+    # Remove Enviroment base if it exists. This allows two of the same repos
+    # in a different location to use the same cache (like capistrano deploys)
+    def normalize_filename_base(source_filename)
+      if @environment.base && source_filename.start_with?(@environment.base)
+        '!'+source_filename.delete_prefix(@environment.base).delete_prefix(File::SEPARATOR)
+      else
+        source_filename
+      end
+    end
+    
     def process_cache_version
       return @pcv if @pcv
 
       f = []
-      all_dependenies(process_dependencies, [], :process_dependencies) do |dep|
+      all_dependenies(process_dependencies, Set.new, :process_dependencies) do |dep|
         f << [
-          @environment.base ? dep.source_file.delete_prefix(@environment.base) : dep.source_file,
+          normalize_filename_base(dep.source_file),
           Digest::SHA256.file(dep.source_file).hexdigest
         ]
       end
@@ -167,9 +185,9 @@ class Condenser
       return @ecv if @ecv
 
       f = []
-      all_dependenies(export_dependencies, [], :export_dependencies) do |dep|
+      all_dependenies(export_dependencies, Set.new, :export_dependencies) do |dep|
         f << [
-          @environment.base ? dep.source_file.delete_prefix(@environment.base) : dep.source_file,
+          normalize_filename_base(dep.source_file),
           Digest::SHA256.file(dep.source_file).hexdigest
         ]
       end
@@ -206,9 +224,9 @@ class Condenser
             content_type: mime_types,
 
             map: nil,
-            linked_assets: [],
-            process_dependencies: [],
-            export_dependencies: [],
+            linked_assets: Set.new,
+            process_dependencies: Set.new,
+            export_dependencies: Set.new,
             
             processors: Set.new
           }
@@ -276,6 +294,8 @@ class Condenser
       
           data[:digest] = @environment.digestor.digest(data[:source])
           data[:digest_name] = @environment.digestor.name.sub(/^.*::/, '').downcase
+          data[:process_dependencies] = normialize_dependency_names(data[:process_dependencies])
+          data[:export_dependencies] = normialize_dependency_names(data[:export_dependencies])
 
           # Do this here and at the end so cache_key can be calculated if we
           # run this block
@@ -285,15 +305,14 @@ class Condenser
           @content_types = data[:content_type]
           @digest = data[:digest]
           @digest_name = data[:digest_name]
-          @linked_assets = data[:linked_assets]
-          @process_dependencies = data[:process_dependencies]
-          @export_dependencies = data[:export_dependencies]
+          @linked_assets = Set.new(data[:linked_assets])
+          @process_dependencies = Set.new(data[:process_dependencies])
+          @export_dependencies = Set.new(data[:export_dependencies])
           @default_export = data[:default_export]
           @exports = data[:exports]
           @processors = data[:processors]
           @processors_loaded = true
           @processed = true
-          
           data
         end
       end
@@ -304,9 +323,9 @@ class Condenser
       @content_types = result[:content_type]
       @digest = result[:digest]
       @digest_name = result[:digest_name]
-      @linked_assets = result[:linked_assets]
-      @process_dependencies = result[:process_dependencies]
-      @export_dependencies  = result[:export_dependencies]
+      @linked_assets = Set.new(result[:linked_assets])
+      @process_dependencies = Set.new(result[:process_dependencies])
+      @export_dependencies  = Set.new(result[:export_dependencies])
       @default_export = result[:default_export]
       @exports = result[:exports]
       @processors = result[:processors]
@@ -315,6 +334,17 @@ class Condenser
       @processed = true
     end
     
+    def normialize_dependency_names(deps)
+      deps.map do |fn|
+        if fn.is_a?(String)
+          dirname, basename, extensions, mime_types = @environment.decompose_path(fn, source_file)
+          [dirname ? File.join(dirname, basename) : basename, mime_types.empty? ? @content_types : mime_types]
+        else
+          fn
+        end
+      end
+    end
+    
     def export
       return @export if @export
       
@@ -335,11 +365,15 @@ class Condenser
             export_dependencies: []
           }
         
-          if exporter = @environment.exporters[content_type]
-            exporter.call(@environment, data)
+          if @environment.exporters.has_key?(content_type)
+            @environment.exporters[content_type].each do |exporter|
+              @environment.logger.info { "Exporting #{self.filename} with #{exporter.name}" }
+              exporter.call(@environment, data)
+            end
           end
 
           if minifier = @environment.minifier_for(content_type)
+            @environment.logger.info { "Minifing #{self.filename} with #{minifier.name}" }
             minifier.call(@environment, data)
           end
         

data/lib/condenser/build_cache.rb

@@ -22,6 +22,10 @@ class Condenser
       else
         @semaphore = Mutex.new
         @listener = Listen.to(*path) do |modified, added, removed|
+          modified = Set.new(modified)
+          added = Set.new(added)
+          removed = Set.new(removed)
+          
           @semaphore.synchronize do
             @logger.debug { "build cache semaphore locked by #{Thread.current.object_id}" }
             @logger.debug do
@@ -33,7 +37,7 @@ class Condenser
             end
 
             globs = []
-            (added + removed).each do |file|
+            (added + removed + modified).each do |file|
               globs << file.match(/([^\.]+)(\.|$)/).to_a[1]
               if path_match = @path.find { |p| file.start_with?(p) }
                 a = file.delete_prefix(path_match).match(/([^\.]+)(\.|$)/).to_a[1]
@@ -122,16 +126,25 @@ class Condenser
     
     def []=(value, assets)
       @lookup_cache[value] = assets
+      
+      if @fetching.nil?
+        begin
+          assets.each do |asset|
+            @fetching = Set.new
+            asset.all_process_dependencies(@fetching).each do |pd|
+              @process_dependencies[pd] ||= Set.new
+              @process_dependencies[pd] << asset
+            end
 
-      assets.each do |asset|
-        asset.all_process_dependencies.each do |pd|
-          @process_dependencies[pd] ||= Set.new
-          @process_dependencies[pd] << asset
-        end
+            @fetching = Set.new
+            asset.all_export_dependencies(@fetching).each do |pd|
+              @export_dependencies[pd] ||= Set.new
 
-        asset.all_export_dependencies.each do |pd|
-          @export_dependencies[pd] ||= Set.new
-          @export_dependencies[pd] << asset
+              @export_dependencies[pd] << asset
+            end
+          end
+        ensure
+          @fetching = nil
         end
       end
     end

data/lib/condenser/context.rb

@@ -35,7 +35,7 @@ class Condenser
       end
     end
 
-    attr_reader :environment, :filename
+    attr_reader :environment, :filename, :links, :dependencies
 
     def initialize(environment)
       @environment  = environment
@@ -110,29 +110,14 @@ class Condenser
     # `depend_on` allows you to state a dependency on a file without
     # including it.
     #
-    # This is used for caching purposes. Any changes made to
-    # the dependency file will invalidate the cache of the
-    # source file.
-    def depend_on(path)
-      if environment.absolute_path?(path) && environment.stat(path)
-        @dependencies << environment.build_file_digest_uri(path)
-      else
-        resolve(path)
-      end
-      nil
-    end
-
-    # `depend_on_asset` allows you to state an asset dependency
-    # without including it.
-    #
     # This is used for caching purposes. Any changes that would
     # invalidate the dependency asset will invalidate the source
-    # file. Unlike `depend_on`, this will recursively include
-    # the target asset's dependencies.
-    def depend_on_asset(path)
-      asset = environment.find!(path)
-      @dependencies << asset.source_file
-      asset
+    # file.
+    def depend_on(path)
+      d = environment.decompose_path(path)
+      @dependencies << [File.join(*d[0], d[1]), [d[3]]]
+
+      nil
     end
 
     # `depend_on_env` allows you to state a dependency on an environment
@@ -150,9 +135,8 @@ class Condenser
     #
     # Returns an Asset or nil.
     def link_asset(path)
-      asset = depend_on_asset(path)
-      @links << asset.path
-      asset
+      depend_on(path)
+      @links << path
     end
 
     # Returns a `data:` URI with the contents of the asset at the specified

data/lib/condenser/helpers/parse_helpers.rb

@@ -3,7 +3,7 @@ module Condenser::ParseHelpers
   attr_accessor :matched
 
   def eos?
-    @index >= @source.size
+    @index >= (@source.size - 1)
   end
 
   def scan_until(r)
@@ -55,4 +55,11 @@ module Condenser::ParseHelpers
     "#{lineno.to_s.rjust(4)}: " + @source[start..uptop] + "\n      #{'-'* (@index-1-start)}#{'^'*(@matched.length)}"
   end
 
+  def gobble(r)
+    m = @source.match(r, @index)
+    if m&.begin(0) == @index
+      scan_until(r)
+    end
+  end
+
 end

data/lib/condenser/manifest.rb

@@ -71,7 +71,9 @@ class Condenser
 
       @data[asset.filename] = export.to_json
       outputs = export.write(@dir)
-      asset.linked_assets.each { |a| outputs += add_asset(a) }
+      asset.linked_assets.each do |la|
+        @environment.resolve(la).each { |a| outputs += add_asset(a) }
+      end
       outputs
     end
     

data/lib/condenser/pipeline.rb

@@ -98,11 +98,16 @@ class Condenser
     end
     
     def register_exporter(mime_type, engine)
-      @exporters[mime_type] = engine
+      @exporters[mime_type] ||= []
+      @exporters[mime_type] << engine
     end
     
-    def unregister_exporter(mime_type, engine)
-      @exporters[mime_type] = nil
+    def unregister_exporter(mime_type, engine=nil)
+      if engine.nil?
+        @exporters[mime_type].clear
+      else
+        @exporters[mime_type]&.reject! { |e| e == engine || e.is_a?(engine) }
+      end
     end
     
     def register_minifier(mime_type, engine)

data/lib/condenser/processors/babel_processor.rb

@@ -4,7 +4,7 @@ class Condenser::BabelProcessor < Condenser::NodeProcessor
   
   attr_accessor :options
   
-  def initialize(dir = nil, options = {})
+  def initialize(dir = nil, **options)
     super(dir)
     
     options[:plugins] ||= [
@@ -95,23 +95,17 @@ class Condenser::BabelProcessor < Condenser::NodeProcessor
             ImportDeclaration(path, state) {
               imports.push(path.node.source.value);
             },
-            ExportDefaultDeclaration(path, state) {
+
+            ExportDeclaration(path, state) {
               hasExports = true;
-              defaultExport = true;
+              if (path.node.source) {
+                imports.push(path.node.source.value);
+              }
             },
-            ExportDefaultSpecifier(path, state) {
-              hasExports = true;
+
+            ExportDefaultDeclaration(path, state) {
               defaultExport = true;
-            },
-            ExportAllDeclaration(path, state) {
-              hasExports = true;
-            },
-            ExportNamedDeclaration(path, state) {
-              hasExports = true;
-            },
-            ExportSpecifier(path, state) {
-              hasExports = true;
-            },
+            }
           }
         };
       });

data/lib/condenser/processors/css_media_combiner_processor.rb

@@ -0,0 +1,81 @@
+class Condenser::CSSMediaCombinerProcessor
+  
+  include Condenser::ParseHelpers
+  
+  def self.setup(env)
+  end
+  
+  def self.call(environment, input)
+    new.call(environment, input)
+  end
+
+  def reduce_media_query(queries)
+    output = ''
+    queries.each do |query, contents|
+      output << query if query
+      output << if contents.is_a?(Hash)
+        reduce_media_query(contents)
+      else
+        contents + '}'
+      end
+    end
+    output
+  end
+  
+  def call(environment, input)
+    seek(0)
+    @sourcefile = input[:source_file]
+    @source = input[:source]
+    @stack =  []
+    @selectors = []
+    @media_queries = {}
+
+    input[:source] = ''
+    while !eos?
+      output = if @selectors.empty?
+        input[:source]
+      else
+        (@selectors[0...-1].reduce(@media_queries) { |hash, selector| hash[selector] ||= {} }[@selectors.last] ||= '')
+      end
+      
+      case @stack.last
+      when :media_query
+        scan_until(/(@media[^\{]*{|\{|\})/)
+        case matched
+        when '{'
+          output << pre_match << matched
+          @stack << :statement
+        when '}'
+          output << pre_match
+          @stack.pop
+          @selectors.pop
+        else
+          output << pre_match
+          @selectors << matched.squish
+          @stack << :media_query
+        end
+      when :statement
+        scan_until(/(\{|\})/)
+        output << pre_match << matched
+        case matched
+        when '{'
+          @stack << :statement
+        when '}'
+          @stack.pop
+        end
+      else
+        case scan_until(/(@media[^\{]*{|\Z)/)
+        when ''
+          output << pre_match
+        else
+          output << pre_match
+          @selectors << matched.squish
+          @stack << :media_query
+        end
+      end
+    end
+
+    input[:source] << reduce_media_query(@media_queries)
+  end
+
+end

data/lib/condenser/processors/js_analyzer.rb

@@ -1,5 +1,3 @@
-require 'condenser/helpers/parse_helpers'
-
 class Condenser::JSAnalyzer
 
   include Condenser::ParseHelpers
@@ -17,7 +15,7 @@ class Condenser::JSAnalyzer
     @source = input[:source]
     @stack =  [:main]
 
-    input[:export_dependencies] ||= []
+    input[:export_dependencies] ||= Set.new
 
     scan_until(/\A(\/\/[^\n]*(\n|\z))*/)
     if matched
@@ -30,6 +28,7 @@ class Condenser::JSAnalyzer
     end
     
     last_postion = nil
+    last_stack = nil
     while !eos?
       case @stack.last
 
@@ -55,6 +54,32 @@ class Condenser::JSAnalyzer
         scan_until(/(;|\n)/)
         @stack.pop
 
+      when :export
+        input[:exports] = true;
+        input[:default_export] = true if gobble(/\s+default/)
+        gobble(/\s+/)
+
+        if gobble(/\{/)
+          @stack << :brackets
+        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)/)
 
@@ -87,15 +112,17 @@ class Condenser::JSAnalyzer
           @stack.push :brackets
         when '}'
           case @stack.last
-          when :brackets, :tick_statment
+          when :tick_statment
+            @stack.pop
+          when :brackets
             @stack.pop
+            @stack << :export_from if @stack.last == :export
           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
@@ -106,10 +133,13 @@ class Condenser::JSAnalyzer
         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
   end
@@ -123,7 +153,10 @@ class Condenser::JSAnalyzer
     message << "\n#{lineno.to_s.rjust(4)}: " << @source[start..uptop]
     message << "\n      #{'-'* (@index-1-start)}#{'^'*(@matched.length)}"
     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

data/lib/condenser/processors/node_processor.rb

@@ -60,6 +60,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

@@ -34,7 +34,7 @@ class Condenser::PurgeCSSProcessor < Condenser::NodeProcessor
       const { PurgeCSS } = require("#{File.join(npm_module_path('purgecss'))}")
       const options = #{@options.to_json}
       options.css = [{
-        raw: #{input[:source].inspect}
+        raw: #{JSON.dump(input[:source])}
       }]
       if(options.safelist) {
         options.safelist = options.safelist.map(s => {
@@ -44,13 +44,16 @@ class Condenser::PurgeCSSProcessor < Condenser::NodeProcessor
           return s
         })
       }
+      if(!options.defaultExtractor) {
+        options.defaultExtractor = content => content.match(/[\\w\\-\\/\\:]+(?<!:)/g) || []
+      }
       const result = new PurgeCSS().purge(options)
       try {
         result.then(
           r => console.log(JSON.stringify({
             success: r[0]
           })),
-          function() {console.log(JSON.stringify({'error': arguments}))}
+          function(e) {console.log(JSON.stringify({'error': [e.name, e.message, e.stack]}))}
         )
       } catch(e) {
         console.log(JSON.stringify({'error': [e.name, e.message, e.stack]}));
@@ -60,11 +63,10 @@ class Condenser::PurgeCSSProcessor < Condenser::NodeProcessor
       if result['error'][0] == 'SyntaxError'
         raise exec_syntax_error(result['error'][1], "/assets/#{input[:filename]}")
       else
-        raise exec_runtime_error(result['error'][0] + ': ' + result['error'][1])
+        raise exec_runtime_error(result['error']["0"]["name"] + ": " + result['error']["0"]["reason"])
       end
     else
       input[:source] = result["success"]["css"]
     end
   end
-
 end