uglifier 3.2.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d2722575407efccc0c2cfb1f160b6306a6a8452
-  data.tar.gz: 67ac05657beeea49bdeca3a7acf59037ad9a0ee8
+  metadata.gz: d161a455919cc87b9ac6f7d7b95244d8f39c2cf7
+  data.tar.gz: cc5a06ebea3dd02c15b65808b6739d8ee5a90da5
 SHA512:
-  metadata.gz: a8e246165b8e7a6753b43fe5868e2a4dcf7f204098946cfbc6eee4bb50b1be92d5b220124423388166e0852b09afe8f77bcbd6e9079cc16a256e07f0d00e5822
-  data.tar.gz: 604fc25e6ab69d9af0846f0bb2fe8bbb7e243e683d7341b808deb6378275575394152aaa60c4103a4d2e378b97d6fd843aeacc66a23f109b4d65bc73a3270e67
+  metadata.gz: bcc621675abbb456cc1e9e2177294af3e5ed73460452baf5b278293ef516bfe4d160b40c16f486ecf7eafaf2e7f4acbbb9d38e53b0ad8321f6f7165dbc112ddf
+  data.tar.gz: 5e62e7214959feed02b9e44b2c51c43ed57021ee075bb567bb6eca83ec1cdcb3c8c68ba798a86813b5d95d72fdfec81d3dda23933827cb540951e432502426ce

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  DisplayCopNames: true
   Exclude:
     - uglifier.gemspec
     - lib/uglifier/version.rb
@@ -19,6 +20,9 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Max: 20
 
+Style/Encoding:
+  Enabled: false
+
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 

data/.travis.yml

@@ -5,27 +5,29 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.10
-  - 2.2.6
-  - 2.3.3
-  - 2.4.1
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
   - ruby-head
   - jruby-19mode
-  - jruby-9.1.8.0
+  - jruby-9.1.13.0
+before_install:
+  - gem install bundler -v 1.15.4
 git:
   submodules: false
 gemfile:
   - Gemfile
 matrix:
   include:
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       gemfile: gemfiles/rubyracer
-    - rvm: jruby-9.1.8.0
+    - rvm: jruby-9.1.13.0
       gemfile: gemfiles/rubyrhino
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       gemfile: gemfiles/alaska
       env: ALASKA=1
   allow_failures:
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       gemfile: gemfiles/alaska
       env: ALASKA=1
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## 4.0.0 (2 December 2017)
+
+- update UglifyJS to 3.2.0
+- remove Angular ngInject processing
+- add unsafe_math compress option
+- add reduce_funcs compress option
+- add parse options
+- add shebang output option
+- add keep_infinity compress option
+- add quote_style output option
+- add side_effects compress option
+- add switches compress option
+- more helpful error Message in Harmony mode
+
+Dropped options:
+
+- output: angular
+- mangle: except => reserved
+- mangle_properties: ignore_quoted => keep_quoted
+- enclose
+- squeeze, copyright and screw_ie8 options
+
+
 ## 3.2.0 (9 April 2017)
 
 - experimental ES6/Harmony mode based on UglifyJS2 Harmony branch

data/Gemfile

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rubocop', '~> 0.48.0', :group => [:development] if RUBY_VERSION >= '2.0'
+gem 'rubocop', '~> 0.51.0', :group => [:development] if RUBY_VERSION >= '2.1'

data/README.md

@@ -66,10 +66,12 @@ Available options and their defaults are
     :beautify => false,         # Beautify output
     :indent_level => 4,         # Indent level in spaces
     :indent_start => 0,         # Starting indent level
-    :space_colon => false,      # Insert space before colons (only with beautifier)
     :width => 80,               # Specify line width when beautifier is used (only with beautifier)
     :preamble => nil,           # Preamble for the generated JS file. Can be used to insert any code or comment.
     :wrap_iife => false         # Wrap IIFEs in parenthesis. Note: this disables the negate_iife compression option.
+    :shebang => true            # Preserve shebang (#!) in preamble (shell scripts)
+    :quote_style => 0,          # Quote style, possible values :auto (default), :single, :double, :original
+    :keep_quoted_props => false # Keep quotes property names
   },
   :mangle => {
     :eval => false,             # Mangle names when eval of when is used in scope
@@ -91,6 +93,7 @@ Available options and their defaults are
     :drop_debugger => true,     # Remove debugger; statements
     :unsafe => false,           # Apply "unsafe" transformations
     :unsafe_comps => false,     # Reverse < and <= to > and >= to allow improved compression. This might be unsafe when an at least one of two operands is an object with computed values due the use of methods like get, or valueOf. This could cause change in execution order after operands in the comparison are switching. Compression only works if both comparisons and unsafe_comps are both set to true.
+    :unsafe_math => false,      # Optimize numerical expressions like 2 * x * 3 into 6 * x, which may give imprecise floating point results.
     :unsafe_proto => false,     # Optimize expressions like Array.prototype.slice.call(a) into [].slice.call(a)
     :conditionals => true,      # Optimize for if-s and conditional expressions
     :comparisons => true,       # Apply binary node optimizations for comparisons
@@ -106,16 +109,26 @@ Available options and their defaults are
     :join_vars => true,         # Join consecutive var statements
     :cascade => true,           # Cascade sequences
     :collapse_vars => false,    # Collapse single-use var and const definitions when possible.
+    :reduce_funcs => false,     # Inline single-use functions as function expressions. Depends on reduce_vars.
     :reduce_vars => false,      # Collapse variables assigned with and used as constant values.
     :negate_iife => true,       # Negate immediately invoked function expressions to avoid extra parens
     :pure_getters => false,     # Assume that object property access does not have any side-effects
     :pure_funcs => nil,         # List of functions without side-effects. Can safely discard function calls when the result value is not used
     :drop_console => false,     # Drop calls to console.* functions
-    :angular => false,          # Process @ngInject annotations
     :keep_fargs => false,       # Preserve unused function arguments
-    :keep_fnames => false       # Do not drop names in function definitions
-    :passes => 1                # Number of times to run compress. Raising the number of passes will increase compress time, but can produce slightly smaller code.
+    :keep_fnames => false,      # Do not drop names in function definitions
+    :passes => 1,               # Number of times to run compress. Raising the number of passes will increase compress time, but can produce slightly smaller code.
+    :keep_infinity => false,    # Prevent compression of Infinity to 1/0
+    :side_effects => true,      # Pass false to disable potentially dropping functions marked as "pure" using pure comment annotation. See UglifyJS documentation for details.
+    :switches => true,          # de-duplicate and remove unreachable switch branches
   },                            # Apply transformations to code, set to false to skip
+  :parse => {
+    :bare_returns => false,     # Allow top-level return statements.
+    :expression => false,       # Parse a single expression, rather than a program (for parsing JSON).
+    :html5_comments => true,    # Ignore HTML5 comments in input
+    :shebang => true,           # support #!command as the first line
+    :strict => false
+  },
   :define => {},                # Define values for symbol replacement
   :enclose => false,            # Enclose in output function wrapper, define replacements as key-value pairs
   :keep_fnames => false,        # Generate code safe for the poor souls relying on Function.prototype.name at run-time. Sets both compress and mangle keep_fanems to true.

data/lib/uglifier.js

@@ -17,14 +17,6 @@ function comments(option) {
   }
 }
 
-function readNameCache(key) {
-  return UglifyJS.readNameCache(null, key);
-}
-
-function writeNameCache(key, cache) {
-  return UglifyJS.writeNameCache(null, key, cache);
-}
-
 function regexOption(options) {
   if (typeof options === 'object' && options.regex) {
     return new RegExp(options.regex[0], options.regex[1]);
@@ -33,88 +25,25 @@ function regexOption(options) {
   }
 }
 
-function parse(source, options) {
-  UglifyJS.base54.reset();
-  var ast = UglifyJS.parse(source, options.parse_options);
-
-  if (options.compress) {
-    var compress = { warnings: false };
-    UglifyJS.merge(compress, options.compress);
-    ast.figure_out_scope(options.mangle);
-    var compressor = UglifyJS.Compressor(compress);
-    ast = compressor.compress(ast);
-    ast.figure_out_scope();
-  }
-
-  if (options.mangle) {
-    ast.figure_out_scope(options.mangle);
-    ast.compute_char_frequency();
-    ast.mangle_names(options.mangle);
-  }
-
-  if (options.mangle_properties) {
-    var regex = regexOption(options.mangle_properties);
-    UglifyJS.mangle_properties(ast, {
-      reserved: [],
-      only_cache: false,
-      regex: regex,
-      debug: options.mangle_properties.debug,
-      ignore_quoted: options.mangle_properties.ignore_quoted
-    });
-  }
-
-  if (options.enclose) {
-    ast = ast.wrap_enclose(options.enclose);
-  }
-  return ast;
-}
-
-function copySourcesContent(sourceMap, options) {
-  sourceMap.get().setSourceContent(options.parse_options.filename, options.source);
-
-  var original = options.source_map_options.orig;
-
-  if (original && original.sources && original.sourcesContent) {
-    for(var i = 0; i < original.sources.length; i++) {
-      sourceMap.get().setSourceContent(original.sources[i], original.sourcesContent[i]);
-    }
-  }
-}
-
 function uglifier(options) {
   var source = options.source;
-  var ast = parse(source, options);
-  var source_map;
-
-  var gen_code_options = options.output;
-  gen_code_options.comments = comments(options.output.comments);
+  options.output.comments = comments(options.output.comments);
 
-  if (options.generate_map) {
-    source_map = UglifyJS.SourceMap(options.source_map_options);
-    gen_code_options.source_map = source_map;
-
-    if (options.source_map_options.sources_content) {
-      copySourcesContent(source_map, options);
+  if (options.mangle) {
+    if (options.mangle.properties) {
+      options.mangle.properties.regex = regexOption(options.mangle.properties);
     }
   }
+  delete options.source;
 
-  var stream = UglifyJS.OutputStream(gen_code_options);
-  ast.print(stream);
-
-  if (options.source_map_options.map_url) {
-    stream += "\n//# sourceMappingURL=" + options.source_map_options.map_url;
-  }
 
-  if (options.source_map_options.url) {
-    stream += "\n//# sourceURL=" + options.source_map_options.url;
+  var inputFilename = '0'
+  if (options.sourceMap) {
+    inputFilename = options.sourceMap.input;
+    delete options.sourceMap.input;
   }
 
-  if (options.generate_map) {
-    if (options.source_map_options.sources_content) {
-      source_map.get().setSourceContent(options.parse_options.filename, options.source);
-    }
-    return [stream.toString(), source_map.toString()];
-  } else {
-    return stream.toString();
-  }
+  var inputs = {};
+  inputs[inputFilename] = source;
+  return UglifyJS.minify(inputs, options);
 }

data/lib/uglifier.rb

@@ -8,7 +8,7 @@ require "uglifier/version"
 # A wrapper around the UglifyJS interface
 class Uglifier
   # Error class for compilation errors.
-  Error = ExecJS::Error
+  class Error < StandardError; end
 
   # UglifyJS source path
   SourcePath = File.expand_path("../uglify.js", __FILE__)
@@ -38,20 +38,19 @@ class Uglifier
       :beautify => false, # Beautify output
       :indent_level => 4, # Indent level in spaces
       :indent_start => 0, # Starting indent level
-      :space_colon => false, # Insert space before colons (only with beautifier)
       :width => 80, # Specify line width when beautifier is used (only with beautifier)
       :preamble => nil, # Preamble for the generated JS file. Can be used to insert any code or comment.
-      :wrap_iife => false # Wrap IIFEs in parenthesis. Note: this disables the negate_iife compression option.
+      :wrap_iife => false, # Wrap IIFEs in parenthesis. Note: this disables the negate_iife compression option.
+      :shebang => true, # Preserve shebang (#!) in preamble (shell scripts)
+      :quote_style => 0, # Quote style, possible values :auto (default), :single, :double, :original
+      :keep_quoted_props => false # Keep quotes property names
     },
     :mangle => {
       :eval => false, # Mangle names when eval of when is used in scope
-      :except => ["$super"], # Argument names to be excluded from mangling
-      :sort => false, # Assign shorter names to most frequently used variables. Often results in bigger output after gzip.
-      :toplevel => false, # Mangle names declared in the toplevel scope
+      :reserved => ["$super"], # Argument names to be excluded from mangling
       :properties => false, # Mangle property names
-      :keep_fnames => false # Do not modify function names
+      :toplevel => false, # Mangle names declared in the toplevel scope
     }, # Mangle variable and function names, set to false to skip mangling
-    :mangle_properties => false, # Mangle property names
     :compress => {
       :sequences => true, # Allow statements to be joined by commas
       :properties => true, # Rewrite property access using the dot notation
@@ -59,6 +58,7 @@ class Uglifier
       :drop_debugger => true, # Remove debugger; statements
       :unsafe => false, # Apply "unsafe" transformations
       :unsafe_comps => false, # Reverse < and <= to > and >= to allow improved compression. This might be unsafe when an at least one of two operands is an object with computed values due the use of methods like get, or valueOf. This could cause change in execution order after operands in the comparison are switching. Compression only works if both comparisons and unsafe_comps are both set to true.
+      :unsafe_math => false, # Optimize numerical expressions like 2 * x * 3 into 6 * x, which may give imprecise floating point results.
       :unsafe_proto => false, # Optimize expressions like Array.prototype.slice.call(a) into [].slice.call(a)
       :conditionals => true, # Optimize for if-s and conditional expressions
       :comparisons => true, # Apply binary node optimizations for comparisons
@@ -74,30 +74,42 @@ class Uglifier
       :join_vars => true, # Join consecutive var statements
       :cascade => true, # Cascade sequences
       :collapse_vars => true, # Collapse single-use var and const definitions when possible.
+      :reduce_funcs => false, # Inline single-use functions as function expressions. Depends on reduce_vars.
       :reduce_vars => false, # Collapse variables assigned with and used as constant values.
       :negate_iife => true, # Negate immediately invoked function expressions to avoid extra parens
       :pure_getters => false, # Assume that object property access does not have any side-effects
       :pure_funcs => nil, # List of functions without side-effects. Can safely discard function calls when the result value is not used
       :drop_console => false, # Drop calls to console.* functions
-      :angular => false, # Process @ngInject annotations
       :keep_fargs => false, # Preserve unused function arguments
       :keep_fnames => false, # Do not drop names in function definitions
-      :passes => 1 # Number of times to run compress. Raising the number of passes will increase compress time, but can produce slightly smaller code.
+      :passes => 1, # Number of times to run compress. Raising the number of passes will increase compress time, but can produce slightly smaller code.
+      :keep_infinity => false, # Prevent compression of Infinity to 1/0
+      :side_effects => true, # Pass false to disable potentially dropping functions marked as "pure" using pure comment annotation. See UglifyJS documentation for details.
+      :switches => true, # de-duplicate and remove unreachable switch branches
     }, # Apply transformations to code, set to false to skip
+    :parse => {
+      :bare_returns => false, # Allow top-level return statements.
+      :expression => false, # Parse a single expression, rather than a program (for parsing JSON).
+      :html5_comments => true, # Ignore HTML5 comments in input
+      :shebang => true, # support #!command as the first line
+      :strict => false
+    },
     :define => {}, # Define values for symbol replacement
-    :enclose => false, # Enclose in output function wrapper, define replacements as key-value pairs
     :keep_fnames => false, # Generate code safe for the poor souls relying on Function.prototype.name at run-time. Sets both compress and mangle keep_fanems to true.
-    :screw_ie8 => false, # Don't bother to generate safe code for IE8
+    :toplevel => false,
+    :ie8 => true, # Generate safe code for IE8
     :source_map => false, # Generate source map
     :harmony => false # Enable ES6/Harmony mode (experimental). Disabling mangling and compressing is recommended with Harmony mode.
   }
 
-  LEGACY_OPTIONS = [:comments, :squeeze, :copyright, :mangle]
+  EXTRA_OPTIONS = [:comments, :mangle_properties]
 
   MANGLE_PROPERTIES_DEFAULTS = {
+    :debug => false, # Add debug prefix and suffix to mangled properties
     :regex => nil, # A regular expression to filter property names to be mangled
-    :ignore_quoted => false, # Only mangle unquoted property names
-    :debug => false # Mangle names with the original name still present
+    :keep_quoted => false, # Keep quoted property names
+    :reserved => [], # List of properties that should not be mangled
+    :builtins => false, # Mangle properties that overlap with standard JS globals
   }
 
   SOURCE_MAP_DEFAULTS = {
@@ -134,12 +146,12 @@ class Uglifier
   #
   # @param options [Hash] optional overrides to +Uglifier::DEFAULTS+
   def initialize(options = {})
-    (options.keys - DEFAULTS.keys - LEGACY_OPTIONS)[0..1].each do |missing|
+    (options.keys - DEFAULTS.keys - EXTRA_OPTIONS)[0..1].each do |missing|
       raise ArgumentError, "Invalid option: #{missing}"
     end
     @options = options
 
-    source = @options[:harmony] ? source_with(HarmonySourcePath) : source_with(SourcePath)
+    source = harmony? ? source_with(HarmonySourcePath) : source_with(SourcePath)
     @context = ExecJS.compile(source)
   end
 
@@ -169,6 +181,20 @@ class Uglifier
 
   private
 
+  def source_map_comments
+    return '' unless @options[:source_map].respond_to?(:[])
+
+    suffix = ''
+    if @options[:source_map][:map_url]
+      suffix += "\n//# sourceMappingURL=" + @options[:source_map][:map_url]
+    end
+
+    if @options[:source_map][:url]
+      suffix += "\n//# sourceURL=" + @options[:source_map][:url]
+    end
+    suffix
+  end
+
   def source_with(path)
     [ES5FallbackPath, SplitFallbackPath, SourceMapPath, path,
      UglifyJSWrapperPath].map do |file|
@@ -185,14 +211,36 @@ class Uglifier
       :output => output_options,
       :compress => compressor_options,
       :mangle => mangle_options,
-      :mangle_properties => mangle_properties_options,
-      :parse_options => parse_options,
-      :source_map_options => source_map_options(input_map),
-      :generate_map => generate_map,
-      :enclose => enclose_options
+      :parse => parse_options,
+      :sourceMap => source_map_options(input_map),
+      :ie8 => ie8?
     }
 
-    @context.call("uglifier", options)
+    parse_result(@context.call("uglifier", options), generate_map)
+  end
+
+  def harmony?
+    @options[:harmony]
+  end
+
+  def error_message(result)
+    result['error']['message'] +
+      if result['error']['message'].start_with?("Unexpected token:") && !harmony?
+        ". To use ES6 syntax, harmony mode must be enabled with " \
+        "Uglifier.new(:harmony => true)."
+      else
+        ""
+      end
+  end
+
+  def parse_result(result, generate_map)
+    raise Error, error_message(result) if result.has_key?('error')
+
+    if generate_map
+      [result['code'] + source_map_comments, result['map']]
+    else
+      result['code'] + source_map_comments
+    end
   end
 
   def read_source(source)
@@ -210,15 +258,24 @@ class Uglifier
     )
 
     conditional_option(
-      @options.fetch(:mangle, DEFAULTS[:mangle]),
+      @options[:mangle],
       defaults,
-      :keep_fnames => keep_fnames?(:mangle)
+      :properties => mangle_properties_options
     )
   end
 
   def mangle_properties_options
-    mangle_options = @options.fetch(:mangle_properties, DEFAULTS[:mangle_properties])
-    options = conditional_option(mangle_options, MANGLE_PROPERTIES_DEFAULTS)
+    mangle_options = conditional_option(@options[:mangle], DEFAULTS[:mangle])
+
+    mangle_properties_options =
+      if @options.has_key?(:mangle_properties)
+        @options[:mangle_properties]
+      else
+        mangle_options && mangle_options[:properties]
+      end
+
+    options = conditional_option(mangle_properties_options, MANGLE_PROPERTIES_DEFAULTS)
+
     if options && options[:regex]
       options.merge(:regex => encode_regexp(options[:regex]))
     else
@@ -229,12 +286,11 @@ class Uglifier
   def compressor_options
     defaults = conditional_option(
       DEFAULTS[:compress],
-      :global_defs => @options[:define] || {},
-      :screw_ie8 => screw_ie8?
+      :global_defs => @options[:define] || {}
     )
 
     conditional_option(
-      @options[:compress] || @options[:squeeze],
+      @options[:compress],
       defaults,
       { :keep_fnames => keep_fnames?(:compress) }.merge(negate_iife_block)
     )
@@ -264,13 +320,27 @@ class Uglifier
     end
   end
 
+  def quote_style
+    option = conditional_option(@options[:output], DEFAULTS[:output])[:quote_style]
+    case option
+    when :single
+      1
+    when :double
+      2
+    when :original
+      3
+    when Numeric
+      option
+    else # auto
+      0
+    end
+  end
+
   def comment_setting
     if @options.has_key?(:output) && @options[:output].has_key?(:comments)
       @options[:output][:comments]
     elsif @options.has_key?(:comments)
       @options[:comments]
-    elsif @options[:copyright] == false
-      :none
     else
       DEFAULTS[:output][:comments]
     end
@@ -279,16 +349,12 @@ class Uglifier
   def output_options
     DEFAULTS[:output].merge(@options[:output] || {}).merge(
       :comments => comment_options,
-      :screw_ie8 => screw_ie8?
-    ).reject { |key, _| key == :ie_proof }
+      :quote_style => quote_style
+    )
   end
 
-  def screw_ie8?
-    if (@options[:output] || {}).has_key?(:ie_proof)
-      !@options[:output][:ie_proof]
-    else
-      @options.fetch(:screw_ie8, DEFAULTS[:screw_ie8])
-    end
+  def ie8?
+    @options.fetch(:ie8, DEFAULTS[:ie8])
   end
 
   def keep_fnames?(type)
@@ -304,16 +370,22 @@ class Uglifier
     options = conditional_option(@options[:source_map], SOURCE_MAP_DEFAULTS) || SOURCE_MAP_DEFAULTS
 
     {
-      :file => options[:output_filename],
+      :input => options[:filename],
+      :filename => options[:output_filename],
       :root => options.fetch(:root) { input_map ? input_map["sourceRoot"] : nil },
-      :orig => input_map,
-      :map_url => options[:map_url],
+      :content => input_map,
+      #:map_url => options[:map_url],
       :url => options[:url],
-      :sources_content => options[:sources_content]
+      :includeSources => options[:sources_content]
     }
   end
 
   def parse_options
+    conditional_option(@options[:parse], DEFAULTS[:parse])
+      .merge(parse_source_map_options)
+  end
+
+  def parse_source_map_options
     if @options[:source_map].respond_to?(:[])
       { :filename => @options[:source_map][:filename] }
     else