Combine serde context (#418)

* feat: combine serde types, cleanup unused imports

* feat: update model location

* feat: change Injectable to Pluggable

Author: Chase Coalwell

packages/middleware-content-length/src/index.ts

@@ -5,7 +5,7 @@ import {
   BodyLengthCalculator,
   MetadataBearer,
   BuildHandlerOutput,
-  Injectable
+  Pluggable
 } from "@aws-sdk/types";
 import { HttpRequest } from "@aws-sdk/protocol-http";
 
@@ -46,7 +46,7 @@ export function contentLengthMiddleware(
 
 export const contentLengthPlugin = (options: {
   bodyLengthChecker: BodyLengthCalculator;
-}): Injectable<any, any> => clientStack => {
+}): Pluggable<any, any> => clientStack => {
   clientStack.add(contentLengthMiddleware(options.bodyLengthChecker), {
     step: "build",
     tags: { SET_CONTENT_LENGTH: true }

packages/middleware-serde/src/serdePlugin.ts

@@ -1,12 +1,11 @@
 import {
   RequestSerializer,
   ResponseDeserializer,
-  Injectable,
+  Pluggable,
   Protocol,
   MetadataBearer,
   MiddlewareStack,
-  EndpointBearer,
-  Provider
+  EndpointBearer
 } from "@aws-sdk/types";
 import { deserializerMiddleware } from "./deserializerMiddleware";
 import { serializerMiddleware } from "./serializerMiddleware";
@@ -17,11 +16,11 @@ export function serdePlugin<
   OutputType extends MetadataBearer,
   DeserializerRuntimeUtils
 >(
-  config: PromisifyEndpoint<SerializerRuntimeUtils> &
+  config: SerializerRuntimeUtils &
     DeserializerRuntimeUtils & { protocol: Protocol<any, any> },
   serializer: RequestSerializer<any, SerializerRuntimeUtils>,
   deserializer: ResponseDeserializer<OutputType, any, DeserializerRuntimeUtils>
-): Injectable<InputType, OutputType> {
+): Pluggable<InputType, OutputType> {
   return (commandStack: MiddlewareStack<InputType, OutputType>) => {
     commandStack.add(deserializerMiddleware(config, deserializer), {
       step: "deserialize",
@@ -33,7 +32,3 @@ export function serdePlugin<
     });
   };
 }
-
-export type PromisifyEndpoint<T extends EndpointBearer> = {
-  [K in keyof T]: K extends "endpoint" ? Provider<T[K]> : T[K];
-};

packages/middleware-serde/src/serializerMiddleware.ts

@@ -7,14 +7,13 @@ import {
   Protocol,
   EndpointBearer
 } from "@aws-sdk/types";
-import { PromisifyEndpoint } from "./serdePlugin";
 
 export function serializerMiddleware<
   Input extends object,
   Output extends object,
   RuntimeUtils extends EndpointBearer
 >(
-  options: { protocol: Protocol<any, any> } & PromisifyEndpoint<RuntimeUtils>,
+  options: { protocol: Protocol<any, any> } & RuntimeUtils,
   serializer: RequestSerializer<any, RuntimeUtils>
 ): SerializeMiddleware<Input, Output> {
   return (

packages/smithy-client/src/client.ts

@@ -1,5 +1,5 @@
 import { MiddlewareStack } from "@aws-sdk/middleware-stack";
-import { Protocol, Command, MetadataBearer, Injectable } from "@aws-sdk/types";
+import { Protocol, Command, MetadataBearer, Pluggable } from "@aws-sdk/types";
 
 export interface SmithyConfiguration<HandlerOptions> {
   protocol: Protocol<any, any, HandlerOptions>;
@@ -19,8 +19,8 @@ export class Client<
   constructor(config: SmithyConfiguration<HandlerOptions>) {
     this.config = config;
   }
-  use(injectable: Injectable<ClientInput, ClientOutput>) {
-    injectable(this.middlewareStack);
+  use(pluggable: Pluggable<ClientInput, ClientOutput>) {
+    pluggable(this.middlewareStack);
   }
   send<InputType extends ClientInput, OutputType extends ClientOutput>(
     command: Command<

packages/smithy-client/src/command.ts

@@ -1,9 +1,9 @@
 import { MiddlewareStack } from "@aws-sdk/middleware-stack";
-import { Injectable, HandlerOptions as InjectOptions } from "@aws-sdk/types";
+import { Pluggable, HandlerOptions as InjectOptions } from "@aws-sdk/types";
 
 export class Command<InputType extends object, OutputType extends object> {
   readonly middlewareStack = new MiddlewareStack<InputType, OutputType>();
-  use(injectable: Injectable<InputType, OutputType>) {
-    injectable(this.middlewareStack);
+  use(pluggable: Pluggable<InputType, OutputType>) {
+    pluggable(this.middlewareStack);
   }
 }