ruby2js 4.0.5 → 4.1.4

data/lib/ruby2js/serializer.rb

@@ -300,22 +300,29 @@ module Ruby2JS
     BASE64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
 
     # https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit
+    # http://sokra.github.io/source-map-visualization/
     def vlq(*mark)
-      if @mark[0] == mark[0]
-        return if @mark[-3..-1] == mark[-3..-1]
-        @mappings += ',' unless @mappings == ''
+      if !@mark
+        diffs = mark
+        @mark = [0, 0, 0, 0, 0, 0]
+      else
+        if @mark[0] == mark[0]
+          return if @mark[4] == mark[4] and @mark[3] == mark[3]
+          @mappings += ',' unless @mappings == ''
+        end
+
+        diffs = mark.zip(@mark).map {|a,b| a-b}
       end
 
       while @mark[0] < mark[0]
         @mappings += ';'
         @mark[0] += 1
-        @mark[1] = 0
+        diffs[1] = mark[1] 
       end
 
-      diffs = mark.zip(@mark).map {|a,b| a-b}
-      @mark = mark
+      @mark[0...mark.length] = mark
 
-      diffs[1..4].each do |diff|
+      diffs[1..-1].each do |diff|
         if diff < 0
           data = (-diff << 1) + 1
         else
@@ -345,7 +352,8 @@ module Ruby2JS
 
       @mappings = ''
       sources = []
-      @mark = [0, 0, 0, 0, 0]
+      names = []
+      @mark = nil
 
       @lines.each_with_index do |line, row|
         col = line.indent
@@ -361,8 +369,30 @@ module Ruby2JS
               sources << buffer
             end
 
-            split = buffer.source[0...pos].split("\n")
-            vlq row, col, source_index, [split.length - 1, 0].max, split.last.to_s.length
+            line = buffer.line_for_position(pos) - 1
+            column = buffer.column_for_position(pos)
+
+            name = nil
+            if %i{lvasgn lvar}.include? token.ast.type
+              name = token.ast.children.first
+            elsif %i{casgn const}.include? token.ast.type 
+              if token.ast.children.first == nil
+                name = token.ast.children[1]
+              end
+            end
+
+            if name
+              index = names.find_index(name)
+
+              unless index
+                index = names.length
+                names << name
+              end
+
+              vlq row, col, source_index, line, column, index
+            else
+              vlq row, col, source_index, line, column
+            end
           end
           col += token.length
         end
@@ -372,6 +402,7 @@ module Ruby2JS
         version: 3,
         file: @file_name,
         sources: sources.map(&:name),
+        names: names.map(&:to_s),
         mappings: @mappings
       }
     end

data/lib/ruby2js/version.rb

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

data/lib/tasks/install/config/webpack/loaders/ruby2js.js

@@ -0,0 +1,20 @@
+const { environment } = require('@rails/webpacker')
+
+module.exports = {
+  test: /\.js\.rb$/,
+  use: [
+    {
+      loader: "babel-loader",
+      options: environment.loaders.get('babel').use[0].options
+    },
+
+    {
+      loader: "@ruby2js/webpack-loader",
+      options: {
+        autoexports: "default",
+        eslevel: 2021,
+        filters: ["esm", "functions"]
+      }
+    }
+  ]
+}

data/lib/tasks/install/preact.rb

@@ -0,0 +1,3 @@
+@ruby2js_options = {filters: ['react']}
+@yarn_add='preact'
+eval IO.read "#{__dir__}/webpacker.rb"

data/lib/tasks/install/webpacker.rb

@@ -27,40 +27,25 @@ insert_into_file Rails.root.join("config/webpacker.yml").to_s,
 # install webpack loader
 run "yarn add @ruby2js/webpack-loader #{@yarn_add}"
 
+target = Rails.root.join("config/webpack/loaders/ruby2js.js").to_s
+
 # default config
-config = <<~CONFIG
-  // Insert rb2js loader at the end of list
-  environment.loaders.append('rb2js', {
-    test: /\.js\.rb$/,
-    use: [
-      {
-        loader: "babel-loader",
-        options: environment.loaders.get('babel').use[0].options
-      },
+if not File.exist? target
+  # may be called via eval, or directly.  Resolve source either way.
+  source_paths.unshift __dir__
+  source_paths.unshift File.dirname(caller.first)
+  directory "config/webpack/loaders", File.dirname(target)
+end
 
-      {
-        loader: "@ruby2js/webpack-loader",
-        options: {
-          autoexports: "default",
-          eslevel: 2021,
-          filters: ["esm", "functions"]
-        }
-      },
-    ]
-  })
-CONFIG
+# load config
+insert_into_file Rails.root.join("config/webpack/environment.js").to_s,
+  "environment.loaders.prepend('ruby2js', require('./loaders/ruby2js'))\n"
 
 # read current configuration
-target = Rails.root.join("config/webpack/environment.js").to_s
 before = IO.read(target)
 
-# extract indentation and options either from the current configuration or the
-# default configuration.
-if before.include? '@ruby2js/webpack-loader'
-  match = /^(\s*)options: (\{.*?\n\1\})/m.match(before)
-else
-  match = /^(\s*)options: (\{.*?\n\1\})/m.match(config)
-end
+# extract indentation and options
+match = /^(\s*)options: (\{.*?\n\1\})/m.match(before)
 
 # evaluate base options.  Here it is handy that Ruby's syntax for hashes is
 # fairly close to JavaScript's object literals.  May run into problems in the
@@ -90,8 +75,6 @@ replacement =  Ruby2JS.convert(merged.inspect + "\n").to_s.
   gsub(/^/, match[1]).strip
 
 # Update configuration
-if before.include? '@ruby2js/webpack-loader'
+unless before.include? replacement
   gsub_file target, match[2].to_s, replacement
-else
-  append_to_file target, "\n" + config.sub(match[2], replacement)
 end

data/lib/tasks/ruby2js_tasks.rake

@@ -12,6 +12,11 @@ namespace :ruby2js do
       template 'install/litelement.rb'
     end
 
+    desc "Install Ruby2JS with Preact support"
+    task :preact do
+      template 'install/preact.rb'
+    end
+
     desc "Install Ruby2JS with React support"
     task :react do
       template 'install/react.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.1.4
 platform: ruby
 authors:
 - Sam Ruby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -85,6 +85,7 @@ files:
 - lib/ruby2js/converter/literal.rb
 - lib/ruby2js/converter/logical.rb
 - lib/ruby2js/converter/masgn.rb
+- lib/ruby2js/converter/match.rb
 - lib/ruby2js/converter/module.rb
 - lib/ruby2js/converter/next.rb
 - lib/ruby2js/converter/nil.rb
@@ -159,7 +160,9 @@ files:
 - lib/ruby2js/version.rb
 - lib/tasks/README.md
 - lib/tasks/install/app/javascript/elements/index.js
+- lib/tasks/install/config/webpack/loaders/ruby2js.js
 - lib/tasks/install/litelement.rb
+- lib/tasks/install/preact.rb
 - lib/tasks/install/react.rb
 - lib/tasks/install/stimulus-sprockets.rb
 - lib/tasks/install/stimulus-webpacker.rb
@@ -186,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Minimal yet extensible Ruby to JavaScript conversion.