Move injected types into internal types

loopbackio · Jun 3, 2017 · b9c2411 · b9c2411
1 parent fd00595
commit b9c2411
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/packages/core/src/http-handler.ts b/packages/core/src/http-handler.ts
@@ -9,9 +9,14 @@ import {ServerRequest, ServerResponse} from 'http';
 import {getApiSpec} from './router/metadata';
 import * as HttpErrors from 'http-errors';
 
-import {Sequence, FindRoute, InvokeMethod} from './sequence';
+import {Sequence} from './sequence';
 import {RoutingTable, parseRequestUrl} from './router/routing-table';
-import {ParsedRequest, OperationArgs} from './internal-types';
+import {
+  FindRoute,
+  InvokeMethod,
+  ParsedRequest,
+  OperationArgs,
+} from './internal-types';
 
 const debug = require('debug')('loopback:core:http-handler');
 

diff --git a/packages/core/src/internal-types.ts b/packages/core/src/internal-types.ts
@@ -4,6 +4,7 @@
 // License text available at https://opensource.org/licenses/MIT
 
 import {ServerRequest} from 'http';
+import {ResolvedRoute} from './router/routing-table';
 
 export interface ParsedRequest extends ServerRequest {
   // see http://expressjs.com/en/4x/api.html#req.path
@@ -16,6 +17,10 @@ export interface ParsedRequest extends ServerRequest {
   method: string;
 }
 
+export type FindRoute = (request: ParsedRequest) => ResolvedRoute<string>;
+export type InvokeMethod = (controller: string, method: string, args: OperationArgs) => Promise<OperationRetval>;
+export type LogError = (err: Error, statusCode: number, request: ServerRequest) => void;
+
 // tslint:disable:no-any
 export type PathParameterValues = {[key: string]: any};
 export type OperationArgs = any[];

diff --git a/packages/core/src/sequence.ts b/packages/core/src/sequence.ts
@@ -7,8 +7,10 @@ import {Application} from './application';
 const debug = require('debug')('loopback:core:sequence');
 import {ServerRequest, ServerResponse} from 'http';
 import {inject} from '@loopback/context';
-import {ResolvedRoute} from './router/routing-table';
 import {
+  FindRoute,
+  InvokeMethod,
+  LogError,
   OperationArgs,
   OperationRetval,
   ParsedRequest,
@@ -17,12 +19,6 @@ import {parseOperationArgs} from './parser';
 import {writeResultToResponse} from './writer';
 import {HttpError} from 'http-errors';
 
-export type FindRoute = (request: ParsedRequest) => ResolvedRoute<string>;
-export type InvokeMethod =
-  (controller: string, method: string, args: OperationArgs) => Promise<OperationRetval>;
-export type LogError =
-  (err: Error, statusCode: number, request: ServerRequest) => void;
-
 export class Sequence {
   constructor(
     @inject('findRoute')