condenser 1.3 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52e335c087aab2b9bb3ef4540e54bfc5b8de0a888cab8f095c2f1dd778458bd4
-  data.tar.gz: 566502264a1049f4ff5e33154caa56ef64ed74d14a8d72abd5e31628d59986c1
+  metadata.gz: fdcbd2e642b5cc57eac94430a67e47501bd392ab8af410e89a07a47da1e339ba
+  data.tar.gz: 82a762a471c4c934846ceb833bf12a6a59761aca72b99cd731d3ca8986cc2290
 SHA512:
-  metadata.gz: 5c0fdf66cb6b17ff6a519af5205061f37e3af2f12896e45c2798154c46ba2db3dea57e219595b33e5433a82db17751bc8444453c5bc0371fb27013e97157352d
-  data.tar.gz: 2486bd59e00c2d70ea683d2f69f1a71b0981b557144a08fd4965f9fe38a0c2da68d79e1c6fcba359718af3f9c26f4978619c3bb651f394cbb0db0172c450096f
+  metadata.gz: 6d2c9f090dfa9a869074596e55a7cc195e5aacc0a9485d06b5f8e46489caf2cabb306fc6a669793e77bf97c7c68cf265293b683f48b0e02cae14f6e74d01d55d
+  data.tar.gz: f7a3f2ca45c330b04019877e08a7b90e99c54ce142c1fff0f8b6ee0718b98212af03ee891785760ace67ab286968838763f7c9f64e89404b170190eef758f1b7

data/lib/condenser/asset.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 require 'digest/md5'
 require 'digest/sha1'
@@ -10,7 +12,7 @@ class Condenser
     include EncodingUtils
     
     attr_reader :environment, :filename, :content_types, :source_file, :source_path
-    attr_reader :linked_assets, :content_types_digest, :exports
+    attr_reader :content_types_digest, :exports, :type
     attr_writer :source, :sourcemap
 
     attr_accessor :imports, :processed
@@ -65,33 +67,50 @@ class Condenser
     def process_dependencies
       deps = @environment.cache.fetch "direct-deps/#{cache_key}" do
         process
-        @process_dependencies
+        # Sort so etag and cache key are same irrelevant of ordering of
+        # dependencies
+        @process_dependencies.map { |fn| [normalize_filename_base(fn[0]), fn[1]] }.sort_by { |d| d[0] }
       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
+        # Sort so etag and cache key are same irrelevant of ordering of
+        # dependencies
+        (@export_dependencies + @process_dependencies).map { |fn| [normalize_filename_base(fn[0]), fn[1]] }.sort_by { |d| d[0] }
+      end
+      
+      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], npm: true).each do |asset|
+          memo << asset
+        end
+        memo
+      end
+    end
+    
+    def linked_assets
+      deps = @environment.cache.fetch "linked-assets/#{cache_key}" do
+        process
+        @linked_assets.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 +142,27 @@ class Condenser
       end
     end
     
-    def all_process_dependencies
-      f = [@source_file]
-      all_dependenies(process_dependencies, Set.new, :process_dependencies) do |dep|
+    def all_process_dependencies(visited = Set.new)
+      f = Set.new
+      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, Set.new, :export_dependencies) do |dep|
+    def all_export_dependencies(visited = Set.new)
+      f = Set.new
+      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 +172,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, 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
@@ -169,12 +208,12 @@ class Condenser
       f = []
       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
 
-      @ecv = Digest::SHA1.base64digest(JSON.generate(f))
+      @ecv = Digest::SHA1.hexdigest(JSON.generate(f))
     end
     
     def needs_reprocessing!
@@ -276,6 +315,9 @@ 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])
+          data[:linked_assets] = normialize_dependency_names(data[:linked_assets])
 
           # Do this here and at the end so cache_key can be calculated if we
           # run this block
@@ -293,6 +335,15 @@ class Condenser
           @processors = data[:processors]
           @processors_loaded = true
           @processed = true
+          @type = data[:type]
+          
+          digestor = @environment.digestor.new
+          digestor << data[:source]
+          all_dependenies(export_dependencies, Set.new, :export_dependencies) do |dep|
+            digestor << dep.source
+          end
+          data[:etag] = digestor.digest.unpack('H*'.freeze).first
+          @etag = data[:etag]
           data
         end
       end
@@ -309,11 +360,24 @@ class Condenser
       @default_export = result[:default_export]
       @exports = result[:exports]
       @processors = result[:processors]
+      @etag = result[:etag]
+      @type = result[:type]
       load_processors
 
       @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
       
@@ -322,6 +386,9 @@ class Condenser
           process
           dirname, basename, extensions, mime_types = @environment.decompose_path(@filename)
           data = {
+            etag: @etag,
+            type: @type,
+            
             source: @source.dup,
             source_file: @source_file,
         
@@ -398,7 +465,11 @@ class Condenser
       process
       @digest.unpack('H*'.freeze).first
     end
-    alias_method :etag, :hexdigest
+    
+    def etag
+      process
+      @etag
+    end
     
     def integrity
       process
@@ -406,7 +477,14 @@ class Condenser
     end
     
     def to_json
-      { path: path, digest: hexdigest, size: size, integrity: integrity }
+      {
+        path: path,
+        etag: etag,
+        type: type,
+        size: size,
+        digest: hexdigest,
+        integrity: integrity
+      }
     end
     
     def write(output_directory)

data/lib/condenser/build_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser
   class BuildCache
     
@@ -22,6 +24,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
@@ -122,16 +128,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/cache/file_store.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Condenser::Cache
   class FileStore < Condenser::CacheStore
     GITKEEP_FILES = ['.gitkeep', '.keep'].freeze

data/lib/condenser/cache/memory_store.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Condenser::Cache
   # Public: Basic in memory LRU cache.
   #

data/lib/condenser/cache/null_store.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Condenser::Cache
   class NullStore
 

data/lib/condenser/cache_store.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Condenser::CacheStore
 
   def fetch(key)

data/lib/condenser/context.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'set'
 require 'condenser/errors'
 

data/lib/condenser/encoding_utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser
   module EncodingUtils
 

data/lib/condenser/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'digest/sha2'
 require 'condenser/context'
 require 'condenser/cache_store'

data/lib/condenser/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Basic Condenser error classes
 class Condenser
   class Error < StandardError; end

data/lib/condenser/export.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Condenser
   class Export
 
-    attr_reader :filename, :source, :sourcemap, :content_types, :digest, :digest_name
+    attr_reader :filename, :source, :sourcemap, :content_types, :digest, :digest_name, :etag, :type
 
     def initialize(env, input={})
       @environment = env
@@ -12,6 +14,8 @@ class Condenser
       @content_types = input[:content_types]
       @digest = input[:digest]
       @digest_name = input[:digest_name]
+      @etag = input[:etag]
+      @type = input[:type]
     end
     
     def path
@@ -43,7 +47,6 @@ class Condenser
     def hexdigest
       @digest.unpack('H*'.freeze).first
     end
-    alias_method :etag, :hexdigest
     
     def integrity
       "#{@digest_name}-#{[@digest].pack('m0')}"
@@ -51,10 +54,12 @@ class Condenser
     
     def to_json
       {
-        'path' => path,
-        'size' => size,
-        'digest' => hexdigest,
-        'integrity' => integrity
+        path: path,
+        etag: etag,
+        type: type,
+        size: size,
+        digest: hexdigest,
+        integrity: integrity
       }
     end
     

data/lib/condenser/helpers/parse_helpers.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Condenser::ParseHelpers
 
   attr_accessor :matched
 
   def eos?
-    @index >= (@source.size - 1)
+    @index >= @source.size
   end
 
   def scan_until(r)
@@ -55,4 +57,24 @@ module Condenser::ParseHelpers
     "#{lineno.to_s.rjust(4)}: " + @source[start..uptop] + "\n      #{'-'* (@index-1-start)}#{'^'*(@matched.length)}"
   end
 
+  def gobble(r)
+    if r.is_a?(Regexp)
+      m = @source.match(r, @index)
+      if m&.begin(0) == @index
+        scan_until(r)
+      end
+    else
+      forward(1)
+      @source[@index-1];
+    end
+  end
+
+  def peek(n=1)
+    if n.is_a?(Regexp)
+      @source.match(n, @index)
+    else
+      @source.slice(@index, n)
+    end
+  end
+
 end

data/lib/condenser/manifest.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser
   class Manifest
     
@@ -72,7 +74,7 @@ class Condenser
       @data[asset.filename] = export.to_json
       outputs = export.write(@dir)
       asset.linked_assets.each do |la|
-        @environment.resolve(la).each { |a| outputs += add_asset(a) }
+        outputs += add_asset(la)
       end
       outputs
     end

data/lib/condenser/minifiers/sass_minifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser::SassMinifier
     
   def self.instance

data/lib/condenser/minifiers/terser_minifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser::TerserMinifier < Condenser::NodeProcessor
 
   def initialize(dir, options = {})

data/lib/condenser/minifiers/uglify_minifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser::UglifyMinifier < Condenser::NodeProcessor
 
   class Error < StandardError

data/lib/condenser/pipeline.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser
   module Pipeline
     

data/lib/condenser/processors/babel_processor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 class Condenser::BabelProcessor < Condenser::NodeProcessor
@@ -16,6 +18,7 @@ class Condenser::BabelProcessor < Condenser::NodeProcessor
         targets: { browsers: '> 1% and not dead' }
       }]
     ]
+    options[:highlightCode] = false if !options.has_key?(:highlightCode)
 
     packages = options.slice(:plugins, :presets).values.reduce(&:+).map { |p| p.is_a?(Array) ? p[0] : p}
     packages.unshift('@babel/core')
@@ -80,11 +83,17 @@ class Condenser::BabelProcessor < Condenser::NodeProcessor
       end
     end
     
-    
+    opts['preset']&.each do |preset|
+      preset[0] = preset[0].gsub(/"@?babel[\/-][^"]+"/) { |m| "require(#{m})"}
+    end
+    opts['plugins']&.each do |preset|
+      preset[0] = preset[0].gsub(/"@?babel[\/-][^"]+"/) { |m| "require(#{m})"}
+    end
+
     result = exec_runtime(<<-JS)
       const babel = require("#{File.join(npm_module_path('@babel/core'))}");
       const source = #{JSON.generate(input[:source])};
-      const options = #{JSON.generate(opts).gsub(/"@?babel[\/-][^"]+"/) { |m| "require(#{m})"}};
+      const options = #{JSON.generate(opts)};
       
       let imports = [];
       let defaultExport = false;
@@ -95,23 +104,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser::CSSMediaCombinerProcessor
   
   include Condenser::ParseHelpers
@@ -10,7 +12,7 @@ class Condenser::CSSMediaCombinerProcessor
   end
 
   def reduce_media_query(queries)
-    output = ''
+    output = String.new
     queries.each do |query, contents|
       output << query if query
       output << if contents.is_a?(Hash)
@@ -30,12 +32,12 @@ class Condenser::CSSMediaCombinerProcessor
     @selectors = []
     @media_queries = {}
 
-    input[:source] = ''
+    input[:source] = String.new
     while !eos?
       output = if @selectors.empty?
         input[:source]
       else
-        (@selectors[0...-1].reduce(@media_queries) { |hash, selector| hash[selector] ||= {} }[@selectors.last] ||= '')
+        (@selectors[0...-1].reduce(@media_queries) { |hash, selector| hash[selector] ||= {} }[@selectors.last] ||= String.new)
       end
       
       case @stack.last
@@ -64,11 +66,11 @@ class Condenser::CSSMediaCombinerProcessor
           @stack.pop
         end
       else
-        case scan_until(/(@media[^\{]*{|\Z)/)
+        case scan_until(/(@media[^\{]*{|\z)/)
         when ''
           output << pre_match
         else
-          output << pre_match
+          output << pre_match.rstrip
           @selectors << matched.squish
           @stack << :media_query
         end