uglifier 4.1.20 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e80ba00a3806f9848b926823cd7cee1d7f6fd72a050c8b17f5dd084f45a1ed39
-  data.tar.gz: 32f396008cd005a2725b698b55a9167872c13b5334e637801ca725ba7049fcc5
+  metadata.gz: 6eb829d19c603a2d3760e02f0235d9d654f640111734caa9317449378e40fa26
+  data.tar.gz: '0774580cb6353b90d72e5febfdc6777bc05c6d6d773b09e4aab3b82178fe8acd'
 SHA512:
-  metadata.gz: 464ea32ccd16245306fcc71c575580890d0590dd61e913b1c8b10496dd80c1f6d44d1f3716a06fa4a9d145bca75243e880f466b63e9f07719c02962b8667f9c4
-  data.tar.gz: 3b5a4997bcf52bc6fa0670fab41a187eeff8e716a579309a2949b1b2677334e4298cb6358e8359c3597f34126a3c13b2e1929cf40db99d798cfc5c0357af6522
+  metadata.gz: 81f5c10b9dd4b9c84a6fe850dfb45b30bb25e0d9b04fa089ff745683028d1733e6b0b1c92846788af96197ee8774d8a7d105b424bc88f38b0c5abab5971bded0
+  data.tar.gz: 3120b0abc086792140a2cdb3a8ecae725327c8c8ea7b55c49d98be196e97de526087583c5bb2b6a0c169e86277474e8ae8a82d6a02cc23cd58cf0276defff03a

data/.github/workflows/ruby.yml

@@ -0,0 +1,14 @@
+name: Ruby
+
+on: [push]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - uses: lautis/rubocop-action@master
+        name: Lint
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.rubocop.yml

@@ -6,6 +6,9 @@ AllCops:
     - "vendor/**/*"
     - "gemfiles/vendor/**/*"
 
+Metrics/AbcSize:
+  Max: 20
+
 Metrics/BlockLength:
   Enabled: true
   Exclude:

data/.travis.yml

@@ -6,28 +6,29 @@ rvm:
   - 2.0.0
   - 2.1.10
   - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
   - ruby-head
-  - jruby-9.2.0.0
+  - jruby-9.2.5.0
 before_install:
-  - gem install bundler -v 1.16.1
+  - gem install bundler -v 1.17.3
 git:
   submodules: false
 gemfile:
   - Gemfile
 matrix:
   include:
-    - rvm: 2.5.1
+    - rvm: 2.5.3
       gemfile: gemfiles/rubyracer
-    - rvm: jruby-9.2.0.0
+    - rvm: jruby-9.2.5.0
       gemfile: gemfiles/rubyrhino
-    - rvm: 2.5.1
+    - rvm: 2.5.3
       gemfile: gemfiles/alaska
       env: ALASKA=1
   allow_failures:
-    - rvm: 2.5.1
+    - rvm: 2.5.3
       gemfile: gemfiles/alaska
       env: ALASKA=1
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.2.0 (25 September 2019)
+
+- show code context for error messages (#167)
+- defer initialisation of ExecJS context to fix #165
+
 ## 4.1.20 (17 November 2018)
 
 - update UglifyJS to [3.4.8](https://github.com/mishoo/UglifyJS2/compare/v3.4.9...v3.4.8)

data/README.md

@@ -168,6 +168,7 @@ Available options and their defaults are
     :output_filename => nil,    # The filename or URL where the minified output can be found
     :input_source_map => nil    # The contents of the source map describing the input
   },
+  :error_context_lines => 8,    # How many context lines surrounding the error line. Env var ERROR_CONTEXT_LINES overrides this option
   :harmony => false             # Enable ES6/Harmony mode (experimental). Disabling mangling and compressing is recommended with Harmony mode.
 }
 ```

data/lib/uglifier.rb

@@ -98,6 +98,7 @@ class Uglifier
     :toplevel => false,
     :ie8 => true, # Generate safe code for IE8
     :source_map => false, # Generate source map
+    :error_context_lines => 8, # How many lines surrounding the error line
     :harmony => false # Enable ES6/Harmony mode (experimental). Disabling mangling and compressing is recommended with Harmony mode.
   }
 
@@ -149,9 +150,6 @@ class Uglifier
       raise ArgumentError, "Invalid option: #{missing}"
     end
     @options = options
-
-    source = harmony? ? source_with(HarmonySourcePath) : source_with(SourcePath)
-    @context = ExecJS.compile(source)
   end
 
   # Minifies JavaScript code
@@ -180,6 +178,13 @@ class Uglifier
 
   private
 
+  def context
+    @context ||= begin
+      source = harmony? ? source_with(HarmonySourcePath) : source_with(SourcePath)
+      ExecJS.compile(source)
+    end
+  end
+
   def source_map_comments
     return '' unless @options[:source_map].respond_to?(:[])
 
@@ -213,25 +218,77 @@ class Uglifier
       :ie8 => ie8?
     }
 
-    parse_result(@context.call("uglifier", options), generate_map)
+    parse_result(context.call("uglifier", options), generate_map, options)
   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)."
+  def harmony_error_message(message)
+    if message.start_with?("Unexpected token")
+      ". To use ES6 syntax, harmony mode must be enabled with " \
+      "Uglifier.new(:harmony => true)."
+    else
+      ""
+    end
+  end
+
+  def error_context_lines
+    @options.fetch(:error_context_lines, DEFAULTS[:error_context_lines]).to_i
+  end
+
+  def error_context_format_options(low, high, line_index, column)
+    line_width = high.to_s.size
+    {
+      :line_index => line_index,
+      :base_index => low,
+      :line_width => line_width,
+      :line_format => "\e[36m%#{line_width + 1}d\e[0m ", # cyan
+      :col => column
+    }
+  end
+
+  def format_error_line(line, options)
+    # light red
+    indicator = ' => '.rjust(options[:line_width] + 2)
+    colored_line = "#{line[0...options[:col]]}\e[91m#{line[options[:col]..-1]}"
+    "\e[91m#{indicator}\e[0m#{colored_line}\e[0m"
+  end
+
+  def format_lines(lines, options)
+    lines.map.with_index do |line, index|
+      if options[:base_index] + index == options[:line_index]
+        format_error_line(line, options)
       else
-        ""
+        "#{options[:line_format] % (options[:base_index] + index + 1)}#{line}"
       end
+    end
+  end
+
+  def context_lines_message(source, line_number, column)
+    return if line_number.nil?
+
+    line_index = line_number - 1
+    lines = source.split("\n")
+
+    first_line = [line_index - error_context_lines, 0].max
+    last_line = [line_number + error_context_lines, lines.size].min
+    options = error_context_format_options(first_line, last_line, line_index, column)
+    context_lines = lines[first_line...last_line]
+
+    "--\n#{format_lines(context_lines, options).join("\n")}\n=="
+  end
+
+  def error_message(result, options)
+    err = result['error']
+    harmony_msg = harmony? ? '' : harmony_error_message(err['message'].to_s)
+    src_ctx = context_lines_message(options[:source], err['line'], err['col'])
+    "#{err['message']}#{harmony_msg}\n#{src_ctx}"
   end
 
-  def parse_result(result, generate_map)
-    raise Error, error_message(result) if result.has_key?('error')
+  def parse_result(result, generate_map, options)
+    raise Error, error_message(result, options) if result.has_key?('error')
 
     if generate_map
       [result['code'] + source_map_comments, result['map']]

data/lib/uglifier/version.rb

@@ -1,4 +1,4 @@
 class Uglifier
   # Current version of Uglifier.
-  VERSION = "4.1.20"
+  VERSION = "4.2.0"
 end

data/uglifier.gemspec

@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "execjs", [">= 0.3.0", "< 3"]
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", ">= 1.3"
   spec.add_development_dependency "sourcemap", "~> 0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uglifier
 version: !ruby/object:Gem::Version
-  version: 4.1.20
+  version: 4.2.0
 platform: ruby
 authors:
 - Ville Lautanala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-17 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -62,14 +62,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
@@ -99,6 +99,7 @@ extra_rdoc_files:
 - CONTRIBUTING.md
 files:
 - ".document"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
@@ -139,8 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for UglifyJS JavaScript compressor