@loopback/rest 5.0.1 → 5.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +47 -0
- package/dist/body-parsers/body-parser.d.ts +1 -1
- package/dist/body-parsers/body-parser.helpers.js +1 -1
- package/dist/body-parsers/body-parser.js +112 -115
- package/dist/body-parsers/body-parser.js.map +1 -1
- package/dist/body-parsers/body-parser.json.js +24 -27
- package/dist/body-parsers/body-parser.json.js.map +1 -1
- package/dist/body-parsers/body-parser.raw.js +19 -22
- package/dist/body-parsers/body-parser.raw.js.map +1 -1
- package/dist/body-parsers/body-parser.text.js +21 -24
- package/dist/body-parsers/body-parser.text.js.map +1 -1
- package/dist/body-parsers/body-parser.urlencoded.js +19 -22
- package/dist/body-parsers/body-parser.urlencoded.js.map +1 -1
- package/dist/body-parsers/index.js +1 -1
- package/dist/body-parsers/index.js.map +1 -1
- package/dist/coercion/coerce-parameter.d.ts +3 -1
- package/dist/coercion/coerce-parameter.js +28 -12
- package/dist/coercion/coerce-parameter.js.map +1 -1
- package/dist/coercion/validator.js +1 -1
- package/dist/http-handler.d.ts +1 -1
- package/dist/http-handler.js +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/keys.d.ts +1 -1
- package/dist/keys.js +33 -34
- package/dist/keys.js.map +1 -1
- package/dist/parser.js +1 -1
- package/dist/parser.js.map +1 -1
- package/dist/providers/find-route.provider.d.ts +1 -1
- package/dist/providers/find-route.provider.js +21 -24
- package/dist/providers/find-route.provider.js.map +1 -1
- package/dist/providers/invoke-method.provider.d.ts +1 -1
- package/dist/providers/invoke-method.provider.js +16 -19
- package/dist/providers/invoke-method.provider.js.map +1 -1
- package/dist/providers/log-error.provider.d.ts +1 -1
- package/dist/providers/parse-params.provider.d.ts +1 -1
- package/dist/providers/parse-params.provider.js +20 -23
- package/dist/providers/parse-params.provider.js.map +1 -1
- package/dist/providers/reject.provider.d.ts +1 -1
- package/dist/providers/reject.provider.js +25 -28
- package/dist/providers/reject.provider.js.map +1 -1
- package/dist/providers/send.provider.d.ts +1 -1
- package/dist/request-context.d.ts +1 -1
- package/dist/rest.application.d.ts +15 -2
- package/dist/rest.application.js +14 -1
- package/dist/rest.application.js.map +1 -1
- package/dist/rest.component.d.ts +1 -1
- package/dist/rest.component.js +46 -49
- package/dist/rest.component.js.map +1 -1
- package/dist/rest.server.d.ts +15 -2
- package/dist/rest.server.js +615 -588
- package/dist/rest.server.js.map +1 -1
- package/dist/router/base-route.d.ts +1 -1
- package/dist/router/controller-route.d.ts +1 -1
- package/dist/router/controller-route.js +3 -4
- package/dist/router/controller-route.js.map +1 -1
- package/dist/router/external-express-routes.js +1 -1
- package/dist/router/external-express-routes.js.map +1 -1
- package/dist/router/handler-route.d.ts +1 -1
- package/dist/router/handler-route.js +2 -2
- package/dist/router/handler-route.js.map +1 -1
- package/dist/router/redirect-route.js +2 -2
- package/dist/router/redirect-route.js.map +1 -1
- package/dist/router/regexp-router.js +55 -58
- package/dist/router/regexp-router.js.map +1 -1
- package/dist/router/route-entry.d.ts +1 -1
- package/dist/router/trie-router.js +32 -35
- package/dist/router/trie-router.js.map +1 -1
- package/dist/sequence.d.ts +1 -1
- package/dist/sequence.js +74 -77
- package/dist/sequence.js.map +1 -1
- package/dist/spec-enhancers/consolidate.spec-enhancer.js +89 -92
- package/dist/spec-enhancers/consolidate.spec-enhancer.js.map +1 -1
- package/dist/spec-enhancers/info.spec-enhancer.js +63 -67
- package/dist/spec-enhancers/info.spec-enhancer.js.map +1 -1
- package/dist/types.d.ts +10 -0
- package/dist/validation/ajv-factory.provider.js +63 -66
- package/dist/validation/ajv-factory.provider.js.map +1 -1
- package/dist/validation/request-body.validator.d.ts +10 -2
- package/dist/validation/request-body.validator.js +25 -9
- package/dist/validation/request-body.validator.js.map +1 -1
- package/package.json +25 -23
- package/src/body-parsers/body-parser.helpers.ts +1 -1
- package/src/body-parsers/body-parser.json.ts +1 -1
- package/src/body-parsers/body-parser.raw.ts +1 -1
- package/src/body-parsers/body-parser.text.ts +1 -1
- package/src/body-parsers/body-parser.ts +1 -1
- package/src/body-parsers/body-parser.urlencoded.ts +1 -1
- package/src/body-parsers/index.ts +1 -1
- package/src/coercion/coerce-parameter.ts +55 -15
- package/src/coercion/validator.ts +1 -1
- package/src/http-handler.ts +2 -2
- package/src/index.ts +6 -0
- package/src/keys.ts +1 -2
- package/src/parser.ts +1 -1
- package/src/providers/find-route.provider.ts +1 -1
- package/src/providers/invoke-method.provider.ts +1 -1
- package/src/providers/log-error.provider.ts +1 -1
- package/src/providers/parse-params.provider.ts +1 -1
- package/src/providers/reject.provider.ts +1 -1
- package/src/providers/send.provider.ts +1 -1
- package/src/request-context.ts +1 -1
- package/src/rest.application.ts +19 -3
- package/src/rest.component.ts +1 -1
- package/src/rest.server.ts +35 -3
- package/src/router/base-route.ts +1 -1
- package/src/router/controller-route.ts +2 -2
- package/src/router/external-express-routes.ts +2 -2
- package/src/router/handler-route.ts +1 -1
- package/src/router/redirect-route.ts +1 -2
- package/src/router/regexp-router.ts +1 -1
- package/src/router/route-entry.ts +1 -1
- package/src/router/trie-router.ts +2 -2
- package/src/sequence.ts +1 -1
- package/src/spec-enhancers/info.spec-enhancer.ts +3 -2
- package/src/types.ts +11 -0
- package/src/validation/request-body.validator.ts +35 -12
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// Copyright IBM Corp. 2018. All Rights Reserved.
|
|
2
|
+
// Copyright IBM Corp. 2018,2020. All Rights Reserved.
|
|
3
3
|
// Node module: @loopback/rest
|
|
4
4
|
// This file is licensed under the MIT License.
|
|
5
5
|
// License text available at https://opensource.org/licenses/MIT
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/body-parsers/index.ts"],"names":[],"mappings":";AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/body-parsers/index.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;AAEhE,wDAA8B;AAC9B,gEAAsC;AACtC,6DAAmC;AACnC,4DAAkC;AAClC,+DAAqC;AACrC,6DAAmC;AACnC,mEAAyC;AACzC,kDAAwB"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { ParameterObject } from '@loopback/openapi-v3';
|
|
2
|
+
import { ValueValidationOptions } from '../';
|
|
2
3
|
/**
|
|
3
4
|
* Coerce the http raw data to a JavaScript type data of a parameter
|
|
4
5
|
* according to its OpenAPI schema specification.
|
|
5
6
|
*
|
|
6
7
|
* @param data - The raw data get from http request
|
|
7
8
|
* @param schema - The parameter's schema defined in OpenAPI specification
|
|
9
|
+
* @param options - The ajv validation options
|
|
8
10
|
*/
|
|
9
|
-
export declare function coerceParameter(data: string | undefined | object, spec: ParameterObject): string | number | boolean | object | undefined
|
|
11
|
+
export declare function coerceParameter(data: string | undefined | object, spec: ParameterObject, options?: ValueValidationOptions): Promise<string | number | boolean | object | undefined>;
|
|
@@ -20,14 +20,10 @@ const debug = debug_1.default('loopback:rest:coercion');
|
|
|
20
20
|
*
|
|
21
21
|
* @param data - The raw data get from http request
|
|
22
22
|
* @param schema - The parameter's schema defined in OpenAPI specification
|
|
23
|
+
* @param options - The ajv validation options
|
|
23
24
|
*/
|
|
24
|
-
function coerceParameter(data, spec) {
|
|
25
|
-
|
|
26
|
-
// If a query parameter is a url encoded Json object, the schema is defined under content['application/json']
|
|
27
|
-
if (!schema && spec.in === 'query' && spec.content) {
|
|
28
|
-
const jsonSpec = spec.content['application/json'];
|
|
29
|
-
schema = jsonSpec.schema;
|
|
30
|
-
}
|
|
25
|
+
async function coerceParameter(data, spec, options) {
|
|
26
|
+
const schema = extractSchemaFromSpec(spec);
|
|
31
27
|
if (!schema || openapi_v3_1.isReferenceObject(schema)) {
|
|
32
28
|
debug('The parameter with schema %s is not coerced since schema' +
|
|
33
29
|
'dereference is not supported yet.', schema);
|
|
@@ -56,7 +52,7 @@ function coerceParameter(data, spec) {
|
|
|
56
52
|
case 'boolean':
|
|
57
53
|
return coerceBoolean(data, spec);
|
|
58
54
|
case 'object':
|
|
59
|
-
return coerceObject(data, spec);
|
|
55
|
+
return coerceObject(data, spec, options);
|
|
60
56
|
case 'string':
|
|
61
57
|
case 'password':
|
|
62
58
|
return coerceString(data, spec);
|
|
@@ -127,17 +123,37 @@ function coerceBoolean(data, spec) {
|
|
|
127
123
|
return false;
|
|
128
124
|
throw __1.RestHttpErrors.invalidData(data, spec.name);
|
|
129
125
|
}
|
|
130
|
-
function coerceObject(input, spec) {
|
|
126
|
+
async function coerceObject(input, spec, options) {
|
|
131
127
|
const data = parseJsonIfNeeded(input, spec);
|
|
132
|
-
if (data
|
|
128
|
+
if (data == null) {
|
|
133
129
|
// Skip any further checks and coercions, nothing we can do with `undefined`
|
|
134
|
-
return
|
|
130
|
+
return data;
|
|
135
131
|
}
|
|
136
132
|
if (typeof data !== 'object' || Array.isArray(data))
|
|
137
133
|
throw __1.RestHttpErrors.invalidData(input, spec.name);
|
|
138
|
-
|
|
134
|
+
const schema = extractSchemaFromSpec(spec);
|
|
135
|
+
if (schema) {
|
|
136
|
+
// Apply coercion based on properties defined by spec.schema
|
|
137
|
+
await __1.validateValueAgainstSchema(data, schema, {}, { ...options, coerceTypes: true, source: 'parameter' });
|
|
138
|
+
}
|
|
139
139
|
return data;
|
|
140
140
|
}
|
|
141
|
+
/**
|
|
142
|
+
* Extract the schema from an OpenAPI parameter specification. If the root level
|
|
143
|
+
* one not found, search from media type 'application/json'.
|
|
144
|
+
*
|
|
145
|
+
* @param spec The parameter specification
|
|
146
|
+
*/
|
|
147
|
+
function extractSchemaFromSpec(spec) {
|
|
148
|
+
var _a, _b;
|
|
149
|
+
let schema = spec.schema;
|
|
150
|
+
// If a query parameter is a url encoded Json object,
|
|
151
|
+
// the schema is defined under content['application/json']
|
|
152
|
+
if (!schema && spec.in === 'query') {
|
|
153
|
+
schema = (_b = (_a = spec.content) === null || _a === void 0 ? void 0 : _a['application/json']) === null || _b === void 0 ? void 0 : _b.schema;
|
|
154
|
+
}
|
|
155
|
+
return schema;
|
|
156
|
+
}
|
|
141
157
|
function parseJsonIfNeeded(data, spec) {
|
|
142
158
|
if (typeof data !== 'string')
|
|
143
159
|
return data;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-parameter.js","sourceRoot":"","sources":["../../src/coercion/coerce-parameter.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,
|
|
1
|
+
{"version":3,"file":"coerce-parameter.js","sourceRoot":"","sources":["../../src/coercion/coerce-parameter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// Copyright IBM Corp. 2018,
|
|
2
|
+
// Copyright IBM Corp. 2018,2020. All Rights Reserved.
|
|
3
3
|
// Node module: @loopback/rest
|
|
4
4
|
// This file is licensed under the MIT License.
|
|
5
5
|
// License text available at https://opensource.org/licenses/MIT
|
package/dist/http-handler.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Context } from '@loopback/
|
|
1
|
+
import { Context } from '@loopback/core';
|
|
2
2
|
import { ComponentsObject, ControllerSpec, PathObject, ReferenceObject, SchemaObject, SchemasObject } from '@loopback/openapi-v3';
|
|
3
3
|
import { RestServerResolvedConfig } from './rest.server';
|
|
4
4
|
import { ControllerClass, ControllerFactory, ResolvedRoute, RouteEntry, RoutingTable } from './router';
|
package/dist/http-handler.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// Copyright IBM Corp. 2017,
|
|
2
|
+
// Copyright IBM Corp. 2017,2020. All Rights Reserved.
|
|
3
3
|
// Node module: @loopback/rest
|
|
4
4
|
// This file is licensed under the MIT License.
|
|
5
5
|
// License text available at https://opensource.org/licenses/MIT
|
package/dist/index.d.ts
CHANGED
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
* @packageDocumentation
|
|
16
16
|
*/
|
|
17
17
|
export * from '@loopback/openapi-v3';
|
|
18
|
+
export { ErrorHandlerOptions, ErrorWriterOptions, StrongErrorHandler, writeErrorToResponse, } from 'strong-error-handler';
|
|
18
19
|
export * from './body-parsers';
|
|
19
20
|
export * from './http-handler';
|
|
20
21
|
export * from './keys';
|
package/dist/index.js
CHANGED
|
@@ -23,6 +23,8 @@ const tslib_1 = require("tslib");
|
|
|
23
23
|
* @packageDocumentation
|
|
24
24
|
*/
|
|
25
25
|
tslib_1.__exportStar(require("@loopback/openapi-v3"), exports);
|
|
26
|
+
var strong_error_handler_1 = require("strong-error-handler");
|
|
27
|
+
Object.defineProperty(exports, "writeErrorToResponse", { enumerable: true, get: function () { return strong_error_handler_1.writeErrorToResponse; } });
|
|
26
28
|
tslib_1.__exportStar(require("./body-parsers"), exports);
|
|
27
29
|
tslib_1.__exportStar(require("./http-handler"), exports);
|
|
28
30
|
tslib_1.__exportStar(require("./keys"), exports);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;AAEhE;;;;;;;;;;;;;;;GAeG;AAEH,+DAAqC;AACrC,yDAA+B;AAC/B,yDAA+B;AAC/B,iDAAuB;AACvB,uDAA6B;AAC7B,mDAAyB;AACzB,sDAA4B;AAC5B,4DAAkC;AAClC,4DAAkC;AAClC,6DAAmC;AACnC,2DAAiC;AACjC,wDAA8B;AAC9B,mDAAyB;AACzB,qDAA2B;AAC3B,8EAAoD;AACpD,kDAAwB;AACxB,8EAAoD;AACpD,mDAAyB;AAGzB,sDAAsD;AACtD,sEAAqC;AAH7B,qBAGD,qBAAU,CAHC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;AAEhE;;;;;;;;;;;;;;;GAeG;AAEH,+DAAqC;AACrC,6DAK8B;AAD5B,4HAAA,oBAAoB,OAAA;AAEtB,yDAA+B;AAC/B,yDAA+B;AAC/B,iDAAuB;AACvB,uDAA6B;AAC7B,mDAAyB;AACzB,sDAA4B;AAC5B,4DAAkC;AAClC,4DAAkC;AAClC,6DAAmC;AACnC,2DAAiC;AACjC,wDAA8B;AAC9B,mDAAyB;AACzB,qDAA2B;AAC3B,8EAAoD;AACpD,kDAAwB;AACxB,8EAAoD;AACpD,mDAAyB;AAGzB,sDAAsD;AACtD,sEAAqC;AAH7B,qBAGD,qBAAU,CAHC"}
|
package/dist/keys.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { BindingKey, Context } from '@loopback/
|
|
2
|
+
import { BindingKey, Context } from '@loopback/core';
|
|
3
3
|
import { InvokeMiddleware } from '@loopback/express';
|
|
4
4
|
import { HttpProtocol } from '@loopback/http-server';
|
|
5
5
|
import { OpenApiSpec, OperationObject } from '@loopback/openapi-v3';
|
package/dist/keys.js
CHANGED
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
// License text available at https://opensource.org/licenses/MIT
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.RestTags = exports.RestBindings = void 0;
|
|
8
|
-
const context_1 = require("@loopback/context");
|
|
9
8
|
const core_1 = require("@loopback/core");
|
|
10
9
|
/**
|
|
11
10
|
* RestServer-specific bindings
|
|
@@ -19,44 +18,44 @@ var RestBindings;
|
|
|
19
18
|
/**
|
|
20
19
|
* Binding key for setting and injecting the host name of RestServer
|
|
21
20
|
*/
|
|
22
|
-
RestBindings.HOST =
|
|
21
|
+
RestBindings.HOST = core_1.BindingKey.create('rest.host');
|
|
23
22
|
/**
|
|
24
23
|
* Binding key for setting and injecting the port number of RestServer
|
|
25
24
|
*/
|
|
26
|
-
RestBindings.PORT =
|
|
25
|
+
RestBindings.PORT = core_1.BindingKey.create('rest.port');
|
|
27
26
|
/**
|
|
28
27
|
* Binding key for setting and injecting the socket path of the RestServer
|
|
29
28
|
*/
|
|
30
|
-
RestBindings.PATH =
|
|
29
|
+
RestBindings.PATH = core_1.BindingKey.create('rest.path');
|
|
31
30
|
/**
|
|
32
31
|
* Binding key for setting and injecting the URL of RestServer
|
|
33
32
|
*/
|
|
34
|
-
RestBindings.URL =
|
|
33
|
+
RestBindings.URL = core_1.BindingKey.create('rest.url');
|
|
35
34
|
/**
|
|
36
35
|
* Binding key for setting and injecting the protocol of RestServer
|
|
37
36
|
*/
|
|
38
|
-
RestBindings.PROTOCOL =
|
|
37
|
+
RestBindings.PROTOCOL = core_1.BindingKey.create('rest.protocol');
|
|
39
38
|
/**
|
|
40
39
|
* Binding key for HTTPS options
|
|
41
40
|
*/
|
|
42
|
-
RestBindings.HTTPS_OPTIONS =
|
|
41
|
+
RestBindings.HTTPS_OPTIONS = core_1.BindingKey.create('rest.httpsOptions');
|
|
43
42
|
/**
|
|
44
43
|
* Binding key for the server itself
|
|
45
44
|
*/
|
|
46
|
-
RestBindings.SERVER =
|
|
45
|
+
RestBindings.SERVER = core_1.BindingKey.create('servers.RestServer');
|
|
47
46
|
/**
|
|
48
47
|
* Internal binding key for basePath
|
|
49
48
|
*/
|
|
50
|
-
RestBindings.BASE_PATH =
|
|
49
|
+
RestBindings.BASE_PATH = core_1.BindingKey.create('rest.basePath');
|
|
51
50
|
/**
|
|
52
51
|
* Internal binding key for http-handler
|
|
53
52
|
*/
|
|
54
|
-
RestBindings.HANDLER =
|
|
53
|
+
RestBindings.HANDLER = core_1.BindingKey.create('rest.handler');
|
|
55
54
|
/**
|
|
56
55
|
* Internal binding key for rest router
|
|
57
56
|
*/
|
|
58
|
-
RestBindings.ROUTER =
|
|
59
|
-
RestBindings.ROUTER_OPTIONS =
|
|
57
|
+
RestBindings.ROUTER = core_1.BindingKey.create('rest.router');
|
|
58
|
+
RestBindings.ROUTER_OPTIONS = core_1.BindingKey.create('rest.router.options');
|
|
60
59
|
/**
|
|
61
60
|
* Binding key for setting and injecting Reject action's error handling
|
|
62
61
|
* options.
|
|
@@ -65,54 +64,54 @@ var RestBindings;
|
|
|
65
64
|
* the list of available options. Please note that the flag `log` is not used
|
|
66
65
|
* by `@loopback/rest`.
|
|
67
66
|
*/
|
|
68
|
-
RestBindings.ERROR_WRITER_OPTIONS =
|
|
67
|
+
RestBindings.ERROR_WRITER_OPTIONS = core_1.BindingKey.create('rest.errorWriterOptions');
|
|
69
68
|
/**
|
|
70
69
|
* Binding key for request body parser options
|
|
71
70
|
*/
|
|
72
|
-
RestBindings.REQUEST_BODY_PARSER_OPTIONS =
|
|
71
|
+
RestBindings.REQUEST_BODY_PARSER_OPTIONS = core_1.BindingKey.create('rest.requestBodyParserOptions');
|
|
73
72
|
/**
|
|
74
73
|
* Binding key for request body parser
|
|
75
74
|
*/
|
|
76
|
-
RestBindings.REQUEST_BODY_PARSER =
|
|
75
|
+
RestBindings.REQUEST_BODY_PARSER = core_1.BindingKey.create('rest.requestBodyParser');
|
|
77
76
|
function bodyParserBindingKey(parser) {
|
|
78
77
|
return `${RestBindings.REQUEST_BODY_PARSER}.${parser}`;
|
|
79
78
|
}
|
|
80
79
|
/**
|
|
81
80
|
* Binding key for request json body parser
|
|
82
81
|
*/
|
|
83
|
-
RestBindings.REQUEST_BODY_PARSER_JSON =
|
|
82
|
+
RestBindings.REQUEST_BODY_PARSER_JSON = core_1.BindingKey.create(bodyParserBindingKey('JsonBodyParser'));
|
|
84
83
|
/**
|
|
85
84
|
* Binding key for request urlencoded body parser
|
|
86
85
|
*/
|
|
87
|
-
RestBindings.REQUEST_BODY_PARSER_URLENCODED =
|
|
86
|
+
RestBindings.REQUEST_BODY_PARSER_URLENCODED = core_1.BindingKey.create(bodyParserBindingKey('UrlEncodedBodyParser'));
|
|
88
87
|
/**
|
|
89
88
|
* Binding key for request text body parser
|
|
90
89
|
*/
|
|
91
|
-
RestBindings.REQUEST_BODY_PARSER_TEXT =
|
|
90
|
+
RestBindings.REQUEST_BODY_PARSER_TEXT = core_1.BindingKey.create(bodyParserBindingKey('TextBodyParser'));
|
|
92
91
|
/**
|
|
93
92
|
* Binding key for request raw body parser
|
|
94
93
|
*/
|
|
95
|
-
RestBindings.REQUEST_BODY_PARSER_RAW =
|
|
94
|
+
RestBindings.REQUEST_BODY_PARSER_RAW = core_1.BindingKey.create(bodyParserBindingKey('RawBodyParser'));
|
|
96
95
|
/**
|
|
97
96
|
* Binding key for request raw body parser
|
|
98
97
|
*/
|
|
99
|
-
RestBindings.REQUEST_BODY_PARSER_STREAM =
|
|
98
|
+
RestBindings.REQUEST_BODY_PARSER_STREAM = core_1.BindingKey.create(bodyParserBindingKey('StreamBodyParser'));
|
|
100
99
|
/**
|
|
101
100
|
* Binding key for AJV
|
|
102
101
|
*/
|
|
103
|
-
RestBindings.AJV_FACTORY =
|
|
102
|
+
RestBindings.AJV_FACTORY = core_1.BindingKey.create(bodyParserBindingKey('rest.ajvFactory'));
|
|
104
103
|
/**
|
|
105
104
|
* Binding key for setting and injecting an OpenAPI spec
|
|
106
105
|
*/
|
|
107
|
-
RestBindings.API_SPEC =
|
|
106
|
+
RestBindings.API_SPEC = core_1.BindingKey.create('rest.apiSpec');
|
|
108
107
|
/**
|
|
109
108
|
* Binding key for setting and injecting an OpenAPI operation spec
|
|
110
109
|
*/
|
|
111
|
-
RestBindings.OPERATION_SPEC_CURRENT =
|
|
110
|
+
RestBindings.OPERATION_SPEC_CURRENT = core_1.BindingKey.create('rest.operationSpec.current');
|
|
112
111
|
/**
|
|
113
112
|
* Binding key for setting and injecting a Sequence
|
|
114
113
|
*/
|
|
115
|
-
RestBindings.SEQUENCE =
|
|
114
|
+
RestBindings.SEQUENCE = core_1.BindingKey.create('rest.sequence');
|
|
116
115
|
/**
|
|
117
116
|
* Bindings for potential actions that could be used in a sequence
|
|
118
117
|
*/
|
|
@@ -121,31 +120,31 @@ var RestBindings;
|
|
|
121
120
|
/**
|
|
122
121
|
* Binding key for setting and injecting a route finding function
|
|
123
122
|
*/
|
|
124
|
-
SequenceActions.INVOKE_MIDDLEWARE =
|
|
123
|
+
SequenceActions.INVOKE_MIDDLEWARE = core_1.BindingKey.create('rest.sequence.actions.invokeMiddleware');
|
|
125
124
|
/**
|
|
126
125
|
* Binding key for setting and injecting a route finding function
|
|
127
126
|
*/
|
|
128
|
-
SequenceActions.FIND_ROUTE =
|
|
127
|
+
SequenceActions.FIND_ROUTE = core_1.BindingKey.create('rest.sequence.actions.findRoute');
|
|
129
128
|
/**
|
|
130
129
|
* Binding key for setting and injecting a parameter parsing function
|
|
131
130
|
*/
|
|
132
|
-
SequenceActions.PARSE_PARAMS =
|
|
131
|
+
SequenceActions.PARSE_PARAMS = core_1.BindingKey.create('rest.sequence.actions.parseParams');
|
|
133
132
|
/**
|
|
134
133
|
* Binding key for setting and injecting a controller route invoking function
|
|
135
134
|
*/
|
|
136
|
-
SequenceActions.INVOKE_METHOD =
|
|
135
|
+
SequenceActions.INVOKE_METHOD = core_1.BindingKey.create('rest.sequence.actions.invokeMethod');
|
|
137
136
|
/**
|
|
138
137
|
* Binding key for setting and injecting an error logging function
|
|
139
138
|
*/
|
|
140
|
-
SequenceActions.LOG_ERROR =
|
|
139
|
+
SequenceActions.LOG_ERROR = core_1.BindingKey.create('rest.sequence.actions.logError');
|
|
141
140
|
/**
|
|
142
141
|
* Binding key for setting and injecting a response writing function
|
|
143
142
|
*/
|
|
144
|
-
SequenceActions.SEND =
|
|
143
|
+
SequenceActions.SEND = core_1.BindingKey.create('rest.sequence.actions.send');
|
|
145
144
|
/**
|
|
146
145
|
* Binding key for setting and injecting a bad response writing function
|
|
147
146
|
*/
|
|
148
|
-
SequenceActions.REJECT =
|
|
147
|
+
SequenceActions.REJECT = core_1.BindingKey.create('rest.sequence.actions.reject');
|
|
149
148
|
})(SequenceActions = RestBindings.SequenceActions || (RestBindings.SequenceActions = {}));
|
|
150
149
|
/**
|
|
151
150
|
* Request-specific bindings
|
|
@@ -155,15 +154,15 @@ var RestBindings;
|
|
|
155
154
|
/**
|
|
156
155
|
* Binding key for setting and injecting the http request
|
|
157
156
|
*/
|
|
158
|
-
Http.REQUEST =
|
|
157
|
+
Http.REQUEST = core_1.BindingKey.create('rest.http.request');
|
|
159
158
|
/**
|
|
160
159
|
* Binding key for setting and injecting the http response
|
|
161
160
|
*/
|
|
162
|
-
Http.RESPONSE =
|
|
161
|
+
Http.RESPONSE = core_1.BindingKey.create('rest.http.response');
|
|
163
162
|
/**
|
|
164
163
|
* Binding key for setting and injecting the http request context
|
|
165
164
|
*/
|
|
166
|
-
Http.CONTEXT =
|
|
165
|
+
Http.CONTEXT = core_1.BindingKey.create('rest.http.request.context');
|
|
167
166
|
})(Http = RestBindings.Http || (RestBindings.Http = {}));
|
|
168
167
|
/**
|
|
169
168
|
* Namespace for REST routes
|
package/dist/keys.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../src/keys.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;AAEhE
|
|
1
|
+
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../src/keys.ts"],"names":[],"mappings":"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"}
|
package/dist/parser.js
CHANGED
|
@@ -49,7 +49,7 @@ async function buildOperationArguments(operationSpec, request, pathParams, body,
|
|
|
49
49
|
}
|
|
50
50
|
const spec = paramSpec;
|
|
51
51
|
const rawValue = getParamFromRequest(spec, request, pathParams);
|
|
52
|
-
const coercedValue = coerce_parameter_1.coerceParameter(rawValue, spec);
|
|
52
|
+
const coercedValue = await coerce_parameter_1.coerceParameter(rawValue, spec);
|
|
53
53
|
paramArgs.push(coercedValue);
|
|
54
54
|
}
|
|
55
55
|
debug('Validating request body - value %j', body);
|
package/dist/parser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,qDAM8B;AAC9B,0DAAiC;AACjC,iDAA8D;AAC9D,kEAA4D;AAC5D,uDAAiD;AAQjD,gFAAwE;AACxE,MAAM,KAAK,GAAG,eAAY,CAAC,sBAAsB,CAAC,CAAC;AAEnD;;;;;;GAMG;AACI,KAAK,UAAU,kBAAkB,CACtC,OAAgB,EAChB,KAAoB,EACpB,oBAAuC,IAAI,gCAAiB,EAAE,EAC9D,UAAwC,EAAE;IAE1C,KAAK,CAAC,0CAA0C,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpE,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC;IACjC,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;IACpC,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,uBAAuB,CAC1D,aAAa,EACb,OAAO,CACR,CAAC;IACF,OAAO,uBAAuB,CAC5B,aAAa,EACb,OAAO,EACP,UAAU,EACV,IAAI,EACJ,KAAK,CAAC,OAAO,EACb,OAAO,CACR,CAAC;AACJ,CAAC;AArBD,gDAqBC;AAED,KAAK,UAAU,uBAAuB,CACpC,aAA8B,EAC9B,OAAgB,EAChB,UAA+B,EAC/B,IAAiB,EACjB,aAA4B,EAC5B,UAAwC,EAAE;;IAE1C,IAAI,gBAAgB,GAAG,CAAC,CAAC,CAAC;IAC1B,IAAI,aAAa,CAAC,WAAW,EAAE;QAC7B,uEAAuE;QACvE,uEAAuE;QACvE,IAAI,8BAAiB,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE;YAChD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;SAC3D;QACD,MAAM,CAAC,GAAG,aAAa,CAAC,WAAW,CAAC,+BAAkB,CAAC,CAAC;QACxD,gBAAgB,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KAC9B;IAED,MAAM,SAAS,GAAkB,EAAE,CAAC;IAEpC,KAAK,MAAM,SAAS,UAAI,aAAa,CAAC,UAAU,mCAAI,EAAE,EAAE;QACtD,IAAI,8BAAiB,CAAC,SAAS,CAAC,EAAE;YAChC,yCAAyC;YACzC,6DAA6D;YAC7D,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;SAC3D;QACD,MAAM,IAAI,GAAG,SAA4B,CAAC;QAC1C,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;QAChE,MAAM,YAAY,GAAG,kCAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,qDAM8B;AAC9B,0DAAiC;AACjC,iDAA8D;AAC9D,kEAA4D;AAC5D,uDAAiD;AAQjD,gFAAwE;AACxE,MAAM,KAAK,GAAG,eAAY,CAAC,sBAAsB,CAAC,CAAC;AAEnD;;;;;;GAMG;AACI,KAAK,UAAU,kBAAkB,CACtC,OAAgB,EAChB,KAAoB,EACpB,oBAAuC,IAAI,gCAAiB,EAAE,EAC9D,UAAwC,EAAE;IAE1C,KAAK,CAAC,0CAA0C,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpE,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC;IACjC,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;IACpC,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,uBAAuB,CAC1D,aAAa,EACb,OAAO,CACR,CAAC;IACF,OAAO,uBAAuB,CAC5B,aAAa,EACb,OAAO,EACP,UAAU,EACV,IAAI,EACJ,KAAK,CAAC,OAAO,EACb,OAAO,CACR,CAAC;AACJ,CAAC;AArBD,gDAqBC;AAED,KAAK,UAAU,uBAAuB,CACpC,aAA8B,EAC9B,OAAgB,EAChB,UAA+B,EAC/B,IAAiB,EACjB,aAA4B,EAC5B,UAAwC,EAAE;;IAE1C,IAAI,gBAAgB,GAAG,CAAC,CAAC,CAAC;IAC1B,IAAI,aAAa,CAAC,WAAW,EAAE;QAC7B,uEAAuE;QACvE,uEAAuE;QACvE,IAAI,8BAAiB,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE;YAChD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;SAC3D;QACD,MAAM,CAAC,GAAG,aAAa,CAAC,WAAW,CAAC,+BAAkB,CAAC,CAAC;QACxD,gBAAgB,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KAC9B;IAED,MAAM,SAAS,GAAkB,EAAE,CAAC;IAEpC,KAAK,MAAM,SAAS,UAAI,aAAa,CAAC,UAAU,mCAAI,EAAE,EAAE;QACtD,IAAI,8BAAiB,CAAC,SAAS,CAAC,EAAE;YAChC,yCAAyC;YACzC,6DAA6D;YAC7D,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;SAC3D;QACD,MAAM,IAAI,GAAG,SAA4B,CAAC;QAC1C,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;QAChE,MAAM,YAAY,GAAG,MAAM,kCAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC3D,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;KAC9B;IAED,KAAK,CAAC,oCAAoC,EAAE,IAAI,CAAC,CAAC;IAClD,MAAM,4CAAmB,CACvB,IAAI,EACJ,aAAa,CAAC,WAAW,EACzB,aAAa,EACb,OAAO,CACR,CAAC;IAEF,IAAI,gBAAgB,GAAG,CAAC,CAAC;QAAE,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7E,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,mBAAmB,CAC1B,IAAqB,EACrB,OAAgB,EAChB,UAA+B;IAE/B,QAAQ,IAAI,CAAC,EAAE,EAAE;QACf,KAAK,OAAO;YACV,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,KAAK,MAAM;YACT,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,KAAK,QAAQ;YACX,kCAAkC;YAClC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAClD,sCAAsC;QACtC,mEAAmE;QACnE;YACE,MAAM,gCAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KACtD;AACH,CAAC"}
|
|
@@ -6,31 +6,28 @@
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.FindRouteProvider = void 0;
|
|
8
8
|
const tslib_1 = require("tslib");
|
|
9
|
-
const
|
|
9
|
+
const core_1 = require("@loopback/core");
|
|
10
10
|
const http_handler_1 = require("../http-handler");
|
|
11
11
|
const keys_1 = require("../keys");
|
|
12
|
-
let FindRouteProvider =
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
], FindRouteProvider);
|
|
33
|
-
return FindRouteProvider;
|
|
34
|
-
})();
|
|
12
|
+
let FindRouteProvider = class FindRouteProvider {
|
|
13
|
+
constructor(context, handler) {
|
|
14
|
+
this.context = context;
|
|
15
|
+
this.handler = handler;
|
|
16
|
+
}
|
|
17
|
+
value() {
|
|
18
|
+
return request => this.action(request);
|
|
19
|
+
}
|
|
20
|
+
action(request) {
|
|
21
|
+
const found = this.handler.findRoute(request);
|
|
22
|
+
found.updateBindings(this.context);
|
|
23
|
+
return found;
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
FindRouteProvider = tslib_1.__decorate([
|
|
27
|
+
tslib_1.__param(0, core_1.inject(keys_1.RestBindings.Http.CONTEXT)),
|
|
28
|
+
tslib_1.__param(1, core_1.inject(keys_1.RestBindings.HANDLER)),
|
|
29
|
+
tslib_1.__metadata("design:paramtypes", [core_1.Context,
|
|
30
|
+
http_handler_1.HttpHandler])
|
|
31
|
+
], FindRouteProvider);
|
|
35
32
|
exports.FindRouteProvider = FindRouteProvider;
|
|
36
33
|
//# sourceMappingURL=find-route.provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-route.provider.js","sourceRoot":"","sources":["../../src/providers/find-route.provider.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;AAEhE
|
|
1
|
+
{"version":3,"file":"find-route.provider.js","sourceRoot":"","sources":["../../src/providers/find-route.provider.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,yCAAyD;AAEzD,kDAA4C;AAC5C,kCAAqC;AAGrC,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAC5B,YAC+C,OAAgB,EACrB,OAAoB;QADf,YAAO,GAAP,OAAO,CAAS;QACrB,YAAO,GAAP,OAAO,CAAa;IAC3D,CAAC;IAEJ,KAAK;QACH,OAAO,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,OAAgB;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC9C,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnC,OAAO,KAAK,CAAC;IACf,CAAC;CACF,CAAA;AAfY,iBAAiB;IAEzB,mBAAA,aAAM,CAAC,mBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACjC,mBAAA,aAAM,CAAC,mBAAY,CAAC,OAAO,CAAC,CAAA;6CADyB,cAAO;QACZ,0BAAW;GAHnD,iBAAiB,CAe7B;AAfY,8CAAiB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Context, Provider } from '@loopback/
|
|
1
|
+
import { Context, Provider } from '@loopback/core';
|
|
2
2
|
import { InvokeMethod, OperationArgs, OperationRetval } from '../types';
|
|
3
3
|
import { RouteEntry } from '../router';
|
|
4
4
|
export declare class InvokeMethodProvider implements Provider<InvokeMethod> {
|
|
@@ -6,25 +6,22 @@
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.InvokeMethodProvider = void 0;
|
|
8
8
|
const tslib_1 = require("tslib");
|
|
9
|
-
const
|
|
9
|
+
const core_1 = require("@loopback/core");
|
|
10
10
|
const keys_1 = require("../keys");
|
|
11
|
-
let InvokeMethodProvider =
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
], InvokeMethodProvider);
|
|
27
|
-
return InvokeMethodProvider;
|
|
28
|
-
})();
|
|
11
|
+
let InvokeMethodProvider = class InvokeMethodProvider {
|
|
12
|
+
constructor(context) {
|
|
13
|
+
this.context = context;
|
|
14
|
+
}
|
|
15
|
+
value() {
|
|
16
|
+
return (route, args) => this.action(route, args);
|
|
17
|
+
}
|
|
18
|
+
action(route, args) {
|
|
19
|
+
return route.invokeHandler(this.context, args);
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
InvokeMethodProvider = tslib_1.__decorate([
|
|
23
|
+
tslib_1.__param(0, core_1.inject(keys_1.RestBindings.Http.CONTEXT)),
|
|
24
|
+
tslib_1.__metadata("design:paramtypes", [core_1.Context])
|
|
25
|
+
], InvokeMethodProvider);
|
|
29
26
|
exports.InvokeMethodProvider = InvokeMethodProvider;
|
|
30
27
|
//# sourceMappingURL=invoke-method.provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoke-method.provider.js","sourceRoot":"","sources":["../../src/providers/invoke-method.provider.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;AAEhE
|
|
1
|
+
{"version":3,"file":"invoke-method.provider.js","sourceRoot":"","sources":["../../src/providers/invoke-method.provider.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,yCAAyD;AAEzD,kCAAqC;AAGrC,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC/B,YAAyD,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;IAE7E,KAAK;QACH,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,CAAC,KAAiB,EAAE,IAAmB;QAC3C,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;CACF,CAAA;AAVY,oBAAoB;IAClB,mBAAA,aAAM,CAAC,mBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;6CAAoB,cAAO;GAD9D,oBAAoB,CAUhC;AAVY,oDAAoB"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.ParseParamsProvider = void 0;
|
|
8
8
|
const tslib_1 = require("tslib");
|
|
9
|
-
const
|
|
9
|
+
const core_1 = require("@loopback/core");
|
|
10
10
|
const body_parsers_1 = require("../body-parsers");
|
|
11
11
|
const keys_1 = require("../keys");
|
|
12
12
|
const parser_1 = require("../parser");
|
|
@@ -15,27 +15,24 @@ const parser_1 = require("../parser");
|
|
|
15
15
|
*
|
|
16
16
|
* @returns The handler function that will parse request args.
|
|
17
17
|
*/
|
|
18
|
-
let ParseParamsProvider =
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
], ParseParamsProvider);
|
|
38
|
-
return ParseParamsProvider;
|
|
39
|
-
})();
|
|
18
|
+
let ParseParamsProvider = class ParseParamsProvider {
|
|
19
|
+
constructor(requestBodyParser, validationOptions = {}, ajvFactory) {
|
|
20
|
+
this.requestBodyParser = requestBodyParser;
|
|
21
|
+
this.validationOptions = validationOptions;
|
|
22
|
+
this.ajvFactory = ajvFactory;
|
|
23
|
+
}
|
|
24
|
+
value() {
|
|
25
|
+
return (request, route) => parser_1.parseOperationArgs(request, route, this.requestBodyParser, {
|
|
26
|
+
ajvFactory: this.ajvFactory,
|
|
27
|
+
...this.validationOptions,
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
};
|
|
31
|
+
ParseParamsProvider = tslib_1.__decorate([
|
|
32
|
+
tslib_1.__param(0, core_1.inject(keys_1.RestBindings.REQUEST_BODY_PARSER)),
|
|
33
|
+
tslib_1.__param(1, core_1.inject(keys_1.RestBindings.REQUEST_BODY_PARSER_OPTIONS.deepProperty('validation'), { optional: true })),
|
|
34
|
+
tslib_1.__param(2, core_1.inject(keys_1.RestBindings.AJV_FACTORY, { optional: true })),
|
|
35
|
+
tslib_1.__metadata("design:paramtypes", [body_parsers_1.RequestBodyParser, Object, Function])
|
|
36
|
+
], ParseParamsProvider);
|
|
40
37
|
exports.ParseParamsProvider = ParseParamsProvider;
|
|
41
38
|
//# sourceMappingURL=parse-params.provider.js.map
|