token-swap typescript: Move things around, fix typing problems (#1643)

* Move things around, fix typing problems

* oups output built in src

* fix typegen

* fix cli

* fix linting, apply review comments and add forgotten package-lock.json change

* remove typegen.sh and move simpler command to package.json

* Move things around, remove babel and rollup

* Update packages

* Add browser dist to eslintignore

Co-authored-by: Arrowana <[email protected]>
Co-authored-by: Jon Cinque <[email protected]>

Author: Arrowana

ci/js-test-token-swap.sh

@@ -4,13 +4,10 @@ set -ex
 cd "$(dirname "$0")/.."
 source ./ci/solana-version.sh install
 
-(cd token/js && npm install)
-
 cd token-swap/js
 npm install
 npm run lint
-npm run flow
-npx tsc module.d.ts
+npm run build
 npm run start-with-test-validator
 (cd ../../target/deploy && mv spl_token_swap_production.so spl_token_swap.so)
 SWAP_PROGRAM_OWNER_FEE_ADDRESS="HfoTxFR1Tm6kGmWgYWD6J7YHVy1UwqSULUGVLXkJqaKN" npm run start-with-test-validator

token-swap/js/.eslintignore

@@ -1 +1,2 @@
-/lib
+/dist
+/dist.browser

token-swap/js/.eslintrc.js

@@ -11,7 +11,6 @@ module.exports = {
     'plugin:import/errors',
     'plugin:import/warnings',
   ],
-  parser: 'babel-eslint',
   parserOptions: {
     sourceType: 'module',
     ecmaVersion: 8,

token-swap/js/.gitignore

@@ -1 +1,3 @@
 test-ledger/
+dist/
+dist.browser/

token-swap/js/babel.config.json

@@ -1,9 +1,3 @@
-/**
- * Exercises the token-swap program
- *
- * @flow
- */
-
 import {
   createAccountAndSwapAtomic,
   createTokenSwap,

token-swap/js/babel.rollup.config.json

@@ -1,5 +1,3 @@
-// @flow
-
 import {
   Account,
   Connection,
@@ -9,15 +7,11 @@ import {
 } from '@solana/web3.js';
 import {AccountLayout, Token, TOKEN_PROGRAM_ID} from '@solana/spl-token';
 
-import {
-  TokenSwap,
-  CurveType,
-  TOKEN_SWAP_PROGRAM_ID,
-} from '../client/token-swap';
-import {sendAndConfirmTransaction} from '../client/util/send-and-confirm-transaction';
-import {newAccountWithLamports} from '../client/util/new-account-with-lamports';
-import {url} from '../url';
-import {sleep} from '../client/util/sleep';
+import {TokenSwap, CurveType, TOKEN_SWAP_PROGRAM_ID} from '../src';
+import {sendAndConfirmTransaction} from '../src/util/send-and-confirm-transaction';
+import {newAccountWithLamports} from '../src/util/new-account-with-lamports';
+import {url} from '../src/util/url';
+import {sleep} from '../src/util/sleep';
 
 // The following globals are created by `createTokenSwap` and used by subsequent tests
 // Token swap
@@ -76,14 +70,14 @@ const DEFAULT_POOL_TOKEN_AMOUNT = 1000000000;
 // Pool token amount to withdraw / deposit
 const POOL_TOKEN_AMOUNT = 10000000;
 
-function assert(condition, message) {
+function assert(condition: boolean, message?: string) {
   if (!condition) {
     console.log(Error().stack + ':token-test.js');
     throw message || 'Assertion failed';
   }
 }
 
-let connection;
+let connection: Connection;
 async function getConnection(): Promise<Connection> {
   if (connection) return connection;
 
@@ -356,7 +350,7 @@ export async function createAccountAndSwapAtomic(): Promise<void> {
   let userAccountA = await mintA.createAccount(owner.publicKey);
   await mintA.mintTo(userAccountA, owner, [], SWAP_AMOUNT_IN);
 
-  // $FlowFixMe[prop-missing]
+  // @ts-ignore
   const balanceNeeded = await Token.getMinBalanceRentForExemptAccount(
     connection,
   );