From 98c1fc82f7cb8377f394a43ca7ef1f19965d7d8c Mon Sep 17 00:00:00 2001 From: Matthew Russell Date: Thu, 7 Apr 2022 06:41:57 -0700 Subject: [PATCH] Feat/152 Trade list MVP (#217) * add trades lib with data provider * add trades table and cell color logic * ensure we only show last 50 rows * add test for table columns and formatting * update trades table to get cells using col-id * fix linting * use default function param for fetchpolicy --- apps/trading/pages/markets/trade-grid.tsx | 24 ++--- .../src/lib/generic-data-provider.ts | 1 + libs/trades/.babelrc | 12 +++ libs/trades/.eslintrc.json | 18 ++++ libs/trades/README.md | 7 ++ libs/trades/jest.config.js | 10 +++ libs/trades/package.json | 4 + libs/trades/project.json | 43 +++++++++ libs/trades/src/index.ts | 1 + .../src/lib/__generated__/TradeFields.ts | 57 ++++++++++++ libs/trades/src/lib/__generated__/Trades.ts | 81 +++++++++++++++++ .../trades/src/lib/__generated__/TradesSub.ts | 68 ++++++++++++++ libs/trades/src/lib/trades-container.tsx | 65 ++++++++++++++ libs/trades/src/lib/trades-data-provider.ts | 78 ++++++++++++++++ libs/trades/src/lib/trades-table.spec.tsx | 74 ++++++++++++++++ libs/trades/src/lib/trades-table.tsx | 88 +++++++++++++++++++ libs/trades/src/setup-tests.ts | 1 + libs/trades/tsconfig.json | 25 ++++++ libs/trades/tsconfig.lib.json | 22 +++++ libs/trades/tsconfig.spec.json | 19 ++++ tsconfig.base.json | 1 + workspace.json | 1 + 22 files changed, 684 insertions(+), 16 deletions(-) create mode 100644 libs/trades/.babelrc create mode 100644 libs/trades/.eslintrc.json create mode 100644 libs/trades/README.md create mode 100644 libs/trades/jest.config.js create mode 100644 libs/trades/package.json create mode 100644 libs/trades/project.json create mode 100644 libs/trades/src/index.ts create mode 100644 libs/trades/src/lib/__generated__/TradeFields.ts create mode 100644 libs/trades/src/lib/__generated__/Trades.ts create mode 100644 libs/trades/src/lib/__generated__/TradesSub.ts create mode 100644 libs/trades/src/lib/trades-container.tsx create mode 100644 libs/trades/src/lib/trades-data-provider.ts create mode 100644 libs/trades/src/lib/trades-table.spec.tsx create mode 100644 libs/trades/src/lib/trades-table.tsx create mode 100644 libs/trades/src/setup-tests.ts create mode 100644 libs/trades/tsconfig.json create mode 100644 libs/trades/tsconfig.lib.json create mode 100644 libs/trades/tsconfig.spec.json diff --git a/apps/trading/pages/markets/trade-grid.tsx b/apps/trading/pages/markets/trade-grid.tsx index 07d9df892..1bf3bc365 100644 --- a/apps/trading/pages/markets/trade-grid.tsx +++ b/apps/trading/pages/markets/trade-grid.tsx @@ -5,10 +5,12 @@ import { useState } from 'react'; import { GridTab, GridTabs } from './grid-tabs'; import { DealTicketContainer } from '@vegaprotocol/deal-ticket'; import { OrderListContainer } from '@vegaprotocol/order-list'; +import { TradesContainer } from '@vegaprotocol/trades'; import { Splash } from '@vegaprotocol/ui-toolkit'; import { PositionsContainer } from '@vegaprotocol/positions'; import type { Market_market } from './__generated__/Market'; import { t } from '@vegaprotocol/react-helpers'; +import { AccountsContainer } from '@vegaprotocol/accounts'; const Chart = () => ( @@ -20,16 +22,6 @@ const Orderbook = () => (

{t('Orderbook')}

 ); -const Collateral = () => ( - -

{t('Collateral')}

- -); -const Trades = () => ( - -

{t('Trades')}

- -); const TradingViews = { Chart: Chart, @@ -37,8 +29,8 @@ const TradingViews = { Orderbook: Orderbook, Orders: OrderListContainer, Positions: PositionsContainer, - Collateral: Collateral, - Trades: Trades, + Accounts: AccountsContainer, + Trades: TradesContainer, }; type TradingView = keyof typeof TradingViews; @@ -50,7 +42,7 @@ interface TradeGridProps { export const TradeGrid = ({ market }: TradeGridProps) => { const wrapperClasses = classNames( 'h-full max-h-full', - 'grid gap-[1px] grid-cols-[1fr_325px_325px] grid-rows-[min-content_1fr_200px]', + 'grid gap-[1px] grid-cols-[1fr_375px_460px] grid-rows-[min-content_1fr_200px]', 'bg-black-10 dark:bg-white-10', 'text-ui' ); @@ -70,7 +62,7 @@ export const TradeGrid = ({ market }: TradeGridProps) => { - + @@ -85,8 +77,8 @@ export const TradeGrid = ({ market }: TradeGridProps) => { - - + + diff --git a/libs/react-helpers/src/lib/generic-data-provider.ts b/libs/react-helpers/src/lib/generic-data-provider.ts index 04b65b4ff..e1a2afa49 100644 --- a/libs/react-helpers/src/lib/generic-data-provider.ts +++ b/libs/react-helpers/src/lib/generic-data-provider.ts @@ -86,6 +86,7 @@ function makeDataProviderInternal( .subscribe({ query: subscriptionQuery, variables, + fetchPolicy, }) .subscribe(({ data: subscriptionData }) => { if (!subscriptionData) { diff --git a/libs/trades/.babelrc b/libs/trades/.babelrc new file mode 100644 index 000000000..ccae900be --- /dev/null +++ b/libs/trades/.babelrc @@ -0,0 +1,12 @@ +{ + "presets": [ + [ + "@nrwl/react/babel", + { + "runtime": "automatic", + "useBuiltIns": "usage" + } + ] + ], + "plugins": [] +} diff --git a/libs/trades/.eslintrc.json b/libs/trades/.eslintrc.json new file mode 100644 index 000000000..db820c5d0 --- /dev/null +++ b/libs/trades/.eslintrc.json @@ -0,0 +1,18 @@ +{ + "extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"], + "ignorePatterns": ["!**/*", "__generated__"], + "overrides": [ + { + "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], + "rules": {} + }, + { + "files": ["*.ts", "*.tsx"], + "rules": {} + }, + { + "files": ["*.js", "*.jsx"], + "rules": {} + } + ] +} diff --git a/libs/trades/README.md b/libs/trades/README.md new file mode 100644 index 000000000..b81d584d8 --- /dev/null +++ b/libs/trades/README.md @@ -0,0 +1,7 @@ +# trades + +This library was generated with [Nx](https://nx.dev). + +## Running unit tests + +Run `nx test trades` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/trades/jest.config.js b/libs/trades/jest.config.js new file mode 100644 index 000000000..7197c3c24 --- /dev/null +++ b/libs/trades/jest.config.js @@ -0,0 +1,10 @@ +module.exports = { + displayName: 'trades', + preset: '../../jest.preset.js', + transform: { + '^.+\\.[tj]sx?$': 'babel-jest', + }, + moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], + coverageDirectory: '../../coverage/libs/trades', + setupFilesAfterEnv: ['./src/setup-tests.ts'], +}; diff --git a/libs/trades/package.json b/libs/trades/package.json new file mode 100644 index 000000000..45be21637 --- /dev/null +++ b/libs/trades/package.json @@ -0,0 +1,4 @@ +{ + "name": "@vegaprotocol/trades", + "version": "0.0.1" +} diff --git a/libs/trades/project.json b/libs/trades/project.json new file mode 100644 index 000000000..5e885e56a --- /dev/null +++ b/libs/trades/project.json @@ -0,0 +1,43 @@ +{ + "root": "libs/trades", + "sourceRoot": "libs/trades/src", + "projectType": "library", + "tags": [], + "targets": { + "build": { + "executor": "@nrwl/web:rollup", + "outputs": ["{options.outputPath}"], + "options": { + "outputPath": "dist/libs/trades", + "tsConfig": "libs/trades/tsconfig.lib.json", + "project": "libs/trades/package.json", + "entryFile": "libs/trades/src/index.ts", + "external": ["react/jsx-runtime"], + "rollupConfig": "@nrwl/react/plugins/bundle-rollup", + "compiler": "babel", + "assets": [ + { + "glob": "libs/trades/README.md", + "input": ".", + "output": "." + } + ] + } + }, + "lint": { + "executor": "@nrwl/linter:eslint", + "outputs": ["{options.outputFile}"], + "options": { + "lintFilePatterns": ["libs/trades/**/*.{ts,tsx,js,jsx}"] + } + }, + "test": { + "executor": "@nrwl/jest:jest", + "outputs": ["coverage/libs/trades"], + "options": { + "jestConfig": "libs/trades/jest.config.js", + "passWithNoTests": true + } + } + } +} diff --git a/libs/trades/src/index.ts b/libs/trades/src/index.ts new file mode 100644 index 000000000..ba70717d7 --- /dev/null +++ b/libs/trades/src/index.ts @@ -0,0 +1 @@ +export * from './lib/trades-container'; diff --git a/libs/trades/src/lib/__generated__/TradeFields.ts b/libs/trades/src/lib/__generated__/TradeFields.ts new file mode 100644 index 000000000..8ea3b94cb --- /dev/null +++ b/libs/trades/src/lib/__generated__/TradeFields.ts @@ -0,0 +1,57 @@ +/* tslint:disable */ +/* eslint-disable */ +// @generated +// This file was automatically generated and should not be edited. + +// ==================================================== +// GraphQL fragment: TradeFields +// ==================================================== + +export interface TradeFields_market { + __typename: "Market"; + /** + * Market ID + */ + id: string; + /** + * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct + * number denominated in the currency of the Market. (uint64) + * + * Examples: + * Currency Balance decimalPlaces Real Balance + * GBP 100 0 GBP 100 + * GBP 100 2 GBP 1.00 + * GBP 100 4 GBP 0.01 + * GBP 1 4 GBP 0.0001 ( 0.01p ) + * + * GBX (pence) 100 0 GBP 1.00 (100p ) + * GBX (pence) 100 2 GBP 0.01 ( 1p ) + * GBX (pence) 100 4 GBP 0.0001 ( 0.01p ) + * GBX (pence) 1 4 GBP 0.000001 ( 0.0001p) + */ + decimalPlaces: number; +} + +export interface TradeFields { + __typename: "Trade"; + /** + * The hash of the trade data + */ + id: string; + /** + * The price of the trade (probably initially the passive order price, other determination algorithms are possible though) (uint64) + */ + price: string; + /** + * The number of contracts trades, will always be <= the remaining size of both orders immediately before the trade (uint64) + */ + size: string; + /** + * RFC3339Nano time for when the trade occurred + */ + createdAt: string; + /** + * The market the trade occurred on + */ + market: TradeFields_market; +} diff --git a/libs/trades/src/lib/__generated__/Trades.ts b/libs/trades/src/lib/__generated__/Trades.ts new file mode 100644 index 000000000..923b49601 --- /dev/null +++ b/libs/trades/src/lib/__generated__/Trades.ts @@ -0,0 +1,81 @@ +/* tslint:disable */ +/* eslint-disable */ +// @generated +// This file was automatically generated and should not be edited. + +// ==================================================== +// GraphQL query operation: Trades +// ==================================================== + +export interface Trades_market_trades_market { + __typename: "Market"; + /** + * Market ID + */ + id: string; + /** + * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct + * number denominated in the currency of the Market. (uint64) + * + * Examples: + * Currency Balance decimalPlaces Real Balance + * GBP 100 0 GBP 100 + * GBP 100 2 GBP 1.00 + * GBP 100 4 GBP 0.01 + * GBP 1 4 GBP 0.0001 ( 0.01p ) + * + * GBX (pence) 100 0 GBP 1.00 (100p ) + * GBX (pence) 100 2 GBP 0.01 ( 1p ) + * GBX (pence) 100 4 GBP 0.0001 ( 0.01p ) + * GBX (pence) 1 4 GBP 0.000001 ( 0.0001p) + */ + decimalPlaces: number; +} + +export interface Trades_market_trades { + __typename: "Trade"; + /** + * The hash of the trade data + */ + id: string; + /** + * The price of the trade (probably initially the passive order price, other determination algorithms are possible though) (uint64) + */ + price: string; + /** + * The number of contracts trades, will always be <= the remaining size of both orders immediately before the trade (uint64) + */ + size: string; + /** + * RFC3339Nano time for when the trade occurred + */ + createdAt: string; + /** + * The market the trade occurred on + */ + market: Trades_market_trades_market; +} + +export interface Trades_market { + __typename: "Market"; + /** + * Market ID + */ + id: string; + /** + * Trades on a market + */ + trades: Trades_market_trades[] | null; +} + +export interface Trades { + /** + * An instrument that is trading on the VEGA network + */ + market: Trades_market | null; +} + +export interface TradesVariables { + marketId: string; + maxTrades: number; +} diff --git a/libs/trades/src/lib/__generated__/TradesSub.ts b/libs/trades/src/lib/__generated__/TradesSub.ts new file mode 100644 index 000000000..54e6be1e0 --- /dev/null +++ b/libs/trades/src/lib/__generated__/TradesSub.ts @@ -0,0 +1,68 @@ +/* tslint:disable */ +/* eslint-disable */ +// @generated +// This file was automatically generated and should not be edited. + +// ==================================================== +// GraphQL subscription operation: TradesSub +// ==================================================== + +export interface TradesSub_trades_market { + __typename: "Market"; + /** + * Market ID + */ + id: string; + /** + * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct + * number denominated in the currency of the Market. (uint64) + * + * Examples: + * Currency Balance decimalPlaces Real Balance + * GBP 100 0 GBP 100 + * GBP 100 2 GBP 1.00 + * GBP 100 4 GBP 0.01 + * GBP 1 4 GBP 0.0001 ( 0.01p ) + * + * GBX (pence) 100 0 GBP 1.00 (100p ) + * GBX (pence) 100 2 GBP 0.01 ( 1p ) + * GBX (pence) 100 4 GBP 0.0001 ( 0.01p ) + * GBX (pence) 1 4 GBP 0.000001 ( 0.0001p) + */ + decimalPlaces: number; +} + +export interface TradesSub_trades { + __typename: "Trade"; + /** + * The hash of the trade data + */ + id: string; + /** + * The price of the trade (probably initially the passive order price, other determination algorithms are possible though) (uint64) + */ + price: string; + /** + * The number of contracts trades, will always be <= the remaining size of both orders immediately before the trade (uint64) + */ + size: string; + /** + * RFC3339Nano time for when the trade occurred + */ + createdAt: string; + /** + * The market the trade occurred on + */ + market: TradesSub_trades_market; +} + +export interface TradesSub { + /** + * Subscribe to the trades updates + */ + trades: TradesSub_trades[] | null; +} + +export interface TradesSubVariables { + marketId: string; +} diff --git a/libs/trades/src/lib/trades-container.tsx b/libs/trades/src/lib/trades-container.tsx new file mode 100644 index 000000000..ddbb27afe --- /dev/null +++ b/libs/trades/src/lib/trades-container.tsx @@ -0,0 +1,65 @@ +import { useDataProvider } from '@vegaprotocol/react-helpers'; +import { AsyncRenderer } from '@vegaprotocol/ui-toolkit'; +import type { GridApi } from 'ag-grid-community'; +import type { AgGridReact } from 'ag-grid-react'; +import { useCallback, useMemo, useRef } from 'react'; +import { + MAX_TRADES, + sortTrades, + tradesDataProvider, +} from './trades-data-provider'; +import { TradesTable } from './trades-table'; +import type { TradeFields } from './__generated__/TradeFields'; +import type { TradesVariables } from './__generated__/Trades'; + +interface TradesContainerProps { + marketId: string; +} + +export const TradesContainer = ({ marketId }: TradesContainerProps) => { + const gridRef = useRef(null); + const variables = useMemo( + () => ({ marketId, maxTrades: MAX_TRADES }), + [marketId] + ); + const update = useCallback((delta: TradeFields[]) => { + if (!gridRef.current?.api) { + return false; + } + + const incoming = sortTrades(delta); + const currentRows = getAllRows(gridRef.current.api); + // Create array of trades whose index is now greater than the max so we + // can remove them from the grid + const outgoing = [...incoming, ...currentRows].filter( + (r, i) => i > MAX_TRADES - 1 + ); + + gridRef.current.api.applyTransactionAsync({ + add: incoming, + remove: outgoing, + addIndex: 0, + }); + + return true; + }, []); + const { data, error, loading } = useDataProvider( + tradesDataProvider, + update, + variables + ); + + return ( + + {(data) => } + + ); +}; + +const getAllRows = (api: GridApi) => { + const rows: TradeFields[] = []; + api.forEachNode((node) => { + rows.push(node.data); + }); + return rows; +}; diff --git a/libs/trades/src/lib/trades-data-provider.ts b/libs/trades/src/lib/trades-data-provider.ts new file mode 100644 index 000000000..96462a07e --- /dev/null +++ b/libs/trades/src/lib/trades-data-provider.ts @@ -0,0 +1,78 @@ +import { gql } from '@apollo/client'; +import { makeDataProvider } from '@vegaprotocol/react-helpers'; +import type { TradeFields } from './__generated__/TradeFields'; +import type { Trades } from './__generated__/Trades'; +import type { TradesSub } from './__generated__/TradesSub'; +import orderBy from 'lodash/orderBy'; + +export const MAX_TRADES = 50; + +const TRADES_FRAGMENT = gql` + fragment TradeFields on Trade { + id + price + size + createdAt + market { + id + decimalPlaces + } + } +`; + +export const TRADES_QUERY = gql` + ${TRADES_FRAGMENT} + query Trades($marketId: ID!, $maxTrades: Int!) { + market(id: $marketId) { + id + trades(last: $maxTrades) { + ...TradeFields + } + } + } +`; + +export const TRADES_SUB = gql` + ${TRADES_FRAGMENT} + subscription TradesSub($marketId: ID!) { + trades(marketId: $marketId) { + ...TradeFields + } + } +`; + +export const sortTrades = (trades: TradeFields[]) => { + return orderBy( + trades, + (t) => { + return new Date(t.createdAt).getTime(); + }, + 'desc' + ); +}; + +const update = (draft: TradeFields[], delta: TradeFields[]) => { + const incoming = sortTrades(delta); + + // Add new trades to the top + draft.unshift(...incoming); + + // Remove old trades from the bottom + if (draft.length > MAX_TRADES) { + draft.splice(MAX_TRADES, draft.length - MAX_TRADES); + } +}; + +const getData = (responseData: Trades): TradeFields[] | null => + responseData.market ? responseData.market.trades : null; + +const getDelta = (subscriptionData: TradesSub): TradeFields[] => + subscriptionData?.trades || []; + +export const tradesDataProvider = makeDataProvider( + TRADES_QUERY, + TRADES_SUB, + update, + getData, + getDelta +); diff --git a/libs/trades/src/lib/trades-table.spec.tsx b/libs/trades/src/lib/trades-table.spec.tsx new file mode 100644 index 000000000..ddd452849 --- /dev/null +++ b/libs/trades/src/lib/trades-table.spec.tsx @@ -0,0 +1,74 @@ +import { act, render, screen } from '@testing-library/react'; +import { getDateTimeFormat } from '@vegaprotocol/react-helpers'; +import { DOWN_CLASS, TradesTable, UP_CLASS } from './trades-table'; +import type { TradeFields } from './__generated__/TradeFields'; + +const trade: TradeFields = { + __typename: 'Trade', + id: 'trade-id', + price: '111122200', + size: '20', + createdAt: new Date('2022-04-06T19:00:00').toISOString(), + market: { + __typename: 'Market', + id: 'market-id', + decimalPlaces: 2, + }, +}; + +test('Correct columns are rendered', async () => { + await act(async () => { + render(); + }); + const expectedHeaders = ['Price', 'Size', 'Created at']; + const headers = screen.getAllByRole('columnheader'); + expect(headers).toHaveLength(expectedHeaders.length); + expect(headers.map((h) => h.textContent?.trim())).toEqual(expectedHeaders); +}); + +test('Columns are formatted', async () => { + await act(async () => { + render(); + }); + + const cells = screen.getAllByRole('gridcell'); + const expectedValues = [ + '1,111,222.00', + '20', + getDateTimeFormat().format(new Date(trade.createdAt)), + ]; + cells.forEach((cell, i) => { + expect(cell).toHaveTextContent(expectedValues[i]); + }); +}); + +test('Columns are formatted', async () => { + const trade2 = { + ...trade, + id: 'trade-id-2', + price: (Number(trade.price) + 10).toString(), + size: (Number(trade.size) - 10).toString(), + }; + await act(async () => { + render(); + }); + + const cells = screen.getAllByRole('gridcell'); + + const priceCells = cells.filter( + (cell) => cell.getAttribute('col-id') === 'price' + ); + const sizeCells = cells.filter( + (cell) => cell.getAttribute('col-id') === 'size' + ); + + // For first trade price should have green class and size should have red class + // row 1 + expect(priceCells[0]).toHaveClass(UP_CLASS); + expect(priceCells[1]).not.toHaveClass(DOWN_CLASS); + expect(priceCells[1]).not.toHaveClass(UP_CLASS); + + expect(sizeCells[0]).toHaveClass(DOWN_CLASS); + expect(sizeCells[1]).not.toHaveClass(DOWN_CLASS); + expect(sizeCells[1]).not.toHaveClass(UP_CLASS); +}); diff --git a/libs/trades/src/lib/trades-table.tsx b/libs/trades/src/lib/trades-table.tsx new file mode 100644 index 000000000..cacf817a7 --- /dev/null +++ b/libs/trades/src/lib/trades-table.tsx @@ -0,0 +1,88 @@ +import type { AgGridReact } from 'ag-grid-react'; +import { AgGridColumn } from 'ag-grid-react'; +import { forwardRef, useMemo } from 'react'; +import { AgGridDynamic as AgGrid } from '@vegaprotocol/ui-toolkit'; +import type { TradeFields } from './__generated__/TradeFields'; +import { + formatNumber, + getDateTimeFormat, + t, +} from '@vegaprotocol/react-helpers'; +import type { CellClassParams, ValueFormatterParams } from 'ag-grid-community'; +import BigNumber from 'bignumber.js'; +import { sortTrades } from './trades-data-provider'; + +export const UP_CLASS = 'text-vega-green'; +export const DOWN_CLASS = 'text-vega-pink'; + +const changeCellClass = + (dataKey: string) => + ({ api, value, node }: CellClassParams) => { + const rowIndex = node?.rowIndex; + let colorClass = ''; + + if (typeof rowIndex === 'number') { + const prevRowNode = api.getModel().getRow(rowIndex + 1); + const prevValue = prevRowNode?.data[dataKey]; + const valueNum = new BigNumber(value); + + if (valueNum.isGreaterThan(prevValue)) { + colorClass = UP_CLASS; + } else if (valueNum.isLessThan(prevValue)) { + colorClass = DOWN_CLASS; + } + } + + return ['font-mono', colorClass].join(' '); + }; + +interface TradesTableProps { + data: TradeFields[] | null; +} + +export const TradesTable = forwardRef( + ({ data }, ref) => { + // Sort intial trades + const trades = useMemo(() => { + if (!data) { + return null; + } + return sortTrades(data); + }, [data]); + + return ( + data.id} + ref={ref} + defaultColDef={{ + flex: 1, + resizable: true, + }} + > + { + return formatNumber(value, data.market.decimalPlaces); + }} + /> + + { + return getDateTimeFormat().format(new Date(value)); + }} + /> + + ); + } +); diff --git a/libs/trades/src/setup-tests.ts b/libs/trades/src/setup-tests.ts new file mode 100644 index 000000000..7b0828bfa --- /dev/null +++ b/libs/trades/src/setup-tests.ts @@ -0,0 +1 @@ +import '@testing-library/jest-dom'; diff --git a/libs/trades/tsconfig.json b/libs/trades/tsconfig.json new file mode 100644 index 000000000..4c089585e --- /dev/null +++ b/libs/trades/tsconfig.json @@ -0,0 +1,25 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "jsx": "react-jsx", + "allowJs": true, + "esModuleInterop": true, + "allowSyntheticDefaultImports": true, + "forceConsistentCasingInFileNames": true, + "strict": true, + "noImplicitOverride": true, + "noPropertyAccessFromIndexSignature": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true + }, + "files": [], + "include": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] +} diff --git a/libs/trades/tsconfig.lib.json b/libs/trades/tsconfig.lib.json new file mode 100644 index 000000000..252904bb7 --- /dev/null +++ b/libs/trades/tsconfig.lib.json @@ -0,0 +1,22 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../dist/out-tsc", + "types": ["node"] + }, + "files": [ + "../../node_modules/@nrwl/react/typings/cssmodule.d.ts", + "../../node_modules/@nrwl/react/typings/image.d.ts" + ], + "exclude": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "**/*.spec.js", + "**/*.test.js", + "**/*.spec.jsx", + "**/*.test.jsx" + ], + "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] +} diff --git a/libs/trades/tsconfig.spec.json b/libs/trades/tsconfig.spec.json new file mode 100644 index 000000000..67f149c4c --- /dev/null +++ b/libs/trades/tsconfig.spec.json @@ -0,0 +1,19 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": [ + "**/*.test.ts", + "**/*.spec.ts", + "**/*.test.tsx", + "**/*.spec.tsx", + "**/*.test.js", + "**/*.spec.js", + "**/*.test.jsx", + "**/*.spec.jsx", + "**/*.d.ts" + ] +} diff --git a/tsconfig.base.json b/tsconfig.base.json index 6df97ad0e..3605f272c 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -27,6 +27,7 @@ "@vegaprotocol/tailwindcss-config": [ "libs/tailwindcss-config/src/index.js" ], + "@vegaprotocol/trades": ["libs/trades/src/index.ts"], "@vegaprotocol/types": ["libs/types/src/index.ts"], "@vegaprotocol/ui-toolkit": ["libs/ui-toolkit/src/index.ts"], "@vegaprotocol/wallet": ["libs/wallet/src/index.ts"], diff --git a/workspace.json b/workspace.json index 858387239..033989430 100644 --- a/workspace.json +++ b/workspace.json @@ -16,6 +16,7 @@ "stats": "apps/stats", "stats-e2e": "apps/stats-e2e", "tailwindcss-config": "libs/tailwindcss-config", + "trades": "libs/trades", "trading": "apps/trading", "trading-e2e": "apps/trading-e2e", "types": "libs/types",