Extract redux, http-types, http-client and test-utils

package-lock.json

@@ -2153,6 +2153,9 @@
     "@rondo.dev/logger": {
       "version": "file:packages/logger"
     },
+    "@rondo.dev/redux-util": {
+      "version": "file:packages/redux-util"
+    },
     "@rondo.dev/scripts": {
       "version": "file:packages/scripts"
     },

package.json

@@ -12,7 +12,11 @@
     "@rondo.dev/scripts": "file:packages/scripts",
     "@rondo.dev/argparse": "file:packages/argparse",
     "@rondo.dev/logger": "file:packages/logger",
-    "@rondo.dev/config": "file:packages/config"
+    "@rondo.dev/config": "file:packages/config",
+    "@rondo.dev/redux": "file:packages/redux",
+    "@rondo.dev/http-client": "file:packages/http-client",
+    "@rondo.dev/test-utils": "file:packages/test-utils",
+    "@rondo.dev/http-types": "file:packages/http-types"
   },
   "devDependencies": {
     "@types/bcrypt": "^3.0.0",

packages/client/src/components/Link.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 import {History, Location} from 'history'
 import {IWithRouterProps} from './IWithRouterProps'
 import {Link as RouterLink, LinkProps} from 'react-router-dom'
-import {URLFormatter} from '@rondo.dev/common'
+import {URLFormatter} from '@rondo.dev/http-client'
 import {withRouter} from 'react-router'
 
 export interface ILinkProps

packages/client/src/crud/CRUD.test.tsx

@@ -1,10 +1,11 @@
-import {createCRUDActions} from './CRUDActions'
+import { HTTPClientMock } from '@rondo.dev/http-client'
-import React from 'react'
+import { TMethod } from '@rondo.dev/http-types'
-import {AnyAction} from 'redux'
+import { IPendingAction } from '@rondo.dev/redux'
-import {CRUDReducer, TCRUDMethod, TCRUDAsyncMethod} from './'
+import { getError } from '@rondo.dev/test-utils'
-import {HTTPClientMock, TestUtils, getError} from '../test-utils'
+import { AnyAction } from 'redux'
-import {TMethod} from '@rondo.dev/common'
+import { TestUtils } from '../test-utils'
-import {IPendingAction} from '../actions'
+import { CRUDReducer, TCRUDAsyncMethod } from './'
+import { createCRUDActions } from './CRUDActions'
 
 describe('CRUD', () => {
 

packages/client/src/crud/CRUDActions.ts

@@ -1,10 +1,8 @@
-import {IHTTPClient, ITypedRequestParams} from '../http'
+import { TFilter, TOnlyDefined } from '@rondo.dev/common'
-import {IRoutes, TFilter, TOnlyDefined} from '@rondo.dev/common'
+import { IHTTPClient } from '@rondo.dev/http-client'
-import {TCRUDAction} from './TCRUDAction'
+import { IRoutes } from '@rondo.dev/http-types'
-import {TCRUDChangeAction} from './TCRUDAction'
+import { TCRUDAction, TCRUDChangeAction, TCRUDCreateAction, TCRUDEditAction } from './TCRUDAction'
-import {TCRUDCreateAction} from './TCRUDAction'
+import { TCRUDMethod } from './TCRUDMethod'
-import {TCRUDEditAction} from './TCRUDAction'
-import {TCRUDMethod} from './TCRUDMethod'
 
 type TAction <T, ActionType extends string, Method extends TCRUDMethod> =
   TFilter<TCRUDAction<T, ActionType> , {method: Method, status: 'pending'}>

packages/client/src/crud/CRUDReducer.ts

@@ -1,4 +1,4 @@
-import {IAction, IResolvedAction} from '../actions'
+import {IAction, IResolvedAction} from '@rondo.dev/redux'
 import {TCRUDAction} from './TCRUDAction'
 import {TCRUDMethod} from './TCRUDMethod'
 import {indexBy, without, TFilter} from '@rondo.dev/common'

packages/client/src/crud/TCRUDAction.ts

@@ -1,4 +1,4 @@
-import {IAction, TAsyncAction} from '../actions'
+import {IAction, TAsyncAction} from '@rondo.dev/redux'
 import {TCRUDMethod} from './TCRUDMethod'
 
 // Async actions

packages/client/src/crumbs/CrumbsActions.ts

@@ -1,4 +1,4 @@
-import {TGetAction, IAction} from '../actions'
+import {TGetAction, IAction} from '@rondo.dev/redux'
 import {ICrumbLink} from './ICrumbLink'
 
 export interface ICrumbs {

packages/client/src/crumbs/CrumbsConnector.tsx

@@ -1,7 +1,8 @@
-import {Crumb} from './Crumb'
+import { TStateSelector } from '@rondo.dev/redux'
-import {Connector, TStateSelector} from '../redux'
+import { Connector } from '../redux'
-import {ICrumbsState} from './CrumbsReducer'
+import { Crumb } from './Crumb'
-import {CrumbsActions} from './CrumbsActions'
+import { CrumbsActions } from './CrumbsActions'
+import { ICrumbsState } from './CrumbsReducer'
 
 export class CrumbsConnector extends Connector<ICrumbsState> {
   protected readonly breadcrumbsActions = new CrumbsActions()

packages/client/src/index.ts

@@ -1,15 +1,11 @@
-export * from './actions'
 export * from './components'
 export * from './crud'
 export * from './crumbs'
 export * from './csrf'
-export * from './http'
 export * from './login'
-export * from './middleware'
 export * from './redux'
 export * from './renderer'
-export * from './store'
 export * from './test-utils'
 
 import * as team from './team'
-export {team}
+export { team }

packages/client/src/login/LoginActions.ts

@@ -1,6 +1,6 @@
-import {TGetAction, TAsyncAction, IAction, PendingAction} from '../actions'
+import {TGetAction, TAsyncAction, IAction, PendingAction} from '@rondo.dev/redux'
 import {IAPIDef, ICredentials, INewUser, IUser} from '@rondo.dev/common'
-import {IHTTPClient} from '../http/IHTTPClient'
+import {IHTTPClient} from '@rondo.dev/http-client'
 
 export type TLoginAction =
   TAsyncAction<IUser, 'LOGIN'>

packages/client/src/login/LoginConnector.tsx

@@ -1,11 +1,11 @@
-import {Connector} from '../redux/Connector'
+import { ICredentials } from '@rondo.dev/common'
-import {ICredentials} from '@rondo.dev/common'
+import { TStateSelector } from '@rondo.dev/redux'
-import {ILoginState} from './LoginReducer'
+import { bindActionCreators } from 'redux'
-import {TStateSelector} from '../redux'
+import { Connector } from '../redux/Connector'
-import {LoginActions} from './LoginActions'
+import { LoginActions } from './LoginActions'
-import {LoginForm} from './LoginForm'
+import { LoginForm } from './LoginForm'
-import {bindActionCreators} from 'redux'
+import { ILoginState } from './LoginReducer'
-import {withForm} from './withForm'
+import { withForm } from './withForm'
 
 const defaultCredentials: ICredentials = {
   username: '',

packages/client/src/login/LoginForm.test.tsx

@@ -1,10 +1,12 @@
-import * as Feature from './'
+import { IAPIDef } from '@rondo.dev/common'
+import { HTTPClientMock } from '@rondo.dev/http-client'
+import { getError } from '@rondo.dev/test-utils'
 import React from 'react'
 import ReactDOM from 'react-dom'
 import T from 'react-dom/test-utils'
-import {HTTPClientMock, TestUtils, getError} from '../test-utils'
+import { MemoryRouter } from 'react-router-dom'
-import {IAPIDef} from '@rondo.dev/common'
+import { TestUtils } from '../test-utils'
-import {MemoryRouter} from 'react-router-dom'
+import * as Feature from './'
 
 const test = new TestUtils()
 

packages/client/src/login/RegisterConnector.tsx

@@ -1,7 +1,7 @@
 import {Connector} from '../redux/Connector'
 import {INewUser} from '@rondo.dev/common'
 import {ILoginState} from './LoginReducer'
-import {TStateSelector} from '../redux'
+import {TStateSelector} from '@rondo.dev/redux'
 import {LoginActions} from './LoginActions'
 import {RegisterForm} from './RegisterForm'
 import {bindActionCreators} from 'redux'

packages/client/src/login/RegisterForm.test.tsx

@@ -1,10 +1,12 @@
-import * as Feature from './'
+import { IAPIDef } from '@rondo.dev/common'
+import { HTTPClientMock } from '@rondo.dev/http-client'
+import { getError } from '@rondo.dev/test-utils'
 import React from 'react'
 import ReactDOM from 'react-dom'
 import T from 'react-dom/test-utils'
-import {HTTPClientMock, TestUtils, getError} from '../test-utils'
+import { MemoryRouter } from 'react-router-dom'
-import {IAPIDef} from '@rondo.dev/common'
+import { TestUtils } from '../test-utils'
-import {MemoryRouter} from 'react-router-dom'
+import * as Feature from './'
 
 const test = new TestUtils()
 

packages/client/src/login/withForm.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import {IPendingAction} from '../actions'
+import {IPendingAction} from '@rondo.dev/redux'
 
 export interface IComponentProps<Data> {
   onSubmit: () => void

packages/client/src/redux/Connector.ts

@@ -1,4 +1,4 @@
-import {TStateSelector} from './TStateSelector'
+import {TStateSelector} from '@rondo.dev/redux'
 import {connect, Omit} from 'react-redux'
 import {Dispatch} from 'redux'
 import {ComponentType} from 'react'

packages/client/src/redux/TStateSelector.ts

@@ -1,5 +0,0 @@
-/*
- * Select and return a part of the state
- */
-export type TStateSelector<GlobalState, StateSlice>
-  = (state: GlobalState) => StateSlice

packages/client/src/redux/index.ts

@@ -1,3 +1 @@
 export * from './Connector'
-export * from './TStateSelector'
-export * from './pack'

packages/client/src/redux/temp-test.tsx

@@ -1,34 +0,0 @@
-// import React from 'react'
-// import {connect, Omit} from 'react-redux'
-
-// interface IProps {
-//   a: number
-// }
-
-// class NumberDisplay extends React.PureComponent<IProps> {
-//   render() {
-//     return `${this.props.a}`
-//   }
-// }
-
-// // Case 1: this works
-// function mapStateToProps(state: any) {
-//   return {a: 1}
-// }
-
-// const ConnectedNumberDisplay1 = connect(mapStateToProps)(NumberDisplay)
-
-// export const display1 = <ConnectedNumberDisplay1 />
-
-// // Case 2: this doesn't work
-// function wrap<State, StateProps, ComponentProps>(
-//   mapState: (state: State) => StateProps,
-//   Component: React.ComponentType<ComponentProps>,
-// ): React.ComponentType<
-//   Omit<ComponentProps, keyof StateProps & keyof ComponentProps>
-//   > {
-//   return connect(mapState)(Component as any) as any
-// }
-
-// const ConnectedNumberDisplay2 = wrap(mapStateToProps, NumberDisplay)
-// export const display2 = <ConnectedNumberDisplay2 />

packages/client/src/renderer/ClientRenderer.tsx

@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom'
 import {Action} from 'redux'
 import {IAPIDef} from '@rondo.dev/common'
 import {IClientConfig} from './IClientConfig'
-import {IHTTPClient, HTTPClient} from '../http'
+import {IHTTPClient, HTTPClient} from '@rondo.dev/http-client'
 import {IRenderer} from './IRenderer'
 import {Provider} from 'react-redux'
 import {Router} from 'react-router-dom'

packages/client/src/renderer/ServerRenderer.tsx

@@ -1,15 +1,12 @@
 import React from 'react'
+import { renderToNodeStream } from 'react-dom/server'
+import { Provider } from 'react-redux'
+import { StaticRouterContext } from 'react-router'
+import { StaticRouter } from 'react-router-dom'
 import ssrPrepass from 'react-ssr-prepass'
-import {Action} from 'redux'
+import { Store } from 'redux'
-import {IAPIDef} from '@rondo.dev/common'
+import { IClientConfig } from './IClientConfig'
-import {IClientConfig} from './IClientConfig'
+import { IRenderer } from './IRenderer'
-import {IHTTPClient, HTTPClient} from '../http'
-import {IRenderer} from './IRenderer'
-import {Provider} from 'react-redux'
-import {StaticRouterContext} from 'react-router'
-import {StaticRouter} from 'react-router-dom'
-import {Store} from 'redux'
-import {renderToNodeStream} from 'react-dom/server'
 
 export class ServerRenderer<Props> implements IRenderer<Props> {
   constructor(

packages/client/src/team/TeamActions.ts

@@ -1,6 +1,6 @@
 import {IAPIDef} from '@rondo.dev/common'
-import {TGetPendingAction, TAsyncAction, PendingAction} from '../actions'
+import {TGetPendingAction, TAsyncAction, PendingAction} from '@rondo.dev/redux'
-import {IHTTPClient} from '../http/IHTTPClient'
+import {IHTTPClient} from '@rondo.dev/http-client'
 import {ITeam, IUser, IUserInTeam} from '@rondo.dev/common'
 
 export type TTeamAction =

packages/client/src/team/TeamConnector.test.tsx

@@ -1,7 +1,9 @@
 import * as Feature from './'
 // export ReactDOM from 'react-dom'
 import T from 'react-dom/test-utils'
-import {HTTPClientMock, TestUtils, getError} from '../test-utils'
+import {TestUtils} from '../test-utils'
+import {HTTPClientMock} from '@rondo.dev/http-client'
+import {getError} from '@rondo.dev/test-utils'
 import {IAPIDef, ITeam, IUserInTeam} from '@rondo.dev/common'
 import React from 'react'
 import {MemoryRouter} from 'react-router-dom'

packages/client/src/team/TeamConnector.ts

@@ -1,5 +1,5 @@
 import {Connector} from '../redux/Connector'
-import {pack, TStateSelector} from '../redux'
+import {pack, TStateSelector} from '@rondo.dev/redux'
 import {ITeamState} from './TeamReducer'
 import {TeamActions} from './TeamActions'
 import {TeamManager} from './TeamManager'

packages/client/src/team/TeamReducer.ts

@@ -2,7 +2,7 @@ import {
   ITeam, IUserInTeam, TReadonlyRecord, indexBy, without,
 } from '@rondo.dev/common'
 import {TTeamAction} from './TeamActions'
-import {TGetResolvedAction} from '../actions'
+import {TGetResolvedAction} from '@rondo.dev/redux'
 
 export interface ITeamState {
   readonly error: string

packages/client/src/test-utils/TestUtils.tsx

@@ -1,9 +1,8 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
 import T from 'react-dom/test-utils'
-import {TStateSelector} from '../redux'
+import {createStore, TStateSelector} from '@rondo.dev/redux'
 import {Provider} from 'react-redux'
-import {createStore} from '../store'
 import {
   Action,
   AnyAction,

packages/client/src/test-utils/getError.ts

@@ -1,15 +0,0 @@
-/**
- * Waits for a promise be rejected and return the error. If a promise resolves
- * it will throw an error. To be used during testing since
- * `expect(...).toThrowError()` only works with synchronous calls
- */
-export async function getError(promise: Promise<any>): Promise<Error> {
-  let error: Error
-  try {
-    await promise
-  } catch (err) {
-    error = err
-  }
-  expect(error!).toBeTruthy()
-  return error!
-}

packages/client/src/test-utils/index.ts

@@ -1,3 +1 @@
-export * from './HTTPClientMock'
 export * from './TestUtils'
-export * from './getError'

packages/client/tsconfig.json

@@ -5,6 +5,7 @@
     "rootDir": "src"
   },
   "references": [
+    {"path": "../redux"},
     {"path": "../comments-common"}
   ]
 }

packages/common/src/index.ts

@@ -4,16 +4,13 @@ export * from './IAPIDef'
 export * from './ICredentials'
 export * from './ILogger'
 export * from './INewUser'
-export * from './IRequestParams'
 export * from './IRole'
-export * from './IRoutes'
 export * from './ITeam'
 export * from './IUser'
 export * from './IUser'
 export * from './IUserInTeam'
 export * from './IUserTeam'
 export * from './StringUtils'
-export * from './URLFormatter'
 export * from './filterProps'
 export * from './indexBy'
 export * from './types'

packages/common/tsconfig.esm.json

@@ -3,5 +3,6 @@
   "compilerOptions": {
     "outDir": "esm"
   },
-  "references": []
+  "references": [
-}
+  ]
+}

packages/common/tsconfig.json

@@ -3,5 +3,7 @@
   "compilerOptions": {
     "outDir": "lib",
     "rootDir": "src"
-  }
+  },
+  "references": [
+  ]
 }

packages/config/tsconfig.esm.json

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

packages/http-client/jest.config.js

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

packages/http-client/jest.setup.js

@@ -0,0 +1,4 @@
+if (!process.env.LOG) {
+  process.env.LOG = 'sql:warn'
+}
+process.chdir(__dirname)

packages/http-client/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "@rondo.dev/http-client",
+  "private": true,
+  "scripts": {
+    "test": "jest",
+    "lint": "tslint --project .",
+    "compile": "tsc",
+    "clean": "rm -rf lib/"
+  },
+  "dependencies": {
+    "axios": "^0.19.0"
+  },
+  "main": "lib/index.js",
+  "module": "esm/index.js",
+  "types": "lib/index.d.ts"
+}

packages/http-client/src/HTTPClient.ts

@@ -1,7 +1,8 @@
 import axios from 'axios'
 import {IHTTPClient} from './IHTTPClient'
 import {IHeader} from './IHeader'
-import {TMethod, IRoutes, URLFormatter} from '@rondo.dev/common'
+import {TMethod, IRoutes} from '@rondo.dev/http-types'
+import {URLFormatter} from './URLFormatter'
 import {IRequest} from './IRequest'
 import {IResponse} from './IResponse'
 import {ITypedRequestParams} from './ITypedRequestParams'

packages/http-client/src/HTTPClientMock.test.ts

@@ -1,5 +1,5 @@
 import {HTTPClientMock} from './HTTPClientMock'
-import {getError} from './getError'
+import {getError} from '@rondo.dev/test-utils'
 
 describe('HTTPClientMock', () => {
 

packages/http-client/src/HTTPClientMock.ts

@@ -1,8 +1,8 @@
-import {HTTPClient} from '../http/HTTPClient'
+import {HTTPClient} from './HTTPClient'
-import {IRequest} from '../http/IRequest'
+import {IRequest} from './IRequest'
-import {IResponse} from '../http/IResponse'
+import {IResponse} from './IResponse'
-import {IRoutes, TMethod} from '@rondo.dev/common'
+import {IRoutes, TMethod} from '@rondo.dev/http-types'
-import {ITypedRequestParams} from '../http/ITypedRequestParams'
+import {ITypedRequestParams} from './ITypedRequestParams'
 
 interface IReqRes {
   req: IRequest

packages/http-client/src/IHTTPClient.ts

@@ -1,4 +1,4 @@
-import {TMethod, IRoutes} from '@rondo.dev/common'
+import {TMethod, IRoutes} from '@rondo.dev/http-types'
 import {ITypedRequestParams} from './ITypedRequestParams'
 
 export interface IHTTPClient<T extends IRoutes> {

packages/http-client/src/IRequest.ts

@@ -1,4 +1,4 @@
-import {TMethod} from '@rondo.dev/common'
+import {TMethod} from '@rondo.dev/http-types'
 
 export interface IRequest {
   method: TMethod,

packages/http-client/src/ITypedRequestParams.ts

@@ -1,4 +1,4 @@
-import {IRoutes, TMethod} from '@rondo.dev/common'
+import {IRoutes, TMethod} from '@rondo.dev/http-types'
 
 export interface ITypedRequestParams<
   T extends IRoutes,

packages/http-client/src/URLFormatter.ts

@@ -1,4 +1,3 @@
-import assert from 'assert'
 import {IRequestParams} from './IRequestParams'
 import {IRequestQuery} from './IRequestQuery'
 

packages/http-client/src/index.ts

@@ -1,6 +1,10 @@
 export * from './HTTPClient'
-export * from './IHTTPClient'
+export * from './HTTPClientMock'
 export * from './IHeader'
+export * from './IHTTPClient'
 export * from './IRequest'
+export * from './IRequestParams'
+export * from './IRequestQuery'
 export * from './IResponse'
 export * from './ITypedRequestParams'
+export * from './URLFormatter'

packages/http-client/tsconfig.esm.json

@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "esm"
+  },
+  "references": [{
+    "path": "../test-utils/tsconfig.esm.json"
+  }, {
+    "path": "../http-types/tsconfig.json"
+  }]
+}

packages/http-client/tsconfig.json

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

packages/http-client/tslint.json

@@ -0,0 +1,10 @@
+{
+    "extends": [
+        "../tslint.json"
+    ],
+    "linterOptions": {
+        "exclude": [
+            "src/migrations/*.ts"
+        ]
+    }
+}

packages/http-types/jest.config.js

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

packages/http-types/jest.setup.js

@@ -0,0 +1,4 @@
+if (!process.env.LOG) {
+  process.env.LOG = 'sql:warn'
+}
+process.chdir(__dirname)

packages/http-types/package.json

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

packages/http-types/tsconfig.esm.json

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

packages/http-types/tsconfig.json

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

packages/http-types/tslint.json

@@ -0,0 +1,10 @@
+{
+    "extends": [
+        "../tslint.json"
+    ],
+    "linterOptions": {
+        "exclude": [
+            "src/migrations/*.ts"
+        ]
+    }
+}

packages/jsonrpc/src/redux.test.ts

@@ -10,7 +10,7 @@ import {Contextual, TPendingActions, TAllActions} from './types'
 import {combineReducers} from 'redux'
 import {createActions, createReducer} from './redux'
 import {createRemoteClient} from './remote'
-import {createStore} from '@rondo.dev/client'
+import {createStore} from '@rondo.dev/redux'
 import {jsonrpc} from './express'
 import {keys} from 'ts-transformer-keys'
 import {noopLogger} from './test-utils'

packages/jsonrpc/src/types.ts

@@ -1,4 +1,4 @@
-import {IPendingAction, IResolvedAction, IRejectedAction} from '@rondo.dev/client'
+import {IPendingAction, IResolvedAction, IRejectedAction} from '@rondo.dev/redux'
 
 export type ArgumentTypes<T> =
   T extends (...args: infer U) => infer R ? U : never

packages/redux/README.md

@@ -0,0 +1,3 @@
+# @rondo.dev/redux
+
+Client-side utilities and type helpers for Redux.

packages/redux/jest.config.js

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

packages/redux/jest.setup.js

@@ -0,0 +1,4 @@
+if (!process.env.LOG) {
+  process.env.LOG = 'sql:warn'
+}
+process.chdir(__dirname)

packages/redux/package.json

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

packages/redux/src/index.ts

@@ -0,0 +1,4 @@
+export * from './actions'
+export * from './middleware'
+export * from './store'
+export * from './pack'

packages/redux/src/middleware/PromiseMiddleware.test.ts

@@ -1,6 +1,6 @@
 import {createStore, applyMiddleware, Store} from 'redux'
 import {PromiseMiddleware} from './PromiseMiddleware'
-import {getError} from '../test-utils'
+import {getError} from '@rondo.dev/test-utils'
 
 describe('PromiseMiddleware', () => {
 

packages/redux/src/middleware/WaitMiddleware.test.ts

@@ -3,7 +3,7 @@ import {
   IAction, IPendingAction, IResolvedAction, IRejectedAction,
 } from '../actions'
 import {applyMiddleware, createStore, AnyAction} from 'redux'
-import {getError} from '../test-utils'
+import { getError } from '@rondo.dev/test-utils'
 
 describe('WaitMiddleware', () => {
 

packages/redux/src/pack.test.tsx

@@ -3,8 +3,7 @@ import ReactDOM from 'react-dom'
 import TestUtils from 'react-dom/test-utils'
 import { Provider } from 'react-redux'
 import { createStore } from 'redux'
-import { pack } from './pack'
+import { pack, TStateSelector } from './pack'
-import { TStateSelector } from './TStateSelector'
 
 describe('pack', () => {
 

packages/redux/src/pack.ts

@@ -1,7 +1,12 @@
 import { ComponentType, PureComponent } from 'react'
 import { connect, Omit, MapDispatchToPropsParam, Matching, GetProps, ResolveThunks } from 'react-redux'
 import { Dispatch } from 'redux'
-import { TStateSelector } from './TStateSelector'
+
+/*
+ * Select and return a part of the state
+ */
+export type TStateSelector<GlobalState, StateSlice>
+  = (state: GlobalState) => StateSlice
 
 /**
  * This function can be used to pack React components into reusable modules.

packages/redux/tsconfig.esm.json

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

packages/redux/tsconfig.json

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

packages/redux/tslint.json

@@ -0,0 +1,10 @@
+{
+    "extends": [
+        "../tslint.json"
+    ],
+    "linterOptions": {
+        "exclude": [
+            "src/migrations/*.ts"
+        ]
+    }
+}

packages/server/src/application/configureServer.ts

@@ -1,20 +1,20 @@
-import cookieParser from 'cookie-parser'
+import { IContext } from '@rondo.dev/common'
+import { IRoutes } from '@rondo.dev/http-types'
+import { bulkjsonrpc, jsonrpc } from '@rondo.dev/jsonrpc'
 import { json } from 'body-parser'
+import cookieParser from 'cookie-parser'
 import { IDatabase } from '../database'
 import { loggerFactory } from '../logger'
 import * as Middleware from '../middleware'
+import { TransactionalRouter } from '../router'
+import * as routes from '../routes'
+import * as rpc from '../rpc'
 import * as Services from '../services'
 import * as Team from '../team'
 import * as User from '../user'
-import { IServerConfig } from './IServerConfig'
 import { IConfig } from './IConfig'
+import { IServerConfig } from './IServerConfig'
 import { IServices } from './IServices'
-import * as routes from '../routes'
-import { TransactionalRouter } from '../router'
-import { IRoutes, IContext } from '@rondo.dev/common'
-import { Express } from 'express-serve-static-core'
-import { jsonrpc, bulkjsonrpc } from '@rondo.dev/jsonrpc'
-import * as rpc from '../rpc'
 
 export type ServerConfigurator<
   T extends IServerConfig = IServerConfig

packages/server/src/logger/ILogger.ts

@@ -1 +0,0 @@
-export {ILogger} from '@rondo.dev/common'

packages/server/src/logger/SqlLogger.ts

@@ -1,4 +1,4 @@
-import {ILogger} from './ILogger'
+import {ILogger} from '@rondo.dev/logger'
 import {Logger, QueryRunner} from 'typeorm'
 import {Namespace} from 'cls-hooked'
 import {CORRELATION_ID} from '../middleware/Transaction'

packages/server/src/middleware/ErrorApiHandler.ts

@@ -1,5 +1,5 @@
 import {TErrorHandler} from './TErrorHandler'
-import {ILogger} from '../logger/ILogger'
+import {ILogger} from '@rondo.dev/logger'
 import {IMiddleware} from './IMiddleware'
 import {ValidationError} from '../validator'
 

packages/server/src/middleware/ErrorPageHandler.ts

@@ -1,4 +1,4 @@
-import {ILogger} from '../logger/ILogger'
+import {ILogger} from '@rondo.dev/logger'
 import {IMiddleware} from './IMiddleware'
 import {TErrorHandler} from './TErrorHandler'
 

packages/server/src/middleware/RequestLogger.ts

@@ -1,5 +1,5 @@
 import {THandler} from './THandler'
-import {ILogger} from '../logger/ILogger'
+import {ILogger} from '@rondo.dev/logger'
 import {IMiddleware} from './IMiddleware'
 import shortid from 'shortid'
 

packages/server/src/router/AsyncRouter.ts

@@ -1,5 +1,5 @@
 import express from 'express'
-import {IRoutes, TMethod} from '@rondo.dev/common'
+import {IRoutes, TMethod} from '@rondo.dev/http-types'
 import {TTypedHandler, TTypedMiddleware} from './TTypedHandler'
 
 export class AsyncRouter<R extends IRoutes> {

packages/server/src/router/ITypedRequest.ts

@@ -1,5 +1,5 @@
 import express from 'express'
-import {IRoute} from '@rondo.dev/common'
+import {IRoute} from '@rondo.dev/http-types'
 
 export interface ITypedRequest<T extends IRoute> extends express.Request {
   body: T['body']

packages/server/src/router/TTypedHandler.ts

@@ -1,5 +1,5 @@
 import express from 'express'
-import {IRoutes, TMethod} from '@rondo.dev/common'
+import {IRoutes, TMethod} from '@rondo.dev/http-types'
 import {ITypedRequest} from './ITypedRequest'
 
 export type TTypedMiddleware<

packages/server/src/router/TransactionalRouter.ts

@@ -1,6 +1,6 @@
 import express from 'express'
 import {AsyncRouter} from './AsyncRouter'
-import {IRoutes, TMethod} from '@rondo.dev/common'
+import {IRoutes, TMethod} from '@rondo.dev/http-types'
 import {ITransactionManager} from '../database/ITransactionManager'
 import {TTypedHandler} from './TTypedHandler'
 

packages/server/src/routes/BaseRoute.ts

@@ -1,6 +1,6 @@
 import {THandler} from '../middleware/THandler'
 import {AsyncRouter} from '../router'
-import {IRoutes} from '@rondo.dev/common'
+import {IRoutes} from '@rondo.dev/http-types'
 
 export abstract class BaseRoute<T extends IRoutes> {
   readonly handle: THandler