graphql_migrate_execution 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2835acca245bcfe0c626420ae2ce5ac96ee916e0a4dbb35a8db5f1c97a786e1b
-  data.tar.gz: 4522d268937cf7a4fd925b4cf0a8fb492ec797006cf48e9972ae74847390eb21
+  metadata.gz: 9c879a6e266b7520abe76bf69a63cbc7ff8a446fe6438ad0ca37c89368f4c153
+  data.tar.gz: cb33f65e293a55a01d3d2e440eb23f40e2f5c3fc28f1241720f40cacf76ca5d4
 SHA512:
-  metadata.gz: ad8ba9248a12a116f6e6170fbae55029914bd43b71e2aefcab54c85b87af4347e19cc3aa6a0ba87a9df2a1d7caf7594f901ae974e88208c82e473adc61378e3e
-  data.tar.gz: 128a44c801b750c31ad661af93745568a529389afb9fd738534125aba4a708d7c9ab7293b0e02cde6453473486763a09561e16892ac75c93fc39e91659e67672
+  metadata.gz: 99bdbfe4e36d7dce2a78ef1254d4bde1039d3c5189aa96df6c7dab18023ae1f3d58293e1dc98ae0f639f14ced08ebe4f930565d344ff2821fa765ae122c00d8f
+  data.tar.gz: 9e29f27f38e4603a2076071d91dd304c81239e39c59080dfdc533aa9a1f0dc11175bd354a4c924e13b9abd60ba18ba2a7ab79f5270ae6107015ee949cb1ec5ee

data/lib/graphql_migrate_execution/dataloader_all.rb

@@ -52,6 +52,15 @@ module GraphqlMigrateExecution
         else
           "objects.#{map_method} { |obj| obj#{call_chain} }"
         end
+      when /([A-Z][a-zA-Z_0-9]*(\.|\[)[:a-zA-Z0-9_\.\"\'\[\]]+)/
+        # Constant call
+        "objects.#{map_method} { |_obj| #{$1} }"
+      when /^("[a-zA-Z0-9 :_\.]+"|:[a-zA-Z0-9_]+)$/
+        # Constant literal
+        "Array.new(objects.size, #{$1})"
+      when /^([a-z_0-9.]+)$/
+        # Local variable or receiverless method, possibly followed by a method chain
+        "Array.new(objects.size, #{$1})"
       else
         raise ArgumentError, "Failed to transform Dataloader argument: #{old_load_arg_s.inspect}"
       end

data/lib/graphql_migrate_execution/fallback_value.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+module GraphqlMigrateExecution
+  # Turns `fallback_value: ...` into `resolve_static: true`
+  class FallbackValue < Strategy
+    self.color = :GREEN
+
+    def migrate(field_definition)
+      indent = field_definition.node.location.slice_lines[/^ +/]
+      method_name = self.class.prefix_if_necessary(field_definition.name)
+      is_interface = field_definition.type_definition.is_interface
+      new_body = "\n".dup
+
+      if is_interface
+        method_prefix = "def #{method_name}"
+        new_body << "#{indent}resolver_methods do\n"
+        method_indent = indent + "  "
+      else
+        method_prefix = "def self.#{method_name}"
+        method_indent = indent
+      end
+
+      new_body << "#{method_indent}#{method_prefix}(_context)\n"
+      new_body << method_indent + "  #{field_definition.fallback_value}\n"
+      new_body << method_indent + "end"
+
+      if is_interface
+        new_body << "\n#{indent}end"
+      end
+
+      @result_source.sub!(field_definition.source, field_definition.source + "\n" + new_body)
+      keyword_v = method_name == field_definition.name.to_s ? true : method_name.to_sym.inspect
+      inject_field_keyword(field_definition, :resolve_static, keyword_v)
+    end
+
+    def cleanup(field_definition)
+      remove_field_keyword(field_definition, :fallback_value)
+    end
+  end
+end

data/lib/graphql_migrate_execution/field_definition.rb

@@ -12,6 +12,7 @@ module GraphqlMigrateExecution
       @type_instance_method = nil
       @object_direct_method = nil
       @dig = nil
+      @fallback_value = nil
       @already_migrated = nil
 
       @resolver_method = nil
@@ -46,6 +47,8 @@ module GraphqlMigrateExecution
           ResolveStatic
         when :resolve_batch
           ResolveBatch
+        when :resolve_legacy_instance_method
+          DoNothing
         else
           raise ArgumentError, "Unexpected already_migrated: #{@already_migrated.inspect}"
         end
@@ -53,6 +56,8 @@ module GraphqlMigrateExecution
         resolver_method.migration_strategy
       when :resolver
         DoNothing
+      when :fallback_value
+        FallbackValue
       else
         raise "No migration strategy for resolve_mode #{@resolve_mode.inspect}"
       end
@@ -65,13 +70,13 @@ module GraphqlMigrateExecution
     end
 
     def future_resolve_shorthand
-      method_name = resolver_method.name
+      method_name = Strategy.prefix_if_necessary(resolver_method.name).to_sym
       name == method_name ? true : method_name
     end
 
     attr_writer :resolve_mode
 
-    attr_accessor :hash_key, :object_direct_method, :type_instance_method, :resolver, :dig, :already_migrated
+    attr_accessor :hash_key, :object_direct_method, :type_instance_method, :resolver, :dig, :already_migrated, :fallback_value
 
     def path
       @path ||= "#{type_definition.name}.#{@name}"

data/lib/graphql_migrate_execution/migration.rb

@@ -25,7 +25,11 @@ module GraphqlMigrateExecution
     attr_reader :colorable, :action_method, :implicit
 
     def run
-      Dir.glob(@glob).each do |filepath|
+      files = Dir.glob(@glob)
+      if files.size.zero?
+        warn "No files found for #{@glob.inspect}"
+      end
+      files.each do |filepath|
         source = File.read(filepath)
         action = Action.new(self, filepath, source)
         action.run

data/lib/graphql_migrate_execution/resolve_static.rb

@@ -11,6 +11,7 @@ module GraphqlMigrateExecution
 
     def cleanup(field_definition)
       remove_field_keyword(field_definition, :resolver_method)
+      remove_field_keyword(field_definition, :fallback_value)
       remove_resolver_method(field_definition)
     end
   end

data/lib/graphql_migrate_execution/resolver_method.rb

@@ -139,7 +139,7 @@ module GraphqlMigrateExecution
     end
 
     def returns_string_hash?
-      return_expressions.any? { |exp_node| exp_node.is_a?(Prism::HashNode) && exp_node.elements.all? { |el| el.key.is_a?(Prism::StringNode) } }
+      return_expressions.any? { |exp_node| exp_node.is_a?(Prism::HashNode) && exp_node.elements.size > 0 && exp_node.elements.all? { |el| el.key.is_a?(Prism::StringNode) } }
     end
 
     private

data/lib/graphql_migrate_execution/strategy.rb

@@ -52,6 +52,23 @@ module GraphqlMigrateExecution
       attr_accessor :color
     end
 
+    # These methods conflict with built-in class methods,
+    # so when migrating them, prefix them.
+    METHODS_TO_RENAME = [
+      "name",
+      "fields",
+      "arguments",
+    ]
+
+    def self.prefix_if_necessary(method_name)
+      name_s = method_name.to_s
+      if METHODS_TO_RENAME.include?(name_s)
+        "resolve_#{method_name}"
+      else
+        name_s
+      end
+    end
+
     private
 
     def inject_resolve_keyword(field_definition, keyword)
@@ -65,10 +82,13 @@ module GraphqlMigrateExecution
       if field_definition_source.include?(pair)
         # Pass, don't re-add it
       elsif field_definition_source.include?("#{keyword}:")
-        raise "Can't re-inject #{keyword} because it's already present in the definition:\n\n#{field_definition_source}"
+        warn "Can't re-inject #{keyword} because it's already present in the definition:\n\n#{field_definition_source}"
       else
         new_definition_source = if field_definition_source[/ [a-z_]+:/] # Does it already have keywords?
-          field_definition_source.sub(/(field.+?)((?: do)|(?: {)|$)/, "\\1, #{pair}\\2")
+          field_definition_source.sub(/(field.+?)((?:,$)|(?: do)|(?: {)|$)/, "\\1, #{pair}\\2")
+        elsif (block_node = field_definition.node.block)
+          block_source = block_node.location.slice
+          field_definition_source.sub(" " + block_source, ", #{pair} #{block_source}")
         else
           field_definition_source + ", #{pair}"
         end
@@ -85,30 +105,48 @@ module GraphqlMigrateExecution
 
     def replace_resolver_method(field_definition, new_params)
       resolver_method = field_definition.resolver_method
-      method_name = resolver_method.name
+      old_method_name = resolver_method.name.to_s
+      new_method_name = self.class.prefix_if_necessary(old_method_name)
       old_method = resolver_method.source
-      new_class_method = old_method
-        .sub("def ", 'def self.')
+
+      method_prefix = field_definition.type_definition.is_interface ? "def #{new_method_name}" : "def self.#{new_method_name}"
+      new_class_method = old_method.sub("def #{old_method_name}", method_prefix)
 
       if resolver_method.parameter_names.empty?
-        new_class_method.sub!(method_name.to_s, "#{method_name}(#{new_params})")
+        new_class_method.sub!(new_method_name, "#{new_method_name}(#{new_params})")
       else
-        new_class_method.sub!("def self.#{method_name}(", "def self.#{method_name}(#{new_params}, ")
+        new_class_method.sub!("#{method_prefix}(", "#{method_prefix}(#{new_params}, ")
+      end
+
+      if field_definition.type_definition.is_interface
+        indent = new_class_method[/\A +/]
+        new_class_method.gsub!(/^#{indent}/, "#{indent}  ")
+        new_class_method = "#{indent}resolver_methods do\n#{new_class_method}#{indent}end\n"
       end
 
       old_lines = old_method.split("\n")
-      new_body = old_lines.first[/^ +/] + "  self.class.#{method_name}(#{new_params}#{resolver_method.parameter_names.map { |n| ", #{n}: #{n}"}.join})"
-      new_inst_method = [old_lines.first, new_body, old_lines.last].join("\n")
+      forward_previous_params = resolver_method.parameter_names.map { |n| ", #{n}: #{n}"}.join
+      if old_lines.size == 1
+        # TODO doesn't support `def ... =` syntax
+        previous_def = /def [^;]+;/.match(old_method)
+        new_inst_method = old_lines.first[/^ +/] + "#{previous_def} self.class.#{new_method_name}(#{new_params}#{forward_previous_params}); end"
+      else
+        new_body = old_lines.first[/^ +/] + "  self.class.#{new_method_name}(#{new_params}#{forward_previous_params})"
+        new_inst_method = [old_lines.first, new_body, old_lines.last].join("\n")
+      end
 
       new_double_definition = new_class_method + "\n" + new_inst_method + "\n"
       @result_source.sub!(old_method, new_double_definition)
     end
 
+
     def remove_resolver_method(field_definition)
-      src_pattern = /(\n*)(#{Regexp.quote(field_definition.resolver_method.source)})(\n*)/
-      @result_source.sub!(src_pattern) do
-        # $2 includes a newline, too
-        "#{$1.length > 1 ? "\n" : ""}#{$3.length > 0 ? "\n" : ""}"
+      if field_definition.resolver_method
+        src_pattern = /(\n*)(#{Regexp.quote(field_definition.resolver_method.source)})(\n*)/
+        @result_source.sub!(src_pattern) do
+          # $2 includes a newline, too
+          "#{$1.length > 1 ? "\n" : ""}#{$3.length > 0 ? "\n" : ""}"
+        end
       end
     end
   end

data/lib/graphql_migrate_execution/type_definition.rb

@@ -7,9 +7,10 @@ module GraphqlMigrateExecution
       @field_definitions = {}
       @resolver_methods = {}
       @is_resolver = false
+      @is_interface
     end
 
-    attr_accessor :is_resolver, :migration
+    attr_accessor :is_resolver, :migration, :is_interface
 
     attr_reader :resolver_methods, :name, :field_definitions
 

data/lib/graphql_migrate_execution/version.rb

@@ -1,3 +1,3 @@
 module GraphqlMigrateExecution
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/graphql_migrate_execution/visitor.rb

@@ -24,6 +24,7 @@ module GraphqlMigrateExecution
 
     def visit_module_node(node)
       td = @type_definitions[node.name]
+      td.is_interface = true
       @type_definition_stack << td
       super
     ensure
@@ -38,7 +39,7 @@ module GraphqlMigrateExecution
             when "hash_key"
               @current_field_definition.resolve_mode ||= :hash_key
               @current_field_definition.hash_key = get_keyword_value(assoc.value)
-            when "resolver"
+            when "resolver", "mutation", "subscription"
               @current_field_definition.resolve_mode ||= :resolver
               @current_field_definition.resolver = get_keyword_value(assoc.value)
             when "method"
@@ -50,10 +51,15 @@ module GraphqlMigrateExecution
             when "dig"
               @current_field_definition.resolve_mode ||= :dig
               @current_field_definition.dig = get_keyword_value(assoc.value)
-            when "resolve_each", "resolve_static", "resolve_batch"
+            when "resolve_each", "resolve_static", "resolve_batch", "resolve_legacy_instance_method"
               # These should override any other keywords that are discovered
               @current_field_definition.resolve_mode = :already_migrated
               @current_field_definition.already_migrated = { assoc.key.unescaped.to_sym => get_keyword_value(assoc.value) }
+            when "fallback_value"
+              if !assoc.value.is_a?(Prism::NilNode)
+                @current_field_definition.resolve_mode ||= :fallback_value
+                @current_field_definition.fallback_value = self.class.source_for_constant_node(assoc.value)
+              end
             else
               # fallback_value,  connection, extensions, extras, resolver, mutation, subscription
               @current_field_definition.unknown_options << assoc.key.unescaped
@@ -65,11 +71,10 @@ module GraphqlMigrateExecution
     end
 
     def visit_call_node(node)
-      if node.receiver.nil? && node.name == :field
+      if node.receiver.nil? && node.name == :field && node.arguments
         first_arg = node.arguments.arguments.first # rubocop:disable Development/ContextIsPassedCop
-        if first_arg.is_a?(Prism::SymbolNode)
+        if first_arg.is_a?(Prism::SymbolNode) && (td = @type_definition_stack.last)
           field_name = first_arg.unescaped
-          td = @type_definition_stack.last
           @current_field_definition = td.field_definition(field_name, node)
         else
           warn "GraphQL-Ruby warning: Skipping unrecognized field definition: #{node.inspect}"
@@ -113,20 +118,29 @@ module GraphqlMigrateExecution
     end
 
     def visit_def_node(node)
-      if @is_public
-        td = @type_definition_stack.last
+      if @is_public && (td = @type_definition_stack.last)
         if node.receiver.nil?
           @current_resolver_method = td.resolver_method(node.name, node)
         end
 
         if node.name == :resolve && td.resolver_methods.size == 1
           td.is_resolver = true
-        elsif td.is_resolver && td.remove_resolver_methods.size > 1
+        elsif td.is_resolver && td.resolver_methods.size > 1
           td.is_resolver = false
         end
 
-        body = node.body.body
-        if @current_resolver_method && body.length == 1 && (call_node = body.first).is_a?(Prism::CallNode)
+        body = case node.body
+        when Prism::StatementsNode
+          node.body.body
+        when Prism::BeginNode
+          node.body.statements.body
+        when nil
+          nil
+        else
+          raise ArgumentError, "Unexpected DefNode body for `def #{node.name}`: #{node.body.class}"
+        end
+
+        if body && @current_resolver_method && body.length == 1 && (call_node = body.first).is_a?(Prism::CallNode)
           case call_node.name
           when :load, :request, :load_all, :request_all
             if (call_node2 = call_node.receiver).is_a?(Prism::CallNode) && call_node2.name == :with

data/lib/graphql_migrate_execution.rb

@@ -9,6 +9,7 @@ require "graphql_migrate_execution/visitor"
 require "graphql_migrate_execution/strategy"
 require "graphql_migrate_execution/implicit"
 require "graphql_migrate_execution/do_nothing"
+require "graphql_migrate_execution/fallback_value"
 require "graphql_migrate_execution/resolve_batch"
 require "graphql_migrate_execution/resolve_each"
 require "graphql_migrate_execution/resolve_static"

data/readme.md

@@ -186,4 +186,8 @@ bundle exec rake test # TEST=test/...
 
 ## TODO
 
+- [ ] Interfaces: use a `resolver_methods` block with instance methods
+- [ ] `@object` is not migrated, only `object` is
+- [ ] `**kwargs` is not correctly migrated into `resolve_static` methods
 - [ ] Does `--cleanup` work on my app? I haven't run it yet.
+- [ ] Doesn't support `def ... =`-style single-line methods

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: graphql_migrate_execution
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Robert Mosolgo
 bindir: bin
 cert_chain: []
-date: 2026-03-23 00:00:00.000000000 Z
+date: 2026-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb
@@ -96,6 +96,7 @@ files:
 - lib/graphql_migrate_execution/dataloader_manual.rb
 - lib/graphql_migrate_execution/dataloader_shorthand.rb
 - lib/graphql_migrate_execution/do_nothing.rb
+- lib/graphql_migrate_execution/fallback_value.rb
 - lib/graphql_migrate_execution/field_definition.rb
 - lib/graphql_migrate_execution/hash_key.rb
 - lib/graphql_migrate_execution/implicit.rb