diff --git a/packages/phase/index.d.ts b/packages/phase/index.d.ts index ed6a78ef670a..bdb1eaea3129 100644 --- a/packages/phase/index.d.ts +++ b/packages/phase/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/packages/phase/index.js b/packages/phase/index.js index 027b98bb442a..42ff59175812 100644 --- a/packages/phase/index.js +++ b/packages/phase/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/packages/phase/package.json b/packages/phase/package.json index bd61cb69842a..5655e0576f10 100644 --- a/packages/phase/package.json +++ b/packages/phase/package.json @@ -6,29 +6,25 @@ "node": ">=8.9" }, "scripts": { - "build:all-dist": "npm run build:dist8 && npm run build:dist10", "build:apidocs": "lb-apidocs", - "build": "lb-tsc", - "build:dist8": "lb-tsc es2017", - "build:dist10": "lb-tsc es2018", + "build": "lb-tsc es2017 --outDir dist", "clean": "lb-clean loopback-phase*.tgz dist* package api-docs", "pretest": "npm run build", - "integration": "lb-mocha \"DIST/test/integration/**/*.js\"", - "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/integration/**/*.js\"", - "unit": "lb-mocha \"DIST/test/unit/**/*.js\"", + "integration": "lb-mocha \"dist/test/integration/**/*.js\"", + "test": "lb-mocha \"dist/test/unit/**/*.js\" \"dist/test/integration/**/*.js\"", + "unit": "lb-mocha \"dist/test/unit/**/*.js\"", "verify": "npm pack && tar xf loopback-phase*.tgz && tree package && npm run clean" }, "author": "IBM", "copyright.owner": "IBM Corp.", "license": "MIT", "dependencies": { - "debug": "^3.1.0" + "debug": "^4.1.0" }, "devDependencies": { - "@loopback/build": "^0.7.1", - "@loopback/dist-util": "^0.3.6", - "@loopback/testlab": "^0.11.5", - "@types/debug": "0.0.30", + "@loopback/build": "^1.0.0", + "@loopback/testlab": "^1.0.0", + "@types/debug": "0.0.31", "@types/node": "^10.9.4" }, "keywords": [ diff --git a/packages/phase/src/handler.ts b/packages/phase/src/handler.ts index 80554c5a8266..23339701b10b 100644 --- a/packages/phase/src/handler.ts +++ b/packages/phase/src/handler.ts @@ -1,5 +1,5 @@ -// Copyright IBM Corp. 2014. All Rights Reserved. -// Node module: loopback-phase +// Copyright IBM Corp. 2018. All Rights Reserved. +// Node module: @loopback/phase // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT diff --git a/packages/phase/src/index.ts b/packages/phase/src/index.ts index 4f5f6a848fa4..a4a7a923f295 100644 --- a/packages/phase/src/index.ts +++ b/packages/phase/src/index.ts @@ -1,5 +1,5 @@ // Copyright IBM Corp. 2018. All Rights Reserved. -// Node module: loopback-phase +// Node module: @loopback/phase // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT diff --git a/packages/phase/src/merge-name-lists.ts b/packages/phase/src/merge-name-lists.ts index 1d0334a46f93..c70698721f73 100644 --- a/packages/phase/src/merge-name-lists.ts +++ b/packages/phase/src/merge-name-lists.ts @@ -1,5 +1,5 @@ // Copyright IBM Corp. 2018. All Rights Reserved. -// Node module: loopback-phase +// Node module: @loopback/phase // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT diff --git a/packages/phase/src/phase-list.ts b/packages/phase/src/phase-list.ts index 72656fddc358..fde4eae93017 100644 --- a/packages/phase/src/phase-list.ts +++ b/packages/phase/src/phase-list.ts @@ -1,5 +1,5 @@ // Copyright IBM Corp. 2018. All Rights Reserved. -// Node module: loopback-phase +// Node module: @loopback/phase // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT diff --git a/packages/phase/src/phase.ts b/packages/phase/src/phase.ts index e57a431b5744..89c3da74566d 100644 --- a/packages/phase/src/phase.ts +++ b/packages/phase/src/phase.ts @@ -1,5 +1,5 @@ // Copyright IBM Corp. 2018. All Rights Reserved. -// Node module: loopback-phase +// Node module: @loopback/phase // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT diff --git a/packages/phase/test/unit/handler.unit.ts b/packages/phase/test/unit/handler.unit.ts index e6358b1c5be1..76b6e76133d3 100644 --- a/packages/phase/test/unit/handler.unit.ts +++ b/packages/phase/test/unit/handler.unit.ts @@ -1,5 +1,5 @@ // Copyright IBM Corp. 2018. All Rights Reserved. -// Node module: loopback-phase +// Node module: @loopback/phase // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT diff --git a/packages/phase/test/unit/merge-name-lists.unit.ts b/packages/phase/test/unit/merge-name-lists.unit.ts index 600e49922f99..3ef5b3d51026 100644 --- a/packages/phase/test/unit/merge-name-lists.unit.ts +++ b/packages/phase/test/unit/merge-name-lists.unit.ts @@ -1,5 +1,5 @@ // Copyright IBM Corp. 2014. All Rights Reserved. -// Node module: loopback-phase +// Node module: @loopback/phase // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT diff --git a/packages/phase/test/unit/phase-list.unit.ts b/packages/phase/test/unit/phase-list.unit.ts index 43a55aa8467a..b0259d2c795f 100644 --- a/packages/phase/test/unit/phase-list.unit.ts +++ b/packages/phase/test/unit/phase-list.unit.ts @@ -1,5 +1,5 @@ // Copyright IBM Corp. 2014,2016. All Rights Reserved. -// Node module: loopback-phase +// Node module: @loopback/phase // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT diff --git a/packages/phase/test/unit/phase.unit.ts b/packages/phase/test/unit/phase.unit.ts index 457e05d62605..d551e52aa2ba 100644 --- a/packages/phase/test/unit/phase.unit.ts +++ b/packages/phase/test/unit/phase.unit.ts @@ -1,5 +1,5 @@ // Copyright IBM Corp. 2014. All Rights Reserved. -// Node module: loopback-phase +// Node module: @loopback/phase // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT diff --git a/packages/rest/src/types.ts b/packages/rest/src/types.ts index 63993ccf3891..27b7e413e9c1 100644 --- a/packages/rest/src/types.ts +++ b/packages/rest/src/types.ts @@ -4,14 +4,15 @@ // License text available at https://opensource.org/licenses/MIT import {Binding, BoundValue} from '@loopback/context'; -import {ResolvedRoute, RouteEntry} from './router'; -import {Request, Response} from 'express'; import { + Options, OptionsJson, - OptionsUrlencoded, OptionsText, - Options, + OptionsUrlencoded, } from 'body-parser'; +import {Request, RequestHandler, Response} from 'express'; +import {PathParams} from 'express-serve-static-core'; +import {ResolvedRoute, RouteEntry} from './router'; export {Request, Response}; @@ -109,3 +110,21 @@ export type OperationRetval = any; export type GetFromContext = (key: string) => Promise; export type BindElement = (key: string) => Binding; + +/** + * Middleware registration entry + */ +export interface Middleware { + method?: + | 'all' + | 'get' + | 'post' + | 'put' + | 'delete' + | 'patch' + | 'options' + | 'head'; + path?: PathParams; + phase?: string; + handler: RequestHandler; +}