lib/graphql/groups/has_groups.rb in graphql-groups-0.1.1 vs lib/graphql/groups/has_groups.rb in graphql-groups-0.1.2

@@ -1,14 +1,24 @@
 # frozen_string_literal: true
+
 module GraphQL
   module Groups
     module HasGroups
       def self.included(base)
         base.extend(ClassMethods)
       end
 
+      attr_reader :scope
+
+      def initialize(object, context)
+        super(object, context)
+        @scope = instance_eval(&self.class.class_scope)
+      end
+
       module ClassMethods
+        attr_reader :class_scope
+
         # TODO: Error if there are no groupings defined
         def by(name, **options, &block)
           query_method = options[:query_method] || name
           resolver_method = "resolve_#{query_method}".to_sym
           group_field name, [own_result_type],
@@ -19,10 +29,11 @@
 
           define_method query_method do |**kwargs|
             kwargs[:scope].group(name)
           end
 
+          # TODO: Warn / Disallow overwriting these resolver methods
           define_method resolver_method do |**_|
             group[name]
           end
         end
 
@@ -35,34 +46,37 @@
         def result_type(&block)
           @own_result_type = instance_eval(&block)
         end
 
         def scope(&block)
-          @own_scope = block
+          @class_scope = block
         end
 
         private
 
         def own_result_type
-          name = "#{self.name.gsub(/Type$/, '')}ResultType"
-
-          type = name.safe_constantize || GraphQL::Groups::Schema::GroupResultType
+          type = find_result_type
           own_group_type = self
 
-          @classes ||= {}
-          @classes[type] ||= Class.new(type) do
-            graphql_name name
+          registry = GraphQL::Groups::GroupTypeRegistry.instance
+          # To avoid name conflicts check if a result type has already been registered, and if not create a new one
+          registry.get(type) || registry.register(type, Class.new(type) do
+            graphql_name type.name.demodulize
 
             field :group_by, own_group_type, null: false, camelize: true
 
             def group_by
               group_result[1][:nested]
             end
-          end
+          end)
         end
 
-        def own_scope
-          @own_scope ||= nil
+        def find_result_type
+          return @own_result_type if @own_result_type
+
+          return GraphQL::Groups::Schema::GroupResultType unless name
+
+          "#{name.gsub(/Type$/, '')}ResultType".safe_constantize || GraphQL::Groups::Schema::GroupResultType
         end
       end
     end
   end
 end