Split jsonrpc into smaller packages

.gitignore

@@ -62,3 +62,4 @@ build/
 data/
 packages/*/lib
 packages/*/esm
+*.tsbuildinfo

package-lock.json

@@ -2130,8 +2130,14 @@
     "@rondo/image-upload": {
       "version": "file:packages/image-upload"
     },
-    "@rondo/jsonrpc": {
-      "version": "file:packages/jsonrpc"
+    "@rondo/jsonrpc-client": {
+      "version": "file:packages/jsonrpc-client"
+    },
+    "@rondo/jsonrpc-common": {
+      "version": "file:packages/jsonrpc-common"
+    },
+    "@rondo/jsonrpc-server": {
+      "version": "file:packages/jsonrpc-server"
     },
     "@rondo/scripts": {
       "version": "file:packages/scripts"
@@ -14936,9 +14942,9 @@
       }
     },
     "typescript": {
-      "version": "3.3.3333",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.3333.tgz",
-      "integrity": "sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz",
+      "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==",
       "dev": true
     },
     "typescript-tslint-plugin": {

package.json

@@ -8,7 +8,9 @@
     "@rondo/comments-client": "file:packages/comments-client",
     "@rondo/image-upload": "file:packages/image-upload",
     "@rondo/tasq": "file:packages/tasq",
-    "@rondo/jsonrpc": "file:packages/jsonrpc",
+    "@rondo/jsonrpc-client": "file:packages/jsonrpc-client",
+    "@rondo/jsonrpc-server": "file:packages/jsonrpc-server",
+    "@rondo/jsonrpc-common": "file:packages/jsonrpc-common",
     "@rondo/scripts": "file:packages/scripts"
   },
   "devDependencies": {
@@ -79,7 +81,7 @@
     "tsify": "^4.0.1",
     "tslint": "^5.12.0",
     "ttypescript": "^1.5.7",
-    "typescript": "^3.3.3333",
+    "typescript": "^3.5.3",
     "typescript-tslint-plugin": "^0.2.1",
     "uglify-js": "^3.5.3",
     "uglifyify": "^5.0.1",

packages/jsonrpc-client/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@rondo/jsonrpc",
+  "name": "@rondo/jsonrpc-client",
   "private": true,
   "scripts": {
     "test": "jest",
@@ -8,7 +8,8 @@
     "clean": "rm -rf lib/"
   },
   "dependencies": {},
-  "types": "lib/index.d.ts",
   "devDependencies": {},
-  "module": "lib/index.js"
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "module": "esm/index.js"
 }

packages/jsonrpc-client/src/local.ts

@@ -1,4 +1,4 @@
-import {Asyncified} from './types'
+import {Asyncified} from '@rondo/jsonrpc-common'
 
 /**
  * Creates a local client for a specific service instance. The actual service

packages/jsonrpc-client/src/remote.test.ts

@@ -6,7 +6,7 @@ import express from 'express'
 import {AddressInfo} from 'net'
 import {Server} from 'http'
 import {createRemoteClient} from './remote'
-import {jsonrpc} from './server'
+import {jsonrpc} from '@rondo/jsonrpc-server'
 import {keys} from 'ts-transformer-keys'
 
 describe('remote', () => {

packages/jsonrpc-client/src/remote.ts

@@ -1,5 +1,5 @@
 import Axios from 'axios'
-import {Asyncified} from './types'
+import {Asyncified} from '@rondo/jsonrpc-common'
 
 export function createRemoteClient<T>(
   baseUrl: string,

packages/jsonrpc-client/tsconfig.esm.json

@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "esm"
+  },
+  "references": [
+    {"path": "../jsonrpc-common/tsconfig.esm.json"},
+    {"path": "../jsonrpc-server/tsconfig.esm.json"}
+  ]
+}

packages/jsonrpc-client/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../tsconfig.common.json",
+  "compilerOptions": {
+    "outDir": "lib",
+    "rootDir": "src"
+  },
+  "references": [
+    {"path": "../jsonrpc-common"},
+    {"path": "../jsonrpc-server"}
+  ]
+}

packages/jsonrpc-common/jest.config.js

@@ -0,0 +1,22 @@
+module.exports = {
+  globals: {
+    'ts-jest': {
+      compiler: 'ttypescript'
+    }
+  },
+  roots: [
+    '<rootDir>/src'
+  ],
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest'
+  },
+  testRegex: '(/__tests__/.*|\\.(test|spec))\\.tsx?$',
+  moduleFileExtensions: [
+    'ts',
+    'tsx',
+    'js',
+    'jsx'
+  ],
+  setupFiles: ['<rootDir>/jest.setup.js'],
+  verbose: false
+}

packages/jsonrpc-common/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@rondo/jsonrpc-common",
+  "private": true,
+  "scripts": {
+    "test": "jest",
+    "lint": "tslint --project .",
+    "compile": "tsc",
+    "clean": "rm -rf lib/"
+  },
+  "dependencies": {},
+  "devDependencies": {},
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "module": "esm/index.js"
+}

packages/jsonrpc-server/jest.config.js

@@ -0,0 +1,22 @@
+module.exports = {
+  globals: {
+    'ts-jest': {
+      compiler: 'ttypescript'
+    }
+  },
+  roots: [
+    '<rootDir>/src'
+  ],
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest'
+  },
+  testRegex: '(/__tests__/.*|\\.(test|spec))\\.tsx?$',
+  moduleFileExtensions: [
+    'ts',
+    'tsx',
+    'js',
+    'jsx'
+  ],
+  setupFiles: ['<rootDir>/jest.setup.js'],
+  verbose: false
+}

packages/jsonrpc-server/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@rondo/jsonrpc-server",
+  "private": true,
+  "scripts": {
+    "test": "jest",
+    "lint": "tslint --project .",
+    "compile": "tsc",
+    "clean": "rm -rf lib/"
+  },
+  "dependencies": {},
+  "devDependencies": {},
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "module": "esm/index.js"
+}

packages/jsonrpc-server/src/index.ts

@@ -1,2 +1 @@
-export * from './client'
 export * from './server'

packages/jsonrpc-server/src/supertest.ts

@@ -1,6 +1,6 @@
 import request from 'supertest'
 import {Application} from 'express'
-import {Asyncified} from './types'
+import {Asyncified} from '@rondo/jsonrpc-common'
 
 export function createClient<T>(
   app: Application, path: string,

packages/jsonrpc-server/tsconfig.esm.json

@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "esm"
+  },
+  "references": [
+    {"path": "../jsonrpc-common/tsconfig.esm.json"}
+  ]
+}

packages/jsonrpc-server/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.common.json",
+  "compilerOptions": {
+    "outDir": "lib",
+    "rootDir": "src"
+  },
+  "references": [
+    {"path": "../jsonrpc-common"}
+  ]
+}