condenser 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52e335c087aab2b9bb3ef4540e54bfc5b8de0a888cab8f095c2f1dd778458bd4
-  data.tar.gz: 566502264a1049f4ff5e33154caa56ef64ed74d14a8d72abd5e31628d59986c1
+  metadata.gz: 171baa1e5cd8016c4b2e7f142147d174410085ede075c101da43b743a4ad6fec
+  data.tar.gz: 9c97b58fb2bf540b335f6504997da99fac72891f61a0a0631639ae3fd9f28482
 SHA512:
-  metadata.gz: 5c0fdf66cb6b17ff6a519af5205061f37e3af2f12896e45c2798154c46ba2db3dea57e219595b33e5433a82db17751bc8444453c5bc0371fb27013e97157352d
-  data.tar.gz: 2486bd59e00c2d70ea683d2f69f1a71b0981b557144a08fd4965f9fe38a0c2da68d79e1c6fcba359718af3f9c26f4978619c3bb651f394cbb0db0172c450096f
+  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, Set.new, :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, Set.new, :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, 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,7 +187,7 @@ 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
@@ -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
@@ -314,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
       

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
@@ -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/helpers/parse_helpers.rb

@@ -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/processors/babel_processor.rb

@@ -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/js_analyzer.rb

@@ -15,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
@@ -28,6 +28,7 @@ class Condenser::JSAnalyzer
     end
     
     last_postion = nil
+    last_stack = nil
     while !eos?
       case @stack.last
 
@@ -53,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)/)
 
@@ -85,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
@@ -104,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
@@ -121,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/rollup_processor.rb

@@ -214,7 +214,7 @@ class Condenser::RollupProcessor < Condenser::NodeProcessor
             elsif importee.end_with?('*')
               File.join(File.dirname(importee), '*')
             else
-              @environment.find(importee, importer ? File.dirname(@entry == importer ? @input[:source_file] : importer) : nil, accept: @input[:content_types].last)&.source_file
+              @environment.find(importee, importer ? (@entry == importer ? @input[:source_file] : importer) : nil, accept: @input[:content_types].last)&.source_file
             end
           when 'load'
             importee = message['args'].first

data/lib/condenser/resolve.rb

@@ -148,11 +148,34 @@ class Condenser
       end
     end
     
+    def has_dir?(path)
+      path.count('/') > (path.start_with?('/') ? 1 : 0)
+    end
+    
+    def expand_path(path)
+      dir = if path.start_with?('/')
+        File.expand_path(path)
+      else
+        File.expand_path("/#{path}").delete_prefix('/')
+      end
+      dir.empty? ? nil : dir
+    end
+    
     def decompose_path(path, base=nil)
-      dirname = path.index('/') ? File.dirname(path) : nil
-      if base && path&.start_with?('.')
-        dirname = File.expand_path(dirname, base)
+      dirname = if base && path.start_with?('.')
+        if has_dir?(base)
+          if has_dir?(path)
+            expand_path(File.join(File.dirname(base), File.dirname(path)))
+          else
+            expand_path(File.dirname(base))
+          end
+        else
+          expand_path(File.dirname(path))
+        end
+      else
+        path.index('/') ? File.dirname(path) : nil
       end
+
       
       _, star, basename, extensions = path.match(/(([^\.\/]+)(\.[^\/]+)|\*|[^\/]+)$/).to_a
       if extensions == '.*'

data/lib/condenser/version.rb

@@ -1,3 +1,3 @@
 class Condenser
-  VERSION = '1.3'
+  VERSION = '1.4'
 end

data/test/cache_test.rb

@@ -60,6 +60,19 @@ class CacheTest < ActiveSupport::TestCase
     CSS
   end
 
+  test 'changing a source file on calls needs_reprocessing! and needs_reexporting! once' do
+    file 'test.txt.erb', "1<%= 1 + 1 %>3\n"
+    assert_file 'test.txt', 'text/plain', <<~CSS
+    123
+    CSS
+
+    asset = @env.find('test.txt')
+
+    asset.expects(:needs_reprocessing!).once
+    asset.expects(:needs_reexporting!).once
+    file 'test.txt.erb', "1<%= 1 + 2 %>5\n"
+  end
+
   test 'changing a js dependency reflects in the next call' do
     file 'main.js', <<-JS
       import { cube } from 'math';
@@ -74,11 +87,11 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'main.js', 'application/javascript', <<~CSS
-      !function(){"use strict";var o;console.log((o=5)*o)}();
+      !function(){var o;console.log((o=5)*o)}();
     CSS
 
     assert_exported_file 'main.js', 'application/javascript', <<~CSS
-      !function(){"use strict";var o;console.log((o=5)*o)}();
+      !function(){var o;console.log((o=5)*o)}();
     CSS
 
     file 'math.js', <<-JS
@@ -88,7 +101,7 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'main.js', 'application/javascript', <<~CSS
-      !function(){"use strict";var o;console.log((o=5)*o*o)}();
+      !function(){var o;console.log((o=5)*o*o)}();
     CSS
   end
 
@@ -123,10 +136,10 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'a.js', 'application/javascript', <<~JS
-      !function(){"use strict";console.log(5)}();
+      console.log(5);
     JS
     assert_exported_file 'b.js', 'application/javascript', <<~JS
-      !function(){"use strict";console.log(5)}();
+      console.log(5);
     JS
 
     file 'dep.js', <<-JS
@@ -134,12 +147,11 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'a.js', 'application/javascript', <<~JS
-      !function(){"use strict";console.log(10)}();
+      console.log(10);
     JS
     assert_exported_file 'b.js', 'application/javascript', <<~JS
-      !function(){"use strict";console.log(10)}();
+      console.log(10);
     JS
-
   end
 
   test 'a dependency is superceeded by a new file' do
@@ -158,7 +170,7 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'a.js', 'application/javascript', <<~JS
-      !function(){"use strict";console.log(5)}();
+      console.log(5);
     JS
 
     file 'a/dep.js', <<-JS
@@ -166,7 +178,7 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'a.js', 'application/javascript', <<~JS
-      !function(){"use strict";console.log(10)}();
+      console.log(10);
     JS
   end
 
@@ -186,7 +198,7 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'a.js', 'application/javascript', <<~JS
-      !function(){"use strict";console.log(5)}();
+      console.log(5);
     JS
 
     file 'a/deps/dep.js', <<-JS
@@ -194,7 +206,7 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'a.js', 'application/javascript', <<~JS
-      !function(){"use strict";console.log(10)}();
+      console.log(10);
     JS
 
     file 'a/deps/dep.js', <<-JS
@@ -202,7 +214,7 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'a.js', 'application/javascript', <<~JS
-      !function(){"use strict";console.log(20)}();
+      console.log(20);
     JS
   end
   
@@ -259,7 +271,7 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'a.js', 'application/javascript', <<~JS
-      !function(){"use strict";console.log("a")}();
+    console.log("a");
     JS
 
     file 'a.js', <<~JS
@@ -269,7 +281,7 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'a.js', 'application/javascript', <<~JS
-      !function(){"use strict";console.log("a"),console.log("b")}();
+      console.log("a"),console.log("b");
     JS
 
     file 'b.js', <<~JS
@@ -277,7 +289,7 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'a.js', 'application/javascript', <<~JS
-      !function(){"use strict";console.log("a"),console.log("c")}();
+      console.log("a"),console.log("c");
     JS
   end
 
@@ -308,5 +320,88 @@ class CacheTest < ActiveSupport::TestCase
       body{background:green}body{background:aqua}
     JS
   end
+  
+  test 'ensure the build cache only walks the dependency tree once' do
+    # a
+    # | |
+    # b c
+    #   |
+    #   d
+      
+    file 'd.js', "export default function d () { console.log('d'); }\n"
+    file 'b.js', "export default function b () { console.log('b'); }\n"
+    file 'c.js', <<~JS
+      import d from 'd';
+
+      export default function c () { console.log('c'); d(); }
+    JS
+    file 'a.js', <<~JS
+      import b from 'b';
+      import c from 'c';
+      
+      console.log('a'); b(); c();
+    JS
+
+    assert_exported_file 'a.js', 'application/javascript', <<~JS
+      console.log("a"),console.log("b"),console.log("c"),console.log("d");
+    JS
+
+    file 'd.js', "export default function e () { console.log('e'); }\n"
+
+    pd = @env.build_cache.instance_variable_get(:@process_dependencies)
+    pd["#{@path}/a.js"] ||= Set.new
+    pd["#{@path}/b.js"] ||= Set.new
+    pd["#{@path}/c.js"] ||= Set.new
+    pd["#{@path}/d.js"] ||= Set.new
+    pd["#{@path}/a.js"].expects(:<<).with { |a| a.source_file == "#{@path}/a.js" }.once
+    pd["#{@path}/b.js"].expects(:<<).with { |a| a.source_file == "#{@path}/b.js" }.never
+    pd["#{@path}/c.js"].expects(:<<).with { |a| a.source_file == "#{@path}/c.js" }.never
+    pd["#{@path}/d.js"].expects(:<<).with { |a| a.source_file == "#{@path}/d.js" }.once
 
+    assert_exported_file 'a.js', 'application/javascript', <<~JS
+      console.log("a"),console.log("b"),console.log("c"),console.log("e");
+    JS
+  end
+  
+  test 'same files in diffrent dirs sharing a cache doesnt poison the cache (ie capistrano deploys)' do
+    cachepath = Dir.mktmpdir
+    
+    dir = File.realpath(Dir.mktmpdir)
+    base1 = File.join(dir, 'a')
+    base2 = File.join(dir, 'b')
+    base3 = File.join(dir, 'c')
+    Dir.mkdir(base1)
+    Dir.mkdir(base2)
+
+    [base1, base2, base3].each do |b|
+      file 'test.js', "export default function c () { console.log('t'); }\n", base: b
+      file 'test/b.js', <<~JS, base: b
+        import c from './c';
+        export default function b () { console.log('b'); c(); }
+      JS
+      file 'test/a.js', <<~JS, base: b
+        import t from 'test';
+        import b from './b';
+
+        console.log('a');
+        b();
+      JS
+    end
+
+    file 'test/c.js', "export default function c () { console.log('c'); }\n", base: base1
+    file 'test/c.js', "export default function c () { console.log('d'); }\n", base: base2
+    file 'test/c.js', "export default function c () { console.log('e'); }\n", base: base3
+
+    # Set the cache
+    env1 = Condenser.new(base1, logger: Logger.new(STDOUT, level: :debug), base: base1, npm_path: @npm_dir, cache: Condenser::Cache::FileStore.new(cachepath))
+    assert_equal 'console.log("a"),console.log("b"),console.log("c");', env1.find('test/a.js').export.source
+
+    # Poison the cache
+    env2 = Condenser.new(base2, logger: Logger.new(STDOUT, level: :debug), base: base2, npm_path: @npm_dir, cache: Condenser::Cache::FileStore.new(cachepath))
+    assert_equal 'console.log("a"),console.log("b"),console.log("d");', env2.find('test/a.js').export.source
+
+    # Fails to find dependency change because cache is missing the dependency
+    env3 = Condenser.new(base3, logger: Logger.new(STDOUT, level: :debug), base: base3, npm_path: @npm_dir, cache: Condenser::Cache::FileStore.new(cachepath))
+    assert_equal 'console.log("a"),console.log("b"),console.log("e");', env3.find('test/a.js').export.source
+  end
 end

data/test/dependency_test.rb

@@ -17,7 +17,7 @@ class DependencyTest < ActiveSupport::TestCase
     JS
 
     asset = @env.find('name.js')
-    assert_equal asset.instance_variable_get(:@process_dependencies).to_a, ["models/*.js","helpers/*.js"]
+    assert_equal asset.instance_variable_get(:@process_dependencies).to_a, [["models/*", ["application/javascript"]],["helpers/*", ["application/javascript"]]]
 
 
     assert_file 'name.js', 'application/javascript', <<~JS
@@ -54,7 +54,7 @@ class DependencyTest < ActiveSupport::TestCase
     JS
 
     asset = @env.find('name.js')
-    assert_equal asset.instance_variable_get(:@process_dependencies).to_a, ["models/*.js","helpers/*.js"]
+    assert_equal asset.instance_variable_get(:@process_dependencies).to_a, [["models/*", ["application/javascript"]],["helpers/*", ["application/javascript"]]]
 
 
     assert_file 'name.js', 'application/javascript', <<~JS
@@ -74,4 +74,53 @@ class DependencyTest < ActiveSupport::TestCase
     JS
   end
 
+  test 'js depending on another file type with JSAnalzyer' do
+    @env.unregister_preprocessor 'application/javascript', Condenser::BabelProcessor
+    @env.register_preprocessor 'application/javascript', Condenser::JSAnalyzer
+    @env.unregister_minifier('application/javascript')
+
+    file 'a.js', ''
+    file 'b.rb', ''
+    file 'models/a.js', ''
+    file 'models/b.rb', ''
+
+    file 'name.js.erb', <<~JS
+      // depends_on **/*.rb
+
+      console.log([<%= Dir.children("#{@path}").sort.map(&:inspect).join(', ') %>]);
+    JS
+
+    asset = @env.find('name.js')
+    assert_equal asset.instance_variable_get(:@process_dependencies).to_a, [["**/*", ["application/ruby"]]]
+    assert_equal asset.process_dependencies.map(&:source_file), ["#{@path}/b.rb", "#{@path}/models/b.rb"]
+  end
+
+  test 'relative imports with JSAnalzyer' do
+    @env.unregister_preprocessor 'application/javascript', Condenser::BabelProcessor
+    @env.register_preprocessor 'application/javascript', Condenser::JSAnalyzer
+    @env.unregister_minifier('application/javascript')
+    
+    file 'a/a.js', <<~JS
+      export decault function () { console.log("a/a"); }
+    JS
+    file 'b/a.js', <<~JS
+      export decault function () { console.log("a/a"); }
+    JS
+
+    file 'a/b.js', <<~JS
+      import fn from './a';
+      a();
+      console.log("a/b");
+    JS
+    file 'b/b.js', <<~JS
+      import fn from './a';
+      a();
+      console.log("b/b");
+    JS
+    
+    asset = @env.find('a/b.js')
+    assert_equal asset.instance_variable_get(:@export_dependencies).to_a, [["#{@path}/a/a", ["application/javascript"]]]
+    assert_equal asset.export_dependencies.map(&:source_file), ["#{@path}/a/a.js"]
+  end
+  
 end

data/test/preprocessor/babel_test.rb

@@ -28,6 +28,28 @@ class CondenserBabelTest < ActiveSupport::TestCase
     JS
   end
 
+  test "dependency tracking for a export from" do
+    file 'c.js', <<~JS
+    function c() { return 'ok'; }
+    
+    export {c}
+    JS
+    
+    file 'b.js', <<~JS
+    export {c} from 'c';
+    
+    JS
+    
+    file 'a.js', <<~JS
+    import {c} from 'b'
+    
+    console.log(c());
+    JS
+
+    asset = assert_file 'a.js', 'application/javascript'
+    assert_equal ['/a.js', '/b.js', '/c.js'], asset.all_export_dependencies.map { |path| path.delete_prefix(@path) }
+  end
+
   test "error" do
     file 'error.js', <<~JS
       console.log('this file has an error');
@@ -47,6 +69,7 @@ class CondenserBabelTest < ActiveSupport::TestCase
           |              ^
         4 |
     ERROR
+    assert_equal '/assets/error.js', e.path
   end
 
   test 'not duplicating polyfills' do
@@ -83,7 +106,7 @@ class CondenserBabelTest < ActiveSupport::TestCase
       	};
 
       	// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
-      	var global$9 =
+      	var global$8 =
       	  // eslint-disable-next-line es/no-global-this -- safe
       	  check(typeof globalThis == 'object' && globalThis) ||
       	  check(typeof window == 'object' && window) ||
@@ -153,25 +176,14 @@ class CondenserBabelTest < ActiveSupport::TestCase
       	  if (classofRaw(fn) === 'Function') return uncurryThis$8(fn);
       	};
 
-      	var documentAll$2 = typeof document == 'object' && document.all;
-
       	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
-      	// eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
-      	var IS_HTMLDDA = typeof documentAll$2 == 'undefined' && documentAll$2 !== undefined;
-
-      	var documentAll_1 = {
-      	  all: documentAll$2,
-      	  IS_HTMLDDA: IS_HTMLDDA
-      	};
-
-      	var $documentAll$1 = documentAll_1;
-
-      	var documentAll$1 = $documentAll$1.all;
+      	var documentAll = typeof document == 'object' && document.all;
 
       	// `IsCallable` abstract operation
       	// https://tc39.es/ecma262/#sec-iscallable
-      	var isCallable$7 = $documentAll$1.IS_HTMLDDA ? function (argument) {
-      	  return typeof argument == 'function' || argument === documentAll$1;
+      	// eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
+      	var isCallable$7 = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
+      	  return typeof argument == 'function' || argument === documentAll;
       	} : function (argument) {
       	  return typeof argument == 'function';
       	};
@@ -261,20 +273,15 @@ class CondenserBabelTest < ActiveSupport::TestCase
       	};
 
       	var isCallable$6 = isCallable$7;
-      	var $documentAll = documentAll_1;
-
-      	var documentAll = $documentAll.all;
 
-      	var isObject$4 = $documentAll.IS_HTMLDDA ? function (it) {
-      	  return typeof it == 'object' ? it !== null : isCallable$6(it) || it === documentAll;
-      	} : function (it) {
+      	var isObject$4 = function (it) {
       	  return typeof it == 'object' ? it !== null : isCallable$6(it);
       	};
 
       	var path$3 = {};
 
       	var path$2 = path$3;
-      	var global$8 = global$9;
+      	var global$7 = global$8;
       	var isCallable$5 = isCallable$7;
 
       	var aFunction = function (variable) {
@@ -282,8 +289,8 @@ class CondenserBabelTest < ActiveSupport::TestCase
       	};
 
       	var getBuiltIn$1 = function (namespace, method) {
-      	  return arguments.length < 2 ? aFunction(path$2[namespace]) || aFunction(global$8[namespace])
-      	    : path$2[namespace] && path$2[namespace][method] || global$8[namespace] && global$8[namespace][method];
+      	  return arguments.length < 2 ? aFunction(path$2[namespace]) || aFunction(global$7[namespace])
+      	    : path$2[namespace] && path$2[namespace][method] || global$7[namespace] && global$7[namespace][method];
       	};
 
       	var uncurryThis$6 = functionUncurryThis;
@@ -292,11 +299,11 @@ class CondenserBabelTest < ActiveSupport::TestCase
 
       	var engineUserAgent = typeof navigator != 'undefined' && String(navigator.userAgent) || '';
 
-      	var global$7 = global$9;
+      	var global$6 = global$8;
       	var userAgent = engineUserAgent;
 
-      	var process = global$7.process;
-      	var Deno = global$7.Deno;
+      	var process = global$6.process;
+      	var Deno = global$6.Deno;
       	var versions = process && process.versions || Deno && Deno.version;
       	var v8 = versions && versions.v8;
       	var match, version;
@@ -323,9 +330,9 @@ class CondenserBabelTest < ActiveSupport::TestCase
       	/* eslint-disable es/no-symbol -- required for testing */
       	var V8_VERSION = engineV8Version;
       	var fails$4 = fails$8;
-      	var global$6 = global$9;
+      	var global$5 = global$8;
 
-      	var $String$2 = global$6.String;
+      	var $String$2 = global$5.String;
 
       	// eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
       	var symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails$4(function () {
@@ -407,42 +414,42 @@ class CondenserBabelTest < ActiveSupport::TestCase
       	  throw new $TypeError$3("Can't convert object to primitive value");
       	};
 
-      	var shared$1 = {exports: {}};
+      	var sharedStore = {exports: {}};
 
-      	var global$5 = global$9;
+      	var global$4 = global$8;
 
       	// eslint-disable-next-line es/no-object-defineproperty -- safe
       	var defineProperty$1 = Object.defineProperty;
 
       	var defineGlobalProperty$1 = function (key, value) {
       	  try {
-      	    defineProperty$1(global$5, key, { value: value, configurable: true, writable: true });
+      	    defineProperty$1(global$4, key, { value: value, configurable: true, writable: true });
       	  } catch (error) {
-      	    global$5[key] = value;
+      	    global$4[key] = value;
       	  } return value;
       	};
 
-      	var global$4 = global$9;
+      	var globalThis$1 = global$8;
       	var defineGlobalProperty = defineGlobalProperty$1;
 
       	var SHARED = '__core-js_shared__';
-      	var store$1 = global$4[SHARED] || defineGlobalProperty(SHARED, {});
+      	var store$1 = sharedStore.exports = globalThis$1[SHARED] || defineGlobalProperty(SHARED, {});
 
-      	var sharedStore = store$1;
-
-      	var store = sharedStore;
-
-      	(shared$1.exports = function (key, value) {
-      	  return store[key] || (store[key] = value !== undefined ? value : {});
-      	})('versions', []).push({
-      	  version: '3.34.0',
+      	(store$1.versions || (store$1.versions = [])).push({
+      	  version: '3.37.1',
       	  mode: 'pure' ,
-      	  copyright: '© 2014-2023 Denis Pushkarev (zloirock.ru)',
-      	  license: 'https://github.com/zloirock/core-js/blob/v3.34.0/LICENSE',
+      	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
+      	  license: 'https://github.com/zloirock/core-js/blob/v3.37.1/LICENSE',
       	  source: 'https://github.com/zloirock/core-js'
       	});
 
-      	var sharedExports = shared$1.exports;
+      	var sharedStoreExports = sharedStore.exports;
+
+      	var store = sharedStoreExports;
+
+      	var shared$1 = function (key, value) {
+      	  return store[key] || (store[key] = value || {});
+      	};
 
       	var requireObjectCoercible = requireObjectCoercible$2;
 
@@ -476,8 +483,8 @@ class CondenserBabelTest < ActiveSupport::TestCase
       	  return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString(++id + postfix, 36);
       	};
 
-      	var global$3 = global$9;
-      	var shared = sharedExports;
+      	var global$3 = global$8;
+      	var shared = shared$1;
       	var hasOwn$3 = hasOwnProperty_1;
       	var uid = uid$1;
       	var NATIVE_SYMBOL = symbolConstructorDetection;
@@ -531,7 +538,7 @@ class CondenserBabelTest < ActiveSupport::TestCase
       	  return isSymbol(key) ? key : key + '';
       	};
 
-      	var global$2 = global$9;
+      	var global$2 = global$8;
       	var isObject$1 = isObject$4;
 
       	var document$1 = global$2.document;
@@ -695,7 +702,7 @@ class CondenserBabelTest < ActiveSupport::TestCase
       	  return object;
       	};
 
-      	var global$1 = global$9;
+      	var global$1 = global$8;
       	var apply = functionApply;
       	var uncurryThis$2 = functionUncurryThisClause;
       	var isCallable = isCallable$7;
@@ -705,6 +712,8 @@ class CondenserBabelTest < ActiveSupport::TestCase
       	var bind = functionBindContext;
       	var createNonEnumerableProperty = createNonEnumerableProperty$1;
       	var hasOwn$1 = hasOwnProperty_1;
+      	// add debugging info
+
 
       	var wrapConstructor = function (NativeConstructor) {
       	  var Wrapper = function (a, b, c) {
@@ -741,7 +750,7 @@ class CondenserBabelTest < ActiveSupport::TestCase
       	  var STATIC = options.stat;
       	  var PROTO = options.proto;
 
-      	  var nativeSource = GLOBAL ? global$1 : STATIC ? global$1[TARGET] : (global$1[TARGET] || {}).prototype;
+      	  var nativeSource = GLOBAL ? global$1 : STATIC ? global$1[TARGET] : global$1[TARGET] && global$1[TARGET].prototype;
 
       	  var target = GLOBAL ? path$1 : path$1[TARGET] || createNonEnumerableProperty(path$1, TARGET, {})[TARGET];
       	  var targetPrototype = target.prototype;
@@ -764,7 +773,7 @@ class CondenserBabelTest < ActiveSupport::TestCase
       	    // export native or implementation
       	    sourceProperty = (USE_NATIVE && nativeProperty) ? nativeProperty : source[key];
 
-      	    if (USE_NATIVE && typeof targetProperty == typeof sourceProperty) continue;
+      	    if (!FORCED && !PROTO && typeof targetProperty == typeof sourceProperty) continue;
 
       	    // bind methods to global for calling from export context
       	    if (options.bind && USE_NATIVE) resultProperty = bind(sourceProperty, global$1);
@@ -838,7 +847,8 @@ class CondenserBabelTest < ActiveSupport::TestCase
       	// `ToLength` abstract operation
       	// https://tc39.es/ecma262/#sec-tolength
       	var toLength$1 = function (argument) {
-      	  return argument > 0 ? min(toIntegerOrInfinity(argument), 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
+      	  var len = toIntegerOrInfinity(argument);
+      	  return len > 0 ? min(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
       	};
 
       	var toLength = toLength$1;
@@ -858,6 +868,7 @@ class CondenserBabelTest < ActiveSupport::TestCase
       	  return function ($this, el, fromIndex) {
       	    var O = toIndexedObject$1($this);
       	    var length = lengthOfArrayLike(O);
+      	    if (length === 0) return !IS_INCLUDES && -1;
       	    var index = toAbsoluteIndex(fromIndex, length);
       	    var value;
       	    // Array#includes uses SameValueZero equality algorithm

data/test/preprocessor/js_analyzer_test.rb

@@ -248,4 +248,39 @@ class JSAnalyzerTest < ActiveSupport::TestCase
     assert_equal ['a.js', 'b.js'], asset.export_dependencies.map(&:filename)
   end
   
+  test "dependency tracking for a export from" do
+    file 'c.js', <<~JS
+    function c() { return 'ok'; }
+    
+    export {c}
+    JS
+    
+    file 'b.js', <<~JS
+    export {c} from 'c';
+    
+    JS
+    
+    file 'a.js', <<~JS
+    import {c} from 'b'
+    
+    console.log(c());
+    JS
+
+    asset = assert_file 'a.js', 'application/javascript'
+    assert_equal ['/a.js', '/b.js', '/c.js'], asset.all_export_dependencies.map { |path| path.delete_prefix(@path) }
+  end
+  
+  test 'exporting a nested object' do
+    file 't.js', <<~JS
+      export default {
+          registry: {
+              boolean: true,
+              integer: 1
+          }
+      };
+    JS
+    
+    asset = assert_file 't.js', 'application/javascript'
+  end
+
 end

data/test/resolve_test.rb

@@ -35,6 +35,16 @@ class ResolveTest < ActiveSupport::TestCase
     assert_equal ['test', '*', ['.js'], ['application/javascript']], @env.decompose_path('test/*.js')
     assert_equal ['test/*', '*', ['.js'], ['application/javascript']], @env.decompose_path('test/*/*.js')
     assert_equal ['test/**', '*', ['.js'], ['application/javascript']], @env.decompose_path('test/**/*.js')
+    
+    assert_equal ['a', 'test', ['.js'], ['application/javascript']], @env.decompose_path('./test.js', 'a/b.js')
+    assert_equal [nil, 'test', ['.js'], ['application/javascript']], @env.decompose_path('./test.js', 'b.js')
+    assert_equal ['a/folder', 'test', ['.js'], ['application/javascript']], @env.decompose_path('./folder/test.js', 'a/b.js')
+    assert_equal ['folder', 'test', ['.js'], ['application/javascript']], @env.decompose_path('./folder/test.js', 'b.js')
+    
+    assert_equal [nil, 'test', ['.js'], ['application/javascript']], @env.decompose_path('../test.js', 'a/b.js')
+    assert_equal ["/", 'test', ['.js'], ['application/javascript']], @env.decompose_path('../test.js', '/a/b.js')
+    assert_equal ["folder", 'test', ['.js'], ['application/javascript']], @env.decompose_path('../folder/test.js', 'a/b.js')
+    assert_equal ["/folder", 'test', ['.js'], ['application/javascript']], @env.decompose_path('../folder/test.js', '/a/b.js')
   end
   
   test 'resolve' do

data/test/server_test.rb

@@ -27,10 +27,10 @@ class ServerTest < ActiveSupport::TestCase
   test "serve single source file" do
     get "/assets/foo.js"
     assert_equal 200, last_response.status
-    assert_equal "43", last_response.headers['Content-Length']
+    assert_equal "15", last_response.headers['Content-Length']
     assert_equal "Accept-Encoding", last_response.headers['Vary']
     assert_equal <<~JS.strip, last_response.body
-      !function(){"use strict";console.log(1)}();
+      console.log(1);
     JS
   end
 
@@ -54,7 +54,7 @@ class ServerTest < ActiveSupport::TestCase
 
     get "/assets/main.js"
     assert_equal <<~JS.strip, last_response.body
-      !function(){"use strict";var o;console.log((o=5)*o*o)}();
+      !function(){var o;console.log((o=5)*o*o)}();
     JS
   end
 
@@ -73,7 +73,7 @@ class ServerTest < ActiveSupport::TestCase
   test "serve source with etag headers" do
     get "/assets/foo.js"
 
-    digest = '9001f422e9c91516f6e130be56dd77aa313c52bb7dd18e4bb085067162c9fa70'
+    digest = '35c146f76e129477c64061bc84511e1090f3d4d8059713e6663dd4b35b1f7642'
     assert_equal "\"#{digest}\"", last_response.headers['ETag']
   end
 
@@ -107,8 +107,8 @@ class ServerTest < ActiveSupport::TestCase
       'HTTP_IF_NONE_MATCH' => "nope"
 
     assert_equal 200, last_response.status
-    assert_equal '"9001f422e9c91516f6e130be56dd77aa313c52bb7dd18e4bb085067162c9fa70"', last_response.headers['ETag']
-    assert_equal '43', last_response.headers['Content-Length']
+    assert_equal '"35c146f76e129477c64061bc84511e1090f3d4d8059713e6663dd4b35b1f7642"', last_response.headers['ETag']
+    assert_equal '15', last_response.headers['Content-Length']
   end
 
   test "not modified partial response with fingerprint and if-none-match etags match" do
@@ -167,8 +167,8 @@ class ServerTest < ActiveSupport::TestCase
       'HTTP_IF_MATCH' => etag
 
     assert_equal 200, last_response.status
-    assert_equal '"9001f422e9c91516f6e130be56dd77aa313c52bb7dd18e4bb085067162c9fa70"', last_response.headers['ETag']
-    assert_equal '43', last_response.headers['Content-Length']
+    assert_equal '"35c146f76e129477c64061bc84511e1090f3d4d8059713e6663dd4b35b1f7642"', last_response.headers['ETag']
+    assert_equal '15', last_response.headers['Content-Length']
   end
 
   test "precondition failed with if-match is a mismatch" do
@@ -253,7 +253,7 @@ class ServerTest < ActiveSupport::TestCase
     JS
     get "/assets/%E6%97%A5%E6%9C%AC%E8%AA%9E.js"
     assert_equal <<~JS.strip, last_response.body
-      !function(){"use strict";console.log("日本語")}();
+      console.log("日本語");
     JS
   end
 

data/test/test_helper.rb

@@ -53,9 +53,10 @@ class ActiveSupport::TestCase
     assert_equal json, jbuild(&block)
   end
   
-  def file(name, source)
-    dir = name.include?('/') ? File.join(@path, File.dirname(name)) : @path
-    path = File.join(@path, name)
+  def file(name, source, base: nil)
+    base ||= @path
+    dir = name.include?('/') ? File.join(base, File.dirname(name)) : base
+    path = File.join(base, name)
     
     FileUtils.mkdir_p(dir)
     if File.exist?(path)
@@ -78,6 +79,7 @@ class ActiveSupport::TestCase
     assert_equal path.delete_prefix('/'),     asset.filename
     assert_equal Array(mime_types),           asset.content_types
     assert_equal(source.rstrip, asset.source.rstrip) if !source.nil?
+    asset
   end
   
   def assert_exported_file(path, mime_types, source=nil)
@@ -88,6 +90,7 @@ class ActiveSupport::TestCase
     assert_equal path,                        asset.filename
     assert_equal Array(mime_types),           asset.content_types
     assert_equal(source.rstrip, asset.source.rstrip) if !source.nil?
+    asset
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condenser
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Jon Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-06 00:00:00.000000000 Z
+date: 2024-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -398,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: A Rack-based asset packaging system