condenser 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a3307e3793ca525115048d1d418cccdd1ec5727171475fc4909a15b178ac14b
-  data.tar.gz: b991118f195efe01eaae6960862c1101e273f86f3bb1a3ccad009c3ad98f213d
+  metadata.gz: d330a97b14eba56db0e2404b7b5c8bc95880c5a17ef8886bc0fed653311dcb0f
+  data.tar.gz: 8b67113289b161903a55be74073ad979580710fd557f5ad97c6c1e65ef903200
 SHA512:
-  metadata.gz: ce1137d43308c657fffaff3620a6a6095cf961d697a7c56c85dc685821f637b8e6efe73bfa341ae810b467170fa4ccc6b8e8a7a76cca1e42f24e4e112b47418d
-  data.tar.gz: ffc9df1b3a0222888272d7bcff193854ca4eae42d379d974cbf377cd2302aca24bc839ba82de5ae49efa965e64b455523e19cb06845b936e47c1a115d30f16f8
+  metadata.gz: df64dbbbb0ec741c7d4af17d71d4dd0e855fc82f13220775353c361ae4da0254cd233fbeb143bca2536c8331b425c67b3247151fc59214fef5a34b8c1a13880d
+  data.tar.gz: 563064dd6255fb14cbd7bed0ae7bbc6bd64a1c019e7ed3f2837c449c05041333b5c4aca91391e918fbf8b99d4aa7e0725b120cb30819467f193ddd48347cb607

data/lib/condenser.rb

@@ -11,13 +11,10 @@ require 'condenser/encoding_utils'
 require 'condenser/asset'
 require 'condenser/manifest'
 
-require 'active_support/benchmarkable'
-
 class Condenser
-
-  include ActiveSupport::Benchmarkable
+  
   prepend Environment, Pipeline, Resolve
-
+  
   autoload :BabelProcessor,   'condenser/processors/rollup_processor'
   autoload :RollupProcessor,  'condenser/processors/babel_processor'
   autoload :UglifyMinifier,   'condenser/minifiers/uglify_minifier'
@@ -28,7 +25,8 @@ class Condenser
   autoload :EjsTransformer,   'condenser/transformers/ejs'
   autoload :FileWriter,       'condenser/writers/file_writer'
   autoload :ZlibWriter,       'condenser/writers/zlib_writer'
-
+  autoload :BuildCache,       'condenser/build_cache'
+  
   def self.configure(&block)
     instance_eval(&block)
   end

data/lib/condenser/asset.rb

@@ -8,13 +8,12 @@ class Condenser
   class Asset
     
     include EncodingUtils
-    include ActiveSupport::Benchmarkable
     
     attr_reader :environment, :filename, :content_types, :source_file, :source_path
     attr_reader :linked_assets, :content_types_digest
     attr_writer :source, :sourcemap
 
-    attr_accessor :imports
+    attr_accessor :imports, :processed, :export
     
     def initialize(env, attributes={})
       @environment    = env
@@ -26,14 +25,17 @@ class Condenser
       @source_file    = attributes[:source_file]
       @source_path    = attributes[:source_path]
       
-      @linked_assets  = Set.new
-      @dependencies   = Set.new
-      @default_export = nil
-      @exports        = nil
-      @processed      = false
-      
-      @processors_loaded = false
-      @processors        = Set.new
+      @linked_assets        = Set.new
+      @process_dependencies = Set.new
+      @export_dependencies  = Set.new
+      @default_export       = nil
+      @exports              = nil
+      @processed            = false
+      @pcv                  = nil
+      @export               = nil
+      @ecv                  = nil
+      @processors_loaded    = false
+      @processors           = Set.new
     end
     
     def path
@@ -53,17 +55,21 @@ class Condenser
       @stat ||= File.stat(@source_file)
     end
     
+    def restat!
+      @stat = File.stat(@source_file)
+    end
+    
     def inspect
       dirname, basename, extensions, mime_types = @environment.decompose_path(@filename)
       <<-TEXT
-        #<#{self.class.name} @filename=#{@filename} @content_types=#{@content_types.inspect} @source_file=#{@source_file} @source_mime_types=#{mime_types.inspect}>
+        #<#{self.class.name}##{self.object_id} @filename=#{@filename} @content_types=#{@content_types.inspect} @source_file=#{@source_file} @source_mime_types=#{mime_types.inspect}>
       TEXT
     end
     
-    def dependencies
-      deps = @environment.cache.fetch("dependencies/#{cache_key(false)}") do
+    def process_dependencies
+      deps = @environment.cache.fetch "direct-deps/#{cache_key}" do
         process
-        @dependencies
+        @process_dependencies
       end
       
       d = []
@@ -76,66 +82,114 @@ class Condenser
       d
     end
     
-    def has_default_export?
-      @environment.cache.fetch("has_default_export/#{cache_key(false)}") do
+    def export_dependencies
+      deps = @environment.cache.fetch "export-deps/#{cache_key}" do
         process
-        @default_export
+        @export_dependencies + @process_dependencies
+      end
+      
+      d = []
+      deps.each do |i|
+        i = [i, nil] if i.is_a?(String)
+        @environment.resolve(i[0], File.dirname(@source_file), accept: i[1]).each do |asset|
+          d << asset
+        end
       end
+      d
+    end
+    
+    def has_default_export?
+      process
+      @default_export
     end
     
     def has_exports?
-      @environment.cache.fetch("has_exports/#{cache_key(false)}") do
-        process
-        @exports
-      end
+      process
+      @exports
     end
 
     def load_processors
       return if @processors_loaded
 
       @processors_loaded = true
-      processors = @environment.cache.fetch("processors/#{cache_key(false)}") do
-        process
-        @processors
-      end
-      processors.map! { |p| p.is_a?(String) ? p.constantize : p }
-      @environment.load_processors(*processors)
+      process
+      @processors.map! { |p| p.is_a?(String) ? p.constantize : p }
+      @environment.load_processors(*@processors)
     end
     
-    def all_dependenies(deps, visited, &block)
+    def all_dependenies(deps, visited, meth, &block)
       deps.each do |dep|
         if !visited.include?(dep.source_file)
           visited << dep.source_file
           block.call(dep)
-          all_dependenies(dep.dependencies, visited, &block)
+          all_dependenies(dep.send(meth), visited, meth, &block)
         end
       end
     end
     
-    def cache_key(include_dependencies=true)
-      key = []
-      key << [Condenser::VERSION, @source_file, @content_types_digest, stat.ino, stat.mtime.to_f, stat.size]
+    def all_process_dependencies
+      f = [@source_file]
+      all_dependenies(process_dependencies, [], :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|
+        f << dep.source_file
+      end
+      f
+    end
+    
+    def cache_key
+      Digest::SHA1.base64digest(JSON.generate([
+        Condenser::VERSION,
+        @source_file,
+        @content_types_digest
+      ]))
+    end
+    
+    def process_cache_version
+      return @pcv if @pcv
 
-      if include_dependencies
-        all_dependenies(dependencies, []) do |dep|
-          key << [dep.source_file, dep.content_types_digest, dep.stat.ino, dep.stat.mtime.to_f, dep.stat.size]
-        end
+      f = [stat.ino, stat.mtime.to_f, stat.size]
+      all_dependenies(process_dependencies, [], :process_dependencies) do |dep|
+        f << [dep.source_file, dep.stat.ino, dep.stat.mtime.to_f, dep.stat.size]
       end
 
-      Digest::SHA1.base64digest(JSON.generate(key))
+      @pcv = Digest::SHA1.base64digest(JSON.generate(f))
     end
     
-    def logger
-      @environment.logger
+    def export_cache_version
+      return @ecv if @ecv
+
+      f = [stat.ino, stat.mtime.to_f, stat.size]
+      all_dependenies(export_dependencies, [], :export_dependencies) do |dep|
+        f << [dep.source_file, dep.stat.ino, dep.stat.mtime.to_f, dep.stat.size]
+      end
+
+      @ecv = Digest::SHA1.base64digest(JSON.generate(f))
+    end
+    
+    def needs_reprocessing!
+      @processed = false
+      @pcv = nil
+      needs_reexporting!
+    end
+    
+    def needs_reexporting!
+      restat!
+      @export = nil
+      @ecv = nil
     end
     
     def process
       return if @processed
       
-      benchmark "Processing Asset #{self.filename}", level: :info do
-      result = @environment.cache.fetch_if(Proc.new { "process/#{cache_key}" }, "dependencies/#{cache_key(false)}") do
-        @environment.build do
-          
+      result = @environment.build do
+        @environment.cache.fetch_if(Proc.new {"process/#{cache_key}/#{process_cache_version}"}, "direct-deps/#{cache_key}") do
           @source = File.binread(@source_file)
           dirname, basename, extensions, mime_types = @environment.decompose_path(@source_file)
           
@@ -148,7 +202,8 @@ class Condenser
 
             map: nil,
             linked_assets: [],
-            dependencies: [],
+            process_dependencies: [],
+            export_dependencies: [],
             
             processors: Set.new
           }
@@ -160,10 +215,7 @@ class Condenser
             data[:processors] << templator_klass.name
             @environment.load_processors(templator_klass)
             
-            benchmark "Preprocessing #{data[:filename]} with #{templator.name}", level: :info do
-              templator.call(@environment, data)
-            end
-            
+            templator.call(@environment, data)
             data[:filename] = data[:filename].gsub(/\.#{extensions.last}$/, '')
           end
           
@@ -184,9 +236,7 @@ class Condenser
               data[:processors] << processor_klass.name
               @environment.load_processors(processor_klass)
 
-              benchmark "Preprocessing #{self.filename} with #{processor.name}", level: :info do
-                processor.call(@environment, data)
-              end
+              processor.call(@environment, data)
             end
           end
       
@@ -219,7 +269,8 @@ class Condenser
           @digest = data[:digest]
           @digest_name = data[:digest_name]
           @linked_assets = data[:linked_assets]
-          @dependencies = data[:dependencies]
+          @process_dependencies = data[:process_dependencies]
+          @export_dependencies = data[:export_dependencies]
           @default_export = data[:default_export]
           @exports = data[:exports]
           @processors = data[:processors]
@@ -237,20 +288,21 @@ class Condenser
       @digest = result[:digest]
       @digest_name = result[:digest_name]
       @linked_assets = result[:linked_assets]
-      @dependencies = result[:dependencies]
+      @process_dependencies = result[:process_dependencies]
+      @export_dependencies  = result[:export_dependencies]
       @default_export = result[:default_export]
       @exports = result[:exports]
       @processors = result[:processors]
       load_processors
 
       @processed = true
-      end
     end
     
     def export
-      benchmark "Exporting Asset #{self.filename}", level: :info do
-      @environment.build do
-        result = @environment.cache.fetch("export/#{cache_key}") do
+      return @export if @export
+      
+      @export = @environment.build do
+        data = @environment.cache.fetch_if(Proc.new {"export/#{cache_key}/#{export_cache_version}"}, "export-deps/#{cache_key}") do
           process
           dirname, basename, extensions, mime_types = @environment.decompose_path(@filename)
           data = {
@@ -262,28 +314,23 @@ class Condenser
 
             sourcemap: nil,
             linked_assets: [],
-            dependencies: []
+            process_dependencies: [],
+            export_dependencies: []
           }
-          
+        
           if exporter = @environment.exporters[content_type]
-            benchmark "Preprocessing #{data[:filename]} with #{exporter.name}", level: :info do
-              exporter.call(@environment, data)
-            end
+            exporter.call(@environment, data)
           end
 
           if minifier = @environment.minifier_for(content_type)
-            benchmark "Preprocessing #{data[:filename]} with #{minifier.name}", level: :info do
-              minifier.call(@environment, data)
-            end
+            minifier.call(@environment, data)
           end
-          
+        
           data[:digest] = @environment.digestor.digest(data[:source])
           data[:digest_name] = @environment.digestor.name.sub(/^.*::/, '').downcase
           data
         end
-      
-        Export.new(@environment, result)
-      end
+        Export.new(@environment, data)
       end
     end
     

data/lib/condenser/build_cache.rb

@@ -0,0 +1,107 @@
+require 'listen'
+
+class Condenser
+  class BuildCache
+    
+    attr_reader :semaphore
+    
+    def initialize(path)
+      @path = path
+      @semaphore = Mutex.new
+      @polling   = Listen::Adapter.select == Listen::Adapter::Polling
+      @map_cache = {}
+      @lookup_cache = {}
+      @process_dependencies = {}
+      @export_dependencies = {}
+
+      @listener = Listen.to(*path) do |modified, added, removed|
+        @semaphore.synchronize do
+          added = added.reduce([]) do |rt, added_file|
+            rt << added_file.match(/([^\.]+)(\.|$)/).to_a[1]
+            if path_match = @path.find { |p| added_file.start_with?(p) }
+              a = added_file.delete_prefix(path_match).match(/([^\.]+)(\.|$)/).to_a[1]
+              b = (File.dirname(a) + "/*")
+              
+              rt << a << a.delete_prefix('/')
+              rt << a << b.delete_prefix('/')
+            end
+          end
+          
+          removed.each do |file|
+            @map_cache&.delete_if do |k,v|
+              v.source_file == file
+            end
+            
+            @process_dependencies[file]&.delete_if do |asset|
+              asset.source_file == file
+            end
+            
+            @export_dependencies[file]&.delete_if do |asset|
+              asset.source_file == file
+            end
+          end
+
+          @lookup_cache.delete_if do |key, value|
+            if added.any?{ |a| key.starts_with?(a) }
+              value.each do |asset|
+                modified << asset.source_file
+              end
+              true
+            end
+          end
+          @map_cache&.delete_if do |k,v|
+            added.any?{ |a| k.starts_with?(a) }
+          end
+          
+          modified.each do |file|
+            @process_dependencies[file]&.each do |asset|
+              asset.needs_reprocessing!
+            end
+            
+            @export_dependencies[file]&.each do |asset|
+              asset.needs_reexporting!
+            end
+          end
+          
+        end
+      end
+      @listener.start
+    end
+    
+    def map(key)
+      @map_cache[key] ||= yield
+    end
+    
+    def []=(value, assets)
+      @lookup_cache[value] = assets
+
+      assets.each do |asset|
+        asset.all_process_dependencies.each do |pd|
+          @process_dependencies[pd] ||= Set.new
+          @process_dependencies[pd] << asset
+        end
+
+        asset.all_export_dependencies.each do |pd|
+          @export_dependencies[pd] ||= Set.new
+          @export_dependencies[pd] << asset
+        end
+      end
+    end
+    
+    def [](value)
+      @lookup_cache[value]
+    end
+    
+    def fetch(key)
+      value = self[key]
+      
+      if value.nil?
+        value = yield
+        self[key] = value
+      end
+      
+      value
+    end
+    
+  end
+end