graph_weaver 0.4.0 → 0.4.6

data/lib/graph_weaver/transport/faraday.rb

@@ -32,6 +32,13 @@ module GraphWeaver
       def initialize(url_or_connection, headers: {}, &block)
         @connection = case url_or_connection
         when ::Faraday::Connection
+          # a prebuilt connection carries its own headers/middleware, so
+          # headers:/block would be silently dropped — fail loudly instead
+          unless headers.empty? && block.nil?
+            raise ArgumentError,
+              "headers:/block are ignored when passing a prebuilt Faraday::Connection — configure them on it"
+          end
+
           url_or_connection
         else
           # Faraday appends the default adapter when the block doesn't set one

data/lib/graph_weaver/transport.rb

@@ -62,15 +62,18 @@ class GraphWeaver::Transport
     # envelope so QueryError machinery sees the structured errors; only
     # a body that isn't GraphQL (proxy pages, HTML 500s) is a ServerError.
     unless (200..299).cover?(status)
-      return parsed if parsed.is_a?(Hash) && parsed.key?("errors")
+      # only a body carrying actual GraphQL errors flows through — a 4xx with
+      # `"errors": null` (or []) isn't a structured error response, so the
+      # status stays the signal
+      return parsed if parsed.is_a?(Hash) && parsed["errors"].is_a?(Array) && parsed["errors"].any?
 
       raise GraphWeaver::ServerError.new(status:, body: body.to_s)
     end
 
-    unless parsed
-      # a 200 that isn't GraphQL — an HTML error page from a proxy, a
-      # captive portal: the server misbehaved, classify it that way
-      raise GraphWeaver::ServerError.new(status:, body: "non-JSON response: #{body.to_s[0, 500]}")
+    unless parsed.is_a?(Hash)
+      # a 200 that isn't a GraphQL object — an HTML error page from a proxy, a
+      # captive portal, or a bare JSON array/string: the server misbehaved
+      raise GraphWeaver::ServerError.new(status:, body: "non-GraphQL response: #{body.to_s[0, 500]}")
     end
 
     parsed

data/lib/graph_weaver/version.rb

@@ -1,3 +1,3 @@
 module GraphWeaver
-  VERSION = "0.4.0"
+  VERSION = "0.4.6"
 end

data/lib/graph_weaver.rb

@@ -17,9 +17,6 @@ require_relative "graph_weaver/railtie" if defined?(::Rails::Railtie)
 
 # opt-in extras:
 #      require "graph_weaver/transport/faraday"        # Faraday transport
-#      require "graph_weaver/directive_defaults_patch" # fix graphql-ruby
-#        dropping directive argument defaults when loading SDL (needed for
-#        Apollo supergraph SDL until rmosolgo/graphql-ruby#5659 ships)
 module GraphWeaver
   class << self
     # A client for one GraphQL server — transport, schema, and scoped
@@ -296,6 +293,15 @@ module GraphWeaver
     # (`class Module; include T::Sig`) — extracted so it's stubbable in tests.
     def global_tsig? = Module.include?(T::Sig)
 
+    # The closest entry in `dictionary` to `term` — a "did you mean" suggestion,
+    # or nil (also nil when did_you_mean isn't loadable). One home for the guard
+    # used by codegen validation, alias resolution, and the runtime prop hints.
+    def did_you_mean(dictionary, term)
+      return unless defined?(DidYouMean::SpellChecker)
+
+      DidYouMean::SpellChecker.new(dictionary: dictionary).correct(term).first
+    end
+
     # Teach the generator how a GraphQL custom scalar deserializes into a
     # rich Ruby object (and serializes back onto the wire when used as a
     # variable):
@@ -348,13 +354,15 @@ module GraphWeaver
     end
 
     # Include app-owned helper modules into every struct generated from a
-    # GraphQL type — derived values live as methods next to the honest
-    # wire data, and srb tc checks them against each query's selection:
+    # GraphQL type — derived values live as methods next to the honest wire
+    # data, on the struct at runtime (fakes/cassettes included):
     #
     #      GraphWeaver.extend_type("Pet", PetHelpers)
     #
-    # Or build the mixin inline with a block (module_eval'd into an
-    # auto-named module — quick, but invisible to srb tc):
+    # A helper that reads a wire field is checked by srb tc in the module's
+    # own scope, not the struct's, so the field won't resolve — write it
+    # # typed: false or reach it via T.unsafe(self). Or build the mixin inline
+    # with a block (module_eval'd into an auto-named module — invisible to srb):
     #
     #      GraphWeaver.extend_type("Pet") do
     #        def display_name = "#{name} the pet"
@@ -362,8 +370,8 @@ module GraphWeaver
     #
     # Additive (repeated and client-scoped registrations stack). Global;
     # client.extend_type scopes to one client.
-    def extend_type(graphql_name, *mixins, requires: nil, &block)
-      Codegen.extend_type(graphql_name, *mixins, requires:, &block)
+    def extend_type(graphql_name, *mixins, requires: nil, **kw, &block)
+      Codegen.extend_type(graphql_name, *mixins, requires:, **kw, &block)
     end
 
     # Restore the built-in scalars, dropping every custom registration —

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graph_weaver
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.6
 platform: ruby
 authors:
 - Daniel Pepper
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.6.7
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
@@ -253,7 +253,6 @@ files:
 - lib/graph_weaver/codegen/enum_type.rb
 - lib/graph_weaver/codegen/nodes.rb
 - lib/graph_weaver/codegen/scalar_type.rb
-- lib/graph_weaver/directive_defaults_patch.rb
 - lib/graph_weaver/errors.rb
 - lib/graph_weaver/hints.rb
 - lib/graph_weaver/inflect.rb

data/lib/graph_weaver/directive_defaults_patch.rb

@@ -1,32 +0,0 @@
-# typed: false — monkeypatch; `self.class` resolves against the prepended host
-# frozen_string_literal: true
-
-require "graphql"
-
-# graphql-ruby's SDL builder (BuildFromDefinition#prepare_directives)
-# passes only the directive arguments present at the usage site, but
-# Directive#initialize validates ALL defined arguments — so a defaulted
-# non-null argument (`extension: Boolean! = false`) raises
-# InvalidArgumentError when omitted, even though the SDL spec makes it
-# optional. Real Apollo supergraph SDL (join v0.3) hits this on every
-# @join__type usage.
-#
-# Fill in the declared defaults before validation. This is what upstream
-# should do; present in graphql 2.6.3 (latest at time of writing).
-#
-# TODO: delete this file (and its requires) once
-# https://github.com/rmosolgo/graphql-ruby/pull/5659 lands in a released
-# graphql version and the Gemfile picks it up.
-module DirectiveDefaultsPatch
-  def initialize(owner, **arguments)
-    self.class.all_argument_definitions.each do |arg_defn|
-      if !arguments.key?(arg_defn.keyword) && arg_defn.default_value?
-        arguments[arg_defn.keyword] = arg_defn.default_value
-      end
-    end
-
-    super(owner, **arguments)
-  end
-end
-
-GraphQL::Schema::Directive.prepend(DirectiveDefaultsPatch)