fix: stop exporting internal types

Author: PierreJeanjacquot

src/utils/subgraphQuery.ts

@@ -1,6 +1,10 @@
 import { GraphQLClient, gql } from 'graphql-request';
-import { Contact, GraphQLResponse, ProtectedDataQuery } from '../index.js';
+import { Contact } from '../index.js';
 import { WorkflowError } from './errors.js';
+import {
+  GraphQLResponse,
+  ProtectedDataQuery,
+} from '../web3mail/internalTypes.js';
 
 const checkProtectedDataQuery = gql`
   query GetValidContacts(

src/web3mail/fetchMyContacts.ts

@@ -1,13 +1,12 @@
 import { booleanSchema, throwIfMissing } from '../utils/validators.js';
 import { fetchUserContacts } from './fetchUserContacts.js';
 import {
-  Contact,
   DappAddressConsumer,
   DappWhitelistAddressConsumer,
-  FetchMyContactsParams,
   IExecConsumer,
   SubgraphConsumer,
-} from './types.js';
+} from './internalTypes.js';
+import { Contact, FetchMyContactsParams } from './types.js';
 
 export type FetchMyContacts = typeof fetchMyContacts;
 

src/web3mail/fetchUserContacts.ts

@@ -12,14 +12,13 @@ import {
   isEnsTest,
   throwIfMissing,
 } from '../utils/validators.js';
+import { Contact, FetchUserContactsParams } from './types.js';
 import {
-  Contact,
   DappAddressConsumer,
   DappWhitelistAddressConsumer,
-  FetchUserContactsParams,
   IExecConsumer,
   SubgraphConsumer,
-} from './types.js';
+} from './internalTypes.js';
 
 export const fetchUserContacts = async ({
   graphQLClient = throwIfMissing(),

src/web3mail/internalTypes.ts

@@ -0,0 +1,36 @@
+import { IExec } from 'iexec';
+import { AddressOrENS } from './types.js';
+import { GraphQLClient } from 'graphql-request';
+
+export type ProtectedDataQuery = {
+  id: string;
+  name: string;
+};
+
+export type GraphQLResponse = {
+  protectedDatas: ProtectedDataQuery[];
+};
+
+export type DappAddressConsumer = {
+  dappAddressOrENS: AddressOrENS;
+};
+
+export type IpfsNodeConfigConsumer = {
+  ipfsNode: string;
+};
+
+export type IpfsGatewayConfigConsumer = {
+  ipfsGateway: string;
+};
+
+export type DappWhitelistAddressConsumer = {
+  dappWhitelistAddress: string;
+};
+
+export type IExecConsumer = {
+  iexec: IExec;
+};
+
+export type SubgraphConsumer = {
+  graphQLClient: GraphQLClient;
+};

src/web3mail/sendEmail.ts

@@ -26,16 +26,15 @@ import {
   checkUserVoucher,
   filterWorkerpoolOrders,
 } from './sendEmail.models.js';
+import { SendEmailParams, SendEmailResponse } from './types.js';
 import {
   DappAddressConsumer,
   DappWhitelistAddressConsumer,
   IExecConsumer,
   IpfsGatewayConfigConsumer,
   IpfsNodeConfigConsumer,
-  SendEmailParams,
-  SendEmailResponse,
   SubgraphConsumer,
-} from './types.js';
+} from './internalTypes.js';
 
 export type SendEmail = typeof sendEmail;
 

src/web3mail/types.ts

@@ -1,13 +1,8 @@
-import { GraphQLClient } from 'graphql-request';
-import { EnhancedWallet, IExec } from 'iexec';
+import { EnhancedWallet } from 'iexec';
 import { IExecConfigOptions } from 'iexec/IExecConfig';
 
 export type Web3SignerProvider = EnhancedWallet;
 
-export type IExecConsumer = {
-  iexec: IExec;
-};
-
 export type ENS = string;
 
 export type AddressOrENS = Address | ENS;
@@ -58,22 +53,6 @@ export type SendEmailResponse = {
   taskId: string;
 };
 
-/**
- * Internal props for querying the subgraph
- */
-export type ProtectedDataQuery = {
-  id: string;
-  name: string;
-};
-
-export type GraphQLResponse = {
-  protectedDatas: ProtectedDataQuery[];
-};
-
-export type SubgraphConsumer = {
-  graphQLClient: GraphQLClient;
-};
-
 /**
  * Configuration options for Web3Mail.
  */
@@ -121,19 +100,3 @@ export type Web3MailConfigOptions = {
    */
   allowExperimentalNetworks?: boolean;
 };
-
-export type DappAddressConsumer = {
-  dappAddressOrENS: AddressOrENS;
-};
-
-export type IpfsNodeConfigConsumer = {
-  ipfsNode: string;
-};
-
-export type IpfsGatewayConfigConsumer = {
-  ipfsGateway: string;
-};
-
-export type DappWhitelistAddressConsumer = {
-  dappWhitelistAddress: string;
-};