ruby2js 3.4.0 → 3.6.0

data/lib/ruby2js/converter/class2.rb

@@ -9,11 +9,22 @@ module Ruby2JS
     # NOTE: this is the es2015 version of class
 
     handle :class2 do |name, inheritance, *body|
+      body.compact!
+      while body.length == 1 and body.first.type == :begin
+        body = body.first.children 
+      end
+
+      proxied = body.find do |node| 
+        node.type == :def and node.children.first == :method_missing
+      end
+
       if name.type == :const and name.children.first == nil
         put 'class '
         parse name
+        put '$' if proxied
       else
         parse name
+        put '$' if proxied
         put ' = class'
       end
 
@@ -24,11 +35,6 @@ module Ruby2JS
 
       put " {"
 
-      body.compact!
-      while body.length == 1 and body.first.type == :begin
-        body = body.first.children 
-      end
-
       begin
         class_name, @class_name = @class_name, name
         class_parent, @class_parent = @class_parent, inheritance
@@ -64,21 +70,21 @@ module Ruby2JS
               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
+            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]
@@ -299,6 +305,43 @@ module Ruby2JS
           end
         end
 
+        if proxied
+          put @sep
+
+          rename = name.updated(nil, [name.children.first, name.children.last.to_s + '$'])
+
+          if proxied.children[1].children.length == 1
+            # special case: if method_missing only has on argument, call it
+            # directly (i.e., don't pass arguments).  This enables
+            # method_missing to return instance attributes (getters) as well
+            # as bound functions (methods).
+            forward = s(:send, s(:lvar, :obj), :method_missing, s(:lvar, :prop))
+          else
+            # normal case: return a function which, when called, will call
+            # method_missing with method name and arguments.
+            forward = s(:block, s(:send, nil, :proc), s(:args, s(:restarg, :args)),
+            s(:send, s(:lvar, :obj), :method_missing, s(:lvar, :prop),
+            s(:splat, s(:lvar, :args))))
+          end
+
+          proxy = s(:return, s(:send, s(:const, nil, :Proxy), :new,
+            s(:send, rename, :new, s(:splat, s(:lvar, :args))),
+            s(:hash, s(:pair, s(:sym, :get), s(:block, s(:send, nil, :proc),
+            s(:args, s(:arg, :obj), s(:arg, :prop)),
+            s(:if, s(:in?, s(:lvar, :prop), s(:lvar, :obj)),
+            s(:return, s(:send, s(:lvar, :obj), :[], s(:lvar, :prop))),
+            s(:return, forward))))))
+          )
+
+          if name.children.first == nil
+            proxy = s(:def, name.children.last, s(:args, s(:restarg, :args)), proxy)
+          else
+            proxy = s(:defs, *name.children, s(:args, s(:restarg, :args)), proxy)
+          end
+
+          parse proxy
+        end
+
       ensure
         @class_name = class_name
         @class_parent = class_parent

data/lib/ruby2js/converter/def.rb

@@ -131,7 +131,7 @@ module Ruby2JS
           style = :statement
         end
 
-        if args.children.length == 1 and style == :expression
+        if args.children.length == 1 and args.children.first.type != :restarg and style == :expression
           parse args; put ' => '
         else
           put '('; parse args; put ') => '

data/lib/ruby2js/converter/import.rb

@@ -6,7 +6,23 @@ module Ruby2JS
     # NOTE: import is a synthetic 
 
     handle :import do |path, *args|
+      if module_type == :cjs
+        # only the subset of import syntaxes generated by filters are handled here
+        if Parser::AST::Node === args.first and args.first.type == :attr
+          return parse s(:casgn, *args.first.children, 
+            s(:send, nil, :require, s(:str, Array(path).first))), :statement
+        elsif Array === args.first and args.first.length == 1
+          target = args.first.first
+          if Parser::AST::Node === target and target.type == :attr and target.children.first == nil
+            return parse s(:casgn, *target.children, 
+              s(:attr, s(:send, nil, :require, s(:str, Array(path).first)), target.children.last)),
+              :statement
+          end
+        end
+      end
+
       put 'import '
+
       if args.length == 0
         # import "file.css"
         put path.inspect
@@ -66,7 +82,7 @@ module Ruby2JS
       elsif node.respond_to?(:type) && node.children[1] == :default
         put 'default '
         args[0] = node.children[2]
-      elsif node.respond_to?(:type) && node.type == :lvasgn
+      elsif node.respond_to?(:type) && [:lvasgn, :casgn].include?(node.type)
         if node.children[0] == :default
           put 'default '
           args[0] = node.children[1]

data/lib/ruby2js/converter/ivar.rb

@@ -16,8 +16,16 @@ module Ruby2JS
     handle :hostvalue do |value|
       case value
       when Hash
-        parse s(:hash, *value.map {|key, hvalue| s(:pair, s(:hostvalue, key), 
-          s(:hostvalue, hvalue))})
+        parse s(:hash, *value.map {|key, hvalue| 
+          case key
+          when String
+            s(:pair, s(:str, key), s(:hostvalue, hvalue))
+          when Symbol
+            s(:pair, s(:sym, key), s(:hostvalue, hvalue))
+          else
+            s(:pair, s(:hostvalue, key), s(:hostvalue, hvalue))
+          end
+        })
       when Array
         parse s(:array, *value.map {|hvalue| s(:hostvalue, hvalue)})
       when String

data/lib/ruby2js/converter/literal.rb

@@ -5,12 +5,24 @@ module Ruby2JS
     # (float 1.1)
     # (str "1"))
 
-    handle :int, :float, :str do |value|
+    handle :str do |value|
       put value.inspect
     end
 
+    handle :int, :float do |value|
+      put number_format(value)
+    end
+
     handle :octal do |value|
-      put '0' + value.to_s(8)
+      put '0' + number_format(value.to_s(8))
+    end
+
+    def number_format(number)
+      return number.to_s unless es2021
+      parts = number.to_s.split('.')
+      parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1_")
+      parts[1].gsub!(/(\d\d\d)(?=\d)/, "\\1_") if parts[1]
+      parts.join('.')
     end
   end
 end

data/lib/ruby2js/converter/send.rb

@@ -9,11 +9,12 @@ module Ruby2JS
     # (sendw nil :puts
     #   (int 1))
 
-    # Note: attr, sendw, and await are only generated by filters.  Attr forces
+    # Note: attr, sendw, send!, and await are only generated by filters.  Attr forces
     # interpretation as an attribute vs a function call with zero parameters.
+    # send! forces interpretation as a method call even with zero parameters.
     # Sendw forces parameters to be placed on separate lines.
 
-    handle :send, :sendw, :await, :attr, :call do |receiver, method, *args|
+    handle :send, :sendw, :send!, :await, :attr, :call do |receiver, method, *args|
       ast = @ast
 
       if \
@@ -280,7 +281,7 @@ module Ruby2JS
       else
         put 'await ' if @ast.type == :await
 
-        if not ast.is_method?
+        if not ast.is_method? and ast.type != :send!
           if receiver
             (group_receiver ? group(receiver) : parse(receiver))
             put ".#{ method }"

data/lib/ruby2js/converter/xstr.rb

@@ -10,7 +10,7 @@ module Ruby2JS
       if @binding
         puts @binding.eval(str).to_s
       else
-        puts eval(str).to_s
+        raise SecurityError.new('Insecure operation, eval without binding option')
       end
     end
   end

data/lib/ruby2js/filter/active_functions.rb

@@ -0,0 +1,43 @@
+require 'ruby2js'
+
+module Ruby2JS
+  module Filter
+    module ActiveFunctions
+      include SEXP
+
+      def on_send(node)
+        target, method, *args = node.children
+
+        if es2015 and method == :blank?
+          create_or_update_import("blank$")
+          process node.updated :send, [nil, "blank$", target]
+        elsif es2015 and method == :present?
+          create_or_update_import("present$")
+          process node.updated :send, [nil, "present$", target]
+        elsif es2015 and method == :presence
+          create_or_update_import("presence$")
+          process node.updated :send, [nil, "presence$", target]
+        else
+          super
+        end
+      end
+
+      private
+
+      def create_or_update_import(token)
+        af_import = @options[:import_from_skypack] ? "https://cdn.skypack.dev/@ruby2js/active-functions" : "@ruby2js/active-functions"
+
+        if found_node = prepend_list.find {|ast| ast.type == :import && ast.children.first == af_import}
+          unless found_node.children.find {|child| child == token}
+            prepend_list.delete found_node
+            prepend_list << s(:import, found_node.children.first, found_node.children.last.push(s(:const, nil, token)))
+          end
+        else
+          prepend_list << s(:import, af_import, [s(:const, nil, token)])
+        end
+      end
+    end
+
+    DEFAULTS.push ActiveFunctions
+  end
+end

data/lib/ruby2js/filter/camelCase.rb

@@ -9,8 +9,9 @@ module Ruby2JS
     module CamelCase
       include SEXP
 
-      WHITELIST = %w{
+      ALLOWLIST = %w{
         attr_accessor
+        method_missing
       }
 
       CAPS_EXCEPTIONS = {
@@ -37,7 +38,7 @@ module Ruby2JS
         node = super
         return node unless [:send, :csend, :attr].include? node.type
 
-        if node.children[0] == nil and WHITELIST.include? node.children[1].to_s
+        if node.children[0] == nil and ALLOWLIST.include? node.children[1].to_s
           node
         elsif node.children[0] && [:ivar, :cvar].include?(node.children[0].type)
           S(node.type, s(node.children[0].type, camelCase(node.children[0].children[0])),
@@ -61,7 +62,7 @@ module Ruby2JS
       def handle_generic_node(node, node_type)
         return node if node.type != node_type
 
-        if node.children[0] =~ /_.*\w$/
+        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

data/lib/ruby2js/filter/esm.rb

@@ -1,13 +1,68 @@
 require 'ruby2js'
 
+Ruby2JS.module_default = :esm
+
 module Ruby2JS
   module Filter
     module ESM
       include SEXP
 
-      def initialize(*args)
+      def options=(options)
+        super
+        @esm_autoexports = options[:autoexports] && !@disable_autoexports
+        @esm_autoimports = options[:autoimports]
+        @esm_explicit_tokens = Set.new
+      end
+
+      def process(node)
+        return super unless @esm_autoexports
+        @esm_autoexports = false
+
+        list = [node]
+        while list.length == 1 and list.first.type == :begin
+          list = list.first.children.dup
+        end
+
+        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(:export, child)
+          elsif child.type == :casgn and child.children.first == nil
+            replacement = s(:export, child)
+          elsif child.type == :def
+            replacement = s(:export, child)
+          end
+
+          if replacement != child and @comments[child]
+            @comments[replacement] = @comments[child]
+          end
+
+          replacement
+        end
+
+        process s(:begin, *list)
+      end
+
+      def on_class(node)
+        @esm_explicit_tokens << node.children.first.children.last
+
+        super
+      end
+
+      def on_def(node)
+        @esm_explicit_tokens << node.children.first
+
+        super
+      end
+
+      def on_lvasgn(node)
+        @esm_explicit_tokens << node.children.first
+
         super
-        @esm = true # signal for other filters
       end
 
       def on_send(node)
@@ -36,6 +91,8 @@ module Ruby2JS
             args[0].children[2].children[2].type == :str
             # import name from "file.js"
             #  => import name from "file.js"
+            @esm_explicit_tokens << args[0].children[1]
+
             s(:import,
               [args[0].children[2].children[2].children[0]],
               process(s(:attr, nil, args[0].children[1])))
@@ -49,17 +106,52 @@ module Ruby2JS
             #   => import Stuff as * from "file.js"
             # import [ Some, Stuff ], from: "file.js"
             #   => import { Some, Stuff } from "file.js"
-            imports = (args[0].type == :const || args[0].type == :send) ?
-              process(args[0]) : 
+            imports = if args[0].type == :const || args[0].type == :send
+              @esm_explicit_tokens << args[0].children.last
+              process(args[0])
+            else
+              args[0].children.each {|i| @esm_explicit_tokens << i.children.last}
               process_all(args[0].children)
+            end
+
             s(:import, args[1].children, imports) unless args[1].nil?
           end
         elsif method == :export          
           s(:export, *process_all(args))
+        elsif target.nil? and found_import = find_autoimport(method)
+          prepend_list << s(:import, found_import[0], found_import[1])
+          super
         else
           super
         end
       end
+
+      def on_const(node)
+        if node.children.first == nil and found_import = find_autoimport(node.children.last)
+          prepend_list << s(:import, found_import[0], found_import[1])
+        end
+
+        super
+      end
+
+      def on_export(node)
+        s(:export, *process_all(node.children))
+      end
+    end
+
+    private
+
+    def find_autoimport(token)
+      return nil if @esm_autoimports.nil?
+      return nil if @esm_explicit_tokens.include?(token)
+
+      token = camelCase(token) if respond_to?(:camelCase)
+
+      if @esm_autoimports[token]
+        [@esm_autoimports[token], s(:const, nil, token)]
+      elsif found_key = @esm_autoimports.keys.find {|key| key.is_a?(Array) && key.include?(token)}
+        [@esm_autoimports[found_key], found_key.map {|key| s(:const, nil, key)}]
+      end
     end
 
     DEFAULTS.push ESM

data/lib/ruby2js/filter/functions.rb

@@ -531,6 +531,20 @@ module Ruby2JS
         elsif method == :block_given? and target == nil and args.length == 0
           process process s(:lvar, "_implicitBlockYield")
 
+        elsif method == :abs and args.length == 0
+          process S(:send, s(:const, nil, :Math), :abs, target)
+
+        elsif method == :ceil and args.length == 0
+          process S(:send, s(:const, nil, :Math), :ceil, target)
+
+        elsif method == :floor and args.length == 0
+          process S(:send, s(:const, nil, :Math), :floor, target)
+
+        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)),
+            s(:send, s(:lvar, :a), :+, s(:lvar, :b))), s(:int, 0))
+
         else
           super
         end