@smithy/experimental-identity-and-auth 0.5.54 → 0.6.0

package/dist-cjs/index.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var protocolHttp = require('@smithy/protocol-http');
+var protocols = require('@smithy/core/protocols');
 var signatureV4 = require('@smithy/signature-v4');
-var middlewareEndpoint = require('@smithy/middleware-endpoint');
-var utilMiddleware = require('@smithy/util-middleware');
-var middlewareSerde = require('@smithy/middleware-serde');
-var middlewareRetry = require('@smithy/middleware-retry');
+var client = require('@smithy/core/client');
+var endpoints = require('@smithy/core/endpoints');
+var serde = require('@smithy/core/serde');
+var retry = require('@smithy/core/retry');
 
 class DefaultIdentityProviderConfig {
     authSchemes = new Map();
@@ -23,7 +23,7 @@ class DefaultIdentityProviderConfig {
 
 class SigV4Signer {
     async sign(httpRequest, identity, signingProperties) {
-        const clonedRequest = protocolHttp.HttpRequest.clone(httpRequest);
+        const clonedRequest = protocols.HttpRequest.clone(httpRequest);
         const signer = new signatureV4.SignatureV4({
             applyChecksum: signingProperties.applyChecksum !== undefined ? signingProperties.applyChecksum : true,
             credentials: identity,
@@ -83,12 +83,12 @@ const createEndpointRuleSetHttpAuthSchemeParametersProvider = (defaultHttpAuthSc
         throw new Error(`Could not find \`input\` for \`defaultEndpointRuleSetHttpAuthSchemeParametersProvider\``);
     }
     const defaultParameters = await defaultHttpAuthSchemeParametersProvider(config, context, input);
-    const instructionsFn = utilMiddleware.getSmithyContext(context)?.endpointRuleSet
+    const instructionsFn = client.getSmithyContext(context)?.endpointRuleSet
         ?.getEndpointParameterInstructions;
     if (!instructionsFn) {
         throw new Error(`getEndpointParameterInstructions() is not defined on \`${context.commandName}\``);
     }
-    const endpointParameters = await middlewareEndpoint.resolveParams(input, { getEndpointParameterInstructions: instructionsFn }, config);
+    const endpointParameters = await endpoints.resolveParams(input, { getEndpointParameterInstructions: instructionsFn }, config);
     return Object.assign(defaultParameters, endpointParameters);
 };
 
@@ -111,7 +111,7 @@ class HttpApiKeyAuthSigner {
         if (!identity.apiKey) {
             throw new Error("request could not be signed with `apiKey` since the `apiKey` is not defined");
         }
-        const clonedRequest = protocolHttp.HttpRequest.clone(httpRequest);
+        const clonedRequest = protocols.HttpRequest.clone(httpRequest);
         if (signingProperties.in === exports.HttpApiKeyAuthLocation.QUERY) {
             clonedRequest.query[signingProperties.name] = identity.apiKey;
         }
@@ -132,7 +132,7 @@ class HttpApiKeyAuthSigner {
 
 class HttpBearerAuthSigner {
     async sign(httpRequest, identity, signingProperties) {
-        const clonedRequest = protocolHttp.HttpRequest.clone(httpRequest);
+        const clonedRequest = protocols.HttpRequest.clone(httpRequest);
         if (!identity.token) {
             throw new Error("request could not be signed with `token` since the `token` is not defined");
         }
@@ -207,7 +207,7 @@ function convertHttpAuthSchemesToMap(httpAuthSchemes) {
 const httpAuthSchemeMiddleware = (config, mwOptions) => (next, context) => async (args) => {
     const options = config.httpAuthSchemeProvider(await mwOptions.httpAuthSchemeParametersProvider(config, context, args.input));
     const authSchemes = convertHttpAuthSchemesToMap(config.httpAuthSchemes);
-    const smithyContext = utilMiddleware.getSmithyContext(context);
+    const smithyContext = client.getSmithyContext(context);
     const failureReasons = [];
     for (const option of options) {
         const scheme = authSchemes.get(option.schemeId);
@@ -242,7 +242,7 @@ const httpAuthSchemeEndpointRuleSetMiddlewareOptions = {
     name: "httpAuthSchemeMiddleware",
     override: true,
     relation: "before",
-    toMiddleware: middlewareEndpoint.endpointMiddlewareOptions.name,
+    toMiddleware: endpoints.endpointMiddlewareOptions.name,
 };
 const getHttpAuthSchemeEndpointRuleSetPlugin = (config, { httpAuthSchemeParametersProvider, identityProviderConfigProvider, }) => ({
     applyToStack: (clientStack) => {
@@ -259,7 +259,7 @@ const httpAuthSchemeMiddlewareOptions = {
     name: "httpAuthSchemeMiddleware",
     override: true,
     relation: "before",
-    toMiddleware: middlewareSerde.serializerMiddlewareOption.name,
+    toMiddleware: serde.serializerMiddlewareOption.name,
 };
 const getHttpAuthSchemePlugin = (config, { httpAuthSchemeParametersProvider, identityProviderConfigProvider, }) => ({
     applyToStack: (clientStack) => {
@@ -271,10 +271,10 @@ const getHttpAuthSchemePlugin = (config, { httpAuthSchemeParametersProvider, ide
 });
 
 const httpSigningMiddleware = (config) => (next, context) => async (args) => {
-    if (!protocolHttp.HttpRequest.isInstance(args.request)) {
+    if (!protocols.HttpRequest.isInstance(args.request)) {
         return next(args);
     }
-    const smithyContext = utilMiddleware.getSmithyContext(context);
+    const smithyContext = client.getSmithyContext(context);
     const scheme = smithyContext.selectedHttpAuthScheme;
     if (!scheme) {
         throw new Error(`No HttpAuthScheme was selected: unable to sign request`);
@@ -293,7 +293,7 @@ const httpSigningMiddlewareOptions = {
     aliases: ["apiKeyMiddleware", "tokenMiddleware", "awsAuthMiddleware"],
     override: true,
     relation: "after",
-    toMiddleware: middlewareRetry.retryMiddlewareOptions.name,
+    toMiddleware: retry.retryMiddlewareOptions.name,
 };
 const getHttpSigningPlugin = (config) => ({
     applyToStack: (clientStack) => {

package/dist-es/SigV4Signer.js

@@ -1,4 +1,4 @@
-import { HttpRequest } from "@smithy/protocol-http";
+import { HttpRequest } from "@smithy/core/protocols";
 import { SignatureV4 } from "@smithy/signature-v4";
 export class SigV4Signer {
     async sign(httpRequest, identity, signingProperties) {

package/dist-es/endpointRuleSet.js

@@ -1,5 +1,5 @@
-import { resolveParams } from "@smithy/middleware-endpoint";
-import { getSmithyContext } from "@smithy/util-middleware";
+import { getSmithyContext } from "@smithy/core/client";
+import { resolveParams } from "@smithy/core/endpoints";
 export const createEndpointRuleSetHttpAuthSchemeProvider = (defaultEndpointResolver, defaultHttpAuthSchemeResolver) => {
     const endpointRuleSetHttpAuthSchemeProvider = (authParameters) => {
         const endpoint = defaultEndpointResolver(authParameters);

package/dist-es/httpApiKeyAuth.js

@@ -1,4 +1,4 @@
-import { HttpRequest } from "@smithy/protocol-http";
+import { HttpRequest } from "@smithy/core/protocols";
 export var HttpApiKeyAuthLocation;
 (function (HttpApiKeyAuthLocation) {
     HttpApiKeyAuthLocation["HEADER"] = "header";

package/dist-es/httpBearerAuth.js

@@ -1,4 +1,4 @@
-import { HttpRequest } from "@smithy/protocol-http";
+import { HttpRequest } from "@smithy/core/protocols";
 export class HttpBearerAuthSigner {
     async sign(httpRequest, identity, signingProperties) {
         const clonedRequest = HttpRequest.clone(httpRequest);

package/dist-es/middleware-http-auth-scheme/getHttpAuthSchemeEndpointRuleSetPlugin.js

@@ -1,4 +1,4 @@
-import { endpointMiddlewareOptions } from "@smithy/middleware-endpoint";
+import { endpointMiddlewareOptions } from "@smithy/core/endpoints";
 import { httpAuthSchemeMiddleware } from "./httpAuthSchemeMiddleware";
 export const httpAuthSchemeEndpointRuleSetMiddlewareOptions = {
     step: "serialize",

package/dist-es/middleware-http-auth-scheme/getHttpAuthSchemePlugin.js

@@ -1,4 +1,4 @@
-import { serializerMiddlewareOption } from "@smithy/middleware-serde";
+import { serializerMiddlewareOption } from "@smithy/core/serde";
 import { httpAuthSchemeMiddleware } from "./httpAuthSchemeMiddleware";
 export const httpAuthSchemeMiddlewareOptions = {
     step: "serialize",

package/dist-es/middleware-http-auth-scheme/httpAuthSchemeMiddleware.js

@@ -1,4 +1,4 @@
-import { getSmithyContext } from "@smithy/util-middleware";
+import { getSmithyContext } from "@smithy/core/client";
 function convertHttpAuthSchemesToMap(httpAuthSchemes) {
     const map = new Map();
     for (const scheme of httpAuthSchemes) {

package/dist-es/middleware-http-signing/getHttpSigningMiddleware.js

@@ -1,4 +1,4 @@
-import { retryMiddlewareOptions } from "@smithy/middleware-retry";
+import { retryMiddlewareOptions } from "@smithy/core/retry";
 import { httpSigningMiddleware } from "./httpSigningMiddleware";
 export const httpSigningMiddlewareOptions = {
     step: "finalizeRequest",

package/dist-es/middleware-http-signing/httpSigningMiddleware.js

@@ -1,5 +1,5 @@
-import { HttpRequest } from "@smithy/protocol-http";
-import { getSmithyContext } from "@smithy/util-middleware";
+import { getSmithyContext } from "@smithy/core/client";
+import { HttpRequest } from "@smithy/core/protocols";
 export const httpSigningMiddleware = (config) => (next, context) => async (args) => {
     if (!HttpRequest.isInstance(args.request)) {
         return next(args);

package/dist-types/SigV4Signer.d.ts

@@ -1,4 +1,4 @@
-import { HttpRequest } from "@smithy/protocol-http";
+import { HttpRequest } from "@smithy/core/protocols";
 import type { AwsCredentialIdentity, HttpRequest as IHttpRequest } from "@smithy/types";
 import type { HttpSigner } from "./HttpSigner";
 /**

package/dist-types/endpointRuleSet.d.ts

@@ -1,4 +1,4 @@
-import type { EndpointParameterInstructions } from "@smithy/middleware-endpoint";
+import { type EndpointParameterInstructions } from "@smithy/core/endpoints";
 import type { EndpointParameters, EndpointV2, HandlerExecutionContext, Logger } from "@smithy/types";
 import type { HttpAuthSchemeParameters, HttpAuthSchemeParametersProvider, HttpAuthSchemeProvider } from "./HttpAuthSchemeProvider";
 /**

package/dist-types/httpApiKeyAuth.d.ts

@@ -1,7 +1,7 @@
-import { HttpRequest } from "@smithy/protocol-http";
+import { HttpRequest } from "@smithy/core/protocols";
 import type { HttpRequest as IHttpRequest } from "@smithy/types";
-import type { ApiKeyIdentity } from "./apiKeyIdentity";
 import type { HttpSigner } from "./HttpSigner";
+import type { ApiKeyIdentity } from "./apiKeyIdentity";
 /**
  * @internal
  */

package/dist-types/httpBearerAuth.d.ts

@@ -1,4 +1,4 @@
-import { HttpRequest } from "@smithy/protocol-http";
+import { HttpRequest } from "@smithy/core/protocols";
 import type { HttpRequest as IHttpRequest } from "@smithy/types";
 import type { HttpSigner } from "./HttpSigner";
 import type { TokenIdentity } from "./tokenIdentity";

package/dist-types/middleware-http-auth-scheme/getHttpAuthSchemeEndpointRuleSetPlugin.d.ts

@@ -1,7 +1,7 @@
 import type { HandlerExecutionContext, Pluggable, RelativeMiddlewareOptions, SerializeHandlerOptions } from "@smithy/types";
 import type { HttpAuthSchemeParameters, HttpAuthSchemeParametersProvider } from "../HttpAuthSchemeProvider";
 import type { IdentityProviderConfig } from "../IdentityProviderConfig";
-import type { PreviouslyResolved } from "./httpAuthSchemeMiddleware";
+import { type PreviouslyResolved } from "./httpAuthSchemeMiddleware";
 /**
  * @internal
  */

package/dist-types/middleware-http-auth-scheme/getHttpAuthSchemePlugin.d.ts

@@ -1,7 +1,7 @@
 import type { HandlerExecutionContext, Pluggable, RelativeMiddlewareOptions, SerializeHandlerOptions } from "@smithy/types";
 import type { HttpAuthSchemeParameters, HttpAuthSchemeParametersProvider } from "../HttpAuthSchemeProvider";
 import type { IdentityProviderConfig } from "../IdentityProviderConfig";
-import type { PreviouslyResolved } from "./httpAuthSchemeMiddleware";
+import { type PreviouslyResolved } from "./httpAuthSchemeMiddleware";
 /**
  * @internal
  */

package/dist-types/middleware-http-auth-scheme/httpAuthSchemeMiddleware.d.ts

@@ -1,4 +1,4 @@
-import type { HandlerExecutionContext, SerializeMiddleware, SMITHY_CONTEXT_KEY } from "@smithy/types";
+import type { HandlerExecutionContext, SMITHY_CONTEXT_KEY, SerializeMiddleware } from "@smithy/types";
 import type { HttpAuthScheme, SelectedHttpAuthScheme } from "../HttpAuthScheme";
 import type { HttpAuthSchemeParameters, HttpAuthSchemeParametersProvider, HttpAuthSchemeProvider } from "../HttpAuthSchemeProvider";
 import type { IdentityProviderConfig } from "../IdentityProviderConfig";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithy/experimental-identity-and-auth",
-  "version": "0.5.54",
+  "version": "0.6.0",
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es:cjs'",
     "build:es:cjs": "yarn g:tsc -p tsconfig.es.json && node ../../scripts/inline experimental-identity-and-auth",
@@ -26,13 +26,10 @@
   "license": "Apache-2.0",
   "sideEffects": false,
   "dependencies": {
-    "@smithy/middleware-endpoint": "^4.4.32",
-    "@smithy/middleware-retry": "^4.5.7",
-    "@smithy/middleware-serde": "^4.2.20",
-    "@smithy/protocol-http": "^5.3.14",
-    "@smithy/signature-v4": "^5.3.14",
+    "@smithy/core": "^3.24.0",
+    "@smithy/middleware-retry": "^4.6.0",
+    "@smithy/signature-v4": "^5.4.0",
     "@smithy/types": "^4.14.1",
-    "@smithy/util-middleware": "^4.2.14",
     "tslib": "^2.6.2"
   },
   "engines": {