graphiti_graphql 0.1.9 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bd5442b050cb69b0ee1d2bc601f6bba2aa6f891d87f0d30168f70979881e779
-  data.tar.gz: 2135585438d5c17da4a74f3e35110e6030a2ba52229118490eb4d10d941fa326
+  metadata.gz: e99c86540776f6e5aa93eaa422f4919cf4434f6116bb040267bd37f3a0036ba8
+  data.tar.gz: bfac34b9d8b0f5e5e96e9169d969b5a3efbe6d01d0c3da964d27649a6b7514be
 SHA512:
-  metadata.gz: 31419e16ea7745753d88fdb633d4f71d7c57d0bd4bc04a205df835d49cb0fb61412c7287ff53e992bf4f47cc50af1e8869fd525ee478a65dad8623c98513951c
-  data.tar.gz: 3415e4aab9e14a5c31338dc052f1e5487c4ee377e5def3fbccf49e60e3a33de8eca819d0b6f003c44e5d93c7b4a264f6e6ccae63249948ab09fbe94519e6a9b6
+  metadata.gz: 4c8d515d95e749457c887dadfaaedab1e8d9367d57565364a7a5ef969843ad13486f530a4e61623003198c7d099aa571cba2e4269b9e29a4f7941a7b700631ae
+  data.tar.gz: edfe5d07374179c3cceb6dc1fbfd05a6de8cc124759e65b659204f03eb5e0ee1c4980d0515f9b9cccb1ec6095706d7373283435804f5f618e94fb29e045d4b88

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphiti_graphql (0.1.6)
+    graphiti_graphql (0.1.12)
       activesupport (>= 4.1)
       graphiti (~> 1.3)
       graphql (~> 1.12)
@@ -9,9 +9,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.1)
-      activesupport (= 6.1.1)
-    activesupport (6.1.1)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -23,7 +23,7 @@ GEM
     ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
@@ -43,8 +43,8 @@ GEM
       dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    google-protobuf (3.15.2)
-    graphiti (1.3.0)
+    google-protobuf (3.17.3)
+    graphiti (1.3.2)
       activesupport (>= 4.1)
       concurrent-ruby (~> 1.0)
       dry-types (>= 0.15.0, < 2.0)
@@ -56,11 +56,11 @@ GEM
     graphiti_spec_helpers (1.0.5)
       graphiti (>= 1.0.alpha.1)
       rspec (~> 3.0)
-    graphql (1.12.3)
+    graphql (1.12.15)
     graphql-batch (0.4.3)
       graphql (>= 1.3, < 2)
       promise.rb (~> 0.7.2)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jsonapi-renderer (0.2.2)
     jsonapi-serializable (0.3.1)
@@ -68,19 +68,19 @@ GEM
     method_source (1.0.0)
     minitest (5.14.4)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     promise.rb (0.7.4)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
+      pry (~> 0.10)
     rainbow (3.0.0)
     rake (10.5.0)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -94,24 +94,24 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.8.1)
+    rubocop (1.20.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.9.2)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-ast (1.11.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.5)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
-    standard (0.12.0)
-      rubocop (= 1.8.1)
-      rubocop-performance (= 1.9.2)
+    standard (1.3.0)
+      rubocop (= 1.20.0)
+      rubocop-performance (= 1.11.5)
     standardrb (1.0.0)
       standard
     tzinfo (2.0.4)
@@ -137,4 +137,4 @@ DEPENDENCIES
   standardrb
 
 BUNDLED WITH
-   2.2.16
+   2.2.25

data/lib/graphiti_graphql/federation/resource_dsl.rb

@@ -7,10 +7,18 @@ module GraphitiGraphQL
           @type_name = type_name
         end
 
-        def has_many(relationship_name, foreign_key: nil, &blk)
+        def has_many(
+          relationship_name,
+          foreign_key: nil,
+          field: true,
+          filter: true,
+          &blk
+        )
           @caller.federated_has_many relationship_name,
             type: @type_name,
             foreign_key: foreign_key,
+            field: field,
+            filter: filter,
             &blk
         end
       end
@@ -29,14 +37,18 @@ module GraphitiGraphQL
           config[:federated_resources] ||= []
         end
 
+        # NB - for external use, use federated_type("Type").has_many instead
+        #
         # * Add to the list of external graphql-ruby types we need in schema
         # * Add a readable and filterable FK, without clobbering pre-existing
-        def federated_has_many(name, type:, foreign_key: nil, &blk)
+        def federated_has_many(name, type:, filter: true, field: true, foreign_key: nil, &blk)
           foreign_key ||= :"#{type.underscore}_id"
           resource = FederatedResource.new(type)
           federated_resources << resource
           resource.add_relationship(:has_many, name, self, foreign_key, &blk)
 
+          return unless (filter || field)
+
           attribute = attributes.find { |name, config|
             name.to_sym == foreign_key &&
               !!config[:readable] &&
@@ -44,20 +56,31 @@ module GraphitiGraphQL
           }
           has_filter = filters.key?(foreign_key)
           if !attribute && !has_filter
-            attribute foreign_key, :integer,
-              only: [:readable, :filterable],
-              schema: false,
-              readable: :gql?,
-              filterable: :gql?
-          elsif has_filter && !attribute
+            if field
+              opts = {
+                only: [:readable],
+                schema: false,
+                readable: :gql?
+              }
+              if filter
+                opts[:only] << :filterable
+                opts[:filterable] = :gql?
+              end
+              attribute foreign_key, :integer, opts
+            elsif filter
+              filter foreign_key, :integer, schema: false
+              attributes[foreign_key][:filterable] = :gql?
+            end
+          elsif has_filter && !attribute && field
             prior = filters[foreign_key]
             attribute foreign_key, prior[:type],
               only: [:readable, :filterable],
               schema: false,
               readable: :gql?
             filters[foreign_key] = prior
-          elsif attribute && !has_filter
-            filter foreign_key, attribute[:type]
+          elsif attribute && !has_filter && filter
+            filter foreign_key, attribute[:type], schema: false
+            attributes[foreign_key][:filterable] = :gql?
           end
         end
 

data/lib/graphiti_graphql/schema.rb

@@ -52,14 +52,18 @@ module GraphitiGraphQL
       @base_interface || BaseInterface
     end
 
-    def self.generate(entrypoint_resources = nil)
+    def self.generate(resources: nil, entrypoints: nil)
       instance = new
       schema = Class.new(::GraphitiGraphQL.schema_class || GraphQL::Schema)
       graphiti_schema = GraphitiGraphQL::GraphitiSchema::Wrapper
         .new(Graphiti::Schema.generate)
       instance.graphiti_schema = graphiti_schema
+
+      resources ||= graphiti_schema.resources
+      entrypoints ||= self.entrypoints || resources
+
       instance.schema = schema
-      instance.apply_query(entrypoint_resources || entrypoints)
+      instance.apply_query(resources, entrypoints)
       instance
     end
 
@@ -72,8 +76,8 @@ module GraphitiGraphQL
       @query_fields = {}
     end
 
-    def apply_query(entries)
-      query_type = generate_schema_query(entries)
+    def apply_query(resources, entrypoints)
+      query_type = generate_schema_query(resources, entrypoints)
       Federation::SchemaDecorator.decorate(self) if self.class.federation?
 
       # NB - don't call .query here of federation will break things
@@ -86,7 +90,7 @@ module GraphitiGraphQL
       schema.query # Actually fires the federation code
     end
 
-    def generate_schema_query(entrypoint_resources = nil)
+    def generate_schema_query(resources, entrypoints)
       existing_query = schema.instance_variable_get(:@query)
       existing_query ||= schema.send(:find_inherited_value, :query)
       # NB - don't call graphql_schema.query here of federation will break things
@@ -95,10 +99,13 @@ module GraphitiGraphQL
       query_class.graphql_name "Query"
       query_class.field_class BaseField
 
-      get_entrypoints(entrypoint_resources).each do |resource|
-        next if resource.remote?
+      # Ensure all types are generated, even if they aren't in a top-level Query
+      # We might now want to expose the query, but do want to federate the Type
+      get_schema_resources(resources).each do |resource|
         generate_type(resource)
+      end
 
+      get_schema_resources(entrypoints).each do |resource|
         add_index(query_class, resource)
         add_show(query_class, resource)
       end
@@ -198,14 +205,14 @@ module GraphitiGraphQL
         top_level_single: true
     end
 
-    def get_entrypoints(manually_specified)
+    def get_schema_resources(manually_specified)
       resources = graphiti_schema.resources
       if manually_specified
         resources = resources.select { |r|
           manually_specified.map(&:name).include?(r.name)
         }
       end
-      resources
+      resources.reject(&:remote?)
     end
 
     def generate_sort_att_type_for(resource)

data/lib/graphiti_graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGraphQL
-  VERSION = "0.1.9"
+  VERSION = "0.1.14"
 end

data/lib/graphiti_graphql.rb

@@ -53,8 +53,11 @@ module GraphitiGraphQL
       @generated ||= GraphitiGraphQL::Schema.generate
     end
 
-    def generate!(entrypoint_resources = nil)
-      @generated = GraphitiGraphQL::Schema.generate(entrypoint_resources)
+    # resources: All resources to put in the schema. Mostly just for testing.
+    # entrypoints: All resources to expose as top-level query objects
+    def generate!(resources: nil, entrypoints: nil)
+      @generated = GraphitiGraphQL::Schema
+        .generate(resources: resources, entrypoints: entrypoints)
     end
 
     def generated?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.14
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphiti