condenser 1.4 → 1.5.1

data/lib/condenser/server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 require 'time'
 require 'rack/utils'
@@ -67,7 +69,7 @@ class Condenser
       end
 
       # Look up the asset.
-      asset = @condenser.find_export(path)
+      asset = @condenser.find_export(path, npm: true)
       if asset.nil?
         status = :not_found
       elsif fingerprint && asset.etag != fingerprint
@@ -142,39 +144,39 @@ class Condenser
       # Returns a 400 Forbidden response tuple
       def bad_request_response(env)
         if head_request?(env)
-          [ 400, { "Content-Type" => "text/plain", "Content-Length" => "0" }, [] ]
+          [ 400, { "content-type" => "text/plain", "content-length" => "0" }, [] ]
         else
-          [ 400, { "Content-Type" => "text/plain", "Content-Length" => "11" }, [ "Bad Request" ] ]
+          [ 400, { "content-type" => "text/plain", "content-length" => "11" }, [ "Bad Request" ] ]
         end
       end
 
       # Returns a 403 Forbidden response tuple
       def forbidden_response(env)
         if head_request?(env)
-          [ 403, { "Content-Type" => "text/plain", "Content-Length" => "0" }, [] ]
+          [ 403, { "content-type" => "text/plain", "content-length" => "0" }, [] ]
         else
-          [ 403, { "Content-Type" => "text/plain", "Content-Length" => "9" }, [ "Forbidden" ] ]
+          [ 403, { "content-type" => "text/plain", "content-length" => "9" }, [ "Forbidden" ] ]
         end
       end
 
       # Returns a 404 Not Found response tuple
       def not_found_response(env)
         if head_request?(env)
-          [ 404, { "Content-Type" => "text/plain", "Content-Length" => "0", "X-Cascade" => "pass" }, [] ]
+          [ 404, { "content-type" => "text/plain", "content-length" => "0", "x-cascade" => "pass" }, [] ]
         else
-          [ 404, { "Content-Type" => "text/plain", "Content-Length" => "9", "X-Cascade" => "pass" }, [ "Not found" ] ]
+          [ 404, { "content-type" => "text/plain", "content-length" => "9", "x-cascade" => "pass" }, [ "Not found" ] ]
         end
       end
 
       def method_not_allowed_response
-        [ 405, { "Content-Type" => "text/plain", "Content-Length" => "18" }, [ "Method Not Allowed" ] ]
+        [ 405, { "content-type" => "text/plain", "content-length" => "18" }, [ "Method Not Allowed" ] ]
       end
 
       def precondition_failed_response(env)
         if head_request?(env)
-          [ 412, { "Content-Type" => "text/plain", "Content-Length" => "0", "X-Cascade" => "pass" }, [] ]
+          [ 412, { "content-type" => "text/plain", "content-length" => "0", "x-cascade" => "pass" }, [] ]
         else
-          [ 412, { "Content-Type" => "text/plain", "Content-Length" => "19", "X-Cascade" => "pass" }, [ "Precondition Failed" ] ]
+          [ 412, { "content-type" => "text/plain", "content-length" => "19", "x-cascade" => "pass" }, [ "Precondition Failed" ] ]
         end
       end
 
@@ -183,7 +185,7 @@ class Condenser
       def javascript_exception_response(exception)
         err  = "#{exception.class.name}: #{exception.message}\n  (in #{exception.backtrace[0]})"
         body = "throw Error(#{err.inspect})"
-        [ 200, { "Content-Type" => "application/javascript", "Content-Length" => body.bytesize.to_s }, [ body ] ]
+        [ 200, { "content-type" => "application/javascript", "content-length" => body.bytesize.to_s }, [ body ] ]
       end
 
       # Returns a CSS response that hides all elements on the page and
@@ -236,7 +238,7 @@ class Condenser
           }
         CSS
 
-        [ 200, { "Content-Type" => "text/css; charset=utf-8", "Content-Length" => body.bytesize.to_s }, [ body ] ]
+        [ 200, { "content-type" => "text/css; charset=utf-8", "content-length" => body.bytesize.to_s }, [ body ] ]
       end
 
       # Escape special characters for use inside a CSS content("...") string
@@ -252,18 +254,18 @@ class Condenser
         headers = {}
 
         # Set caching headers
-        headers["Cache-Control"] = String.new("public")
-        headers["ETag"]          = %("#{etag}")
+        headers["cache-control"] = String.new("public")
+        headers["etag"]          = %("#{etag}")
 
         # If the request url contains a fingerprint, set a long
         # expires on the response
         if path_fingerprint(env["PATH_INFO"])
-          headers["Cache-Control"] << ", max-age=31536000, immutable"
+          headers["cache-control"] << ", max-age=31536000, immutable"
 
         # Otherwise set `must-revalidate` since the asset could be modified.
         else
-          headers["Cache-Control"] << ", must-revalidate"
-          headers["Vary"] = "Accept-Encoding"
+          headers["cache-control"] << ", must-revalidate"
+          headers["vary"] = "Accept-Encoding"
         end
 
         headers
@@ -273,10 +275,10 @@ class Condenser
         headers = {}
 
         # Set content length header
-        headers["Content-Length"] = length.to_s
+        headers["content-length"] = length.to_s
 
         if asset&.sourcemap
-          headers['SourceMap'] = env['SCRIPT_NAME'] + env['PATH_INFO'] + '.map'
+          headers['sourcemap'] = env['SCRIPT_NAME'] + env['PATH_INFO'] + '.map'
         end
         
         # Set content type header
@@ -285,7 +287,7 @@ class Condenser
           if type.start_with?("text/") && asset.charset
             type += "; charset=#{asset.charset}"
           end
-          headers["Content-Type"] = type
+          headers["content-type"] = type
         end
 
         headers.merge(cache_headers(env, asset.etag))

data/lib/condenser/templating_engine/ejs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser::EjsTemplate
 
   def self.setup(environment)

data/lib/condenser/templating_engine/erb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser::Erubi
 
   def self.setup(environment)

data/lib/condenser/transformers/dart_sass_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser::DartSassTransformer < Condenser::NodeProcessor
 
   @@helper_methods = Set.new
@@ -196,14 +198,14 @@ class Condenser::DartSassTransformer < Condenser::NodeProcessor
   
   def exec_runtime(script)
     io = IO.popen([binary, '-e', script], 'r+')
-    buffer = ''
+    buffer = String.new
     result = nil
     
     begin
       while IO.select([io]) && io_read = io.read_nonblock(1_024)
         buffer << io_read
         messages = buffer.split("\n\n")
-        buffer = buffer.end_with?("\n\n") ? '' : messages.pop
+        buffer = buffer.end_with?("\n\n") ? String.new : messages.pop
         
         messages.each do |message|
           message = JSON.parse(message)
@@ -218,7 +220,7 @@ class Condenser::DartSassTransformer < Condenser::NodeProcessor
             
             if importee.end_with?('*')
               @context.depend_on(importee)
-              code = ""
+              code = String.new
               resolve(importee, importer).each do |f, i|
                 code << "@import '#{f.filename}';\n"
               end

data/lib/condenser/transformers/jst_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser::JstTransformer < Condenser::NodeProcessor
   
   def initialize(dir = nil)

data/lib/condenser/transformers/sass/functions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Public: Functions injected into Sass context during Condenser evaluation.
 #
 # This module may be extended to add global functionality to all Condenser

data/lib/condenser/transformers/sass/importer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "sassc"
 
 class Condenser::Sass::Importer < SassC::Importer

data/lib/condenser/transformers/sass.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Condenser::Sass
   autoload :Functions, 'condenser/transformers/sass/functions'
   autoload :Importer, 'condenser/transformers/sass/importer'

data/lib/condenser/transformers/sass_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Transformer engine class for the SASS/SCSS compiler. Depends on the `sass`
 # gem.
 #

data/lib/condenser/transformers/svg_transformer/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser::SVGTransformer::Base
   
   attr_accessor :children

data/lib/condenser/transformers/svg_transformer/tag.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser::SVGTransformer::Tag
 
   attr_accessor :tag_name, :attrs, :children, :namespace

data/lib/condenser/transformers/svg_transformer/template.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser::SVGTransformer::Template
   
   include Condenser::ParseHelpers
@@ -107,7 +109,7 @@ class Condenser::SVGTransformer::Template
           @tree.last.attrs << { key => matched }
         end
       when :tag_attr_value_double_quoted
-        quoted_value = ''
+        quoted_value = String.new
         scan_until(/"/)
         quoted_value << pre_match if !pre_match.strip.empty?
         rewind(1)

data/lib/condenser/transformers/svg_transformer/template_error.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Condenser::SVGTransformer::TemplateError < StandardError
 end

data/lib/condenser/transformers/svg_transformer/value.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 class Condenser::SVGTransformer::Value

data/lib/condenser/transformers/svg_transformer/var_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser::SVGTransformer::VarGenerator
   def initialize
     @current = nil

data/lib/condenser/transformers/svg_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser::SVGTransformer
   
   autoload :Base, File.expand_path('../svg_transformer/base', __FILE__)

data/lib/condenser/utils.rb

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

data/lib/condenser/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Condenser
-  VERSION = '1.4'
+  VERSION = '1.5.1'
 end

data/lib/condenser/writers/brotli_writer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'brotli'
 require 'condenser/utils'
 

data/lib/condenser/writers/file_writer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'condenser/utils'
 
 # Writes an asset file to disk

data/lib/condenser/writers/zlib_writer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'zlib'
 require 'condenser/utils'
 

data/lib/condenser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logger'
 require 'active_support'
 require 'active_support/core_ext'

data/lib/rake/condensertask.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake'
 require 'rake/tasklib'
 

data/test/cache_test.rb

@@ -86,13 +86,13 @@ class CacheTest < ActiveSupport::TestCase
       }
     JS
 
-    assert_exported_file 'main.js', 'application/javascript', <<~CSS
-      !function(){var o;console.log((o=5)*o)}();
-    CSS
+    assert_exported_file 'main.js', 'application/javascript', <<~JS
+      function cube(c){return c*c}console.log(cube(5));
+    JS
 
-    assert_exported_file 'main.js', 'application/javascript', <<~CSS
-      !function(){var o;console.log((o=5)*o)}();
-    CSS
+    assert_exported_file 'main.js', 'application/javascript', <<~JS
+      function cube(c){return c*c}console.log(cube(5));
+    JS
 
     file 'math.js', <<-JS
       export function cube ( x ) {
@@ -101,7 +101,7 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'main.js', 'application/javascript', <<~CSS
-      !function(){var o;console.log((o=5)*o*o)}();
+      function cube(c){return c*c*c}console.log(cube(5));
     CSS
   end
 
@@ -281,7 +281,7 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'a.js', 'application/javascript', <<~JS
-      console.log("a"),console.log("b");
+      function b(){console.log("b")}console.log("a"),b();
     JS
 
     file 'b.js', <<~JS
@@ -289,7 +289,7 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'a.js', 'application/javascript', <<~JS
-      console.log("a"),console.log("c");
+      function b(){console.log("c")}console.log("a"),b();
     JS
   end
 
@@ -343,7 +343,7 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'a.js', 'application/javascript', <<~JS
-      console.log("a"),console.log("b"),console.log("c"),console.log("d");
+      function b(){console.log("b")}function d(){console.log("d")}function c(){console.log("c"),d()}console.log("a"),b(),c();
     JS
 
     file 'd.js', "export default function e () { console.log('e'); }\n"
@@ -359,7 +359,7 @@ class CacheTest < ActiveSupport::TestCase
     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");
+      function b(){console.log("b")}function e(){console.log("e")}function c(){console.log("c"),e()}console.log("a"),b(),c();
     JS
   end
   
@@ -394,14 +394,14 @@ class CacheTest < ActiveSupport::TestCase
 
     # 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
+    assert_equal 'function c(){console.log("c")}function b(){console.log("b"),c()}console.log("a"),b();', 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
+    assert_equal 'function c(){console.log("d")}function b(){console.log("b"),c()}console.log("a"),b();', 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
+    assert_equal 'function c(){console.log("e")}function b(){console.log("b"),c()}console.log("a"),b();', env3.find('test/a.js').export.source
   end
 end

data/test/manifest_test.rb

@@ -62,8 +62,8 @@ class ManifestTest < ActiveSupport::TestCase
 
     data = JSON.parse(File.read(manifest.filename))
     assert data['application.js']
-    assert data['application.js']['size'] > 16
-    assert_equal asset.path, data['application.js']['path']
+    assert_equal asset.path,  data['application.js']['path']
+    assert_equal 15,          data['application.js']['size']
   end
 
   test "compile asset dependencies includes the dependencies" do
@@ -541,4 +541,19 @@ class ManifestTest < ActiveSupport::TestCase
   #   assert_equal %w(0 1 0 1), processor.seq
   # end
 
+  test "javascript types are in the manifest" do
+    file 'application.js', <<-JS
+      console.log(1);
+    JS
+    
+    manifest = Condenser::Manifest.new(@env, File.join(@dir, 'manifest.json'))
+    manifest.compile('application.js')
+    assert File.directory?(manifest.dir)
+    assert File.file?(manifest.filename)
+    assert File.exist?("#{@dir}/manifest.json")
+    
+    data = JSON.parse(File.read(manifest.filename))
+    assert data['application.js']
+    assert_equal "module",    data['application.js']['type']
+  end
 end

data/test/postprocessors/css_media_combiner_test.rb

@@ -24,7 +24,7 @@ class MediaCombinerTest < ActiveSupport::TestCase
           display: inline;
         }
       }
-      
+
       .test2{
         display: block;
       }
@@ -35,17 +35,14 @@ class MediaCombinerTest < ActiveSupport::TestCase
       }
     CSS
 
-    assert_exported_file 'main.css', 'text/css', <<~FILE
+    assert_exported_file 'main.css', 'text/css', <<~CSS
     .test{
       display: block;
     }
 
-
-
     .test2{
       display: block;
-    }
-    @media only screen and (max-width: 100px) {
+    }@media only screen and (max-width: 100px) {
       .test {
         display: inline-block;
         color: blue;
@@ -59,7 +56,7 @@ class MediaCombinerTest < ActiveSupport::TestCase
         display: inline;
       }
     }
-    FILE
+    CSS
   end
   
   test 'single line css' do
@@ -67,9 +64,9 @@ class MediaCombinerTest < ActiveSupport::TestCase
       .test{display: block;} @media only screen and (max-width: 100px) {.test {display: inline-block;}}@media only screen and (max-width: 500px) {.test {display: inline;}}.test2{display: block;}@media only screen and (max-width: 100px) {.test2 {display: inline-block;}}
     CSS
 
-    assert_exported_file 'main.css', 'text/css', <<~FILE
-    .test{display: block;} .test2{display: block;}@media only screen and (max-width: 100px) {.test {display: inline-block;}.test2 {display: inline-block;}}@media only screen and (max-width: 500px) {.test {display: inline;}}
-    FILE
+    assert_exported_file 'main.css', 'text/css', <<~CSS
+    .test{display: block;}.test2{display: block;}@media only screen and (max-width: 100px) {.test {display: inline-block;}.test2 {display: inline-block;}}@media only screen and (max-width: 500px) {.test {display: inline;}}
+    CSS
   end
 
 
@@ -88,7 +85,7 @@ class MediaCombinerTest < ActiveSupport::TestCase
     }
     CSS
 
-    assert_exported_file 'main.css', 'text/css', <<~FILE
+    assert_exported_file 'main.css', 'text/css', <<~CSS
     .trobber {
     animation: throb 1s infinite;
     }
@@ -100,7 +97,7 @@ class MediaCombinerTest < ActiveSupport::TestCase
             opacity: 0;
         }
     }
-    FILE
+    CSS
   end