ruby2js 4.1.2 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 696f01a3f2781f8821257f1d2d0ed832e45a9fbde25c2f6f9f200ced90b24dab
-  data.tar.gz: d4bc6d38fb7146b3615e621e7c86fc8e864895d377d10ecf69599fa60b7808d3
+  metadata.gz: 8f29494a95eb89f049d35d1a431e50e1ac4fb526fbe7544dff5b7c699b2aae9c
+  data.tar.gz: cd87036fc9542ce81e7dedb379ee5eb874f7ea9144096ff7f1b496b2c3bad5a3
 SHA512:
-  metadata.gz: f82772a1dc3aefde7a5acb6b7ca3b05a083dbb3e4c9bbdcf585387ae950c6d410280dfe069d0be3d5fd5e28a5eb0524f2c35ccac83c3b9789109a45e2ceb29a9
-  data.tar.gz: dffb0cd058bc9cdf28b76e99d73cb4916792bd9160ff9516994b3de2bc1b46e22c5d5be9bb772ec0f62c5947f5d73218e9d5fbd69e5e8a28b450875b92940ed7
+  metadata.gz: 574b8d730585898be4ce8506b256f90a9ed092e88edcbe5af82cf5d0f70aa7177b31486deee3b615269fe8011f0b9ac0efb38381bf6df924d04cfddcd5dda799
+  data.tar.gz: 68d618097efa0fc47509129242d84e72349dd3619b9238df83820ade29fca243d7cb19c6627d9fe5b14c64fb3fb6a5fa1d9f1cfa93bd2a5753acb84645a56fc4

data/lib/ruby2js/converter.rb

@@ -17,8 +17,8 @@ module Ruby2JS
 
     LOGICAL   = :and, :not, :or
     OPERATORS = [:[], :[]=], [:not, :!], [:**], [:*, :/, :%], [:+, :-], 
-      [:>>, :<<], [:&], [:^, :|], [:<=, :<, :>, :>=], [:==, :!=, :===, :"!=="],
-      [:and, :or]
+      [:>>, :<<], [:&], [:^, :|], [:<=, :<, :>, :>=],
+      [:==, :!=, :===, :"!==", :=~, :!~], [:and, :or]
     
     INVERT_OP = {
       :<  => :>=,

data/lib/ruby2js/converter/def.rb

@@ -169,7 +169,9 @@ module Ruby2JS
           put 'function'
         end
 
-        put '('; parse args; put ") {#{nl}"
+        put '('
+        parse s(:args, *args.children.select {|arg| arg.type != :shadowarg})
+        put ") {#{nl}"
 
         next_token, @next_token = @next_token, :return
         @block_depth += 1 if @block_depth

data/lib/ruby2js/converter/logical.rb

@@ -69,16 +69,16 @@ module Ruby2JS
         left = rewrite(*left.children)
       end
 
-      if right.type != :send
+      if right.type != :send or OPERATORS.flatten.include? right.children[1]
         s(:and, left, right)
       elsif conditionally_equals(left, right.children.first)
         # a && a.b => a&.b
-        right.updated(:csend, [left, right.children.last])
+        right.updated(:csend, [left, *right.children[1..-1]])
       elsif conditionally_equals(left.children.last, right.children.first)
         # a && b && b.c => a && b&.c
         left.updated(:and, [left.children.first,
           left.children.last.updated(:csend, 
-          [left.children.last, right.children.last])])
+          [left.children.last, *right.children[1..-1]])])
       else
         s(:and, left, right)
       end

data/lib/ruby2js/converter/send.rb

@@ -323,13 +323,13 @@ module Ruby2JS
         put 'typeof '; parse args.first
 
       elsif ast.children[1] == :is_a? and receiver and args.length == 1
-        parse receiver; put ' instanceof '; parse args.first
+        put '('; parse receiver; put ' instanceof '; parse args.first; put ')'
 
       elsif ast.children[1] == :kind_of? and receiver and args.length == 1
-        parse receiver; put ' instanceof '; parse args.first
+        put '('; parse receiver; put ' instanceof '; parse args.first; put ')'
 
       elsif ast.children[1] == :instance_of? and receiver and args.length == 1
-        parse s(:send, s(:attr, receiver, :constructor), :==, args.first)
+        put '('; parse s(:send, s(:attr, receiver, :constructor), :==, args.first); put ')'
 
       else
         if method == :bind and receiver&.type == :send

data/lib/ruby2js/filter/active_functions.rb

@@ -7,7 +7,6 @@ module Ruby2JS
 
       def on_send(node)
         target, method, *args = node.children
-        return super unless args.empty?
 
         if es2015 and method == :blank?
           create_or_update_import("blank$")
@@ -18,6 +17,15 @@ module Ruby2JS
         elsif es2015 and method == :presence
           create_or_update_import("presence$")
           process node.updated :send, [nil, "presence$", target]
+        elsif es2015 and method == :chomp
+          create_or_update_import("chomp$")
+          process node.updated :send, [nil, "chomp$", target, *args]
+        elsif es2015 and method == :delete_prefix
+          create_or_update_import("deletePrefix$")
+          process node.updated :send, [nil, "deletePrefix$", target, *args]
+        elsif es2015 and method == :delete_suffix
+          create_or_update_import("deleteSuffix$")
+          process node.updated :send, [nil, "deleteSuffix$", target, *args]
         else
           super
         end

data/lib/ruby2js/filter/camelCase.rb

@@ -14,6 +14,9 @@ module Ruby2JS
         attr_reader
         attr_writer
         method_missing
+        is_a?
+        kind_of?
+        instance_of?
       }
 
       CAPS_EXCEPTIONS = {
@@ -28,6 +31,8 @@ module Ruby2JS
       }
 
       def camelCase(symbol)
+        return symbol if ALLOWLIST.include?(symbol.to_s)
+
         should_symbolize = symbol.is_a?(Symbol)
         symbol = symbol
                   .to_s
@@ -64,7 +69,7 @@ module Ruby2JS
       def handle_generic_node(node, node_type)
         return node if node.type != node_type
 
-        if node.children[0] =~ /_.*\w$/ and !ALLOWLIST.include?(node.children[0].to_s)
+        if node.children[0] =~ /_.*[?!\w]$/ and !ALLOWLIST.include?(node.children[0].to_s)
           S(node_type , camelCase(node.children[0]), *node.children[1..-1])
         else
           node
@@ -99,6 +104,10 @@ module Ruby2JS
         handle_generic_node(super, :arg)
       end
 
+      def on_kwarg(node)
+        handle_generic_node(super, :kwarg)
+      end
+
       def on_lvasgn(node)
         handle_generic_node(super, :lvasgn)
       end
@@ -111,6 +120,14 @@ module Ruby2JS
         handle_generic_node(super, :cvasgn)
       end
 
+      def on_match_pattern(node)
+        handle_generic_node(super, :match_pattern)
+      end
+
+      def on_match_var(node)
+        handle_generic_node(super, :match_var)
+      end
+
       def on_sym(node)
         handle_generic_node(super, :sym)
       end
@@ -119,7 +136,7 @@ module Ruby2JS
         node = super
         return node if node.type != :defs
 
-        if node.children[1] =~ /_.*\w$/
+        if node.children[1] =~ /_.*[?!\w]$/
           S(:defs , node.children[0],
             camelCase(node.children[1]), *node.children[2..-1])
         else

data/lib/ruby2js/filter/functions.rb

@@ -341,7 +341,11 @@ module Ruby2JS
 
         elsif method == :last
           if node.children.length == 2
-            process on_send S(:send, target, :[], s(:int, -1))
+            if es2022
+              process S(:send, target, :at, s(:int, -1))
+            else
+              process on_send S(:send, target, :[], s(:int, -1))
+            end
           elsif node.children.length == 3
             process S(:send, target, :slice,
               s(:send, s(:attr, target, :length), :-, node.children[2]),
@@ -358,8 +362,12 @@ module Ruby2JS
           # resolve negative literal indexes
           i = proc do |index|
             if index.type == :int and index.children.first < 0
-              process S(:send, S(:attr, target, :length), :-,
-                s(:int, -index.children.first))
+              if es2022
+                return process S(:send, target, :at, index)
+              else
+                process S(:send, S(:attr, target, :length), :-,
+                  s(:int, -index.children.first))
+              end
             else
               index
             end

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

@@ -36,7 +36,7 @@ module Ruby2JS
       end
 
       def on_class(node)
-        cname, inheritance, *body = node.children
+        _, inheritance, *body = node.children
         return super unless inheritance == s(:const, nil, :LitElement)
 
         @le_props = {}

data/lib/ruby2js/filter/react.rb

@@ -1492,7 +1492,13 @@ module Ruby2JS
        source = Ruby2JS.jsx2_rb(source)
        ast =  Ruby2JS.parse(source).first
        ast = s(:block, s(:send, nil, :_), s(:args), ast) if ast.type == :begin
-       process ast
+
+       begin
+         react, @react = @react, @react || :react
+         process ast
+       ensure
+         @react = react
+       end
       end
     end
 

data/lib/ruby2js/version.rb

@@ -2,7 +2,7 @@ module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 4
     MINOR = 1
-    TINY  = 2
+    TINY  = 6
 
     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.2
+  version: 4.1.6
 platform: ruby
 authors:
 - Sam Ruby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-11 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser