ruby2js 4.0.2 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eada6454a1374751fa61b2522291a4f7c61023ec0218ba98d7fdcb19e0067f0e
-  data.tar.gz: 4bef375ce47cef8733f0e08250dfbf4f6968e9a043aa53825d9198db3fafdd7f
+  metadata.gz: 6b96695d82101133b8d791e19d0f04fa5c6c56c16bb6504b447cf26e0e1291db
+  data.tar.gz: 9a7711f281076e14e354bcab9fd8f96de5b884153360a9b5fdb57b6fa9c5a792
 SHA512:
-  metadata.gz: 511f8917dfac3baaa45f33147430d23ea0a41e3ed2b74147d9589e1385a6f07d36aab029f47ba05f07f974c3543a7823a7c943b190e30fee2a240ce604d25d87
-  data.tar.gz: 61c8b8b5f3fbbecde1fb1bc0d23a35c13202a21467009665faba3b596607272fc1b1601f4f0156cf9d60ed80ff1e96ffa5204a1fa83b57430b729c6bc9b9b9d1
+  metadata.gz: f64daa6dad4b3ed8d475654e588a8f921782fc11aceecb01886b8c039139bdc716f863eb25f57c119410da1a180273cbf9f66992da0555ce66b1131c31deab44
+  data.tar.gz: f5ffccf5acc15710797fc566ba89730f34d5884492892d4972fa9d4ad6ef785e1875bd4e3ffb25a9cb0148d77c4501aed8ea21e3f1171c55c5ca13104c274f56

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

@@ -180,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

data/lib/ruby2js/converter.rb

@@ -60,6 +60,7 @@ module Ruby2JS
       @class_parent = nil
       @class_name = nil
       @jsx = false
+      @autobind = true
 
       @eslevel = :es5
       @strict = false

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 %i(def defm deff).include? m.type
           if m.children.first == :initialize and !visible[:initialize]
             # constructor: remove from body and overwrite init function
             init = m
@@ -89,7 +90,7 @@ module Ruby2JS
             end
           end
 
-        elsif m.type == :defs and m.children.first == s(:self)
+        elsif %i(defs defp).include? m.type and m.children.first == s(:self)
           if m.children[1] =~ /=$/
             # class property setter
             s(:prop, name, m.children[1].to_s[0..-2] =>
@@ -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/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,19 @@ 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
+      
+        if es2015
+          put tag.children.first
+          parse_all(*children, join: '')
+        else
+          parse @ast.updated(:send, [nil, tag.children.last, *children])
+        end
+      ensure
+        @autobind = save_autobind
+      end
     end
   end
 end

data/lib/ruby2js/filter/cjs.rb

@@ -7,6 +7,59 @@ module Ruby2JS
     module CJS
       include SEXP
 
+      def options=(options)
+        super
+        @cjs_autoexports = !@disable_autoexports && options[:autoexports]
+      end
+
+      def process(node)
+        return super unless @cjs_autoexports
+
+        list = [node]
+        while list.length == 1 and list.first.type == :begin
+          list = list.first.children.dup
+        end
+
+        replaced = []
+        list.map! do |child|
+          replacement = child
+
+          if [:module, :class].include? child.type and
+            child.children.first.type == :const and
+            child.children.first.children.first == nil \
+          then
+            replacement = s(:send, nil, :export, child)
+          elsif child.type == :casgn and child.children.first == nil
+            replacement = s(:send, nil, :export, child)
+          elsif child.type == :def
+            replacement = s(:send, nil, :export, child)
+          end
+
+          if replacement != child
+            replaced << replacement
+            @comments[replacement] = @comments[child] if @comments[child]
+          end
+
+          replacement
+        end
+
+        if replaced.length == 1 and @cjs_autoexports == :default
+          list.map! do |child|
+            if child == replaced.first
+              replacement = s(:send, nil, :export, s(:send, nil, :default,
+                *child.children[2..-1]))
+              @comments[replacement] = @comments[child] if @comments[child]
+              replacement
+            else
+              child
+            end
+          end
+        end
+
+        @cjs_autoexports = false
+        process s(:begin, *list)
+      end
+
       def on_send(node)
         return super unless node.children[1] == :export
 
@@ -23,9 +76,54 @@ module Ruby2JS
           node.updated(nil, [
             s(:attr, nil, :exports),
             assign.children[0].to_s + '=',
-            *assign.children[1..-1]
+            *process_all(assign.children[1..-1])
           ])
 
+        elsif node.children[2].type == :casgn
+          assign = node.children[2]
+          if assign.children[0] == nil
+            node.updated(nil, [
+              s(:attr, nil, :exports),
+              assign.children[1].to_s + '=',
+              *process_all(assign.children[2..-1])
+            ])
+          else
+            node
+          end
+
+        elsif node.children[2].type == :class
+          assign = node.children[2]
+          if assign.children[0].children[0] != nil
+            node
+          elsif assign.children[1] == nil
+            node.updated(nil, [
+              s(:attr, nil, :exports),
+              assign.children[0].children[1].to_s + '=',
+              s(:block, s(:send, s(:const, nil, :Class), :new),
+              s(:args), *process_all(assign.children[2..-1]))
+            ])
+          else
+            node.updated(nil, [
+              s(:attr, nil, :exports),
+              assign.children[0].children[1].to_s + '=',
+              s(:block, s(:send, s(:const, nil, :Class), :new,
+              assign.children[1]), s(:args), 
+              *process_all(assign.children[2..-1]))
+            ])
+          end
+
+        elsif node.children[2].type == :module
+          assign = node.children[2]
+          if assign.children[0].children[0] != nil
+            node
+          else
+            node.updated(nil, [
+              s(:attr, nil, :exports),
+              assign.children[0].children[1].to_s + '=',
+              s(:class_module, nil, nil, *process_all(assign.children[1..-1]))
+            ])
+          end
+
         elsif \
           node.children[2].type == :send and
           node.children[2].children[0..1] == [nil, :async] and
@@ -49,7 +147,7 @@ module Ruby2JS
           node.updated(nil, [
             s(:attr, nil, :module),
             :exports=,
-            node.children[2]
+            process(node.children[2])
           ])
 
         else

data/lib/ruby2js/filter/functions.rb

@@ -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
@@ -767,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,218 @@
+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)
+        return super unless node.children.length > 1
+        s(:send, s(:self), node.children.first.to_s[1..-1]+'=',
+          process(node.children[1]))
+      end
+
+      def on_op_asgn(node)
+        return super unless node.children.first.type == :ivasgn
+        var = node.children.first.children.first
+        return super unless @le_props&.include?(var)
+        super node.updated(nil, [s(:attr, s(:attr, nil, :this),
+          var.to_s[1..-1]), *node.children[1..-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..-1]
+
+          if statements.length == 1 and statements.first.type == :begin
+            statements = statements.first.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 child.is_a? Parser::AST::Node
+
+          if child.type == :ivar
+            @le_props[child.children.first] ||= nil
+          elsif child.type == :ivasgn || child.type == :op_asgn
+            prop = child.children.first
+            unless prop.is_a? Symbol
+              prop = prop.children.first if prop.type == :ivasgn
+              next unless prop.is_a? Symbol
+            end
+
+            @le_props[prop] = case child.children.last.type
+              when :str, :dstr
+                :String
+              when :array
+                :Array
+              when :int, :float
+                :Number
+              when :true, :false
+                :Boolean
+              else
+                @le_props[prop] || :Object
+            end
+          else
+            le_walk(child)
+          end
+        end
+      end
+    end
+
+    DEFAULTS.push LitElement
+  end
+end