@loopback/rest 9.3.0 → 10.1.0

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

@@ -7,12 +7,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 util_1 = tslib_1.__importDefault(require("util"));
+const debug_1 = (0, tslib_1.__importDefault)(require("debug"));
+const util_1 = (0, tslib_1.__importDefault)(require("util"));
 const __1 = require("..");
 const ajv_factory_provider_1 = require("./ajv-factory.provider");
 const toJsonSchema = require('@openapi-contrib/openapi-schema-to-json-schema');
-const debug = debug_1.default('loopback:rest:validation');
+const debug = (0, debug_1.default)('loopback:rest:validation');
 /**
  * Check whether the request body is valid according to the provided OpenAPI schema.
  * The JSON schema is generated from the OpenAPI schema which is typically defined
@@ -37,7 +37,7 @@ async function validateRequestBody(body, requestBodySpec, globalSchemas = {}, op
     if (debug.enabled) {
         debug('Request body schema:', util_1.default.inspect(schema, { depth: null }));
         if (schema &&
-            openapi_v3_1.isReferenceObject(schema) &&
+            (0, openapi_v3_1.isReferenceObject)(schema) &&
             schema.$ref.startsWith('#/components/schemas/')) {
             const ref = schema.$ref.slice('#/components/schemas/'.length);
             debug('  referencing:', util_1.default.inspect(globalSchemas[ref], { depth: null }));
@@ -113,9 +113,9 @@ value, schema, globalSchemas = {}, options = {}) {
     }
     let validationErrors = [];
     try {
-        const validationResult = await validate(value);
+        const validationResult = validate(value);
         debug(`Value from ${options.source} passed AJV validation.`, validationResult);
-        return validationResult;
+        return await validationResult;
     }
     catch (error) {
         validationErrors = error.errors;
@@ -143,7 +143,7 @@ function buildErrorDetails(validationErrors) {
     return validationErrors.map((e) => {
         var _a;
         return {
-            path: e.dataPath,
+            path: e.instancePath,
             code: e.keyword,
             message: (_a = e.message) !== null && _a !== void 0 ? _a : `must pass validation rule ${e.keyword}`,
             info: e.params,
@@ -161,11 +161,11 @@ function createValidator(schema, globalSchemas = {}, ajvInst) {
     // Clone global schemas to set `$async: true` flag
     const schemas = {};
     for (const name in globalSchemas) {
-        // See https://github.com/strongloop/loopback-next/issues/4939
+        // See https://github.com/loopbackio/loopback-next/issues/4939
         schemas[name] = { ...globalSchemas[name], $async: true };
     }
     const schemaWithRef = { components: { schemas }, ...jsonSchema };
-    // See https://ajv.js.org/#asynchronous-validation for async validation
+    // See https://js.org/#asynchronous-validation for async validation
     schemaWithRef.$async = true;
     return ajvInst.compile(schemaWithRef);
 }

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/dist/writer.js

@@ -45,7 +45,7 @@ result) {
             }
             else {
                 // TODO(ritch) remove this, should be configurable
-                // See https://github.com/strongloop/loopback-next/issues/436
+                // See https://github.com/loopbackio/loopback-next/issues/436
                 response.setHeader('Content-Type', 'application/json');
                 // TODO(bajtos) handle errors - JSON.stringify can throw
                 result = JSON.stringify(result);

package/dist/writer.js.map

@@ -1 +1 @@
-{"version":3,"file":"writer.js","sourceRoot":"","sources":["../src/writer.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;AAGhE,mCAAgC;AAEhC;;;;;;GAMG;AACH,SAAgB,qBAAqB;AACnC,+DAA+D;AAC/D,QAAkB;AAClB,uDAAuD;AACvD,MAAuB;IAEvB,6EAA6E;IAC7E,yCAAyC;IACzC,IAAI,MAAM,KAAK,QAAQ,IAAI,QAAQ,CAAC,WAAW,EAAE;QAC/C,OAAO;KACR;IACD,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC;QAC1B,QAAQ,CAAC,GAAG,EAAE,CAAC;QACf,OAAO;KACR;IAED,MAAM,QAAQ,GACZ,MAAM,YAAY,iBAAQ,IAAI,OAAO,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAA,KAAK,UAAU,CAAC;IAEnE,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAC;QAC/D,SAAS;QACT,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtB,OAAO;KACR;IACD,QAAQ,OAAO,MAAM,EAAE;QACrB,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS,CAAC;QACf,KAAK,QAAQ;YACX,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBAC3B,yBAAyB;gBACzB,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAC;aAChE;iBAAM;gBACL,kDAAkD;gBAClD,6DAA6D;gBAC7D,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;gBACvD,wDAAwD;gBACxD,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;aACjC;YACD,MAAM;QACR;YACE,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;YACjD,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC3B,MAAM;KACT;IACD,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACvB,CAAC;AA/CD,sDA+CC"}
+{"version":3,"file":"writer.js","sourceRoot":"","sources":["../src/writer.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;AAEhE,mCAAgC;AAGhC;;;;;;GAMG;AACH,SAAgB,qBAAqB;AACnC,+DAA+D;AAC/D,QAAkB;AAClB,uDAAuD;AACvD,MAAuB;IAEvB,6EAA6E;IAC7E,yCAAyC;IACzC,IAAI,MAAM,KAAK,QAAQ,IAAI,QAAQ,CAAC,WAAW,EAAE;QAC/C,OAAO;KACR;IACD,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC;QAC1B,QAAQ,CAAC,GAAG,EAAE,CAAC;QACf,OAAO;KACR;IAED,MAAM,QAAQ,GACZ,MAAM,YAAY,iBAAQ,IAAI,OAAO,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAA,KAAK,UAAU,CAAC;IAEnE,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAC;QAC/D,SAAS;QACT,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtB,OAAO;KACR;IACD,QAAQ,OAAO,MAAM,EAAE;QACrB,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS,CAAC;QACf,KAAK,QAAQ;YACX,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBAC3B,yBAAyB;gBACzB,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAC;aAChE;iBAAM;gBACL,kDAAkD;gBAClD,6DAA6D;gBAC7D,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;gBACvD,wDAAwD;gBACxD,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;aACjC;YACD,MAAM;QACR;YACE,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;YACjD,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC3B,MAAM;KACT;IACD,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACvB,CAAC;AA/CD,sDA+CC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@loopback/rest",
   "description": "Expose controllers as REST endpoints and route REST API requests to controller methods",
-  "version": "9.3.0",
+  "version": "10.1.0",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,7 +9,7 @@
   "copyright.owner": "IBM Corp.",
   "repository": {
     "type": "git",
-    "url": "https://github.com/strongloop/loopback-next.git",
+    "url": "https://github.com/loopbackio/loopback-next.git",
     "directory": "packages/rest"
   },
   "engines": {
@@ -35,27 +35,28 @@
     "!*/__tests__"
   ],
   "peerDependencies": {
-    "@loopback/core": "^2.16.0"
+    "@loopback/core": "^2.18.0"
   },
   "dependencies": {
-    "@loopback/express": "^3.3.0",
-    "@loopback/http-server": "^2.5.0",
-    "@loopback/openapi-v3": "^5.3.0",
-    "@openapi-contrib/openapi-schema-to-json-schema": "^3.1.0",
-    "@types/body-parser": "^1.19.0",
-    "@types/cors": "^2.8.10",
-    "@types/express": "^4.17.11",
-    "@types/express-serve-static-core": "^4.17.19",
-    "@types/http-errors": "^1.8.0",
+    "@loopback/express": "^3.3.4",
+    "@loopback/http-server": "^2.5.4",
+    "@loopback/openapi-v3": "^6.0.2",
+    "@openapi-contrib/openapi-schema-to-json-schema": "^3.1.1",
+    "@types/body-parser": "^1.19.1",
+    "@types/cors": "^2.8.12",
+    "@types/express": "^4.17.13",
+    "@types/express-serve-static-core": "^4.17.24",
+    "@types/http-errors": "^1.8.1",
     "@types/on-finished": "^2.3.1",
-    "@types/serve-static": "1.13.9",
+    "@types/serve-static": "1.13.10",
     "@types/type-is": "^1.6.3",
-    "ajv": "^6.12.6",
-    "ajv-errors": "^1.0.1",
-    "ajv-keywords": "^3.5.2",
+    "ajv": "^8.6.3",
+    "ajv-errors": "^3.0.0",
+    "ajv-formats": "^2.1.1",
+    "ajv-keywords": "^5.0.0",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
-    "debug": "^4.3.1",
+    "debug": "^4.3.2",
     "express": "^4.17.1",
     "http-errors": "^1.8.0",
     "js-yaml": "^4.1.0",
@@ -65,26 +66,26 @@
     "path-to-regexp": "^6.2.0",
     "qs": "^6.10.1",
     "strong-error-handler": "^4.0.0",
-    "tslib": "^2.2.0",
+    "tslib": "^2.3.1",
     "type-is": "^1.6.18",
     "validator": "^13.6.0"
   },
   "devDependencies": {
-    "@loopback/build": "^6.4.0",
-    "@loopback/core": "^2.16.0",
-    "@loopback/eslint-config": "^10.2.0",
-    "@loopback/openapi-spec-builder": "^3.2.0",
-    "@loopback/repository": "^3.6.0",
-    "@loopback/testlab": "^3.4.0",
-    "@types/debug": "^4.1.5",
-    "@types/js-yaml": "^4.0.1",
-    "@types/json-schema-compare": "^0.2.0",
-    "@types/lodash": "^4.14.168",
-    "@types/multer": "^1.4.5",
-    "@types/node": "^10.17.59",
+    "@loopback/build": "^7.0.2",
+    "@loopback/core": "^2.18.0",
+    "@loopback/eslint-config": "^11.0.2",
+    "@loopback/openapi-spec-builder": "^3.2.4",
+    "@loopback/repository": "^3.7.3",
+    "@loopback/testlab": "^3.4.4",
+    "@types/debug": "^4.1.7",
+    "@types/js-yaml": "^4.0.3",
+    "@types/json-schema-compare": "^0.2.1",
+    "@types/lodash": "^4.14.175",
+    "@types/multer": "^1.4.7",
+    "@types/node": "^10.17.60",
     "@types/on-finished": "^2.3.1",
-    "@types/qs": "^6.9.6",
-    "multer": "^1.4.2"
+    "@types/qs": "^6.9.7",
+    "multer": "^1.4.3"
   },
-  "gitHead": "2ca802912d8c7750d0256f3c3d493c4525415201"
+  "gitHead": "d9a29c85dbe38f12ba219d8c495cf6038bbc3590"
 }

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

@@ -56,7 +56,7 @@ export function invokeBodyParserMiddleware(
   request: Request,
 ): Promise<any> {
   // A hack to fool TypeScript as we don't need `response`
-  const response = ({} as any) as Response;
+  const response = {} as any as Response;
   return new Promise<void>((resolve, reject) => {
     handle(request, response, err => {
       if (err) {

package/src/coercion/utils.ts

@@ -51,7 +51,8 @@ export function isValidDateTime(data: Date) {
   return isNaN(data.getTime()) ? false : true;
 }
 
-const REGEX_RFC3339_DATE = /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])$/;
+const REGEX_RFC3339_DATE =
+  /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])$/;
 
 /**
  * Return true when a date follows the RFC3339 standard

package/src/keys.ts

@@ -36,9 +36,8 @@ export namespace RestBindings {
   /**
    * Binding key for setting and injecting RestComponentConfig
    */
-  export const CONFIG: BindingKey<RestServerConfig> = CoreBindings.APPLICATION_CONFIG.deepProperty(
-    'rest',
-  );
+  export const CONFIG: BindingKey<RestServerConfig> =
+    CoreBindings.APPLICATION_CONFIG.deepProperty('rest');
   /**
    * Binding key for setting and injecting the host name of RestServer
    */
@@ -62,9 +61,8 @@ export namespace RestBindings {
   /**
    * Binding key for HTTPS options
    */
-  export const HTTPS_OPTIONS = BindingKey.create<https.ServerOptions>(
-    'rest.httpsOptions',
-  );
+  export const HTTPS_OPTIONS =
+    BindingKey.create<https.ServerOptions>('rest.httpsOptions');
 
   /**
    * Binding key for the server itself
@@ -94,7 +92,7 @@ export namespace RestBindings {
    * Binding key for setting and injecting Reject action's error handling
    * options.
    *
-   * See https://github.com/strongloop/strong-error-handler#options for
+   * See https://github.com/loopbackio/strong-error-handler#options for
    * the list of available options. Please note that the flag `log` is not used
    * by `@loopback/rest`.
    */
@@ -105,9 +103,10 @@ export namespace RestBindings {
   /**
    * Binding key for request body parser options
    */
-  export const REQUEST_BODY_PARSER_OPTIONS = BindingKey.create<RequestBodyParserOptions>(
-    'rest.requestBodyParserOptions',
-  );
+  export const REQUEST_BODY_PARSER_OPTIONS =
+    BindingKey.create<RequestBodyParserOptions>(
+      'rest.requestBodyParserOptions',
+    );
 
   /**
    * Binding key for request body parser
@@ -165,9 +164,8 @@ export namespace RestBindings {
   /**
    * Binding key for setting and injecting an OpenAPI spec
    */
-  export const API_SPEC: BindingKey<OpenApiSpec> = BindingKey.create<OpenApiSpec>(
-    'rest.apiSpec',
-  );
+  export const API_SPEC: BindingKey<OpenApiSpec> =
+    BindingKey.create<OpenApiSpec>('rest.apiSpec');
 
   /**
    * Binding key for setting and injecting an OpenAPI operation spec
@@ -256,9 +254,8 @@ export namespace RestBindings {
     /**
      * Binding key for setting and injecting the http request
      */
-    export const REQUEST: BindingKey<Request> = BindingKey.create<Request>(
-      'rest.http.request',
-    );
+    export const REQUEST: BindingKey<Request> =
+      BindingKey.create<Request>('rest.http.request');
     /**
      * Binding key for setting and injecting the http response
      */

package/src/parser.ts

@@ -79,7 +79,7 @@ async function buildOperationArguments(
   for (const paramSpec of operationSpec.parameters ?? []) {
     if (isReferenceObject(paramSpec)) {
       // TODO(bajtos) implement $ref parameters
-      // See https://github.com/strongloop/loopback-next/issues/435
+      // See https://github.com/loopbackio/loopback-next/issues/435
       throw new Error('$ref parameters are not supported yet.');
     }
     const spec = paramSpec as ParameterObject;
@@ -116,7 +116,7 @@ function getParamFromRequest(
       // @jannyhou TBD: check edge cases
       return request.headers[spec.name.toLowerCase()];
     // TODO(jannyhou) to support `cookie`,
-    // see issue https://github.com/strongloop/loopback-next/issues/997
+    // see issue https://github.com/loopbackio/loopback-next/issues/997
     default:
       throw RestHttpErrors.invalidParamLocation(spec.in);
   }

package/src/request-context.ts

@@ -19,7 +19,8 @@ import {RestServerResolvedConfig} from './rest.server';
  */
 export class RequestContext
   extends MiddlewareContext
-  implements HandlerContext {
+  implements HandlerContext
+{
   /**
    * Get the protocol used by the client to make the request.
    * Please note this protocol may be different from what we are observing

package/src/rest.server.ts

@@ -113,7 +113,8 @@ const SequenceActions = RestBindings.SequenceActions;
  */
 export class RestServer
   extends BaseMiddlewareRegistry
-  implements Server, HttpServerLike {
+  implements Server, HttpServerLike
+{
   /**
    * Handle incoming HTTP(S) request by invoking the corresponding
    * Controller method via the configured Sequence.
@@ -397,7 +398,7 @@ export class RestServer
     if (this._httpHandler) return;
 
     // Watch for binding events
-    // See https://github.com/strongloop/loopback-next/issues/433
+    // See https://github.com/loopbackio/loopback-next/issues/433
     const routesObserver: ContextObserver = {
       filter: binding =>
         filterByKey(RestBindings.API_SPEC.key)(binding) ||
@@ -1146,7 +1147,7 @@ export interface ApiExplorerOptions {
    * URL for the API explorer served over `http` protocol to deal with mixed
    * content security imposed by browsers as the spec is exposed over `http` by
    * default.
-   * See https://github.com/strongloop/loopback-next/issues/1603
+   * See https://github.com/loopbackio/loopback-next/issues/1603
    */
   httpUrl?: string;
 

package/src/router/route-entry.ts

@@ -53,7 +53,7 @@ export interface ResolvedRoute extends RouteEntry {
    * Server/application wide schemas shared by multiple routes,
    * e.g. model schemas. This is a temporary workaround for
    * missing support for $ref references, see
-   * https://github.com/strongloop/loopback-next/issues/435
+   * https://github.com/loopbackio/loopback-next/issues/435
    */
   readonly schemas: SchemasObject;
 }

package/src/router/routing-table.ts

@@ -61,7 +61,7 @@ export class RoutingTable {
    */
   registerRoute(route: RouteEntry) {
     // TODO(bajtos) handle the case where opSpec.parameters contains $ref
-    // See https://github.com/strongloop/loopback-next/issues/435
+    // See https://github.com/loopbackio/loopback-next/issues/435
     /* istanbul ignore if */
     if (debug.enabled) {
       debug(

package/src/types.ts

@@ -5,7 +5,14 @@
 
 import {HandlerContext, Request, Response} from '@loopback/express';
 import {ReferenceObject, SchemaObject} from '@loopback/openapi-v3';
-import ajv, {Ajv, FormatDefinition, KeywordDefinition} from 'ajv';
+import Ajv, {
+  ErrorObject,
+  FormatDefinition,
+  KeywordDefinition,
+  Options as AjvOptions,
+  ValidateFunction,
+} from 'ajv';
+import {ErrorMessageOptions} from 'ajv-errors';
 import {
   Options,
   OptionsJson,
@@ -82,31 +89,29 @@ export type LogError = (
  */
 export type SchemaValidatorCache = WeakMap<
   SchemaObject | ReferenceObject, // First keyed by schema object
-  Map<string, ajv.ValidateFunction> // Second level keyed by stringified AJV options
+  Map<string, ValidateFunction> // Second level keyed by stringified AJV options
 >;
 
 /**
  * Options for AJV errors
  */
-export type AjvErrorOptions = {
-  keepErrors?: boolean;
-  singleError?: boolean;
-};
+export type AjvErrorOptions = ErrorMessageOptions;
 
 /**
  * Factory function for Ajv instances
  */
-export type AjvFactory = (options?: ajv.Options) => Ajv;
+export type AjvFactory = (options?: AjvOptions) => Ajv;
 
 /**
  * Ajv keyword definition with a name
  */
-export type AjvKeyword = KeywordDefinition & {name: string};
+export type AjvKeyword = KeywordDefinition;
 
 /**
  * Ajv format definition with a name
  */
-export type AjvFormat = FormatDefinition & {name: string};
+export type AjvFormat<T extends string | number = string> =
+  FormatDefinition<T> & {name: string};
 
 /**
  * Options for any value validation using AJV
@@ -127,7 +132,7 @@ export interface ValueValidationOptions extends ValidationOptions {
 /**
  * Options for request body validation using AJV
  */
-export interface ValidationOptions extends ajv.Options {
+export interface ValidationOptions extends AjvOptions {
   /**
    * Custom cache for compiled schemas by AJV. This setting makes it possible
    * to skip the default cache.
@@ -135,27 +140,26 @@ export interface ValidationOptions extends ajv.Options {
   compiledSchemaCache?: SchemaValidatorCache;
   /**
    * Enable additional AJV keywords from https://github.com/epoberezkin/ajv-keywords
-   * - `true`: Add all keywords from `ajv-keywords`
    * - `string[]`: Add an array of keywords from `ajv-keywords`
    */
-  ajvKeywords?: true | string[];
+  ajvKeywords?: string[];
   /**
    * Enable custom error messages in JSON-Schema for AJV validator
    * from https://github.com/epoberezkin/ajv-errors
    * - `true`: Enable `ajv-errors`
    * - `AjvErrorOptions`: Enable `ajv-errors` with options
    */
-  ajvErrors?: true | AjvErrorOptions;
+  ajvErrors?: AjvErrorOptions;
   /**
    * A function that transform the `ErrorObject`s reported by AJV.
    * This could be used for error messages customization, localization, etc.
    */
-  ajvErrorTransformer?: (errors: ajv.ErrorObject[]) => ajv.ErrorObject[];
+  ajvErrorTransformer?: (errors: ErrorObject[]) => ErrorObject[];
 
   /**
    * A factory to create Ajv instance
    */
-  ajvFactory?: (options: ajv.Options) => Ajv;
+  ajvFactory?: (options: AjvOptions) => Ajv;
 
   /**
    * An array of keys to be rejected, such as `__proto__`.

package/src/validation/ajv-factory.provider.ts

@@ -11,6 +11,9 @@ import {
   Provider,
 } from '@loopback/core';
 import AjvCtor from 'ajv';
+import ajvErrors from 'ajv-errors';
+import ajvFormats from 'ajv-formats';
+import ajvKeywords from 'ajv-keywords';
 import debugModule from 'debug';
 import {RestBindings, RestTags} from '../keys';
 import {AjvFactory, AjvFormat, AjvKeyword, ValidationOptions} from '../types';
@@ -18,13 +21,8 @@ import {openapiFormats} from './openapi-formats';
 
 const debug = debugModule('loopback:rest:ajv');
 
-const ajvKeywords = require('ajv-keywords');
-const ajvErrors = require('ajv-errors');
-
 export const DEFAULT_AJV_VALIDATION_OPTIONS: ValidationOptions = {
   $data: true,
-  ajvKeywords: true,
-  ajvErrors: true,
 };
 
 /**
@@ -55,34 +53,29 @@ export class AjvFactoryProvider implements Provider<AjvFactory> {
       // See https://github.com/epoberezkin/ajv#options
       validationOptions = {
         allErrors: true,
-        jsonPointers: true,
-        // nullable: support keyword "nullable" from Open API 3 specification.
-        nullable: true,
+        strictTypes: false,
         ...validationOptions,
       };
 
       debug('AJV options', validationOptions);
-      const ajvInst = new AjvCtor(validationOptions);
+      const ajvOptions = {...validationOptions};
+      delete ajvOptions.ajvErrors;
+      const ajvInst = new AjvCtor(ajvOptions);
+      ajvInst.addKeyword('components');
+      ajvInst.addKeyword('x-typescript-type');
 
-      if (validationOptions.ajvKeywords === true) {
-        ajvKeywords(ajvInst);
-      } else if (Array.isArray(validationOptions.ajvKeywords)) {
-        ajvKeywords(ajvInst, validationOptions.ajvKeywords);
-      }
+      ajvKeywords(ajvInst, validationOptions.ajvKeywords);
 
-      if (validationOptions.ajvErrors === true) {
-        ajvErrors(ajvInst);
-      } else if (validationOptions.ajvErrors?.constructor === Object) {
-        ajvErrors(ajvInst, validationOptions.ajvErrors);
-      }
+      ajvErrors(ajvInst, validationOptions.ajvErrors);
 
       if (this.keywords) {
         this.keywords.forEach(keyword => {
-          debug('Adding Ajv keyword %s', keyword.name);
-          ajvInst.addKeyword(keyword.name, keyword);
+          debug('Adding Ajv keyword %s', keyword.keyword);
+          ajvInst.addKeyword(keyword);
         });
       }
 
+      ajvFormats(ajvInst);
       for (const format of openapiFormats) {
         ajvInst.addFormat(format.name, format);
       }

package/src/validation/openapi-formats.ts

@@ -8,7 +8,7 @@ import {AjvFormat} from '../types';
 /**
  * int32: [-2147483648, 21474836 47]
  */
-export const int32Format: AjvFormat = {
+export const int32Format: AjvFormat<number> = {
   name: 'int32',
   type: 'number',
   validate: (value: number) => {
@@ -22,7 +22,7 @@ export const int32Format: AjvFormat = {
 /**
  * int64: [-9223372036854775808, 9223372036854775807]
  */
-export const int64Format: AjvFormat = {
+export const int64Format: AjvFormat<number> = {
   name: 'int64',
   type: 'number',
   validate: (value: number) => {
@@ -36,7 +36,7 @@ export const int64Format: AjvFormat = {
 /**
  * float: [-2^128, 2^128]
  */
-export const floatFormat: AjvFormat = {
+export const floatFormat: AjvFormat<number> = {
   name: 'float',
   type: 'number',
   validate: (value: number) => {
@@ -48,7 +48,7 @@ export const floatFormat: AjvFormat = {
 /**
  * double: [-2^1024, 2^1024]
  */
-export const doubleFormat: AjvFormat = {
+export const doubleFormat: AjvFormat<number> = {
   name: 'double',
   type: 'number',
   validate: (value: number) => {
@@ -82,7 +82,7 @@ export const binaryFormat: AjvFormat = {
   async: false,
 };
 
-export const openapiFormats: AjvFormat[] = [
+export const openapiFormats: (AjvFormat<string> | AjvFormat<number>)[] = [
   int32Format,
   int64Format,
   floatFormat,