ruby-next-core 0.10.5 → 0.13.0

data/lib/ruby-next/language.rb

@@ -94,53 +94,29 @@ module RubyNext
         @runtime
       end
 
-      def transform(*args, **kwargs)
-        if mode == :rewrite
-          rewrite(*args, **kwargs)
-        else
-          regenerate(*args, **kwargs)
-        end
-      rescue Unparser::UnknownNodeError
-        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.0")
-          RubyNext.warn "Ruby Next fallbacks to \"rewrite\" transpiling mode since Unparser doesn't support 2.7+ AST yet.\n" \
-            "See https://github.com/mbj/unparser/pull/142"
+      def transform(source, rewriters: self.rewriters, using: RubyNext::Core.refine?, context: TransformContext.new)
+        retried = 0
+        new_source = nil
+        begin
+          new_source =
+            if mode == :rewrite
+              rewrite(source, rewriters: rewriters, using: using, context: context)
+            else
+              regenerate(source, rewriters: rewriters, using: using, context: context)
+            end
+        rescue Unparser::UnknownNodeError => err
+          RubyNext.warn "Ruby Next fallbacks to \"rewrite\" transpiling mode since the version of Unparser you use doesn't support some syntax yet: #{err.message}.\n" \
+            "Try upgrading the Unparser or set transpiling mode to \"rewrite\" in case you use some edge or experimental syntax."
           self.mode = :rewrite
+          retried += 1
+          retry unless retried > 1
+          raise
         end
-        rewrite(*args, **kwargs)
-      end
-
-      def regenerate(source, rewriters: self.rewriters, using: RubyNext::Core.refine?, context: TransformContext.new)
-        parse_with_comments(source).then do |(ast, comments)|
-          rewriters.inject(ast) do |tree, rewriter|
-            rewriter.new(context).process(tree)
-          end.then do |new_ast|
-            next source unless context.dirty?
-
-            Unparser.unparse(new_ast, comments)
-          end.then do |source|
-            next source unless RubyNext::Core.refine?
-            next source unless using && context.use_ruby_next?
-
-            Core.inject! source.dup
-          end
-        end
-      end
 
-      def rewrite(source, rewriters: self.rewriters, using: RubyNext::Core.refine?, context: TransformContext.new)
-        rewriters.inject(source) do |src, rewriter|
-          buffer = Parser::Source::Buffer.new("<dynamic>")
-          buffer.source = src
+        return new_source unless RubyNext::Core.refine?
+        return new_source unless using && context.use_ruby_next?
 
-          rewriter.new(context).rewrite(buffer, parse(src))
-        end.then do |new_source|
-          next source unless context.dirty?
-          new_source
-        end.then do |source|
-          next source unless RubyNext::Core.refine?
-          next source unless using && context.use_ruby_next?
-
-          Core.inject! source.dup
-        end
+        Core.inject! new_source.dup
       end
 
       def transformable?(path)
@@ -164,12 +140,37 @@ module RubyNext
 
       private
 
+      def regenerate(source, rewriters:, using:, context:)
+        parse_with_comments(source).then do |(ast, comments)|
+          rewriters.inject(ast) do |tree, rewriter|
+            rewriter.new(context).process(tree)
+          end.then do |new_ast|
+            next source unless context.dirty?
+
+            Unparser.unparse(new_ast, comments)
+          end
+        end
+      end
+
+      def rewrite(source, rewriters:, using:, context:)
+        rewriters.inject(source) do |src, rewriter|
+          buffer = Parser::Source::Buffer.new("<dynamic>")
+          buffer.source = src
+
+          rewriter.new(context).rewrite(buffer, parse(src))
+        end.then do |new_source|
+          next source unless context.dirty?
+
+          new_source
+        end
+      end
+
       attr_writer :watch_dirs
     end
 
     self.rewriters = []
     self.watch_dirs = %w[app lib spec test].map { |path| File.join(Dir.pwd, path) }
-    self.mode = ENV.fetch("RUBY_NEXT_TRANSPILE_MODE", "ast").to_sym
+    self.mode = ENV.fetch("RUBY_NEXT_TRANSPILE_MODE", "rewrite").to_sym
 
     require "ruby-next/language/rewriters/base"
 
@@ -179,9 +180,20 @@ module RubyNext
     require "ruby-next/language/rewriters/safe_navigation"
     rewriters << Rewriters::SafeNavigation
 
+    require "ruby-next/language/rewriters/numeric_literals"
+    rewriters << Rewriters::NumericLiterals
+
+    require "ruby-next/language/rewriters/required_kwargs"
+    rewriters << Rewriters::RequiredKwargs
+
     require "ruby-next/language/rewriters/args_forward"
     rewriters << Rewriters::ArgsForward
 
+    # Must be added after general args forward rewriter to become
+    # no-op in Ruby <2.7
+    require "ruby-next/language/rewriters/args_forward_leading"
+    rewriters << Rewriters::ArgsForwardLeading
+
     require "ruby-next/language/rewriters/numbered_params"
     rewriters << Rewriters::NumberedParams
 
@@ -193,11 +205,17 @@ module RubyNext
     require "ruby-next/language/rewriters/find_pattern"
     rewriters << Rewriters::FindPattern
 
+    require "ruby-next/language/rewriters/in_pattern"
+    rewriters << Rewriters::InPattern
+
     # Put endless range in the end, 'cause Parser fails to parse it in
     # pattern matching
     require "ruby-next/language/rewriters/endless_range"
     rewriters << Rewriters::EndlessRange
 
+    require "ruby-next/language/rewriters/endless_method"
+    RubyNext::Language.rewriters << RubyNext::Language::Rewriters::EndlessMethod
+
     if ENV["RUBY_NEXT_EDGE"] == "1"
       require "ruby-next/language/edge"
     end

data/lib/ruby-next/rubocop.rb

@@ -4,6 +4,7 @@
 # edge features and fix some bugs with 2.7+ syntax
 
 require "parser/ruby-next/version"
+require "ruby-next/language/parser"
 
 module RuboCop
   # Transform Ruby Next parser version to a float, e.g.: "2.8.0.1" => 2.801
@@ -37,7 +38,6 @@ module RuboCop
       def parser_class(version)
         return super unless version == RUBY_NEXT_VERSION
 
-        require "parser/rubynext"
         Parser::RubyNext
       end
     end
@@ -52,7 +52,7 @@ module RuboCop
   module AST
     module Traversal
       # Fixed in https://github.com/rubocop-hq/rubocop/pull/7786
-      %i[case_match in_pattern find_pattern].each do |type|
+      %i[case_match in_pattern find_pattern match_pattern match_pattern_p].each do |type|
         next if method_defined?(:"on_#{type}")
         module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
 def on_#{type}(node)
@@ -62,6 +62,10 @@ end
         RUBY
       end
     end
+
+    unless Builder.method_defined?(:match_pattern_p)
+      Builder.include RubyNext::Language::BuilderExt
+    end
   end
 end
 # rubocop:enable Layout/HeredocIndentation
@@ -102,27 +106,14 @@ module RuboCop
           send(:"on_#{body_node.type}", body_node)
         end
       end
-
-      unless method_defined?(:on_rasgn)
-        def on_rasgn(node)
-          val_node, asgn_node = *node
-          send(:"on_#{asgn_node.type}", asgn_node)
-          send(:"on_#{val_node.type}", val_node)
-        end
-
-        def on_mrasgn(node)
-          lhs, rhs = *node
-          send(:"on_#{lhs.type}", lhs)
-          send(:"on_#{rhs.type}", rhs)
-        end
-      end
     end
 
     module Layout
       require "rubocop/cop/layout/assignment_indentation"
-      AssignmentIndentation.prepend(Module.new do
-        POTENTIAL_RIGHT_TYPES = %i[ivasgn lvasgn cvasgn gvasgn casgn masgn].freeze
 
+      POTENTIAL_RIGHT_TYPES = %i[ivasgn lvasgn cvasgn gvasgn casgn masgn].freeze
+
+      AssignmentIndentation.prepend(Module.new do
         def check_assignment(node, *)
           return if rightward?(node)
           super

data/lib/ruby-next/setup_self.rb

@@ -3,10 +3,12 @@
 # This file setup LOAD_PATH to load Ruby Next own transpiled paths
 # (we cannot use language/setup here, 'cause it requires Core to be loaded)
 
-version = RubyNext.next_version
+version = RubyNext.next_ruby_version
 next_dirname = File.join(__dir__, "..", ".rbnext")
 lib_path = File.realpath(File.join(__dir__, ".."))
-current_index = $LOAD_PATH.index(lib_path)
+current_index = $LOAD_PATH.find_index do |load_path|
+  File.exist?(load_path) && File.realpath(load_path) == lib_path
+end
 
 loop do
   break unless version
@@ -18,5 +20,5 @@ loop do
     current_index += 1
   end
 
-  version = RubyNext.next_version(version)
+  version = RubyNext.next_ruby_version(version)
 end

data/lib/ruby-next/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyNext
-  VERSION = "0.10.5"
+  VERSION = "0.13.0"
 end

data/lib/ruby-next.rb

@@ -1,41 +1,8 @@
 # frozen_string_literal: true
 
 require "ruby-next/version"
-
-module RubyNext
-  # Mininum Ruby version supported by RubyNext
-  MIN_SUPPORTED_VERSION = Gem::Version.new("2.2.0")
-
-  # Where to store transpiled files (relative from the project LOAD_PATH, usually `lib/`)
-  RUBY_NEXT_DIR = ".rbnext"
-
-  # Defines last minor version for every major version
-  LAST_MINOR_VERSIONS = {
-    2 => 8, # 2.8 is required for backward compatibility: some gems already uses it
-    3 => 0
-  }.freeze
-
-  LATEST_VERSION = [3, 0].freeze
-
-  class << self
-    def next_version(version = RUBY_VERSION)
-      major, minor = Gem::Version.new(version).segments.map(&:to_i)
-
-      return if major >= LATEST_VERSION.first && minor >= LATEST_VERSION.last
-
-      nxt =
-        if LAST_MINOR_VERSIONS[major] == minor
-          "#{major + 1}.0.0"
-        else
-          "#{major}.#{minor + 1}.0"
-        end
-
-      Gem::Version.new(nxt)
-    end
-  end
-
-  require "ruby-next/setup_self"
-  require "ruby-next/core"
-  require "ruby-next/core_ext" if RubyNext::Core.core_ext?
-  require "ruby-next/logging"
-end
+require "ruby-next/config"
+require "ruby-next/setup_self"
+require "ruby-next/core"
+require "ruby-next/core_ext" if RubyNext::Core.core_ext?
+require "ruby-next/logging"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-next-core
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.13.0
 platform: ruby
 authors:
 - Vladimir Dementyev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-parser
@@ -16,32 +16,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.1
+        version: 3.0.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.1
+        version: 3.0.0.3
 - !ruby/object:Gem::Dependency
   name: unparser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.8
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.8
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
 description: "\n    Ruby Next Core is a zero deps version of Ruby Next meant to be
@@ -62,22 +56,27 @@ files:
 - bin/reparse
 - bin/ruby-next
 - bin/transform
+- lib/.rbnext/2.1/ruby-next/core.rb
+- lib/.rbnext/2.1/ruby-next/language.rb
 - lib/.rbnext/2.3/ruby-next/commands/core_ext.rb
 - lib/.rbnext/2.3/ruby-next/commands/nextify.rb
 - lib/.rbnext/2.3/ruby-next/language/eval.rb
 - lib/.rbnext/2.3/ruby-next/language/rewriters/base.rb
 - lib/.rbnext/2.3/ruby-next/language/rewriters/endless_range.rb
 - lib/.rbnext/2.3/ruby-next/language/rewriters/pattern_matching.rb
-- lib/.rbnext/2.3/ruby-next/language/rewriters/right_hand_assignment.rb
 - lib/.rbnext/2.3/ruby-next/utils.rb
+- lib/.rbnext/2.7/ruby-next/core.rb
 - lib/ruby-next.rb
 - lib/ruby-next/cli.rb
 - lib/ruby-next/commands/base.rb
 - lib/ruby-next/commands/core_ext.rb
 - lib/ruby-next/commands/nextify.rb
+- lib/ruby-next/config.rb
 - lib/ruby-next/core.rb
 - lib/ruby-next/core/array/deconstruct.rb
 - lib/ruby-next/core/array/difference_union_intersection.rb
+- lib/ruby-next/core/array/intersect.rb
+- lib/ruby-next/core/constants/frozen_error.rb
 - lib/ruby-next/core/constants/no_matching_pattern_error.rb
 - lib/ruby-next/core/enumerable/filter.rb
 - lib/ruby-next/core/enumerable/filter_map.rb
@@ -105,14 +104,17 @@ files:
 - lib/ruby-next/language/parser.rb
 - lib/ruby-next/language/proposed.rb
 - lib/ruby-next/language/rewriters/args_forward.rb
+- lib/ruby-next/language/rewriters/args_forward_leading.rb
 - lib/ruby-next/language/rewriters/base.rb
 - lib/ruby-next/language/rewriters/endless_method.rb
 - lib/ruby-next/language/rewriters/endless_range.rb
 - lib/ruby-next/language/rewriters/find_pattern.rb
+- lib/ruby-next/language/rewriters/in_pattern.rb
 - lib/ruby-next/language/rewriters/method_reference.rb
 - lib/ruby-next/language/rewriters/numbered_params.rb
+- lib/ruby-next/language/rewriters/numeric_literals.rb
 - lib/ruby-next/language/rewriters/pattern_matching.rb
-- lib/ruby-next/language/rewriters/right_hand_assignment.rb
+- lib/ruby-next/language/rewriters/required_kwargs.rb
 - lib/ruby-next/language/rewriters/runtime.rb
 - lib/ruby-next/language/rewriters/runtime/dir.rb
 - lib/ruby-next/language/rewriters/safe_navigation.rb
@@ -136,7 +138,7 @@ metadata:
   documentation_uri: http://github.com/ruby-next/ruby-next/blob/master/README.md
   homepage_uri: http://github.com/ruby-next/ruby-next
   source_code_uri: http://github.com/ruby-next/ruby-next
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,8 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Ruby Next core functionality
 test_files: []

data/lib/.rbnext/2.3/ruby-next/language/rewriters/right_hand_assignment.rb

@@ -1,117 +0,0 @@
-# frozen_string_literal: true
-
-module RubyNext
-  module Language
-    module Rewriters
-      class RightHandAssignment < Base
-        NAME = "right-hand-assignment"
-        SYNTAX_PROBE = "1 + 2 => a"
-        MIN_SUPPORTED_VERSION = Gem::Version.new("3.0.0")
-
-        def on_rasgn(node)
-          context.track! self
-
-          node = super(node)
-
-          val_node, asgn_node = *node
-
-          remove(val_node.loc.expression.end.join(asgn_node.loc.expression))
-          insert_before(val_node.loc.expression, "#{asgn_node.loc.expression.source} = ")
-
-          asgn_node.updated(
-            nil,
-            asgn_node.children + [val_node]
-          )
-        end
-
-        def on_vasgn(node)
-          return super(node) unless rightward?(node)
-
-          context.track! self
-
-          name, val_node = *node
-
-          remove(val_node.loc.expression.end.join(node.loc.name))
-          insert_before(val_node.loc.expression, "#{name} = ")
-
-          super(node)
-        end
-
-        def on_casgn(node)
-          return super(node) unless rightward?(node)
-
-          context.track! self
-
-          scope_node, name, val_node = *node
-
-          if scope_node
-            scope = scope_node.type == :cbase ? scope_node.loc.expression.source : "#{scope_node.loc.expression.source}::"
-            name = "#{scope}#{name}"
-          end
-
-          remove(val_node.loc.expression.end.join(node.loc.name))
-          insert_before(val_node.loc.expression, "#{name} = ")
-
-          super(node)
-        end
-
-        def on_mrasgn(node)
-          context.track! self
-
-          node = super(node)
-
-          lhs, rhs = *node
-
-          replace(lhs.loc.expression.end.join(rhs.loc.expression), ")")
-          insert_before(lhs.loc.expression, "#{rhs.loc.expression.source} = (")
-
-          node.updated(
-            :masgn,
-            [rhs, lhs]
-          )
-        end
-
-        def on_masgn(node)
-          return super(node) unless rightward?(node)
-
-          context.track! self
-
-          rhs, lhs = *node
-
-          replace(lhs.loc.expression.end.join(rhs.loc.expression), ")")
-          insert_before(lhs.loc.expression, "#{rhs.loc.expression.source} = (")
-
-          node = super(node)
-
-          lhs, rhs = *node
-
-          node.updated(
-            nil,
-            [
-              lhs,
-              s(:begin, rhs)
-            ]
-          )
-        end
-
-        private
-
-        def rightward?(node)
-          # Location could be empty for node built by rewriters
-          return false unless ((!node.loc.nil? || nil) && node.loc.operator)
-
-          assignee_loc =
-            if node.type == :masgn
-              node.children[0].loc.expression
-            else
-              node.loc.name
-            end
-
-          return false unless assignee_loc
-
-          assignee_loc.begin_pos > node.loc.operator.end_pos
-        end
-      end
-    end
-  end
-end

data/lib/ruby-next/language/rewriters/right_hand_assignment.rb

@@ -1,117 +0,0 @@
-# frozen_string_literal: true
-
-module RubyNext
-  module Language
-    module Rewriters
-      class RightHandAssignment < Base
-        NAME = "right-hand-assignment"
-        SYNTAX_PROBE = "1 + 2 => a"
-        MIN_SUPPORTED_VERSION = Gem::Version.new("3.0.0")
-
-        def on_rasgn(node)
-          context.track! self
-
-          node = super(node)
-
-          val_node, asgn_node = *node
-
-          remove(val_node.loc.expression.end.join(asgn_node.loc.expression))
-          insert_before(val_node.loc.expression, "#{asgn_node.loc.expression.source} = ")
-
-          asgn_node.updated(
-            nil,
-            asgn_node.children + [val_node]
-          )
-        end
-
-        def on_vasgn(node)
-          return super(node) unless rightward?(node)
-
-          context.track! self
-
-          name, val_node = *node
-
-          remove(val_node.loc.expression.end.join(node.loc.name))
-          insert_before(val_node.loc.expression, "#{name} = ")
-
-          super(node)
-        end
-
-        def on_casgn(node)
-          return super(node) unless rightward?(node)
-
-          context.track! self
-
-          scope_node, name, val_node = *node
-
-          if scope_node
-            scope = scope_node.type == :cbase ? scope_node.loc.expression.source : "#{scope_node.loc.expression.source}::"
-            name = "#{scope}#{name}"
-          end
-
-          remove(val_node.loc.expression.end.join(node.loc.name))
-          insert_before(val_node.loc.expression, "#{name} = ")
-
-          super(node)
-        end
-
-        def on_mrasgn(node)
-          context.track! self
-
-          node = super(node)
-
-          lhs, rhs = *node
-
-          replace(lhs.loc.expression.end.join(rhs.loc.expression), ")")
-          insert_before(lhs.loc.expression, "#{rhs.loc.expression.source} = (")
-
-          node.updated(
-            :masgn,
-            [rhs, lhs]
-          )
-        end
-
-        def on_masgn(node)
-          return super(node) unless rightward?(node)
-
-          context.track! self
-
-          rhs, lhs = *node
-
-          replace(lhs.loc.expression.end.join(rhs.loc.expression), ")")
-          insert_before(lhs.loc.expression, "#{rhs.loc.expression.source} = (")
-
-          node = super(node)
-
-          lhs, rhs = *node
-
-          node.updated(
-            nil,
-            [
-              lhs,
-              s(:begin, rhs)
-            ]
-          )
-        end
-
-        private
-
-        def rightward?(node)
-          # Location could be empty for node built by rewriters
-          return false unless node.loc&.operator
-
-          assignee_loc =
-            if node.type == :masgn
-              node.children[0].loc.expression
-            else
-              node.loc.name
-            end
-
-          return false unless assignee_loc
-
-          assignee_loc.begin_pos > node.loc.operator.end_pos
-        end
-      end
-    end
-  end
-end