ruby2js 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46b6cba0b33ebf62cb966def9b680eda35f5e84ff0c3adaea058fc2aae242269
-  data.tar.gz: 6c5843992eccd24e8460b16f805eab16701d70d85e8ef4dcaffee948243666c0
+  metadata.gz: 6b96695d82101133b8d791e19d0f04fa5c6c56c16bb6504b447cf26e0e1291db
+  data.tar.gz: 9a7711f281076e14e354bcab9fd8f96de5b884153360a9b5fdb57b6fa9c5a792
 SHA512:
-  metadata.gz: 6910f39474f2c22c321b91ad742ab10f7fff08bc5408e53f9b4d0cdee4f4fead414519a1b31bf7e6f781dc31da71fbda55bc747132c0d78e8eeb62a8693ca419
-  data.tar.gz: 07b1ddbff32682c2ea3fa65570e40f97907eea4765d00ea4b7921bca5156f83f8f855178ab13ed3fc70b9edb8035fc801cdb4031c6f8176e044699099ac7dccd
+  metadata.gz: f64daa6dad4b3ed8d475654e588a8f921782fc11aceecb01886b8c039139bdc716f863eb25f57c119410da1a180273cbf9f66992da0555ce66b1131c31deab44
+  data.tar.gz: f5ffccf5acc15710797fc566ba89730f34d5884492892d4972fa9d4ad6ef785e1875bd4e3ffb25a9cb0148d77c4501aed8ea21e3f1171c55c5ca13104c274f56

data/lib/ruby2js/converter/class.rb

@@ -59,7 +59,7 @@ module Ruby2JS
           m = m.updated(:def, m.children[1..-1])
         end
 
-        node = if m.type == :def or m.type == :defm
+        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
@@ -90,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] =>

data/lib/ruby2js/converter/taglit.rb

@@ -10,8 +10,12 @@ module Ruby2JS
         # disable autobinding in tag literals
         save_autobind, @autobind = @autobind, false
       
-        put tag.children.first
-        parse_all(*children, join: '')
+        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

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/lit-element.rb

@@ -22,10 +22,19 @@ module Ruby2JS
 
       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)
@@ -66,9 +75,9 @@ module Ruby2JS
 
         # render of a string is converted to a taglit :html
         render = nodes.find_index {|child| 
-          child.type == :def and child.children.first == :render
+          child&.type == :def and child.children.first == :render
         }
-        if render and %i[str dstr].include?(nodes[render].children[2].type)
+        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]))])
@@ -76,9 +85,9 @@ module Ruby2JS
 
         # 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]
+          child&.type == :defs and child.children[0..1] == [s(:self), :styles]
         }
-        if styles and %i[str dstr].include?(nodes[styles].children[3].type)
+        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
@@ -100,13 +109,13 @@ module Ruby2JS
 
         # insert super calls into initializer
         initialize = nodes.find_index {|child| 
-          child.type == :def and child.children.first == :initialize
+          child&.type == :def and child.children.first == :initialize
         }
         if initialize and nodes[initialize].children.length == 3
-          statements = nodes[initialize].children[2].children
+          statements = nodes[initialize].children[2..-1]
 
-          if statements.length == 1 and statements.children.first.type == :begin
-            statements = statements.children 
+          if statements.length == 1 and statements.first.type == :begin
+            statements = statements.first.children 
           end
 
           unless statements.any? {|statement| %i[super zuper].include?  statement.type}
@@ -174,13 +183,18 @@ module Ruby2JS
       # analyze ivar usage
       def le_walk(node)
         node.children.each do |child|
-          next unless Parser::AST::Node === child
-          le_walk(child)
+          next unless child.is_a? Parser::AST::Node
 
           if child.type == :ivar
             @le_props[child.children.first] ||= nil
-          elsif child.type == :ivasgn
-            @le_props[child.children.first] = case child.children.last.type
+          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
@@ -190,8 +204,10 @@ module Ruby2JS
               when :true, :false
                 :Boolean
               else
-                @le_props[child.children.first] || :Object
+                @le_props[prop] || :Object
             end
+          else
+            le_walk(child)
           end
         end
       end

data/lib/ruby2js/filter/react.rb

@@ -31,7 +31,8 @@ module Ruby2JS
         Preact: s(:import,
           [s(:pair, s(:sym, :as), s(:const, nil, :Preact)),
             s(:pair, s(:sym, :from), s(:str, "preact"))],
-            s(:str, '*'))
+            s(:str, '*')),
+        PreactHook: s(:import, ["preact/hooks"], [s(:attr, nil, :useState)])
       }
 
       # the following command can be used to generate ReactAttrs:
@@ -75,7 +76,7 @@ module Ruby2JS
 
       ReactLifecycle = %w(render componentDidMount shouldComponentUpdate
       getShapshotBeforeUpdate componentDidUpdate componentWillUnmount
-      componentDidCatch)
+      componentDidCatch componentWillReceiveProps)
 
       ReactAttrMap = Hash[ReactAttrs.map {|name| [name.downcase, name]}]
       ReactAttrMap['for'] = 'htmlFor'
@@ -91,6 +92,7 @@ module Ruby2JS
         @reactApply = nil
         @reactBlock = nil
         @reactClass = nil
+        @reactMethod = nil
         @react_props = []
         @react_methods = []
         @react_filter_functions = false
@@ -181,8 +183,8 @@ module Ruby2JS
             if not createClass
               pairs << child
             elsif child.is_method?
-              statics << s(:pair, s(:sym, mname), process(child.updated(:block,
-                [s(:send, nil, :proc), args, s(:autoreturn, *block)])))
+              statics << s(:pair, s(:sym, mname), child.updated(:block,
+                [s(:send, nil, :proc), args, s(:autoreturn, *block)]))
             elsif \
               block.length == 1 and
               Converter::EXPRESSIONS.include? block.first.type
@@ -240,6 +242,46 @@ module Ruby2JS
             pairs << s(:pair, s(:sym, :statics), s(:hash, *statics))
           end
 
+          # determine if this class can be emitted as a hook
+          hook = (es2015 and inheritance.children.first == nil)
+          hookinit = nil
+          useState = []
+          body.each_with_index do |statement, index|
+            if statement.type == :def
+              method = statement.children.first
+              if method == :initialize
+                children = statement.children[2..-1]
+                children.pop unless children.last
+                while children.length == 1 and children.first.type == :begin
+                  children = children.first.children 
+                end
+                hookinit = index if children.any? {|child| child.type != :ivasgn}
+              elsif method == :render
+                nil
+              elsif ReactLifecycle.include? method.to_s
+                hook = false
+              elsif not statement.is_method?
+                hook = false
+              elsif method.to_s.end_with? '='
+                hook = false
+              end
+            elsif statement.type == :defs
+              hook = false
+            end
+          end
+
+          if hook
+            @reactClass = :hook
+            @react_props = []
+            @react_methods = []
+
+            if hookinit
+              body = body.dup
+              hookinit = body.delete_at(hookinit)
+              pairs.unshift process hookinit.children[2]
+            end
+          end
+
           # create a default getInitialState method if there is no such method
           # and there are either references to instance variables or there are
           # methods that need to be bound.
@@ -251,6 +293,12 @@ module Ruby2JS
           then
             @reactIvars = {pre: [], post: [], asgn: [], ref: [], cond: []}
             react_walk(node)
+
+            if hook
+              react_walk(hookinit) if hookinit
+              useState = (@reactIvars[:asgn] + @reactIvars[:ref]).uniq
+            end
+
             if createClass and not @reactIvars.values.flatten.empty?
               body = [s(:def, :getInitialState, s(:args),
                 s(:return, s(:hash))), *body]
@@ -263,13 +311,18 @@ module Ruby2JS
           body.select {|child| child.type == :def}.each do |child|
             mname, args, *block = child.children
             @reactMethod = mname
-            @reactProps = child.updated(:attr, [s(:self), :props])
+
+            if @reactClass == :hook
+              @reactProps = s(:lvar, :"prop$")
+            else
+              @reactProps = child.updated(:attr, [s(:self), :props])
+            end
 
             # analyze ivar usage
             @reactIvars = {pre: [], post: [], asgn: [], ref: [], cond: []}
             react_walk(child) unless mname == :initialize
-            @reactIvars[:capture] =
-              (@reactIvars[:pre] + @reactIvars[:post]).uniq
+            @reactIvars[:capture] = (@reactIvars[:pre] + @reactIvars[:post]).uniq
+            @reactIvars[:pre] = @reactIvars[:post] = [] if @reactClass == :hook
 
             if mname == :initialize
               mname = createClass ? :getInitialState : :initialize 
@@ -400,6 +453,52 @@ module Ruby2JS
             # emit a createClass statement
             node.updated(:casgn, [nil, cname.children.last,
               s(:send, s(:const, nil, :React), :createClass, s(:hash, *pairs))])
+          elsif hook
+            initialize = pairs.find_index {|node| node.type == :def and node.children.first == :initialize}
+
+            hash = {}
+            if initialize
+              hash = pairs.delete_at(initialize)
+              hash = hash.children.last while %i(def begin send).include? hash&.type
+              hash = s(:hash) unless hash&.type == :hash
+              hash = hash.children.map {|pair|
+                [pair.children.first.children.first, pair.children.last]
+              }.to_h
+            end 
+
+            useState.each do |symbol|
+              hash[symbol.to_s[1..-1]] ||= s(:nil)
+            end
+
+            hash.sort.reverse.each do |var, value|
+              if @react == :Preact 
+                hooker = nil
+                prepend_list << REACT_IMPORTS[:PreactHook] if modules_enabled?
+              else
+                hooker = s(:const, nil, :React)
+              end
+
+              setter = 'set' + var[0].upcase + var[1..-1]
+              pairs.unshift(s(:masgn, s(:mlhs, s(:lvasgn, var), 
+                s(:lvasgn, setter)), s(:send, hooker, :useState, value)))
+            end
+
+            render = pairs.find_index {|node| node.type == :defm and node.children.first == :render}
+            if render
+              render = pairs.delete_at(render)
+              pairs.push s(:autoreturn, render.children.last)
+            end
+
+            has_cvar = lambda {|list|
+              list.any? {|node|
+                next unless Parser::AST::Node === node
+                return true if node.type == :cvar
+                has_cvar.call(node.children)
+              }
+            }
+            args = has_cvar[node.children] ? s(:args, s(:arg, 'prop$')) : s(:args)
+
+            node.updated(:def, [cname.children.last, args, s(:begin, *pairs)])
           else
             # emit a class that extends React.Component
             node.updated(:class, [s(:const, nil, cname.children.last),
@@ -1068,13 +1167,17 @@ module Ruby2JS
       # convert global variables to refs
       def on_gvar(node)
         return super unless @reactClass
+        return super if @reactClass == :hook
         s(:attr, s(:attr, s(:self), :refs), node.children.first.to_s[1..-1])
       end
 
       # convert instance variables to state
       def on_ivar(node)
         return super unless @reactClass
-        if @reactMethod and @reactIvars[:capture].include? node.children.first
+
+        if @reactClass == :hook
+          node.updated(:lvar, [node.children.first.to_s[1..-1]])
+        elsif @reactMethod and @reactIvars[:capture].include? node.children.first
           node.updated(:lvar, ["$#{node.children.first[1..-1]}"])
         else
           node.updated(:attr, [s(:attr, s(:self), :state),
@@ -1086,6 +1189,12 @@ module Ruby2JS
       def on_ivasgn(node)
         return super unless @react
 
+        if @reactClass == :hook
+          var = node.children.first.to_s[1..-1]
+          return node.updated(:send, [nil, 'set' + var[0].upcase + var[1..-1],
+            process(node.children.last)])
+        end
+
         if @reactMethod and @reactIvars[:capture].include? node.children.first
           ivar = node.children.first.to_s
           if @reactBlock
@@ -1142,7 +1251,11 @@ module Ruby2JS
         return super unless @react
         return super unless node.children.first.type == :ivasgn
         var = node.children.first.children.first
-        if @reactMethod and @reactIvars[:capture].include? var
+        if @reactClass == :hook
+          var = node.children.first.children.first.to_s[1..-1]
+          node.updated(:send, [nil, 'set' + var[0].upcase + var[1..-1],
+            s(:send, s(:lvar, var), *node.children[1..-1])])
+        elsif @reactMethod and @reactIvars[:capture].include? var
           if @reactBlock
             s(:send, s(:self), :setState, s(:hash, s(:pair,
               s(:str, var[1..-1]), process(s(node.type,
@@ -1330,6 +1443,7 @@ module Ruby2JS
           @reactIvars = {pre: [], post: [], asgn: [], ref: [], cond: []}
           react_walk(node.children.last)
           @reactIvars[:capture] = (@reactIvars[:pre] + @reactIvars[:post]).uniq
+          @reactIvars[:pre] = @reactIvars[:post] = [] if @reactClass == :hook
           node = super
           block = react_process_ivars([node.children.last.dup])
           node.updated(nil, [*node.children[0..-2], s(:begin, *block)])

data/lib/ruby2js/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Sam Ruby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser