condenser 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78e391e2e34c47daeb8d0489f2ba3567d24ba9a2fecee0c8457c65276bbb6886
-  data.tar.gz: 354fd3b42f9eb4636a94babb725f87c0c4ea037c0943fa82380eb6f35a169338
+  metadata.gz: bce2f9e63c85791fe398be271a8384c0c1ee1bebda8b6cb4576d797c73fd2095
+  data.tar.gz: ac1375ba4585e172d2fa8eca13e381773e5c76651ec871b23306fd435f5c026d
 SHA512:
-  metadata.gz: a0bf3d990b15d7b225b8d0af09da4359e95e4add21222bbace313ac8a7b6833a40ee17257498e5f2a65a8fa13f47a6467bb9eae910c6acdbd2ddf7ab64b45ac2
-  data.tar.gz: cff15370f99605a8f87c1e313afbb65efc169acf4df4877c44acbe6b0ea36a2a772ecb98641e5c093fb1d658d35b2d562968d890a5ee328d764d3e8229a6c9aa
+  metadata.gz: 10b483f5a68484ec0841c6fde493100f1a13a1037b02b9f3ad4ebc38112711ad9deef64335f51dd1afdd15bf043d6db308171424daad54a3b58f34b5f3d2feed
+  data.tar.gz: a7e759c7f7e887560d21f497155d4eb57bbdc1dc2e76902f159abc20b6d1c4244576473b080b8906080bc0f2f17a30d1cda4f6d036f65c468d5bb9cfb533bf70

data/lib/condenser/asset.rb

@@ -71,7 +71,7 @@ class Condenser
         process
         @process_dependencies
       end
-      
+    
       d = []
       deps.each do |i|
         i = [i, nil] if i.is_a?(String)
@@ -147,6 +147,9 @@ class Condenser
       Digest::SHA1.base64digest(JSON.generate([
         Condenser::VERSION,
         @source_file,
+        stat.ino,
+        stat.mtime.to_f,
+        stat.size,
         @content_types_digest
       ]))
     end
@@ -154,7 +157,7 @@ class Condenser
     def process_cache_version
       return @pcv if @pcv
 
-      f = [stat.ino, stat.mtime.to_f, stat.size]
+      f = []
       all_dependenies(process_dependencies, [], :process_dependencies) do |dep|
         f << [dep.source_file, dep.stat.ino, dep.stat.mtime.to_f, dep.stat.size]
       end
@@ -165,7 +168,7 @@ class Condenser
     def export_cache_version
       return @ecv if @ecv
 
-      f = [stat.ino, stat.mtime.to_f, stat.size]
+      f = []
       all_dependenies(export_dependencies, [], :export_dependencies) do |dep|
         f << [dep.source_file, dep.stat.ino, dep.stat.mtime.to_f, dep.stat.size]
       end

data/lib/condenser/build_cache.rb

@@ -37,29 +37,47 @@ class Condenser
               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]
-                b = (File.dirname(a) + "/*")
+                b = File.join(File.dirname(a), "*")
               
                 globs << a << a.delete_prefix('/')
-                globs << a << b.delete_prefix('/')
+                globs << b << b.delete_prefix('/')
               end
             end
-            
+
+            others = []
             @map_cache&.delete_if do |k,v|
               if globs.any?{ |a| k.starts_with?(a) }
+                @export_dependencies[v.source_file]&.each do |a| 
+                  others << "/#{a.filename}".delete_suffix(File.extname(a.filename))
+                end
                 true
               else
                 false
               end
             end
-
+            @map_cache&.delete_if do |k,v|
+              others.any?{ |a| k.starts_with?(a) || k.starts_with?("/" + a) }
+            end
+            
+            others = []
             @lookup_cache.delete_if do |key, value|
               if globs.any?{ |a| key.starts_with?(a) }
+                value.each do |v|
+                  @export_dependencies[v.source_file]&.each do |a| 
+                    others << "/#{a.filename}".delete_suffix(File.extname(a.filename))
+                  end
+                end
                 value.each do |asset|
                   modified << asset.source_file
                 end
                 true
               end
             end
+            @lookup_cache&.delete_if do |k,v|
+              others.any?{ |a| k.starts_with?(a) || k.starts_with?("/" + a) }
+            end
+            
+
             
             removed.each do |file|
               @process_dependencies[file]&.delete_if do |asset|

data/lib/condenser/errors.rb

@@ -1,6 +1,7 @@
 # Basic Condenser error classes
 class Condenser
-  class Error           < StandardError; end
+  class Error < StandardError; end
+  class SyntaxError < ::SyntaxError; end
   class CommandNotFoundError < Error; end
   # class ArgumentError           < Error; end
   class ContentTypeMismatch     < Error; end

data/lib/condenser/processors/babel_processor.rb

@@ -3,9 +3,6 @@ require File.expand_path('../node_processor', __FILE__)
 
 class Condenser::BabelProcessor < Condenser::NodeProcessor
   
-  class Error < StandardError
-  end
-  
   # npm install @babel/core @babel/runtime-corejs3 @babel/plugin-transform-runtime @babel/preset-env rollup rollup-plugin-commonjs  rollup-plugin-node-resolve  @babel/plugin-proposal-class-properties babel-plugin-transform-class-extended-hook
   
   def self.call(environment, input)
@@ -90,7 +87,11 @@ class Condenser::BabelProcessor < Condenser::NodeProcessor
     JS
     
     if result['error']
-      raise exec_runtime_error(result['error'][0] + ': ' + result['error'][1])
+      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])
+      end
     else
       input[:source] = result['code']
       input[:map] = result['map']

data/lib/condenser/processors/node_processor.rb

@@ -38,6 +38,15 @@ class Condenser
       end
     end
     
+    def exec_syntax_error(output, source_file)
+      error = Condenser::SyntaxError.new(output)
+      lines = output.split("\n")
+      lineno = lines[0][/\((\d+):\d+\)$/, 1] if lines[0]
+      lineno ||= 1
+      error.set_backtrace(["#{source_file}:#{lineno}"] + caller)
+      error
+    end
+    
     def exec_runtime_error(output)
       error = RuntimeError.new(output)
       lines = output.split("\n")

data/lib/condenser/resolve.rb

@@ -19,6 +19,7 @@ class Condenser
       accept = Array(accept)
       
       cache_key = [dirname, basename].flatten.join('/')
+      cache_key = "/#{cache_key}" if !cache_key.starts_with?('/')
       cache_key << "@#{accept.join(',')}" if accept
       build_cache.fetch(cache_key) do
         build do
@@ -86,7 +87,7 @@ class Condenser
           end
         
           results = results.keys.sort.reduce([]) do |c, key|
-            c += results[key].sort_by(&:filename)
+            c += results[key].sort_by(&:filename).uniq { |f| f.filename }
           end
 
           results.sort_by!(&:filename)

data/lib/condenser/version.rb

@@ -1,3 +1,3 @@
 class Condenser
-  VERSION = '0.1'
+  VERSION = '0.2'
 end

data/test/cache_test.rb

@@ -171,6 +171,14 @@ class CacheTest < ActiveSupport::TestCase
     assert_exported_file 'a.js', 'application/javascript', <<~JS
       !function(){"use strict";console.log(10)}();
     JS
+
+    file 'a/deps/dep.js', <<-JS
+      console.log( 20 );
+    JS
+
+    assert_exported_file 'a.js', 'application/javascript', <<~JS
+      !function(){"use strict";console.log(20)}();
+    JS
   end
   
   test 'a new dependency for a glob call is reflected in the next call' do

data/test/preprocessor/babel_test.rb

@@ -24,6 +24,27 @@ class CondenserBabelTest < ActiveSupport::TestCase
     JS
   end
 
+  test "error" do
+    file 'error.js', <<~JS
+      console.log('this file has an error');
+      
+      var error = {;
+    JS
+
+    e = assert_raises Condenser::SyntaxError do
+      assert_file 'error.js', 'application/javascript'
+    end
+    assert_equal <<~ERROR.rstrip, e.message.rstrip
+      /assets/error.js: Unexpected token (3:13)
+
+        1 | console.log('this file has an error');
+        2 | 
+      > 3 | var error = {;
+          |              ^
+        4 | 
+    ERROR
+  end
+  
   test 'not duplicating babel-helpers' do
     file 'a.js', <<-JS
       export default class {

data/test/test_helper.rb

@@ -14,6 +14,7 @@ require 'condenser'
 require 'condenser/server'
 require 'condenser/cache/memory_store'
 
+require 'byebug'
 require "active_support"
 require "active_support/testing/autorun"
 require 'mocha/minitest'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condenser
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi