ruby2js 4.1.6 → 4.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f29494a95eb89f049d35d1a431e50e1ac4fb526fbe7544dff5b7c699b2aae9c
-  data.tar.gz: cd87036fc9542ce81e7dedb379ee5eb874f7ea9144096ff7f1b496b2c3bad5a3
+  metadata.gz: 0e5086f1cd3eb09ea176eb28e0ad73eea87f47f111c24f5029b547883bda7fbd
+  data.tar.gz: d758cd6a5719aaba435ac7944bfbefc426e8d6ff98b41f7794c9dd6394847e6c
 SHA512:
-  metadata.gz: 574b8d730585898be4ce8506b256f90a9ed092e88edcbe5af82cf5d0f70aa7177b31486deee3b615269fe8011f0b9ac0efb38381bf6df924d04cfddcd5dda799
-  data.tar.gz: 68d618097efa0fc47509129242d84e72349dd3619b9238df83820ade29fca243d7cb19c6627d9fe5b14c64fb3fb6a5fa1d9f1cfa93bd2a5753acb84645a56fc4
+  metadata.gz: 405b1b6c7eb8d62d767a3d756378bf1226dfe204d89eb24743eb3af6727e5a2950a2ae16c0d9dc8b0e352fd2a2390964cfb4ef074edc7f4820676ece42ce819c
+  data.tar.gz: 16557065963d7ad981a07e2695fd756956866beb45eada9f3dcfbbe7544b84791e366ccc2e65f2beb4cad6de484c04dbc7465b222853792a1219dfc9997eb466

data/lib/ruby2js/filter/stimulus.rb

@@ -9,12 +9,12 @@ module Ruby2JS
 
       STIMULUS_IMPORT = s(:import,
         [s(:pair, s(:sym, :as), s(:const, nil, :Stimulus)),
-          s(:pair, s(:sym, :from), s(:str, "stimulus"))],
+          s(:pair, s(:sym, :from), s(:str, "@hotwired/stimulus"))],
           s(:str, '*'))
 
       STIMULUS_IMPORT_SKYPACK = s(:import,
         [s(:pair, s(:sym, :as), s(:const, nil, :Stimulus)),
-          s(:pair, s(:sym, :from), s(:str, "https://cdn.skypack.dev/stimulus"))],
+          s(:pair, s(:sym, :from), s(:str, "https://cdn.skypack.dev/@hotwired/stimulus"))],
           s(:str, '*'))
 
       def initialize(*args)

data/lib/ruby2js/filter/underscore.rb

@@ -18,6 +18,12 @@ module Ruby2JS
           else
             super
           end
+        elsif [:take, :drop].include? method and node.is_method?
+          process S(:send, s(:lvar, :_), method, node.children[0], node.children[2])
+        elsif method == :each_slice and node.is_method?
+          process S(:send, s(:lvar, :_), :chunk, node.children[0], node.children[2])
+        elsif [:min, :max].include? method and node.children.length == 2
+          process S(:send, s(:lvar, :_), method, node.children[0])
         elsif method == :sample and  node.children.length <= 3
           process S(:send, s(:lvar, :_), :sample, node.children[0],
             *node.children[2..-1])
@@ -62,14 +68,14 @@ module Ruby2JS
         elsif method == :reduce
           if node.children.length == 3 and node.children[2].type == :sym
             # input: a.reduce(:+)
-            # output: _.reduce(_.rest(a), 
+            # output: _.reduce(_.rest(a),
             #                  proc {|memo, item| return memo+item},
             #                  a[0])
-            process S(:send, s(:lvar, :_), :reduce, 
+            process S(:send, s(:lvar, :_), :reduce,
               s(:send, s(:lvar, :_), :rest, node.children.first),
-              s(:block, s(:send, nil, :proc), 
+              s(:block, s(:send, nil, :proc),
                 s(:args, s(:arg, :memo), s(:arg, :item)),
-                s(:autoreturn, s(:send, s(:lvar, :memo), 
+                s(:autoreturn, s(:send, s(:lvar, :memo),
                   node.children[2].children.first, s(:lvar, :item)))),
                 s(:send, node.children.first, :[], s(:int, 0)))
           elsif node.children.last.type == :block_pass
@@ -79,9 +85,9 @@ module Ruby2JS
             # input: a.reduce(n, :+)
             # output: _.reduce(a, proc {|memo, item| return memo+item}, n)
             process S(:send, s(:lvar, :_), :reduce, node.children.first,
-              s(:block, s(:send, nil, :proc), 
+              s(:block, s(:send, nil, :proc),
                 s(:args, s(:arg, :memo), s(:arg, :item)),
-                s(:autoreturn, s(:send, s(:lvar, :memo), 
+                s(:autoreturn, s(:send, s(:lvar, :memo),
                 node.children[3].children.first, s(:lvar, :item)))),
                 node.children[2])
           else
@@ -93,8 +99,8 @@ module Ruby2JS
           # input: a.compact!
           # output: a.splice(0, a.length, *a.compact)
           target = node.children.first
-          process S(:send, target, :splice, s(:int, 0), 
-            s(:attr, target, :length), s(:splat, s(:send, target, 
+          process S(:send, target, :splice, s(:int, 0),
+            s(:attr, target, :length), s(:splat, s(:send, target,
             :"#{method.to_s[0..-2]}", *node.children[2..-1])))
         else
           super
@@ -111,14 +117,14 @@ module Ruby2JS
           # output: _.sortBy {return expression}
           method = method.to_s.sub(/\_by$/,'By').to_sym
           process S(:block, s(:send, s(:lvar, :_), method,
-            call.children.first), node.children[1], 
+            call.children.first), node.children[1],
             s(:autoreturn, node.children[2]))
         elsif [:find, :reject].include? method
           if call.children.length == 2
             # input: a.find {|item| item > 0}
             # output: _.find(a) {|item| return item > 0}
-            process S(:block, s(:send, s(:lvar, :_), method, 
-              call.children.first), node.children[1], 
+            process S(:block, s(:send, s(:lvar, :_), method,
+              call.children.first), node.children[1],
               s(:autoreturn, node.children[2]))
           else
             super
@@ -127,25 +133,25 @@ module Ruby2JS
         elsif method == :times and call.children.length == 2
           # input: 5.times {|i| console.log i}
           # output: _.find(5) {|i| console.log(i)}
-          process S(:block, s(:send, s(:lvar, :_), method, 
+          process S(:block, s(:send, s(:lvar, :_), method,
             call.children.first), node.children[1], node.children[2])
 
         elsif method == :reduce
           if call.children.length == 2
             # input: a.reduce {|memo, item| memo+item}
-            # output: _.reduce(_.rest(a), 
+            # output: _.reduce(_.rest(a),
             #                  proc {|memo, item| return memo+item},
             #                  a[0])
-            process S(:call, s(:lvar, :_), :reduce, 
+            process S(:call, s(:lvar, :_), :reduce,
               s(:send, s(:lvar, :_), :rest, call.children.first),
-              s(:block, s(:send, nil, :proc), 
+              s(:block, s(:send, nil, :proc),
                 node.children[1], s(:autoreturn, node.children[2])),
                 s(:send, call.children.first, :[], s(:int, 0)))
           elsif call.children.length == 3
             # input: a.reduce(n) {|memo, item| memo+item}
             # output: _.reduce(a, proc {|memo, item| return memo+item}, n)
             process S(:call, s(:lvar, :_), :reduce, call.children.first,
-              s(:block, s(:send, nil, :proc), 
+              s(:block, s(:send, nil, :proc),
                 node.children[1], s(:autoreturn, node.children[2])),
                 call.children[2])
           end
@@ -155,7 +161,7 @@ module Ruby2JS
           # output: a.splice(0, a.length, *a.map {expression})
           method = :"#{method.to_s[0..-2]}"
           target = call.children.first
-          process S(:call, target, :splice, s(:splat, s(:send, s(:array, 
+          process S(:call, target, :splice, s(:splat, s(:send, s(:array,
             s(:int, 0), s(:attr, target, :length)), :concat,
             s(:block, s(:send, target, method, *call.children[2..-1]),
             *node.children[1..-1]))))

data/lib/ruby2js/version.rb

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

data/lib/tasks/install/stimulus-rollup.rb

@@ -0,0 +1,43 @@
+# install rollup plugin
+run "yarn add @ruby2js/rollup-plugin"
+
+# configure rollup for ruby2js with stimulus filters
+insert_into_file Rails.root.join("rollup.config.js").to_s,
+  "import ruby2js from '@ruby2js/rollup-plugin';\n",
+  after: /import resolve from .*\n/
+
+insert_into_file Rails.root.join("rollup.config.js").to_s,
+  <<-CONFIG, after: "resolve()\n"
+    ,ruby2js({
+      eslevel: 2020,
+      autoexports: 'default',
+      filters: ['stimulus', 'esm', 'functions']
+    })
+  CONFIG
+
+# monkey patch stimulus:manifest:update to find .rb.js controllers too
+append_to_file Rails.root.join('config/application.rb').to_s,
+  "\n" + <<~'CONFIG'
+    require 'stimulus/manifest'
+
+    module Stimulus::Manifest
+      def import_and_register_controller(controllers_path, controller_path)
+        controller_path = controller_path.relative_path_from(controllers_path).to_s
+        module_path = controller_path.split('.').first
+        controller_class_name = module_path.camelize.gsub(/::/, "__")
+        tag_name = module_path.remove(/_controller/).gsub(/_/, "-").gsub(/\//, "--")
+
+        <<~JS
+
+          import #{controller_class_name} from "./#{controller_path}"
+          application.register("#{tag_name}", #{controller_class_name})
+        JS
+      end
+
+      def extract_controllers_from(directory)
+        (directory.children.select { |e| e.to_s =~ /_controller\.js(\.\w+)?$/ } +
+          directory.children.select(&:directory?).collect { |d| extract_controllers_from(d) }
+        ).flatten.sort
+      end
+    end
+  CONFIG

data/lib/tasks/install/stimulus-sprockets.rb

@@ -1,32 +1,25 @@
 create_file Rails.root.join('config/initializers/ruby2js.rb').to_s,
   <<~CONFIG
-    require 'ruby2js/filter/esm'
-    require 'ruby2js/filter/functions'
-    require 'ruby2js/filter/stimulus'
+    require 'stimulus/manifest'
 
-    Ruby2JS::SprocketsTransformer.options = {
-      autoexports: :default,
-      eslevel: 2020
-    }
+    module Stimulus::Manifest
+      def import_and_register_controller(controllers_path, controller_path)
+        controller_path = controller_path.relative_path_from(controllers_path).to_s
+        module_path = controller_path.split('.').first
+        controller_class_name = module_path.camelize.gsub(/::/, "__")
+        tag_name = module_path.remove(/_controller/).gsub(/_/, "-").gsub(/\//, "--")
 
-    require 'stimulus/importmap_helper'
+        <<~JS
 
-    module Stimulus::ImportmapHelper
-      def find_javascript_files_in_tree(path)
-         exts = {'.js' => '.js', '.jsm' => '.jsm'}.merge(
-           Sprockets.mime_exts.map {|key, value|
-             next unless Sprockets.transformers[value]["application/javascript"]
-             [key, '.js']
-           }.compact.to_h)
-
-         Dir[path.join('**/*')].map {|file|
-           file_ext, web_ext = Sprockets::PathUtils.match_path_extname(file, exts)
-           next unless file_ext
-
-           next unless File.file? file
+          import #{controller_class_name} from "./#{controller_path}"
+          application.register("#{tag_name}", #{controller_class_name})
+        JS
+      end
 
-           Pathname.new(file.chomp(file_ext) + web_ext)
-         }.compact
+      def extract_controllers_from(directory)
+        (directory.children.select { |e| e.to_s =~ /_controller\.js(\.\w+)?$/ } +
+          directory.children.select(&:directory?).collect { |d| extract_controllers_from(d) }
+        ).flatten.sort
       end
     end
   CONFIG

data/lib/tasks/install/stimulus-webpacker.rb

@@ -3,3 +3,6 @@ eval IO.read "#{__dir__}/webpacker.rb"
 
 insert_into_file Rails.root.join("app/javascript/controllers/index.js").to_s,
   '(\\.rb)?', after: '_controller\\.js'
+
+insert_into_file Rails.root.join("app/javascript/packs/application.js").to_s,
+  "import \"../controllers\"\n", after: "import \"channels\"\n"

data/lib/tasks/ruby2js_tasks.rake

@@ -1,4 +1,6 @@
-Thor::Actions::WARNINGS[:unchanged_no_flag] = 'unchanged'
+if defined? Thor
+  Thor::Actions::WARNINGS[:unchanged_no_flag] = 'unchanged'
+end
 
 def template(location)
   system "#{RbConfig.ruby} #{Rails.root.join("bin")}/rails app:template " + 
@@ -24,9 +26,9 @@ namespace :ruby2js do
     end
 
     namespace :stimulus do
-      desc "Install Ruby2JS with Stimulus Sprockets support"
-      task :sprockets => :"stimulus:install:asset_pipeline" do
-        template 'install/stimulus-sprockets.rb'
+      desc "Install Ruby2JS with Stimulus Rollup support"
+      task :rollup do
+        template 'install/stimulus-rollup.rb'
       end
 
       desc "Install Ruby2JS with Stimulus Webpacker support"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 4.1.6
+  version: 4.1.7
 platform: ruby
 authors:
 - Sam Ruby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -164,6 +164,7 @@ files:
 - lib/tasks/install/litelement.rb
 - lib/tasks/install/preact.rb
 - lib/tasks/install/react.rb
+- lib/tasks/install/stimulus-rollup.rb
 - lib/tasks/install/stimulus-sprockets.rb
 - lib/tasks/install/stimulus-webpacker.rb
 - lib/tasks/install/webpacker.rb