Merge pull request #62 from 0xPolygonID/feature/pid-556

Fix circular dependencies issue

Author: vmidyllic

.github/workflows/ci.yaml

@@ -40,12 +40,12 @@ jobs:
       - name: Run ESLint
         run: npm run lint
 
-      # - name: Circular dependency check
-      #   run: npm run deps:check
-
       - name: Run Build
         run: npm run build
 
+      - name: Circular dependency check
+        run: npm run deps:check
+
       - name: Download regular circuits for CI 'latest.zip' from S3
         run: mkdir ./tests/proofs/testdata && wget https://iden3-circuits-bucket.s3.eu-west-1.amazonaws.com/latest.zip -P ./tests/proofs/testdata
 

src/iden3comm/types/index.ts

@@ -6,13 +6,3 @@ export * from './protocol/revocation';
 
 export * from './packer';
 export * from './packageManager';
-/**
- *  Protocol message type
- */
-export type ProtocolMessage = string;
-
-type JSONValue = string | number | boolean | object | Array<object>;
-
-export type JSONObject = {
-  [x: string]: JSONValue;
-};

src/iden3comm/types/packageManager.ts

@@ -1,16 +1,5 @@
-import { IPacker, PackerParams } from './packer';
+import { BasicMessage, IPacker, PackerParams } from './packer';
 import { MediaType } from '../constants';
-import { ProtocolMessage } from '.';
-
-export type BasicMessage = {
-  id: string;
-  typ?: MediaType;
-  type: ProtocolMessage;
-  thid?: string;
-  body?: unknown;
-  from?: string;
-  to?: string;
-};
 
 /**
  * Interface for defining the registry of packers

src/iden3comm/types/packer.ts

@@ -1,10 +1,36 @@
 import { DID } from '@iden3/js-iden3-core';
 import { DataPrepareHandlerFunc, VerificationHandlerFunc } from '../packers';
-import { BasicMessage } from './index';
 import { ProvingMethodAlg } from '@iden3/js-jwz';
 import { CircuitId } from '../../circuits';
 import { MediaType } from '../constants';
 
+/**
+ *  Protocol message type
+ */
+export type ProtocolMessage = string;
+
+/**
+ * JSONValue
+ */
+type JSONValue = string | number | boolean | object | Array<object>;
+
+/**
+ * JSON object
+ */
+export type JSONObject = {
+  [x: string]: JSONValue;
+};
+
+export type BasicMessage = {
+  id: string;
+  typ?: MediaType;
+  type: ProtocolMessage;
+  thid?: string;
+  body?: unknown;
+  from?: string;
+  to?: string;
+};
+
 /**
  *  parameters for any packer
  */

src/iden3comm/types/protocol/auth.ts

@@ -1,6 +1,6 @@
 import { ZKProof } from '@iden3/js-jwz';
 import { MediaType } from '../../constants';
-import { JSONObject, ProtocolMessage } from '../index';
+import { JSONObject, ProtocolMessage } from '../packer';
 
 /** AuthorizationResponseMessage is struct the represents iden3message authorization response */
 export type AuthorizationResponseMessage = {

src/iden3comm/types/protocol/credentials.ts

@@ -1,7 +1,6 @@
-import { ProtocolMessage } from '../index';
-import { JSONObject } from '../index';
 import { W3CCredential } from '../../../verifiable';
 import { MediaType } from '../../constants';
+import { JSONObject, ProtocolMessage } from '../packer';
 
 /** CredentialIssuanceRequestMessageBody represents data for credential issuance request */
 export type CredentialIssuanceRequestMessageBody = {