tapioca 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61d9bbc2b60ce6dda54eea3d826374ca132938ddcdcc8185a731124bbad31704
-  data.tar.gz: 35aec9d2e19694a7737ff32b7a1d1863b24e255f327d87adbc42e435bcef048c
+  metadata.gz: 80c01f44b0600c3a471756da73e43322f23a951c8f3ebc15c922173a0ccf4d3c
+  data.tar.gz: c778cfa78b0494513f5ad329e432c534486c3ba75fcf83969462a874c7dc7654
 SHA512:
-  metadata.gz: 0d09845c43897689c8b04ca565d22a9dc817fd8100276624ffc21a83538d3584e70909df6007aee6d360abbd63ff2842132db1346483d1faf9615500e4b3c988
-  data.tar.gz: b6ec214e91ed9b14fea2eefc00e396c4ea45157995dfdc52f98494da9498025bfa033b807324757f877768819e68ff04ff32dd0e10f93642dbb48e89dcd77451
+  metadata.gz: f12a7fbe0d64109a5de03d8a98f564413bee79dc0db1ced8c1eaeae8dae73e68c73e8e76a188a06ddfefa333b11024d606359b7f706d13e15dacea081b0a19ea
+  data.tar.gz: 99ef8194c8dab5e776b591992aefa8b59b0b8e2d8927caecfc68d63bf7bb4c7687a92af772c6f8ac5fcfbdd8ebe1f9c1b748a2334b8207d233939d35d02d2b26

data/lib/tapioca/dsl/compilers/aasm.rb

@@ -69,6 +69,17 @@ module Tapioca
             T::Array[String],
           )
 
+        TRANSITION_CALLBACKS =
+          T.let(
+            [
+              "on_transition",
+              "guard",
+              "after",
+              "success",
+            ].freeze,
+            T::Array[String],
+          )
+
         ConstantType = type_member { { fixed: T.all(T::Class[::AASM], ::AASM::ClassMethods) } }
 
         sig { override.void }
@@ -162,8 +173,37 @@ module Tapioca
                     method,
                     parameters: [
                       create_opt_param("symbol", type: "T.nilable(Symbol)", default: "nil"),
-                      create_block_param("block", type: "T.nilable(T.proc.bind(#{constant_name}).void)"),
+                      create_block_param(
+                        "block",
+                        type: "T.nilable(T.proc.bind(#{constant_name}).params(opts: T.untyped).void)",
+                      ),
+                    ],
+                  )
+                end
+
+                event.create_method(
+                  "transitions",
+                  parameters: [
+                    create_opt_param("definitions", default: "nil", type: "T.untyped"),
+                    create_block_param("block", type: "T.nilable(T.proc.bind(PrivateAASMTransition).void)"),
+                  ],
+                )
+              end
+
+              machine.create_class("PrivateAASMTransition", superclass_name: "AASM::Core::Transition") do |transition|
+                TRANSITION_CALLBACKS.each do |method|
+                  return_type = "T.untyped"
+                  return_type = "T::Boolean" if method == "guard"
+
+                  transition.create_method(
+                    method,
+                    parameters: [
+                      create_block_param(
+                        "block",
+                        type: "T.nilable(T.proc.bind(#{constant_name}).params(opts: T.untyped).void)",
+                      ),
                     ],
+                    return_type: return_type,
                   )
                 end
               end

data/lib/tapioca/helpers/rbi_helper.rb

@@ -107,36 +107,12 @@ module Tapioca
 
     sig { params(name: String).returns(T::Boolean) }
     def valid_method_name?(name)
-      # try to parse a method definition with this name
-      iseq = RubyVM::InstructionSequence.compile("def #{name}; end", nil, nil, 0, false)
-      # pull out the first operation in the instruction sequence and its first argument
-      op, arg, _data = iseq.to_a.dig(-1, 0)
-      # make sure that the operation is a method definition and the method that was
-      # defined has the expected name, for example, for `def !foo; end` we don't get
-      # a syntax error but instead get a method defined as `"foo"`
-      op == :definemethod && arg == name.to_sym
-    rescue SyntaxError
-      false
+      Prism.parse_success?("def self.#{name}(a); end")
     end
 
     sig { params(name: String).returns(T::Boolean) }
     def valid_parameter_name?(name)
-      sentinel_method_name = :sentinel_method_name
-      # try to parse a method definition with this name as the name of a
-      # keyword parameter. If we use a positional parameter, then parameter names
-      # like `&` (and maybe others) will be treated like `def foo(&); end` and will
-      # thus be considered valid. Using a required keyword parameter prevents that
-      # confusion between Ruby syntax and parameter name.
-      iseq = RubyVM::InstructionSequence.compile("def #{sentinel_method_name}(#{name}:); end", nil, nil, 0, false)
-      # pull out the first operation in the instruction sequence and its first argument and data
-      op, arg, data = iseq.to_a.dig(-1, 0)
-      # make sure that:
-      # 1. a method was defined, and
-      # 2. the method has the expected method name, and
-      # 3. the method has a keyword parameter with the expected name
-      op == :definemethod && arg == sentinel_method_name && data.dig(11, :keyword, 0) == name.to_sym
-    rescue SyntaxError
-      false
+      Prism.parse_success?("def sentinel_method_name(#{name}:); end")
     end
   end
 end

data/lib/tapioca/internal.rb

@@ -23,6 +23,7 @@ require "tempfile"
 require "thor"
 require "yaml"
 require "yard-sorbet"
+require "prism"
 
 require "tapioca/runtime/dynamic_mixin_compiler"
 require "tapioca/sorbet_ext/backcompat_patches"

data/lib/tapioca/runtime/reflection.rb

@@ -178,13 +178,19 @@ module Tapioca
       end
 
       # Examines the call stack to identify the closest location where a "require" is performed
-      # by searching for the label "<top (required)>". If none is found, it returns the location
+      # by searching for the label "<top (required)>" or "block in <class:...>" in the
+      # case of an ActiveSupport.on_load hook. If none is found, it returns the location
       # labeled "<main>", which is the original call site.
       sig { params(locations: T.nilable(T::Array[Thread::Backtrace::Location])).returns(String) }
       def resolve_loc(locations)
         return "" unless locations
 
-        resolved_loc = locations.find { |loc| REQUIRED_FROM_LABELS.include?(loc.label) }
+        resolved_loc = locations.find do |loc|
+          label = loc.label
+          next unless label
+
+          REQUIRED_FROM_LABELS.include?(label) || label.start_with?("block in <class:")
+        end
         return "" unless resolved_loc
 
         resolved_loc.absolute_path || ""

data/lib/tapioca/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Tapioca
-  VERSION = "0.16.3"
+  VERSION = "0.16.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-03 00:00:00.000000000 Z
+date: 2024-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.20
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: A Ruby Interface file generator for gems, core types and the Ruby standard