refactor: Tweak docs and some variable names

Author: rekmarks

packages/json-rpc-engine/README.md

@@ -81,7 +81,7 @@ await server.handle(notification);
 
 ### Legacy compatibility
 
-Use the `asLegacyMiddleware` function to use a `JsonRpcEngineV2` or V2 middleware as middleware in a legacy `JsonRpcEngine`.
+Use `asLegacyMiddleware()` to convert a `JsonRpcEngineV2` or one or more V2 middleware into a legacy middleware.
 
 #### Context propagation
 

packages/json-rpc-engine/src/README.md

@@ -23,8 +23,7 @@ engine.push(function (req, res, next, end) {
 
 ### V2 compatibility
 
-Use the `asV2Middleware` function to use a `JsonRpcEngine` or legacy middleware as middleware in a
-`JsonRpcEngineV2`:
+Use `asV2Middleware()` to convert a `JsonRpcEngine` or one or more legacy middleware into a V2 middleware.
 
 #### Context propagation
 

packages/json-rpc-engine/src/asV2Middleware.ts

@@ -8,9 +8,9 @@ import {
 } from '@metamask/utils';
 
 import type {
+  JsonRpcEngine,
   JsonRpcEngineEndCallback,
   JsonRpcEngineNextCallback,
-  JsonRpcEngine,
 } from './JsonRpcEngine';
 import { type JsonRpcMiddleware as LegacyMiddleware } from './JsonRpcEngine';
 import { mergeMiddleware } from './mergeMiddleware';
@@ -43,7 +43,7 @@ export function asV2Middleware<
 /**
  * Convert one or more legacy middleware into a {@link JsonRpcEngineV2} middleware.
  *
- * @param middleware - The legacy middleware(s) to convert.
+ * @param middleware - The legacy middleware to convert.
  * @returns The {@link JsonRpcEngineV2} middleware.
  */
 export function asV2Middleware<
@@ -54,10 +54,10 @@ export function asV2Middleware<
 ): JsonRpcMiddleware<Request>;
 
 /**
- * Implementation of asV2Middleware that handles all input types.
+ * The asV2Middleware implementation.
  *
- * @param engineOrMiddleware - A legacy engine, a single legacy middleware, or an array of legacy middleware.
- * @param rest - Additional legacy middleware when the first argument is a single middleware.
+ * @param engineOrMiddleware - A legacy engine or legacy middleware.
+ * @param rest - Any additional legacy middleware when the first argument is a middleware.
  * @returns The {@link JsonRpcEngineV2} middleware.
  */
 export function asV2Middleware<

packages/json-rpc-engine/src/v2/asLegacyMiddleware.ts

@@ -38,10 +38,10 @@ export function asLegacyMiddleware<
 ): LegacyMiddleware<Params, ResultConstraint<Request>>;
 
 /**
- * Implementation of asLegacyMiddleware that handles all input types.
+ * The asLegacyMiddleware implementation.
  *
- * @param engineOrMiddleware - A V2 engine, a single V2 middleware, or an array of V2 middleware.
- * @param rest - Additional V2 middleware when the first argument is a single middleware.
+ * @param engineOrMiddleware - A V2 engine or V2 middleware.
+ * @param rest - Any additional V2 middleware when the first argument is a middleware.
  * @returns The legacy middleware.
  */
 export function asLegacyMiddleware<
@@ -53,7 +53,7 @@ export function asLegacyMiddleware<
     | JsonRpcMiddleware<Request, ResultConstraint<Request>>,
   ...rest: JsonRpcMiddleware<Request, ResultConstraint<Request>>[]
 ): LegacyMiddleware<Params, ResultConstraint<Request>> {
-  const JsonRpcMiddleware =
+  const v2Middleware =
     typeof engineOrMiddleware === 'function'
       ? JsonRpcEngineV2.create({
           middleware: [engineOrMiddleware, ...rest],
@@ -65,11 +65,11 @@ export function asLegacyMiddleware<
     const context = makeContext(req);
     let modifiedRequest: Request | undefined;
 
-    const result = await JsonRpcMiddleware({
+    const result = await v2Middleware({
       request,
       context,
       next: (finalRequest) => {
-        modifiedRequest = finalRequest as Request | undefined;
+        modifiedRequest = finalRequest;
         return Promise.resolve(undefined);
       },
     });