opal 1.0.1 → 1.1.0.rc1

data/lib/opal/util.rb

@@ -6,66 +6,29 @@ module Opal
   module Util
     extend self
 
+    ExitStatusError = Class.new(StandardError)
+
     # Used for uglifying source to minify.
     #
     #     Opal::Util.uglify("javascript contents")
     #
     # @param str [String] string to minify
     # @return [String]
-    def uglify(str)
-      uglifyjs = DigestSourceCommand.new(:uglifyjs, '-c', ' (install with: "npm install -g uglify-js")')
-      uglifyjs.digest(str)
+    def uglify(source)
+      sh 'bin/yarn -s run uglifyjs -c', data: source
     end
 
     # Gzip code to check file size.
-    def gzip(str)
-      gzip = DigestSourceCommand.new(:gzip, '-f', ', it is required to produce the .gz version')
-      gzip.digest(str)
+    def gzip(source)
+      sh 'gzip -f', data: source
     end
 
-    class Command
-      def initialize(command, options, message = nil)
-        @command, @options, @message = command, options, message
-        return unless command_installed? command, message
-      end
-      attr_reader :command, :options, :message
-
-      private
-
-      def hide_stderr
-        if (/mswin|mingw/ =~ RUBY_PLATFORM).nil?
-          '2> /dev/null'
-        else
-          '2> nul'
-        end
-      end
-
-      # Code from http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
-      def which(cmd)
-        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-        ENV['PATH'].split(File::PATH_SEPARATOR).find do |path|
-          exts.find do |ext|
-            exe = File.join(path, "#{cmd}#{ext}")
-            exe if File.executable? exe
-          end
-        end
-      end
-
-      INSTALLED = {}
-      def command_installed?(cmd, install_comment)
-        command_installed = Command::INSTALLED[cmd.to_s] ||= which(cmd)
-        $stderr.puts %{"#{cmd}" command not found#{install_comment}} unless command_installed
-        command_installed
-      end
-    end
+    private
 
-    class DigestSourceCommand < Command
-      ExitStatusError = Class.new(StandardError)
-      def digest(source)
-        out, _, status = Open3.capture3("#{command} #{options} #{hide_stderr}", stdin_data: source)
-        raise ExitStatusError, "exited with status #{status.exitstatus}" unless status.success?
-        out
-      end
+    def sh(command, data:)
+      out, _err, status = Open3.capture3(command, stdin_data: data)
+      raise ExitStatusError, "exited with status #{status.exitstatus}" unless status.success?
+      out
     end
   end
 end

data/lib/opal/version.rb

@@ -3,5 +3,5 @@
 module Opal
   # WHEN RELEASING:
   # Remember to update RUBY_ENGINE_VERSION in opal/corelib/constants.rb too!
-  VERSION = '1.0.1'
+  VERSION = '1.1.0.rc1'
 end

data/opal.gemspec

@@ -1,6 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'opal/version'
+require_relative 'lib/opal/version'
 
 Gem::Specification.new do |spec|
   spec.name         = 'opal'
@@ -13,40 +11,42 @@ Gem::Specification.new do |spec|
   spec.homepage     = 'https://opalrb.com'
   spec.license      = 'MIT'
 
-  spec.metadata = {
-    "bug_tracker_uri"       => "https://github.com/opal/opal/issues",
-    "changelog_uri"         => "https://github.com/opal/opal/blob/v#{spec.version}/CHANGELOG.md",
-    "readme_uri"            => "https://github.com/opal/opal/blob/v#{spec.version}/README.md",
-    "api_documentation_uri" => "http://opalrb.com/docs/api/v#{spec.version}/index.html",
-    "guides_uri"            => "http://opalrb.com/docs/guides/v#{spec.version}/index.html",
-    "homepage_uri"          => "https://opalrb.com/",
-    "chat_uri"              => "https://gitter.im/opal/opal",
-    "source_code_uri"       => "https://github.com/opal/opal",
-  }
-
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0")
-      .reject { |f| f.match(%r{^(test|spec|features)/}) }
-      .reject { |f| File.symlink?(f) } # Windows doesn't always support them
-  end
+  spec.metadata["homepage_uri"]          = "https://opalrb.com/"
+  spec.metadata["bug_tracker_uri"]       = "https://github.com/opal/opal/issues"
+  spec.metadata["changelog_uri"]         = "https://github.com/opal/opal/blob/v#{spec.version}/CHANGELOG.md"
+  spec.metadata["readme_uri"]            = "https://github.com/opal/opal/blob/v#{spec.version}/README.md"
+  spec.metadata["api_documentation_uri"] = "http://opalrb.com/docs/api/v#{spec.version}/index.html"
+  spec.metadata["guides_uri"]            = "http://opalrb.com/docs/guides/v#{spec.version}/index.html"
+  spec.metadata["chat_uri"]              = "https://gitter.im/opal/opal"
+  spec.metadata["source_code_uri"]       = "https://github.com/opal/opal"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  # Remove symlinks because Windows doesn't always support them.
+  files = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }.reject(&File.method(:symlink?))
+
+  spec.files         = files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = files.grep_v(%r{^(test|spec|features)/})
+  spec.executables   = files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.required_ruby_version = '>= 2.3'
 
   spec.add_dependency 'ast', '>= 2.3.0'
-  spec.add_dependency 'parser', '~> 2.6'
+  spec.add_dependency 'parser', '~> 3.0'
 
   spec.add_development_dependency 'sourcemap', '~> 0.1.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.9'
   spec.add_development_dependency 'octokit', '~> 4.9'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rack-test'
-  spec.add_development_dependency 'opal-minitest'
   spec.add_development_dependency 'selenium-webdriver'
   spec.add_development_dependency 'benchmark-ips'
   spec.add_development_dependency 'sinatra'
-  spec.add_development_dependency 'rubocop', '= 0.53.0'
+  spec.add_development_dependency 'rubocop', '~> 0.67.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.1.0'
+  spec.add_development_dependency 'rack'
+  spec.add_development_dependency 'webrick'
 end

data/opal/corelib/array.rb

@@ -1,3 +1,5 @@
+# helpers: truthy, falsy, hash_ids, yield1, hash_get, hash_put, hash_delete, coerce_to, respond_to
+
 require 'corelib/enumerable'
 require 'corelib/numeric'
 
@@ -8,6 +10,29 @@ class Array < `Array`
   `Opal.defineProperty(self.$$prototype, '$$is_array', true)`
 
   %x{
+    // Recent versions of V8 (> 7.1) only use an optimized implementation when Array.prototype is unmodified.
+    // For instance, "array-splice.tq" has a "fast path" (ExtractFastJSArray, defined in "src/codegen/code-stub-assembler.cc")
+    // but it's only enabled when "IsPrototypeInitialArrayPrototype()" is true.
+    //
+    // Older versions of V8 were using relatively fast JS-with-extensions code even when Array.prototype is modified:
+    // https://github.com/v8/v8/blob/7.0.1/src/js/array.js#L599-L642
+    //
+    // In short, Array operations are slow in recent versions of V8 when the Array.prototype has been tampered.
+    // So, when possible, we are using faster open-coded version to boost the performance.
+
+    // As of V8 8.4, depending on the size of the array, this is up to ~25x times faster than Array#shift()
+    // Implementation is heavily inspired by: https://github.com/nodejs/node/blob/ba684805b6c0eded76e5cd89ee00328ac7a59365/lib/internal/util.js#L341-L347
+    function shiftNoArg(list) {
+      var r = list[0];
+      var index = 1;
+      var length = list.length;
+      for (; index < length; index++) {
+        list[index - 1] = list[index];
+      }
+      list.pop();
+      return r;
+    }
+
     function toArraySubclass(obj, klass) {
       if (klass.$$name === Opal.Array) {
         return obj;
@@ -15,6 +40,34 @@ class Array < `Array`
         return klass.$allocate().$replace(#{`obj`.to_a});
       }
     }
+
+    // A helper for keep_if and delete_if, filter is either Opal.truthy
+    // or Opal.falsy.
+    function filterIf(self, filter, block) {
+      var value, raised = null, updated = new Array(self.length);
+
+      for (var i = 0, i2 = 0, length = self.length; i < length; i++) {
+        if (!raised) {
+          try {
+            value = $yield1(block, self[i])
+          } catch(error) {
+            raised = error;
+          }
+        }
+
+        if (raised || filter(value)) {
+          updated[i2] = self[i]
+          i2 += 1;
+        }
+      }
+
+      if (i2 !== i) {
+        self.splice.apply(self, [0, updated.length].concat(updated));
+        self.splice(i2, updated.length);
+      }
+
+      if (raised) throw raised;
+    }
   }
 
   def self.[](*objects)
@@ -50,7 +103,7 @@ class Array < `Array`
         }
       }
 
-      size = #{Opal.coerce_to size, Integer, :to_int}
+      size = $coerce_to(size, #{Integer}, 'to_int');
 
       if (size < 0) {
         #{raise ArgumentError, 'negative array size'}
@@ -83,19 +136,19 @@ class Array < `Array`
     other = if Array === other
               other.to_a
             else
-              Opal.coerce_to(other, Array, :to_ary).to_a
+              `$coerce_to(other, #{Array}, 'to_ary')`.to_a
             end
 
     %x{
       var result = [], hash = #{{}}, i, length, item;
 
       for (i = 0, length = other.length; i < length; i++) {
-        Opal.hash_put(hash, other[i], true);
+        $hash_put(hash, other[i], true);
       }
 
       for (i = 0, length = self.length; i < length; i++) {
         item = self[i];
-        if (Opal.hash_delete(hash, item) !== undefined) {
+        if ($hash_delete(hash, item) !== undefined) {
           result.push(item);
         }
       }
@@ -108,18 +161,18 @@ class Array < `Array`
     other = if Array === other
               other.to_a
             else
-              Opal.coerce_to(other, Array, :to_ary).to_a
+              `$coerce_to(other, #{Array}, 'to_ary')`.to_a
             end
 
     %x{
       var hash = #{{}}, i, length, item;
 
       for (i = 0, length = self.length; i < length; i++) {
-        Opal.hash_put(hash, self[i], true);
+        $hash_put(hash, self[i], true);
       }
 
       for (i = 0, length = other.length; i < length; i++) {
-        Opal.hash_put(hash, other[i], true);
+        $hash_put(hash, other[i], true);
       }
 
       return hash.$keys();
@@ -129,7 +182,7 @@ class Array < `Array`
   def *(other)
     return join(other.to_str) if other.respond_to? :to_str
 
-    other = Opal.coerce_to other, Integer, :to_int
+    other = `$coerce_to(other, #{Integer}, 'to_int')`
 
     if `other < 0`
       raise ArgumentError, 'negative argument'
@@ -151,7 +204,7 @@ class Array < `Array`
     other = if Array === other
               other.to_a
             else
-              Opal.coerce_to(other, Array, :to_ary).to_a
+              `$coerce_to(other, #{Array}, 'to_ary')`.to_a
             end
 
     `self.concat(other)`
@@ -161,7 +214,7 @@ class Array < `Array`
     other = if Array === other
               other.to_a
             else
-              Opal.coerce_to(other, Array, :to_ary).to_a
+              `$coerce_to(other, #{Array}, 'to_ary')`.to_a
             end
 
     return [] if `self.length === 0`
@@ -171,12 +224,12 @@ class Array < `Array`
       var result = [], hash = #{{}}, i, length, item;
 
       for (i = 0, length = other.length; i < length; i++) {
-        Opal.hash_put(hash, other[i], true);
+        $hash_put(hash, other[i], true);
       }
 
       for (i = 0, length = self.length; i < length; i++) {
         item = self[i];
-        if (Opal.hash_get(hash, item) === undefined) {
+        if ($hash_get(hash, item) === undefined) {
           result.push(item);
         }
       }
@@ -230,7 +283,7 @@ class Array < `Array`
           return true;
 
         if (!other.$$is_array) {
-          if (#{Opal.respond_to? `other`, :to_ary}) {
+          if ($respond_to(other, '$to_ary')) {
             return #{`other` == `array`};
           } else {
             return false;
@@ -280,8 +333,8 @@ class Array < `Array`
           exclude, from, to, result;
 
       exclude = index.excl;
-      from    = Opal.Opal.$coerce_to(index.begin, Opal.Integer, 'to_int');
-      to      = Opal.Opal.$coerce_to(index.end, Opal.Integer, 'to_int');
+      from    = $coerce_to(index.begin, Opal.Integer, 'to_int');
+      to      = $coerce_to(index.end, Opal.Integer, 'to_int');
 
       if (from < 0) {
         from += size;
@@ -315,7 +368,7 @@ class Array < `Array`
       var size = self.length,
           exclude, from, to, result;
 
-      index = Opal.Opal.$coerce_to(index, Opal.Integer, 'to_int');
+      index = $coerce_to(index, Opal.Integer, 'to_int');
 
       if (index < 0) {
         index += size;
@@ -333,7 +386,7 @@ class Array < `Array`
         return self[index];
       }
       else {
-        length = Opal.Opal.$coerce_to(length, Opal.Integer, 'to_int');
+        length = $coerce_to(length, Opal.Integer, 'to_int');
 
         if (length < 0 || index > size || index < 0) {
           return nil;
@@ -372,8 +425,8 @@ class Array < `Array`
 
       %x{
         var exclude = index.excl,
-            from    = #{Opal.coerce_to `index.begin`, Integer, :to_int},
-            to      = #{Opal.coerce_to `index.end`, Integer, :to_int};
+            from    = $coerce_to(index.begin, #{Integer}, 'to_int'),
+            to      = $coerce_to(index.end, #{Integer}, 'to_int');
 
         if (from < 0) {
           from += size;
@@ -425,8 +478,8 @@ class Array < `Array`
       %x{
         var old;
 
-        index  = #{Opal.coerce_to index, Integer, :to_int};
-        length = #{Opal.coerce_to length, Integer, :to_int};
+        index  = $coerce_to(index, #{Integer}, 'to_int');
+        length = $coerce_to(length, #{Integer}, 'to_int');
 
         if (index < 0) {
           old    = index;
@@ -477,9 +530,9 @@ class Array < `Array`
   end
 
   def at(index)
-    index = Opal.coerce_to index, Integer, :to_int
-
     %x{
+      index = $coerce_to(index, #{Integer}, 'to_int')
+
       if (index < 0) {
         index += self.length;
       }
@@ -507,7 +560,7 @@ class Array < `Array`
       while (min < max) {
         mid = min + Math.floor((max - min) / 2);
         val = self[mid];
-        ret = Opal.yield1(block, val);
+        ret = $yield1(block, val);
 
         if (ret === true) {
           satisfied = mid;
@@ -565,7 +618,7 @@ class Array < `Array`
       if (n === nil) {
         while (true) {
           for (i = 0, length = self.length; i < length; i++) {
-            value = Opal.yield1(block, self[i]);
+            value = $yield1(block, self[i]);
           }
         }
       }
@@ -577,7 +630,7 @@ class Array < `Array`
 
         while (n > 0) {
           for (i = 0, length = self.length; i < length; i++) {
-            value = Opal.yield1(block, self[i]);
+            value = $yield1(block, self[i]);
           }
 
           n--;
@@ -613,7 +666,7 @@ class Array < `Array`
       var result = [];
 
       for (var i = 0, length = self.length; i < length; i++) {
-        var value = Opal.yield1(block, self[i]);
+        var value = $yield1(block, self[i]);
         result.push(value);
       }
 
@@ -626,7 +679,7 @@ class Array < `Array`
 
     %x{
       for (var i = 0, length = self.length; i < length; i++) {
-        var value = Opal.yield1(block, self[i]);
+        var value = $yield1(block, self[i]);
         self[i] = value;
       }
     }
@@ -760,7 +813,7 @@ class Array < `Array`
       other = if Array === other
                 other.to_a
               else
-                Opal.coerce_to(other, Array, :to_ary).to_a
+                `$coerce_to(other, #{Array}, 'to_ary')`.to_a
               end
 
       if other.equal?(self)
@@ -806,7 +859,7 @@ class Array < `Array`
 
   def delete_at(index)
     %x{
-      index = #{Opal.coerce_to `index`, Integer, :to_int};
+      index = $coerce_to(index, #{Integer}, 'to_int');
 
       if (index < 0) {
         index += self.length;
@@ -826,23 +879,12 @@ class Array < `Array`
 
   def delete_if(&block)
     return enum_for(:delete_if) { size } unless block_given?
-
-    %x{
-      for (var i = 0, length = self.length, value; i < length; i++) {
-        value = block(self[i]);
-
-        if (value !== false && value !== nil) {
-          self.splice(i, 1);
-
-          length--;
-          i--;
-        }
-      }
-    }
-
+    %x{filterIf(self, $falsy, block)}
     self
   end
 
+  alias difference -
+
   def dig(idx, *idxs)
     item = self[idx]
 
@@ -887,7 +929,7 @@ class Array < `Array`
 
     %x{
       for (var i = 0, length = self.length; i < length; i++) {
-        var value = Opal.yield1(block, self[i]);
+        var value = $yield1(block, self[i]);
       }
     }
 
@@ -899,7 +941,7 @@ class Array < `Array`
 
     %x{
       for (var i = 0, length = self.length; i < length; i++) {
-        var value = Opal.yield1(block, i);
+        var value = $yield1(block, i);
       }
     }
 
@@ -959,7 +1001,7 @@ class Array < `Array`
     %x{
       var original = index;
 
-      index = #{Opal.coerce_to `index`, Integer, :to_int};
+      index = $coerce_to(index, #{Integer}, 'to_int');
 
       if (index < 0) {
         index += self.length;
@@ -1014,22 +1056,22 @@ class Array < `Array`
     if Range === one
       raise TypeError, 'length invalid with range' if two
 
-      left   = Opal.coerce_to one.begin, Integer, :to_int
+      left   = `$coerce_to(one.begin, #{Integer}, 'to_int')`
       `left += this.length` if `left < 0`
       raise RangeError, "#{one.inspect} out of range" if `left < 0`
 
-      right = Opal.coerce_to one.end, Integer, :to_int
+      right = `$coerce_to(one.end, #{Integer}, 'to_int')`
       `right += this.length` if `right < 0`
       `right += 1` unless one.exclude_end?
 
       return self if `right <= left`
     elsif one
-      left   = Opal.coerce_to one, Integer, :to_int
+      left   = `$coerce_to(one, #{Integer}, 'to_int')`
       `left += this.length` if `left < 0`
       left   = 0 if `left < 0`
 
       if two
-        right = Opal.coerce_to two, Integer, :to_int
+        right = `$coerce_to(two, #{Integer}, 'to_int')`
 
         return self if `right == 0`
 
@@ -1078,7 +1120,7 @@ class Array < `Array`
         return self.length === 0 ? nil : self[0];
       }
 
-      count = #{Opal.coerce_to `count`, Integer, :to_int};
+      count = $coerce_to(count, #{Integer}, 'to_int');
 
       if (count < 0) {
         #{raise ArgumentError, 'negative array size'};
@@ -1100,7 +1142,7 @@ class Array < `Array`
         for (i = 0, length = array.length; i < length; i++) {
           item = array[i];
 
-          if (!#{Opal.respond_to? `item`, :to_ary, true}) {
+          if (!$respond_to(item, '$to_ary', true)) {
             result.push(item);
             continue;
           }
@@ -1135,7 +1177,7 @@ class Array < `Array`
       }
 
       if (level !== undefined) {
-        level = #{Opal.coerce_to(`level`, Integer, :to_int)};
+        level = $coerce_to(level, #{Integer}, 'to_int');
       }
 
       return toArraySubclass(_flatten(self, level), #{self.class});
@@ -1166,29 +1208,29 @@ class Array < `Array`
 
   def hash
     %x{
-      var top = (Opal.hash_ids === undefined),
+      var top = ($hash_ids === undefined),
           result = ['A'],
           hash_id = self.$object_id(),
           item, i, key;
 
       try {
         if (top) {
-          Opal.hash_ids = Object.create(null);
+          $hash_ids = Object.create(null);
         }
 
         // return early for recursive structures
-        if (Opal.hash_ids[hash_id]) {
+        if ($hash_ids[hash_id]) {
           return 'self';
         }
 
-        for (key in Opal.hash_ids) {
-          item = Opal.hash_ids[key];
+        for (key in $hash_ids) {
+          item = $hash_ids[key];
           if (#{eql?(`item`)}) {
             return 'self';
           }
         }
 
-        Opal.hash_ids[hash_id] = self;
+        $hash_ids[hash_id] = self;
 
         for (i = 0; i < self.length; i++) {
           item = self[i];
@@ -1198,7 +1240,7 @@ class Array < `Array`
         return result.join(',');
       } finally {
         if (top) {
-          Opal.hash_ids = undefined;
+          $hash_ids = undefined;
         }
       }
     }
@@ -1250,7 +1292,7 @@ class Array < `Array`
 
   def insert(index, *objects)
     %x{
-      index = #{Opal.coerce_to `index`, Integer, :to_int};
+      index = $coerce_to(index, #{Integer}, 'to_int');
 
       if (objects.length > 0) {
         if (index < 0) {
@@ -1293,6 +1335,8 @@ class Array < `Array`
     }
   end
 
+  alias intersection &
+
   def join(sep = nil)
     return '' if `self.length === 0`
 
@@ -1307,7 +1351,7 @@ class Array < `Array`
       for (i = 0, length = self.length; i < length; i++) {
         item = self[i];
 
-        if (#{Opal.respond_to? `item`, :to_str}) {
+        if ($respond_to(item, '$to_str')) {
           tmp = #{`item`.to_str};
 
           if (tmp !== nil) {
@@ -1317,7 +1361,7 @@ class Array < `Array`
           }
         }
 
-        if (#{Opal.respond_to? `item`, :to_ary}) {
+        if ($respond_to(item, '$to_ary')) {
           tmp = #{`item`.to_ary};
 
           if (tmp === self) {
@@ -1331,7 +1375,7 @@ class Array < `Array`
           }
         }
 
-        if (#{Opal.respond_to? `item`, :to_s}) {
+        if ($respond_to(item, '$to_s')) {
           tmp = #{`item`.to_s};
 
           if (tmp !== nil) {
@@ -1355,20 +1399,7 @@ class Array < `Array`
 
   def keep_if(&block)
     return enum_for(:keep_if) { size } unless block_given?
-
-    %x{
-      for (var i = 0, length = self.length, value; i < length; i++) {
-        value = block(self[i]);
-
-        if (value === false || value === nil) {
-          self.splice(i, 1);
-
-          length--;
-          i--;
-        }
-      }
-    }
-
+    %x{filterIf(self, $truthy, block)}
     self
   end
 
@@ -1378,7 +1409,7 @@ class Array < `Array`
         return self.length === 0 ? nil : self[self.length - 1];
       }
 
-      count = #{Opal.coerce_to `count`, Integer, :to_int};
+      count = $coerce_to(count, #{Integer}, 'to_int');
 
       if (count < 0) {
         #{raise ArgumentError, 'negative array size'};
@@ -1435,7 +1466,7 @@ class Array < `Array`
         num = self.length;
       }
       else {
-        num = #{ Opal.coerce_to num, Integer, :to_int }
+        num = $coerce_to(num, #{Integer}, 'to_int');
       }
 
       if (num < 0 || self.length < num) {
@@ -1471,7 +1502,7 @@ class Array < `Array`
                 for (var j = 0; j < perm.length; j++) {
                   output.push(self[perm[j]]);
                 }
-                Opal.yield1(blk, output);
+                $yield1(blk, output);
               }
             }
           }
@@ -1521,7 +1552,7 @@ class Array < `Array`
       return `self.pop()`
     end
 
-    count = Opal.coerce_to count, Integer, :to_int
+    count = `$coerce_to(count, #{Integer}, 'to_int')`
 
     if `count < 0`
       raise ArgumentError, 'negative array size'
@@ -1529,7 +1560,9 @@ class Array < `Array`
 
     return [] if `self.length === 0`
 
-    if `count > self.length`
+    if `count === 1`
+      `[self.pop()]`
+    elsif `count > self.length`
       `self.splice(0, self.length)`
     else
       `self.splice(self.length - count, self.length)`
@@ -1547,7 +1580,7 @@ class Array < `Array`
 
       arrays[0] = self;
       for (i = 1; i < n; i++) {
-        arrays[i] = #{Opal.coerce_to(`args[i - 1]`, Array, :to_ary)};
+        arrays[i] = $coerce_to(args[i - 1], #{Array}, 'to_ary');
       }
 
       for (i = 0; i < n; i++) {
@@ -1646,7 +1679,7 @@ class Array < `Array`
     other = if Array === other
               other.to_a
             else
-              Opal.coerce_to(other, Array, :to_ary).to_a
+              `$coerce_to(other, #{Array}, 'to_ary')`.to_a
             end
 
     %x{
@@ -1712,10 +1745,11 @@ class Array < `Array`
   end
 
   def rotate(n = 1)
-    n = Opal.coerce_to n, Integer, :to_int
     %x{
       var ary, idx, firstPart, lastPart;
 
+      n = $coerce_to(n, #{Integer}, 'to_int')
+
       if (self.length === 1) {
         return self.slice();
       }
@@ -1737,8 +1771,8 @@ class Array < `Array`
       if (self.length === 0 || self.length === 1) {
         return self;
       }
+      cnt = $coerce_to(cnt, #{Integer}, 'to_int');
     }
-    cnt = Opal.coerce_to cnt, Integer, :to_int
     ary = rotate(cnt)
     replace ary
   end
@@ -1749,7 +1783,7 @@ class Array < `Array`
     end
 
     def rand(size)
-      random = Opal.coerce_to @rng.rand(size), Integer, :to_int
+      random = `$coerce_to(#{@rng.rand(size)}, #{Integer}, 'to_int')`
       raise RangeError, 'random value must be >= 0' if `random < 0`
       raise RangeError, 'random value must be less than Array size' unless `random < size`
 
@@ -1766,11 +1800,11 @@ class Array < `Array`
         count = nil
       else
         options = nil
-        count = Opal.coerce_to count, Integer, :to_int
+        count = `$coerce_to(count, #{Integer}, 'to_int')`
       end
     else
-      count = Opal.coerce_to count, Integer, :to_int
-      options = Opal.coerce_to options, Hash, :to_hash
+      count = `$coerce_to(count, #{Integer}, 'to_int')`
+      options = `$coerce_to(options, #{Hash}, 'to_hash')`
     end
 
     if count && `count < 0`
@@ -1877,9 +1911,9 @@ class Array < `Array`
       for (var i = 0, length = self.length, item, value; i < length; i++) {
         item = self[i];
 
-        value = Opal.yield1(block, item);
+        value = $yield1(block, item);
 
-        if (Opal.truthy(value)) {
+        if ($truthy(value)) {
           result.push(item);
         }
       }
@@ -1898,13 +1932,16 @@ class Array < `Array`
     }
   end
 
+  alias filter select
+  alias filter! select!
+
   def shift(count = undefined)
     if `count === undefined`
       return if `self.length === 0`
-      return `self.shift()`
+      return `shiftNoArg(self)`
     end
 
-    count = Opal.coerce_to count, Integer, :to_int
+    count = `$coerce_to(count, #{Integer}, 'to_int')`
 
     if `count < 0`
       raise ArgumentError, 'negative array size'
@@ -1972,8 +2009,8 @@ class Array < `Array`
         range = index
         result = self[range]
 
-        range_start = Opal.coerce_to(range.begin, Integer, :to_int)
-        range_end = Opal.coerce_to(range.end, Integer, :to_int)
+        range_start = `$coerce_to(range.begin, #{Integer}, 'to_int')`
+        range_end = `$coerce_to(range.end, #{Integer}, 'to_int')`
 
         %x{
           if (range_start < 0) {
@@ -2001,7 +2038,7 @@ class Array < `Array`
           }
         }
       else
-        start = Opal.coerce_to(index, Integer, :to_int)
+        start = `$coerce_to(index, #{Integer}, 'to_int')`
         %x{
           if (start < 0) {
             start += self.length;
@@ -2021,8 +2058,8 @@ class Array < `Array`
         }
       end
     else
-      start = Opal.coerce_to(index, Integer, :to_int)
-      length = Opal.coerce_to(length, Integer, :to_int)
+      start = `$coerce_to(index, #{Integer}, 'to_int')`
+      length = `$coerce_to(length, #{Integer}, 'to_int')`
 
       %x{
         if (length < 0) {
@@ -2133,12 +2170,15 @@ class Array < `Array`
 
   alias to_ary to_a
 
-  def to_h
+  def to_h(&block)
+    array = self
+    array = array.map(&block) if block_given?
+
     %x{
-      var i, len = self.length, ary, key, val, hash = #{{}};
+      var i, len = array.length, ary, key, val, hash = #{{}};
 
       for (i = 0; i < len; i++) {
-        ary = #{Opal.coerce_to?(`self[i]`, Array, :to_ary)};
+        ary = #{Opal.coerce_to?(`array[i]`, Array, :to_ary)};
         if (!ary.$$is_array) {
           #{raise TypeError, "wrong element type #{`ary`.class} at #{`i`} (expected array)"}
         }
@@ -2147,7 +2187,7 @@ class Array < `Array`
         }
         key = ary[0];
         val = ary[1];
-        Opal.hash_put(hash, key, val);
+        $hash_put(hash, key, val);
       }
 
       return hash;
@@ -2166,7 +2206,7 @@ class Array < `Array`
       row = if Array === row
               row.to_a
             else
-              Opal.coerce_to(row, Array, :to_ary).to_a
+              `$coerce_to(row, #{Array}, 'to_ary')`.to_a
             end
 
       max ||= `row.length`
@@ -2184,6 +2224,8 @@ class Array < `Array`
     result
   end
 
+  alias union |
+
   def uniq(&block)
     %x{
       var hash = #{{}}, i, length, item, key;
@@ -2191,17 +2233,17 @@ class Array < `Array`
       if (block === nil) {
         for (i = 0, length = self.length; i < length; i++) {
           item = self[i];
-          if (Opal.hash_get(hash, item) === undefined) {
-            Opal.hash_put(hash, item, item);
+          if ($hash_get(hash, item) === undefined) {
+            $hash_put(hash, item, item);
           }
         }
       }
       else {
         for (i = 0, length = self.length; i < length; i++) {
           item = self[i];
-          key = Opal.yield1(block, item);
-          if (Opal.hash_get(hash, key) === undefined) {
-            Opal.hash_put(hash, key, item);
+          key = $yield1(block, item);
+          if ($hash_get(hash, key) === undefined) {
+            $hash_put(hash, key, item);
           }
         }
       }
@@ -2216,10 +2258,10 @@ class Array < `Array`
 
       for (i = 0, length = original_length; i < length; i++) {
         item = self[i];
-        key = (block === nil ? item : Opal.yield1(block, item));
+        key = (block === nil ? item : $yield1(block, item));
 
-        if (Opal.hash_get(hash, key) === undefined) {
-          Opal.hash_put(hash, key, item);
+        if ($hash_get(hash, key) === undefined) {
+          $hash_put(hash, key, item);
           continue;
         }
 
@@ -2249,8 +2291,8 @@ class Array < `Array`
 
     args.each do |elem|
       if elem.is_a? Range
-        finish = Opal.coerce_to elem.last, Integer, :to_int
-        start = Opal.coerce_to elem.first, Integer, :to_int
+        finish = `$coerce_to(#{elem.last}, #{Integer}, 'to_int')`
+        start = `$coerce_to(#{elem.first}, #{Integer}, 'to_int')`
 
         %x{
           if (start < 0) {
@@ -2273,7 +2315,7 @@ class Array < `Array`
 
         start.upto(finish) { |i| out << at(i) }
       else
-        i = Opal.coerce_to elem, Integer, :to_int
+        i = `$coerce_to(elem, #{Integer}, 'to_int')`
         out << at(i)
       end
     end
@@ -2300,7 +2342,7 @@ class Array < `Array`
         }
         others[j] = #{(
           Opal.coerce_to?(`o`, Array, :to_ary) ||
-          Opal.coerce_to!(`o`, Enumerator, :each)
+          Opal.coerce_to!(`o`, Enumerator, :to_enum, :each)
         ).to_a};
       }