Reverse fn, arg to arg,fn

graphile · May 17, 2024 · 0ee9787 · 0ee9787
1 parent 0c189a3
commit 0ee9787
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 40 deletions.
diff --git a/grafast/grafserv/src/core/base.ts b/grafast/grafserv/src/core/base.ts
@@ -164,6 +164,7 @@ export class GrafservBase {
     const { resolvedPreset } = this;
     return this.middlewares.run(
       "processRequest",
+      { resolvedPreset, requestDigest, instance: this },
       ({ requestDigest: request }) => {
         let returnValue: PromiseOrDirect<Result | null>;
         try {
@@ -190,7 +191,6 @@ export class GrafservBase {
           return returnValue;
         }
       },
-      { resolvedPreset, requestDigest, instance: this },
     );
   }
 
@@ -245,24 +245,20 @@ export class GrafservBase {
     return (
       new Promise((resolve) =>
         resolve(
-          middlewares.run(
-            "setPreset",
-            (dynamicOptions) => {
-              const { resolvedPreset } = dynamicOptions;
-              // Overwrite all the `this.*` properties at once
-              this.resolvedPreset = resolvedPreset;
-              this.middlewares = middlewares;
-              this.dynamicOptions = dynamicOptions as DynamicOptions;
-              this.initialized = true;
-              // ENHANCE: this.graphqlHandler?.release()?
-              this.refreshHandlers();
-              this.getExecutionConfig = dynamicOptions.getExecutionConfig;
-              // MUST come after the handlers have been refreshed, otherwise we'll
-              // get infinite loops
-              this.eventEmitter.emit("dynamicOptions:ready", {});
-            },
-            dynamicOptions,
-          ),
+          middlewares.run("setPreset", dynamicOptions, (dynamicOptions) => {
+            const { resolvedPreset } = dynamicOptions;
+            // Overwrite all the `this.*` properties at once
+            this.resolvedPreset = resolvedPreset;
+            this.middlewares = middlewares;
+            this.dynamicOptions = dynamicOptions as DynamicOptions;
+            this.initialized = true;
+            // ENHANCE: this.graphqlHandler?.release()?
+            this.refreshHandlers();
+            this.getExecutionConfig = dynamicOptions.getExecutionConfig;
+            // MUST come after the handlers have been refreshed, otherwise we'll
+            // get infinite loops
+            this.eventEmitter.emit("dynamicOptions:ready", {});
+          }),
         ),
       )
         .then(null, (e) => {

diff --git a/grafast/grafserv/src/middleware/graphiql.ts b/grafast/grafserv/src/middleware/graphiql.ts
@@ -24,11 +24,15 @@ export function makeGraphiQLHandler(
         ...makeHTMLParts(),
         ...htmlPartsFromConfig,
       };
-      await middlewares.run("ruruHTMLParts", noop, {
-        resolvedPreset,
-        htmlParts,
-        request,
-      });
+      await middlewares.run(
+        "ruruHTMLParts",
+        {
+          resolvedPreset,
+          htmlParts,
+          request,
+        },
+        noop,
+      );
     }
     const config: RuruServerConfig = {
       endpoint: dynamicOptions.graphqlPath,

diff --git a/grafast/grafserv/src/middleware/graphql.ts b/grafast/grafserv/src/middleware/graphql.ts
@@ -360,11 +360,15 @@ const _makeGraphQLHandlerInternal = (instance: GrafservBase) => {
       // Apply our middlewares (if any) to the body (they will mutate the body in place)
       const hookResult =
         middlewares.middlewares.processGraphQLRequestBody != null
-          ? middlewares.run("processGraphQLRequestBody", noop, {
-              resolvedPreset,
-              body: parsedBody,
-              request,
-            })
+          ? middlewares.run(
+              "processGraphQLRequestBody",
+              {
+                resolvedPreset,
+                body: parsedBody,
+                request,
+              },
+              noop,
+            )
           : undefined;
       if (hookResult != null) {
         await hookResult;

diff --git a/grafast/grafserv/src/utils.ts b/grafast/grafserv/src/utils.ts
@@ -210,11 +210,15 @@ export function makeGraphQLWSConfig(instance: GrafservBase): ServerOptions {
       } = await instance.getExecutionConfig(grafastCtx);
 
       const parsedBody = parseGraphQLJSONBody(message.payload);
-      await instance.middlewares.run("processGraphQLRequestBody", noop, {
-        resolvedPreset,
-        body: parsedBody,
-        graphqlWsContext: ctx,
-      });
+      await instance.middlewares.run(
+        "processGraphQLRequestBody",
+        {
+          resolvedPreset,
+          body: parsedBody,
+          graphqlWsContext: ctx,
+        },
+        noop,
+      );
 
       const { query, operationName, variableValues } =
         validateGraphQLBody(parsedBody);
@@ -254,11 +258,15 @@ export function makeGraphQLWSConfig(instance: GrafservBase): ServerOptions {
   const { resolvedPreset } = instance;
   return {
     onSubscribe(ctx, message) {
-      return instance.middlewares.run("onSubscribe", onSubscribe, {
-        resolvedPreset,
-        ctx,
-        message,
-      });
+      return instance.middlewares.run(
+        "onSubscribe",
+        {
+          resolvedPreset,
+          ctx,
+          message,
+        },
+        onSubscribe,
+      );
     },
     // TODO: validate that this actually does mask every error
     onError(_ctx, _message, errors) {

diff --git a/utils/graphile-config/src/middleware.ts b/utils/graphile-config/src/middleware.ts
@@ -46,10 +46,10 @@ export class Middlewares<TActivities extends MiddlewareObject<TActivities>> {
 
   run<TActivityName extends keyof TActivities>(
     activityName: TActivityName,
+    arg: ActivityParameter<TActivities, TActivityName>,
     activity: (
       arg: ActivityParameter<TActivities, TActivityName>,
     ) => ReturnType<ActivityFn<TActivities, TActivityName>>,
-    arg: ActivityParameter<TActivities, TActivityName>,
   ) {
     const middlewares = this.middlewares[activityName];
     if (middlewares === undefined) {