opal 1.6.1 → 1.7.0.rc1

data/lib/opal/cli_runners/node_modules/ws/package.json

@@ -1,81 +1,7 @@
 {
-  "_args": [
-    [
-      {
-        "raw": "ws@2.0.x",
-        "scope": null,
-        "escapedName": "ws",
-        "name": "ws",
-        "rawSpec": "2.0.x",
-        "spec": ">=2.0.0 <2.1.0",
-        "type": "range"
-      },
-      "/Users/ilya/Work/opal/lib/opal/cli_runners/node_modules/chrome-remote-interface"
-    ]
-  ],
-  "_from": "ws@>=2.0.0 <2.1.0",
-  "_id": "ws@2.0.3",
-  "_inCache": true,
-  "_location": "/ws",
-  "_nodeVersion": "7.5.0",
-  "_npmOperationalInternal": {
-    "host": "packages-18-east.internal.npmjs.com",
-    "tmp": "tmp/ws-2.0.3.tgz_1486561489812_0.7949141394346952"
-  },
-  "_npmUser": {
-    "name": "lpinca",
-    "email": "luigipinca@gmail.com"
-  },
-  "_npmVersion": "4.1.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "raw": "ws@2.0.x",
-    "scope": null,
-    "escapedName": "ws",
-    "name": "ws",
-    "rawSpec": "2.0.x",
-    "spec": ">=2.0.0 <2.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/chrome-remote-interface"
-  ],
-  "_resolved": "https://registry.npmjs.org/ws/-/ws-2.0.3.tgz",
-  "_shasum": "532fd499c3f7d7d720e543f1f807106cfc57d9cb",
-  "_shrinkwrap": null,
-  "_spec": "ws@2.0.x",
-  "_where": "/Users/ilya/Work/opal/lib/opal/cli_runners/node_modules/chrome-remote-interface",
-  "author": {
-    "name": "Einar Otto Stangvik",
-    "email": "einaros@gmail.com",
-    "url": "http://2x.io"
-  },
-  "bugs": {
-    "url": "https://github.com/websockets/ws/issues"
-  },
-  "dependencies": {
-    "ultron": "~1.1.0"
-  },
+  "name": "ws",
+  "version": "7.5.9",
   "description": "Simple to use, blazing fast and thoroughly tested websocket client and server for Node.js",
-  "devDependencies": {
-    "benchmark": "~2.1.2",
-    "bufferutil": "~2.0.0",
-    "eslint": "~3.15.0",
-    "eslint-config-semistandard": "~7.0.0",
-    "eslint-config-standard": "~6.2.1",
-    "eslint-plugin-promise": "~3.4.0",
-    "eslint-plugin-standard": "~2.0.1",
-    "istanbul": "~0.4.5",
-    "mocha": "~3.2.0",
-    "utf-8-validate": "~3.0.0"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "532fd499c3f7d7d720e543f1f807106cfc57d9cb",
-    "tarball": "https://registry.npmjs.org/ws/-/ws-2.0.3.tgz"
-  },
-  "gitHead": "3918e11d200e574beca9d5abd61fbe3020434aed",
-  "homepage": "https://github.com/websockets/ws#readme",
   "keywords": [
     "HyBi",
     "Push",
@@ -84,39 +10,47 @@
     "WebSockets",
     "real-time"
   ],
+  "homepage": "https://github.com/websockets/ws",
+  "bugs": "https://github.com/websockets/ws/issues",
+  "repository": "websockets/ws",
+  "author": "Einar Otto Stangvik <einaros@gmail.com> (http://2x.io)",
   "license": "MIT",
   "main": "index.js",
-  "maintainers": [
-    {
-      "name": "3rdeden",
-      "email": "npm@3rd-Eden.com"
-    },
-    {
-      "name": "einaros",
-      "email": "einaros@gmail.com"
-    },
-    {
-      "name": "lpinca",
-      "email": "luigipinca@gmail.com"
-    },
-    {
-      "name": "v1",
-      "email": "npm@3rd-Eden.com"
-    }
+  "browser": "browser.js",
+  "engines": {
+    "node": ">=8.3.0"
+  },
+  "files": [
+    "browser.js",
+    "index.js",
+    "lib/*.js"
   ],
-  "name": "ws",
-  "optionalDependencies": {},
-  "readme": "ERROR: No README data found!",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/websockets/ws.git"
-  },
   "scripts": {
-    "coverage": "istanbul cover _mocha --report html -- test/*.test.js",
-    "integration": "npm run lint && mocha test/*.integration.js",
-    "lint": "eslint .",
-    "test": "npm run lint && mocha test/*.test.js",
-    "test-travis": "npm run lint && istanbul cover _mocha --report lcovonly -- test/*.test.js"
+    "test": "nyc --reporter=lcov --reporter=text mocha --throw-deprecation test/*.test.js",
+    "integration": "mocha --throw-deprecation test/*.integration.js",
+    "lint": "eslint --ignore-path .gitignore . && prettier --check --ignore-path .gitignore \"**/*.{json,md,yaml,yml}\""
   },
-  "version": "2.0.3"
+  "peerDependencies": {
+    "bufferutil": "^4.0.1",
+    "utf-8-validate": "^5.0.2"
+  },
+  "peerDependenciesMeta": {
+    "bufferutil": {
+      "optional": true
+    },
+    "utf-8-validate": {
+      "optional": true
+    }
+  },
+  "devDependencies": {
+    "benchmark": "^2.1.4",
+    "bufferutil": "^4.0.1",
+    "eslint": "^7.2.0",
+    "eslint-config-prettier": "^8.1.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "mocha": "^7.0.0",
+    "nyc": "^15.0.0",
+    "prettier": "^2.0.5",
+    "utf-8-validate": "^5.0.2"
+  }
 }

data/lib/opal/cli_runners/package-lock.json

@@ -0,0 +1,62 @@
+{
+  "name": "cli_runners",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "chrome-remote-interface": "^0.31.3"
+      }
+    },
+    "node_modules/chrome-remote-interface": {
+      "version": "0.31.3",
+      "license": "MIT",
+      "dependencies": {
+        "commander": "2.11.x",
+        "ws": "^7.2.0"
+      },
+      "bin": {
+        "chrome-remote-interface": "bin/client.js"
+      }
+    },
+    "node_modules/commander": {
+      "version": "2.11.0",
+      "license": "MIT"
+    },
+    "node_modules/ws": {
+      "version": "7.5.9",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    }
+  },
+  "dependencies": {
+    "chrome-remote-interface": {
+      "version": "0.31.3",
+      "requires": {
+        "commander": "2.11.x",
+        "ws": "^7.2.0"
+      }
+    },
+    "commander": {
+      "version": "2.11.0"
+    },
+    "ws": {
+      "version": "7.5.9",
+      "requires": {}
+    }
+  }
+}

data/lib/opal/cli_runners/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "chrome-remote-interface": "latest"
+    "chrome-remote-interface": "^0.31.3"
   }
 }

data/lib/opal/cli_runners.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'opal/os'
+
 module Opal
   # `Opal::CliRunners` is the register in which JavaScript runners can be
   # defined for use by `Opal::CLI`. Runners will be called via the `#call`
@@ -19,6 +21,12 @@ module Opal
     class RunnerError < StandardError
     end
 
+    @runners = []
+
+    def self.registered_runners
+      @runners
+    end
+
     @register = {}
 
     def self.[](name)
@@ -45,6 +53,8 @@ module Opal
     def self.register_runner(name, runner, path = nil)
       autoload runner, path if path
 
+      @runners.push(runner.to_s)
+
       if runner.respond_to? :call
         self[name] = -> { runner }
       else
@@ -61,17 +71,29 @@ module Opal
       nil
     end
 
-    register_runner :applescript, :Applescript, 'opal/cli_runners/applescript'
+    # running on all OS
     register_runner :chrome,      :Chrome,      'opal/cli_runners/chrome'
     register_runner :compiler,    :Compiler,    'opal/cli_runners/compiler'
+    register_runner :deno,        :Deno,        'opal/cli_runners/deno'
+    register_runner :firefox,     :Firefox,     'opal/cli_runners/firefox'
     register_runner :nashorn,     :Nashorn,     'opal/cli_runners/nashorn'
     register_runner :nodejs,      :Nodejs,      'opal/cli_runners/nodejs'
-    register_runner :gjs,         :Gjs,         'opal/cli_runners/gjs'
     register_runner :quickjs,     :Quickjs,     'opal/cli_runners/quickjs'
-    register_runner :miniracer,   :MiniRacer,   'opal/cli_runners/mini_racer'
     register_runner :server,      :Server,      'opal/cli_runners/server'
 
-    alias_runner :osascript, :applescript
     alias_runner :node, :nodejs
+
+    if !OS.windows? && !OS.macos?
+      register_runner :gjs,         :Gjs,         'opal/cli_runners/gjs'
+    end
+
+    unless OS.windows?
+      register_runner :miniracer,   :MiniRacer,   'opal/cli_runners/mini_racer'
+    end
+
+    if OS.macos?
+      register_runner :applescript, :Applescript, 'opal/cli_runners/applescript'
+      alias_runner :osascript, :applescript
+    end
   end
 end

data/lib/opal/nodes/args/prepare_post_args.rb

@@ -17,9 +17,9 @@ module Opal
           helper :slice
 
           if offset == 0
-            push "$post_args = $slice.call(arguments)"
+            push "$post_args = $slice(arguments)"
           else
-            push "$post_args = $slice.call(arguments, #{offset})"
+            push "$post_args = $slice(arguments, #{offset})"
           end
         end
       end

data/lib/opal/nodes/def.rb

@@ -12,26 +12,26 @@ module Opal
       def compile
         compile_body_or_shortcut
 
-        blockopts = []
+        blockopts = {}
 
-        blockopts << "$$arity: #{arity}"
+        blockopts["$$arity"] = arity if arity < 0
 
         if compiler.arity_check?
-          blockopts << "$$parameters: #{parameters_code}"
+          blockopts["$$parameters"] = parameters_code
         end
 
         if compiler.parse_comments?
-          blockopts << "$$comments: #{comments_code}"
+          blockopts["$$comments"] = comments_code
         end
 
         if compiler.enable_source_location?
-          blockopts << "$$source_location: #{source_location}"
+          blockopts["$$source_location"] = source_location
         end
 
-        if blockopts.length == 1
+        if blockopts.keys == ["$$arity"]
           push ", #{arity}"
-        elsif blockopts.length > 1
-          push ', {', blockopts.join(', '), '}'
+        elsif !blockopts.empty?
+          push ', {', blockopts.map { |k, v| "#{k}: #{v}" }.join(', '), '}'
         end
 
         wrap_with_definition

data/lib/opal/nodes/iter.rb

@@ -14,18 +14,18 @@ module Opal
 
         compile_body_or_shortcut
 
-        blockopts = []
-        blockopts << "$$arity: #{arity}"
-        blockopts << "$$s: #{scope.self}" if @define_self
-        blockopts << "$$brk: #{@closure.throwers[:break]}" if @closure&.throwers&.key? :break
-        blockopts << "$$ret: #{@closure.throwers[:return]}" if @closure&.throwers&.key? :return
+        blockopts = {}
+        blockopts["$$arity"] = arity if arity < 0
+        blockopts["$$s"] = scope.self if @define_self
+        blockopts["$$brk"] = @closure.throwers[:break] if @closure&.throwers&.key? :break
+        blockopts["$$ret"] = @closure.throwers[:return] if @closure&.throwers&.key? :return
 
         if compiler.arity_check?
-          blockopts << "$$parameters: #{parameters_code}"
+          blockopts["$$parameters"] = parameters_code
         end
 
         if compiler.enable_source_location?
-          blockopts << "$$source_location: #{source_location}"
+          blockopts["$$source_location"] = source_location
         end
 
         # MRI expands a passed argument if the block:
@@ -37,17 +37,17 @@ module Opal
         # This flag on the method indicates that a block has a top level mlhs argument
         # which means that we have to expand passed array explicitly in runtime.
         if has_top_level_mlhs_arg?
-          blockopts << "$$has_top_level_mlhs_arg: true"
+          blockopts["$$has_top_level_mlhs_arg"] = "true"
         end
 
         if has_trailing_comma_in_args?
-          blockopts << "$$has_trailing_comma_in_args: true"
+          blockopts["$$has_trailing_comma_in_args"] = "true"
         end
 
-        if blockopts.length == 1
+        if blockopts.keys == ["$$arity"]
           push ", #{arity}"
-        elsif blockopts.length > 1
-          push ', {', blockopts.join(', '), '}'
+        elsif !blockopts.empty?
+          push ', {', blockopts.map { |k, v| "#{k}: #{v}" }.join(', '), '}'
         end
 
         scope.nesting if @define_nesting

data/lib/opal/nodes/logic.rb

@@ -53,7 +53,7 @@ module Opal
 
       def compile_iter
         helper :slice
-        push "return #{scope.identity}.apply(null, $slice.call(arguments))"
+        push "return #{scope.identity}.apply(null, $slice(arguments))"
       end
     end
 

data/lib/opal/nodes/masgn.rb

@@ -44,7 +44,7 @@ module Opal
           if post_splat.empty? # trailing splat
             if part = splat.children[0]
               helper :slice
-              part = part.dup << s(:js_tmp, "$slice.call(#{array}, #{pre_splat.size})")
+              part = part.dup << s(:js_tmp, "$slice(#{array}, #{pre_splat.size})")
               push ', '
               push expr(part)
             end
@@ -55,7 +55,7 @@ module Opal
 
             if part = splat.children[0]
               helper :slice
-              part = part.dup << s(:js_tmp, "$slice.call(#{array}, #{pre_splat.size}, #{tmp})")
+              part = part.dup << s(:js_tmp, "$slice(#{array}, #{pre_splat.size}, #{tmp})")
               push ', '
               push expr(part)
             end

data/lib/opal/parser/with_ruby_lexer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Opal::Parser::WithRubyLexer < Parser::Ruby31
+class Opal::Parser::WithRubyLexer < Parser::Ruby32
   include Opal::Parser::DefaultConfig
   Opal::Parser.default_parser_class = self
 end

data/lib/opal/paths.rb

@@ -30,6 +30,20 @@ module Opal
     nil
   end
 
+  # All files that Opal depends on while compiling (for cache keying and
+  # watching)
+  def self.dependent_files
+    # We want to ensure the compiler and any Gemfile/gemspec (for development)
+    # stays untouched
+    opal_path = File.expand_path('..', Opal.gem_dir)
+    files = Dir["#{opal_path}/{Gemfile*,*.gemspec,lib/**/*}"]
+
+    # Also check if parser wasn't changed:
+    files += $LOADED_FEATURES.grep(%r{lib/(parser|ast)})
+
+    files
+  end
+
   module UseGem
     # Adds the "require_paths" (usually `lib/`) of gem with the given name to
     # Opal paths. By default will include the "require_paths" from all the

data/lib/opal/rewriter.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'opal/rewriters/opal_engine_check'
+require 'opal/rewriters/targeted_patches'
 require 'opal/rewriters/for_rewriter'
 require 'opal/rewriters/js_reserved_words'
 require 'opal/rewriters/block_to_iter'
@@ -57,6 +58,7 @@ module Opal
     use Rewriters::Numblocks
     use Rewriters::ForwardArgs
     use Rewriters::BlockToIter
+    use Rewriters::TargetedPatches
     use Rewriters::DotJsSyntax
     use Rewriters::PatternMatching
     use Rewriters::JsReservedWords

data/lib/opal/rewriters/forward_args.rb

@@ -11,17 +11,65 @@ module Opal
         )
       end
 
+      def on_forwarded_restarg(_node)
+        process(
+          s(:splat, s(:lvar, '$fwd_rest'))
+        )
+      end
+
+      def on_forwarded_kwrestarg(_node)
+        process(
+          s(:kwsplat, s(:lvar, '$fwd_kwrest'))
+        )
+      end
+
+      def on_block_pass(node)
+        if !node.children.first
+          process(
+            node.updated(nil,
+              [s(:lvar, '$fwd_block')]
+            )
+          )
+        else
+          super
+        end
+      end
+
       def on_args(node)
         if node.children.last && node.children.last.type == :forward_arg
           prev_children = node.children[0..-2]
 
-          node.updated(nil,
+          super(node.updated(nil,
             [
               *prev_children,
               s(:restarg, '$fwd_rest'),
               s(:blockarg, '$fwd_block')
             ]
-          )
+          ))
+        else
+          super
+        end
+      end
+
+      def on_restarg(node)
+        if !node.children.first
+          node.updated(nil, ['$fwd_rest'])
+        else
+          super
+        end
+      end
+
+      def on_kwrestarg(node)
+        if !node.children.first
+          node.updated(nil, ['$fwd_kwrest'])
+        else
+          super
+        end
+      end
+
+      def on_blockarg(node)
+        if !node.children.first
+          node.updated(nil, ['$fwd_block'])
         else
           super
         end
@@ -34,7 +82,7 @@ module Opal
 
           prev_children = node.children[0..-2]
 
-          node.updated(nil,
+          super(node.updated(nil,
             [
               *prev_children,
               s(:splat,
@@ -44,7 +92,7 @@ module Opal
                 s(:lvar, '$fwd_block')
               )
             ]
-          )
+          ))
         else
           super
         end

data/lib/opal/rewriters/targeted_patches.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+require 'opal/rewriters/base'
+
+module Opal
+  module Rewriters
+    # This module attempts to run some optimizations or compatibility
+    # improvements against some libraries used with Opal.
+    #
+    # This should be a last resort and must not break functionality in
+    # existing applications.
+    class TargetedPatches < Base
+      def on_def(node)
+        name, args, body = *node
+
+        if body && body.type == :begin && body.children.length >= 2
+          # parser/rubyxx.rb - racc generated code often looks like:
+          #
+          #     def _reduce_219(val, _values, result)
+          #       result = @builder.op_assign(val[0], val[1], val[2])
+          #       result
+          #     end
+          #
+          # This converter transform this into just
+          #
+          #     def _reduce_219(val, _values, result)
+          #       @builder.op_assign(val[0], val[1], val[2])
+          #     end
+
+          calls = body.children
+          assignment, ret = calls.last(2)
+          if assignment.type == :lvasgn && ret.type == :lvar &&
+             assignment.children.first == ret.children.first
+
+            if calls.length == 2
+              node.updated(nil, [name, args, assignment.children[1]])
+            else
+              calls = calls[0..-3] << assignment.children[1]
+              node.updated(nil, [name, args, body.updated(nil, calls)])
+            end
+          else
+            super
+          end
+        else
+          super
+        end
+      end
+
+      def on_array(node)
+        children = node.children
+
+        # Optimize large arrays produced by lexer, but mainly we are interested
+        # in improving compile times, by reducing the tree for the further
+        # compilation efforts (also reducing the bundle size a bit)
+        #
+        # This particular patch reduces compile time of the following command
+        # by 12.5%:
+        #
+        #     OPAL_CACHE_DISABLE=true OPAL_PREFORK_DISABLE=true bin/opal \
+        #         --no-source-map -ropal-parser -ropal/platform -ce \
+        #         'puts ::Opal.compile($stdin.read)' > _Cnow.js
+        #
+        # So, in short, an array of a kind:
+        #
+        #     [1, 2, 3, nil, nil, :something, :abc, nil, ...]
+        #
+        # Becomes compiled to:
+        #
+        #     Opal.large_array_unpack("1,2,3,,something,abc,,...")
+
+        if children.length > 32
+          ssin_array = children.all? do |child|
+            # Break for wrong types
+            next false unless %i[str sym int nil].include?(child.type)
+            # Break for strings that may conflict with our numbers, nils and separator
+            next false if %i[str sym].include?(child.type) && child.children.first.to_s =~ /\A[0-9-]|\A\z|,/
+            # Break for too numbers out of range, as there may be decoding issues
+            next false if child.type == :int && !(-1_000_000..1_000_000).cover?(child.children.first)
+            true
+          end
+
+          if ssin_array
+            str = children.map { |i| i.children.first.to_s }.join(',')
+            node.updated(:jscall, [s(:js_tmp, :Opal), :large_array_unpack, s(:sym, str)])
+          else
+            super
+          end
+        else
+          super
+        end
+      end
+    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.6.1'
+  VERSION = '1.7.0.rc1'
 end

data/opal/corelib/basic_object.rb

@@ -30,7 +30,7 @@ class ::BasicObject
         #{raise ::TypeError, "#{inspect} is not a symbol nor a string"}
       }
 
-      var func = self['$' + symbol];
+      var func = self[Opal.jsid(symbol)];
 
       if (func) {
         if (block !== nil) {