feat(codegen): support type import statements

Author: kuhe

.changeset/famous-planes-vanish.md

@@ -0,0 +1,2 @@
+---
+---

Makefile

@@ -18,10 +18,6 @@ generate-protocol-tests:
 	cp -r ./smithy-typescript-protocol-test-codegen/build/smithyprojections/smithy-typescript-protocol-test-codegen/my-local-model/typescript-client-codegen/ ./private/my-local-model
 	cp -r ./smithy-typescript-protocol-test-codegen/build/smithyprojections/smithy-typescript-protocol-test-codegen/my-local-model-schema/typescript-client-codegen/ ./private/my-local-model-schema
 	node ./scripts/post-protocol-test-codegen
-	npx prettier --write ./private/smithy-rpcv2-cbor
-	npx prettier --write ./private/smithy-rpcv2-cbor-schema
-	npx prettier --write ./private/my-local-model
-	npx prettier --write ./private/my-local-model-schema
 	yarn
 	(cd ./private/smithy-rpcv2-cbor && npm run build)
 	(cd ./private/smithy-rpcv2-cbor-schema && npm run build)

private/my-local-model-schema/src/XYZService.ts

@@ -1,13 +1,18 @@
 // smithy-typescript generated code
-import { XYZServiceClient, XYZServiceClientConfig } from "./XYZServiceClient";
-import { GetNumbersCommand, GetNumbersCommandInput, GetNumbersCommandOutput } from "./commands/GetNumbersCommand";
+import { createAggregatedClient } from "@smithy/smithy-client";
+import type { HttpHandlerOptions as __HttpHandlerOptions } from "@smithy/types";
+
+import {
+  type GetNumbersCommandInput,
+  type GetNumbersCommandOutput,
+  GetNumbersCommand,
+} from "./commands/GetNumbersCommand";
 import {
+  type TradeEventStreamCommandInput,
+  type TradeEventStreamCommandOutput,
   TradeEventStreamCommand,
-  TradeEventStreamCommandInput,
-  TradeEventStreamCommandOutput,
 } from "./commands/TradeEventStreamCommand";
-import { createAggregatedClient } from "@smithy/smithy-client";
-import { HttpHandlerOptions as __HttpHandlerOptions } from "@smithy/types";
+import { XYZServiceClient } from "./XYZServiceClient";
 
 const commands = {
   GetNumbersCommand,
@@ -19,8 +24,14 @@ export interface XYZService {
    * @see {@link GetNumbersCommand}
    */
   getNumbers(): Promise<GetNumbersCommandOutput>;
-  getNumbers(args: GetNumbersCommandInput, options?: __HttpHandlerOptions): Promise<GetNumbersCommandOutput>;
-  getNumbers(args: GetNumbersCommandInput, cb: (err: any, data?: GetNumbersCommandOutput) => void): void;
+  getNumbers(
+    args: GetNumbersCommandInput,
+    options?: __HttpHandlerOptions,
+  ): Promise<GetNumbersCommandOutput>;
+  getNumbers(
+    args: GetNumbersCommandInput,
+    cb: (err: any, data?: GetNumbersCommandOutput) => void
+  ): void;
   getNumbers(
     args: GetNumbersCommandInput,
     options: __HttpHandlerOptions,
@@ -33,7 +44,7 @@ export interface XYZService {
   tradeEventStream(): Promise<TradeEventStreamCommandOutput>;
   tradeEventStream(
     args: TradeEventStreamCommandInput,
-    options?: __HttpHandlerOptions
+    options?: __HttpHandlerOptions,
   ): Promise<TradeEventStreamCommandOutput>;
   tradeEventStream(
     args: TradeEventStreamCommandInput,
@@ -44,6 +55,7 @@ export interface XYZService {
     options: __HttpHandlerOptions,
     cb: (err: any, data?: TradeEventStreamCommandOutput) => void
   ): void;
+
 }
 
 /**

private/my-local-model-schema/src/XYZServiceClient.ts

@@ -1,82 +1,97 @@
 // smithy-typescript generated code
-import {
-  HttpAuthSchemeInputConfig,
-  HttpAuthSchemeResolvedConfig,
-  defaultXYZServiceHttpAuthSchemeParametersProvider,
-  resolveHttpAuthSchemeConfig,
-} from "./auth/httpAuthSchemeProvider";
-import { GetNumbersCommandInput, GetNumbersCommandOutput } from "./commands/GetNumbersCommand";
-import { TradeEventStreamCommandInput, TradeEventStreamCommandOutput } from "./commands/TradeEventStreamCommand";
-import {
-  ClientInputEndpointParameters,
-  ClientResolvedEndpointParameters,
-  EndpointParameters,
-  resolveClientEndpointParameters,
-} from "./endpoint/EndpointParameters";
-import { getRuntimeConfig as __getRuntimeConfig } from "./runtimeConfig";
-import { RuntimeExtension, RuntimeExtensionsConfig, resolveRuntimeExtensions } from "./runtimeExtensions";
 import {
   DefaultIdentityProviderConfig,
   getHttpAuthSchemeEndpointRuleSetPlugin,
   getHttpSigningPlugin,
 } from "@smithy/core";
 import { getSchemaSerdePlugin } from "@smithy/core/schema";
 import {
-  EventStreamSerdeInputConfig,
-  EventStreamSerdeResolvedConfig,
+  type EventStreamSerdeInputConfig,
+  type EventStreamSerdeResolvedConfig,
   resolveEventStreamSerdeConfig,
 } from "@smithy/eventstream-serde-config-resolver";
 import { getContentLengthPlugin } from "@smithy/middleware-content-length";
 import {
-  EndpointInputConfig,
-  EndpointRequiredInputConfig,
-  EndpointRequiredResolvedConfig,
-  EndpointResolvedConfig,
+  type EndpointInputConfig,
+  type EndpointRequiredInputConfig,
+  type EndpointRequiredResolvedConfig,
+  type EndpointResolvedConfig,
   resolveEndpointConfig,
   resolveEndpointRequiredConfig,
 } from "@smithy/middleware-endpoint";
-import { RetryInputConfig, RetryResolvedConfig, getRetryPlugin, resolveRetryConfig } from "@smithy/middleware-retry";
-import { HttpHandlerUserInput as __HttpHandlerUserInput } from "@smithy/protocol-http";
 import {
+  type RetryInputConfig,
+  type RetryResolvedConfig,
+  getRetryPlugin,
+  resolveRetryConfig,
+} from "@smithy/middleware-retry";
+import type { HttpHandlerUserInput as __HttpHandlerUserInput } from "@smithy/protocol-http";
+import {
+  type DefaultsMode as __DefaultsMode,
+  type SmithyConfiguration as __SmithyConfiguration,
+  type SmithyResolvedConfiguration as __SmithyResolvedConfiguration,
   Client as __Client,
-  DefaultsMode as __DefaultsMode,
-  SmithyConfiguration as __SmithyConfiguration,
-  SmithyResolvedConfiguration as __SmithyResolvedConfiguration,
 } from "@smithy/smithy-client";
-import {
-  ClientProtocol,
-  HttpRequest,
-  HttpResponse,
+import type {
   BodyLengthCalculator as __BodyLengthCalculator,
   CheckOptionalClientConfig as __CheckOptionalClientConfig,
   ChecksumConstructor as __ChecksumConstructor,
+  ClientProtocol,
   Decoder as __Decoder,
   Encoder as __Encoder,
   EventStreamSerdeProvider as __EventStreamSerdeProvider,
   HashConstructor as __HashConstructor,
   HttpHandlerOptions as __HttpHandlerOptions,
+  HttpRequest,
+  HttpResponse,
   Logger as __Logger,
   Provider as __Provider,
   StreamCollector as __StreamCollector,
   UrlParser as __UrlParser,
 } from "@smithy/types";
 
-export { __Client };
+import {
+  type HttpAuthSchemeInputConfig,
+  type HttpAuthSchemeResolvedConfig,
+  defaultXYZServiceHttpAuthSchemeParametersProvider,
+  resolveHttpAuthSchemeConfig,
+} from "./auth/httpAuthSchemeProvider";
+import type { GetNumbersCommandInput, GetNumbersCommandOutput } from "./commands/GetNumbersCommand";
+import type { TradeEventStreamCommandInput, TradeEventStreamCommandOutput } from "./commands/TradeEventStreamCommand";
+import {
+  type ClientInputEndpointParameters,
+  type ClientResolvedEndpointParameters,
+  type EndpointParameters,
+  resolveClientEndpointParameters,
+} from "./endpoint/EndpointParameters";
+import { getRuntimeConfig as __getRuntimeConfig } from "./runtimeConfig";
+import {
+  type RuntimeExtension,
+  type RuntimeExtensionsConfig,
+  resolveRuntimeExtensions,
+} from "./runtimeExtensions";
+
+export { __Client }
 
 /**
  * @public
  */
-export type ServiceInputTypes = GetNumbersCommandInput | TradeEventStreamCommandInput;
+export type ServiceInputTypes =
+  | GetNumbersCommandInput
+  | TradeEventStreamCommandInput;
 
 /**
  * @public
  */
-export type ServiceOutputTypes = GetNumbersCommandOutput | TradeEventStreamCommandOutput;
+export type ServiceOutputTypes =
+  | GetNumbersCommandOutput
+  | TradeEventStreamCommandOutput;
 
 /**
  * @public
  */
-export interface ClientDefaults extends Partial<__SmithyConfiguration<__HttpHandlerOptions>> {
+export interface ClientDefaults
+  extends Partial<__SmithyConfiguration<__HttpHandlerOptions>> {
   /**
    * The HTTP handler to use or its constructor options. Fetch in browser and Https in Nodejs.
    */
@@ -184,19 +199,20 @@ export interface ClientDefaults extends Partial<__SmithyConfiguration<__HttpHand
    * The {@link @smithy/smithy-client#DefaultsMode} that will be used to determine how certain default configuration options are resolved in the SDK.
    */
   defaultsMode?: __DefaultsMode | __Provider<__DefaultsMode>;
+
 }
 
 /**
  * @public
  */
-export type XYZServiceClientConfigType = Partial<__SmithyConfiguration<__HttpHandlerOptions>> &
-  ClientDefaults &
-  RetryInputConfig &
-  EndpointInputConfig<EndpointParameters> &
-  EndpointRequiredInputConfig &
-  EventStreamSerdeInputConfig &
-  HttpAuthSchemeInputConfig &
-  ClientInputEndpointParameters;
+export type XYZServiceClientConfigType = Partial<__SmithyConfiguration<__HttpHandlerOptions>>
+  & ClientDefaults
+  & RetryInputConfig
+  & EndpointInputConfig<EndpointParameters>
+  & EndpointRequiredInputConfig
+  & EventStreamSerdeInputConfig
+  & HttpAuthSchemeInputConfig
+  & ClientInputEndpointParameters
 /**
  * @public
  *
@@ -207,15 +223,15 @@ export interface XYZServiceClientConfig extends XYZServiceClientConfigType {}
 /**
  * @public
  */
-export type XYZServiceClientResolvedConfigType = __SmithyResolvedConfiguration<__HttpHandlerOptions> &
-  Required<ClientDefaults> &
-  RuntimeExtensionsConfig &
-  RetryResolvedConfig &
-  EndpointResolvedConfig<EndpointParameters> &
-  EndpointRequiredResolvedConfig &
-  EventStreamSerdeResolvedConfig &
-  HttpAuthSchemeResolvedConfig &
-  ClientResolvedEndpointParameters;
+export type XYZServiceClientResolvedConfigType = __SmithyResolvedConfiguration<__HttpHandlerOptions>
+  & Required<ClientDefaults>
+  & RuntimeExtensionsConfig
+  & RetryResolvedConfig
+  & EndpointResolvedConfig<EndpointParameters>
+  & EndpointRequiredResolvedConfig
+  & EventStreamSerdeResolvedConfig
+  & HttpAuthSchemeResolvedConfig
+  & ClientResolvedEndpointParameters
 /**
  * @public
  *
@@ -239,27 +255,26 @@ export class XYZServiceClient extends __Client<
   readonly config: XYZServiceClientResolvedConfig;
 
   constructor(...[configuration]: __CheckOptionalClientConfig<XYZServiceClientConfig>) {
-    let _config_0 = __getRuntimeConfig(configuration || {});
+    const _config_0 = __getRuntimeConfig(configuration || {});
     super(_config_0 as any);
     this.initConfig = _config_0;
-    let _config_1 = resolveClientEndpointParameters(_config_0);
-    let _config_2 = resolveRetryConfig(_config_1);
-    let _config_3 = resolveEndpointConfig(_config_2);
-    let _config_4 = resolveEndpointRequiredConfig(_config_3);
-    let _config_5 = resolveEventStreamSerdeConfig(_config_4);
-    let _config_6 = resolveHttpAuthSchemeConfig(_config_5);
-    let _config_7 = resolveRuntimeExtensions(_config_6, configuration?.extensions || []);
+    const _config_1 = resolveClientEndpointParameters(_config_0);
+    const _config_2 = resolveRetryConfig(_config_1);
+    const _config_3 = resolveEndpointConfig(_config_2);
+    const _config_4 = resolveEndpointRequiredConfig(_config_3);
+    const _config_5 = resolveEventStreamSerdeConfig(_config_4);
+    const _config_6 = resolveHttpAuthSchemeConfig(_config_5);
+    const _config_7 = resolveRuntimeExtensions(_config_6, configuration?.extensions || []);
     this.config = _config_7;
     this.middlewareStack.use(getSchemaSerdePlugin(this.config));
     this.middlewareStack.use(getRetryPlugin(this.config));
     this.middlewareStack.use(getContentLengthPlugin(this.config));
-    this.middlewareStack.use(
-      getHttpAuthSchemeEndpointRuleSetPlugin(this.config, {
+    this.middlewareStack.use(getHttpAuthSchemeEndpointRuleSetPlugin(this.config,
+      {
         httpAuthSchemeParametersProvider: defaultXYZServiceHttpAuthSchemeParametersProvider,
-        identityProviderConfigProvider: async (config: XYZServiceClientResolvedConfig) =>
-          new DefaultIdentityProviderConfig({}),
-      })
-    );
+        identityProviderConfigProvider: async (config: XYZServiceClientResolvedConfig) => new DefaultIdentityProviderConfig({}),
+      }
+    ));
     this.middlewareStack.use(getHttpSigningPlugin(this.config));
   }
 

private/my-local-model-schema/src/auth/httpAuthExtensionConfiguration.ts

@@ -1,6 +1,7 @@
 // smithy-typescript generated code
-import { XYZServiceHttpAuthSchemeProvider } from "./httpAuthSchemeProvider";
-import { HttpAuthScheme } from "@smithy/types";
+import type { HttpAuthScheme } from "@smithy/types";
+
+import type { XYZServiceHttpAuthSchemeProvider } from "./httpAuthSchemeProvider";
 
 /**
  * @internal
@@ -23,14 +24,12 @@ export type HttpAuthRuntimeConfig = Partial<{
 /**
  * @internal
  */
-export const getHttpAuthExtensionConfiguration = (
-  runtimeConfig: HttpAuthRuntimeConfig
-): HttpAuthExtensionConfiguration => {
-  let _httpAuthSchemes = runtimeConfig.httpAuthSchemes!;
+export const getHttpAuthExtensionConfiguration = (runtimeConfig: HttpAuthRuntimeConfig): HttpAuthExtensionConfiguration => {
+  const _httpAuthSchemes = runtimeConfig.httpAuthSchemes!;
   let _httpAuthSchemeProvider = runtimeConfig.httpAuthSchemeProvider!;
   return {
     setHttpAuthScheme(httpAuthScheme: HttpAuthScheme): void {
-      const index = _httpAuthSchemes.findIndex((scheme) => scheme.schemeId === httpAuthScheme.schemeId);
+      const index = _httpAuthSchemes.findIndex(scheme => scheme.schemeId === httpAuthScheme.schemeId);
       if (index === -1) {
         _httpAuthSchemes.push(httpAuthScheme);
       } else {
@@ -46,7 +45,7 @@ export const getHttpAuthExtensionConfiguration = (
     httpAuthSchemeProvider(): XYZServiceHttpAuthSchemeProvider {
       return _httpAuthSchemeProvider;
     },
-  };
+  }
 };
 
 /**