refactor and move tests under src

bitcoin-sv · Mar 23, 2024 · 6f47be3 · 6f47be3
1 parent 5412dda
commit 6f47be3
Show file tree

Hide file tree

Showing 33 changed files with 90 additions and 124 deletions.
diff --git a/examples/client.ts b/examples/client.ts
@@ -1,4 +1,4 @@
-import PaymailClient from '../src/client/paymailClient.js'
+import PaymailClient from '../src/paymailClient/paymailClient.js'
 
 const client = new PaymailClient();
 

diff --git a/examples/server.ts b/examples/server.ts
@@ -1,6 +1,6 @@
 import express from 'express'
-import PaymailRouter from '../src/router/router.js'
-import PublicProfileRoute from '../src/router/routes/publicProfileRoute.js'
+import PaymailRouter from '../src/paymailRouter/paymailRouter.js'
+import PublicProfileRoute from '../src/paymailRouter/paymailRoutes/publicProfileRoute.js'
 import { mockUser1 } from './mockUser.js'
 const app = express()
 

diff --git a/mod.ts b/mod.ts
@@ -1,3 +1,3 @@
 export * from './src/capability/index.js';
-export * from './src/client/index.js';
-export * from './src/router/index.js';
+export * from './src/paymailClient/index.js';
+export * from './src/paymailRouter/index.js';
diff --git a/package.json b/package.json
@@ -2,8 +2,57 @@
   "name": "@bsv/ts-paymail",
   "version": "1.0.0",
   "description": "BSV Paymail library",
-  "main": "index.js",
+  "main": "dist/cjs/mod.js",
+  "module": "dist/esm/mod.js",
+  "types": "dist/types/mod.d.ts",
   "type": "module",
+  "files": [
+    "dist",
+    "src",
+    "docs"
+  ],
+  "exports": {
+    ".": {
+      "types": "./dist/types/mod.d.ts",
+      "import": "./dist/esm/mod.js",
+      "require": "./dist/cjs/mod.js"
+    },
+    "./*.ts": {
+      "types": "./dist/types/src/*.d.ts",
+      "import": "./dist/esm/src/*.js",
+      "require": "./dist/cjs/src/*.js"
+    },
+    "./paymailClient": {
+      "import": "./dist/esm/src/paymailClient/index.js",
+      "require": "./dist/cjs/src/paymailClient/index.js",
+      "types": "./dist/types/src/paymailClient/index.d.ts"
+    },
+    "./paymailClient/*": {
+      "import": "./dist/esm/src/paymailClient/*.js",
+      "require": "./dist/cjs/src/paymailClient/*.js",
+      "types": "./dist/types/src/paymailClient/*.d.ts"
+    },
+    "./capability": {
+      "import": "./dist/esm/src/capability/index.js",
+      "require": "./dist/cjs/src/capability/index.js",
+      "types": "./dist/types/src/capability/index.d.ts"
+    },
+    "./capability/*": {
+      "import": "./dist/esm/src/capability/*.js",
+      "require": "./dist/cjs/src/capability/*.js",
+      "types": "./dist/types/src/capability/*.d.ts"
+    },
+    "./paymailRouter": {
+      "import": "./dist/esm/src/paymailRouter/index.js",
+      "require": "./dist/cjs/src/paymailRouter/index.js",
+      "types": "./dist/types/src/paymailRouter/index.d.ts"
+    },
+    "./transaction/*": {
+      "import": "./dist/esm/src/paymailRouter/*.js",
+      "require": "./dist/cjs/src/paymailRouter/*.js",
+      "types": "./dist/types/src/paymailRouter/*.d.ts"
+    }
+  },
   "scripts": {
     "test": "npm run build && jest --testTimeout=15000",
     "test:watch": "npm run build && jest --watch",

diff --git a/...ration/client/capabilityDiscovery.test.ts → ...lient/__tests/capabilityDiscovery.test.ts b/...ration/client/capabilityDiscovery.test.ts → ...lient/__tests/capabilityDiscovery.test.ts
@@ -1,5 +1,5 @@
-import PaymailClient from '../../../dist/cjs/src/client/paymailClient.js';
-import HttpClient from '../../../dist/cjs/src/client/httpClient.js';
+import PaymailClient from '../../../dist/cjs/src/paymailClient/paymailClient.js';
+import HttpClient from '../../../dist/cjs/src/paymailClient/httpClient.js';
 
 describe('#PaymailClient - Capability Discovery', () => {
     let paymailClient: PaymailClient;

diff --git a/...tion/client/p2pPaymentDestination.test.ts → ...ent/__tests/p2pPaymentDestination.test.ts b/...tion/client/p2pPaymentDestination.test.ts → ...ent/__tests/p2pPaymentDestination.test.ts
@@ -1,5 +1,5 @@
-import PaymailClient from '../../../dist/cjs/src/client/paymailClient.js';
-import HttpClient from '../../../dist/cjs/src/client/httpClient.js';
+import PaymailClient from '../../../dist/cjs/src/paymailClient/paymailClient.js';
+import HttpClient from '../../../dist/cjs/src/paymailClient/httpClient.js';
 
 describe('#PaymailClient - P2P Payment Destination', () => {
     let paymailClient: PaymailClient;

diff --git a/test/integration/client/pki.test.ts → src/paymailClient/__tests/pki.test.ts b/test/integration/client/pki.test.ts → src/paymailClient/__tests/pki.test.ts
@@ -1,5 +1,5 @@
-import PaymailClient from '../../../dist/cjs/src/client/paymailClient.js';
-import HttpClient from '../../../dist/cjs/src/client/httpClient.js';
+import PaymailClient from '../../../dist/cjs/src/paymailClient/paymailClient.js';
+import HttpClient from '../../../dist/cjs/src/paymailClient/httpClient.js';
 
 describe('#PaymailClient - Public Key Infrastructure', () => {
     let paymailClient;

diff --git a/.../integration/client/publicProfile.test.ts → ...ymailClient/__tests/publicProfile.test.ts b/.../integration/client/publicProfile.test.ts → ...ymailClient/__tests/publicProfile.test.ts
@@ -1,5 +1,5 @@
-import PaymailClient from '../../../dist/cjs/src/client/paymailClient.js';
-import HttpClient from '../../../dist/cjs/src/client/httpClient.js';
+import PaymailClient from '../../../dist/cjs/src/paymailClient/paymailClient.js';
+import HttpClient from '../../../dist/cjs/src/paymailClient/httpClient.js';
 
 describe('#PaymailClient - Public Profile', () => {
     let paymailClient: PaymailClient;

diff --git a/...ation/client/verifyPublicKeyOwner.test.ts → ...ient/__tests/verifyPublicKeyOwner.test.ts b/...ation/client/verifyPublicKeyOwner.test.ts → ...ient/__tests/verifyPublicKeyOwner.test.ts
@@ -1,5 +1,5 @@
-import PaymailClient from '../../../dist/cjs/src/client/paymailClient.js';
-import HttpClient from '../../../dist/cjs/src/client/httpClient.js';
+import PaymailClient from '../../../dist/cjs/src/paymailClient/paymailClient.js';
+import HttpClient from '../../../dist/cjs/src/paymailClient/httpClient.js';
 
 describe('#PaymailClient - Verify Public Key Owner', () => {
     let paymailClient;

diff --git a/src/client/httpClient.ts → src/paymailClient/httpClient.ts b/src/client/httpClient.ts → src/paymailClient/httpClient.ts
diff --git a/src/client/index.ts → src/paymailClient/index.ts b/src/client/index.ts → src/paymailClient/index.ts
diff --git a/src/client/paymailClient.ts → src/paymailClient/paymailClient.ts b/src/client/paymailClient.ts → src/paymailClient/paymailClient.ts
diff --git a/.../integration/resolver/dnsResolver.test.ts → ...ient/resolver/__tests/dnsResolver.test.ts b/.../integration/resolver/dnsResolver.test.ts → ...ient/resolver/__tests/dnsResolver.test.ts
@@ -1,7 +1,7 @@
-import DNSResolver from '../../../dist/cjs/src/client/resolver/dnsResolver.js';
 import { describe, it, expect } from '@jest/globals';
 import dns from 'dns';
-import HttpClient from '../../../src/client/httpClient';
+import DNSResolver from '../../../../dist/cjs/src/paymailClient/resolver/dnsResolver.js';
+import HttpClient from '../../../../dist/cjs/src/paymailClient/httpClient.js';
 
 describe('# DNS resolver', () => {
     it('should resolve SRV records for handcash.io', async () => {

diff --git a/src/client/resolver/abstractResolver.ts → ...aymailClient/resolver/abstractResolver.ts b/src/client/resolver/abstractResolver.ts → ...aymailClient/resolver/abstractResolver.ts
diff --git a/src/client/resolver/dnsResolver.ts → src/paymailClient/resolver/dnsResolver.ts b/src/client/resolver/dnsResolver.ts → src/paymailClient/resolver/dnsResolver.ts
diff --git a/...t/server/p2p-payment-destinations.test.ts → .../__tests/p2p-payment-destinations.test.ts b/...t/server/p2p-payment-destinations.test.ts → .../__tests/p2p-payment-destinations.test.ts
@@ -1,8 +1,8 @@
 import request from 'supertest';
 import express from 'express';
-import PaymailRouter from '../../../dist/cjs/src/router/router.js';
-import P2pPaymentDestinationRoute from '../../../dist/cjs/src/router/routes/p2pPaymentDestinationRoute.js';
-import PaymailClient from '../../../dist/cjs/src/client/paymailClient.js';
+import PaymailRouter from '../../../dist/cjs/src/paymailRouter/paymailRouter.js';
+import P2pPaymentDestinationRoute from '../../../dist/cjs/src/paymailRouter/paymailRoutes/p2pPaymentDestinationRoute.js';
+import PaymailClient from '../../../dist/cjs/src/paymailClient/paymailClient.js';
 
 describe('#Paymail Server - P2P Payment Destinations', () => {
   let app;

diff --git a/test/unit/server/pki.test.ts → src/paymailRouter/__tests/pki.test.ts b/test/unit/server/pki.test.ts → src/paymailRouter/__tests/pki.test.ts
@@ -1,7 +1,7 @@
 import request from 'supertest';
 import express from 'express';
-import PaymailRouter from '../../../dist/cjs/src/router/router.js';
-import PublicKeyInfrastructureRoute from '../../../dist/cjs/src/router/routes/pki.js';
+import PaymailRouter from '../../../dist/cjs/src/paymailRouter/paymailRouter.js';
+import PublicKeyInfrastructureRoute from '../../../dist/cjs/src/paymailRouter/paymailRoutes/pki.js';
 import { PrivateKey } from '@bsv/sdk';
 
 

diff --git a/test/unit/server/public-profile.test.ts → ...mailRouter/__tests/public-profile.test.ts b/test/unit/server/public-profile.test.ts → ...mailRouter/__tests/public-profile.test.ts
@@ -1,7 +1,7 @@
 import request from 'supertest';
 import express from 'express';
-import PaymailRouter from '../../../dist/cjs/src/router/router.js';
-import PublicProfileRoute from '../../../dist/cjs/src/router/routes/publicProfileRoute.js';
+import PaymailRouter from '../../../dist/cjs/src/paymailRouter/paymailRouter.js';
+import PublicProfileRoute from '../../../dist/cjs/src/paymailRouter/paymailRoutes/publicProfileRoute.js';
 
 describe('#Paymail Server - Get Public Profile', () => {
   let app;

diff --git a/test/unit/server/receive-transaction.test.ts → ...outer/__tests/receive-transaction.test.ts b/test/unit/server/receive-transaction.test.ts → ...outer/__tests/receive-transaction.test.ts
@@ -1,7 +1,7 @@
 import request from 'supertest';
 import express from 'express';
-import PaymailRouter from '../../../dist/cjs/src/router/router.js';
-import ReceiveTransactionRoute from '../../../dist/cjs/src/router/routes/receiveTransaction.js';
+import PaymailRouter from '../../../dist/cjs/src/paymailRouter/paymailRouter.js';
+import ReceiveTransactionRoute from '../../../dist/cjs/src/paymailRouter/paymailRoutes/receiveTransaction.js';
 
 describe('#Paymail Server - P2P Receive Transaction', () => {
   let app;

diff --git a/test/unit/server/serviceDiscovery.test.ts → ...ilRouter/__tests/serviceDiscovery.test.ts b/test/unit/server/serviceDiscovery.test.ts → ...ilRouter/__tests/serviceDiscovery.test.ts
@@ -1,7 +1,7 @@
 import request from 'supertest';
 import express from 'express';
-import PaymailRouter from '../../../dist/cjs/src/router/router.js';
-import PublicProfileRoute from '../../../dist/cjs/src/router/routes/publicProfileRoute.js';
+import PaymailRouter from '../../../dist/cjs/src/paymailRouter/paymailRouter.js';
+import PublicProfileRoute from '../../../dist/cjs/src/paymailRouter/paymailRoutes/publicProfileRoute.js';
 
 describe('#Paymail Server - Capability discovery', () => {
   let app;

diff --git a/src/paymailRouter/index.ts b/src/paymailRouter/index.ts
@@ -0,0 +1,6 @@
+export { default as PaymailRouter } from './paymailRouter.js'
+export { default as PaymailRoute } from './paymailRoutes/paymailRoute.js'
+export { default as P2pPaymentDestinationRoute } from './paymailRoutes/p2pPaymentDestinationRoute.js'
+export { default as PublicKeyInfrastructureRoute } from './paymailRoutes/pki.js'
+export { default as ReceiveTransactionRoute } from './paymailRoutes/receiveTransaction.js'
+export { default as VerifyPublicKeyOwnerRoute } from './paymailRoutes/verifyPublicKeyOwner.js'
diff --git a/src/router/router.ts → src/paymailRouter/paymailRouter.ts b/src/router/router.ts → src/paymailRouter/paymailRouter.ts
@@ -1,6 +1,6 @@
 import express, { Router, ErrorRequestHandler } from 'express'
 import bodyParser from 'body-parser'
-import PaymailRoute from './routes/route.js'
+import PaymailRoute from './paymailRoutes/paymailRoute.js'
 import RequestSenderValidationCapability from '../capability/requestSenderValidationCapability.js'
 
 export default class PaymailRouter {

diff --git a/...uter/routes/p2pPaymentDestinationRoute.ts → ...ymailRoutes/p2pPaymentDestinationRoute.ts b/...uter/routes/p2pPaymentDestinationRoute.ts → ...ymailRoutes/p2pPaymentDestinationRoute.ts
@@ -1,5 +1,5 @@
 
-import PaymailRoute from './route.js';
+import PaymailRoute from './paymailRoute.js';
 import { RequestHandler } from 'express';
 import P2pPaymentDestinationCapability from '../../capability/p2pPaymentDestinationCapability.js';
 import joi from 'joi';

diff --git a/src/router/routes/route.ts → ...ymailRouter/paymailRoutes/paymailRoute.ts b/src/router/routes/route.ts → ...ymailRouter/paymailRoutes/paymailRoute.ts
diff --git a/src/router/routes/pki.ts → src/paymailRouter/paymailRoutes/pki.ts b/src/router/routes/pki.ts → src/paymailRouter/paymailRoutes/pki.ts
@@ -1,4 +1,4 @@
-import PaymailRoute from './route.js';
+import PaymailRoute from './paymailRoute.js';
 import { RequestHandler } from 'express';
 import PublicKeyInfrastructureCapability from '../../capability/pkiCapability.js';
 

diff --git a/src/router/routes/publicProfileRoute.ts → ...outer/paymailRoutes/publicProfileRoute.ts b/src/router/routes/publicProfileRoute.ts → ...outer/paymailRoutes/publicProfileRoute.ts
@@ -1,4 +1,4 @@
-import PaymailRoute from './route.js';
+import PaymailRoute from './paymailRoute.js';
 import { RequestHandler } from 'express';
 import PublicProfileCapability from '../../capability/publicProfileCapability.js';
 

diff --git a/src/router/routes/receiveTransaction.ts → ...outer/paymailRoutes/receiveTransaction.ts b/src/router/routes/receiveTransaction.ts → ...outer/paymailRoutes/receiveTransaction.ts
@@ -1,4 +1,4 @@
-import PaymailRoute from './route.js';
+import PaymailRoute from './paymailRoute.js';
 import { RequestHandler } from 'express';
 import P2pReceiveTransactionCapability from '../../capability/p2pReceiveTransactionCapability.js';
 

diff --git a/src/router/routes/verifyPublicKeyOwner.ts → ...ter/paymailRoutes/verifyPublicKeyOwner.ts b/src/router/routes/verifyPublicKeyOwner.ts → ...ter/paymailRoutes/verifyPublicKeyOwner.ts
@@ -1,4 +1,4 @@
-import PaymailRoute from './route.js';
+import PaymailRoute from './paymailRoute.js';
 import { RequestHandler } from 'express';
 import VerifyPublicKeyOwnerCapability from 'src/capability/verifyPublicKeyOwnerCapability.js';
 

diff --git a/src/router/index.ts b/src/router/index.ts
diff --git a/test/acceptance/clientServer.test.ts b/test/acceptance/clientServer.test.ts
diff --git a/tsconfig.examples.json b/tsconfig.examples.json
diff --git a/tsconfig.json b/tsconfig.json
@@ -13,11 +13,5 @@
     {
       "path": "tsconfig.types.json"
     },
-    {
-      "path": "tsconfig.examples.json"
-    },
-    {
-      "path": "tsconfig.test.json"
-    }
   ]
 }
diff --git a/tsconfig.test.json b/tsconfig.test.json