ruby2js 3.5.2 → 4.0.1

data/lib/ruby2js/namespace.rb

@@ -0,0 +1,75 @@
+# Instances of this class keep track of both classes and modules that we have
+# seen before, as well as the methods and properties that are defined in each.
+#
+# Use cases this enables:
+#
+#   * detection of "open" classes and modules, i.e., redefining a class or
+#     module that was previously declared in order to add or modify methods
+#     or properties.
+#
+#   * knowing when to prefix method or property access with `this.` and
+#     when to add `.bind(this)` for methods and properties that were defined
+#     outside of this class.
+#     
+module Ruby2JS 
+  class Namespace
+    def initialize
+      @active = [] # current scope
+      @seen = {}   # history of all definitions seen previously
+    end
+
+    # convert an AST name which is represented as a set of nested 
+    # s(:const, # ...) into an array of symbols that represent
+    # the relative path.
+    def resolve(token, result = [])
+      return [] unless token&.type == :const
+      resolve(token.children.first, result)
+      result.push(token.children.last)
+    end
+    
+    # return the active scope as a flat array of symbols
+    def active
+      @active.flatten.compact
+    end
+
+    # enter a new scope, which may be a nested subscope.  Mark the new scope
+    # as seen, and return any previous definition that may have been seen
+    # before.
+    def enter(name)
+      @active.push resolve(name)
+      previous = @seen[active]
+      @seen[active] ||= {}
+      previous
+    end
+
+    # return the set of known properties (and methods) for either the current
+    # scope or a named subscope.
+    def getOwnProps(name = nil)
+      @seen[active + resolve(name)]&.dup || {}
+    end
+
+    # add new props (and methods) to the current scope.
+    def defineProps(props, namespace=active)
+      @seen[namespace] ||= {}
+      @seen[namespace].merge! props || {}
+    end
+
+    # find a named scope which may be relative to any point in the ancestry of
+    # the current scope.  Return the properties for that scope.
+    def find(name)
+      name = resolve(name)
+      prefix = active
+      while prefix.pop
+        result = @seen[prefix + name]
+        return result if result
+      end
+      {}
+    end
+
+    # leave a given scope.  Note that the scope may be compound (e.g., M::N),
+    # and if so, it will pop the entire resolved name.
+    def leave()
+      @active.pop
+    end
+  end
+end

data/lib/ruby2js/rails.rb

@@ -1,6 +1,6 @@
 # Example usage:
 #
-#   $ echo gem 'ruby2js', require: 'ruby2js/rails' > Gemfile
+#   $ echo "gem 'ruby2js', require: 'ruby2js/rails'" >> Gemfile
 #   $ bundle update
 #   $ rails generate controller Say hello
 #   $ echo 'alert "Hello world!"' > app/views/say/hello.js.rb
@@ -13,8 +13,8 @@
 #
 # Asset Pipeline:
 #
-#  Ruby2JS registers ".rbs" (RuBy Script) extension.
-#  You can add "ruby_thing.js.rbs" to your javascript folder
+#  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
@@ -26,15 +26,17 @@ module Ruby2JS
     class Template
       cattr_accessor :default_format
       self.default_format = Mime[:js]
-      def self.call(template)
-        "Ruby2JS.convert(#{template.source.inspect}).to_s"
+      def self.call(template, source)
+        "Ruby2JS.convert(#{template.source.inspect}, file: source).to_s"
       end
     end
 
-    ActionView::Template.register_template_handler :rb, Template
+    ActiveSupport.on_load(:action_view) do
+      ActionView::Template.register_template_handler :rb, Template
+    end
 
     class SprocketProcessor
-      def initialize( file)
+      def initialize(file = nil)
         @file = file
       end
       def render(context , _)
@@ -46,10 +48,14 @@ module Ruby2JS
     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_engine '.rbs', SprocketProcessor, mime_type: 'text/javascript', silence_deprecation: true
+        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

data/lib/ruby2js/serializer.rb

@@ -42,6 +42,7 @@ module Ruby2JS
 
   class Serializer
     attr_reader :timestamps
+    attr_accessor :file_name
 
     def initialize
       @sep = '; '
@@ -56,6 +57,7 @@ module Ruby2JS
       @timestamps = {}
 
       @ast = nil
+      @file_name = ''
     end
 
     def timestamp(file)
@@ -363,7 +365,7 @@ module Ruby2JS
 
       @sourcemap = {
         version: 3,
-        file: @ast.loc.expression.source_buffer.name,
+        file: @file_name,
         sources: sources.map(&:name),
         mappings: @mappings
       }

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
-  s.authors = ["Sam Ruby".freeze]
+  s.authors = ["Sam Ruby".freeze, "Jared White".freeze]
   s.description = "    The base package maps Ruby syntax to JavaScript semantics.\n    Filters may be provided to add Ruby-specific or framework specific\n    behavior.\n".freeze
   s.email = "rubys@intertwingly.net".freeze
   s.files = %w(ruby2js.gemspec README.md) + Dir.glob("{lib}/**/*")
@@ -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')
+  s.add_dependency('regexp_parser', '~> 2.0.3')
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 4.0.1
 platform: ruby
 authors:
 - Sam Ruby
+- Jared White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -28,16 +29,16 @@ dependencies:
   name: regexp_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.3
 description: |2
       The base package maps Ruby syntax to JavaScript semantics.
       Filters may be provided to add Ruby-specific or framework specific
@@ -54,6 +55,7 @@ files:
 - lib/ruby2js/converter/arg.rb
 - lib/ruby2js/converter/args.rb
 - lib/ruby2js/converter/array.rb
+- lib/ruby2js/converter/assign.rb
 - lib/ruby2js/converter/begin.rb
 - lib/ruby2js/converter/block.rb
 - lib/ruby2js/converter/blockpass.rb
@@ -73,6 +75,7 @@ files:
 - lib/ruby2js/converter/fileline.rb
 - lib/ruby2js/converter/for.rb
 - lib/ruby2js/converter/hash.rb
+- lib/ruby2js/converter/hide.rb
 - lib/ruby2js/converter/if.rb
 - lib/ruby2js/converter/import.rb
 - lib/ruby2js/converter/in.rb
@@ -105,6 +108,7 @@ files:
 - lib/ruby2js/converter/xnode.rb
 - lib/ruby2js/converter/xstr.rb
 - lib/ruby2js/converter/yield.rb
+- lib/ruby2js/demo.rb
 - lib/ruby2js/es2015.rb
 - lib/ruby2js/es2015/strict.rb
 - lib/ruby2js/es2016.rb
@@ -119,15 +123,17 @@ files:
 - lib/ruby2js/es2020/strict.rb
 - lib/ruby2js/es2021.rb
 - lib/ruby2js/es2021/strict.rb
+- lib/ruby2js/es2022.rb
+- lib/ruby2js/es2022/strict.rb
 - lib/ruby2js/execjs.rb
 - lib/ruby2js/filter.rb
+- lib/ruby2js/filter/active_functions.rb
 - lib/ruby2js/filter/camelCase.rb
 - lib/ruby2js/filter/cjs.rb
 - lib/ruby2js/filter/esm.rb
-- lib/ruby2js/filter/esm_migration.rb
-- lib/ruby2js/filter/fast-deep-equal.rb
 - lib/ruby2js/filter/functions.rb
 - lib/ruby2js/filter/jquery.rb
+- lib/ruby2js/filter/jsx.rb
 - lib/ruby2js/filter/matchAll.rb
 - lib/ruby2js/filter/minitest-jasmine.rb
 - lib/ruby2js/filter/node.rb
@@ -136,11 +142,13 @@ files:
 - lib/ruby2js/filter/require.rb
 - lib/ruby2js/filter/return.rb
 - lib/ruby2js/filter/securerandom.rb
+- lib/ruby2js/filter/stimulus.rb
 - lib/ruby2js/filter/tagged_templates.rb
 - lib/ruby2js/filter/underscore.rb
 - lib/ruby2js/filter/vue.rb
-- lib/ruby2js/filter/wunderbar.rb
 - lib/ruby2js/haml.rb
+- lib/ruby2js/jsx.rb
+- lib/ruby2js/namespace.rb
 - lib/ruby2js/rails.rb
 - lib/ruby2js/serializer.rb
 - lib/ruby2js/sinatra.rb

data/lib/ruby2js/filter/esm_migration.rb

@@ -1,72 +0,0 @@
-require 'ruby2js'
-
-module Ruby2JS
-  module Filter
-    module ESMMigration
-      include SEXP
-
-      def initialize(*args)
-        @esm_include = nil
-        super
-      end
-
-      def process(node)
-        return super if @esm_include
-        @esm_include = Set.new
-        @esm_exclude = Set.new
-        @esm_export = nil
-        result = super
-
-        esm_walk(result)
-
-        inventory = (@esm_include - @esm_exclude).to_a.sort
-
-        if inventory.empty? and not @esm_export
-          result
-        else
-          list = inventory.map do |name|
-             if name == "React" and defined? Ruby2JS::Filter::React
-               s(:import, "#{name.downcase}", s(:const, nil, name))
-             elsif not %w(JSON Object).include? name
-               s(:import, "./#{name.downcase}.js", s(:const, nil, name))
-             end
-          end
-
-          list.push result
-
-          if @esm_export
-            list.push s(:export, :default, s(:const, nil, @esm_export))
-          end
-
-          s(:begin, *list.compact)
-        end
-      end
-
-      # gather constants
-      def esm_walk(node)
-        # extract ivars and cvars
-        if node.type == :const and node.children.first == nil
-          @esm_include << node.children.last.to_s
-        elsif node.type == :xnode
-          name = node.children.first
-          @esm_include << name unless name.empty? or name =~ /^[a-z]/
-        elsif node.type == :casgn and node.children.first == nil
-          @esm_exclude << node.children[1].to_s
-        elsif node.type == :class and node.children.first.type == :const
-          if node.children.first.children.first == nil
-            name = node.children.first.children.last.to_s
-            @esm_exclude << name
-            @esm_export ||= name
-          end
-        end
-
-        # recurse
-        node.children.each do |child|
-          esm_walk(child) if Parser::AST::Node === child
-        end
-      end
-    end
-
-    DEFAULTS.push ESMMigration
-  end
-end

data/lib/ruby2js/filter/fast-deep-equal.rb

@@ -1,23 +0,0 @@
-require 'ruby2js'
-
-module Ruby2JS
-  module Filter
-    module Fast_Deep_Equal
-      include SEXP
-
-      SCALAR = [ :float, :int, :nil, :str ]
-
-      def on_send(node)
-        return super unless node.children.length == 3
-        left, method, right = node.children
-        return super unless method == :==
-        return super if SCALAR.include? left.type
-        return super if SCALAR.include? right.type
-
-        node.updated nil, [nil, :$eq, left, right]
-      end
-    end
-
-    DEFAULTS.push Fast_Deep_Equal
-  end
-end