chore: apply feedback

Signed-off-by: Rifa Achrinza <[email protected]>

bodyparsers/msgpack/package.json

@@ -45,7 +45,7 @@
     "@types/msgpack-lite": "0.1.7",
     "@types/node": "^10.17.28",
     "@types/type-is": "^1.6.3",
-    "typescript": "~3.9.7"
+    "typescript": "~4.0.2"
   },
   "copyright.owner": "IBM Corp.",
   "publishConfig": {

bodyparsers/msgpack/src/__tests__/acceptance/bodyparser.acceptance.ts

@@ -21,11 +21,7 @@ import {
   stubExpressContext,
 } from '@loopback/testlab';
 import {encode} from 'msgpack-lite';
-import {
-  DefaultMsgPackParserLibrary,
-  MsgPackBodyParser,
-  MsgPackBodyParserBindings,
-} from '../..';
+import {MsgPackBodyParser} from '../..';
 
 describe('MessagePack body parser', () => {
   let requestBodyParser: RequestBodyParser;
@@ -131,9 +127,6 @@ describe('MessagePack body parser', () => {
     const options = {};
     const parsers = [new MsgPackBodyParser(options)];
     const context = new Context();
-    context
-      .bind(MsgPackBodyParserBindings.PARSER_LIBRARY)
-      .toClass(DefaultMsgPackParserLibrary);
     requestBodyParser = new RequestBodyParser(parsers, context);
   }
 });

bodyparsers/msgpack/src/__tests__/acceptance/component.acceptance.ts

@@ -3,37 +3,30 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import {RestApplication} from '@loopback/rest';
+import {RestApplication, RestBindings} from '@loopback/rest';
 import {expect} from '@loopback/testlab';
-import {StubParserLibrary} from '../';
 import {
-  DefaultMsgPackParserLibrary,
+  MsgPackBodyParser,
   MsgPackBodyParserBindings,
   MsgPackBodyParserComponent,
 } from '../..';
 
 describe('MessagePack body parser component', () => {
-  let restApplication: RestApplication;
-  beforeEach(givenRestAppWithComponent);
+  it('binds MessagePack body parser', async () => {
+    const restApplication = new RestApplication();
+    restApplication.component(MsgPackBodyParserComponent);
 
-  it('binds default parser library', async () => {
     expect(
-      await restApplication.get(MsgPackBodyParserBindings.PARSER_LIBRARY),
-    ).to.be.instanceOf(DefaultMsgPackParserLibrary);
+      await restApplication.get(MsgPackBodyParserBindings.BODY_PARSER),
+    ).to.be.instanceOf(MsgPackBodyParser);
   });
 
-  it('uses a custom parser library', async () => {
-    restApplication
-      .bind(MsgPackBodyParserBindings.PARSER_LIBRARY)
-      .toClass(StubParserLibrary);
+  it('throws error without raw body parser', async () => {
+    const restApplication = new RestApplication();
+    restApplication.unbind(RestBindings.REQUEST_BODY_PARSER_RAW);
 
-    expect(
-      await restApplication.get(MsgPackBodyParserBindings.PARSER_LIBRARY),
-    ).to.be.instanceOf(StubParserLibrary);
+    expect(() =>
+      restApplication.component(MsgPackBodyParserComponent),
+    ).to.throw();
   });
-
-  function givenRestAppWithComponent() {
-    restApplication = new RestApplication();
-    restApplication.component(MsgPackBodyParserComponent);
-  }
 });

bodyparsers/msgpack/src/__tests__/unit/bodyparser.unit.ts

@@ -12,7 +12,9 @@ describe('MessagePack body parser', () => {
     'application/x-msgpack',
     'application/subtype+msgpack',
   ];
+
   let bodyParser: MsgPackBodyParser;
+
   beforeEach(givenBodyParser);
 
   for (const contentType of contentTypes) {

bodyparsers/msgpack/src/bodyparser.ts

@@ -11,29 +11,17 @@ import {
   RequestBodyParserOptions,
   RestBindings,
 } from '@loopback/rest';
+import msgpack from 'msgpack-lite';
 import {is} from 'type-is';
-import {
-  DefaultMsgPackParserLibrary,
-  MsgPackBodyParserBindings,
-  MsgPackParserLibrary,
-} from '.';
-
-// FIXME(achrinza): Workaround for https://github.com/microsoft/rushstack/pull/1867
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import * as loopbackBodyParserMsgPack from '.';
 
 export class MsgPackBodyParser extends RawBodyParser {
   name = Symbol('msgpack');
-  private readonly _parserLibrary: MsgPackParserLibrary;
 
   constructor(
     @inject(RestBindings.REQUEST_BODY_PARSER_OPTIONS, {optional: true})
     options: RequestBodyParserOptions = {},
-    @inject(MsgPackBodyParserBindings.PARSER_LIBRARY)
-    parserLibrary: MsgPackParserLibrary = new DefaultMsgPackParserLibrary(),
   ) {
     super(options);
-    this._parserLibrary = parserLibrary;
   }
 
   supports(mediaType: string) {
@@ -47,7 +35,7 @@ export class MsgPackBodyParser extends RawBodyParser {
 
   async parse(request: Request): Promise<RequestBody> {
     const result = await super.parse(request);
-    const body = this._parserLibrary.decode(result.value);
+    const body = msgpack.decode(result.value);
 
     return {
       value: body,

bodyparsers/msgpack/src/component.ts

@@ -3,26 +3,28 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import {Binding, Component} from '@loopback/core';
-import {createBodyParserBinding} from '@loopback/rest';
+import {Binding, Component, inject} from '@loopback/core';
 import {
-  DefaultMsgPackParserLibrary,
-  MsgPackBodyParser,
-  MsgPackBodyParserBindings,
-} from '.';
-
-// FIXME(achrinza): Workaround for https://github.com/microsoft/rushstack/pull/1867
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import * as loopbackCore from '@loopback/core';
+  createBodyParserBinding,
+  RawBodyParser,
+  RestBindings,
+} from '@loopback/rest';
+import {MsgPackBodyParser, MsgPackBodyParserBindings} from '.';
 
 export class MsgPackBodyParserComponent implements Component {
-  bindings = [
+  bindings: Binding[] = [
     createBodyParserBinding(
       MsgPackBodyParser,
       MsgPackBodyParserBindings.BODY_PARSER,
     ),
-    Binding.bind(MsgPackBodyParserBindings.PARSER_LIBRARY).toClass(
-      DefaultMsgPackParserLibrary,
-    ),
   ];
+
+  constructor(
+    @inject(RestBindings.REQUEST_BODY_PARSER_RAW, {optional: true})
+    rawBodyParser?: RawBodyParser,
+  ) {
+    if (rawBodyParser == null) {
+      throw new Error('MessagePack body parser requires raw body parser.');
+    }
+  }
 }

bodyparsers/msgpack/src/index.ts

@@ -6,5 +6,3 @@
 export * from './bodyparser';
 export * from './component';
 export * from './keys';
-export * from './parserlibrary';
-export * from './types';

bodyparsers/msgpack/src/keys.ts

@@ -5,14 +5,9 @@
 
 import {BindingKey} from '@loopback/core';
 import {BodyParser, RestBindings} from '@loopback/rest';
-import {MsgPackParserLibrary} from '.';
 
 export namespace MsgPackBodyParserBindings {
   export const BODY_PARSER = BindingKey.create<BodyParser>(
     `${RestBindings.REQUEST_BODY_PARSER}.msgpack`,
   );
-
-  export const PARSER_LIBRARY = BindingKey.create<MsgPackParserLibrary>(
-    `${BODY_PARSER}.parserLibrary`,
-  );
 }

packages/express/src/middleware-registry.ts

@@ -18,6 +18,9 @@ import {
   MiddlewareBindingOptions,
 } from './types';
 
+// FIXME(rfeng): Workaround for https://github.com/microsoft/rushstack/pull/1867
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import * as loopbackContext from '@loopback/core';
 /* eslint-enable @typescript-eslint/no-unused-vars */
 
 /**