refactor: drop using internal modules

.circleci/config.yml

@@ -187,8 +187,6 @@ jobs:
       - checkout
       - restore_cache:
           key: dependency-cache-v3-{{ checksum "src/package-lock.json" }}
-          paths:
-            - src/node_modules
       - run:
           name: Create dir for lint results
           command: cd src && mkdir -p /lintresults
@@ -207,8 +205,6 @@ jobs:
       - checkout
       - restore_cache:
           key: dependency-cache-v3-{{ checksum "src/package-lock.json" }}
-          paths:
-            - src/node_modules
       - run:
           name: Create dir for test results
           command: mkdir -p ./audit/results
@@ -217,7 +213,6 @@ jobs:
           command: cd src && npm run audit:check --silent -- --json > ../audit/results/auditResults.json
       - store_artifacts:
           path: ./audit/results
-          prefix: audit
 
   audit-licenses:
     executor: default-docker
@@ -230,14 +225,11 @@ jobs:
           <<: *defaults_license_scanner
       - restore_cache:
           key: dependency-cache-v3-{{ checksum "src/package-lock.json" }}
-          paths:
-            - src/node_modules
       - run:
           name: Run the license-scanner
           command: cd /tmp/license-scanner && pathToRepo=$CIRCLE_WORKING_DIRECTORY make run
       - store_artifacts:
           path: /tmp/license-scanner/results
-          prefix: licenses
 
   build-local:
     executor: default-machine
@@ -272,7 +264,6 @@ jobs:
           command: cd /tmp/license-scanner && mode=docker dockerImages=mojaloop/$CIRCLE_PROJECT_REPONAME:local make run
       - store_artifacts:
           path: /tmp/license-scanner/results
-          prefix: licenses
 
   image-scan:
     executor: anchore/anchore_engine
@@ -333,8 +324,6 @@ jobs:
       - checkout
       - restore_cache:
           key: dependency-cache-v3-{{ checksum "src/package-lock.json" }}
-          paths:
-            - src/node_modules
       - run:
           name: Configure git
           command: |

Dockerfile

@@ -11,14 +11,6 @@ WORKDIR /src/
 # relying on docker-compose.
 COPY ./src/package.json ./package.json
 COPY ./src/package-lock.json ./package-lock.json
-COPY ./src/lib/cache/package.json ./lib/cache/package.json
-COPY ./src/lib/check/package.json ./lib/check/package.json
-COPY ./src/lib/model/lib/requests/package.json ./lib/model/lib/requests/package.json
-COPY ./src/lib/model/lib/shared/package.json ./lib/model/lib/shared/package.json
-COPY ./src/lib/model/package.json ./lib/model/package.json
-COPY ./src/lib/randomphrase/package.json ./lib/randomphrase/package.json
-COPY ./src/lib/router/package.json ./lib/router/package.json
-COPY ./src/lib/validate/package.json ./lib/validate/package.json
 RUN npm ci --only=production
 
 FROM node:14.15-alpine

src/InboundServer/handlers.js

@@ -13,11 +13,11 @@
 
 'use strict';
 
-const Model = require('@internal/model').InboundTransfersModel;
-const PartiesModel = require('@internal/model').PartiesModel;
-const QuotesModel = require('@internal/model').QuotesModel;
-const TransfersModel = require('@internal/model').TransfersModel;
-const AuthorizationsModel = require('@internal/model').AuthorizationsModel;
+const Model = require('../lib/model').InboundTransfersModel;
+const PartiesModel = require('../lib/model').PartiesModel;
+const QuotesModel = require('../lib/model').QuotesModel;
+const TransfersModel = require('../lib/model').TransfersModel;
+const AuthorizationsModel = require('../lib/model').AuthorizationsModel;
 
 /**
  * Handles a GET /authorizations/{id} request

src/InboundServer/index.js

@@ -20,8 +20,8 @@ const EventEmitter = require('events');
 
 const { WSO2Auth } = require('@mojaloop/sdk-standard-components');
 
-const Validate = require('@internal/validate');
-const router = require('@internal/router');
+const Validate = require('../lib/validate');
+const router = require('../lib/router');
 const handlers = require('./handlers');
 const middlewares = require('./middlewares');
 

src/InboundServer/middlewares.js

@@ -10,7 +10,7 @@
 
 const coBody = require('co-body');
 
-const randomPhrase = require('@internal/randomphrase');
+const randomPhrase = require('../lib/randomphrase');
 const { Jws, Errors } = require('@mojaloop/sdk-standard-components');
 
 /**

src/OutboundServer/handlers.js

@@ -25,7 +25,7 @@ const {
     QuotesModel,
     TransfersModel,
     AuthorizationsModel
-} = require('@internal/model');
+} = require('../lib/model');
 
 
 /**

src/OutboundServer/index.js

@@ -20,8 +20,8 @@ const cors = require('@koa/cors');
 
 const { WSO2Auth } = require('@mojaloop/sdk-standard-components');
 
-const Validate = require('@internal/validate');
-const router = require('@internal/router');
+const Validate = require('../lib/validate');
+const router = require('../lib/router');
 const handlers = require('./handlers');
 const middlewares = require('./middlewares');
 

src/OutboundServer/middlewares.js

@@ -9,7 +9,7 @@
  **************************************************************************/
 
 
-const { ProxyModel } = require('@internal/model');
+const { ProxyModel } = require('../lib/model');
 const { applyState, createErrorHandler, createLogger, createRequestIdGenerator } =
     require('../InboundServer/middlewares');
 

src/TestServer/index.js

@@ -16,8 +16,8 @@ const yaml = require('js-yaml');
 const fs = require('fs').promises;
 const path = require('path');
 
-const Validate = require('@internal/validate');
-const router = require('@internal/router');
+const Validate = require('../lib/validate');
+const router = require('../lib/router');
 const handlers = require('./handlers');
 const middlewares = require('../InboundServer/middlewares');
 

src/index.js

@@ -23,10 +23,10 @@ const TestServer = require('./TestServer');
 // scheme adapter as a service
 const InboundServerMiddleware = require('./InboundServer/middlewares.js');
 const OutboundServerMiddleware = require('./OutboundServer/middlewares.js');
-const Router = require('@internal/router');
-const Validate = require('@internal/validate');
-const RandomPhrase = require('@internal/randomphrase');
-const Cache = require('@internal/cache');
+const Router = require('./lib/router');
+const Validate = require('./lib/validate');
+const RandomPhrase = require('./lib/randomphrase');
+const Cache = require('./lib/cache');
 const { Logger } = require('@mojaloop/sdk-standard-components');
 
 /**

src/lib/model/Async2SyncModel.js

@@ -13,7 +13,7 @@ const util = require('util');
 
 const PSM = require('./common').PersistentStateMachine;
 const MojaloopRequests = require('@mojaloop/sdk-standard-components').MojaloopRequests;
-const deferredJob = require('@internal/shared/deferredJob');
+const deferredJob = require('./lib').deferredJob;
 
 function generate({
     /**

src/lib/model/InboundTransfersModel.js

@@ -14,13 +14,13 @@
 const {
     BackendRequests,
     HTTPResponseError,
-} = require('@internal/requests');
+} = require('./lib/requests');
 const {
     MojaloopRequests,
     Ilp,
     Errors,
 } = require('@mojaloop/sdk-standard-components');
-const shared = require('@internal/shared');
+const shared = require('./lib/shared');
 
 /**
  *  Models the operations required for performing inbound transfers

src/lib/model/OutboundBulkQuotesModel.js

@@ -14,7 +14,7 @@ const util = require('util');
 const { uuid } = require('uuidv4');
 const StateMachine = require('javascript-state-machine');
 const { MojaloopRequests } = require('@mojaloop/sdk-standard-components');
-const shared = require('@internal/shared');
+const shared = require('./lib/shared');
 const { BackendError } = require('./common');
 
 const stateEnum = {

src/lib/model/OutboundRequestToPayTransferModel.js

@@ -14,7 +14,7 @@ const util = require('util');
 const { uuid } = require('uuidv4');
 const StateMachine = require('javascript-state-machine');
 const { Ilp, MojaloopRequests } = require('@mojaloop/sdk-standard-components');
-const shared = require('@internal/shared');
+const shared = require('./lib/shared');
 const { BackendError } = require('./common');
 const PartiesModel = require('./PartiesModel');
 

src/lib/model/OutboundTransfersModel.js

@@ -14,7 +14,7 @@ const util = require('util');
 const { uuid } = require('uuidv4');
 const StateMachine = require('javascript-state-machine');
 const { Ilp, MojaloopRequests } = require('@mojaloop/sdk-standard-components');
-const shared = require('@internal/shared');
+const shared = require('./lib/shared');
 const { BackendError } = require('./common');
 const PartiesModel = require('./PartiesModel');
 

src/lib/model/lib/index.js

@@ -0,0 +1,9 @@
+const deferredJob = require('./deferredJob');
+const request = require('./requests');
+const shared = require('./shared');
+
+module.exports = {
+    deferredJob,
+    request,
+    shared,
+};

src/lib/model/lib/shared/index.js → src/lib/model/lib/shared.js

@@ -439,8 +439,6 @@ const mojaloopBulkPrepareToInternalBulkTransfer = (external, bulkQuotes, ilp) =>
     return internal;
 };
 
-const deferredJob = require('./deferredJob');
-
 module.exports = {
     internalPartyToMojaloopParty,
     internalQuoteResponseToMojaloop,
@@ -452,6 +450,5 @@ module.exports = {
     mojaloopTransactionRequestToInternal,
     mojaloopBulkQuotesRequestToInternal,
     internalBulkQuotesResponseToMojaloop,
-    mojaloopBulkPrepareToInternalBulkTransfer,
-    deferredJob
+    mojaloopBulkPrepareToInternalBulkTransfer
 };