refactor monorepo tsconfig mapping

.gitignore

@@ -35,3 +35,6 @@ coverage
 
 # vscode
 .vscode
+
+# typescript
+tsconfig.build.tsbuildinfo

jest.config.js

@@ -1,6 +1,23 @@
 module.exports = {
-  projects: [
-    '<rootDir>/packages/*'
-  ],
-  testTimeout: 240000
+  preset: 'ts-jest',
+  testRegex: '((\\.|/)(e2e|test|spec))\\.[jt]sx?$',
+  moduleNameMapper: {
+    '@defichain/jellyfish-address': '<rootDir>/packages/jellyfish-address/src',
+    '@defichain/jellyfish-api-core': '<rootDir>/packages/jellyfish-api-core/src',
+    '@defichain/jellyfish-api-jsonrpc': '<rootDir>/packages/jellyfish-api-jsonrpc/src',
+    '@defichain/jellyfish-crypto': '<rootDir>/packages/jellyfish-crypto/src',
+    '@defichain/jellyfish-json': '<rootDir>/packages/jellyfish-json/src',
+    '@defichain/jellyfish-network': '<rootDir>/packages/jellyfish-network/src',
+    '@defichain/jellyfish-transaction': '<rootDir>/packages/jellyfish-transaction/src',
+    '@defichain/jellyfish-transaction-builder': '<rootDir>/packages/jellyfish-transaction-builder/src',
+    '@defichain/jellyfish-wallet': '<rootDir>/packages/jellyfish-wallet/src',
+    '@defichain/jellyfish-wallet-mnemonic': '<rootDir>/packages/jellyfish-wallet-mnemonic/src',
+    '@defichain/testcontainers': '<rootDir>/packages/testcontainers/src',
+    '@defichain/testing': '<rootDir>/packages/testing/src'
+  },
+  testTimeout: 240000,
+  coveragePathIgnorePatterns: [
+    '/node_modules/',
+    '.*/__tests__/.*'
+  ]
 }

package.json

@@ -21,6 +21,7 @@
     "node": ">=14.x"
   },
   "scripts": {
+    "clean": "rm -rf ./packages/**/dist && rm -rf ./packages/**/tsconfig.build.tsbuildinfo",
     "prepare": "husky install",
     "build": "lerna run build",
     "version": "lerna version $1 --yes --no-push --no-git-tag-version",
@@ -29,7 +30,7 @@
     "standard": "ts-standard --fix",
     "test": "jest --maxWorkers=100%",
     "test:ci": "jest --ci --coverage --forceExit --maxWorkers=4",
-    "all": "npm run build && npm run standard && npm run test"
+    "all": "npm run clean && npm run build && npm run standard && npm run test"
   },
   "devDependencies": {
     "@size-limit/preset-app": "^4.10.1",

packages/jellyfish-address/package.json

@@ -32,7 +32,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsc"
+    "build": "tsc -b ./tsconfig.build.json"
   },
   "dependencies": {
     "@defichain/jellyfish-crypto": "0.0.0",

packages/jellyfish-address/tsconfig.build.json

@@ -0,0 +1,15 @@
+{
+  "extends": "../../tsconfig.build.json",
+  "include": [
+    "./src/**/*"
+  ],
+  "compilerOptions": {
+    "outDir": "./dist",
+    "rootDir": "./src",
+  },
+  "references": [
+    {"path": "../jellyfish-crypto/tsconfig.build.json"},
+    {"path": "../jellyfish-network/tsconfig.build.json"},
+    {"path": "../jellyfish-transaction/tsconfig.build.json"}
+  ]
+}

packages/jellyfish-api-core/package.json

@@ -32,7 +32,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsc"
+    "build": "tsc -b ./tsconfig.build.json"
   },
   "dependencies": {
     "@defichain/jellyfish-json": "0.0.0"

packages/jellyfish-api-core/tsconfig.build.json

@@ -0,0 +1,14 @@
+{
+  "extends": "../../tsconfig.build.json",
+  "include": [
+    "./src/**/*"
+  ],
+  "compilerOptions": {
+    "outDir": "./dist",
+    "rootDir": "./src",
+  },
+  "references": [
+    {"path": "../jellyfish-json/tsconfig.build.json"},
+    {"path": "../testcontainers/tsconfig.build.json"}
+  ]
+}

packages/jellyfish-api-jsonrpc/package.json

@@ -32,7 +32,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsc"
+    "build": "tsc -b ./tsconfig.build.json"
   },
   "dependencies": {
     "@defichain/jellyfish-api-core": "0.0.0",

packages/jellyfish-api-jsonrpc/tsconfig.build.json

@@ -0,0 +1,14 @@
+{
+  "extends": "../../tsconfig.build.json",
+  "include": [
+    "./src/**/*"
+  ],
+  "compilerOptions": {
+    "outDir": "./dist",
+    "rootDir": "./src",
+  },
+  "references": [
+    {"path": "../jellyfish-api-core/tsconfig.build.json"},
+    {"path": "../testcontainers/tsconfig.build.json"}
+  ]
+}

packages/jellyfish-crypto/package.json

@@ -32,7 +32,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsc"
+    "build": "tsc -b ./tsconfig.build.json"
   },
   "dependencies": {
     "bech32": "^2.0.0",

packages/jellyfish-address/tsconfig.json → packages/jellyfish-crypto/tsconfig.build.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.build.json",
   "include": [
     "./src/**/*"
   ],

packages/jellyfish-json/package.json

@@ -32,7 +32,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsc"
+    "build": "tsc -b ./tsconfig.build.json"
   },
   "peerDependencies": {
     "bignumber.js": "^9.0.1"

packages/jellyfish-api-core/tsconfig.json → packages/jellyfish-json/tsconfig.build.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.build.json",
   "include": [
     "./src/**/*"
   ],

packages/jellyfish-network/package.json

@@ -32,6 +32,6 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsc"
+    "build": "tsc -b ./tsconfig.build.json"
   }
 }

packages/jellyfish-api-jsonrpc/tsconfig.json → packages/jellyfish-network/tsconfig.build.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.build.json",
   "include": [
     "./src/**/*"
   ],

packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_account_account_to_account.test.ts

@@ -1,7 +1,6 @@
 import BigNumber from 'bignumber.js'
 import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc'
-import { OP_CODES } from '@defichain/jellyfish-transaction'
-import { AccountToAccount } from '@defichain/jellyfish-transaction/dist/script/defi/dftx_account'
+import { OP_CODES, AccountToAccount } from '@defichain/jellyfish-transaction'
 import { P2WPKH } from '@defichain/jellyfish-address'
 import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { createToken, mintTokens, sendTokensToAddress, utxosToAccount } from '@defichain/testing'

packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_account_account_to_utxos.test.ts

@@ -1,7 +1,6 @@
 import BigNumber from 'bignumber.js'
 import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc'
-import { OP_CODES } from '@defichain/jellyfish-transaction'
-import { AccountToUtxos } from '@defichain/jellyfish-transaction/dist/script/defi/dftx_account'
+import { OP_CODES, AccountToUtxos } from '@defichain/jellyfish-transaction'
 import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { utxosToAccount } from '@defichain/testing'
 import { getProviders, MockProviders } from '../provider.mock'

packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_account_utxos_to_account.test.ts

@@ -1,7 +1,6 @@
 import BigNumber from 'bignumber.js'
 import { Bech32, HASH160 } from '@defichain/jellyfish-crypto'
-import { OP_CODES } from '@defichain/jellyfish-transaction'
-import { UtxosToAccount } from '@defichain/jellyfish-transaction/src/script/defi/dftx_account'
+import { OP_CODES, UtxosToAccount } from '@defichain/jellyfish-transaction'
 import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc'
 import { getProviders, MockProviders } from '../provider.mock'

packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_liq_pool_add_liquidity.test.ts

@@ -1,7 +1,7 @@
 import BigNumber from 'bignumber.js'
 import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc'
 import { RegTest } from '@defichain/jellyfish-network'
-import { OP_CODES } from '@defichain/jellyfish-transaction'
+import { OP_CODES, PoolAddLiquidity } from '@defichain/jellyfish-transaction'
 import { P2WPKH } from '@defichain/jellyfish-address'
 import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { createPoolPair, createToken, mintTokens, sendTokensToAddress, utxosToAccount } from '@defichain/testing'
@@ -13,7 +13,6 @@ import {
   sendTransaction
 } from '../test.utils'
 import { Bech32, HASH160 } from '@defichain/jellyfish-crypto'
-import { PoolAddLiquidity } from '@defichain/jellyfish-transaction/dist/script/defi/dftx_pool'
 
 const container = new MasterNodeRegTestContainer()
 let providers: MockProviders

packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_liq_pool_remove_liquidity.test.ts

@@ -1,6 +1,6 @@
 import BigNumber from 'bignumber.js'
 import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc'
-import { OP_CODES } from '@defichain/jellyfish-transaction'
+import { OP_CODES, PoolRemoveLiquidity } from '@defichain/jellyfish-transaction'
 import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { addPoolLiquidity, createPoolPair, createToken, mintTokens } from '@defichain/testing'
 import { getProviders, MockProviders } from '../provider.mock'
@@ -11,7 +11,6 @@ import {
   sendTransaction
 } from '../test.utils'
 import { Bech32, HASH160 } from '@defichain/jellyfish-crypto'
-import { PoolRemoveLiquidity } from '@defichain/jellyfish-transaction/dist/script/defi/dftx_pool'
 
 const container = new MasterNodeRegTestContainer()
 let providers: MockProviders

packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_p2wpkh.test.ts

@@ -3,12 +3,9 @@ import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { getProviders, MockProviders } from '../provider.mock'
 import { P2WPKHTxnBuilder } from '../../src'
 import { fundEllipticPair } from '../test.utils'
-import { OP_DEFI_TX } from '@defichain/jellyfish-transaction/dist/script/defi'
-import { CDfTx } from '@defichain/jellyfish-transaction/dist/script/defi/dftx'
-import { OP_CODES } from '@defichain/jellyfish-transaction/dist'
-import { DeFiOpUnmapped } from '@defichain/jellyfish-transaction/src/script/defi/dftx_unmapped'
+import { DeFiOpUnmapped, OP_CODES, OP_DEFI_TX, CDfTx } from '@defichain/jellyfish-transaction'
 
-// P2WPKHTxnBuilder is abstact and not instantiable
+// P2WPKHTxnBuilder is abstract and not instantiable
 class TestBuilder extends P2WPKHTxnBuilder {}
 
 const container = new MasterNodeRegTestContainer()

packages/jellyfish-transaction-builder/package.json

@@ -32,7 +32,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsc"
+    "build": "tsc -b ./tsconfig.build.json"
   },
   "peerDependencies": {
     "bignumber.js": "^9.0.1"

packages/jellyfish-transaction-builder/src/txn/txn_builder.ts

@@ -4,12 +4,11 @@ import {
   SignInputOption,
   Transaction,
   TransactionSegWit,
-  TransactionSigner, Vin, Vout
+  TransactionSigner, Vin, Vout, OP_DEFI_TX
 } from '@defichain/jellyfish-transaction'
 import { BigNumber } from 'bignumber.js'
 import { EllipticPairProvider, FeeRateProvider, Prevout, PrevoutProvider } from '../provider'
 import { calculateFeeP2WPKH } from './txn_fee'
-import { OP_DEFI_TX } from '@defichain/jellyfish-transaction/dist/script/defi'
 import { TxnBuilderError, TxnBuilderErrorType } from './txn_builder_error'
 
 const MAX_FEE_RATE = new BigNumber('0.00100000')

packages/jellyfish-transaction-builder/src/txn/txn_builder_account.ts

@@ -1,6 +1,8 @@
 import BigNumber from 'bignumber.js'
-import { AccountToAccount, AccountToUtxos, UtxosToAccount } from '@defichain/jellyfish-transaction/dist/script/defi/dftx_account'
-import { DeFiTransactionConstants, OP_CODES, Script, Transaction, TransactionSegWit, Vout } from '@defichain/jellyfish-transaction'
+import {
+  AccountToAccount, AccountToUtxos, UtxosToAccount, DeFiTransactionConstants,
+  OP_CODES, Script, Transaction, TransactionSegWit, Vout
+} from '@defichain/jellyfish-transaction'
 import { P2WPKHTxnBuilder } from './txn_builder'
 import { TxnBuilderError, TxnBuilderErrorType } from './txn_builder_error'
 

packages/jellyfish-transaction-builder/src/txn/txn_builder_dex.ts

@@ -1,5 +1,4 @@
-import { OP_CODES, Script, TransactionSegWit } from '@defichain/jellyfish-transaction'
-import { PoolSwap } from '@defichain/jellyfish-transaction/dist/script/defi/dftx_pool'
+import { OP_CODES, Script, TransactionSegWit, PoolSwap } from '@defichain/jellyfish-transaction'
 import { P2WPKHTxnBuilder } from './txn_builder'
 
 export class TxnBuilderDex extends P2WPKHTxnBuilder {

packages/jellyfish-transaction-builder/src/txn/txn_builder_liq_pool.ts

@@ -1,5 +1,4 @@
-import { PoolAddLiquidity, PoolRemoveLiquidity } from '@defichain/jellyfish-transaction/dist/script/defi/dftx_pool'
-import { OP_CODES, Script, TransactionSegWit } from '@defichain/jellyfish-transaction'
+import { OP_CODES, Script, TransactionSegWit, PoolAddLiquidity, PoolRemoveLiquidity } from '@defichain/jellyfish-transaction'
 import { P2WPKHTxnBuilder } from './txn_builder'
 import { TxnBuilderError, TxnBuilderErrorType } from './txn_builder_error'
 

packages/jellyfish-transaction-builder/src/txn/txn_builder_oracles.ts

@@ -1,5 +1,7 @@
-import { AppointOracle, RemoveOracle, SetOracleData, UpdateOracle } from '@defichain/jellyfish-transaction/dist/script/defi/dftx_oracles'
-import { OP_CODES, Script, TransactionSegWit } from '@defichain/jellyfish-transaction'
+import {
+  OP_CODES, Script, TransactionSegWit,
+  AppointOracle, RemoveOracle, SetOracleData, UpdateOracle
+} from '@defichain/jellyfish-transaction'
 import { P2WPKHTxnBuilder } from './txn_builder'
 import { TxnBuilderError, TxnBuilderErrorType } from './txn_builder_error'
 

packages/jellyfish-transaction-builder/tsconfig.build.json

@@ -0,0 +1,15 @@
+{
+  "extends": "../../tsconfig.build.json",
+  "include": [
+    "./src/**/*"
+  ],
+  "compilerOptions": {
+    "outDir": "./dist",
+    "rootDir": "./src",
+  },
+  "references": [
+    {"path": "../jellyfish-api-jsonrpc/tsconfig.build.json"},
+    {"path": "../testcontainers/tsconfig.build.json"},
+    {"path": "../testing/tsconfig.build.json"}
+  ]
+}

packages/jellyfish-transaction/package.json

@@ -32,7 +32,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsc"
+    "build": "tsc -b ./tsconfig.build.json"
   },
   "peerDependencies": {
     "bignumber.js": "^9.0.1"

packages/jellyfish-transaction/src/script/defi/index.ts

@@ -5,6 +5,18 @@ import { OP_RETURN } from '../control'
 import { CDfTx, DfTx } from './dftx'
 import { OP_CODES } from '../mapping'
 
+export * from './dftx_account'
+export * from './dftx_balance'
+export * from './dftx_governance'
+export * from './dftx_masternode'
+export * from './dftx_misc'
+export * from './dftx_oracles'
+export * from './dftx_pool'
+export * from './dftx_price'
+export * from './dftx_token'
+export * from './dftx_unmapped'
+export * from './dftx'
+
 const DEFI_SIGNATURE = '44665478' // DfTx
 
 /**

packages/jellyfish-transaction/src/script/index.ts

@@ -6,3 +6,4 @@ export * from './data'
 export * from './mapping'
 export * from './opcode'
 export * from './stack'
+export * from './defi'