ruby2js 3.5.0 → 3.6.1

data/lib/ruby2js.rb

@@ -17,6 +17,7 @@ module Ruby2JS
 
   @@eslevel_default = 2009 # ecmascript 5
   @@strict_default = false
+  @@module_default = nil
 
   def self.eslevel_default
     @@eslevel_default
@@ -34,6 +35,14 @@ module Ruby2JS
     @@strict_default = level
   end
 
+  def self.module_default
+    @@module_default
+  end
+
+  def self.module_default=(module_type)
+    @@module_default = module_type
+  end
+
   module Filter
     DEFAULTS = []
 
@@ -52,11 +61,19 @@ module Ruby2JS
       include Ruby2JS::Filter
       BINARY_OPERATORS = Converter::OPERATORS[2..-1].flatten
 
+      attr_accessor :prepend_list, :disable_autoimports
+
       def initialize(comments)
         @comments = comments
+
+        # check if magic comment is present:
+        first_comment = @comments.values.first&.map(&:text)&.first
+        @disable_autoimports = first_comment&.include?(" autoimports: false")
+        @disable_autoexports = first_comment&.include?(" autoexports: false")
+
         @ast = nil
         @exclude_methods = []
-        @esm = false
+        @prepend_list = Set.new
       end
 
       def options=(options)
@@ -129,6 +146,7 @@ module Ruby2JS
       def on_method(node); on_send(node); end
       def on_prop(node); on_array(node); end
       def on_prototype(node); on_begin(node); end
+      def on_send!(node); on_send(node); end
       def on_sendw(node); on_send(node); end
       def on_undefined?(node); on_defined?(node); end
       def on_nil(node); end
@@ -162,6 +180,7 @@ module Ruby2JS
   def self.convert(source, options={})
     options[:eslevel] ||= @@eslevel_default
     options[:strict] = @@strict_default if options[:strict] == nil
+    options[:module] ||= @@module_default || :esm
 
     if Proc === source
       file,line = source.source_location
@@ -175,7 +194,7 @@ module Ruby2JS
       source = ast.loc.expression.source_buffer.source
     else
       ast, comments = parse( source, options[:file] )
-      comments = Parser::Source::Comment.associate(ast, comments) if ast
+      comments = ast ? Parser::Source::Comment.associate(ast, comments) : {}
     end
 
     filters = (options[:filters] || Filter::DEFAULTS)
@@ -193,6 +212,12 @@ module Ruby2JS
 
       filter.options = options
       ast = filter.process(ast)
+
+      unless filter.prepend_list.empty?
+        prepend = filter.prepend_list.sort_by {|ast| ast.type == :import ? 0 : 1}
+        prepend.reject! {|ast| ast.type == :import} if filter.disable_autoimports
+        ast = Parser::AST::Node.new(:begin, [*prepend, ast])
+      end
     end
 
     ruby2js = Ruby2JS::Converter.new(ast, comments)
@@ -203,6 +228,7 @@ module Ruby2JS
     ruby2js.strict = options[:strict]
     ruby2js.comparison = options[:comparison] || :equality
     ruby2js.or = options[:or] || :logical
+    ruby2js.module_type = options[:module] || :esm
     ruby2js.underscored_private = (options[:eslevel] < 2020) || options[:underscored_private]
     if ruby2js.binding and not ruby2js.ivars
       ruby2js.ivars = ruby2js.binding.eval \
@@ -221,6 +247,8 @@ module Ruby2JS
 
     ruby2js.timestamp options[:file]
 
+    ruby2js.file_name = options[:file] || ast&.loc&.expression&.source_buffer&.name || ''
+
     ruby2js
   end
   

data/lib/ruby2js/converter.rb

@@ -3,9 +3,11 @@ require 'ruby2js/serializer'
 module Ruby2JS
   class Error < NotImplementedError
     def initialize(message, ast)
-      message += ' at ' + ast.loc.expression.source_buffer.name.to_s
-      message += ':' + ast.loc.expression.line.inspect
-      message += ':' + ast.loc.expression.column.to_s
+      if ast.loc
+        message += ' at ' + ast.loc.expression.source_buffer.name.to_s
+        message += ':' + ast.loc.expression.line.inspect
+        message += ':' + ast.loc.expression.column.to_s
+      end
       super(message)
     end
   end
@@ -128,7 +130,7 @@ module Ruby2JS
       Parser::AST::Node.new(type, args)
     end
 
-    attr_accessor :strict, :eslevel, :comparison, :or, :underscored_private
+    attr_accessor :strict, :eslevel, :module_type, :comparison, :or, :underscored_private
 
     def es2015
       @eslevel >= 2015
@@ -246,7 +248,7 @@ module Ruby2JS
         if ast.loc and ast.loc.expression
           filename = ast.loc.expression.source_buffer.name
           if filename and not filename.empty?
-            @timestamps[filename] ||= File.mtime(filename)
+            @timestamps[filename] ||= File.mtime(filename) rescue nil
           end
         end
 

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/module.rb

@@ -6,6 +6,11 @@ module Ruby2JS
     #   (...)
 
     handle :module do |name, *body|
+      if body == [nil]
+        parse @ast.updated(:casgn, [*name.children, s(:hash)])
+        return
+      end
+
       while body.length == 1 and body.first.type == :begin
         body = body.first.children
       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.last.find {|const| const.children.last == 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