ruby2js 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f659d6312b558d08a3ca6c1f30183d602445ed580910715909ea2b4334a114a9
-  data.tar.gz: 3f07730f5727ea25b95e095c7b45c19f3fb85dcc5d640e822a3a629fa88b8056
+  metadata.gz: 8995ca731fa2bedb5306084bca13f70aa01c269a3b3ac9b6c0ace540a0d58fae
+  data.tar.gz: 71c6cbb010ddf18f67623307c469f1ce4f55c4938c33a9e3172161f71819de87
 SHA512:
-  metadata.gz: a85a3d7f144485575608cd136d764e36868d095fb8dbf4f6bc8b8adb8a218379775eeb12934c148574cac0f03dc6e12fc6223ef302973b5f4cb0a0629ba41de4
-  data.tar.gz: 4c154cd393ce76cc0f72e23180fbfdd1b0b8e876a5d60686d246e9f53effff1c4f4ce4ea3c5573cf9ac5cb7cfcda3d2300ee865c2d8d21855a717fa8f203de4a
+  metadata.gz: b51e4838e7180248ffb00debab0758049dcc6a989bcc4b9e1087fb7112ac1a8142507c96e21309b23c3b69d987065e9d7fafb91dd0a7d8961b25f125fafc3788
+  data.tar.gz: fe7b943fc51b4f1685b5cc7020c969101d7a9aa17834bc6a8af746fdbe9472f9cc55960ef464f8dcfc10125598d6966a8cf38322ce432ec88e6dd787a49158ac

data/README.md

@@ -243,8 +243,10 @@ the script.
 
 * <a id="functions" href="https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/functions.rb">functions</a>
 
+    * `.abs` becomes `Math.abs()`
     * `.all?` becomes `.every`
     * `.any?` becomes `.some`
+    * `.ceil` becomes `Math.ceil()`
     * `.chr` becomes `fromCharCode`
     * `.clear` becomes `.length = 0`
     * `.delete` becomes `delete target[arg]`
@@ -259,6 +261,7 @@ the script.
     * `.find_index` becomes `findIndex`
     * `.first` becomes `[0]`
     * `.first(n)` becomes `.slice(0, n)`
+    * `.floor` becomes `Math.floor()`
     * `.gsub` becomes `replace(//g)`
     * `.include?` becomes `.indexOf() != -1`
     * `.inspect` becomes `JSON.stringify()`

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,14 @@ module Ruby2JS
       include Ruby2JS::Filter
       BINARY_OPERATORS = Converter::OPERATORS[2..-1].flatten
 
+      attr_accessor :prepend_list
+
       def initialize(comments)
         @comments = comments
         @ast = nil
         @exclude_methods = []
         @esm = false
+        @prepend_list = Set.new
       end
 
       def options=(options)
@@ -162,6 +174,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
@@ -193,6 +206,11 @@ module Ruby2JS
 
       filter.options = options
       ast = filter.process(ast)
+
+      if filter.prepend_list
+        prepend = filter.prepend_list.sort_by {|ast| ast.type == :import ? 0 : 1}
+        ast = Parser::AST::Node.new(:begin, [*prepend, ast])
+      end
     end
 
     ruby2js = Ruby2JS::Converter.new(ast, comments)
@@ -203,6 +221,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 \

data/lib/ruby2js/converter.rb

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

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

data/lib/ruby2js/filter/esm.rb

@@ -1,5 +1,7 @@
 require 'ruby2js'
 
+Ruby2JS.module_default = :esm
+
 module Ruby2JS
   module Filter
     module ESM
@@ -8,6 +10,27 @@ module Ruby2JS
       def initialize(*args)
         super
         @esm = true # signal for other filters
+        @esm_imports = nil
+      end
+
+      def options=(options)
+        super
+        @esm_autoimports = options[:autoimports]
+        return unless @esm_autoimports
+      end
+
+      def process(node)
+        return super if @esm_imports or not @esm_autoimports
+        @esm_imports = Set.new
+        result = super
+
+        if @esm_imports.empty?
+          result
+        else
+          s(:begin, *@esm_imports.to_a.map {|token|
+            s(:import, @esm_autoimports[token], s(:const, nil, token))
+          }, result)
+        end
       end
 
       def on_send(node)
@@ -56,10 +79,21 @@ module Ruby2JS
           end
         elsif method == :export          
           s(:export, *process_all(args))
+        elsif @esm_imports and args.length == 0 and @esm_autoimports[method]
+          @esm_imports.add(method)
+          super
         else
           super
         end
       end
+
+      def on_const(node)
+        return super unless @esm_autoimports
+        if node.children.first == nil and @esm_autoimports[node.children.last]
+          @esm_imports.add(node.children.last)
+        end
+        super
+      end
     end
 
     DEFAULTS.push ESM

data/lib/ruby2js/filter/functions.rb

@@ -531,6 +531,15 @@ 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)
+
         else
           super
         end

data/lib/ruby2js/filter/node.rb

@@ -1,44 +1,21 @@
 require 'ruby2js'
 require 'set'
 
+Ruby2JS.module_default ||= :cjs
+
 module Ruby2JS
   module Filter
     module Node
       include SEXP
       extend SEXP
 
-      CJS_SETUP = {
-        child_process: s(:casgn, nil, :child_process, 
-          s(:send, nil, :require, s(:str, "child_process"))),
-        fs: s(:casgn, nil, :fs, s(:send, nil, :require, s(:str, "fs"))),
-        ARGV: s(:lvasgn, :ARGV, s(:send, s(:attr, 
-          s(:attr, nil, :process), :argv), :slice, s(:int, 2)))
-      }
-
-      ESM_SETUP = {
-        child_process: s(:import, ['child_process'],
-          s(:attr, nil, :child_process)),
-        fs: s(:import, ['fs'], s(:attr, nil, :fs)),
-        ARGV: CJS_SETUP[:ARGV]
-      }
-
-      def initialize(*args)
-        @node_setup = nil
-        super
-      end
+      IMPORT_CHILD_PROCESS = s(:import, ['child_process'],
+          s(:attr, nil, :child_process))
 
-      def process(node)
-        return super if @node_setup
-        @node_setup = Set.new
-        result = super
+      IMPORT_FS = s(:import, ['fs'], s(:attr, nil, :fs))
 
-        if @node_setup.empty?
-          result
-        else
-          setup = @esm ? ESM_SETUP : CJS_SETUP;
-          s(:begin, *@node_setup.to_a.map {|token| setup[token]}, result)
-        end
-      end
+      SETUP_ARGV = s(:lvasgn, :ARGV, s(:send, s(:attr, 
+          s(:attr, nil, :process), :argv), :slice, s(:int, 2)))
 
       def on_send(node)
         target, method, *args = node.children
@@ -51,7 +28,7 @@ module Ruby2JS
             s(:send, s(:attr, nil, :process), :exit, *process_all(args));
 
           elsif method == :system
-            @node_setup << :child_process
+            prepend_list << IMPORT_CHILD_PROCESS
 
             if args.length == 1
               s(:send, s(:attr, nil, :child_process), :execSync,
@@ -79,38 +56,38 @@ module Ruby2JS
           target.type == :const and target.children.first == nil
         then
           if method == :read and args.length == 1
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             s(:send, s(:attr, nil, :fs), :readFileSync, *process_all(args),
               s(:str, 'utf8'))
 
           elsif method == :write and args.length == 2
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             S(:send, s(:attr, nil, :fs), :writeFileSync, *process_all(args))
 
           elsif target.children.last == :IO
             super
 
           elsif [:exist?, :exists?].include? method and args.length == 1
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             S(:send, s(:attr, nil, :fs), :existsSync, process(args.first))
 
           elsif method == :readlink and args.length == 1
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             S(:send, s(:attr, nil, :fs), :readlinkSync, process(args.first))
 
           elsif method == :realpath and args.length == 1
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             S(:send, s(:attr, nil, :fs), :realpathSync, process(args.first))
 
           elsif method == :rename and args.length == 2
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             S(:send, s(:attr, nil, :fs), :renameSync, *process_all(args))
 
           elsif \
             [:chmod, :lchmod].include? method and 
             args.length > 1 and args.first.type == :int
           then
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
 
             S(:begin, *args[1..-1].map{|file|
               S(:send, s(:attr, nil, :fs), method.to_s + 'Sync', process(file),
@@ -121,7 +98,7 @@ module Ruby2JS
             [:chown, :lchown].include? method and args.length > 2 and 
             args[0].type == :int and args[1].type == :int
           then
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
 
             S(:begin, *args[2..-1].map{|file|
               s(:send, s(:attr, nil, :fs), method.to_s + 'Sync', process(file),
@@ -129,24 +106,24 @@ module Ruby2JS
             })
 
           elsif [:ln, :link].include? method and args.length == 2
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             s(:send, s(:attr, nil, :fs), :linkSync, *process_all(args))
             
           elsif method == :symlink and args.length == 2
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             s(:send, s(:attr, nil, :fs), :symlinkSync, *process_all(args))
             
           elsif method == :truncate and args.length == 2
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             s(:send, s(:attr, nil, :fs), :truncateSync, *process_all(args))
             
           elsif [:stat, :lstat].include? method and args.length == 1
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             s(:send, s(:attr, nil, :fs), method.to_s + 'Sync',
               process(args.first))
 
           elsif method == :unlink and args.length == 1
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             S(:begin, *args.map{|file|
               S(:send, s(:attr, nil, :fs), :unlinkSync, process(file))
             })
@@ -169,15 +146,15 @@ module Ruby2JS
           end
             
           if [:cp, :copy].include? method and args.length == 2
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             s(:send, s(:attr, nil, :fs), :copyFileSync, *process_all(args))
             
           elsif [:mv, :move].include? method and args.length == 2
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             S(:send, s(:attr, nil, :fs), :renameSync, *process_all(args))
 
           elsif method == :mkdir and args.length == 1
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             S(:begin, *list[args.last].map {|file|
               s(:send, s(:attr, nil, :fs), :mkdirSync, process(file))
             })
@@ -189,21 +166,21 @@ module Ruby2JS
             s(:send, s(:attr, nil, :process), :cwd)
 
           elsif method == :rmdir and args.length == 1
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             S(:begin, *list[args.last].map {|file|
               s(:send, s(:attr, nil, :fs), :rmdirSync, process(file))
             })
 
           elsif method == :ln and args.length == 2
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             s(:send, s(:attr, nil, :fs), :linkSync, *process_all(args))
             
           elsif method == :ln_s and args.length == 2
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             s(:send, s(:attr, nil, :fs), :symlinkSync, *process_all(args))
             
           elsif method == :rm and args.length == 1
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             S(:begin, *list[args.last].map {|file|
               s(:send, s(:attr, nil, :fs), :unlinkSync, process(file))
             })
@@ -211,7 +188,7 @@ module Ruby2JS
           elsif \
             method == :chmod and args.length == 2 and args.first.type == :int
           then
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
 
             S(:begin, *list[args.last].map {|file|
               S(:send, s(:attr, nil, :fs), method.to_s + 'Sync', process(file),
@@ -222,14 +199,14 @@ module Ruby2JS
             method == :chown and args.length == 3 and 
             args[0].type == :int and args[1].type == :int
           then
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
 
             S(:begin, *list[args.last].map {|file|
               s(:send, s(:attr, nil, :fs), method.to_s + 'Sync', process(file),
                 *process_all(args[0..1]))})
 
           elsif method == :touch
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
 
             S(:begin, *list[args.first].map {|file|
               S(:send, s(:attr, nil, :fs), :closeSync,
@@ -249,16 +226,16 @@ module Ruby2JS
           elsif method == :pwd and args.length == 0
             s(:send, s(:attr, nil, :process), :cwd)
           elsif method == :entries
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             s(:send, s(:attr, nil, :fs), :readdirSync, *process_all(args))
           elsif method == :mkdir and args.length == 1
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             s(:send, s(:attr, nil, :fs), :mkdirSync, process(args.first))
           elsif method == :rmdir and args.length == 1
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             s(:send, s(:attr, nil, :fs), :rmdirSync, process(args.first))
           elsif method == :mktmpdir and args.length <=1
-            @node_setup << :fs
+            prepend_list << IMPORT_FS
             if args.length == 0
               prefix = s(:str, 'd')
             elsif args.first.type == :array
@@ -298,7 +275,7 @@ module Ruby2JS
 
       def on_const(node)
         if node.children == [nil, :ARGV]
-          @node_setup << :ARGV
+          prepend_list << SETUP_ARGV
           super
         elsif node.children == [nil, :ENV]
           S(:attr, s(:attr, nil, :process), :env)
@@ -326,7 +303,7 @@ module Ruby2JS
       end
 
       def on_xstr(node)
-        @node_setup << :child_process
+        prepend_list << IMPORT_CHILD_PROCESS
 
         children = node.children.dup
         command = children.shift

data/lib/ruby2js/filter/nokogiri.rb

@@ -7,33 +7,7 @@ module Ruby2JS
       include SEXP
       extend SEXP
 
-      CJS_SETUP = {
-        jsdom: s(:casgn, nil, :JSDOM, 
-          s(:attr, s(:send, nil, :require, s(:str, "jsdom")), :JSDOM))
-      }
-
-      ESM_SETUP = {
-        jsdom: s(:import, ["jsdom"], [s(:attr, nil, :JSDOM)])
-      }
-
-      def initialize(*args)
-        @nokogiri_setup = nil
-        super
-      end
-
-      def process(node)
-        return super if @nokogiri_setup
-        @nokogiri_setup = Set.new
-        result = super
-
-        if @nokogiri_setup.empty?
-          result
-        else
-          setup = @esm ? ESM_SETUP : CJS_SETUP;
-          s(:begin, 
-            *@nokogiri_setup.to_a.map {|token| setup[token]}, result)
-        end
-      end
+      IMPORT_JSDOM = s(:import, ["jsdom"], [s(:attr, nil, :JSDOM)])
 
       def on_send(node)
         target, method, *args = node.children
@@ -55,7 +29,7 @@ module Ruby2JS
           [:HTML, :HTML5].include? method and
           target == s(:const, nil, :Nokogiri)
         then
-          @nokogiri_setup << :jsdom
+          prepend_list << IMPORT_JSDOM
           S(:attr, s(:attr, s(:send, s(:const, nil, :JSDOM), :new,
             *process_all(args)), :window), :document)
 
@@ -65,7 +39,7 @@ module Ruby2JS
           target.children.first == s(:const, nil, :Nokogiri) and
           [:HTML, :HTML5].include? target.children.last
         then
-          @nokogiri_setup << :jsdom
+          prepend_list << IMPORT_JSDOM
           S(:attr, s(:attr, s(:send, s(:const, nil, :JSDOM), :new,
             *process_all(args)), :window), :document)
 

data/lib/ruby2js/filter/return.rb

@@ -21,6 +21,8 @@ module Ruby2JS
       def on_def(node)
         node = super
         return node unless node.type == :def
+        return node if [:constructor, :initialize].include?(node.children.first)
+
         children = node.children[1..-1]
 
         children[-1] = s(:nil) if children.last == nil

data/lib/ruby2js/filter/securerandom.rb

@@ -0,0 +1,33 @@
+require 'ruby2js'
+require 'set'
+
+# Experimental secure random support
+
+module Ruby2JS
+  module Filter
+    module SecureRandom
+      include SEXP
+      extend SEXP
+
+      IMPORT_BASE62_RANDOM = s(:import, ['base62-random'],
+        s(:attr, nil, :base62_random))
+
+      def on_send(node)
+        target, method, *args = node.children
+
+        if target == s(:const, nil, :SecureRandom)
+          if method == :alphanumeric and args.length == 1
+            prepend_list << IMPORT_BASE62_RANDOM
+            node.updated(nil, [nil, :base62_random, *args])
+          else
+            super
+          end
+        else
+          super
+        end
+      end
+    end
+
+    DEFAULTS.push SecureRandom
+  end
+end

data/lib/ruby2js/filter/vue.rb

@@ -106,6 +106,7 @@ module Ruby2JS
         computed = []
         setters = []
         options = []
+        watch = nil
         el = nil
         mixins = []
 
@@ -205,6 +206,9 @@ module Ruby2JS
                 end
 
                 @vue_h = args.children.first.children.last
+              elsif method == :watch and args.children.length == 0 and block.type == :hash
+                watch = process(block)
+                next
               elsif method == :initialize
                 method = :data
 
@@ -332,6 +336,11 @@ module Ruby2JS
           hash << s(:pair, s(:sym, :computed), s(:hash, *computed))
         end
 
+        # append watch to hash
+        if watch
+          hash << s(:pair, s(:sym, :watch), watch)
+        end
+
         # convert class name to camel case
         cname = cname.children.last
         camel = cname.to_s.gsub(/[^\w]/, '-').

data/lib/ruby2js/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -135,6 +135,7 @@ files:
 - lib/ruby2js/filter/react.rb
 - lib/ruby2js/filter/require.rb
 - lib/ruby2js/filter/return.rb
+- lib/ruby2js/filter/securerandom.rb
 - lib/ruby2js/filter/tagged_templates.rb
 - lib/ruby2js/filter/underscore.rb
 - lib/ruby2js/filter/vue.rb