From 56643c9f2a024ad9d2d1e0cf75418f1a6e401140 Mon Sep 17 00:00:00 2001 From: Liran Cohen Date: Wed, 20 Dec 2023 18:12:22 -0500 Subject: [PATCH] lint and circular deps --- src/core/message-reply.ts | 11 +---------- src/dwn.ts | 4 ++-- src/handlers/events-get.ts | 4 ++-- src/handlers/events-query.ts | 4 ++-- src/handlers/messages-get.ts | 4 ++-- src/handlers/permissions-grant.ts | 2 +- src/handlers/permissions-request.ts | 2 +- src/handlers/permissions-revoke.ts | 2 +- src/handlers/protocols-configure.ts | 2 +- src/handlers/records-delete.ts | 2 +- src/handlers/records-write.ts | 2 +- src/types/event-types.ts | 3 +-- src/types/message-types.ts | 7 +++++++ src/types/messages-types.ts | 5 ++--- src/types/method-handler.ts | 3 +-- src/types/protocols-types.ts | 3 +-- src/types/records-types.ts | 3 +-- tests/core/message-reply.spec.ts | 2 +- 18 files changed, 29 insertions(+), 36 deletions(-) diff --git a/src/core/message-reply.ts b/src/core/message-reply.ts index a133b24de..d52ba0e84 100644 --- a/src/core/message-reply.ts +++ b/src/core/message-reply.ts @@ -1,15 +1,6 @@ import type { MessagesGetReplyEntry } from '../types/messages-types.js'; -import type { QueryResultEntry } from '../types/message-types.js'; import type { RecordsWriteReply } from '../types/records-types.js'; - -type Status = { - code: number - detail: string -}; - -export type GenericMessageReply = { - status: Status; -}; +import type { GenericMessageReply, QueryResultEntry } from '../types/message-types.js'; export function messageReplyFromError(e: unknown, code: number): GenericMessageReply { diff --git a/src/dwn.ts b/src/dwn.ts index bf519bbb1..29beb3a5a 100644 --- a/src/dwn.ts +++ b/src/dwn.ts @@ -1,12 +1,12 @@ import type { DataStore } from './types/data-store.js'; import type { EventLog } from './types/event-log.js'; -import type { GenericMessage } from './types/message-types.js'; import type { MessageStore } from './types/message-store.js'; import type { MethodHandler } from './types/method-handler.js'; import type { Readable } from 'readable-stream'; import type { TenantGate } from './core/tenant-gate.js'; +import type { UnionMessageReply } from './core/message-reply.js'; import type { EventsGetMessage, EventsGetReply, EventsQueryMessage, EventsQueryReply } from './types/event-types.js'; -import type { GenericMessageReply, UnionMessageReply } from './core/message-reply.js'; +import type { GenericMessage, GenericMessageReply } from './types/message-types.js'; import type { MessagesGetMessage, MessagesGetReply } from './types/messages-types.js'; import type { PermissionsGrantMessage, PermissionsRequestMessage, PermissionsRevokeMessage } from './types/permissions-types.js'; import type { ProtocolsConfigureMessage, ProtocolsQueryMessage, ProtocolsQueryReply } from './types/protocols-types.js'; diff --git a/src/handlers/events-get.ts b/src/handlers/events-get.ts index 38e38920d..24ae57b21 100644 --- a/src/handlers/events-get.ts +++ b/src/handlers/events-get.ts @@ -39,8 +39,8 @@ export class EventsGetHandler implements MethodHandler { const events = await this.eventLog.getEvents(tenant, options); return { - status: { code: 200, detail: 'OK' }, - entries: events + status : { code: 200, detail: 'OK' }, + entries : events }; } } \ No newline at end of file diff --git a/src/handlers/events-query.ts b/src/handlers/events-query.ts index f22e387f1..762bce1b9 100644 --- a/src/handlers/events-query.ts +++ b/src/handlers/events-query.ts @@ -36,8 +36,8 @@ export class EventsQueryHandler implements MethodHandler { const events = await this.eventLog.queryEvents(tenant, logFilters, cursor); return { - status: { code: 200, detail: 'OK' }, - entries: events + status : { code: 200, detail: 'OK' }, + entries : events }; } } diff --git a/src/handlers/messages-get.ts b/src/handlers/messages-get.ts index ebcd327d2..18786b8ce 100644 --- a/src/handlers/messages-get.ts +++ b/src/handlers/messages-get.ts @@ -73,8 +73,8 @@ export class MessagesGetHandler implements MethodHandler { } return { - status: { code: 200, detail: 'OK' }, - entries: messages + status : { code: 200, detail: 'OK' }, + entries : messages }; } } \ No newline at end of file diff --git a/src/handlers/permissions-grant.ts b/src/handlers/permissions-grant.ts index e8c401e02..04a850076 100644 --- a/src/handlers/permissions-grant.ts +++ b/src/handlers/permissions-grant.ts @@ -1,6 +1,6 @@ import type { DidResolver } from '../did/did-resolver.js'; import type { EventLog } from '../types//event-log.js'; -import type { GenericMessageReply } from '../core/message-reply.js'; +import type { GenericMessageReply } from '../types/message-types.js'; import type { KeyValues } from '../types/query-types.js'; import type { MessageStore } from '../types//message-store.js'; import type { MethodHandler } from '../types/method-handler.js'; diff --git a/src/handlers/permissions-request.ts b/src/handlers/permissions-request.ts index 07d9e0221..d1a0d762e 100644 --- a/src/handlers/permissions-request.ts +++ b/src/handlers/permissions-request.ts @@ -1,6 +1,6 @@ import type { DidResolver } from '../did/did-resolver.js'; import type { EventLog } from '../types//event-log.js'; -import type { GenericMessageReply } from '../core/message-reply.js'; +import type { GenericMessageReply } from '../types/message-types.js'; import type { MessageStore } from '../types//message-store.js'; import type { MethodHandler } from '../types/method-handler.js'; import type { PermissionsRequestMessage } from '../types/permissions-types.js'; diff --git a/src/handlers/permissions-revoke.ts b/src/handlers/permissions-revoke.ts index 83e7a73dd..f7fda04f7 100644 --- a/src/handlers/permissions-revoke.ts +++ b/src/handlers/permissions-revoke.ts @@ -1,6 +1,6 @@ import type { DidResolver } from '../did/did-resolver.js'; import type { EventLog } from '../types/event-log.js'; -import type { GenericMessageReply } from '../core/message-reply.js'; +import type { GenericMessageReply } from '../types/message-types.js'; import type { KeyValues } from '../types/query-types.js'; import type { MessageStore } from '../types/message-store.js'; import type { MethodHandler } from '../types/method-handler.js'; diff --git a/src/handlers/protocols-configure.ts b/src/handlers/protocols-configure.ts index 02db9e897..5873fee58 100644 --- a/src/handlers/protocols-configure.ts +++ b/src/handlers/protocols-configure.ts @@ -1,7 +1,7 @@ import type { DataStore } from '../types/data-store.js'; import type { DidResolver } from '../did/did-resolver.js'; import type { EventLog } from '../types/event-log.js'; -import type { GenericMessageReply } from '../core/message-reply.js'; +import type { GenericMessageReply } from '../types/message-types.js'; import type { MessageStore } from '../types//message-store.js'; import type { MethodHandler } from '../types/method-handler.js'; import type { ProtocolsConfigureMessage } from '../types/protocols-types.js'; diff --git a/src/handlers/records-delete.ts b/src/handlers/records-delete.ts index db8473fad..4a9935546 100644 --- a/src/handlers/records-delete.ts +++ b/src/handlers/records-delete.ts @@ -1,7 +1,7 @@ import type { DataStore } from '../types/data-store.js'; import type { DidResolver } from '../did/did-resolver.js'; import type { EventLog } from '../types/event-log.js'; -import type { GenericMessageReply } from '../core/message-reply.js'; +import type { GenericMessageReply } from '../types/message-types.js'; import type { KeyValues } from '../types/query-types.js'; import type { MessageStore } from '../types//message-store.js'; import type { MethodHandler } from '../types/method-handler.js'; diff --git a/src/handlers/records-write.ts b/src/handlers/records-write.ts index dd276ef6f..3d356fe8d 100644 --- a/src/handlers/records-write.ts +++ b/src/handlers/records-write.ts @@ -1,7 +1,7 @@ import type { DataStore } from '../types/data-store.js'; import type { DidResolver } from '../did/did-resolver.js'; import type { EventLog } from '../types/event-log.js'; -import type { GenericMessageReply } from '../core/message-reply.js'; +import type { GenericMessageReply } from '../types/message-types.js'; import type { MessageStore } from '../types//message-store.js'; import type { MethodHandler } from '../types/method-handler.js'; import type { RecordsQueryReplyEntry, RecordsWriteMessage } from '../types/records-types.js'; diff --git a/src/types/event-types.ts b/src/types/event-types.ts index 704b636ea..a89205a92 100644 --- a/src/types/event-types.ts +++ b/src/types/event-types.ts @@ -1,6 +1,5 @@ -import type { GenericMessageReply } from '../core/message-reply.js'; import type { ProtocolsQueryFilter } from './protocols-types.js'; -import type { AuthorizationModel, GenericMessage } from './message-types.js'; +import type { AuthorizationModel, GenericMessage, GenericMessageReply } from './message-types.js'; import type { DwnInterfaceName, DwnMethodName } from '../enums/dwn-interface-method.js'; import type { RangeCriterion, RangeFilter } from './query-types.js'; diff --git a/src/types/message-types.ts b/src/types/message-types.ts index a338b3837..b3d07343f 100644 --- a/src/types/message-types.ts +++ b/src/types/message-types.ts @@ -77,7 +77,14 @@ export type Pagination = { limit?: number; }; +type Status = { + code: number + detail: string +}; +export type GenericMessageReply = { + status: Status; +}; export type MessageSort = { dateCreated?: SortDirection; diff --git a/src/types/messages-types.ts b/src/types/messages-types.ts index edcd2e803..0a2aa7712 100644 --- a/src/types/messages-types.ts +++ b/src/types/messages-types.ts @@ -1,5 +1,4 @@ -import type { GenericMessageReply } from '../core/message-reply.js'; -import type { AuthorizationModel, GenericMessage } from './message-types.js'; +import type { AuthorizationModel, GenericMessage, GenericMessageReply } from './message-types.js'; import type { DwnInterfaceName, DwnMethodName } from '../enums/dwn-interface-method.js'; export type MessagesGetDescriptor = { @@ -23,4 +22,4 @@ export type MessagesGetReplyEntry = { export type MessagesGetReply = GenericMessageReply & { entries?: MessagesGetReplyEntry[]; -}; \ No newline at end of file +}; diff --git a/src/types/method-handler.ts b/src/types/method-handler.ts index 3167e4be9..7bc9bb07c 100644 --- a/src/types/method-handler.ts +++ b/src/types/method-handler.ts @@ -1,6 +1,5 @@ -import type { GenericMessage } from './message-types.js'; -import type { GenericMessageReply } from '../core/message-reply.js'; import type { Readable } from 'readable-stream'; +import type { GenericMessage, GenericMessageReply } from './message-types.js'; /** * Interface that defines a message handler of a specific method. diff --git a/src/types/protocols-types.ts b/src/types/protocols-types.ts index cda472c72..724712319 100644 --- a/src/types/protocols-types.ts +++ b/src/types/protocols-types.ts @@ -1,6 +1,5 @@ -import type { GenericMessageReply } from '../core/message-reply.js'; import type { PublicJwk } from './jose-types.js'; -import type { AuthorizationModel, GenericMessage } from './message-types.js'; +import type { AuthorizationModel, GenericMessage, GenericMessageReply } from './message-types.js'; import type { DwnInterfaceName, DwnMethodName } from '../enums/dwn-interface-method.js'; export type ProtocolsConfigureDescriptor = { diff --git a/src/types/records-types.ts b/src/types/records-types.ts index edcf36292..25da5fde8 100644 --- a/src/types/records-types.ts +++ b/src/types/records-types.ts @@ -1,10 +1,9 @@ import type { EncryptionAlgorithm } from '../utils/encryption.js'; import type { GeneralJws } from './jws-types.js'; -import type { GenericMessageReply } from '../core/message-reply.js'; import type { KeyDerivationScheme } from '../utils/hd-key.js'; import type { PublicJwk } from './jose-types.js'; import type { Readable } from 'readable-stream'; -import type { AuthorizationModel, GenericMessage, GenericSignaturePayload, Pagination } from './message-types.js'; +import type { AuthorizationModel, GenericMessage, GenericMessageReply, GenericSignaturePayload, Pagination } from './message-types.js'; import type { DwnInterfaceName, DwnMethodName } from '../enums/dwn-interface-method.js'; import type { RangeCriterion, RangeFilter } from './query-types.js'; diff --git a/tests/core/message-reply.spec.ts b/tests/core/message-reply.spec.ts index e666c9010..2853ba911 100644 --- a/tests/core/message-reply.spec.ts +++ b/tests/core/message-reply.spec.ts @@ -1,4 +1,4 @@ -import type { GenericMessageReply } from '../../src/core/message-reply.js'; +import type { GenericMessageReply } from '../../src/types/message-types.js'; import { expect } from 'chai'; import { messageReplyFromError } from '../../src/core/message-reply.js';