Merge remote-tracking branch 'origin/main' into andrueastman/untypedNodes

Author: Andrew Omondi

package-lock.json

@@ -5,6 +5,7 @@ import type {
   PrimitiveTypesForDeserialization,
   PrimitiveTypesForDeserializationType,
   RequestAdapter,
+  SendMethods,
 } from "./requestAdapter";
 import type { RequestConfiguration } from "./requestConfiguration";
 import {
@@ -125,53 +126,53 @@ function getRequestConfigurationValue(args: any[]) {
   }
   return undefined;
 }
-function sendAsync(
+function send(
   requestAdapter: RequestAdapter,
   requestInfo: RequestInformation,
   metadata: RequestMetadata,
 ) {
   switch (metadata.adapterMethodName) {
-    case "sendAsync":
+    case "send":
       if (!metadata.responseBodyFactory) {
         throw new Error("couldn't find response body factory");
       }
-      return requestAdapter.sendAsync(
+      return requestAdapter.send(
         requestInfo,
         metadata.responseBodyFactory as ParsableFactory<Parsable>,
         metadata.errorMappings,
       );
-    case "sendCollectionAsync":
+    case "sendCollection":
       if (!metadata.responseBodyFactory) {
         throw new Error("couldn't find response body factory");
       }
-      return requestAdapter.sendCollectionAsync(
+      return requestAdapter.sendCollection(
         requestInfo,
         metadata.responseBodyFactory as ParsableFactory<Parsable>,
         metadata.errorMappings,
       );
-    case "sendCollectionOfPrimitiveAsync":
+    case "sendCollectionOfPrimitive":
       if (!metadata.responseBodyFactory) {
         throw new Error("couldn't find response body factory");
       }
-      return requestAdapter.sendCollectionOfPrimitiveAsync(
+      return requestAdapter.sendCollectionOfPrimitive(
         requestInfo,
         metadata.responseBodyFactory as Exclude<
           PrimitiveTypesForDeserialization,
           "ArrayBuffer"
         >,
         metadata.errorMappings,
       );
-    case "sendPrimitiveAsync":
+    case "sendPrimitive":
       if (!metadata.responseBodyFactory) {
         throw new Error("couldn't find response body factory");
       }
-      return requestAdapter.sendPrimitiveAsync(
+      return requestAdapter.sendPrimitive(
         requestInfo,
         metadata.responseBodyFactory as PrimitiveTypesForDeserialization,
         metadata.errorMappings,
       );
-    case "sendNoResponseContentAsync":
-      return requestAdapter.sendNoResponseContentAsync(
+    case "sendNoResponseContent":
+      return requestAdapter.sendNoResponseContent(
         requestInfo,
         metadata.errorMappings,
       );
@@ -223,7 +224,7 @@ export function apiClientProxifier<T extends object>(
                     undefined,
                     requestConfiguration,
                   );
-                  return sendAsync(requestAdapter, requestInfo, metadata);
+                  return send(requestAdapter, requestInfo, metadata);
                 };
               case "patch":
                 return (...args: any[]) => {
@@ -237,7 +238,7 @@ export function apiClientProxifier<T extends object>(
                     getRequestMediaTypeUserDefinedValue(metadata, args),
                     getRequestConfigurationValue(args),
                   );
-                  return sendAsync(requestAdapter, requestInfo, metadata);
+                  return send(requestAdapter, requestInfo, metadata);
                 };
               case "put":
                 return (...args: any[]) => {
@@ -251,7 +252,7 @@ export function apiClientProxifier<T extends object>(
                     getRequestMediaTypeUserDefinedValue(metadata, args),
                     getRequestConfigurationValue(args),
                   );
-                  return sendAsync(requestAdapter, requestInfo, metadata);
+                  return send(requestAdapter, requestInfo, metadata);
                 };
               case "delete":
                 return (...args: any[]) => {
@@ -265,7 +266,7 @@ export function apiClientProxifier<T extends object>(
                     getRequestMediaTypeUserDefinedValue(metadata, args),
                     getRequestConfigurationValue(args),
                   );
-                  return sendAsync(requestAdapter, requestInfo, metadata);
+                  return send(requestAdapter, requestInfo, metadata);
                 };
               case "post":
                 return (...args: any[]) => {
@@ -279,7 +280,7 @@ export function apiClientProxifier<T extends object>(
                     getRequestMediaTypeUserDefinedValue(metadata, args),
                     getRequestConfigurationValue(args),
                   );
-                  return sendAsync(requestAdapter, requestInfo, metadata);
+                  return send(requestAdapter, requestInfo, metadata);
                 };
               case "toGetRequestInformation":
                 return (
@@ -405,7 +406,7 @@ export interface RequestMetadata {
   requestBodyContentType?: string;
   responseBodyContentType?: string;
   errorMappings?: ErrorMappings;
-  adapterMethodName?: keyof RequestAdapter;
+  adapterMethodName?: SendMethods;
   responseBodyFactory?:
     | ParsableFactory<Parsable>
     | PrimitiveTypesForDeserialization;

packages/abstractions/src/apiClientProxifier.ts

@@ -7,7 +7,7 @@ export class NativeResponseHandler implements ResponseHandler {
   public value?: any;
   /** The error mappings for the response to use when deserializing failed responses bodies. Where an error code like 401 applies specifically to that status code, a class code like 4XX applies to all status codes within the range if an the specific error code is not present. */
   public errorMappings: ErrorMappings | undefined;
-  public handleResponseAsync<NativeResponseType, ModelType>(
+  public handleResponse<NativeResponseType, ModelType>(
     response: NativeResponseType,
     errorMappings: ErrorMappings | undefined,
   ): Promise<ModelType> {