Fix preset default behavior - it should override plugins

graphile · Sep 26, 2024 · e720702 · e720702
1 parent 426e932
commit e720702
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/graphile-build/graphile-build/src/behavior.ts b/graphile-build/graphile-build/src/behavior.ts
@@ -194,27 +194,29 @@ export class Behavior {
       }
     }
 
+    const pluginDefaultBehavior = this.resolveBehavior(
+      null,
+      NULL_BEHAVIOR,
+      plugins.map((p) => [
+        `${p.name}.schema.globalBehavior`,
+        p.schema?.globalBehavior,
+      ]),
+      build,
+    );
     const defaultBehaviorFromPreset =
       this.resolvedPreset.schema?.defaultBehavior ?? "";
-    const resolvedDefaultBehavior: ResolvedBehavior = {
-      behaviorString: defaultBehaviorFromPreset as GraphileBuild.BehaviorString,
+    this.globalDefaultBehavior = {
+      behaviorString:
+        `${pluginDefaultBehavior.behaviorString} ${defaultBehaviorFromPreset}` as GraphileBuild.BehaviorString,
       stack: [
+        ...pluginDefaultBehavior.stack,
         {
           source: "preset.schema.defaultBehavior",
-          prefix: defaultBehaviorFromPreset,
-          suffix: "",
+          prefix: "",
+          suffix: defaultBehaviorFromPreset,
         },
       ],
     };
-    this.globalDefaultBehavior = this.resolveBehavior(
-      null,
-      resolvedDefaultBehavior,
-      plugins.map((p) => [
-        `${p.name}.schema.globalBehavior`,
-        p.schema?.globalBehavior,
-      ]),
-      build,
-    );
 
     orderedApply(
       plugins,