ruby2js 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b77ba98b59e2dd3f500c4fa6c4974d6a082757becd31eb47efa841b51513ec28
-  data.tar.gz: 3a868aa5a10b6562ad156c47bec44aed4060338f6aa747e90298dd890ae3095f
+  metadata.gz: 46b6cba0b33ebf62cb966def9b680eda35f5e84ff0c3adaea058fc2aae242269
+  data.tar.gz: 6c5843992eccd24e8460b16f805eab16701d70d85e8ef4dcaffee948243666c0
 SHA512:
-  metadata.gz: 2837170756fe4b6ca1f369d1dfe10c2ee6613f0572d54104354fb10df0b2f57dbe38c1dc4a44fa53f093af26bc6b826897144fbd5c5f0f6029885898878ff581
-  data.tar.gz: 97b02c3f49d12c7eb6f84e5a504e6b5210f04bf4450f8923ee38927714aa749968839b67ac2ad04f508f7a4cc34010eab06ad4b3cc408415390107bc1a04d623
+  metadata.gz: 6910f39474f2c22c321b91ad742ab10f7fff08bc5408e53f9b4d0cdee4f4fead414519a1b31bf7e6f781dc31da71fbda55bc747132c0d78e8eeb62a8693ca419
+  data.tar.gz: 07b1ddbff32682c2ea3fa65570e40f97907eea4765d00ea4b7921bca5156f83f8f855178ab13ed3fc70b9edb8035fc801cdb4031c6f8176e044699099ac7dccd

data/README.md

@@ -3,7 +3,6 @@ Ruby2JS
 
 Minimal yet extensible Ruby to JavaScript conversion.  
 
-[![Build Status](https://travis-ci.org/rubys/ruby2js.svg)](https://travis-ci.org/rubys/ruby2js)
 [![Gem Version](https://badge.fury.io/rb/ruby2js.svg)](https://badge.fury.io/rb/ruby2js)
 [![Gitter](https://badges.gitter.im/ruby2js/community.svg)](https://gitter.im/ruby2js/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 

data/lib/ruby2js.rb

@@ -92,6 +92,17 @@ module Ruby2JS
         include_only(options[:include_only]) if options[:include_only]
         include(options[:include]) if options[:include]
         exclude(options[:exclude]) if options[:exclude]
+
+        filters = options[:filters] || DEFAULTS
+        @modules_enabled =
+          (defined? Ruby2JS::Filter::ESM and
+          filters.include? Ruby2JS::Filter::ESM) or
+          (defined? Ruby2JS::Filter::CJS and
+          filters.include? Ruby2JS::Filter::CJS)
+      end
+
+      def modules_enabled?
+        @modules_enabled
       end
 
       def es2015
@@ -169,7 +180,7 @@ module Ruby2JS
       def on_xnode(node); end
       def on_export(node); end
       def on_import(node); end
-      def on_taglit(node); end
+      def on_taglit(node); on_pair(node); end
 
       # provide a method so filters can call 'super'
       def on_sym(node); node; end
@@ -279,7 +290,7 @@ module Ruby2JS
   
   def self.parse(source, file=nil, line=1)
     buffer = Parser::Source::Buffer.new(file, line)
-    buffer.source = source.encode('utf-8')
+    buffer.source = source.encode('UTF-8')
     parser = Parser::CurrentRuby.new
     parser.diagnostics.all_errors_are_fatal = true
     parser.diagnostics.consumer = lambda {|diagnostic| nil}

data/lib/ruby2js/converter.rb

@@ -60,12 +60,14 @@ module Ruby2JS
       @class_parent = nil
       @class_name = nil
       @jsx = false
+      @autobind = true
 
       @eslevel = :es5
       @strict = false
       @comparison = :equality
       @or = :logical
       @underscored_private = true
+      @redoable = false
     end
 
     def width=(width)
@@ -243,6 +245,34 @@ module Ruby2JS
       end
     end
 
+    def redoable(block)
+      save_redoable = @redoable
+
+      has_redo = proc do |node|
+        node.children.any? do |child|
+          next false unless child.is_a? Parser::AST::Node
+          next true if child.type == :redo
+          next false if %i[for while while_post until until_post].include? child.type
+          has_redo[child]
+        end
+      end
+
+      @redoable = has_redo[@ast]
+
+      if @redoable
+        put es2015 ? 'let ' : 'var '
+        put "redo$#@sep"
+        puts 'do {'
+        put "redo$ = false#@sep"
+        scope block
+        put "#@nl} while(redo$)"
+      else
+        scope block
+      end
+    ensure
+      @redoable = save_redoable
+    end
+
     def timestamp(file)
       super
 
@@ -335,6 +365,7 @@ require 'ruby2js/converter/nil'
 require 'ruby2js/converter/nthref'
 require 'ruby2js/converter/opasgn'
 require 'ruby2js/converter/prototype'
+require 'ruby2js/converter/redo'
 require 'ruby2js/converter/regexp'
 require 'ruby2js/converter/return'
 require 'ruby2js/converter/self'

data/lib/ruby2js/converter/args.rb

@@ -32,7 +32,7 @@ module Ruby2JS
           elsif kw.type == :kwoptarg
             put kw.children.first
             unless kw.children.last == s(:send, nil, :undefined)
-              put ' = '; parse kw.children.last
+              put '='; parse kw.children.last
             end
           elsif kw.type == :kwrestarg
             raise 'Rest arg requires ES2018' unless es2018

data/lib/ruby2js/converter/class.rb

@@ -36,7 +36,8 @@ module Ruby2JS
         end
 
         if inheritance
-          init = s(:def, :initialize, s(:args), s(:super))
+          parent = @namespace.find(inheritance)&.[](:constructor)
+          init = s(:def, :initialize, parent || s(:args), s(:zsuper))
         else
           init = s(:def, :initialize, s(:args), nil)
         end
@@ -58,7 +59,7 @@ module Ruby2JS
           m = m.updated(:def, m.children[1..-1])
         end
 
-        node = if m.type == :def
+        node = if m.type == :def or m.type == :defm
           if m.children.first == :initialize and !visible[:initialize]
             # constructor: remove from body and overwrite init function
             init = m
@@ -313,7 +314,7 @@ module Ruby2JS
       # prepend constructor
       if init
         constructor = init.updated(:constructor, [name, *init.children[1..-1]])
-        @comments[constructor] = @comments[init] unless @comments[init].empty?
+        visible[:constructor] = init.children[1]
 
         if @ast.type == :class_extend or extend
           if es2015
@@ -329,6 +330,7 @@ module Ruby2JS
           end
         end
 
+        @comments[constructor] = @comments[init] unless @comments[init].empty?
         body.unshift constructor
       end
 
@@ -349,7 +351,7 @@ module Ruby2JS
         self.ivars = ivars
         @class_name = class_name
         @class_parent = class_parent
-        @rbstack.pop
+        @namespace.defineProps @rbstack.pop
         @namespace.leave unless @ast.type == :class_module
       end
     end

data/lib/ruby2js/converter/class2.rb

@@ -99,7 +99,6 @@ module Ruby2JS
           end
           walk[@ast]
 
-          # process leading initializers in constructor
           while constructor.length == 1 and constructor.first.type == :begin
             constructor = constructor.first.children.dup
           end
@@ -116,6 +115,7 @@ module Ruby2JS
             put 'static #$' + cvar.to_s[2..-1]
           end
 
+          # process leading initializers in constructor
           while constructor.length > 0 and constructor.first.type == :ivasgn
             put(index == 0 ? @nl : @sep)
             index += 1
@@ -156,7 +156,7 @@ module Ruby2JS
             end
           end
 
-          if m.type == :def || m.type == :defm || m.type == :async
+          if %i[def defm deff async].include? m.type
             @prop = m.children.first
 
             if @prop == :initialize and !@rbstack.last[:initialize]
@@ -190,11 +190,11 @@ module Ruby2JS
             end
 
           elsif \
-            [:defs, :asyncs].include? m.type and m.children.first.type == :self
+            [:defs, :defp, :asyncs].include? m.type and m.children.first.type == :self
           then
 
             @prop = "static #{m.children[1]}"
-            if not m.is_method?
+            if m.type == :defp or not m.is_method?
               @prop = "static get #{m.children[1]}"
               m = m.updated(m.type, [*m.children[0..2], 
                 s(:autoreturn, m.children[3])])

data/lib/ruby2js/converter/def.rb

@@ -142,7 +142,13 @@ module Ruby2JS
         end
 
         if style == :expression
-          expr.type == :hash ? group(expr) : wrap('(', ')') { parse(expr) }
+          if expr.type == :taglit
+            parse expr
+          elsif expr.type == :hash
+            group(expr)
+          else
+            wrap('(', ')') { parse(expr) }
+          end
         elsif body.type == :begin and body.children.length == 0
           put "{}"
         else

data/lib/ruby2js/converter/dstr.rb

@@ -25,7 +25,9 @@ module Ruby2JS
         put '`'
         children.each do |child|
           if child.type == :str
-            str = child.children.first.inspect[1..-2].gsub('${', '$\{').gsub('`', '\\\`')
+            str = child.children.first.inspect[1..-2].
+              gsub('${', '$\{').gsub('`', '\\\`')
+            str = str.gsub(/\\"/, '"') unless str.include? '\\\\'
             if heredoc
               put! str.gsub("\\n", "\n")
             else

data/lib/ruby2js/converter/for.rb

@@ -28,7 +28,7 @@ module Ruby2JS
         else
           put (@ast.type==:for_of ? ' of ' : ' in '); parse expression; 
         end
-        puts ') {'; scope block; sput '}'
+        puts ') {'; redoable block; sput '}'
       ensure
         @next_token = next_token
         @vars = vars if es2015

data/lib/ruby2js/converter/next.rb

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

data/lib/ruby2js/converter/redo.rb

@@ -0,0 +1,14 @@
+module Ruby2JS
+  class Converter
+
+    # (redo)
+
+    handle :redo do
+      unless @redoable and @next_token == :continue
+        raise Error.new("redo outside of loop", @ast)
+      end
+
+      put "redo$ = true#{@sep}continue"
+    end
+  end
+end

data/lib/ruby2js/converter/return.rb

@@ -15,7 +15,7 @@ module Ruby2JS
     EXPRESSIONS = [ :array, :float, :hash, :int, :lvar, :nil, :send, :attr,
       :str, :sym, :dstr, :dsym, :cvar, :ivar, :zsuper, :super, :or, :and,
       :block, :const, :true, :false, :xnode, :taglit, :self,
-      :op_asgn, :and_asgn, :or_asgn ]
+      :op_asgn, :and_asgn, :or_asgn, :taglit, :gvar ]
 
     handle :autoreturn do |*statements|
       return if statements == [nil]

data/lib/ruby2js/converter/send.rb

@@ -153,6 +153,7 @@ module Ruby2JS
       if receiver
         if receiver.type == :autobind
           autobind = receiver = receiver.children.first
+          autobind = nil unless @autobind
         end
 
         group_receiver = receiver.type == :send &&

data/lib/ruby2js/converter/taglit.rb

@@ -6,8 +6,15 @@ module Ruby2JS
    #   (dstr)
 
     handle :taglit do |tag, *children|
-      put tag.children.first
-      parse_all(*children, join: '')
+      begin
+        # disable autobinding in tag literals
+        save_autobind, @autobind = @autobind, false
+      
+        put tag.children.first
+        parse_all(*children, join: '')
+      ensure
+        @autobind = save_autobind
+      end
     end
   end
 end

data/lib/ruby2js/converter/while.rb

@@ -22,7 +22,7 @@ module Ruby2JS
           end
         end
 
-        put 'while ('; parse condition; puts ') {'; scope block; sput '}'
+        put 'while ('; parse condition; puts ') {'; redoable block; sput '}'
       ensure
         @next_token = next_token
       end

data/lib/ruby2js/converter/whilepost.rb

@@ -11,7 +11,7 @@ module Ruby2JS
       begin
         next_token, @next_token = @next_token, :continue
 
-        puts 'do {'; scope block; sput '} while ('; parse condition; put ')'
+        puts 'do {'; redoable block; sput '} while ('; parse condition; put ')'
       ensure
         @next_token = next_token
       end

data/lib/ruby2js/filter/functions.rb

@@ -210,10 +210,10 @@ module Ruby2JS
                 s(:block, s(:send, nil, :proc), s(:args, s(:arg, :s)),
                   s(:send, s(:lvar, :s), :slice, s(:int, 1))))
             else
-              # str.match(/.../g).map(s => s.match(/.../).slice(1))
+              # (str.match(/.../g) || []).map(s => s.match(/.../).slice(1))
               s(:block, s(:send,
-                s(:send, process(target), :match, gpattern), :map),
-                s(:args, s(:arg, :s)),
+                s(:or, s(:send, process(target), :match, gpattern), s(:array)),
+                :map), s(:args, s(:arg, :s)),
                 s(:return, s(:send, s(:send, s(:lvar, :s), :match, arg),
                 :slice, s(:int, 1))))
             end
@@ -227,14 +227,19 @@ module Ruby2JS
           if before.type == :regexp
             before = before.updated(:regexp, [*before.children[0...-1],
               s(:regopt, :g, *before.children.last)])
-          elsif before.type == :str
+          elsif before.type == :str and not es2021
             before = before.updated(:regexp,
               [s(:str, Regexp.escape(before.children.first)), s(:regopt, :g)])
           end
           if after.type == :str
             after = s(:str, after.children.first.gsub(/\\(\d)/, "$\\1"))
           end
-          process node.updated nil, [target, :replace, before, after]
+
+          if es2021
+            process node.updated nil, [target, :replaceAll, before, after]
+          else
+            process node.updated nil, [target, :replace, before, after]
+          end
 
         elsif method == :ord and args.length == 0
           if target.type == :str
@@ -508,6 +513,36 @@ module Ruby2JS
         elsif method == :floor and args.length == 0
           process S(:send, s(:const, nil, :Math), :floor, target)
 
+        elsif method == :rand and target == nil
+          if args.length == 0
+            process S(:send!, s(:const, nil, :Math), :random)
+          elsif %i[irange erange].include? args.first.type
+            range = args.first
+            multiplier = s(:send, range.children.last, :-, range.children.first)
+            if range.children.all? {|child| child.type == :int}
+              multiplier = s(:int, range.children.last.children.last - range.children.first.children.last)
+              multiplier = s(:int, multiplier.children.first + 1) if range.type == :irange
+            elsif range.type == :irange
+              if multiplier.children.last.type == :int
+                diff = multiplier.children.last.children.last - 1
+                multiplier = s(:send, *multiplier.children[0..1], s(:int, diff))
+                multiplier = multiplier.children.first if diff == 0
+                multiplier = s(:send, multiplier.children[0], :+, s(:int, -diff)) if diff < 0
+              else
+                multiplier = s(:send, multiplier, :+, s(:int, 1))
+              end
+            end
+            raw = s(:send, s(:send, s(:const, nil, :Math), :random), :*, multiplier)
+            if range.children.first != s(:int, 0)
+              raw = s(:send, raw, :+, range.children.first)
+            end
+            process S(:send, nil, :parseInt, raw)
+          else
+            process S(:send, nil, :parseInt,
+              s(:send, s(:send, s(:const, nil, :Math), :random),
+              :*, args.first))
+          end
+
         elsif method == :sum and args.length == 0
           process S(:send, target, :reduce, s(:block, s(:send, nil, :proc),
             s(:args, s(:arg, :a), s(:arg, :b)),
@@ -737,10 +772,10 @@ module Ruby2JS
             body.any? {|statement| statement.type == :def and
             statement.children.first == :initialize}
           then
-            body.unshift S(:def, :initialize, s(:args, s(:arg, :message)),
-              s(:begin, S(:send, s(:self), :message=, s(:lvar, :message)),
-              S(:send, s(:self), :name=, s(:sym, name.children[1])),
-              S(:send, s(:self), :stack=, s(:send, s(:send, nil, :Error,
+            body.unshift s(:def, :initialize, s(:args, s(:arg, :message)),
+              s(:begin, s(:send, s(:self), :message=, s(:lvar, :message)),
+              s(:send, s(:self), :name=, s(:sym, name.children[1])),
+              s(:send, s(:self), :stack=, s(:attr, s(:send, nil, :Error,
               s(:lvar, :message)), :stack))))
           end
 

data/lib/ruby2js/filter/lit-element.rb

@@ -0,0 +1,202 @@
+require 'ruby2js'
+
+module Ruby2JS
+  module Filter
+    module LitElement
+      include SEXP
+      extend  SEXP
+
+      LITELEMENT_IMPORT = s(:import,
+        [s(:pair, s(:sym, :from), s(:str, "lit-element"))],
+        [s(:const, nil, :LitElement), s(:attr, nil, :css), s(:attr, nil, :html)]) 
+
+      def initialize(node)
+        super
+        @le_props = nil
+      end
+
+      def on_ivar(node)
+        return super unless @le_props&.include?(node.children.first)
+        s(:attr, s(:self), node.children.first.to_s[1..-1])
+      end
+
+      def on_ivasgn(node)
+        return super unless @le_props&.include?(node.children.first)
+        s(:send, s(:self), node.children.first.to_s[1..-1]+'=',
+          process(node.children[1]))
+      end
+
+      def on_class(node)
+        cname, inheritance, *body = node.children
+        return super unless inheritance == s(:const, nil, :LitElement)
+
+        @le_props = {}
+        le_walk(node)
+
+        prepend_list << LITELEMENT_IMPORT if modules_enabled?
+
+        nodes = body.dup
+        if nodes.length == 1 and nodes.first&.type == :begin
+          nodes = nodes.first.children.dup
+        end
+
+        # insert/update static get properties() {}
+        unless @le_props.empty?
+          values = nodes.find_index {|child| 
+            child.type == :defs and child.children[0..1] == [s(:self), :properties]
+          }
+
+          if values == nil
+            nodes.unshift s(:defp, s(:self), :properties, s(:args), s(:return, 
+              s(:hash, *@le_props.map {|name, type| s(:pair, s(:str, name.to_s[1..-1]), 
+              s(:hash, s(:pair, s(:sym, :type), s(:const, nil, type || :String))))})))
+          elsif nodes[values].children[3].type == :hash
+            le_props = @le_props.map {|name, type| 
+              [s(:sym, name.to_s[1..-1].to_sym), 
+              s(:hash, s(:pair, s(:sym, :type), s(:const, nil, type || :String)))]
+            }.to_h.merge(
+              nodes[values].children[3].children.map {|pair| pair.children}.to_h
+            )
+
+            nodes[values] = nodes[values].updated(nil,
+              [*nodes[values].children[0..2], s(:hash,
+              *le_props.map{|name, value| s(:pair, name, value)})])
+          end
+        end
+
+        # render of a string is converted to a taglit :html
+        render = nodes.find_index {|child| 
+          child.type == :def and child.children.first == :render
+        }
+        if render and %i[str dstr].include?(nodes[render].children[2].type)
+          nodes[render] = nodes[render].updated(:deff,
+            [*nodes[render].children[0..1],
+            s(:autoreturn, html_wrap(nodes[render].children[2]))])
+        end
+
+        # self.styles returning string is converted to a taglit :css
+        styles = nodes.find_index {|child| 
+          child.type == :defs and child.children[0..1] == [s(:self), :styles]
+        }
+        if styles and %i[str dstr].include?(nodes[styles].children[3].type)
+          string = nodes[styles].children[3]
+          string = s(:dstr, string) if string.type == :str
+          children = string.children.dup
+
+          while children.length > 1 and children.last.type == :str and
+            children.last.children.last.strip == ''
+            children.pop
+          end
+
+          if children.last.type == :str
+            children << s(:str, children.pop.children.first.chomp)
+          end
+
+          nodes[styles] = nodes[styles].updated(nil,
+            [*nodes[styles].children[0..2],
+            s(:autoreturn, s(:taglit, s(:sym, :css),
+            s(:dstr, *children)))])
+        end
+
+        # insert super calls into initializer
+        initialize = nodes.find_index {|child| 
+          child.type == :def and child.children.first == :initialize
+        }
+        if initialize and nodes[initialize].children.length == 3
+          statements = nodes[initialize].children[2].children
+
+          if statements.length == 1 and statements.children.first.type == :begin
+            statements = statements.children 
+          end
+
+          unless statements.any? {|statement| %i[super zuper].include?  statement.type}
+            nodes[initialize] = nodes[initialize].updated(nil,
+            [*nodes[initialize].children[0..1],
+            s(:begin, s(:zsuper), *statements)])
+          end
+        end
+
+        props = @le_props.keys.map {|prop| [prop.to_sym, s(:self)]}.to_h
+
+        nodes.unshift s(:defineProps, props)
+
+        nodes.pop unless nodes.last
+
+        node.updated(nil, [*node.children[0..1], s(:begin, *process_all(nodes))])
+      ensure
+        @le_props = nil
+      end
+
+      def html_wrap(node)
+        if node.type == :str and node.children.first.strip.start_with? '<'
+          s(:taglit, s(:sym, :html), s(:dstr, node))
+        elsif node.type == :dstr
+          prefix = ''
+          node.children.each do |child|
+            break unless child.type == :str
+            prefix += child.children.first
+          end
+
+          return node unless prefix.strip.start_with? '<'
+
+          children = node.children.map do |child|
+            if child.type == :str
+              child
+            else
+              html_wrap(child)
+            end
+          end
+
+          while children.length > 1 and children.last.type == :str and
+            children.last.children.last.strip == ''
+            children.pop
+          end
+
+          if children.last.type == :str
+            children << s(:str, children.pop.children.first.chomp)
+          end
+
+          s(:taglit, s(:sym, :html), node.updated(nil, children))
+        elsif node.type == :begin
+          node.updated(nil, node.children.map {|child| html_wrap(child)})
+        elsif node.type == :if
+          node.updated(nil, [node.children.first,
+            *node.children[1..2].map {|child| html_wrap(child)}])
+        elsif node.type == :block and
+          node.children.first.children[1] == :map
+          node.updated(nil, [*node.children[0..1],
+            html_wrap(node.children[2])])
+        else
+          node
+        end
+      end
+
+      # analyze ivar usage
+      def le_walk(node)
+        node.children.each do |child|
+          next unless Parser::AST::Node === child
+          le_walk(child)
+
+          if child.type == :ivar
+            @le_props[child.children.first] ||= nil
+          elsif child.type == :ivasgn
+            @le_props[child.children.first] = case child.children.last.type
+              when :str, :dstr
+                :String
+              when :array
+                :Array
+              when :int, :float
+                :Number
+              when :true, :false
+                :Boolean
+              else
+                @le_props[child.children.first] || :Object
+            end
+          end
+        end
+      end
+    end
+
+    DEFAULTS.push LitElement
+  end
+end