@tstdl/base 0.71.84 → 0.71.87
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/api/client/client.js +9 -5
- package/api/client/client.js.map +1 -1
- package/api/server/gateway.js +16 -7
- package/api/server/gateway.js.map +1 -1
- package/api/server/middlewares/allowed-methods.middleware.js +1 -1
- package/api/server/middlewares/allowed-methods.middleware.js.map +1 -1
- package/api/types.d.ts +2 -2
- package/http/server/http-server-response.d.ts +1 -0
- package/http/server/http-server-response.js +3 -0
- package/http/server/http-server-response.js.map +1 -1
- package/old-api/http-api.js +4 -4
- package/old-api/http-api.js.map +1 -1
- package/package.json +1 -1
- package/schema/schemas/object.d.ts +8 -1
- package/schema/schemas/object.js +29 -2
- package/schema/schemas/object.js.map +1 -1
- package/schema/schemas/union.d.ts +1 -1
- package/schema/schemas/union.js.map +1 -1
package/api/client/client.js
CHANGED
|
@@ -41,11 +41,7 @@ function compileClient(definition, options = {}) {
|
|
|
41
41
|
const fallbackMethod = methods.filter((method) => method != 'GET')[0] ?? 'GET';
|
|
42
42
|
const apiEndpointFunction = {
|
|
43
43
|
async [name](parameters) {
|
|
44
|
-
const responseType = (config.result
|
|
45
|
-
: (config.result instanceof schema_1.StringSchemaValidator) ? 'text'
|
|
46
|
-
: (config.result instanceof schema_1.Uint8ArraySchemaValidator) ? 'buffer'
|
|
47
|
-
: (config.result == undefined) ? 'none'
|
|
48
|
-
: 'json';
|
|
44
|
+
const responseType = convertApiEndpointResultToHttpBodyType(config.result);
|
|
49
45
|
const context = {
|
|
50
46
|
endpoint: config
|
|
51
47
|
};
|
|
@@ -71,6 +67,14 @@ function compileClient(definition, options = {}) {
|
|
|
71
67
|
return api;
|
|
72
68
|
}
|
|
73
69
|
exports.compileClient = compileClient;
|
|
70
|
+
function convertApiEndpointResultToHttpBodyType(result) {
|
|
71
|
+
return (result instanceof schema_1.AsyncIterableSchemaValidator) ? 'stream'
|
|
72
|
+
: (result instanceof schema_1.StringSchemaValidator) ? 'text'
|
|
73
|
+
: (result instanceof schema_1.LiteralSchemaValidator) ? ((typeof result.schema.value) == 'string') ? 'text' : 'json'
|
|
74
|
+
: (result instanceof schema_1.Uint8ArraySchemaValidator) ? 'buffer'
|
|
75
|
+
: (result == undefined) ? 'none'
|
|
76
|
+
: 'json';
|
|
77
|
+
}
|
|
74
78
|
async function getBody(response, schema) {
|
|
75
79
|
if ((0, type_guards_1.isUndefined)(schema)) {
|
|
76
80
|
return undefined;
|
package/api/client/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../source/api/client/client.ts"],"names":[],"mappings":";;;AACA,+CAA6D;AAE7D,8CAA8D;AAE9D,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../source/api/client/client.ts"],"names":[],"mappings":"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"}
|
package/api/server/gateway.js
CHANGED
|
@@ -156,13 +156,7 @@ let ApiGateway = ApiGateway_1 = class ApiGateway {
|
|
|
156
156
|
return response;
|
|
157
157
|
}
|
|
158
158
|
async getBody(request, schema) {
|
|
159
|
-
const body = (schema
|
|
160
|
-
? await request.bodyAsJson()
|
|
161
|
-
: (schema instanceof schema_1.StringSchemaValidator)
|
|
162
|
-
? await request.bodyAsText()
|
|
163
|
-
: (schema instanceof schema_1.Uint8ArraySchemaValidator)
|
|
164
|
-
? await request.bodyAsBytes()
|
|
165
|
-
: (0, helpers_1._throw)(new Error('invalid body schema'));
|
|
159
|
+
const body = await getRequestBody(schema, request);
|
|
166
160
|
if ((0, type_guards_1.isUndefined)(body)) {
|
|
167
161
|
return undefined;
|
|
168
162
|
}
|
|
@@ -178,4 +172,19 @@ ApiGateway = ApiGateway_1 = __decorate([
|
|
|
178
172
|
__metadata("design:paramtypes", [logger_1.Logger, Object])
|
|
179
173
|
], ApiGateway);
|
|
180
174
|
exports.ApiGateway = ApiGateway;
|
|
175
|
+
async function getRequestBody(schema, request) {
|
|
176
|
+
if (schema instanceof schema_1.ObjectSchemaValidator) {
|
|
177
|
+
return request.bodyAsJson();
|
|
178
|
+
}
|
|
179
|
+
if (schema instanceof schema_1.StringSchemaValidator) {
|
|
180
|
+
return request.bodyAsText();
|
|
181
|
+
}
|
|
182
|
+
if (schema instanceof schema_1.Uint8ArraySchemaValidator) {
|
|
183
|
+
return request.bodyAsBytes();
|
|
184
|
+
}
|
|
185
|
+
if (schema instanceof schema_1.UnionSchemaValidator) {
|
|
186
|
+
return getRequestBody(schema.innerSchemas[0], request);
|
|
187
|
+
}
|
|
188
|
+
throw new Error('invalid body schema');
|
|
189
|
+
}
|
|
181
190
|
//# sourceMappingURL=gateway.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../../source/api/server/gateway.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,+CAA+F;AAC/F,uCAA8E;AAE9E,8CAAmD;AAGnD,yCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../../source/api/server/gateway.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ async function allowedMethodsMiddleware(request, next, context) {
|
|
|
12
12
|
return next(request);
|
|
13
13
|
}
|
|
14
14
|
const allowMethods = [...context.api.endpoints.keys()].join(', ');
|
|
15
|
-
return
|
|
15
|
+
return server_1.HttpServerResponse.fromObject({
|
|
16
16
|
statusCode: 204,
|
|
17
17
|
statusMessage: 'No Content',
|
|
18
18
|
headers: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"allowed-methods.middleware.js","sourceRoot":"","sources":["../../../../source/api/server/middlewares/allowed-methods.middleware.ts"],"names":[],"mappings":";;;AAAA,sFAAyE;AAEzE,iDAAmD;AAEnD,4DAAkD;AAG3C,KAAK,UAAU,wBAAwB,CAAC,OAA0B,EAAE,IAAgE,EAAE,OAAoC;IAC/K,IAAI,OAAO,CAAC,MAAM,IAAI,SAAS,EAAE;QAC/B,IAAI,IAAA,yBAAW,EAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACjC,MAAM,IAAI,gDAAqB,CAAC,UAAU,OAAO,CAAC,MAAM,iBAAiB,OAAO,CAAC,GAAG,CAAC,QAAQ,gBAAgB,CAAC,CAAC;SAChH;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC;KACtB;IAED,MAAM,YAAY,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAElE,OAAO,
|
|
1
|
+
{"version":3,"file":"allowed-methods.middleware.js","sourceRoot":"","sources":["../../../../source/api/server/middlewares/allowed-methods.middleware.ts"],"names":[],"mappings":";;;AAAA,sFAAyE;AAEzE,iDAAmD;AAEnD,4DAAkD;AAG3C,KAAK,UAAU,wBAAwB,CAAC,OAA0B,EAAE,IAAgE,EAAE,OAAoC;IAC/K,IAAI,OAAO,CAAC,MAAM,IAAI,SAAS,EAAE;QAC/B,IAAI,IAAA,yBAAW,EAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACjC,MAAM,IAAI,gDAAqB,CAAC,UAAU,OAAO,CAAC,MAAM,iBAAiB,OAAO,CAAC,GAAG,CAAC,QAAQ,gBAAgB,CAAC,CAAC;SAChH;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC;KACtB;IAED,MAAM,YAAY,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAElE,OAAO,2BAAkB,CAAC,UAAU,CAAC;QACnC,UAAU,EAAE,GAAG;QACf,aAAa,EAAE,YAAY;QAC3B,OAAO,EAAE;YACP,KAAK,EAAE,YAAY;SACpB;KACF,CAAC,CAAC;AACL,CAAC;AAlBD,4DAkBC"}
|
package/api/types.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { HttpServerRequest, HttpServerResponse } from "../http/server";
|
|
2
2
|
import type { HttpMethod } from "../http/types";
|
|
3
|
-
import type { ObjectSchemaValidator, SchemaOutput, SchemaValidator, StringSchemaValidator, Uint8ArraySchemaValidator } from "../schema";
|
|
3
|
+
import type { ObjectSchemaDefinition, ObjectSchemaValidator, SchemaOutput, SchemaValidator, StringSchemaDefinition, StringSchemaValidator, Uint8ArraySchemaValidator, UnionSchemaValidator } from "../schema";
|
|
4
4
|
import type { NonUndefinable, OneOrMany, Record, ReturnTypeOrT } from "../types";
|
|
5
5
|
import type { ApiGatewayMiddlewareContext } from './server';
|
|
6
6
|
export declare const rootResource = "$";
|
|
@@ -19,7 +19,7 @@ export declare type EndpointRegistrationOptions = {
|
|
|
19
19
|
description?: string;
|
|
20
20
|
};
|
|
21
21
|
export declare type ApiEndpointMethod = HttpMethod;
|
|
22
|
-
export declare type ApiEndpointDefinitionBody = StringSchemaValidator | ObjectSchemaValidator<any> | Uint8ArraySchemaValidator
|
|
22
|
+
export declare type ApiEndpointDefinitionBody = StringSchemaValidator | ObjectSchemaValidator<any> | Uint8ArraySchemaValidator | UnionSchemaValidator<StringSchemaDefinition | ObjectSchemaDefinition<any>, (StringSchemaDefinition | ObjectSchemaDefinition<any>)[]>;
|
|
23
23
|
export declare type ApiEndpointDefinitionResult = SchemaValidator;
|
|
24
24
|
export declare type ApiEndpointDataProvider<T> = T | ((request: HttpServerRequest, context: ApiGatewayMiddlewareContext) => T | Promise<T>);
|
|
25
25
|
export declare type ApiEndpointDefinitionCors = {
|
|
@@ -9,6 +9,9 @@ class HttpServerResponse {
|
|
|
9
9
|
this.headers = new http_headers_1.HttpHeaders(response.headers);
|
|
10
10
|
this.body = response.body;
|
|
11
11
|
}
|
|
12
|
+
static fromObject(options) {
|
|
13
|
+
return new HttpServerResponse(options);
|
|
14
|
+
}
|
|
12
15
|
}
|
|
13
16
|
exports.HttpServerResponse = HttpServerResponse;
|
|
14
17
|
//# sourceMappingURL=http-server-response.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-server-response.js","sourceRoot":"","sources":["../../../source/http/server/http-server-response.ts"],"names":[],"mappings":";;;AAEA,kDAA8C;AAc9C,MAAa,kBAAkB;IAW7B,YAAY,WAAsC,EAAE;QAClD,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;QACtC,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;QAC5C,IAAI,CAAC,OAAO,GAAG,IAAI,0BAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC5B,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"http-server-response.js","sourceRoot":"","sources":["../../../source/http/server/http-server-response.ts"],"names":[],"mappings":";;;AAEA,kDAA8C;AAc9C,MAAa,kBAAkB;IAW7B,YAAY,WAAsC,EAAE;QAClD,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;QACtC,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;QAC5C,IAAI,CAAC,OAAO,GAAG,IAAI,0BAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,OAAmC;QACnD,OAAO,IAAI,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;CACF;AArBD,gDAqBC"}
|
package/old-api/http-api.js
CHANGED
|
@@ -31,19 +31,19 @@ function route(route) {
|
|
|
31
31
|
}
|
|
32
32
|
exports.route = route;
|
|
33
33
|
function getTextRouteHandler() {
|
|
34
|
-
return getSimpleRouteHandler((result) =>
|
|
34
|
+
return getSimpleRouteHandler((result) => server_1.HttpServerResponse.fromObject({ body: { text: result } }));
|
|
35
35
|
}
|
|
36
36
|
exports.getTextRouteHandler = getTextRouteHandler;
|
|
37
37
|
function getJsonRouteHandler() {
|
|
38
|
-
return getSimpleRouteHandler((result) =>
|
|
38
|
+
return getSimpleRouteHandler((result) => server_1.HttpServerResponse.fromObject({ body: { json: result } }));
|
|
39
39
|
}
|
|
40
40
|
exports.getJsonRouteHandler = getJsonRouteHandler;
|
|
41
41
|
function getBufferRouteHandler() {
|
|
42
|
-
return getSimpleRouteHandler((result) =>
|
|
42
|
+
return getSimpleRouteHandler((result) => server_1.HttpServerResponse.fromObject({ body: { buffer: result } }));
|
|
43
43
|
}
|
|
44
44
|
exports.getBufferRouteHandler = getBufferRouteHandler;
|
|
45
45
|
function getStreamRouteHandler() {
|
|
46
|
-
return getSimpleRouteHandler((result) =>
|
|
46
|
+
return getSimpleRouteHandler((result) => server_1.HttpServerResponse.fromObject({ body: { stream: result } }));
|
|
47
47
|
}
|
|
48
48
|
exports.getStreamRouteHandler = getStreamRouteHandler;
|
|
49
49
|
function getSimpleRouteHandler(handler) {
|
package/old-api/http-api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-api.js","sourceRoot":"","sources":["../../source/old-api/http-api.ts"],"names":[],"mappings":";;;AACA,8CAA0F;AAE1F,oCAA4F;AAE5F,kCAAgD;AAIhD,0CAAwC;AACxC,gDAA8C;AAC9C,wCAAqC;AAErC,iEAAgE;AAEhE,0CAAsC;AACtC,sDAA0D;AAC1D,yCAAyC;AAGzC,2BAA2B;AAE3B,2CAAuE;AAyBvE,SAAgB,WAAW,CACzB,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAA2L;IAElP,OAAO,KAAK,CACV;QACE,MAAM;QACN,IAAI;QACJ,QAAQ;QACR,mBAAmB;QACnB,OAAO,EAAE,mBAAmB,EAAE;QAC9B,sBAAsB,EAAE,gCAAgC,EAAE;QAC1D,QAAQ;KACT,CACF,CAAC;AACJ,CAAC;AAdD,kCAcC;AAED,wDAAwD;AACxD,SAAgB,KAAK,CAA0H,KAA6F;IAC1O,OAAO,KAAK,CAAC;AACf,CAAC;AAFD,sBAEC;AAQD,SAAgB,mBAAmB;IACjC,OAAO,qBAAqB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"http-api.js","sourceRoot":"","sources":["../../source/old-api/http-api.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { JsonPath } from "../../json-path";
|
|
2
|
-
import type {
|
|
2
|
+
import type { OneOrMany, Optionalize, SimplifyObject, StringMap } from "../../types";
|
|
3
|
+
import type { Simplify } from 'type-fest';
|
|
3
4
|
import type { DefinedValidationOptions, ValidationTestResult } from '../schema.validator';
|
|
4
5
|
import { SchemaValidator, test, testAsync } from '../schema.validator';
|
|
5
6
|
import type { Maskable, SchemaDefinition, SchemaOptions, SchemaOutput } from '../types';
|
|
@@ -15,13 +16,19 @@ export declare type ObjectSchemaDefinition<T extends StringMap<SchemaDefinition>
|
|
|
15
16
|
keepUnknown?: boolean;
|
|
16
17
|
};
|
|
17
18
|
export declare type ObjectAssign<A extends StringMap<SchemaDefinition>, B extends StringMap<SchemaDefinition>> = SimplifyObject<B & Omit<A, keyof B>>;
|
|
19
|
+
export declare type ObjectPick<T extends StringMap<SchemaDefinition>, K extends keyof T> = SimplifyObject<Pick<T, K>>;
|
|
20
|
+
export declare type ObjectExclude<T extends StringMap<SchemaDefinition>, K extends keyof T> = SimplifyObject<Omit<T, K>>;
|
|
18
21
|
export declare class ObjectSchemaValidator<T extends StringMap<SchemaDefinition>> extends SchemaValidator<ObjectSchemaDefinition<T>> {
|
|
19
22
|
private readonly validatorEntries;
|
|
20
23
|
constructor(validators: ObjectSchemaValidatorEntries<T>, schema: ObjectSchemaDefinition<T>);
|
|
21
24
|
static assign<A extends StringMap<SchemaDefinition>, B extends StringMap<SchemaDefinition>>(a: ObjectSchemaValidator<A>, b: ObjectSchemaValidator<B>): ObjectSchemaValidator<ObjectAssign<A, B>>;
|
|
25
|
+
static pick<T extends StringMap<SchemaDefinition>, K extends keyof T>(objectSchema: ObjectSchemaValidator<T>, keys: OneOrMany<K>): ObjectSchemaValidator<ObjectPick<T, K>>;
|
|
26
|
+
static exclude<T extends StringMap<SchemaDefinition>, K extends keyof T>(objectSchema: ObjectSchemaValidator<T>, keys: OneOrMany<K>): ObjectSchemaValidator<ObjectExclude<T, K>>;
|
|
22
27
|
[test](value: unknown, options: DefinedValidationOptions, path: JsonPath): ValidationTestResult<ObjectOutputType<T>>;
|
|
23
28
|
[testAsync](value: unknown, options: DefinedValidationOptions, path: JsonPath): Promise<ValidationTestResult<ObjectOutputType<T>>>;
|
|
24
29
|
private _testBase;
|
|
25
30
|
}
|
|
26
31
|
export declare function object<T extends StringMap<SchemaDefinition>>(entries: ObjectSchemaValidatorEntries<T>, options?: SchemaOptions<ObjectSchemaDefinition<T>, 'entries'>): ObjectSchemaValidator<T>;
|
|
27
32
|
export declare function assign<A extends StringMap<SchemaDefinition>, B extends StringMap<SchemaDefinition>>(a: ObjectSchemaValidator<A>, b: ObjectSchemaValidator<B>): ObjectSchemaValidator<ObjectAssign<A, B>>;
|
|
33
|
+
export declare function pick<T extends StringMap<SchemaDefinition>, K extends keyof T>(objectSchema: ObjectSchemaValidator<T>, keys: OneOrMany<K>): ObjectSchemaValidator<ObjectPick<T, K>>;
|
|
34
|
+
export declare function exclude<T extends StringMap<SchemaDefinition>, K extends keyof T>(objectSchema: ObjectSchemaValidator<T>, keys: OneOrMany<K>): ObjectSchemaValidator<ObjectExclude<T, K>>;
|
package/schema/schemas/object.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.assign = exports.object = exports.ObjectSchemaValidator = void 0;
|
|
3
|
+
exports.exclude = exports.pick = exports.assign = exports.object = exports.ObjectSchemaValidator = void 0;
|
|
4
|
+
const array_1 = require("../../utils/array/array");
|
|
4
5
|
const map_1 = require("../../utils/map");
|
|
5
6
|
const object_1 = require("../../utils/object/object");
|
|
6
7
|
const type_guards_1 = require("../../utils/type-guards");
|
|
@@ -13,13 +14,31 @@ class ObjectSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
13
14
|
this.validatorEntries = new Map((0, object_1.objectEntries)(validators));
|
|
14
15
|
}
|
|
15
16
|
static assign(a, b) {
|
|
16
|
-
const validatorEntries = Object.fromEntries([...a.validatorEntries
|
|
17
|
+
const validatorEntries = Object.fromEntries([...a.validatorEntries, ...b.validatorEntries]);
|
|
17
18
|
const schema = {
|
|
18
19
|
type: 'object',
|
|
19
20
|
entries: { ...a.schema.entries, ...b.schema.entries }
|
|
20
21
|
};
|
|
21
22
|
return new ObjectSchemaValidator(validatorEntries, schema);
|
|
22
23
|
}
|
|
24
|
+
static pick(objectSchema, keys) {
|
|
25
|
+
const keysArray = (0, array_1.toArray)(keys);
|
|
26
|
+
const validatorEntries = Object.fromEntries([...objectSchema.validatorEntries].filter(([key]) => keysArray.includes(key)));
|
|
27
|
+
const schema = {
|
|
28
|
+
type: 'object',
|
|
29
|
+
entries: Object.fromEntries([...Object.entries(objectSchema.schema.entries)].filter(([key]) => keysArray.includes(key)))
|
|
30
|
+
};
|
|
31
|
+
return new ObjectSchemaValidator(validatorEntries, schema);
|
|
32
|
+
}
|
|
33
|
+
static exclude(objectSchema, keys) {
|
|
34
|
+
const keysArray = (0, array_1.toArray)(keys);
|
|
35
|
+
const validatorEntries = Object.fromEntries([...objectSchema.validatorEntries].filter(([key]) => !keysArray.includes(key)));
|
|
36
|
+
const schema = {
|
|
37
|
+
type: 'object',
|
|
38
|
+
entries: Object.fromEntries([...Object.entries(objectSchema.schema.entries)].filter(([key]) => !keysArray.includes(key)))
|
|
39
|
+
};
|
|
40
|
+
return new ObjectSchemaValidator(validatorEntries, schema);
|
|
41
|
+
}
|
|
23
42
|
[schema_validator_1.test](value, options, path) {
|
|
24
43
|
const testBaseResult = this._testBase(value, options, path);
|
|
25
44
|
if (!testBaseResult.valid) {
|
|
@@ -91,4 +110,12 @@ function assign(a, b) {
|
|
|
91
110
|
return ObjectSchemaValidator.assign(a, b);
|
|
92
111
|
}
|
|
93
112
|
exports.assign = assign;
|
|
113
|
+
function pick(objectSchema, keys) {
|
|
114
|
+
return ObjectSchemaValidator.pick(objectSchema, keys);
|
|
115
|
+
}
|
|
116
|
+
exports.pick = pick;
|
|
117
|
+
function exclude(objectSchema, keys) {
|
|
118
|
+
return ObjectSchemaValidator.exclude(objectSchema, keys);
|
|
119
|
+
}
|
|
120
|
+
exports.exclude = exclude;
|
|
94
121
|
//# sourceMappingURL=object.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../source/schema/schemas/object.ts"],"names":[],"mappings":";;;AAEA,yCAA6C;AAC7C,sDAAsD;AACtD,yDAAgD;
|
|
1
|
+
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../source/schema/schemas/object.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,8 @@ export declare type UnionSchemaDefinition<A extends SchemaDefinition, B extends
|
|
|
8
8
|
schemas: [A, ...B];
|
|
9
9
|
};
|
|
10
10
|
export declare class UnionSchemaValidator<A extends SchemaDefinition, B extends SchemaDefinition[]> extends SchemaValidator<UnionSchemaDefinition<A, B>> {
|
|
11
|
-
private readonly innerSchemas;
|
|
12
11
|
private readonly innerSchemaTypesString;
|
|
12
|
+
readonly innerSchemas: [SchemaValidator<A>, ...SchemaValidator<B[number]>[]];
|
|
13
13
|
constructor(innerSchemas: [SchemaValidator<A>, ...SchemaValidator<B[number]>[]], schema: UnionSchemaDefinition<A, B>);
|
|
14
14
|
[test](value: unknown, options: DefinedValidationOptions, path: JsonPath): ValidationTestResult<UnionSchemaOutput<A, B>>;
|
|
15
15
|
protected [testAsync](value: unknown, options: DefinedValidationOptions, path: JsonPath): Promise<ValidationTestResult<UnionSchemaOutput<A, B>>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"union.js","sourceRoot":"","sources":["../../../source/schema/schemas/union.ts"],"names":[],"mappings":";;;AACA,kDAA8C;AAE9C,0DAAuE;AAEvE,oCAAwC;AASxC,MAAa,oBAA+E,SAAQ,kCAA4C;
|
|
1
|
+
{"version":3,"file":"union.js","sourceRoot":"","sources":["../../../source/schema/schemas/union.ts"],"names":[],"mappings":";;;AACA,kDAA8C;AAE9C,0DAAuE;AAEvE,oCAAwC;AASxC,MAAa,oBAA+E,SAAQ,kCAA4C;IAK9I,YAAY,YAAmE,EAAE,MAAmC;QAClH,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3G,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE;YACtC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAA0B,EAAE,OAAO,CAAC,CAAC;YAEhE,IAAI,MAAM,CAAC,KAAK,EAAE;gBAChB,OAAO,MAAM,CAAC;aACf;SACF;QAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,0BAAW,CAAC,mDAAmD,IAAI,CAAC,sBAAsB,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IAChJ,CAAC;IAES,KAAK,CAAC,CAAC,4BAAS,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QAC3F,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE;YACtC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,KAA0B,EAAE,OAAO,CAAC,CAAC;YAE3E,IAAI,MAAM,CAAC,KAAK,EAAE;gBAChB,OAAO,MAAM,CAAC;aACf;SACF;QAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,0BAAW,CAAC,mDAAmD,IAAI,CAAC,sBAAsB,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IAChJ,CAAC;CACF;AAnCD,oDAmCC;AAED,SAAgB,KAAK,CAAyD,OAAkB,EAAE,OAA6F;IAC7L,MAAM,MAAM,GAAG,IAAA,oBAAY,EAA4D;QACrF,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAuC;QAC/F,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AACnD,CAAC;AARD,sBAQC"}
|