rbs_heuristic_prototype 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af9a660bde45e0c64701f350cfa2fed63112aec3c6fd3320f0387b084c5a6236
-  data.tar.gz: 92f823a5423774c78a092b35719ec66d440e9d63dedc5488d07c7049fd3b03df
+  metadata.gz: 358275124e21b1d4060fa62fc17832e1b4398ce9f74571a5cda63b5677747bf0
+  data.tar.gz: 819ee68bf26be9f3352191aa62a1e244ac0584dd66ab19946df7230da8fb176b
 SHA512:
-  metadata.gz: e0dce9def43b5ccd0445b2f4d748626381bf83eeb9831082b9bd184d49f7cc0a0c039c16a3dda9df2ae7bb595a056e2b39551c13dbc8b74a91dcbd54f474732d
-  data.tar.gz: 9d7aeaa4971e0b3535e94abb963dde4ad11528c8601a770ddae778fa4adde37a0bca5c4b7dda2088fe651ebf0ecd9dae843df4ea02aa00a97fd7824cc4c6417d
+  metadata.gz: aa3f88c1a520774b683e9cdb486e0ba58f68bb7da9c96629658e6bd1eb58efd320b26952d07e673bfa38ecc13a374ebb561c6fca4cf61d6cf4af380aae50b88f
+  data.tar.gz: 371d461c82de68c3fd03ef9cbf03a2f59b4c03e796255938237087fa066fff359bcfced4b5d760a778dfa95d5839540b9c80e590a5d248a449a267cae57407ea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs_heuristic_prototype (0.4.0)
+    rbs_heuristic_prototype (0.5.0)
       rbs
 
 GEM

data/README.md

@@ -45,6 +45,8 @@ by `rbs prototype` according to the heuristic rules.
 * Rule 4:
   * Convert a scoped module/class definition (ex. `Foo::Bar::Baz`) to the nested definitions
   * This is useful to define intermediate modules automatically like what Rails and zeitwerk does.
+* Rule 5:
+  * Convert a module reference without type arguments (ex. `include Enumerable`) to a module reference with type arguments (ex. `include Enumerable[untyped]`)
 
 ## Development
 

data/lib/rbs_heuristic_prototype/filters/type_args_filter.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require_relative "base"
+
+module RbsHeuristicPrototype
+  module Filters
+    class TypeArgsFilter < Base
+      def process_class(decl)
+        decl = super(decl)
+        RBS::AST::Declarations::Class.new(
+          name: decl.name,
+          type_params: decl.type_params,
+          super_class: process_super_class(decl.super_class),
+          members: decl.members,
+          annotations: decl.annotations,
+          location: decl.location,
+          comment: decl.comment
+        )
+      end
+
+      def process_super_class(decl)
+        return unless decl
+
+        class_decl = external_env.class_decls[decl.name.absolute!]
+        if class_decl && decl.args.empty?
+          RBS::AST::Declarations::Class::Super.new(
+            name: decl.name,
+            args: class_decl.type_params.size.times.map { :untyped },
+            location: decl.location
+          )
+        else
+          decl
+        end
+      end
+
+      def process_member(decl)
+        case decl
+        when RBS::AST::Members::Include
+          process_include(decl)
+        else
+          super
+        end
+      end
+
+      def process_include(decl)
+        class_decl = external_env.class_decls[decl.name.absolute!]
+        if class_decl && decl.args.empty?
+          RBS::AST::Members::Include.new(
+            name: decl.name,
+            args: class_decl.type_params.size.times.map { :untyped },
+            annotations: decl.annotations,
+            location: decl.location,
+            comment: decl.comment
+          )
+        else
+          decl
+        end
+      end
+
+      def external_env
+        loader = RBS::EnvironmentLoader.new
+        RBS::Environment.from_loader(loader)
+      end
+    end
+  end
+end

data/lib/rbs_heuristic_prototype/rake_task.rb

@@ -10,7 +10,8 @@ module RbsHeuristicPrototype
       active_model_validations: Filters::ActiveModelValidationsFilter,
       boolean_methods: Filters::BooleanMethodsFilter,
       deep_module: Filters::DeepModuleFilter,
-      symbol_array_constants: Filters::SymbolArrayConstantsFilter
+      symbol_array_constants: Filters::SymbolArrayConstantsFilter,
+      type_args: Filters::TypeArgsFilter
     }.freeze
 
     attr_reader :name, :path

data/lib/rbs_heuristic_prototype/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbsHeuristicPrototype
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/rbs_heuristic_prototype.rb

@@ -4,6 +4,7 @@ require_relative "rbs_heuristic_prototype/filters/active_model_validations_filte
 require_relative "rbs_heuristic_prototype/filters/boolean_methods_filter"
 require_relative "rbs_heuristic_prototype/filters/deep_module_filter"
 require_relative "rbs_heuristic_prototype/filters/symbol_array_constants_filter"
+require_relative "rbs_heuristic_prototype/filters/type_args_filter"
 require_relative "rbs_heuristic_prototype/rake_task"
 require_relative "rbs_heuristic_prototype/version"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs_heuristic_prototype
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -49,6 +49,7 @@ files:
 - lib/rbs_heuristic_prototype/filters/boolean_methods_filter.rb
 - lib/rbs_heuristic_prototype/filters/deep_module_filter.rb
 - lib/rbs_heuristic_prototype/filters/symbol_array_constants_filter.rb
+- lib/rbs_heuristic_prototype/filters/type_args_filter.rb
 - lib/rbs_heuristic_prototype/rake_task.rb
 - lib/rbs_heuristic_prototype/version.rb
 - rbs_collection.lock.yaml