ruby2js 3.3.4 → 3.5.1

data/lib/ruby2js/filter/functions.rb

@@ -528,6 +528,9 @@ module Ruby2JS
         elsif method == :new and target == s(:const, nil, :Exception)
           process S(:send, s(:const, nil, :Error), :new, *args)
 
+        elsif method == :block_given? and target == nil and args.length == 0
+          process process s(:lvar, "_implicitBlockYield")
+
         else
           super
         end
@@ -538,7 +541,7 @@ module Ruby2JS
         method = call.children[1]
         return super if excluded?(method)
 
-        if [:setInterval, :setTimeout].include? method
+        if [:setInterval, :setTimeout, :set_interval, :set_timeout].include? method
           return super unless call.children.first == nil
           block = process s(:block, s(:send, nil, :proc), *node.children[1..-1])
           on_send call.updated nil, [*call.children[0..1], block,
@@ -703,6 +706,17 @@ module Ruby2JS
           process call.updated(nil, [*call.children, s(:block,
             s(:send, nil, :proc), *node.children[1..-1])])
 
+        elsif method == :yield_self and call.children.length == 2
+          process node.updated(:send, [s(:block, s(:send, nil, :proc),
+            node.children[1], s(:autoreturn, node.children[2])),
+            :[], call.children[0]])
+
+        elsif method == :tap and call.children.length == 2
+          process node.updated(:send, [s(:block, s(:send, nil, :proc),
+            node.children[1], s(:begin, node.children[2],
+            s(:return, s(:lvar, node.children[1].children[0].children[0])))),
+            :[], call.children[0]])
+
         else
           super
         end

data/lib/ruby2js/filter/node.rb

@@ -7,7 +7,7 @@ module Ruby2JS
       include SEXP
       extend SEXP
 
-      NODE_SETUP = {
+      CJS_SETUP = {
         child_process: s(:casgn, nil, :child_process, 
           s(:send, nil, :require, s(:str, "child_process"))),
         fs: s(:casgn, nil, :fs, s(:send, nil, :require, s(:str, "fs"))),
@@ -15,6 +15,13 @@ module Ruby2JS
           s(:attr, nil, :process), :argv), :slice, s(:int, 2)))
       }
 
+      ESM_SETUP = {
+        child_process: s(:import, ['child_process'],
+          s(:attr, nil, :child_process)),
+        fs: s(:import, ['fs'], s(:attr, nil, :fs)),
+        ARGV: CJS_SETUP[:ARGV]
+      }
+
       def initialize(*args)
         @node_setup = nil
         super
@@ -28,8 +35,8 @@ module Ruby2JS
         if @node_setup.empty?
           result
         else
-          s(:begin, *@node_setup.to_a.map {|token| NODE_SETUP[token]},
-            result)
+          setup = @esm ? ESM_SETUP : CJS_SETUP;
+          s(:begin, *@node_setup.to_a.map {|token| setup[token]}, result)
         end
       end
 

data/lib/ruby2js/filter/nokogiri.rb

@@ -7,11 +7,15 @@ module Ruby2JS
       include SEXP
       extend SEXP
 
-      NOKOGIRI_SETUP = {
+      CJS_SETUP = {
         jsdom: s(:casgn, nil, :JSDOM, 
           s(:attr, s(:send, nil, :require, s(:str, "jsdom")), :JSDOM))
       }
 
+      ESM_SETUP = {
+        jsdom: s(:import, ["jsdom"], [s(:attr, nil, :JSDOM)])
+      }
+
       def initialize(*args)
         @nokogiri_setup = nil
         super
@@ -25,9 +29,9 @@ module Ruby2JS
         if @nokogiri_setup.empty?
           result
         else
+          setup = @esm ? ESM_SETUP : CJS_SETUP;
           s(:begin, 
-            *@nokogiri_setup.to_a.map {|token| NOKOGIRI_SETUP[token]},
-            result)
+            *@nokogiri_setup.to_a.map {|token| setup[token]}, result)
         end
       end
 

data/lib/ruby2js/filter/require.rb

@@ -38,8 +38,6 @@ module Ruby2JS
 
             filename = File.join(dirname, basename)
 
-            segments = basename.split(/[\/\\]/)
-
             if not File.file? filename and File.file? filename+".rb"
               filename += '.rb'
             elsif not File.file? filename and File.file? filename+".js.rb"

data/lib/ruby2js/filter/return.rb

@@ -8,16 +8,20 @@ module Ruby2JS
       EXPRESSIONS = [ :array, :float, :hash, :if, :int, :lvar, :nil, :send ]
 
       def on_block(node)
-        children = process_all(node.children)
+        node = super
+        return node unless node.type == :block
+        children = node.children.dup
 
         children[-1] = s(:nil) if children.last == nil
 
-        node.updated nil, [*node.children[0..1],
+        node.updated nil, [*children[0..1],
           s(:autoreturn, *children[2..-1])]
       end
 
       def on_def(node)
-        children = process_all(node.children[1..-1])
+        node = super
+        return node unless node.type == :def
+        children = node.children[1..-1]
 
         children[-1] = s(:nil) if children.last == nil
 

data/lib/ruby2js/filter/tagged_templates.rb

@@ -0,0 +1,40 @@
+require 'ruby2js'
+
+module Ruby2JS
+  module Filter
+    module TaggedTemplates
+      include SEXP
+
+      def initialize(*args)
+        super
+      end
+
+      def on_send(node)
+        target, method, *args = node.children
+        return super unless target.nil? and es2015
+
+        tagged_methods = @options[:template_literal_tags] || [:html, :css]
+
+        if tagged_methods.include?(method) && !args.empty?
+          strnode = process args.first
+          if strnode.type == :str
+            # convert regular strings to literal strings
+            strnode = strnode.updated(:dstr, [s(:str, strnode.children.first.chomp("\n"))])
+          else
+            # for literal strings, chomp a newline off the end
+            if strnode.children.last.type == :str && strnode.children.last.children[0].end_with?("\n")
+             children = [*strnode.children.take(strnode.children.length - 1), s(:str, strnode.children.last.children[0].chomp)]
+             strnode = s(:dstr, *children)
+            end
+          end
+
+          S(:taglit, s(:sym, method), strnode)
+        else
+          super
+        end
+      end
+    end
+
+    DEFAULTS.push TaggedTemplates
+  end
+end

data/lib/ruby2js/serializer.rb

@@ -355,7 +355,7 @@ module Ruby2JS
             end
 
             split = buffer.source[0...pos].split("\n")
-            vlq row, col, source_index, split.length-1, split.last.to_s.length
+            vlq row, col, source_index, [split.length - 1, 0].max, split.last.to_s.length
           end
           col += token.length
         end

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.files = %w(ruby2js.gemspec README.md) + Dir.glob("{lib}/**/*")
   s.homepage = "http://github.com/rubys/ruby2js".freeze
   s.licenses = ["MIT".freeze]
-  s.required_ruby_version = Gem::Requirement.new(">= 2.0".freeze)
+  s.required_ruby_version = Gem::Requirement.new(">= 2.3".freeze)
   s.summary = "Minimal yet extensible Ruby to JavaScript conversion.".freeze
 
   s.add_dependency('parser')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.5.1
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -94,6 +94,7 @@ files:
 - lib/ruby2js/converter/send.rb
 - lib/ruby2js/converter/super.rb
 - lib/ruby2js/converter/sym.rb
+- lib/ruby2js/converter/taglit.rb
 - lib/ruby2js/converter/undef.rb
 - lib/ruby2js/converter/until.rb
 - lib/ruby2js/converter/untilpost.rb
@@ -103,6 +104,7 @@ files:
 - lib/ruby2js/converter/whilepost.rb
 - lib/ruby2js/converter/xnode.rb
 - lib/ruby2js/converter/xstr.rb
+- lib/ruby2js/converter/yield.rb
 - lib/ruby2js/es2015.rb
 - lib/ruby2js/es2015/strict.rb
 - lib/ruby2js/es2016.rb
@@ -122,6 +124,8 @@ files:
 - lib/ruby2js/filter/camelCase.rb
 - lib/ruby2js/filter/cjs.rb
 - lib/ruby2js/filter/esm.rb
+- lib/ruby2js/filter/esm_migration.rb
+- lib/ruby2js/filter/fast-deep-equal.rb
 - lib/ruby2js/filter/functions.rb
 - lib/ruby2js/filter/jquery.rb
 - lib/ruby2js/filter/matchAll.rb
@@ -131,7 +135,7 @@ files:
 - lib/ruby2js/filter/react.rb
 - lib/ruby2js/filter/require.rb
 - lib/ruby2js/filter/return.rb
-- lib/ruby2js/filter/rubyjs.rb
+- lib/ruby2js/filter/tagged_templates.rb
 - lib/ruby2js/filter/underscore.rb
 - lib/ruby2js/filter/vue.rb
 - lib/ruby2js/filter/wunderbar.rb
@@ -154,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/ruby2js/filter/rubyjs.rb

@@ -1,112 +0,0 @@
-require 'ruby2js'
-
-module Ruby2JS
-  module Filter
-    module RubyJS
-      include SEXP
-
-      def on_send(node)
-        # leave functional style calls alone
-        target = node.children.first
-        return super if target and [:_s, :_a, :_h, :_n, :_i, :_t].
-          include? target.children[1]
-
-        method = node.children[1]
-        return super if excluded?(method)
-
-        # leave classic ("OO") style call chains alone
-        while target and target.type == :send
-          return super if target.children[1] == :R
-          target = target.children.first
-        end
-
-        if \
-          [:capitalize, :center, :chomp, :ljust, :lstrip, :rindex, :rjust,
-            :rstrip, :scan, :swapcase, :tr].include? method
-        then
-          # map selected string functions
-          s(:send, s(:lvar, :_s), method,
-            *process_all([node.children[0], *node.children[2..-1]]))
-
-        elsif \
-          [:at, :compact, :compact!, :delete_at, :delete_at, :flatten, :insert,
-          :reverse, :reverse!, :rotate, :rotate, :rotate!, :shift, :shuffle,
-          :shuffle!, :slice, :slice!, :transpose, :union, :uniq, :uniq!]
-          .include? method
-        then
-          # map selected array functions
-          s(:send, s(:lvar, :_a), method.to_s.sub("!", '_bang'),
-            *process_all([node.children[0], *node.children[2..-1]]))
-
-
-        elsif [:strftime].include? method
-          # map selected time functions
-          s(:send, s(:lvar, :_t), method,
-            *process_all([node.children[0], *node.children[2..-1]]))
-
-        elsif method == :<=>
-          s(:send, s(:attr, s(:const, nil, :R), :Comparable), :cmp,
-            node.children[0], *node.children[2..-1])
-
-        elsif method == :between?
-          s(:send, s(:send, nil, :R, node.children[0]), :between,
-            *node.children[2..-1])
-
-        else
-          super
-        end
-      end
-
-      def on_block(node)
-        call, args, *block = node.children
-        method = call.children[1]
-        return super if excluded?(method)
-
-        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 \
-            [: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,
-            :take_while].include? method
-          then
-            block = [ s(:autoreturn, *block) ]
-          end
-
-          lvar = [:each_index, :keep_if, :select!].include?(method) ? :_a : :_e
-
-          if method == :find and call.children.length == 2
-            call = s(:send, *call.children, s(:nil))
-          elsif method == :inject and call.children.length == 3
-            call = s(:send, *call.children, s(:nil))
-          elsif method == :select!
-            call = s(:send, call.children.first, :select_bang,
-              *call.children[2..-1])
-          end
-
-          s(:block, s(:send, s(:lvar, lvar), call.children[1],
-            *process_all([call.children[0], *call.children[2..-1]])),
-            args, *block)
-        else
-          super
-        end
-      end
-
-      def on_irange(node)
-        s(:send, s(:attr, s(:const, nil, :R), :Range), :new, *node.children)
-      end
-
-      def on_erange(node)
-        s(:send, s(:attr, s(:const, nil, :R), :Range), :new, *node.children,
-          s(:true))
-      end
-    end
-
-    DEFAULTS.push RubyJS
-  end
-end