uglifier 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/uglifier.rb

@@ -11,6 +11,7 @@ class Uglifier
     :seqs => true, # Reduce consecutive statements in blocks into single statement
     :dead_code => true, # Remove dead code (e.g. after return)
     :extra => false, # Additional and potentially unsafe optimizations
+    :unsafe => false, # Optimizations known to be unsafe in some situations
     :beautify => false, # Ouput indented code
     :beautify_options => {
       :indent_level => 4,
@@ -21,12 +22,20 @@ class Uglifier
   }
 
   def initialize(options = {})
-    @options = DEFAULTS.merge options
+    @options = DEFAULTS.merge(options)
+    @exports = {
+      "sys" => {
+        :debug => lambda {|m| puts m }
+      }
+    }
   end
 
   def compile(source)
     V8::Context.new do |cxt|
-      initialize_v8(cxt)
+      cxt["process"] = { :version => "v0.2.0" }
+
+      load_file(cxt, "parse-js")
+      load_file(cxt, "process")
       begin
         return generate_code(cxt, ast(cxt, source))
       rescue Exception => e
@@ -35,6 +44,10 @@ class Uglifier
     end
   end
 
+  def self.compile(source, options = {})
+    self.new(options).compile(source)
+  end
+
   private
 
   def generate_code(cxt, ast)
@@ -42,14 +55,17 @@ class Uglifier
   end
 
   def ast(cxt, source)
-    squeeze(cxt, mangle(cxt, cxt["parse"].call(source)))
+    squeeze_unsafe(cxt, squeeze(cxt, mangle(cxt, cxt["parse"].call(source))))
   end
 
   def mangle(cxt, ast)
+    return ast unless @options[:mangle]
     cxt["ast_mangle"].call(ast, @options[:toplevel])
   end
 
   def squeeze(cxt, ast)
+    return ast unless @options[:squeeze]
+
     cxt["ast_squeeze"].call(ast, {
       "make_seqs" => @options[:seqs],
       "dead_code" => @options[:dead_code],
@@ -57,25 +73,23 @@ class Uglifier
     })
   end
 
-  def initialize_v8(cxt)
-    cxt["process"] = { :version => "v0.2.0" }
-    exports = {
-      "sys" => {
-        :debug => lambda { |m| puts m }
-      },
-      "./parse-js" => load_file(cxt, "vendor/uglifyjs/lib/parse-js.js")
-    }
-
-    cxt["require"] = lambda do |file|
-      exports[file]
-    end
-
-    load_file(cxt, "vendor/uglifyjs/lib/process.js")
+  def squeeze_unsafe(cxt, ast)
+    return ast unless @options[:unsafe]
+    cxt["ast_squeeze_more"].call(ast)
   end
 
   def load_file(cxt, file)
+    old = cxt["exports"]
     cxt["exports"] = {}
-    cxt.load(File.join(File.dirname(__FILE__), "..", file))
-    cxt["exports"]
+    cxt["require"] = lambda {|r|
+      @exports[File.basename(r, ".js")] || begin
+        @exports[file] = cxt["exports"] # Prevent circular dependencies
+        load_file(cxt, File.basename(r, ".js"))
+      end
+    }
+    cxt.load(File.join(File.dirname(__FILE__), "..", "vendor", "uglifyjs", "lib", File.basename(file, ".js") + ".js"))
+    @exports[file] = cxt["exports"]
+    cxt["exports"] = old
+    @exports[file]
   end
 end

data/spec/uglifier_spec.rb

@@ -25,4 +25,19 @@ describe "Uglifier" do
       }")
     }.should_not raise_error(Uglifier::Error)
   end
+
+  it "does additional squeezing when unsafe options is true" do
+    unsafe_input = "function a(b){b.toString();}"
+    Uglifier.new(:unsafe => true).compile(unsafe_input).length.should < Uglifier.new(:unsafe => false).compile(unsafe_input).length
+  end
+
+  it "mangles variables only if mangle is set to true" do
+    code = "function longFunctionName(){}"
+    Uglifier.new(:mangle => false).compile(code).length.should == code.length
+  end
+
+  it "squeezes code only if squeeze is set to true" do
+    code = "function a(a){if(a) { return 0; } else { return 1; }}"
+    Uglifier.compile(code, :squeeze => false).length.should > Uglifier.compile(code, :squeeze => true).length
+  end
 end

data/uglifier.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uglifier}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ville Lautanala"]
-  s.date = %q{2010-11-18}
+  s.date = %q{2010-11-24}
   s.email = %q{lautis@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -29,7 +29,8 @@ Gem::Specification.new do |s|
     "spec/uglifier_spec.rb",
     "uglifier.gemspec",
     "vendor/uglifyjs/lib/parse-js.js",
-    "vendor/uglifyjs/lib/process.js"
+    "vendor/uglifyjs/lib/process.js",
+    "vendor/uglifyjs/lib/squeeze-more.js"
   ]
   s.homepage = %q{http://github.com/lautis/uglifier}
   s.require_paths = ["lib"]

data/vendor/uglifyjs/lib/process.js

@@ -361,14 +361,10 @@ function ast_add_scope(ast) {
 
         function with_new_scope(cont) {
                 current_scope = new Scope(current_scope);
-                try {
-                        var ret = current_scope.body = cont();
-                        ret.scope = current_scope;
-                        return ret;
-                }
-                finally {
-                        current_scope = current_scope.parent;
-                }
+                var ret = current_scope.body = cont();
+                ret.scope = current_scope;
+                current_scope = current_scope.parent;
+                return ret;
         };
 
         function define(name) {
@@ -987,17 +983,10 @@ function ast_squeeze(ast, options) {
                 "unary-prefix": function(op, cond) {
                         if (op == "!")
                                 return best_of(this, negate(cond));
-                },
-                "call": function(expr, args) {
-                        if (expr[0] == "dot" && expr[2] == "toString" && args.length == 0) {
-                                // foo.toString()  ==>  foo+""
-                                return [ "binary", "+", expr[1], [ "string", "" ]];
-                        }
                 }
         }, function() {
                 return walk(ast);
         });
-
 };
 
 /* -----[ re-generate code from the AST ]----- */
@@ -1091,7 +1080,7 @@ function gen_code(ast, beautify) {
                         // parent is "stat", and so on.  Messy stuff,
                         // but it worths the trouble.
                         var a = slice($stack), self = a.pop(), p = a.pop();
-                        while (true) {
+                        while (p) {
                                 if (p[0] == "stat") return true;
                                 if ((p[0] == "seq" && p[1] === self) ||
                                     (p[0] == "call" && p[1] === self) ||
@@ -1115,7 +1104,7 @@ function gen_code(ast, beautify) {
                                 a.push(m[1] + "e" + m[2].length);
                         }
                 } else if ((m = /^0?\.(0+)(.*)$/.exec(num))) {
-                        a.push(m[2] + "e-" + (m[1].length + 1),
+                        a.push(m[2] + "e-" + (m[1].length + m[2].length),
                                str.substr(str.indexOf(".")));
                 }
                 return best_of(a);
@@ -1329,6 +1318,13 @@ function gen_code(ast, beautify) {
         // to the inner IF).  This function checks for this case and
         // adds the block brackets if needed.
         function make_then(th) {
+                if (th[0] == "do") {
+                        // https://github.com/mishoo/UglifyJS/issues/#issue/57
+                        // IE croaks with "syntax error" on code like this:
+                        //     if (foo) do ... while(cond); else ...
+                        // we need block brackets around do/while
+                        return make([ "block", [ th ]]);
+                }
                 var b = th;
                 while (true) {
                         var type = b[0];
@@ -1482,3 +1478,4 @@ exports.ast_mangle = ast_mangle;
 exports.ast_squeeze = ast_squeeze;
 exports.gen_code = gen_code;
 exports.ast_add_scope = ast_add_scope;
+exports.ast_squeeze_more = require("./squeeze-more").ast_squeeze_more;

data/vendor/uglifyjs/lib/squeeze-more.js

@@ -0,0 +1,22 @@
+var jsp = require("./parse-js"),
+    pro = require("./process"),
+    slice = jsp.slice,
+    member = jsp.member,
+    PRECEDENCE = jsp.PRECEDENCE,
+    OPERATORS = jsp.OPERATORS;
+
+function ast_squeeze_more(ast) {
+        var w = pro.ast_walker(), walk = w.walk;
+        return w.with_walkers({
+                "call": function(expr, args) {
+                        if (expr[0] == "dot" && expr[2] == "toString" && args.length == 0) {
+                                // foo.toString()  ==>  foo+""
+                                return [ "binary", "+", expr[1], [ "string", "" ]];
+                        }
+                }
+        }, function() {
+                return walk(ast);
+        });
+};
+
+exports.ast_squeeze_more = ast_squeeze_more;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: uglifier
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ville Lautanala
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 +02:00
+date: 2010-11-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -200,6 +200,7 @@ files:
 - uglifier.gemspec
 - vendor/uglifyjs/lib/parse-js.js
 - vendor/uglifyjs/lib/process.js
+- vendor/uglifyjs/lib/squeeze-more.js
 has_rdoc: true
 homepage: http://github.com/lautis/uglifier
 licenses: []