opal 0.11.0.rc1 → 0.11.0

data/lib/opal/cli_runners/nodejs.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'opal/cli_runners'
 require 'opal/paths'
 require 'shellwords'
 

data/lib/opal/cli_runners/package.json

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

data/lib/opal/cli_runners/server.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'opal/cli_runners'
 
 module Opal
   module CliRunners

data/lib/opal/compiler.rb

@@ -3,6 +3,7 @@ require 'set'
 require 'opal/parser'
 require 'opal/fragment'
 require 'opal/nodes'
+require 'opal/eof_content'
 
 module Opal
   # Compile a string of ruby code into javascript.
@@ -155,6 +156,7 @@ module Opal
       @unique = 0
       @options = options
       @comments = Hash.new([])
+      @case_stmt = nil
     end
 
     # Compile some ruby code to a string.
@@ -169,24 +171,20 @@ module Opal
     end
 
     def parse
-      buffer = ::Parser::Source::Buffer.new(file)
-      buffer.source = @source
+      @buffer = ::Opal::Source::Buffer.new(file, 1)
+      @buffer.source = @source
 
       @parser = Opal::Parser.default_parser
 
       begin
-        if parse_comments?
-          sexp, comments = @parser.parse_with_comments(buffer)
-          @comments = ::Parser::Source::Comment.associate_locations(sexp, comments)
-        else
-          sexp = @parser.parse(buffer)
-        end
+        sexp, comments, tokens = @parser.tokenize(@buffer)
       rescue ::Parser::SyntaxError => error
         raise ::SyntaxError, error.message, error.backtrace
       end
 
       @sexp = s(:top, sexp || s(:nil))
-      @eof_content = extract_eof_content
+      @comments = ::Parser::Source::Comment.associate_locations(sexp, comments)
+      @eof_content = EofContent.new(tokens, @source).eof
     end
 
     # Returns a source map that can be used in the browser to map back to
@@ -342,7 +340,7 @@ module Opal
       if handler = handlers[sexp.type]
         return handler.new(sexp, level, self).compile_to_fragments
       else
-        raise "Unsupported sexp: #{sexp.type}"
+        error "Unsupported sexp: #{sexp.type}"
       end
     end
 
@@ -484,13 +482,5 @@ module Opal
         fragment("false", scope, sexp)
       end
     end
-
-    # Extracts all the content after __END__ directive
-    #
-    # @return [String, nil]
-    def extract_eof_content
-      matches = @source.match(/\n__END__\n?([\w\s]*)/)
-      matches && matches[1]
-    end
   end
 end

data/lib/opal/deprecations.rb

@@ -5,7 +5,7 @@ module Opal
 
     def deprecation message
       message = "DEPRECATION WARNING: #{message}"
-      if @raise_on_deprecation
+      if defined?(@raise_on_deprecation) && @raise_on_deprecation
         raise message
       else
         warn message

data/lib/opal/eof_content.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Opal
+  class EofContent
+    DATA_SEPARATOR = "__END__\n"
+
+    def initialize(tokens, source)
+      @tokens = tokens
+      @source = source
+    end
+
+    def eof
+      return nil if @tokens.empty?
+
+      eof_content = @source[last_token_position..-1]
+      return nil unless eof_content
+
+      eof_content = eof_content.lines.drop_while { |line| line == "\n" }
+
+      if eof_content[0] == "__END__\n"
+        eof_content = eof_content[1..-1] || []
+        eof_content.join
+      elsif eof_content == ["__END__"]
+        ""
+      end
+    end
+
+    private
+
+    def last_token_position
+      _, last_token_info = @tokens.last
+      _, last_token_range = last_token_info
+      last_token_range.end_pos
+    end
+  end
+end

data/lib/opal/nodes.rb

@@ -31,7 +31,6 @@ require 'opal/nodes/case'
 require 'opal/nodes/super'
 require 'opal/nodes/top'
 require 'opal/nodes/while'
-require 'opal/nodes/for'
 require 'opal/nodes/hash'
 require 'opal/nodes/array'
 require 'opal/nodes/defined'

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

@@ -10,19 +10,21 @@ module Opal
     #
     class KwargNode < InitializeKwargsNode
       handle :kwarg
-      children :name
+      children :lvar_name
 
       def compile
+        key_name = @sexp.meta[:arg_name]
+
         initialize_kw_args_if_needed
 
-        add_temp name
+        add_temp lvar_name
 
-        line "if (!Opal.hasOwnProperty.call($kwargs.$$smap, '#{name}')) {"
-        line "  throw Opal.ArgumentError.$new('missing keyword: #{name}');"
+        line "if (!Opal.hasOwnProperty.call($kwargs.$$smap, '#{key_name}')) {"
+        line "  throw Opal.ArgumentError.$new('missing keyword: #{key_name}');"
         line "}"
-        line "#{name} = $kwargs.$$smap['#{name}'];"
+        line "#{lvar_name} = $kwargs.$$smap[#{key_name.to_s.inspect}];"
 
-        scope.used_kwargs << name
+        scope.used_kwargs << key_name
       end
     end
   end

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

@@ -10,18 +10,24 @@ module Opal
     #
     class KwoptArgNode < InitializeKwargsNode
       handle :kwoptarg
-      children :name, :default_value
+      children :lvar_name, :default_value
 
       def compile
+        key_name = @sexp.meta[:arg_name]
+
         initialize_kw_args_if_needed
 
-        add_temp name
+        add_temp lvar_name
 
-        line "if ((#{name} = $kwargs.$$smap['#{name}']) == null) {"
-        line "  #{name} = ", expr(default_value)
-        line "}"
+        line "#{lvar_name} = $kwargs.$$smap[#{key_name.to_s.inspect}];"
+
+        scope.used_kwargs << key_name
 
-        scope.used_kwargs << name
+        return if default_value.children[1] == :undefined
+
+        line "if (#{lvar_name} == null) {"
+        line "  #{lvar_name} = ", expr(default_value)
+        line "}"
       end
     end
   end

data/lib/opal/nodes/call.rb

@@ -32,6 +32,8 @@ module Opal
         if last_arg && [:iter, :block_pass].include?(last_arg.type)
           @iter = last_arg
           args = rest
+        else
+          @iter = nil
         end
 
         @arglist = s(:arglist, *args)
@@ -246,6 +248,7 @@ module Opal
 
           dir = File.dirname(compiler.file)
           full_path = Pathname(dir).join(relative_path).cleanpath.to_s
+          full_path.force_encoding(relative_path.encoding)
           first_arg = first_arg.updated(nil, [full_path])
         end
         @arglist = arglist.updated(nil, [first_arg] + rest)
@@ -281,7 +284,6 @@ module Opal
       end
 
       add_special :nesting do |compile_default|
-        recv, method, *args = children
         push_nesting = push_nesting?(children)
         push '(Opal.Module.$$nesting = $nesting, ' if push_nesting
         compile_default.call
@@ -289,7 +291,6 @@ module Opal
       end
 
       add_special :constants do |compile_default|
-        recv, method, *args = children
         push_nesting = push_nesting?(children)
         push '(Opal.Module.$$nesting = $nesting, ' if push_nesting
         compile_default.call

data/lib/opal/nodes/call_special.rb

@@ -46,7 +46,16 @@ module Opal
       end
 
       def method_jsid
-        "." + meth.to_s
+        ".#{meth}"
+      end
+
+      def compile_using_send
+        push recv(receiver_sexp), method_jsid, ".apply(null"
+        compile_arguments
+        if iter
+          push ".concat(", expr(iter), ")"
+        end
+        push ")"
       end
     end
 

data/lib/opal/nodes/definitions.rb

@@ -61,7 +61,7 @@ module Opal
         end
       end
 
-      COMPLEX_CHILDREN = [:while, :while_post, :until, :until_post, :until, :js_return]
+      COMPLEX_CHILDREN = [:while, :while_post, :until, :until_post, :js_return]
 
       def simple_children?
         children.none? do |child|
@@ -70,9 +70,11 @@ module Opal
       end
 
       def compile_inline_children(children, level)
-        children.each_with_index do |child, idx|
+        children.map do |child|
+          process(child, level)
+        end.reject(&:empty?).each_with_index do |child, idx|
           push ', ' unless idx == 0
-          push process(child, level)
+          push child
         end
       end
     end

data/lib/opal/nodes/helpers.rb

@@ -47,9 +47,8 @@ module Opal
           return optimize
         end
 
-        with_temp do |tmp|
-          [fragment("((#{tmp} = "), expr(sexp), fragment(") !== nil && #{tmp} != null && (!#{tmp}.$$is_boolean || #{tmp} == true))")]
-        end
+        helper :truthy
+        [fragment("$truthy("),expr(sexp),fragment(")")]
       end
 
       def js_falsy(sexp)
@@ -61,9 +60,8 @@ module Opal
           end
         end
 
-        with_temp do |tmp|
-          [fragment("((#{tmp} = "), expr(sexp), fragment(") === nil || #{tmp} == null || (#{tmp}.$$is_boolean && #{tmp} == false))")]
-        end
+        helper :falsy
+        [fragment("$falsy("),expr(sexp),fragment(")")]
       end
 
       def js_truthy_optimize(sexp)
@@ -83,8 +81,6 @@ module Opal
             mid == :"=="
             expr(sexp)
           end
-        elsif [:lvar, :self].include? sexp.type
-          [expr(sexp.dup), fragment(" !== false && "), expr(sexp.dup), fragment(" !== nil && "), expr(sexp.dup), fragment(" != null")]
         end
       end
 

data/lib/opal/nodes/literal.rb

@@ -53,11 +53,23 @@ module Opal
       end
 
       def compile
-        sanitized_value = value.inspect.gsub(/\\u\{([0-9a-f]+)\}/) do |match|
+        string_value = value
+        encoding = string_value.encoding
+        should_encode = encoding != Encoding::UTF_8
+
+        if should_encode
+          string_value = string_value.force_encoding('UTF-8')
+        end
+
+        sanitized_value = string_value.inspect.gsub(/\\u\{([0-9a-f]+)\}/) do |match|
           code_point = $1.to_i(16)
           to_utf16(code_point)
         end
         push translate_escape_chars(sanitized_value)
+
+        if should_encode && RUBY_ENGINE != 'opal'
+          push '.$force_encoding("', encoding.name, '")'
+        end
       end
 
       # http://www.2ality.com/2013/09/javascript-unicode.html

data/lib/opal/nodes/logic.rb

@@ -130,25 +130,21 @@ module Opal
       children :lhs, :rhs
 
       def compile_ternary
+        helper :truthy
+
         with_temp do |tmp|
-          push "(((#{tmp} = "
-          push expr(lhs)
-          push ") !== false && #{tmp} !== nil && #{tmp} != null) ? #{tmp} : "
-          push expr(rhs)
-          push ")"
+          push "($truthy(#{tmp} = ", expr(lhs), ") ? #{tmp} : ", expr(rhs), ")"
         end
       end
 
       def compile_if
+        helper :truthy
+
         with_temp do |tmp|
-          push "if (#{tmp} = ", expr(lhs), ", #{tmp} !== false && #{tmp} !== nil && #{tmp} != null) {"
-          indent do
-            line tmp
-          end
+          push "if ($truthy(#{tmp} = ", expr(lhs), ")) {"
+          indent { line tmp }
           line "} else {"
-            indent do
-              line expr(rhs)
-            end
+          indent { line expr(rhs) }
           line "}"
         end
       end
@@ -169,31 +165,22 @@ module Opal
             push expr(rhs)
             push " : ", expr(lhs), ")"
           else
-            push "(#{tmp} = "
-            push expr(lhs)
-            push ", #{tmp} !== false && #{tmp} !== nil && #{tmp} != null ?"
-            push expr(rhs)
-            push " : #{tmp})"
+            helper :truthy
+
+            push "($truthy(#{tmp} = ", expr(lhs), ") ? ", expr(rhs), " : #{tmp})"
           end
         end
       end
 
       def compile_if
-        with_temp do |tmp|
-          if truthy_opt = js_truthy_optimize(lhs)
-            push "if (#{tmp} = ", truthy_opt, ") {"
-          else
-            push "if (#{tmp} = ", expr(lhs), ", #{tmp} !== false && #{tmp} !== nil && #{tmp} != null) {"
-          end
-          indent do
-            line expr(rhs)
-          end
-          line "} else {"
-          indent do
-            line expr(lhs)
-          end
-          line "}"
-        end
+        helper :truthy
+        condition = js_truthy_optimize(lhs) || expr(lhs)
+
+        line "if ($truthy(", condition, ")) {"
+        indent { line expr(rhs) }
+        line "} else {"
+        indent { line expr(lhs) }
+        line "}"
       end
     end
 

data/lib/opal/nodes/node_with_args.rb

@@ -212,7 +212,7 @@ module Opal
       # Returns an array of JS conditions for raising and argument
       # error caused by arity check
       def arity_checks
-        return @arity_checks if @arity_checks
+        return @arity_checks if defined?(@arity_checks)
 
         arity = args.children.size
         arity -= (opt_args.size)

data/lib/opal/nodes/scope.rb

@@ -53,6 +53,7 @@ module Opal
         @methods = []
 
         @uses_block = false
+        @in_ensure = false
 
         # used by classes to store all ivars used in direct def methods
         @proto_ivars = []

data/lib/opal/nodes/super.rb

@@ -36,10 +36,6 @@ module Opal
 
       private
 
-      def method_id
-        raise 'Not implemented, see #add_method'
-      end
-
       # Using super in a block inside a method is allowed, e.g.
       # def a
       #  { super }

data/lib/opal/nodes/variables.rb

@@ -46,6 +46,17 @@ module Opal
       end
     end
 
+    class LocalDeclareNode < Base
+      handle :lvdeclare
+
+      children :var_name
+
+      def compile
+        add_local(var_name.to_s)
+        nil
+      end
+    end
+
     class InstanceVariableNode < Base
       handle :ivar