Skip to content

Commit

Permalink
fix: Import declaration conflicts with local declaration
Browse files Browse the repository at this point in the history
resolves aws#232

Typescript 3.7 does a better job identifying declaration conflicts
and so identifies the conflite between the type
and the class import of the same name.
e.g. `WebCryptoEncryptionMaterial` is defined as a type and imported.
When aws#148 was the referance to the return type
can go directly to the needed Material (WebCrypto or Node).
  • Loading branch information
seebees committed Nov 6, 2019
1 parent 8f11f6a commit 0332426
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import {
WebCryptoMaterialsManager, EncryptionRequest, // eslint-disable-line no-unused-vars
DecryptionRequest, EncryptionContext, // eslint-disable-line no-unused-vars
EncryptionMaterial, DecryptionMaterial, // eslint-disable-line no-unused-vars
WebCryptoAlgorithmSuite, WebCryptoEncryptionMaterial,
WebCryptoDecryptionMaterial, SignatureKey, needs, readOnlyProperty,
VerificationKey, AlgorithmSuiteIdentifier, immutableBaseClass,
Expand All @@ -29,8 +28,6 @@ import { fromBase64, toBase64 } from '@aws-sdk/util-base64-browser'

export type WebCryptoEncryptionRequest = EncryptionRequest<WebCryptoAlgorithmSuite>
export type WebCryptoDecryptionRequest = DecryptionRequest<WebCryptoAlgorithmSuite>
export type WebCryptoEncryptionMaterial = EncryptionMaterial<WebCryptoAlgorithmSuite>
export type WebCryptoDecryptionMaterial = DecryptionMaterial<WebCryptoAlgorithmSuite>
export type WebCryptoGetEncryptionMaterials = GetEncryptionMaterials<WebCryptoAlgorithmSuite>
export type WebCryptoGetDecryptMaterials = GetDecryptMaterials<WebCryptoAlgorithmSuite>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

import {
NodeMaterialsManager, EncryptionRequest, DecryptionRequest, EncryptionContext, // eslint-disable-line no-unused-vars
EncryptionMaterial, DecryptionMaterial, // eslint-disable-line no-unused-vars
NodeAlgorithmSuite, NodeEncryptionMaterial, NodeDecryptionMaterial, SignatureKey,
needs, VerificationKey, AlgorithmSuiteIdentifier,
immutableClass, readOnlyProperty, KeyringNode,
Expand All @@ -28,8 +27,6 @@ import { createECDH } from 'crypto'

export type NodeEncryptionRequest = EncryptionRequest<NodeAlgorithmSuite>
export type NodeDecryptionRequest = DecryptionRequest<NodeAlgorithmSuite>
export type NodeEncryptionMaterial = EncryptionMaterial<NodeAlgorithmSuite>
export type NodeDecryptionMaterial = DecryptionMaterial<NodeAlgorithmSuite>
export type NodeGetEncryptionMaterials = GetEncryptionMaterials<NodeAlgorithmSuite>
export type NodeGetDecryptMaterials = GetDecryptMaterials<NodeAlgorithmSuite>

Expand Down

0 comments on commit 0332426

Please sign in to comment.