ruby2js 3.1.1 → 3.3.2

data/lib/ruby2js/filter/require.rb

@@ -17,7 +17,7 @@ module Ruby2JS
       end
 
       def on_send(node)
-        if
+        if \
           not @require_expr and # only statements
           node.children.length == 3 and
           node.children[0] == nil and
@@ -39,9 +39,6 @@ module Ruby2JS
             filename = File.join(dirname, basename)
 
             segments = basename.split(/[\/\\]/)
-            if segments.all? {|path| path =~ @@valid_path and path != '..'}
-              filename.untaint 
-            end
 
             if not File.file? filename and File.file? filename+".rb"
               filename += '.rb'

data/lib/ruby2js/filter/rubyjs.rb

@@ -20,7 +20,7 @@ module Ruby2JS
           target = target.children.first
         end
 
-        if 
+        if \
           [:capitalize, :center, :chomp, :ljust, :lstrip, :rindex, :rjust,
             :rstrip, :scan, :swapcase, :tr].include? method
         then
@@ -28,7 +28,7 @@ module Ruby2JS
           s(:send, s(:lvar, :_s), method,
             *process_all([node.children[0], *node.children[2..-1]]))
 
-        elsif 
+        elsif \
           [:at, :compact, :compact!, :delete_at, :delete_at, :flatten, :insert,
           :reverse, :reverse!, :rotate, :rotate, :rotate!, :shift, :shuffle,
           :shuffle!, :slice, :slice!, :transpose, :union, :uniq, :uniq!]
@@ -62,14 +62,14 @@ module Ruby2JS
         method = call.children[1]
         return super if excluded?(method)
 
-        if 
+        if \
           [:collect_concat, :count, :cycle, :delete_if, :drop_while,
           :each_index, :each_slice, :each_with_index, :each_with_object,
           :find, :find_all, :flat_map, :inject, :grep, :group_by, :keep_if,
           :map, :max_by, :min_by, :one?, :partition, :reject, :reverse_each,
           :select!, :sort_by, :take_while].include? method
         then
-          if 
+          if \
             [:collect_concat, :count, :delete_if, :drop_while, :find,
             :find_all, :flat_map, :grep, :group_by, :keep_if, :map, :max_by,
             :min_by, :one?, :partition, :reject, :select!, :sort_by,

data/lib/ruby2js/filter/vue.rb

@@ -31,6 +31,8 @@ module Ruby2JS
         @vue_reactive = []
         @vue_filter_functions = false
 
+        @vue_setup = false
+
         super
 
         @exclude_methods << @vue_methods
@@ -41,7 +43,7 @@ module Ruby2JS
         @vue_h ||= options[:vue_h]
         filters = options[:filters] || Filter::DEFAULTS
 
-        if 
+        if \
           defined? Ruby2JS::Filter::Functions and
           filters.include? Ruby2JS::Filter::Functions
         then
@@ -49,6 +51,29 @@ module Ruby2JS
         end
       end
 
+      # if options[:vue_h] is set, return an array of nodes
+      def process(node)
+        return super if @vue_setup
+        @vue_setup = true
+        if @vue_h 
+          if node.type == :begin
+            begin
+              @vue_apply = true
+              process s(:send, s(:block, s(:send, nil, :proc), 
+                s(:args, s(:shadowarg, :$_)), 
+                s(:begin, s(:lvasgn, :$_, s(:array)), process(node),
+                  s(:return, s(:gvar, :$_)))), :[])
+            ensure
+              @vue_apply = nil
+            end
+          else
+            process s(:array, node)
+          end
+        else
+          process node
+        end
+      end
+
       # Example conversion
       #  before:
       #    (class (const nil :Foo) (const nil :Vue) nil)
@@ -115,7 +140,7 @@ module Ruby2JS
               end
             end
 
-          elsif
+          elsif \
             statement.type == :send and statement.children[0] == cname and
             statement.children[1].to_s.end_with? '='
           then
@@ -136,13 +161,13 @@ module Ruby2JS
               hash << s(:pair, s(:sym, statement.children[1]),
                 statement.children[2])
 
-            elsif
+            elsif \
               statement.children[1] == :options and
               statement.children[2].type == :hash
             then
               options += statement.children[2].children
 
-            elsif
+            elsif \
               statement.children[1] == :el and
               statement.children[2].type == :str
             then
@@ -165,7 +190,7 @@ module Ruby2JS
 
                 block = s(:begin, block) unless block and block.type == :begin
 
-                if
+                if \
                   (block.children.length != 1 and
                     not vue_wunderbar_free(block.children[0..-2])) or
 
@@ -378,7 +403,7 @@ module Ruby2JS
                 end
               end
 
-            elsif
+            elsif \
               class_methods.any? do |other_method|
                 other_method.children[1].to_s == "#{method.children[1]}="
               end
@@ -520,7 +545,7 @@ module Ruby2JS
                         *values.join(' ').split(' ').
                           map {|str| s(:pair, s(:str, str), s(:true))})
                     else
-                      if
+                      if \
                         expr.type == :if and expr.children[1] and
                         expr.children[1].type == :str
                       then
@@ -822,7 +847,7 @@ module Ruby2JS
             s(:splat, s(:array, *process_all(node.children[2..-1])))
           end
 
-        elsif
+        elsif \
           node.children[1] == :createElement and
           node.children[0] == s(:const, nil, :Vue)
         then
@@ -842,7 +867,7 @@ module Ruby2JS
             element
           end
 
-        elsif
+        elsif \
           @vue_self and VUE_METHODS.include? node.children[1] and
           node.children[0] == s(:const, nil, :Vue)
         then
@@ -904,7 +929,7 @@ module Ruby2JS
           prev = nil
           (node.children.length-1).downto(0) do |i|
             child = node.children[i]
-            if 
+            if \
               child.type == :send and child.children[0] == s(:gvar, :$_) and
               child.children[1] == :push
             then
@@ -943,7 +968,7 @@ module Ruby2JS
         child = node.children.first
 
         # map Vue.render(el, &block) to Vue.new(el: el, render: block)
-        if
+        if \
           child.children[1] == :render and
           child.children[0] == s(:const, nil, :Vue)
         then
@@ -954,7 +979,7 @@ module Ruby2JS
             block = node.children[2]
             block = s(:begin, block) unless block and block.type == :begin
 
-            if
+            if \
               block.children.length != 1 or not block.children.last or
               not [:send, :block].include? block.children.first.type
             then
@@ -974,7 +999,7 @@ module Ruby2JS
 
         return super unless @vue_h
 
-        if
+        if \
           child.children[1] == :createElement and
           child.children[0] == s(:const, nil, :Vue)
         then
@@ -1034,7 +1059,7 @@ module Ruby2JS
               *node.children[1..-1]))
           end
 
-        elsif
+        elsif \
           node.children.first.children.last == :forEach and
           vue_element?(node.children.last)
         then
@@ -1119,7 +1144,7 @@ module Ruby2JS
             node.children[0].children[0].to_s[1..-1]),
             node.children[1], process(node.children[2])]
 
-        elsif
+        elsif \
           node.children.first.type == :lvasgn and
           @vue_props.include? node.children[0].children[0]
         then

data/lib/ruby2js/filter/wunderbar.rb

@@ -0,0 +1,63 @@
+require 'ruby2js'
+
+module Ruby2JS
+  module Filter
+    module Wunderbar
+      include SEXP
+
+      def on_send(node)
+        target, method, *attrs = node.children
+
+        if target == s(:const, nil, :Wunderbar)
+          if [:debug, :info, :warn, :error, :fatal].include? method
+            method = :error if method == :fatal
+            return node.updated(nil, [s(:const, nil, :console), method, *attrs])
+          end
+        end
+
+        stack = []
+        while target!=nil and target.type==:send and target.children.length==2
+          name = method.to_s
+          if name.end_with? '!'
+            stack << s(:hash, s(:pair, s(:sym, :id), s(:str, name[0..-2])))
+          else
+            stack << s(:hash, s(:pair, s(:sym, :class), s(:str, name)))
+          end
+          target, method = target.children
+        end
+
+        if target == nil and method.to_s.start_with? "_"
+          S(:xnode, *method.to_s[1..-1], *stack, *process_all(attrs))
+        else
+          super
+        end
+      end
+
+      def on_block(node)
+        send, args, *block = node.children
+        target, method, *_ = send.children
+        while target!=nil and target.type==:send and target.children.length==2
+          target, method = target.children
+        end
+
+        if target == nil and method.to_s.start_with? "_"
+          if args.children.empty?
+            # append block as a standalone proc
+            process send.updated(nil, [*send.children, *process_all(block)])
+          else
+            # iterate over Enumerable arguments if there are args present
+            send = send.children
+            return super if send.length < 3
+            process s(:block, s(:send, *send[0..1], *send[3..-1]),
+              s(:args), s(:block, s(:send, send[2], :map),
+              *node.children[1..-1]))
+          end
+        else
+          super
+        end
+      end
+    end
+
+    DEFAULTS.push Wunderbar
+  end
+end

data/lib/ruby2js/serializer.rb

@@ -32,8 +32,10 @@ module Ruby2JS
         ''
       elsif ['case ', 'default:'].include? self[0]
         ' ' * ([0,indent-2].max) + join
-      else
+      elsif indent > 0
         ' ' * indent + join
+      else
+        join
       end
     end
   end
@@ -58,7 +60,6 @@ module Ruby2JS
 
     def timestamp(file)
       if file
-        file = file.dup.untaint
         @timestamps[file] = File.mtime(file) if File.exist?(file)
       end
     end
@@ -87,9 +88,21 @@ module Ruby2JS
         first = line.find {|token| !token.empty?}
         if first
           last = line[line.rindex {|token| !token.empty?}]
-          indent -= @indent if ')}]'.include? first[0] and indent >= @indent
-          line.indent = indent
-          indent += @indent if '({['.include? last[-1]
+          if (first.start_with? '<' and line.include? '>') or
+             (last.end_with? '>' and line.include? '<')
+          then
+            node = line.join[/.*?(<.*)/, 1]
+            indent -= @indent if node.start_with? '</'
+
+            line.indent = indent
+
+            node = line.join[/.*(<.*)/, 1]
+            indent += @indent unless node.include? '</' or node.include? '/>'
+          else
+            indent -= @indent if ')}]'.include? first[0] and indent >= @indent
+            line.indent = indent
+            indent += @indent if '({['.include? last[-1]
+          end
         else
           line.indent = indent
         end
@@ -102,24 +115,24 @@ module Ruby2JS
       reindent @lines
 
       (@lines.length-3).downto(0) do |i|
-        if
+        if \
           @lines[i].length == 0
         then
           @lines.delete i
-        elsif
+        elsif \
           @lines[i+1].comment? and not @lines[i].comment? and
           @lines[i].indent == @lines[i+1].indent
         then
           # before a comment
           @lines.insert i+1, Line.new
-        elsif
+        elsif \
           @lines[i].indent == @lines[i+1].indent and 
           @lines[i+1].indent < @lines[i+2].indent and
           not @lines[i].comment?
         then
           # start of indented block
           @lines.insert i+1, Line.new
-        elsif
+        elsif \
           @lines[i].indent > @lines[i+1].indent and 
           @lines[i+1].indent == @lines[i+2].indent and
           not @lines[i+2].empty?
@@ -136,7 +149,8 @@ module Ruby2JS
         @line << Token.new(string, @ast)
       else
         parts = string.split("\n")
-        @line << Token.new(parts.shift, @ast)
+        first = parts.shift
+        @line << Token.new(first, @ast) if first
         @lines += parts.map {|part| Line.new(Token.new(part, @ast))}
         @lines << Line.new if string.end_with?("\n")
         @line = @lines.last
@@ -208,7 +222,7 @@ module Ruby2JS
       mark = output_location
       yield
 
-      if
+      if \
         @lines.length > mark.first+1 or
         @lines[mark.first-1].join.length + @line.join.length >= @width
       then

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -18,15 +18,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)
   s.summary = "Minimal yet extensible Ruby to JavaScript conversion.".freeze
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<parser>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<parser>.freeze, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<parser>.freeze, [">= 0"])
-  end
+  s.add_dependency('parser')
+  s.add_dependency('regexp_parser')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-09 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: regexp_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
       The base package maps Ruby syntax to JavaScript semantics.
       Filters may be provided to add Ruby-specific or framework specific
@@ -60,6 +74,7 @@ files:
 - lib/ruby2js/converter/for.rb
 - lib/ruby2js/converter/hash.rb
 - lib/ruby2js/converter/if.rb
+- lib/ruby2js/converter/import.rb
 - lib/ruby2js/converter/in.rb
 - lib/ruby2js/converter/ivar.rb
 - lib/ruby2js/converter/ivasgn.rb
@@ -86,6 +101,7 @@ files:
 - lib/ruby2js/converter/vasgn.rb
 - lib/ruby2js/converter/while.rb
 - lib/ruby2js/converter/whilepost.rb
+- lib/ruby2js/converter/xnode.rb
 - lib/ruby2js/converter/xstr.rb
 - lib/ruby2js/es2015.rb
 - lib/ruby2js/es2015/strict.rb
@@ -99,12 +115,16 @@ files:
 - lib/ruby2js/es2019/strict.rb
 - lib/ruby2js/es2020.rb
 - lib/ruby2js/es2020/strict.rb
+- lib/ruby2js/es2021.rb
+- lib/ruby2js/es2021/strict.rb
 - lib/ruby2js/execjs.rb
 - lib/ruby2js/filter.rb
 - lib/ruby2js/filter/camelCase.rb
 - lib/ruby2js/filter/cjs.rb
+- lib/ruby2js/filter/esm.rb
 - lib/ruby2js/filter/functions.rb
 - lib/ruby2js/filter/jquery.rb
+- lib/ruby2js/filter/matchAll.rb
 - lib/ruby2js/filter/minitest-jasmine.rb
 - lib/ruby2js/filter/node.rb
 - lib/ruby2js/filter/nokogiri.rb
@@ -114,6 +134,7 @@ files:
 - lib/ruby2js/filter/rubyjs.rb
 - lib/ruby2js/filter/underscore.rb
 - lib/ruby2js/filter/vue.rb
+- lib/ruby2js/filter/wunderbar.rb
 - lib/ruby2js/haml.rb
 - lib/ruby2js/rails.rb
 - lib/ruby2js/serializer.rb
@@ -140,8 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Minimal yet extensible Ruby to JavaScript conversion.