condenser 1.4 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 171baa1e5cd8016c4b2e7f142147d174410085ede075c101da43b743a4ad6fec
-  data.tar.gz: 9c97b58fb2bf540b335f6504997da99fac72891f61a0a0631639ae3fd9f28482
+  metadata.gz: 6f9c3ee00b220c07b9a0791215a5f260ac84c4d7432c19a0764339ebae02d48d
+  data.tar.gz: 460361e7976a33f448a06d348582aa70c370cd7fcc334b4839e47c1c6738b2ef
 SHA512:
-  metadata.gz: decc8b993d0e99c5212f3c0b1d4be88de43d49ab1386f32936a0dae482fc9b45de55cbbc51d99eafce58bcd68809a20fd27267ef0fe62d3aa3a244e33e68992e
-  data.tar.gz: e39a90c28c7beab789885e53e35ae0ad43340ff4009f81ad1586ac16eb0073dbaf999b69a94f78e796f5bfe5e93a16e0a45481e76b706d0e496dfbe5435b4966
+  metadata.gz: 7af0b344077380ed7c25ad7a7c27e16a11f584518688f4f30e18e4a84af252c9aaa889aca549108ca7487bce6d246985ee15e34b5864f88e146578a34a328e04
+  data.tar.gz: 3f425933f7f0c2f07b9e5da5d17a78a0234bf35bd0c0e1095822a1c62f62b74cd93a935b8717a3f249d3321733826530c1afa82008e39fd847e61d93a35f2c13

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,7 +67,9 @@ class Condenser
     def process_dependencies
       deps = @environment.cache.fetch "direct-deps/#{cache_key}" do
         process
-        @process_dependencies.map { |fn| [normalize_filename_base(fn[0]), fn[1]] }
+        # 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
     
       deps.inject([]) do |memo, i|
@@ -80,7 +84,24 @@ class Condenser
     def export_dependencies
       deps = @environment.cache.fetch "export-deps/#{cache_key}" do
         process
-        (@export_dependencies + @process_dependencies).map { |fn| [normalize_filename_base(fn[0]), fn[1]] }
+        # 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
       
       deps.inject([]) do |memo, i|
@@ -122,7 +143,7 @@ class Condenser
     end
     
     def all_process_dependencies(visited = Set.new)
-      f = []
+      f = Set.new
       if !visited.include?(@source_file)
         f << @source_file
         visited << self.source_file
@@ -135,7 +156,7 @@ class Condenser
     end
     
     def all_export_dependencies(visited = Set.new)
-      f = []
+      f = Set.new
       if !visited.include?(@source_file)
         f << @source_file
         visited << self.source_file
@@ -192,7 +213,7 @@ class Condenser
         ]
       end
 
-      @ecv = Digest::SHA1.base64digest(JSON.generate(f))
+      @ecv = Digest::SHA1.hexdigest(JSON.generate(f))
     end
     
     def needs_reprocessing!
@@ -296,6 +317,7 @@ class Condenser
           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
@@ -313,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
@@ -329,6 +360,8 @@ class Condenser
       @default_export = result[:default_export]
       @exports = result[:exports]
       @processors = result[:processors]
+      @etag = result[:etag]
+      @type = result[:type]
       load_processors
 
       @processed = true
@@ -353,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,
         
@@ -429,7 +465,11 @@ class Condenser
       process
       @digest.unpack('H*'.freeze).first
     end
-    alias_method :etag, :hexdigest
+    
+    def etag
+      process
+      @etag
+    end
     
     def integrity
       process
@@ -437,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
     

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)
@@ -56,9 +58,22 @@ module Condenser::ParseHelpers
   end
 
   def gobble(r)
-    m = @source.match(r, @index)
-    if m&.begin(0) == @index
-      scan_until(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
 

data/lib/condenser/manifest.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser
   class Manifest
     
@@ -39,7 +41,7 @@ class Condenser
       
       if File.exist?(@filename)
         begin
-          @data = JSON.parse(File.read(@filename))
+          @data = JSON.parse(File.read(@filename), symbolize_names: true).transform_keys(&:to_s)
         rescue JSON::ParserError => e
           @data = {}
           logger.error "#{@filename} is invalid: #{e.class} #{e.message}"
@@ -72,14 +74,14 @@ 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
     
     def [](key)
       add(key) if @environment
-      @data[key]
+      @data[key.delete_prefix('/')]
     end
     
     def compile(*args)
@@ -104,7 +106,7 @@ class Condenser
     # Cleanup old assets in the compile directory. By default it will keep the
     # latest version and remove any other files over 4 weeks old.
     def clean(age = 2419200)
-      clean_dir(@dir, @data.values.map{ |v| v['path'] }, Time.now - age)
+      clean_dir(@dir, @data.values.map{ |v| v[:path] }, Time.now - age)
     end
 
     def clean_dir(dir, assets, age)

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;

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