rough lerna build implementation

retzger · Dec 7, 2018 · 7e2dbfa · 7e2dbfa
1 parent d057f70
commit 7e2dbfa
Show file tree

Hide file tree

Showing 62 changed files with 2,167 additions and 1,402 deletions.
diff --git a/lerna.json b/lerna.json
@@ -0,0 +1,6 @@
+{
+  "packages": ["packages/*"],
+  "npmClient": "yarn",
+  "npmClientArgs": ["--no-lockfile"],
+  "version": "0.0.0"
+}
diff --git a/package.json b/package.json
@@ -36,7 +36,6 @@
     "lint:ts": "$(npm bin)/tslint --fix -t stylish -c tslint.json -p tsconfig.json && $(npm bin)/prettier --parser typescript --write 'src/**/*.ts'",
     "lint:rest": "$(npm bin)/prettier '**/*.{md,json}' --write",
     "test": "$(npm bin)/jest",
-    "test:ci": "$(npm bin)/jest --maxWorkers=4",
     "test:watch": "$(npm bin)/jest --watch",
     "coverage": "$(npm bin)/jest --collectCoverage",
     "precommit": "npm run test && $(npm bin)/lint-staged",
@@ -76,28 +75,29 @@
     "ez-ens": "^1.0.4",
     "get-port": "^4.0.0",
     "graphlib": "^2.1.5",
-    "graphql": "^14.0.2",
-    "graphql-import": "^0.7.1",
-    "graphql-tools": "^4.0.3",
-    "immutable": "^4.0.0-rc.12",
+    "graphql": "^0.13.2",
+    "graphql-import": "^0.6.0",
+    "graphql-tools": "^3.0.2",
+    "immutable": "^3.8.2",
     "lodash": "^4.17.10",
     "patch-package": "^5.1.1",
-    "postinstall-postinstall": "^2.0.0",
+    "postinstall-postinstall": "^1.0.0",
     "web3": "^1.0.0-beta.35"
   },
   "devDependencies": {
-    "@types/graphql": "^14.0.3",
+    "@types/graphql": "^0.13.1",
     "@types/jest": "^23.1.0",
     "@types/lodash": "^4.14.109",
     "copyfiles": "^2.0.0",
     "dotenv": "^6.0.0",
     "dotenv-cli": "^1.4.0",
-    "husky": "^1.2.0",
+    "husky": "^0.14.3",
     "jest": "^23.5.0",
-    "lint-staged": "^8.1.0",
+    "lerna": "^3.4.3",
+    "lint-staged": "^7.2.2",
     "nodemon": "^1.17.5",
     "npm-run-all": "^4.1.3",
-    "prettier": "1.15.3",
+    "prettier": "1.14.2",
     "rimraf": "^2.6.2",
     "ts-jest": "^23.1.4",
     "ts-node": "^7.0.1",

diff --git a/packages/base/package.json b/packages/base/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@ethql/base",
+  "version": "0.0.0",
+  "license": "Apache-2.0",
+  "scripts": {
+    "clean": "rimraf dist",
+    "build:ts": "npm run clean && patch-package && tsc && copyfiles -u 1 src/schema/**/*.graphql src/abi/** dist"
+  },
+  "dependencies": {
+  }
+}
diff --git a/src/bootstrap.ts → packages/base/src/bootstrap.ts b/src/bootstrap.ts → packages/base/src/bootstrap.ts
diff --git a/src/config.ts → packages/base/src/config.ts b/src/config.ts → packages/base/src/config.ts
diff --git a/src/context.ts → packages/base/src/context.ts b/src/context.ts → packages/base/src/context.ts
diff --git a/src/core/index.ts → packages/base/src/core/index.ts b/src/core/index.ts → packages/base/src/core/index.ts
diff --git a/src/core/model/index.ts → packages/base/src/core/model/index.ts b/src/core/model/index.ts → packages/base/src/core/model/index.ts
diff --git a/src/core/resolvers/account.ts → packages/base/src/core/resolvers/account.ts b/src/core/resolvers/account.ts → packages/base/src/core/resolvers/account.ts
diff --git a/src/core/resolvers/block.ts → packages/base/src/core/resolvers/block.ts b/src/core/resolvers/block.ts → packages/base/src/core/resolvers/block.ts
diff --git a/src/core/resolvers/health.ts → packages/base/src/core/resolvers/health.ts b/src/core/resolvers/health.ts → packages/base/src/core/resolvers/health.ts
diff --git a/src/core/resolvers/index.ts → packages/base/src/core/resolvers/index.ts b/src/core/resolvers/index.ts → packages/base/src/core/resolvers/index.ts
diff --git a/src/core/resolvers/log.ts → packages/base/src/core/resolvers/log.ts b/src/core/resolvers/log.ts → packages/base/src/core/resolvers/log.ts
diff --git a/src/core/resolvers/root.ts → packages/base/src/core/resolvers/root.ts b/src/core/resolvers/root.ts → packages/base/src/core/resolvers/root.ts
diff --git a/src/core/resolvers/scalars.ts → packages/base/src/core/resolvers/scalars.ts b/src/core/resolvers/scalars.ts → packages/base/src/core/resolvers/scalars.ts
diff --git a/src/core/resolvers/storage.ts → packages/base/src/core/resolvers/storage.ts b/src/core/resolvers/storage.ts → packages/base/src/core/resolvers/storage.ts
diff --git a/src/core/resolvers/transaction.ts → ...es/base/src/core/resolvers/transaction.ts b/src/core/resolvers/transaction.ts → ...es/base/src/core/resolvers/transaction.ts
diff --git a/src/core/schema/index.ts → packages/base/src/core/schema/index.ts b/src/core/schema/index.ts → packages/base/src/core/schema/index.ts
diff --git a/src/core/services/decoder/impl/simple.ts → .../src/core/services/decoder/impl/simple.ts b/src/core/services/decoder/impl/simple.ts → .../src/core/services/decoder/impl/simple.ts
diff --git a/src/core/services/decoder/index.ts → ...s/base/src/core/services/decoder/index.ts b/src/core/services/decoder/index.ts → ...s/base/src/core/services/decoder/index.ts
diff --git a/...ices/eth-service/impl/web3-eth-service.ts → ...ices/eth-service/impl/web3-eth-service.ts b/...ices/eth-service/impl/web3-eth-service.ts → ...ices/eth-service/impl/web3-eth-service.ts
diff --git a/src/core/services/eth-service/index.ts → ...se/src/core/services/eth-service/index.ts b/src/core/services/eth-service/index.ts → ...se/src/core/services/eth-service/index.ts
diff --git a/src/core/services/web3/index.ts → ...ages/base/src/core/services/web3/index.ts b/src/core/services/web3/index.ts → ...ages/base/src/core/services/web3/index.ts
diff --git a/src/editor.ts → packages/base/src/editor.ts b/src/editor.ts → packages/base/src/editor.ts
diff --git a/src/plugin.ts → packages/base/src/plugin.ts b/src/plugin.ts → packages/base/src/plugin.ts
diff --git a/src/schema/root.ts → packages/base/src/schema/root.ts b/src/schema/root.ts → packages/base/src/schema/root.ts
diff --git a/src/server.ts → packages/base/src/server.ts b/src/server.ts → packages/base/src/server.ts
diff --git a/src/services.ts → packages/base/src/services.ts b/src/services.ts → packages/base/src/services.ts
@@ -8,6 +8,9 @@ export type EthqlServiceDefinition<Config, Service> = {
   };
 };
 
+export interface EthqlServiceDefinitions {
+}
+
 export type EthqlServiceFactories = {
   [P in keyof EthqlServiceDefinitions]: EthqlServiceDefinitions[P] extends EthqlServiceDefinition<
     infer Config,

diff --git a/src/types/web3/eth/abi.d.ts → packages/base/src/types/web3/eth/abi.d.ts b/src/types/web3/eth/abi.d.ts → packages/base/src/types/web3/eth/abi.d.ts
diff --git a/src/types/web3/eth/accounts.d.ts → ...ges/base/src/types/web3/eth/accounts.d.ts b/src/types/web3/eth/accounts.d.ts → ...ges/base/src/types/web3/eth/accounts.d.ts
diff --git a/src/types/web3/eth/contract.d.ts → ...ges/base/src/types/web3/eth/contract.d.ts b/src/types/web3/eth/contract.d.ts → ...ges/base/src/types/web3/eth/contract.d.ts
diff --git a/src/types/web3/eth/index.d.ts → packages/base/src/types/web3/eth/index.d.ts b/src/types/web3/eth/index.d.ts → packages/base/src/types/web3/eth/index.d.ts
diff --git a/src/types/web3/eth/types.d.ts → packages/base/src/types/web3/eth/types.d.ts b/src/types/web3/eth/types.d.ts → packages/base/src/types/web3/eth/types.d.ts
diff --git a/src/types/web3/index.d.ts → packages/base/src/types/web3/index.d.ts b/src/types/web3/index.d.ts → packages/base/src/types/web3/index.d.ts
diff --git a/src/types/web3/promiEvent.d.ts → packages/base/src/types/web3/promiEvent.d.ts b/src/types/web3/promiEvent.d.ts → packages/base/src/types/web3/promiEvent.d.ts
diff --git a/src/types/web3/providers.d.ts → packages/base/src/types/web3/providers.d.ts b/src/types/web3/providers.d.ts → packages/base/src/types/web3/providers.d.ts
diff --git a/src/types/web3/types.d.ts → packages/base/src/types/web3/types.d.ts b/src/types/web3/types.d.ts → packages/base/src/types/web3/types.d.ts
diff --git a/src/types/web3/utils.d.ts → packages/base/src/types/web3/utils.d.ts b/src/types/web3/utils.d.ts → packages/base/src/types/web3/utils.d.ts
diff --git a/src/utils.ts → packages/base/src/utils.ts b/src/utils.ts → packages/base/src/utils.ts
diff --git a/packages/base/tsconfig.json b/packages/base/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist"
+  },
+  "include": ["src/**/*"]
+}
diff --git a/packages/ens/package.json b/packages/ens/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "@ethql/ens",
+  "version": "0.0.0",
+  "main": "dist/index.js",
+  "license": "Apache-2.0",
+  "scripts": {
+    "clean": "rimraf dist",
+    "build:ts": "npm run clean && patch-package && tsc && copyfiles -u 1 src/schema/**/*.graphql src/abi/** dist"
+  },
+  "dependencies": {
+    "@ethql/base": "^0.0.0"
+  }
+}
diff --git a/src/ens/README.md → packages/ens/src/README.md b/src/ens/README.md → packages/ens/src/README.md
diff --git a/src/ens/index.ts → packages/ens/src/index.ts b/src/ens/index.ts → packages/ens/src/index.ts
@@ -1,7 +1,9 @@
 import ENS = require('ez-ens');
-import { EthqlPluginFactory } from '../plugin';
+import { EthqlPluginFactory } from '@ethql/base/dist/plugin';
 import resolvers from './resolvers';
 
+import {} from '@ethql/base/dist/core/services/web3';
+
 const plugin: EthqlPluginFactory = config => ({
   name: 'ens',
   priority: 20,

diff --git a/src/ens/resolvers/index.ts → packages/ens/src/resolvers/index.ts b/src/ens/resolvers/index.ts → packages/ens/src/resolvers/index.ts
@@ -1,6 +1,6 @@
 import * as _ from 'lodash';
-import { EthqlContext } from '../../context';
-import { EthqlBlock } from '../../core/model';
+import { EthqlContext } from '@ethql/base/dist/context';
+import { EthqlBlock } from '@ethql/base/dist/core/model';
 import { Address, addressFn } from './scalars';
 
 // This uses the _reduction_ approach for installing plugin resolvers.

diff --git a/src/ens/resolvers/scalars.ts → packages/ens/src/resolvers/scalars.ts b/src/ens/resolvers/scalars.ts → packages/ens/src/resolvers/scalars.ts
@@ -1,6 +1,6 @@
 import { GraphQLScalarType, Kind } from 'graphql';
 import Web3 = require('web3');
-import { EthqlContext } from '../../context';
+import { EthqlContext } from '@ethql/base/dist/context';
 
 function isEnsDomain(input: string) {
   return input.includes('.eth');

diff --git a/src/ens/services/ens.ts → packages/ens/src/services/ens.ts b/src/ens/services/ens.ts → packages/ens/src/services/ens.ts
@@ -1,6 +1,6 @@
 import ENS = require('ez-ens');
 
-declare module '../../services' {
+declare module '@ethql/base/dist/services' {
   interface EthqlServices {
     ens: ENS;
   }

diff --git a/packages/ens/tsconfig.json b/packages/ens/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist"
+  },
+  "include": ["src/**/*"]
+}
diff --git a/packages/erc20/package.json b/packages/erc20/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "@ethql/erc20",
+  "version": "0.0.0",
+  "main": "dist/index.js",
+  "license": "Apache-2.0",
+  "scripts": {
+    "clean": "rimraf dist",
+    "build:ts": "npm run clean && patch-package && tsc && copyfiles -u 1 src/schema/**/*.graphql src/abi/** dist"
+  },
+  "dependencies": {
+    "@ethql/base": "^0.0.0"
+  }
+}
diff --git a/src/abi/README.md → packages/erc20/src/abi/README.md b/src/abi/README.md → packages/erc20/src/abi/README.md
diff --git a/src/abi/erc20.json → packages/erc20/src/abi/erc20.json b/src/abi/erc20.json → packages/erc20/src/abi/erc20.json
diff --git a/src/erc20/decoders/index.ts → packages/erc20/src/decoders/index.ts b/src/erc20/decoders/index.ts → packages/erc20/src/decoders/index.ts
@@ -1,6 +1,6 @@
-import { EthqlContext } from '../../context';
-import { EthqlAccount, EthqlTransaction } from '../../core/model';
-import { createAbiDecoder, DecoderDefinition, extractParamValue } from '../../core/services/decoder';
+import { EthqlContext } from '@ethql/base/dist/context';
+import { EthqlAccount, EthqlTransaction } from '@ethql/base/dist/core/model';
+import { createAbiDecoder, DecoderDefinition, extractParamValue } from '@ethql/base/dist/core/services/decoder';
 import {
   ERC20ApprovalEvent,
   Erc20Approve,
@@ -28,7 +28,7 @@ type Erc20TxBindings = {
 class Erc20TokenDecoder implements DecoderDefinition<Erc20TxBindings, Erc20LogBindings> {
   public readonly entity = 'token';
   public readonly standard = 'ERC20';
-  public readonly abiDecoder = createAbiDecoder(__dirname + '../../../abi/erc20.json');
+  public readonly abiDecoder = createAbiDecoder(__dirname + '/../abi/erc20.json');
 
   public readonly txTransformers = {
     transfer: (decoded: any, tx: EthqlTransaction, context: EthqlContext) => {

diff --git a/src/erc20/index.ts → packages/erc20/src/index.ts b/src/erc20/index.ts → packages/erc20/src/index.ts
@@ -1,8 +1,12 @@
-import { EthqlPluginFactory } from '../plugin';
+import { EthqlPluginFactory } from '@ethql/base/dist/plugin';
 import { Erc20TokenDecoder } from './decoders';
 import erc20Schema from './schema/erc20';
 import tokenSchema from './schema/token';
 
+import {} from '@ethql/base/dist/core/services/web3';
+import {} from '@ethql/base/dist/core/services/eth-service';
+import {} from '@ethql/base/dist/core/services/decoder';
+
 const plugin: EthqlPluginFactory = config => ({
   name: 'erc20',
   priority: 10,

diff --git a/src/erc20/model/index.ts → packages/erc20/src/model/index.ts b/src/erc20/model/index.ts → packages/erc20/src/model/index.ts
@@ -1,6 +1,6 @@
 import Contract from 'web3/eth/contract';
-import { EthqlContext } from '../../context';
-import { EthqlAccount } from '../../core/model';
+import { EthqlContext } from '@ethql/base/dist/context';
+import { EthqlAccount } from '@ethql/base/dist/core/model';
 
 export interface Erc20Transaction {
   tokenContract: Erc20TokenContract;
@@ -38,7 +38,7 @@ export type ERC20ApprovalEvent = {
 };
 
 export class Erc20TokenContract {
-  private static ABI = require(__dirname + '../../../abi/erc20.json');
+  private static ABI = require(__dirname + '/../abi/erc20.json');
   private _contract: Contract;
 
   constructor(public readonly account: EthqlAccount, readonly context: EthqlContext) {

diff --git a/src/erc20/schema/erc20.ts → packages/erc20/src/schema/erc20.ts b/src/erc20/schema/erc20.ts → packages/erc20/src/schema/erc20.ts
diff --git a/src/erc20/schema/token.ts → packages/erc20/src/schema/token.ts b/src/erc20/schema/token.ts → packages/erc20/src/schema/token.ts
diff --git a/packages/erc20/tsconfig.json b/packages/erc20/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist"
+  },
+  "include": ["src/**/*"]
+}
diff --git a/packages/ethql/package.json b/packages/ethql/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "ethql",
+  "version": "0.0.0",
+  "license": "Apache-2.0",
+  "scripts": {
+    "clean": "rimraf dist",
+    "build:ts": "npm run clean && patch-package && tsc && copyfiles -u 1 src/schema/**/*.graphql src/abi/** dist"
+  },
+  "dependencies": {
+    "@ethql/base": "^0.0.0",
+    "@ethql/erc20": "^0.0.0",
+    "@ethql/ens": "^0.0.0"
+  }
+}
diff --git a/packages/ethql/src/index.ts b/packages/ethql/src/index.ts
@@ -0,0 +1,17 @@
+import config from '@ethql/base/dist/config';
+import core from '@ethql/base/dist/core';
+import ens from '@ethql/ens';
+import erc20 from '@ethql/erc20';
+import { EthqlServer } from '@ethql/base/dist/server';
+
+console.log(`Effective configuration:\n${JSON.stringify(config, null, 2)}`);
+
+const server = new EthqlServer({
+  config,
+  plugins: [core, erc20, ens],
+});
+
+process.on('SIGINT', async () => await server.stop());
+process.on('SIGTERM', async () => await server.stop());
+
+server.start();
diff --git a/packages/ethql/tsconfig.json b/packages/ethql/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist"
+  },
+  "include": ["src/**/*"]
+}
diff --git a/src/index.ts b/src/index.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -5,14 +5,12 @@
     "esModuleInterop": true,
     "module": "commonjs",
     "sourceMap": true,
-    "rootDir": "src",
-    "outDir": "dist",
-    "baseUrl": ".",
+    "declaration": true,
     "lib": ["esnext"],
+    "baseUrl": ".",
+    "allowSyntheticDefaultImports": true,
     "paths": {
-      "web3": ["src/types/web3/index.d.ts"],
-      "*": ["node_modules/*", "src/types/*"]
+      "*": ["packages/base/src/types/*"]
     }
-  },
-  "include": ["src/**/*"]
+  }
 }