Adjust some of the behavior overhaul changes

.changeset/gold-games-live.md

@@ -0,0 +1,7 @@
+---
+"graphile-build-pg": patch
+"graphile-build": patch
+---
+
+Behaviors can now be registered by more than one plugin. Apply behaviors to more
+entities. Don't log so much.

graphile-build/graphile-build-pg/src/plugins/PgBasicsPlugin.ts

@@ -153,6 +153,11 @@ declare global {
   }
 }
 
+const FILTER_DEF = {
+  description: "can we filter this resource/codec",
+  entities: ["pgCodec", "pgResource"],
+} as const;
+
 export const PgBasicsPlugin: GraphileConfig.Plugin = {
   name: "PgBasicsPlugin",
   description:
@@ -220,17 +225,35 @@ export const PgBasicsPlugin: GraphileConfig.Plugin = {
           description: 'should we add this attribute to the "base" input type?',
           entities: [],
         },
-        // filter: { description: "can we filter these results?", entities: [] },
+        filter: FILTER_DEF,
+        "query:resource:list:filter": FILTER_DEF,
+        "query:resource:connection:filter": FILTER_DEF,
+        "manyRelation:resource:list:filter": FILTER_DEF,
+        "manyRelation:resource:connection:filter": FILTER_DEF,
+        "singularRelation:resource:list:filter": FILTER_DEF,
+        "singularRelation:resource:connection:filter": FILTER_DEF,
+        "typeField:resource:list:filter": FILTER_DEF,
+        "typeField:resource:connection:filter": FILTER_DEF,
+        "queryField:resource:list:filter": FILTER_DEF,
+        "queryField:resource:connection:filter": FILTER_DEF,
         filterBy: { description: "can we filter by this thing?", entities: [] },
         order: {
           description: "can we order these results?",
           entities: ["pgCodec", "pgResource"],
         },
-        orderBy: { description: "can we order by this thing?", entities: [] },
+        orderBy: {
+          description: "can we order by this thing?",
+          entities: ["pgCodecAttribute", "pgResource" /* < computed column */],
+        },
 
         connection: {
           description: "should we use a connection field for this?",
-          entities: ["pgCodec", "pgResource", "pgResourceUnique"],
+          entities: [
+            "pgCodec",
+            "pgCodecRelation",
+            "pgResource",
+            "pgResourceUnique",
+          ],
         },
         list: {
           description: "should we use a list field for this?",

graphile-build/graphile-build-pg/src/plugins/PgConditionArgumentPlugin.ts

@@ -45,11 +45,6 @@ declare global {
   }
 }
 
-const FILTER_DEF = {
-  description: "can we filter this resource/codec",
-  entities: ["pgCodec", "pgResource"],
-} as const;
-
 export const PgConditionArgumentPlugin: GraphileConfig.Plugin = {
   name: "PgConditionArgumentPlugin",
   description: "Adds the 'condition' argument to connections and lists",
@@ -64,22 +59,6 @@ export const PgConditionArgumentPlugin: GraphileConfig.Plugin = {
   },
 
   schema: {
-    behaviorRegistry: {
-      add: {
-        filter: FILTER_DEF,
-        "query:resource:list:filter": FILTER_DEF,
-        "query:resource:connection:filter": FILTER_DEF,
-        "manyRelation:resource:list:filter": FILTER_DEF,
-        "manyRelation:resource:connection:filter": FILTER_DEF,
-        "singularRelation:resource:list:filter": FILTER_DEF,
-        "singularRelation:resource:connection:filter": FILTER_DEF,
-        "typeField:resource:list:filter": FILTER_DEF,
-        "typeField:resource:connection:filter": FILTER_DEF,
-        "queryField:resource:list:filter": FILTER_DEF,
-        "queryField:resource:connection:filter": FILTER_DEF,
-      },
-    },
-
     entityBehavior: {
       pgCodec: ["select", "filter"],
       pgResource: {

graphile-build/graphile-build/src/behavior.ts

@@ -152,8 +152,7 @@ export class Behavior {
     [behavior in keyof GraphileBuild.BehaviorStrings]: {
       entities: {
         [entity in keyof GraphileBuild.BehaviorEntities]?: {
-          description: string;
-          pluginName: string | null;
+          registeredBy: Array<{ pluginName: string; description: string }>;
         };
       };
     };
@@ -198,16 +197,20 @@ export class Behavior {
             allEntities.add(entityType);
             if (!this.behaviorRegistry[behaviorString].entities[entityType]) {
               this.behaviorRegistry[behaviorString].entities[entityType] = {
-                description,
-                pluginName: plugin.name,
+                registeredBy: [
+                  {
+                    description,
+                    pluginName: plugin.name,
+                  },
+                ],
               };
             } else {
-              console.warn(
-                `Behavior string '${behaviorString}' for entity type '${entityType}' has been registered by more than one plugin! First registered by ${
-                  this.behaviorRegistry[behaviorString].entities[entityType]!
-                    .pluginName
-                }; and then later again by ${plugin.name}`,
-              );
+              this.behaviorRegistry[behaviorString].entities[
+                entityType
+              ]!.registeredBy.push({
+                description,
+                pluginName: plugin.name,
+              });
             }
           }
         }
@@ -338,6 +341,8 @@ export class Behavior {
     filter: TFilter,
   ): boolean | undefined {
     if (!this.behaviorRegistry[filter]) {
+      // DIAGNOSTIC: enable for all filters
+      /*
       console.warn(
         `Behavior '${filter}' is not registered; please be sure to register it within a plugin via \`plugin.schema.behaviorRegistry.add[${JSON.stringify(
           filter,
@@ -346,11 +351,11 @@ export class Behavior {
         )}] }\`.`,
       );
       // Register it so we don't see this warning again
+      */
       this.behaviorRegistry[filter] = {
         entities: {
           [entityType]: {
-            description: "Unregistered.",
-            pluginName: null,
+            registeredBy: [],
           },
         },
       };
@@ -373,8 +378,7 @@ export class Behavior {
       );
       // Register it so we don't see this warning again
       this.behaviorRegistry[filter].entities[entityType] = {
-        description: "Unregistered!",
-        pluginName: null,
+        registeredBy: [],
       };
     }
     const finalString = this.getBehaviorForEntity(