terser 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 756cc27e5aae90c30bfde06fddd7b21ac958b83fd03566e196b8134ba3fe9763
-  data.tar.gz: 03b10dead50a434af48ed4c11676bcd0ccf24ccce7b4c8f129836fee3abae491
+  metadata.gz: 0df4df7d398c0f92a7764fe0dbc8727d57c81df483ce0971d70fcbab762d4ebe
+  data.tar.gz: a11aba6fb280518f7aedf86cc8b66ea2745679fb4e019c8911e4af053fa569b4
 SHA512:
-  metadata.gz: 7d0997164194491cf31a0dbef18e0421ca4c728844d48ae2e2fb5d09d02769454f6148c3692673c706c552b9f7695d0421fdb736384d7fb6896cd17c0ded7d5c
-  data.tar.gz: fdae9057fa77d5d0485e61fd836dd65a45a406a897bf542e73bff44c5b39be73c896a97e3cd3145bff10cb6a36b2875c02b6e95442a5bd107e53f721c788144e
+  metadata.gz: 60aca4d535adb3a1d86396e06013657f1db73a1074849ee1a6ac0caf2bc093846abe8f49575a2ce4a2c694e05011814914099e655b702e51a988dcd21b983f78
+  data.tar.gz: 41ba3d478eacb5128bf45d86975567570209369e609016ecc8b2e8ead21488ce826ef3ab89f3f53916cd6325512935ad78fd0a1b64ec42579de400419efeb7a5

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Unreleased
 
+## 1.0.1 (02 August 2020)
+- share the context in order to speedup sprockets compilation
+
 ## 1.0.0 (13 July 2020)
 - add sprockets wrapper
 - drop Ruby < 2.3.0 support

data/README.md

@@ -7,7 +7,7 @@ a fork based on https://github.com/lautis/uglifier and https://github.com/mishoo
 
 ES6 support
 
-[![Build Status](https://travis-ci.org/ahorek/terser-ruby.svg?branch=master)](https://travis-ci.org/ahorek/terser-ruby)
+[![Build Status](https://api.travis-ci.com/ahorek/terser-ruby.svg?branch=master)](https://travis-ci.org/ahorek/terser-ruby)
 
 ### Rails
 

data/lib/terser.rb

@@ -152,10 +152,11 @@ class Terser
   # Minifies JavaScript code
   #
   # @param source [IO, String] valid JS source code.
+  # @param source_map_options [Hash] optional
   # @return [String] minified code.
-  def compile(source)
-    if @options[:source_map]
-      compiled, source_map = run_terserjs(source, true)
+  def compile(source, source_map_options = @options)
+    if source_map_options[:source_map]
+      compiled, source_map = run_terserjs(source, true, source_map_options)
       source_map_uri = Base64.strict_encode64(source_map)
       source_map_mime = "application/json;charset=utf-8;base64"
       compiled + "\n//# sourceMappingURL=data:#{source_map_mime},#{source_map_uri}"
@@ -168,9 +169,10 @@ class Terser
   # Minifies JavaScript code and generates a source map
   #
   # @param source [IO, String] valid JS source code.
+  # @param source_map_options [Hash] optional
   # @return [Array(String, String)] minified code and source map.
-  def compile_with_map(source)
-    run_terserjs(source, true)
+  def compile_with_map(source, source_map_options = @options)
+    run_terserjs(source, true, source_map_options)
   end
 
   private
@@ -189,12 +191,12 @@ class Terser
     raise e
   end
 
-  def source_map_comments
-    return '' unless @options[:source_map].respond_to?(:[])
+  def source_map_comments(source_map_options)
+    return '' unless source_map_options[:source_map].respond_to?(:[])
 
     suffix = ''
-    suffix += "\n//# sourceMappingURL=" + @options[:source_map][:map_url] if @options[:source_map][:map_url]
-    suffix += "\n//# sourceURL=" + @options[:source_map][:url] if @options[:source_map][:url]
+    suffix += "\n//# sourceMappingURL=" + source_map_options[:source_map][:map_url] if source_map_options[:source_map][:map_url]
+    suffix += "\n//# sourceURL=" + source_map_options[:source_map][:url] if source_map_options[:source_map][:url]
     suffix
   end
 
@@ -206,19 +208,19 @@ class Terser
   end
 
   # Run TerserJS for given source code
-  def run_terserjs(input, generate_map)
+  def run_terserjs(input, generate_map, source_map_options = {})
     source = read_source(input)
-    input_map = input_source_map(source, generate_map)
+    input_map = input_source_map(source, generate_map, source_map_options)
     options = {
       :source => source,
       :output => output_options,
       :compress => compressor_options,
       :mangle => mangle_options,
-      :parse => parse_options,
-      :sourceMap => source_map_options(input_map)
+      :parse => parse_options(source_map_options),
+      :sourceMap => source_map_options(input_map, source_map_options)
     }
 
-    parse_result(context.call("terser_wrapper", options), generate_map, options)
+    parse_result(context.call("terser_wrapper", options), generate_map, options, source_map_options)
   end
 
   def error_context_lines
@@ -273,13 +275,13 @@ class Terser
     "#{err['message']}\n#{src_ctx}"
   end
 
-  def parse_result(result, generate_map, options)
+  def parse_result(result, generate_map, options, source_map_options = {})
     raise Error, error_message(result, options) if result.has_key?('error')
 
     if generate_map
-      [result['code'] + source_map_comments, result['map']]
+      [result['code'] + source_map_comments(source_map_options), result['map']]
     else
-      result['code'] + source_map_comments
+      result['code'] + source_map_comments(source_map_options)
     end
   end
 
@@ -400,8 +402,8 @@ class Terser
     end
   end
 
-  def source_map_options(input_map)
-    options = conditional_option(@options[:source_map], SOURCE_MAP_DEFAULTS) || SOURCE_MAP_DEFAULTS
+  def source_map_options(input_map, source_map_options)
+    options = conditional_option(source_map_options[:source_map], SOURCE_MAP_DEFAULTS) || SOURCE_MAP_DEFAULTS
 
     {
       :input => options[:filename],
@@ -414,14 +416,14 @@ class Terser
     }
   end
 
-  def parse_options
+  def parse_options(source_map_options)
     conditional_option(@options[:parse], DEFAULTS[:parse])
-      .merge(parse_source_map_options)
+      .merge(parse_source_map_options(source_map_options))
   end
 
-  def parse_source_map_options
-    if @options[:source_map].respond_to?(:[])
-      { :filename => @options[:source_map][:filename] }
+  def parse_source_map_options(source_map_options)
+    if source_map_options[:source_map].respond_to?(:[])
+      { :filename => source_map_options[:source_map][:filename] }
     else
       {}
     end
@@ -479,10 +481,10 @@ class Terser
     match && match[1]
   end
 
-  def input_source_map(source, generate_map)
+  def input_source_map(source, generate_map, options)
     return nil unless generate_map
 
-    source_map_options = @options[:source_map].is_a?(Hash) ? @options[:source_map] : {}
+    source_map_options = options[:source_map].is_a?(Hash) ? options[:source_map] : {}
     sanitize_map_root(source_map_options.fetch(:input_source_map) do
       url = extract_source_mapping_url(source)
       Base64.strict_decode64(url.split(",", 2)[-1]) if url && url.start_with?("data:")

data/lib/terser/compressor.rb

@@ -12,6 +12,7 @@ class Terser
       options[:comments] ||= :none
       @options = options
       @cache_key = -"Terser:#{::Terser::VERSION}:#{VERSION}:#{::Sprockets::DigestUtils.digest(options)}"
+      @terser = ::Terser.new(@options)
     end
 
     def self.instance
@@ -31,9 +32,8 @@ class Terser
     if Gem::Version.new(::Sprockets::VERSION) >= Gem::Version.new('4.x')
       def call(input)
         input_options = { :source_map => { :filename => input[:filename] } }
-        terser = ::Terser.new(@options.merge(input_options))
 
-        js, map = terser.compile_with_map(input[:data])
+        js, map = @terser.compile_with_map(input[:data], input_options)
 
         map = ::Sprockets::SourceMapUtils.format_source_map(JSON.parse(map), input)
         map = ::Sprockets::SourceMapUtils.combine_source_maps(input[:metadata][:map], map)
@@ -42,8 +42,7 @@ class Terser
       end
     else
       def call(input)
-        terser = ::Terser.new(@options)
-        terser.compile(input[:data])
+        @terser.compile(input[:data])
       end
     end
   end

data/lib/terser/version.rb

@@ -2,5 +2,5 @@
 
 class Terser
   # Current version of Terser.
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terser
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Pavel Rosicky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs