lint and circular deps

decentralized-identity · Dec 20, 2023 · 56643c9 · 56643c9
1 parent 64960d1
commit 56643c9
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 36 deletions.
diff --git 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
@@ -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
@@ -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
     };
   }
 }
diff --git 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
@@ -73,8 +73,8 @@ export class MessagesGetHandler implements MethodHandler {
     }
 
     return {
-      status: { code: 200, detail: 'OK' },
-      entries: messages
+      status  : { code: 200, detail: 'OK' },
+      entries : messages
     };
   }
 }
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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[];
-};
+};
diff --git 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
@@ -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
@@ -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
@@ -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';