From ec7f299f25bf2f6ac04ded49026c37c2152e7ed7 Mon Sep 17 00:00:00 2001 From: Timo Glastra Date: Mon, 20 Jun 2022 10:06:24 +0200 Subject: [PATCH 1/2] fix: remove usage of const enum Signed-off-by: Timo Glastra --- .../connections/errors/DidExchangeProblemReportReason.ts | 2 +- packages/core/src/modules/connections/models/DidExchangeRole.ts | 2 +- .../core/src/modules/connections/models/DidExchangeState.ts | 2 +- .../core/src/modules/connections/models/HandshakeProtocol.ts | 2 +- packages/core/src/modules/dids/methods/peer/didPeer.ts | 2 +- packages/core/src/modules/oob/domain/OutOfBandRole.ts | 2 +- packages/core/src/modules/oob/domain/OutOfBandState.ts | 2 +- packages/core/src/types.ts | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/core/src/modules/connections/errors/DidExchangeProblemReportReason.ts b/packages/core/src/modules/connections/errors/DidExchangeProblemReportReason.ts index 28f31dc6d4..540cc9923c 100644 --- a/packages/core/src/modules/connections/errors/DidExchangeProblemReportReason.ts +++ b/packages/core/src/modules/connections/errors/DidExchangeProblemReportReason.ts @@ -3,7 +3,7 @@ * * @see https://github.com/hyperledger/aries-rfcs/blob/main/features/0023-did-exchange/README.md#errors */ -export const enum DidExchangeProblemReportReason { +export enum DidExchangeProblemReportReason { RequestNotAccepted = 'request_not_accepted', RequestProcessingError = 'request_processing_error', ResponseNotAccepted = 'response_not_accepted', diff --git a/packages/core/src/modules/connections/models/DidExchangeRole.ts b/packages/core/src/modules/connections/models/DidExchangeRole.ts index 9027757e96..bc5c3939d4 100644 --- a/packages/core/src/modules/connections/models/DidExchangeRole.ts +++ b/packages/core/src/modules/connections/models/DidExchangeRole.ts @@ -1,4 +1,4 @@ -export const enum DidExchangeRole { +export enum DidExchangeRole { Requester = 'requester', Responder = 'responder', } diff --git a/packages/core/src/modules/connections/models/DidExchangeState.ts b/packages/core/src/modules/connections/models/DidExchangeState.ts index 23decb1598..9614b81da2 100644 --- a/packages/core/src/modules/connections/models/DidExchangeState.ts +++ b/packages/core/src/modules/connections/models/DidExchangeState.ts @@ -3,7 +3,7 @@ * * @see https://github.com/hyperledger/aries-rfcs/blob/main/features/0023-did-exchange/README.md#state-machine-tables */ -export const enum DidExchangeState { +export enum DidExchangeState { Start = 'start', InvitationSent = 'invitation-sent', InvitationReceived = 'invitation-received', diff --git a/packages/core/src/modules/connections/models/HandshakeProtocol.ts b/packages/core/src/modules/connections/models/HandshakeProtocol.ts index bee2008144..a433bd87f5 100644 --- a/packages/core/src/modules/connections/models/HandshakeProtocol.ts +++ b/packages/core/src/modules/connections/models/HandshakeProtocol.ts @@ -1,4 +1,4 @@ -export const enum HandshakeProtocol { +export enum HandshakeProtocol { Connections = 'https://didcomm.org/connections/1.0', DidExchange = 'https://didcomm.org/didexchange/1.0', } diff --git a/packages/core/src/modules/dids/methods/peer/didPeer.ts b/packages/core/src/modules/dids/methods/peer/didPeer.ts index b21aa77306..a36c067cc1 100644 --- a/packages/core/src/modules/dids/methods/peer/didPeer.ts +++ b/packages/core/src/modules/dids/methods/peer/didPeer.ts @@ -8,7 +8,7 @@ export function isValidPeerDid(did: string): boolean { return isValid } -export const enum PeerDidNumAlgo { +export enum PeerDidNumAlgo { InceptionKeyWithoutDoc = 0, GenesisDoc = 1, MultipleInceptionKeyWithoutDoc = 2, diff --git a/packages/core/src/modules/oob/domain/OutOfBandRole.ts b/packages/core/src/modules/oob/domain/OutOfBandRole.ts index fb047d46ba..5cb80da351 100644 --- a/packages/core/src/modules/oob/domain/OutOfBandRole.ts +++ b/packages/core/src/modules/oob/domain/OutOfBandRole.ts @@ -1,4 +1,4 @@ -export const enum OutOfBandRole { +export enum OutOfBandRole { Sender = 'sender', Receiver = 'receiver', } diff --git a/packages/core/src/modules/oob/domain/OutOfBandState.ts b/packages/core/src/modules/oob/domain/OutOfBandState.ts index b127a1db24..a82936517f 100644 --- a/packages/core/src/modules/oob/domain/OutOfBandState.ts +++ b/packages/core/src/modules/oob/domain/OutOfBandState.ts @@ -1,4 +1,4 @@ -export const enum OutOfBandState { +export enum OutOfBandState { Initial = 'initial', AwaitResponse = 'await-response', PrepareResponse = 'prepare-response', diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts index 0c43e71711..50379219bf 100644 --- a/packages/core/src/types.ts +++ b/packages/core/src/types.ts @@ -9,7 +9,7 @@ import type { OutOfBandRecord } from './modules/oob/repository' import type { AutoAcceptProof } from './modules/proofs' import type { MediatorPickupStrategy } from './modules/routing' -export const enum KeyDerivationMethod { +export enum KeyDerivationMethod { /** default value in indy-sdk. Will be used when no value is provided */ Argon2IMod = 'ARGON2I_MOD', /** less secure, but faster */ From 452c1d6a191821a457dcfb44a4922c7bbe4d19e1 Mon Sep 17 00:00:00 2001 From: Timo Glastra Date: Mon, 20 Jun 2022 10:21:25 +0200 Subject: [PATCH 2/2] style(eslint): no const enums Signed-off-by: Timo Glastra --- .eslintrc.js | 10 ++++++++++ .../storage/migration/updates/0.1-0.2/credential.ts | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 86ce362612..c23f0a0ee2 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -57,6 +57,16 @@ module.exports = { patterns: ['packages/*'], }, ], + // Do not allow const enums + // https://github.com/typescript-eslint/typescript-eslint/issues/561#issuecomment-593059472 + // https://ncjamieson.com/dont-export-const-enums/ + 'no-restricted-syntax': [ + 'error', + { + selector: 'TSEnumDeclaration[const=true]', + message: "Don't declare const enums", + }, + ], }, overrides: [ { diff --git a/packages/core/src/storage/migration/updates/0.1-0.2/credential.ts b/packages/core/src/storage/migration/updates/0.1-0.2/credential.ts index 2509b4aca5..ab252a00cf 100644 --- a/packages/core/src/storage/migration/updates/0.1-0.2/credential.ts +++ b/packages/core/src/storage/migration/updates/0.1-0.2/credential.ts @@ -39,7 +39,7 @@ export async function migrateCredentialRecordToV0_2(agent: Agent) { } } -export const enum CredentialRole { +export enum CredentialRole { Issuer, Holder, }