ruby2js 3.1.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c818d7a2fb520e13fea6b323e1c0b0fc1feb696d4fc4acdd2eff72a5de29ca22
-  data.tar.gz: 161e0c26b4f648c85522dc6f54d5802b3feae071427790f20df9354ef742a49c
+  metadata.gz: a7be3ac378426bc010a8e435f3be72cf21e2b0097f75e05c320e972df2d40de2
+  data.tar.gz: 615394a93302b09a241569996ba0186eda723fafe751ceca62dc4521d0bf3b56
 SHA512:
-  metadata.gz: 575f68cebfd725c1d43b3eb0ee2aea8174b867b42839b5c1ec237999fdf68a2be6251a4130fb6a4a438597c55e874c41448ebb745eb60e311713e49c9bc4cb0c
-  data.tar.gz: a8ea6eb2cdbae3a2ac24cad9101a6496a7b2f3d7865cbda1535bfb6d034694cd618d5c3b843db49267e29cb87f7acbc1bd6552da17bfb4115a0a4f6f31151050
+  metadata.gz: 6309c00069f51a2b78f14f4fb2c7d45364449b82f74a1fc91af420bea17f5b4d112b11963a92873baa1f72b049e4d1060221f2fd59b762f3af6a780063be2eb2
+  data.tar.gz: ecbed895c7319cbce8e8faafc510a0ab64e4a0e3eb14ed9a2d31ebbef4bcd131d52e8340dbc95d9c6ecdff5dc21c919722e76d74f8f940802b3d55484b1083ae

data/README.md

@@ -92,6 +92,18 @@ Enable strict support:
 puts Ruby2JS.convert('a=1', strict: true)
 ```
 
+Emit strict equality comparisons:
+
+```ruby
+puts Ruby2JS.convert('a==1', comparison: :identity)
+```
+
+Emit nullish coalescing operators:
+
+```ruby
+puts Ruby2JS.convert('a || 1', or: :nullish)
+```
+
 With [ExecJS](https://github.com/sstephenson/execjs):
 ```ruby
 require 'ruby2js/execjs'
@@ -209,7 +221,7 @@ the script.
 
 * <a id="camelCase" href="https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/camelCase.rb">camelCase</a>
   converts `underscore_case` to `camelCase`.  See
-  [camelCase_spec](https://github.com/rubys/ruby2js/blob/master/spec/camelCase_spec.rb)
+  [camelcase_spec](https://github.com/rubys/ruby2js/blob/master/spec/camelcase_spec.rb)
   for examples.
 
 * <a id="functions" href="https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/functions.rb">functions</a>
@@ -220,9 +232,10 @@ the script.
     * `.clear` becomes `.length = 0`
     * `.delete` becomes `delete target[arg]`
     * `.downcase` becomes `.toLowerCase`
-    * `.each` becomes `for (i in ...) {}`
-    * `.each_key` becomes `Object.keys().forEach`
-    * `.each_value` becomes `for (i in ...) {}`
+    * `.each` becomes `.forEach`
+    * `.each_key` becomes `for (i in ...) {}`
+    * `.each_pair` becomes `for (var key in item) {var value = item[key]; ...}`
+    * `.each_value` becomes `.forEach`
     * `.each_with_index` becomes `.forEach`
     * `.end_with?` becomes `.slice(-arg.length) == arg`
     * `.empty?` becomes `.length == 0`
@@ -232,9 +245,10 @@ the script.
     * `.gsub` becomes `replace(//g)`
     * `.include?` becomes `.indexOf() != -1`
     * `.inspect` becomes `JSON.stringify()`
-    * `.keys` becomes `Object.keys()`
+    * `.keys()` becomes `Object.keys()`
     * `.last` becomes `[*.length-1]`
     * `.last(n)` becomes `.slice(*.length-1, *.length)`
+    * `.lstrip` becomes `.replace(/^\s+/, "")`
     * `.max` becomes `Math.max.apply(Math)`
     * `.merge` becomes `Object.assign({}, ...)`
     * `.merge!` becomes `Object.assign()`
@@ -244,6 +258,7 @@ the script.
     * `puts` becomes `console.log`
     * `.replace` becomes `.length = 0; ...push.apply(*)`
     * `.respond_to?` becomes `right in left`
+    * `.rstrip` becomes `.replace(/s+$/, "")`
     * `.scan` becomes `.match(//g)`
     * `.start_with?` becomes `.substring(0, arg.length) == arg`
     * `.upto(lim)` becomes `for (var i=num; i<=lim; i+=1)`
@@ -263,6 +278,7 @@ the script.
     * `[n...m]` becomes `.slice(n,m)`
     * `[n..m]` becomes `.slice(n,m+1)`
     * `[/r/, n]` becomes `.match(/r/)[n]`
+    * `[/r/, n]=` becomes `.replace(/r/, ...)`
     * `(1..2).each {|i| ...}` becomes `for (var i=1 i<=2; i+=1)`
     * `"string" * length` becomes `new Array(length + 1).join("string")`
     * `.sub!` and `.gsub!` become equivalent `x = x.replace` statements
@@ -280,6 +296,7 @@ the script.
     * New classes subclassed off of `Exception` will become subclassed off
       of `Error` instead; and default constructors will be provided
     * `loop do...end` will be replaced with `while (true) {...}`
+    * `raise Exception.new(...)` will be replaced with `throw new Error(...)`
 
     Additionally, there is one mapping that will only be done if explicitly
     <a href="https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter.rb">included</a>:
@@ -515,6 +532,16 @@ the script.
     * maps `export default async proc` to `module.exports = async`
     * maps `export default` to `module.exports =`
 
+* <a id="matchAll" href="https://github.com/rubys/ruby2js/blob/master/spec/matchAll">matchAll</a>
+
+    For ES level < 2020:
+
+    * maps `str.matchAll(pattern).forEach {}` to 
+      `while (match = pattern.exec(str)) {}`
+
+    Note `pattern` must be a simple variable with a value of a regular
+    expression with the `g` flag set at runtime.
+
 [Wunderbar](https://github.com/rubys/wunderbar) includes additional demos:
 
 * [chat](https://github.com/rubys/wunderbar/blob/master/demo/chat.rb),
@@ -536,7 +563,7 @@ conversions are made:
 * `def f(a, (foo, *bar))` becomes `function f(a, [foo, ...bar])`
 * `def a(b=1)` becomes `function a(b=1)`
 * `def a(*b)` becomes `function a(...b)`
-* `.each_key` becomes `for (i of ...) {}`
+* `.each_value` becomes `for (i of ...) {}`
 * `a(*b)` becomes `a(...b)`
 * `"#{a}"` becomes <code>\`${a}\`</code>
 * `lambda {|x| x}` becomes `(x) => {return x}`
@@ -572,9 +599,11 @@ ES2017 support
 ---
 
 When option `eslevel: 2017` is provided, the following additional
-conversion is made by the `functions` filter:
+conversions are made by the `functions` filter:
 
-* `.each_entry` becomes `Object.entries().forEach`
+* `.values()` becomes `Object.values()`
+* `.entries()` becomes `Object.entries()`
+* `.each_pair {}` becomes `for (let [key, value] of Object.entries()) {}'
 
 ES2018 support
 ---
@@ -590,13 +619,14 @@ optional keyword arguments.
 ES2019 support
 ---
 
-When option `eslevel: 2018` is provided, the following additional
+When option `eslevel: 2019` is provided, the following additional
 conversion is made by the `functions` filter:
 
 * `.flatten` becomes `.flat(Infinity)`
 * `.lstrip` becomes `.trimEnd
 * `.rstrip` becomes `.trimStart
 * `a.to_h` becomes `Object.fromEntries(a)`
+* `Hash[a]` becomes `Object.fromEntries(a)`
 
 Additionally, `rescue` without a variable will map to `catch` without a
 variable.
@@ -604,11 +634,22 @@ variable.
 ES2020 support
 ---
 
-When option `eslevel: 2018` is provided, the following additional
-conversion is made:
+When option `eslevel: 2020` is provided, the following additional
+conversions are made:
 
 * `@x` becomes `this.#x`
 * `@@x` becomes `ClassName.#x`
+* `a&.b` becomes `a?.b`
+* `.scan` becomes `Array.from(str.matchAll(/.../g), s => s.slice(1))`
+
+ES2021 support
+---
+
+When option `eslevel: 2021` is provided, the following additional
+conversions are made:
+
+* `x ||= 1` becomes `x ||= 1`
+* `x &&= 1` becomes `x &&= 1`
 
 Picking a Ruby to JS mapping tool
 ---

data/lib/ruby2js.rb

@@ -94,6 +94,10 @@ module Ruby2JS
         @options[:eslevel] >= 2020
       end
 
+      def es2021
+        @options[:eslevel] >= 2021
+      end
+
       def process(node)
         ast, @ast = @ast, node
         replacement = super
@@ -127,6 +131,9 @@ module Ruby2JS
       def on_sendw(node); on_send(node); end
       def on_undefined?(node); on_defined?(node); end
       def on_nil(node); end
+      def on_xnode(node); end
+      def on_export(node); end
+      def on_import(node); end
 
       # provide a method so filters can call 'super'
       def on_sym(node); node; end
@@ -156,7 +163,7 @@ module Ruby2JS
 
     if Proc === source
       file,line = source.source_location
-      source = File.read(file.dup.untaint).untaint
+      source = IO.read(file)
       ast, comments = parse(source)
       comments = Parser::Source::Comment.associate(ast, comments) if ast
       ast = find_block( ast, line )
@@ -169,9 +176,12 @@ module Ruby2JS
       comments = Parser::Source::Comment.associate(ast, comments) if ast
     end
 
-    filters = options[:filters] || Filter::DEFAULTS
+    filters = (options[:filters] || Filter::DEFAULTS)
 
     unless filters.empty?
+      filters.dup.each do |filter|
+        filters = filter.reorder(filters) if filter.respond_to? :reorder
+      end
 
       filter = Filter::Processor
       filters.reverse.each do |mod|
@@ -189,6 +199,8 @@ module Ruby2JS
     ruby2js.ivars = options[:ivars]
     ruby2js.eslevel = options[:eslevel]
     ruby2js.strict = options[:strict]
+    ruby2js.comparison = options[:comparison] || :equality
+    ruby2js.or = options[:or] || :logical
     if ruby2js.binding and not ruby2js.ivars
       ruby2js.ivars = ruby2js.binding.eval \
         'Hash[instance_variables.map {|var| [var, instance_variable_get(var)]}]'

data/lib/ruby2js/converter.rb

@@ -28,7 +28,7 @@ module Ruby2JS
       :=== => :'!=='
     }
 
-    GROUP_OPERATORS = [:begin, :dstr, :dsym, :and, :or, :casgn]
+    GROUP_OPERATORS = [:begin, :dstr, :dsym, :and, :or, :casgn, :if]
 
     VASGN = [:cvasgn, :ivasgn, :gvasgn, :lvasgn]
 
@@ -57,9 +57,12 @@ module Ruby2JS
       @prototype = nil
       @class_parent = nil
       @class_name = nil
+      @jsx = false
 
       @eslevel = :es5
       @strict = false
+      @comparison = :equality
+      @or = :logical
     end
 
     def width=(width)
@@ -124,7 +127,7 @@ module Ruby2JS
       Parser::AST::Node.new(type, args)
     end
 
-    attr_accessor :strict, :eslevel
+    attr_accessor :strict, :eslevel, :comparison, :or
 
     def es2015
       @eslevel >= 2015
@@ -150,6 +153,10 @@ module Ruby2JS
       @eslevel >= 2020
     end
 
+    def es2021
+      @eslevel >= 2021
+    end
+
     @@handlers = []
     def self.handle(*types, &block)
       types.each do |type| 
@@ -238,7 +245,6 @@ module Ruby2JS
         if ast.loc and ast.loc.expression
           filename = ast.loc.expression.source_buffer.name
           if filename and not filename.empty?
-            filename = filename.dup.untaint
             @timestamps[filename] ||= File.mtime(filename)
           end
         end
@@ -307,6 +313,7 @@ require 'ruby2js/converter/for'
 require 'ruby2js/converter/hash'
 require 'ruby2js/converter/if'
 require 'ruby2js/converter/in'
+require 'ruby2js/converter/import'
 require 'ruby2js/converter/ivar'
 require 'ruby2js/converter/ivasgn'
 require 'ruby2js/converter/kwbegin'
@@ -333,3 +340,4 @@ require 'ruby2js/converter/vasgn'
 require 'ruby2js/converter/while'
 require 'ruby2js/converter/whilepost'
 require 'ruby2js/converter/xstr'
+require 'ruby2js/converter/xnode'

data/lib/ruby2js/converter/args.rb

@@ -41,7 +41,7 @@ module Ruby2JS
     end
 
     handle :mlhs do |*args|
-      if es2015
+      if es2015 or @jsx
         put '['
         parse_all(*args, join: ', ')
         put ']'

data/lib/ruby2js/converter/block.rb

@@ -9,7 +9,7 @@ module Ruby2JS
 
     handle :block do |call, args, block|
 
-      if
+      if \
         @state == :statement and args.children.length == 1 and
         call.children.first and call.children.first.type == :begin and
         call.children[1] == :step and
@@ -42,7 +42,7 @@ module Ruby2JS
           @vars = vars if es2015
         end
 
-      elsif
+      elsif \
         call.children[0] == nil and call.children[1] == :function and
         call.children[2..-1].all? do |child|
           child.type == :lvar or (child.type == :send and

data/lib/ruby2js/converter/class.rb

@@ -37,7 +37,7 @@ module Ruby2JS
       body.compact!
       visible = {}
       body.map! do |m| 
-        if 
+        if \
           @ast.type == :class_module and m.type == :defs and
           m.children.first == s(:self)
         then
@@ -196,7 +196,8 @@ module Ruby2JS
 
       if inheritance
         body.unshift s(:send, name, :prototype=, 
-          s(:send, s(:const, nil, :Object), :create, inheritance)),
+          s(:send, s(:const, nil, :Object), :create,
+            s(:attr, inheritance, :prototype))),
           s(:send, s(:attr, name, :prototype), :constructor=, name)
       else
         body.compact!
@@ -217,7 +218,7 @@ module Ruby2JS
         end
 
         # collapse sequence to a single assignment
-        if 
+        if \
           @ast.type != :class_extend and
           (methods > 1 or (methods == 1 and body[start].type == :prop))
         then

data/lib/ruby2js/converter/class2.rb

@@ -56,10 +56,30 @@ module Ruby2JS
           # find ivars and cvars
           walk = proc do |ast|
             ivars << ast.children.first if ast.type === :ivar
+            ivars << ast.children.first if ast.type === :ivasgn
             cvars << ast.children.first if ast.type === :cvar
+            cvars << ast.children.first if ast.type === :cvasgn
+
             ast.children.each do |child|
               walk[child] if child.is_a? Parser::AST::Node
             end
+
+	    if ast.type == :send and ast.children.first == nil
+	      if ast.children[1] == :attr_accessor
+		ast.children[2..-1].each_with_index do |child_sym, index2|
+		  ivars << :"@#{child_sym.children.first}"
+		end
+	      elsif ast.children[1] == :attr_reader
+		ast.children[2..-1].each_with_index do |child_sym, index2|
+		  ivars << :"@#{child_sym.children.first}"
+		end
+	      elsif ast.children[1] == :attr_writer
+		ast.children[2..-1].each_with_index do |child_sym, index2|
+		  ivars << :"@#{child_sym.children.first}"
+		end
+	      end
+	    end
+
           end
           walk[@ast]
 
@@ -77,7 +97,7 @@ module Ruby2JS
           cvars.to_a.sort.each do |cvar|
             put(index == 0 ? @nl : @sep)
             index += 1
-            put 'static #' + cvar.to_s[2..-1]
+            put 'static #$' + cvar.to_s[2..-1]
           end
 
           while constructor.length > 0 and constructor.first.type == :ivasgn
@@ -131,7 +151,7 @@ module Ruby2JS
                 next
               end
 
-              m = m.updated(m.type, [@prop, m.children[1], *constructor])
+              m = m.updated(m.type, [@prop, m.children[1], s(:begin, *constructor)])
             elsif not m.is_method?
               @prop = "get #{@prop}"
               m = m.updated(m.type, [*m.children[0..1], 
@@ -147,12 +167,13 @@ module Ruby2JS
 
             begin
               @instance_method = m
+              @class_method = nil
               parse m # unless skipped
             ensure
               @instance_method = nil
             end
 
-          elsif 
+          elsif \
             [:defs, :asyncs].include? m.type and m.children.first.type == :self
           then
 
@@ -172,27 +193,35 @@ module Ruby2JS
             @prop.sub! 'static', 'static async' if m.type == :asyncs
 
             m = m.updated(:def, m.children[1..3])
-            parse m
+            begin
+              @instance_method = nil
+              @class_method = m
+              parse m # unless skipped
+            ensure
+              @instance_method = nil
+            end
 
           elsif m.type == :send and m.children.first == nil
+            p = es2020 ? '#' : '_'
+
             if m.children[1] == :attr_accessor
               m.children[2..-1].each_with_index do |child_sym, index2|
                 put @sep unless index2 == 0
                 var = child_sym.children.first
-                put "get #{var}() {#{@nl}return this._#{var}#@nl}#@sep"
-                put "set #{var}(#{var}) {#{@nl}this._#{var} = #{var}#@nl}"
+                put "get #{var}() {#{@nl}return this.#{p}#{var}#@nl}#@sep"
+                put "set #{var}(#{var}) {#{@nl}this.#{p}#{var} = #{var}#@nl}"
               end
             elsif m.children[1] == :attr_reader
               m.children[2..-1].each_with_index do |child_sym, index2|
                 put @sep unless index2 == 0
                 var = child_sym.children.first
-                put "get #{var}() {#{@nl}return this._#{var}#@nl}"
+                put "get #{var}() {#{@nl}return this.#{p}#{var}#@nl}"
               end
             elsif m.children[1] == :attr_writer
               m.children[2..-1].each_with_index do |child_sym, index2|
                 put @sep unless index2 == 0
                 var = child_sym.children.first
-                put "set #{var}(#{var}) {#{@nl}this._#{var} = #{var}#@nl}"
+                put "set #{var}(#{var}) {#{@nl}this.#{p}#{var} = #{var}#@nl}"
               end
             elsif [:private, :protected, :public].include? m.children[1]
               raise Error.new("class #{m.children[1]} is not supported", @ast)
@@ -208,7 +237,7 @@ module Ruby2JS
 
           else
             if m.type == :cvasgn and es2020
-              put 'static #'; put m.children[0].to_s[2..-1]; put ' = '
+              put 'static #$'; put m.children[0].to_s[2..-1]; put ' = '
               parse m.children[1]
             else
               skipped = true

data/lib/ruby2js/converter/cvar.rb

@@ -4,7 +4,7 @@ module Ruby2JS
     # (cvar :@@a)
 
     handle :cvar do |var|
-      prefix = es2020 ? '#' : '_'
+      prefix = es2020 ? '#$' : '_'
 
       @class_name ||= nil
       if @class_name