ruby2js 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e00c31d4c3008e16e720676fe6170e741e647dbc
-  data.tar.gz: d3882d4c1a946655055af40fc41028f096238101
+SHA256:
+  metadata.gz: 96bf18688d1c3a685449b4e8404cb6a8c13f989031c61f950bfb69e5adf7855f
+  data.tar.gz: 39abc46c793667b6b3bd502986ad0aec2dd8f912eca79d94d870095a5d0aeb64
 SHA512:
-  metadata.gz: da8fb9a021cc0037d31bcc1bb2d83fbb52f686640d0247dda4d030869ae148ad4a271f6c93aa78f2fe2211ea0c82275807897bf86dc1223ae6cb56ea32567b1c
-  data.tar.gz: d843723f447de12fa82ebb5402dd74302a4390ee216b1cf1a711cf78526311672e4f3968db8cf9d54a51a94a1265c816a56c1c2fa27e015b24a239c850c9fbe1
+  metadata.gz: 70a47951f48b3a389c497f393eb9a112e5b702f006efb3191fa7c99a36d7cd44dade1baef64925951a4c9158a2d7e3b2f5e27e24d03c4502c00af9056b0a1779
+  data.tar.gz: 1f785124a3ad1dea8028f29c728953396eb7e2b34d51d8fdd634cffada1d63f574a21132a11337a3d08aff693668ef33132fe74f743a02f37c299027d8e017b9

data/lib/ruby2js/converter.rb

@@ -1,6 +1,15 @@
 require 'ruby2js/serializer'
 
 module Ruby2JS
+  class Error < NotImplementedError
+    def initialize(message, ast)
+      message += ' at ' + ast.loc.expression.source_buffer.name.to_s
+      message += ':' + ast.loc.expression.line.inspect
+      message += ':' + ast.loc.expression.column.to_s
+      super(message)
+    end
+  end
+
   class Converter < Serializer
     attr_accessor :ast
 
@@ -146,7 +155,7 @@ module Ruby2JS
       handler = @handlers[ast.type]
 
       unless handler
-        raise NotImplementedError, "unknown AST type #{ ast.type }"
+        raise Error.new("unknown AST type #{ ast.type }", ast)
       end
 
       if state == :statement and not @comments[ast].empty?
@@ -171,7 +180,11 @@ module Ruby2JS
     end
     
     def group( ast )
-      put '('; parse ast; put ')'
+      if [:dstr, :dsym].include? ast.type and es2015
+        parse ast
+      else
+        put '('; parse ast; put ')'
+      end
     end
 
     def timestamp(file)

data/lib/ruby2js/converter/arg.rb

@@ -7,14 +7,14 @@ module Ruby2JS
     # NOTE: process_all appends a nil child for unknown reasons
 
     handle :arg, :blockarg do |arg, unknown=nil|
-      raise NotImplementedError, "argument #{ unknown.inspect }" if unknown
+      raise Error.new("argument #{ unknown.inspect }", @ast) if unknown
       put arg
     end
 
     # (shadowarg :a)
 
     handle :shadowarg do |arg, unknown=nil|
-      raise NotImplementedError, "argument #{ unknown.inspect }" if unknown
+      raise Error.new("argument #{ unknown.inspect }", @ast) if unknown
       nil
     end
   end

data/lib/ruby2js/converter/args.rb

@@ -16,7 +16,7 @@ module Ruby2JS
         parse_all(*args, join: ', ')
         put ']'
       else
-        raise NotImplementedError, "destructuring requires ES2015"
+        raise Error.new("destructuring requires ES2015", @ast)
       end
     end
   end

data/lib/ruby2js/converter/array.rb

@@ -7,7 +7,7 @@ module Ruby2JS
 
     handle :array do |*items|
       splat = items.rindex { |a| a.type == :splat }
-      if splat
+      if splat and (items.length == 1 or not es2015)
         item = items[splat].children.first
         if items.length == 1
           parse item

data/lib/ruby2js/converter/break.rb

@@ -5,8 +5,8 @@ module Ruby2JS
     #   (int 1))
 
     handle :break do |n=nil|
-      raise NotImplementedError, "break argument #{ n.inspect }" if n
-      raise NotImplementedError, "break outside of loop" if @next_token == :return
+      raise Error.new("break argument #{ n.inspect }", @ast) if n
+      raise Error.new("break outside of loop", @ast) if @next_token == :return
       put 'break'
     end
   end

data/lib/ruby2js/converter/class.rb

@@ -145,7 +145,7 @@ module Ruby2JS
             "#{m.children[0].children.first}=", 
             s(:attr, s(:attr, name, :prototype), m.children[1].children.first))
         else
-          raise NotImplementedError, "class #{ m.type }"
+          raise Error.new("class #{ m.type }", @ast)
         end
 
         # associate comments

data/lib/ruby2js/converter/def.rb

@@ -9,7 +9,7 @@ module Ruby2JS
     handle :def, :defm, :async do |name, args, body=nil|
       body ||= s(:begin)
       if name =~ /[!?]$/
-        raise NotImplementedError, "invalid method name #{ name }"
+        raise Error.new("invalid method name #{ name }", @ast)
       end
 
       vars = {}

data/lib/ruby2js/converter/hash.rb

@@ -13,7 +13,7 @@ module Ruby2JS
         (singleton ? put('{') : puts('{'))
 
         pairs.each_with_index do |node, index|
-          raise NotImplementedError, "kwsplat" if node.type == :kwsplat
+          raise Error.new("kwsplat", @ast) if node.type == :kwsplat
 
           (singleton ? put(', ') : put(",#@ws")) unless index == 0
 

data/lib/ruby2js/converter/kwbegin.rb

@@ -27,17 +27,17 @@ module Ruby2JS
 
       if block and block.type == :rescue
         body, *recovers, otherwise = block.children
-        raise NotImplementedError, "block else" if otherwise
+        raise Error.new("block else", @ast) if otherwise
 
         if recovers.any? {|recover| not recover.children[1]}
-          raise NotImplementedError, "recover without exception variable"
+          raise Error.new("recover without exception variable", @ast)
         end
 
         var = recovers.first.children[1]
 
         if recovers.any? {|recover| recover.children[1] != var}
-          raise NotImplementedError, 
-            "multiple recovers with different exception variables"
+          raise Error.new( 
+            "multiple recovers with different exception variables", @ast)
         end
       else
         body = block

data/lib/ruby2js/converter/next.rb

@@ -5,7 +5,7 @@ module Ruby2JS
     #   (int 1))
 
     handle :next do |n=nil|
-      raise NotImplementedError, "next argument #{ n.inspect }" if n
+      raise Error.new("next argument #{ n.inspect }", @ast) if n
       put @next_token.to_s
     end
   end

data/lib/ruby2js/converter/send.rb

@@ -218,7 +218,7 @@ module Ruby2JS
           parse s(:send, s(:const, nil, args.first.children[1]), :new,
             *args.first.children[2..-1], args.last), @state
         else
-          raise NotImplementedError, "use of JavaScript keyword new"
+          raise Error.new("use of JavaScript keyword new", @ast)
         end
 
       elsif method == :raise and receiver == nil

data/lib/ruby2js/converter/super.rb

@@ -7,7 +7,7 @@ module Ruby2JS
 
     handle :super, :zsuper do |*args|
       unless @instance_method and @class_parent
-        raise NotImplementedError, "super outside of a method"
+        raise Error.new("super outside of a method", @ast)
       end
 
       # what to pass

data/lib/ruby2js/filter/functions.rb

@@ -142,8 +142,20 @@ module Ruby2JS
              S(:send, target, :push, s(:splat, node.children[2])))
 
         elsif method == :include? and args.length == 1
-          process S(:send, S(:send, target, :indexOf, args.first), :!=,
-            s(:int, -1))
+          while target.type == :begin and target.children.length == 1
+            target = target.children.first
+          end
+
+          if target.type == :irange
+            S(:and, s(:send, args.first, :>=, target.children.first),
+              s(:send, args.first, :<=, target.children.last))
+          elsif target.type == :erange
+            S(:and, s(:send, args.first, :>=, target.children.first),
+              s(:send, args.first, :<, target.children.last))
+          else
+            process S(:send, S(:send, target, :indexOf, args.first), :!=,
+              s(:int, -1))
+          end
 
         elsif method == :respond_to? and args.length == 1
           process S(:in?, args.first, target)

data/lib/ruby2js/filter/react.rb

@@ -823,7 +823,7 @@ module Ruby2JS
       # prevent attempts to assign to React properties
       def on_cvasgn(node)
         return super unless @reactMethod
-        raise NotImplementedError, "setting a React property"
+        raise Error.new("setting a React property", node)
       end
 
       # convert instance variables to state: "@x ||= y"

data/lib/ruby2js/filter/vue.rb

@@ -29,12 +29,21 @@ module Ruby2JS
         @vue_methods = []
         @vue_props = []
         @vue_reactive = []
+        @vue_filter_functions = false
         super
       end
 
       def options=(options)
         super
         @vue_h ||= options[:vue_h]
+        filters = options[:filters] || Filter::DEFAULTS
+
+        if 
+          defined? Ruby2JS::Filter::Functions and
+          filters.include? Ruby2JS::Filter::Functions
+        then
+          @vue_filter_functions = true
+        end
       end
 
       # Example conversion
@@ -393,15 +402,15 @@ module Ruby2JS
       # expand 'wunderbar' like method calls
       def on_send(node)
         if not @vue_h
-	  if node.children.first == s(:const, nil, :Vue)
-	    # enable React filtering within Vue class method calls or
-	    # React component calls
-	    begin
-	      vue_h, @vue_h = @vue_h, [s(:self), :$createElement]
-	      return on_send(node)
-	    ensure
-	      @vue_h = vue_h
-	    end
+          if node.children.first == s(:const, nil, :Vue)
+            # enable React filtering within Vue class method calls or
+            # React component calls
+            begin
+              vue_h, @vue_h = @vue_h, [s(:self), :$createElement]
+              return on_send(node)
+            ensure
+              @vue_h = vue_h
+            end
 
           elsif node.children.first == s(:send, s(:const, nil, :Vue), :util)
             if node.children[1] == :defineReactive
@@ -588,18 +597,7 @@ module Ruby2JS
               end
 
               # check for normal case: only elements and text
-              simple = statements.all? do |arg|
-                # explicit call to Vue.createElement
-                next true if arg.children[1] == :createElement and
-                  arg.children[0] == s(:const, nil, :Vue)
-
-                # wunderbar style call
-                arg = arg.children.first if arg.type == :block
-                while arg.type == :send and arg.children.first != nil
-                  arg = arg.children.first
-                end
-                arg.type == :send and arg.children[1] =~ /^_/
-              end
+              simple = statements.all? {|arg| vue_element?(arg)}
 
               if simple
                 args << s(:array, *statements)
@@ -736,15 +734,50 @@ module Ruby2JS
               #     return $_
               #   }())
               #
+              @vue_apply = false
+
+              # gather non-element emitting statements in the front
+              prolog = []
+              while not complex_block.empty? and 
+                vue_wunderbar_free([complex_block.first]) do
+                prolog << process(complex_block.shift)
+              end
+
+              # gather element emitting statements in the front
+              prefix = []
+              while vue_element?(complex_block.first) do
+                prefix << process(complex_block.shift)
+              end
+
+              # gather element emitting statements in the back
+              suffix = []
+              while vue_element?(complex_block.last) do
+                suffix.unshift process(complex_block.pop)
+              end
+
+              result = s(:lvar, :$_)
+
+              unless suffix.empty?
+                result = s(:send, result, :concat, s(:array, *suffix))
+              end
+
               @vue_apply = true
 
-              element = node.updated :send, [nil, @vue_h,
-                *process_all(args),
-                s(:send, s(:block, s(:send, nil, :proc),
-                  s(:args, s(:shadowarg, :$_)), s(:begin,
-                  s(:lvasgn, :$_, s(:array)),
-                  *process_all(complex_block),
-                  s(:return, s(:lvar, :$_)))), :[])]
+              if suffix.empty? and complex_block.empty?
+                element = node.updated :send, [nil, @vue_h,
+                  *process_all(args),
+                  s(:send, s(:block, s(:send, nil, :proc),
+                    s(:args), s(:begin, *prolog,
+                    s(:return, s(:array, *prefix)))), :[])]
+              else
+                element = node.updated :send, [nil, @vue_h,
+                  *process_all(args),
+                  s(:send, s(:block, s(:send, nil, :proc),
+                    s(:args, s(:shadowarg, :$_)), s(:begin, *prolog,
+                    s(:lvasgn, :$_, s(:array, *prefix)),
+                    *process_all(complex_block),
+                    s(:return, result))), :[])]
+              end
             end
           ensure
             @vue_apply = vue_apply
@@ -951,6 +984,39 @@ module Ruby2JS
               s(:args), s(:block, s(:send, send[2], :forEach),
               *node.children[1..-1]))
           end
+
+        elsif
+          node.children.first.children.last == :forEach and
+          vue_element?(node.children.last)
+        then
+          # map forEach to map
+          map = node.children.first.updated(nil, 
+            [*node.children.first.children[0..-2], :map])
+          node = node.updated(nil, [map, *node.children[1..-2],
+            s(:autoreturn, node.children[-1])])
+          begin
+            vue_apply, @vue_apply = @vue_apply, false
+            if vue_apply
+              s(:send, s(:gvar, :$_), :push, s(:splat, process(node)))
+            else
+              s(:splat, process(node))
+            end
+          ensure
+            @vue_apply = vue_apply
+          end
+        else
+          super
+        end
+      end
+
+      # convert for_of back to forEach for conversion to map
+      def on_for_of(node)
+        if vue_element?(node.children.last)
+          process node.updated(:block, [
+            s(:send, node.children[1], :forEach),
+            s(:args, s(:arg, node.children.first.children.last)),
+            node.children.last
+          ])
         else
           super
         end
@@ -975,7 +1041,7 @@ module Ruby2JS
       # prevent attempts to assign to Vue properties
       def on_cvasgn(node)
         return super unless @vue_self
-        raise NotImplementedError, "setting a Vue property"
+        raise Error.new("setting a Vue property", node)
       end
 
       # expand @ to @vue_self
@@ -1036,20 +1102,35 @@ module Ruby2JS
           value.children[1]])]
       end
 
+      # is this a "wunderbar" style call or createElement?
+      def vue_element?(node)
+        return false unless node
+
+        forEach = [:forEach]
+        forEach << :each if @vue_filter_functions
+
+        return true if node.type == :block and
+          forEach.include? node.children.first.children.last and 
+          vue_element?(node.children.last)
+
+        # explicit call to Vue.createElement
+        return true if node.children[1] == :createElement and
+          node.children[0] == s(:const, nil, :Vue)
+
+        # wunderbar style call
+        node = node.children.first if node.type == :block
+        while node.type == :send and node.children.first != nil
+          node = node.children.first
+        end
+        node.type == :send and node.children[1].to_s.start_with? '_'
+      end
+
       # ensure that there are no "wunderbar" or "createElement" calls in
       # a set of statements.
       def vue_wunderbar_free(nodes)
         nodes.each do |node|
           if Parser::AST::Node === node
-            if node.type == :send
-              # wunderbar style calls
-              return false if node.children[0] == nil and
-                node.children[1].to_s.start_with? '_'
-
-              # Vue.createElement calls
-              return false if node.children[0] == s(:const, nil, :Vue) and
-                node.children[1] == :createElement
-            end
+            return false if vue_element?(node)
 
             # recurse
             return false unless vue_wunderbar_free(node.children)

data/lib/ruby2js/version.rb

@@ -2,7 +2,7 @@ module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Minimal yet extensible Ruby to JavaScript conversion.