@loopback/rest 6.0.0 → 7.0.1

package/dist/spec-enhancers/info.spec-enhancer.js

@@ -21,17 +21,25 @@ let InfoSpecEnhancer = InfoSpecEnhancer_1 = class InfoSpecEnhancer {
         this.name = 'info';
     }
     modifySpec(spec) {
+        var _a, _b, _c, _d;
         if (this.pkg == null) {
             debug('Application metadata is not found. Skipping spec enhancing.');
             return spec;
         }
         const contact = InfoSpecEnhancer_1.parseAuthor(this.pkg.author);
+        // Only override `info` if the `spec.info` is not customized
+        const overrideInfo = spec.info.title === openapi_v3_1.DEFAULT_OPENAPI_SPEC_INFO.title &&
+            spec.info.version === openapi_v3_1.DEFAULT_OPENAPI_SPEC_INFO.version;
         const patchSpec = {
             info: {
-                title: this.pkg.name,
-                description: this.pkg.description,
-                version: this.pkg.version,
-                contact,
+                title: overrideInfo ? this.pkg.name : (_a = spec.info.title) !== null && _a !== void 0 ? _a : this.pkg.name,
+                description: overrideInfo
+                    ? this.pkg.description
+                    : (_b = spec.info.description) !== null && _b !== void 0 ? _b : this.pkg.description,
+                version: overrideInfo
+                    ? this.pkg.version
+                    : (_c = spec.info.version) !== null && _c !== void 0 ? _c : this.pkg.version,
+                contact: overrideInfo ? contact : (_d = spec.info.contact) !== null && _d !== void 0 ? _d : contact,
             },
         };
         debug('Enhancing OpenAPI spec with %j', patchSpec);
@@ -77,7 +85,7 @@ let InfoSpecEnhancer = InfoSpecEnhancer_1 = class InfoSpecEnhancer {
     }
 };
 InfoSpecEnhancer = InfoSpecEnhancer_1 = tslib_1.__decorate([
-    core_1.bind(openapi_v3_1.asSpecEnhancer, { scope: core_1.BindingScope.SINGLETON }),
+    core_1.injectable(openapi_v3_1.asSpecEnhancer, { scope: core_1.BindingScope.SINGLETON }),
     tslib_1.__param(0, core_1.inject(core_1.CoreBindings.APPLICATION_METADATA, { optional: true })),
     tslib_1.__metadata("design:paramtypes", [Object])
 ], InfoSpecEnhancer);

package/dist/spec-enhancers/info.spec-enhancer.js.map

@@ -1 +1 @@
-{"version":3,"file":"info.spec-enhancer.js","sourceRoot":"","sources":["../../src/spec-enhancers/info.spec-enhancer.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;;AAEhE,yCAQwB;AACxB,qDAM8B;AAC9B,0DAAiC;AAEjC,MAAM,KAAK,GAAG,eAAY,CAAC,qCAAqC,CAAC,CAAC;AAElE;;;GAGG;AAEH,IAAa,gBAAgB,wBAA7B,MAAa,gBAAgB;IAG3B,YAEW,GAAyB;QAAzB,QAAG,GAAH,GAAG,CAAsB;QAJpC,SAAI,GAAG,MAAM,CAAC;IAKX,CAAC;IAEJ,UAAU,CAAC,IAAiB;QAC1B,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,EAAE;YACpB,KAAK,CAAC,6DAA6D,CAAC,CAAC;YACrE,OAAO,IAAI,CAAC;SACb;QACD,MAAM,OAAO,GAAkB,kBAAgB,CAAC,WAAW,CACzD,IAAI,CAAC,GAAG,CAAC,MAAM,CAChB,CAAC;QACF,MAAM,SAAS,GAAG;YAChB,IAAI,EAAE;gBACJ,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI;gBACpB,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW;gBACjC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO;gBACzB,OAAO;aACR;SACF,CAAC;QACF,KAAK,CAAC,gCAAgC,EAAE,SAAS,CAAC,CAAC;QACnD,OAAO,6BAAgB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;OAKG;IACK,MAAM,CAAC,WAAW,CAAC,MAAiB;;QAC1C,IAAI,OAAO,GAAkB,EAAE,CAAC;QAChC,IAAI,MAAM,IAAI,IAAI,EAAE;YAClB,OAAO,GAAG,EAAE,CAAC;SACd;aAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YACrC,kEAAkE;YAClE,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,UAAU;YAC3C,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,QAAQ;YACzC,MAAM,SAAS,GAAG,YAAY,CAAC;YAC/B,OAAO,GAAG;gBACR,IAAI,cAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,0CAAG,CAAC,2CAAG,IAAI,EAAE;gBACzC,KAAK,cAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,0CAAG,CAAC,2CAAG,IAAI,EAAE;gBAC3C,GAAG,cAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,0CAAG,CAAC,2CAAG,IAAI,EAAE;aACxC,CAAC;SACH;aAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YACrC,MAAM,SAAS,GAAG,MAAoB,CAAC;YACvC,OAAO,GAAG;gBACR,IAAI,EAAE,SAAS,CAAC,IAAc;gBAC9B,KAAK,EAAE,SAAS,CAAC,KAAe;gBAChC,GAAG,EAAE,SAAS,CAAC,GAAa;aAC7B,CAAC;SACH;QACD,+BAA+B;QAC/B,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;YACvB,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI;gBAAE,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;SAC3C;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF,CAAA;AA9DY,gBAAgB;IAD5B,WAAI,CAAC,2BAAc,EAAE,EAAC,KAAK,EAAE,mBAAY,CAAC,SAAS,EAAC,CAAC;IAKjD,mBAAA,aAAM,CAAC,mBAAY,CAAC,oBAAoB,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAA;;GAJnD,gBAAgB,CA8D5B;AA9DY,4CAAgB"}
+{"version":3,"file":"info.spec-enhancer.js","sourceRoot":"","sources":["../../src/spec-enhancers/info.spec-enhancer.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -86,6 +86,10 @@ export interface ValueValidationOptions extends ValidationOptions {
      * 'query', 'cookie', etc...
      */
     source?: string;
+    /**
+     * Parameter name, as provided in `ParameterObject#name` property.
+     */
+    name?: string;
 }
 /**
  * Options for request body validation using AJV

package/dist/validation/ajv-factory.provider.js

@@ -10,6 +10,7 @@ const core_1 = require("@loopback/core");
 const ajv_1 = tslib_1.__importDefault(require("ajv"));
 const debug_1 = tslib_1.__importDefault(require("debug"));
 const keys_1 = require("../keys");
+const openapi_formats_1 = require("./openapi-formats");
 const debug = debug_1.default('loopback:rest:ajv');
 const ajvKeywords = require('ajv-keywords');
 const ajvErrors = require('ajv-errors');
@@ -38,8 +39,6 @@ let AjvFactoryProvider = class AjvFactoryProvider {
                 jsonPointers: true,
                 // nullable: support keyword "nullable" from Open API 3 specification.
                 nullable: true,
-                // Allow OpenAPI spec binary format
-                unknownFormats: ['binary'],
                 ...validationOptions,
             };
             debug('AJV options', validationOptions);
@@ -62,6 +61,9 @@ let AjvFactoryProvider = class AjvFactoryProvider {
                     ajvInst.addKeyword(keyword.name, keyword);
                 });
             }
+            for (const format of openapi_formats_1.openapiFormats) {
+                ajvInst.addFormat(format.name, format);
+            }
             if (this.formats) {
                 this.formats.forEach(format => {
                     debug('Adding Ajv format %s', format.name);
@@ -81,7 +83,7 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Array)
 ], AjvFactoryProvider.prototype, "formats", void 0);
 AjvFactoryProvider = tslib_1.__decorate([
-    core_1.bind({ scope: core_1.BindingScope.SINGLETON }),
+    core_1.injectable({ scope: core_1.BindingScope.SINGLETON }),
     tslib_1.__param(0, core_1.inject(keys_1.RestBindings.REQUEST_BODY_PARSER_OPTIONS.deepProperty('validation'), { optional: true })),
     tslib_1.__metadata("design:paramtypes", [Object])
 ], AjvFactoryProvider);

package/dist/validation/ajv-factory.provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ajv-factory.provider.js","sourceRoot":"","sources":["../../src/validation/ajv-factory.provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ajv-factory.provider.js","sourceRoot":"","sources":["../../src/validation/ajv-factory.provider.ts"],"names":[],"mappings":"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"}

package/dist/validation/openapi-formats.d.ts

@@ -0,0 +1,26 @@
+import { AjvFormat } from '../types';
+/**
+ * int32: [-2147483648, 21474836 47]
+ */
+export declare const int32Format: AjvFormat;
+/**
+ * int64: [-9223372036854775808, 9223372036854775807]
+ */
+export declare const int64Format: AjvFormat;
+/**
+ * float: [-2^128, 2^128]
+ */
+export declare const floatFormat: AjvFormat;
+/**
+ * double: [-2^1024, 2^1024]
+ */
+export declare const doubleFormat: AjvFormat;
+/**
+ * Base64 encoded string
+ */
+export declare const byteFormat: AjvFormat;
+/**
+ * Binary string
+ */
+export declare const binaryFormat: AjvFormat;
+export declare const openapiFormats: AjvFormat[];

package/dist/validation/openapi-formats.js

@@ -0,0 +1,85 @@
+"use strict";
+// Copyright IBM Corp. 2020. All Rights Reserved.
+// Node module: @loopback/rest
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.openapiFormats = exports.binaryFormat = exports.byteFormat = exports.doubleFormat = exports.floatFormat = exports.int64Format = exports.int32Format = void 0;
+/**
+ * int32: [-2147483648, 21474836 47]
+ */
+exports.int32Format = {
+    name: 'int32',
+    type: 'number',
+    validate: (value) => {
+        return (Number.isInteger(value) && value >= -2147483648 && value <= 2147483647);
+    },
+    async: false,
+};
+/**
+ * int64: [-9223372036854775808, 9223372036854775807]
+ */
+exports.int64Format = {
+    name: 'int64',
+    type: 'number',
+    validate: (value) => {
+        const max = Number.MAX_SAFE_INTEGER; // 9007199254740991
+        const min = Number.MIN_SAFE_INTEGER; // -9007199254740991
+        return Number.isInteger(value) && value >= min && value <= max;
+    },
+    async: false,
+};
+/**
+ * float: [-2^128, 2^128]
+ */
+exports.floatFormat = {
+    name: 'float',
+    type: 'number',
+    validate: (value) => {
+        return value >= -Math.pow(2, 128) && value <= Math.pow(2, 128);
+    },
+    async: false,
+};
+/**
+ * double: [-2^1024, 2^1024]
+ */
+exports.doubleFormat = {
+    name: 'double',
+    type: 'number',
+    validate: (value) => {
+        const max = Number.MAX_VALUE; // 1.7976931348623157e+308
+        const min = -Number.MAX_VALUE; // -1.7976931348623157e+308
+        return value >= min && value <= max;
+    },
+    async: false,
+};
+/**
+ * Base64 encoded string
+ */
+exports.byteFormat = {
+    name: 'byte',
+    type: 'string',
+    validate: (value) => {
+        const base64 = Buffer.from(value, 'base64').toString('base64');
+        return value === base64;
+    },
+    async: false,
+};
+/**
+ * Binary string
+ */
+exports.binaryFormat = {
+    name: 'binary',
+    type: 'string',
+    validate: (value) => true,
+    async: false,
+};
+exports.openapiFormats = [
+    exports.int32Format,
+    exports.int64Format,
+    exports.floatFormat,
+    exports.doubleFormat,
+    exports.byteFormat,
+    exports.binaryFormat,
+];
+//# sourceMappingURL=openapi-formats.js.map

package/dist/validation/openapi-formats.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openapi-formats.js","sourceRoot":"","sources":["../../src/validation/openapi-formats.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;AAIhE;;GAEG;AACU,QAAA,WAAW,GAAc;IACpC,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;QAC1B,OAAO,CACL,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,UAAU,IAAI,KAAK,IAAI,UAAU,CACvE,CAAC;IACJ,CAAC;IACD,KAAK,EAAE,KAAK;CACb,CAAC;AAEF;;GAEG;AACU,QAAA,WAAW,GAAc;IACpC,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;QAC1B,MAAM,GAAG,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC,mBAAmB;QACxD,MAAM,GAAG,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC,oBAAoB;QACzD,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,GAAG,IAAI,KAAK,IAAI,GAAG,CAAC;IACjE,CAAC;IACD,KAAK,EAAE,KAAK;CACb,CAAC;AAEF;;GAEG;AACU,QAAA,WAAW,GAAc;IACpC,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;QAC1B,OAAO,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACjE,CAAC;IACD,KAAK,EAAE,KAAK;CACb,CAAC;AAEF;;GAEG;AACU,QAAA,YAAY,GAAc;IACrC,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;QAC1B,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,0BAA0B;QACxD,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,2BAA2B;QAC1D,OAAO,KAAK,IAAI,GAAG,IAAI,KAAK,IAAI,GAAG,CAAC;IACtC,CAAC;IACD,KAAK,EAAE,KAAK;CACb,CAAC;AAEF;;GAEG;AACU,QAAA,UAAU,GAAc;IACnC,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;QAC1B,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC/D,OAAO,KAAK,KAAK,MAAM,CAAC;IAC1B,CAAC;IACD,KAAK,EAAE,KAAK;CACb,CAAC;AAEF;;GAEG;AACU,QAAA,YAAY,GAAc;IACrC,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI;IACjC,KAAK,EAAE,KAAK;CACb,CAAC;AAEW,QAAA,cAAc,GAAgB;IACzC,mBAAW;IACX,mBAAW;IACX,mBAAW;IACX,oBAAY;IACZ,kBAAU;IACV,oBAAY;CACb,CAAC"}

package/dist/validation/request-body.validator.d.ts

@@ -13,10 +13,10 @@ import { ValidationOptions, ValueValidationOptions } from '../types';
  */
 export declare function validateRequestBody(body: RequestBody, requestBodySpec?: RequestBodyObject, globalSchemas?: SchemasObject, options?: ValidationOptions): Promise<void>;
 /**
- * Validate the request body data against JSON schema.
- * @param body - The request body data.
+ * Validate the value against JSON schema.
+ * @param value - The data value.
  * @param schema - The JSON schema used to perform the validation.
  * @param globalSchemas - Schema references.
- * @param options - Request body validation options.
+ * @param options - Value validation options.
  */
-export declare function validateValueAgainstSchema(value: any, schema: SchemaObject | ReferenceObject, globalSchemas?: SchemasObject, options?: ValueValidationOptions): Promise<void>;
+export declare function validateValueAgainstSchema(value: any, schema: SchemaObject | ReferenceObject, globalSchemas?: SchemasObject, options?: ValueValidationOptions): Promise<any>;

package/dist/validation/request-body.validator.js

@@ -8,7 +8,6 @@ exports.validateValueAgainstSchema = exports.validateRequestBody = void 0;
 const tslib_1 = require("tslib");
 const openapi_v3_1 = require("@loopback/openapi-v3");
 const debug_1 = tslib_1.__importDefault(require("debug"));
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const util_1 = tslib_1.__importDefault(require("util"));
 const __1 = require("..");
 const ajv_factory_provider_1 = require("./ajv-factory.provider");
@@ -86,16 +85,16 @@ function getKeyForOptions(options = ajv_factory_provider_1.DEFAULT_AJV_VALIDATIO
     return JSON.stringify(ajvOptions);
 }
 /**
- * Validate the request body data against JSON schema.
- * @param body - The request body data.
+ * Validate the value against JSON schema.
+ * @param value - The data value.
  * @param schema - The JSON schema used to perform the validation.
  * @param globalSchemas - Schema references.
- * @param options - Request body validation options.
+ * @param options - Value validation options.
  */
 async function validateValueAgainstSchema(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 value, schema, globalSchemas = {}, options = {}) {
-    var _a, _b;
+    var _a, _b, _c;
     let validate;
     const cache = (_a = options.compiledSchemaCache) !== null && _a !== void 0 ? _a : DEFAULT_COMPILED_SCHEMA_CACHE;
     const key = getKeyForOptions(options);
@@ -115,11 +114,8 @@ value, schema, globalSchemas = {}, options = {}) {
     let validationErrors = [];
     try {
         const validationResult = await validate(value);
-        // When value is optional & values is empty / null, ajv returns null
-        if (validationResult || validationResult === null) {
-            debug(`Value from ${options.source} passed AJV validation.`);
-            return;
-        }
+        debug(`Value from ${options.source} passed AJV validation.`, validationResult);
+        return validationResult;
     }
     catch (error) {
         validationErrors = error.errors;
@@ -133,24 +129,23 @@ value, schema, globalSchemas = {}, options = {}) {
     }
     // Throw invalid request body error
     if (options.source === 'body') {
-        const error = __1.RestHttpErrors.invalidRequestBody();
-        addErrorDetails(error, validationErrors);
+        const error = __1.RestHttpErrors.invalidRequestBody(buildErrorDetails(validationErrors));
         throw error;
     }
     // Throw invalid value error
-    const error = new __1.HttpErrors.BadRequest('Invalid value.');
-    addErrorDetails(error, validationErrors);
+    const error = __1.RestHttpErrors.invalidData(value, (_c = options.name) !== null && _c !== void 0 ? _c : '(unknown)', {
+        details: buildErrorDetails(validationErrors),
+    });
     throw error;
 }
 exports.validateValueAgainstSchema = validateValueAgainstSchema;
-function addErrorDetails(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-error, validationErrors) {
-    error.details = lodash_1.default.map(validationErrors, e => {
+function buildErrorDetails(validationErrors) {
+    return validationErrors.map((e) => {
+        var _a;
         return {
             path: e.dataPath,
             code: e.keyword,
-            message: e.message,
+            message: (_a = e.message) !== null && _a !== void 0 ? _a : `must pass validation rule ${e.keyword}`,
             info: e.params,
         };
     });

package/dist/validation/request-body.validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-body.validator.js","sourceRoot":"","sources":["../../src/validation/request-body.validator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"request-body.validator.js","sourceRoot":"","sources":["../../src/validation/request-body.validator.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loopback/rest",
-  "version": "6.0.0",
+  "version": "7.0.1",
   "description": "Expose controllers as REST endpoints and route REST API requests to controller methods",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,21 +23,23 @@
   "publishConfig": {
     "access": "public"
   },
+  "peerDependencies": {
+    "@loopback/core": "^2.10.1"
+  },
   "dependencies": {
-    "@loopback/core": "^2.9.3",
-    "@loopback/express": "^1.3.0",
-    "@loopback/http-server": "^2.1.11",
-    "@loopback/openapi-v3": "^3.4.7",
-    "@openapi-contrib/openapi-schema-to-json-schema": "^3.0.3",
+    "@loopback/express": "^2.0.1",
+    "@loopback/http-server": "^2.2.2",
+    "@loopback/openapi-v3": "^4.0.1",
+    "@openapi-contrib/openapi-schema-to-json-schema": "^3.0.4",
     "@types/body-parser": "^1.19.0",
     "@types/cors": "^2.8.7",
-    "@types/express": "^4.17.7",
-    "@types/express-serve-static-core": "^4.17.9",
+    "@types/express": "^4.17.8",
+    "@types/express-serve-static-core": "^4.17.12",
     "@types/http-errors": "^1.8.0",
     "@types/on-finished": "^2.3.1",
     "@types/serve-static": "1.13.5",
     "@types/type-is": "^1.6.3",
-    "ajv": "^6.12.3",
+    "ajv": "^6.12.5",
     "ajv-errors": "^1.0.1",
     "ajv-keywords": "^3.5.2",
     "body-parser": "^1.19.0",
@@ -47,29 +49,30 @@
     "http-errors": "^1.8.0",
     "js-yaml": "^3.14.0",
     "json-schema-compare": "^0.2.2",
-    "lodash": "^4.17.19",
+    "lodash": "^4.17.20",
     "on-finished": "^2.3.0",
     "path-to-regexp": "^6.1.0",
     "qs": "^6.9.4",
     "strong-error-handler": "^3.5.0",
-    "tslib": "^2.0.0",
+    "tslib": "^2.0.1",
     "type-is": "^1.6.18",
     "validator": "^13.1.1"
   },
   "devDependencies": {
-    "@loopback/build": "^6.2.0",
-    "@loopback/eslint-config": "^9.0.0",
-    "@loopback/openapi-spec-builder": "^2.1.11",
-    "@loopback/repository": "^2.11.0",
-    "@loopback/testlab": "^3.2.2",
+    "@loopback/build": "^6.2.4",
+    "@loopback/core": "^2.10.1",
+    "@loopback/eslint-config": "^10.0.0",
+    "@loopback/openapi-spec-builder": "^2.1.15",
+    "@loopback/repository": "^3.0.1",
+    "@loopback/testlab": "^3.2.6",
     "@types/debug": "^4.1.5",
     "@types/js-yaml": "^3.12.5",
     "@types/json-schema-compare": "^0.2.0",
-    "@types/lodash": "^4.14.158",
-    "@types/multer": "^1.4.3",
-    "@types/node": "^10.17.28",
+    "@types/lodash": "^4.14.161",
+    "@types/multer": "^1.4.4",
+    "@types/node": "^10.17.35",
     "@types/on-finished": "^2.3.1",
-    "@types/qs": "^6.9.4",
+    "@types/qs": "^6.9.5",
     "multer": "^1.4.2"
   },
   "files": [
@@ -83,5 +86,5 @@
     "url": "https://github.com/strongloop/loopback-next.git",
     "directory": "packages/rest"
   },
-  "gitHead": "1619bf0c29aa03853a7977212e60028664fca640"
+  "gitHead": "79327fd7e68ebb05be0aa689f4986b54e2a99a6b"
 }

package/src/body-parsers/body-parser.ts

@@ -61,15 +61,18 @@ export class RequestBodyParser {
       if (customParser) {
         // Invoke the custom parser
         const body = await this._invokeCustomParser(customParser, request);
+        debug('Parsed request body', body);
         return Object.assign(requestBody, body);
       } else {
         const parser = this._findParser(matchedMediaType);
         if (parser) {
           const body = await parser.parse(request);
+          debug('Parsed request body', body);
           return Object.assign(requestBody, body);
         }
       }
     } catch (err) {
+      debug('Request body parsing error', err);
       throw normalizeParsingError(err);
     }
 

package/src/coercion/coerce-parameter.ts

@@ -13,10 +13,10 @@ import debugModule from 'debug';
 import {
   RestHttpErrors,
   validateValueAgainstSchema,
-  ValidationOptions,
   ValueValidationOptions,
 } from '../';
 import {parseJson} from '../parse-json';
+import {ValidationOptions} from '../types';
 import {DEFAULT_AJV_VALIDATION_OPTIONS} from '../validation/ajv-factory.provider';
 import {
   DateCoercionOptions,
@@ -61,31 +61,51 @@ export async function coerceParameter(
   validator.validateParamBeforeCoercion(data);
   if (data === undefined) return data;
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let result: any = data;
+
   switch (OAIType) {
     case 'byte':
-      return coerceBuffer(data, spec);
+      result = coerceBuffer(data, spec);
+      break;
     case 'date':
-      return coerceDatetime(data, spec, {dateOnly: true});
+      result = coerceDatetime(data, spec, {dateOnly: true});
+      break;
     case 'date-time':
-      return coerceDatetime(data, spec);
+      result = coerceDatetime(data, spec);
+      break;
     case 'float':
     case 'double':
     case 'number':
-      return coerceNumber(data, spec);
+      result = coerceNumber(data, spec);
+      break;
     case 'long':
-      return coerceInteger(data, spec, {isLong: true});
+      result = coerceInteger(data, spec, {isLong: true});
+      break;
     case 'integer':
-      return coerceInteger(data, spec);
+      result = coerceInteger(data, spec);
+      break;
     case 'boolean':
-      return coerceBoolean(data, spec);
+      result = coerceBoolean(data, spec);
+      break;
     case 'object':
-      return coerceObject(data, spec, options);
+      result = await coerceObject(data, spec);
+      break;
     case 'string':
     case 'password':
-      return coerceString(data, spec);
-    default:
-      return data;
+      result = coerceString(data, spec);
+      break;
+  }
+
+  if (result != null) {
+    // For date/date-time/byte, we need to pass the raw string value to AJV
+    if (OAIType === 'date' || OAIType === 'date-time' || OAIType === 'byte') {
+      await validateParam(spec, data, options);
+      return result;
+    }
+    result = await validateParam(spec, result, options);
   }
+  return result;
 }
 
 function coerceString(data: string | object, spec: ParameterObject) {
@@ -165,11 +185,7 @@ function coerceBoolean(data: string | object, spec: ParameterObject) {
   throw RestHttpErrors.invalidData(data, spec.name);
 }
 
-async function coerceObject(
-  input: string | object,
-  spec: ParameterObject,
-  options: ValidationOptions = DEFAULT_AJV_VALIDATION_OPTIONS,
-) {
+async function coerceObject(input: string | object, spec: ParameterObject) {
   const data = parseJsonIfNeeded(input, spec);
 
   if (data == null) {
@@ -180,17 +196,25 @@ async function coerceObject(
   if (typeof data !== 'object' || Array.isArray(data))
     throw RestHttpErrors.invalidData(input, spec.name);
 
+  return data;
+}
+
+function validateParam(
+  spec: ParameterObject,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  data: any,
+  options: ValidationOptions = DEFAULT_AJV_VALIDATION_OPTIONS,
+) {
   const schema = extractSchemaFromSpec(spec);
   if (schema) {
     // Apply coercion based on properties defined by spec.schema
-    await validateValueAgainstSchema(
+    return validateValueAgainstSchema(
       data,
       schema,
       {},
-      {...options, coerceTypes: true, source: 'parameter'},
+      {...options, coerceTypes: true, source: 'parameter', name: spec.name},
     );
   }
-
   return data;
 }
 

package/src/http-handler.ts

@@ -4,6 +4,7 @@
 // License text available at https://opensource.org/licenses/MIT
 
 import {Context} from '@loopback/core';
+import {MIDDLEWARE_CONTEXT} from '@loopback/express';
 import {
   ComponentsObject,
   ControllerSpec,
@@ -109,6 +110,11 @@ export class HttpHandler {
       this._serverConfig,
     );
 
+    // Set the request context as a property of Express request object so that
+    // downstream Express native integration can access `RequestContext`
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (request as any)[MIDDLEWARE_CONTEXT] = requestContext;
+
     const sequence = await requestContext.get<SequenceHandler>(
       RestBindings.SEQUENCE,
     );