ruby2js 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b77ba98b59e2dd3f500c4fa6c4974d6a082757becd31eb47efa841b51513ec28
-  data.tar.gz: 3a868aa5a10b6562ad156c47bec44aed4060338f6aa747e90298dd890ae3095f
+  metadata.gz: eada6454a1374751fa61b2522291a4f7c61023ec0218ba98d7fdcb19e0067f0e
+  data.tar.gz: 4bef375ce47cef8733f0e08250dfbf4f6968e9a043aa53825d9198db3fafdd7f
 SHA512:
-  metadata.gz: 2837170756fe4b6ca1f369d1dfe10c2ee6613f0572d54104354fb10df0b2f57dbe38c1dc4a44fa53f093af26bc6b826897144fbd5c5f0f6029885898878ff581
-  data.tar.gz: 97b02c3f49d12c7eb6f84e5a504e6b5210f04bf4450f8923ee38927714aa749968839b67ac2ad04f508f7a4cc34010eab06ad4b3cc408415390107bc1a04d623
+  metadata.gz: 511f8917dfac3baaa45f33147430d23ea0a41e3ed2b74147d9589e1385a6f07d36aab029f47ba05f07f974c3543a7823a7c943b190e30fee2a240ce604d25d87
+  data.tar.gz: 61c8b8b5f3fbbecde1fb1bc0d23a35c13202a21467009665faba3b596607272fc1b1601f4f0156cf9d60ed80ff1e96ffa5204a1fa83b57430b729c6bc9b9b9d1

data/lib/ruby2js.rb

@@ -92,6 +92,17 @@ module Ruby2JS
         include_only(options[:include_only]) if options[:include_only]
         include(options[:include]) if options[:include]
         exclude(options[:exclude]) if options[:exclude]
+
+        filters = options[:filters] || DEFAULTS
+        @modules_enabled =
+          (defined? Ruby2JS::Filter::ESM and
+          filters.include? Ruby2JS::Filter::ESM) or
+          (defined? Ruby2JS::Filter::CJS and
+          filters.include? Ruby2JS::Filter::CJS)
+      end
+
+      def modules_enabled?
+        @modules_enabled
       end
 
       def es2015
@@ -279,7 +290,7 @@ module Ruby2JS
   
   def self.parse(source, file=nil, line=1)
     buffer = Parser::Source::Buffer.new(file, line)
-    buffer.source = source.encode('utf-8')
+    buffer.source = source.encode('UTF-8')
     parser = Parser::CurrentRuby.new
     parser.diagnostics.all_errors_are_fatal = true
     parser.diagnostics.consumer = lambda {|diagnostic| nil}

data/lib/ruby2js/converter.rb

@@ -66,6 +66,7 @@ module Ruby2JS
       @comparison = :equality
       @or = :logical
       @underscored_private = true
+      @redoable = false
     end
 
     def width=(width)
@@ -243,6 +244,34 @@ module Ruby2JS
       end
     end
 
+    def redoable(block)
+      save_redoable = @redoable
+
+      has_redo = proc do |node|
+        node.children.any? do |child|
+          next false unless child.is_a? Parser::AST::Node
+          next true if child.type == :redo
+          next false if %i[for while while_post until until_post].include? child.type
+          has_redo[child]
+        end
+      end
+
+      @redoable = has_redo[@ast]
+
+      if @redoable
+        put es2015 ? 'let ' : 'var '
+        put "redo$#@sep"
+        puts 'do {'
+        put "redo$ = false#@sep"
+        scope block
+        put "#@nl} while(redo$)"
+      else
+        scope block
+      end
+    ensure
+      @redoable = save_redoable
+    end
+
     def timestamp(file)
       super
 
@@ -335,6 +364,7 @@ require 'ruby2js/converter/nil'
 require 'ruby2js/converter/nthref'
 require 'ruby2js/converter/opasgn'
 require 'ruby2js/converter/prototype'
+require 'ruby2js/converter/redo'
 require 'ruby2js/converter/regexp'
 require 'ruby2js/converter/return'
 require 'ruby2js/converter/self'

data/lib/ruby2js/converter/args.rb

@@ -32,7 +32,7 @@ module Ruby2JS
           elsif kw.type == :kwoptarg
             put kw.children.first
             unless kw.children.last == s(:send, nil, :undefined)
-              put ' = '; parse kw.children.last
+              put '='; parse kw.children.last
             end
           elsif kw.type == :kwrestarg
             raise 'Rest arg requires ES2018' unless es2018

data/lib/ruby2js/converter/for.rb

@@ -28,7 +28,7 @@ module Ruby2JS
         else
           put (@ast.type==:for_of ? ' of ' : ' in '); parse expression; 
         end
-        puts ') {'; scope block; sput '}'
+        puts ') {'; redoable block; sput '}'
       ensure
         @next_token = next_token
         @vars = vars if es2015

data/lib/ruby2js/converter/next.rb

@@ -5,8 +5,16 @@ module Ruby2JS
     #   (int 1))
 
     handle :next do |n=nil|
-      raise Error.new("next argument #{ n.inspect }", @ast) if n
-      put @next_token.to_s
+      if @next_token == :return
+        put 'return'
+        if n
+          put ' '
+          parse n
+        end
+      else
+        raise Error.new("next argument #{ n.inspect }", @ast) if n
+        put @next_token.to_s
+      end
     end
   end
 end

data/lib/ruby2js/converter/redo.rb

@@ -0,0 +1,14 @@
+module Ruby2JS
+  class Converter
+
+    # (redo)
+
+    handle :redo do
+      unless @redoable and @next_token == :continue
+        raise Error.new("redo outside of loop", @ast)
+      end
+
+      put "redo$ = true#{@sep}continue"
+    end
+  end
+end

data/lib/ruby2js/converter/while.rb

@@ -22,7 +22,7 @@ module Ruby2JS
           end
         end
 
-        put 'while ('; parse condition; puts ') {'; scope block; sput '}'
+        put 'while ('; parse condition; puts ') {'; redoable block; sput '}'
       ensure
         @next_token = next_token
       end

data/lib/ruby2js/converter/whilepost.rb

@@ -11,7 +11,7 @@ module Ruby2JS
       begin
         next_token, @next_token = @next_token, :continue
 
-        puts 'do {'; scope block; sput '} while ('; parse condition; put ')'
+        puts 'do {'; redoable block; sput '} while ('; parse condition; put ')'
       ensure
         @next_token = next_token
       end

data/lib/ruby2js/filter/functions.rb

@@ -210,10 +210,10 @@ module Ruby2JS
                 s(:block, s(:send, nil, :proc), s(:args, s(:arg, :s)),
                   s(:send, s(:lvar, :s), :slice, s(:int, 1))))
             else
-              # str.match(/.../g).map(s => s.match(/.../).slice(1))
+              # (str.match(/.../g) || []).map(s => s.match(/.../).slice(1))
               s(:block, s(:send,
-                s(:send, process(target), :match, gpattern), :map),
-                s(:args, s(:arg, :s)),
+                s(:or, s(:send, process(target), :match, gpattern), s(:array)),
+                :map), s(:args, s(:arg, :s)),
                 s(:return, s(:send, s(:send, s(:lvar, :s), :match, arg),
                 :slice, s(:int, 1))))
             end
@@ -508,6 +508,36 @@ module Ruby2JS
         elsif method == :floor and args.length == 0
           process S(:send, s(:const, nil, :Math), :floor, target)
 
+        elsif method == :rand and target == nil
+          if args.length == 0
+            process S(:send!, s(:const, nil, :Math), :random)
+          elsif %i[irange erange].include? args.first.type
+            range = args.first
+            multiplier = s(:send, range.children.last, :-, range.children.first)
+            if range.children.all? {|child| child.type == :int}
+              multiplier = s(:int, range.children.last.children.last - range.children.first.children.last)
+              multiplier = s(:int, multiplier.children.first + 1) if range.type == :irange
+            elsif range.type == :irange
+              if multiplier.children.last.type == :int
+                diff = multiplier.children.last.children.last - 1
+                multiplier = s(:send, *multiplier.children[0..1], s(:int, diff))
+                multiplier = multiplier.children.first if diff == 0
+                multiplier = s(:send, multiplier.children[0], :+, s(:int, -diff)) if diff < 0
+              else
+                multiplier = s(:send, multiplier, :+, s(:int, 1))
+              end
+            end
+            raw = s(:send, s(:send, s(:const, nil, :Math), :random), :*, multiplier)
+            if range.children.first != s(:int, 0)
+              raw = s(:send, raw, :+, range.children.first)
+            end
+            process S(:send, nil, :parseInt, raw)
+          else
+            process S(:send, nil, :parseInt,
+              s(:send, s(:send, s(:const, nil, :Math), :random),
+              :*, args.first))
+          end
+
         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)),

data/lib/ruby2js/filter/react.rb

@@ -85,7 +85,6 @@ module Ruby2JS
         @react_props = []
         @react_methods = []
         @react_filter_functions = false
-        @react_imports = false
         @jsx = false
         super
       end
@@ -102,15 +101,6 @@ module Ruby2JS
           @react_filter_functions = true
         end
 
-        if \
-          (defined? Ruby2JS::Filter::ESM and
-          filters.include? Ruby2JS::Filter::ESM) or
-          (defined? Ruby2JS::Filter::CJS and
-          filters.include? Ruby2JS::Filter::CJS)
-        then
-          @react_imports = true
-        end
-
         if \
           defined? Ruby2JS::Filter::JSX and
           filters.include? Ruby2JS::Filter::JSX
@@ -133,7 +123,7 @@ module Ruby2JS
           inheritance == s(:const, s(:const, nil, :React), :Component) or
           inheritance == s(:send, s(:const, nil, :React), :Component)
 
-        prepend_list << REACT_IMPORTS[:React] if @react_imports
+        prepend_list << REACT_IMPORTS[:React] if modules_enabled?
 
         # traverse down to actual list of class statements
         if body.length == 1
@@ -445,7 +435,7 @@ module Ruby2JS
             node.children.first == s(:const, nil, :React) or
             node.children.first == s(:const, nil, :ReactDOM)
           then
-            if @react_imports
+            if modules_enabled?
               prepend_list << REACT_IMPORTS[node.children.first.children.last]
             end
 

data/lib/ruby2js/filter/stimulus.rb

@@ -51,8 +51,10 @@ module Ruby2JS
         @stim_classes = Set.new
         stim_walk(node)
 
-        prepend_list << (@options[:import_from_skypack] ?
-          STIMULUS_IMPORT_SKYPACK : STIMULUS_IMPORT)
+        if modules_enabled?
+          prepend_list << (@options[:import_from_skypack] ?
+            STIMULUS_IMPORT_SKYPACK : STIMULUS_IMPORT)
+        end
 
         nodes = body
         if nodes.length == 1 and nodes.first&.type == :begin

data/lib/ruby2js/serializer.rb

@@ -303,11 +303,11 @@ module Ruby2JS
     def vlq(*mark)
       if @mark[0] == mark[0]
         return if @mark[-3..-1] == mark[-3..-1]
-        @mappings << ',' unless @mappings == ''
+        @mappings += ',' unless @mappings == ''
       end
 
       while @mark[0] < mark[0]
-        @mappings << ';'
+        @mappings += ';'
         @mark[0] += 1
         @mark[1] = 0
       end
@@ -322,16 +322,21 @@ module Ruby2JS
           data = diff << 1
         end
 
-        encoded = ''
-
-        begin
-          digit = data & 0b11111
-          data >>= 5
-          digit |= 0b100000 if data > 0
-          encoded << BASE64[digit]
-        end while data > 0
+        if data <= 0b11111
+          # workaround https://github.com/opal/opal/issues/575
+          encoded = BASE64[data]
+        else
+          encoded = ''
+
+          begin
+            digit = data & 0b11111
+            data >>= 5
+            digit |= 0b100000 if data > 0
+            encoded += BASE64[digit]
+          end while data > 0
+        end
 
-        @mappings << encoded
+        @mappings += encoded
       end
     end
 

data/lib/ruby2js/sprockets.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+require 'sprockets/source_map_utils'
+require 'ruby2js'
+require 'ruby2js/version'
+
+module Ruby2JS
+  module SprocketsTransformer
+    include Sprockets
+    VERSION = '1'
+
+    @@options = {}
+
+    def self.options=(options)
+      @@options = options
+    end
+
+    def self.cache_key
+      @cache_key ||= "#{name}:#{Ruby2JS::VERSION::STRING}:#{VERSION}".freeze
+    end
+
+    def self.call(input)
+      data = input[:data]
+
+      js, map = input[:cache].fetch([self.cache_key, data]) do
+        result = Ruby2JS.convert(data, {**@@options, file: input[:filename]})
+        [result.to_s, result.sourcemap.transform_keys {|key| key.to_s}]
+      end
+
+      map = SourceMapUtils.format_source_map(map, input)
+      map = SourceMapUtils.combine_source_maps(input[:metadata][:map], map)
+
+      { data: js, map: map }
+    end
+  end
+end
+
+Sprockets.register_mime_type 'application/ruby', extensions: ['.rb', '.js.rb']
+
+Sprockets.register_transformer 'application/ruby', 'application/javascript',
+  Ruby2JS::SprocketsTransformer

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
   s.summary = "Minimal yet extensible Ruby to JavaScript conversion.".freeze
 
   s.add_dependency('parser')
-  s.add_dependency('regexp_parser', '~> 2.0.3')
+  s.add_dependency('regexp_parser', '~> 2.1.1')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Sam Ruby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.1
 description: |2
       The base package maps Ruby syntax to JavaScript semantics.
       Filters may be provided to add Ruby-specific or framework specific
@@ -91,6 +91,7 @@ files:
 - lib/ruby2js/converter/nthref.rb
 - lib/ruby2js/converter/opasgn.rb
 - lib/ruby2js/converter/prototype.rb
+- lib/ruby2js/converter/redo.rb
 - lib/ruby2js/converter/regexp.rb
 - lib/ruby2js/converter/return.rb
 - lib/ruby2js/converter/self.rb
@@ -149,9 +150,9 @@ files:
 - lib/ruby2js/haml.rb
 - lib/ruby2js/jsx.rb
 - lib/ruby2js/namespace.rb
-- lib/ruby2js/rails.rb
 - lib/ruby2js/serializer.rb
 - lib/ruby2js/sinatra.rb
+- lib/ruby2js/sprockets.rb
 - lib/ruby2js/strict.rb
 - lib/ruby2js/version.rb
 - ruby2js.gemspec

data/lib/ruby2js/rails.rb

@@ -1,63 +0,0 @@
-# Example usage:
-#
-#   $ echo "gem 'ruby2js', require: 'ruby2js/rails'" >> Gemfile
-#   $ bundle update
-#   $ rails generate controller Say hello
-#   $ echo 'alert "Hello world!"' > app/views/say/hello.js.rb
-#   $ rails server
-#   $ curl http://localhost:3000/say/hello.js
-#
-# Using an optional filter:
-#
-#   $ echo 'require "ruby2js/filter/functions"' > config/initializers/ruby2js.rb
-#
-# Asset Pipeline:
-#
-#  Ruby2JS registers ".rb.js" extension.
-#  You can add "ruby_thing.js.rb" to your app/javascript folder
-#  and '= require ruby_thing' from other js sources.
-#
-#  (options are not yet supported, but by requiring the appropriate files
-#   as shown above, you can configure proejct wide.)
-require 'ruby2js'
-
-module Ruby2JS
-  module Rails
-    class Template
-      cattr_accessor :default_format
-      self.default_format = Mime[:js]
-      def self.call(template, source)
-        "Ruby2JS.convert(#{template.source.inspect}, file: source).to_s"
-      end
-    end
-
-    ActiveSupport.on_load(:action_view) do
-      ActionView::Template.register_template_handler :rb, Template
-    end
-
-    class SprocketProcessor
-      def initialize(file = nil)
-        @file = file
-      end
-      def render(context , _)
-        context = context.instance_eval { binding } unless context.is_a? Binding
-        Ruby2JS.convert(File.read(@file), binding: context).to_s
-      end
-    end
-
-    class Engine < ::Rails::Engine
-      engine_name "ruby2js"
-
-      config.app_generators.javascripts true
-      config.app_generators.javascript_engine :rb
-
-      config.assets.configure do |env|
-        env.register_mime_type 'text/ruby', extensions: ['.js.rb', '.rb']
-        env.register_transformer 'text/ruby', 'text/javascript', SprocketProcessor
-        env.register_preprocessor 'text/javascript', SprocketProcessor
-      end
-    end
-
-  end
-
-end