@tstdl/base 0.71.60 → 0.71.63
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 +6 -7
- package/api/client/client.js.map +1 -1
- package/api/default-error-handlers.js +2 -4
- package/api/default-error-handlers.js.map +1 -1
- package/api/response.js +1 -2
- package/api/response.js.map +1 -1
- package/api/server/api-controller.js +2 -3
- package/api/server/api-controller.js.map +1 -1
- package/api/server/gateway.js +9 -12
- package/api/server/gateway.js.map +1 -1
- package/api/server/middlewares/cors.middleware.js +3 -4
- package/api/server/middlewares/cors.middleware.js.map +1 -1
- package/api/server/module.js +1 -2
- package/api/server/module.js.map +1 -1
- package/collections/sorted-map.js +1 -2
- package/collections/sorted-map.js.map +1 -1
- package/container/container.js +13 -17
- package/container/container.js.map +1 -1
- package/container/decorators.js +5 -17
- package/container/decorators.js.map +1 -1
- package/container/resolve-chain.js +1 -1
- package/container/resolve-chain.js.map +1 -1
- package/container/type-info.js +4 -5
- package/container/type-info.js.map +1 -1
- package/core.js +4 -5
- package/core.js.map +1 -1
- package/css/theme/theme.service.js +1 -2
- package/css/theme/theme.service.js.map +1 -1
- package/data-structures/circular-buffer.js +12 -27
- package/data-structures/circular-buffer.js.map +1 -1
- package/database/module.js +2 -3
- package/database/module.js.map +1 -1
- package/database/mongo/model/document.js +35 -26
- package/database/mongo/model/document.js.map +1 -1
- package/database/mongo/module.js +5 -18
- package/database/mongo/module.js.map +1 -1
- package/database/mongo/mongo-base.repository.js +16 -61
- package/database/mongo/mongo-base.repository.js.map +1 -1
- package/database/mongo/mongo-entity-repository.js +25 -98
- package/database/mongo/mongo-entity-repository.js.map +1 -1
- package/database/mongo/query-converter.js +7 -11
- package/database/mongo/query-converter.js.map +1 -1
- package/disposable/disposable.js +2 -2
- package/disposable/disposable.js.map +1 -1
- package/distributed-loop/distributed-loop.js +1 -2
- package/distributed-loop/distributed-loop.js.map +1 -1
- package/enumerable/async-enumerable.js +2 -2
- package/enumerable/async-enumerable.js.map +1 -1
- package/enumerable/enumerable.js +2 -2
- package/enumerable/enumerable.js.map +1 -1
- package/error/custom.error.js +1 -2
- package/error/custom.error.js.map +1 -1
- package/http/client/adapters/got-http-client.adapter.js +13 -42
- package/http/client/adapters/got-http-client.adapter.js.map +1 -1
- package/http/client/adapters/undici-http-client.adapter.js +6 -8
- package/http/client/adapters/undici-http-client.adapter.js.map +1 -1
- package/http/client/adapters/utils.js +2 -3
- package/http/client/adapters/utils.js.map +1 -1
- package/http/client/http-client-request.js +14 -16
- package/http/client/http-client-request.js.map +1 -1
- package/http/client/http-client.js +40 -78
- package/http/client/http-client.js.map +1 -1
- package/http/http-headers.js +1 -2
- package/http/http-headers.js.map +1 -1
- package/http/http-value-map.js +2 -4
- package/http/http-value-map.js.map +1 -1
- package/http/http.error.js +2 -3
- package/http/http.error.js.map +1 -1
- package/http/server/http-server-request.js +2 -3
- package/http/server/http-server-request.js.map +1 -1
- package/http/server/node/node-http-server.js +15 -61
- package/http/server/node/node-http-server.js.map +1 -1
- package/image-service/imgproxy/imgproxy-image-service.js +1 -1
- package/image-service/imgproxy/imgproxy-image-service.js.map +1 -1
- package/instance-provider.js +7 -8
- package/instance-provider.js.map +1 -1
- package/json-path/json-path.js +1 -2
- package/json-path/json-path.js.map +1 -1
- package/lock/mongo/lock.js +1 -1
- package/lock/mongo/lock.js.map +1 -1
- package/logger/console/logger.js +2 -6
- package/logger/console/logger.js.map +1 -1
- package/mail/clients/nodemailer.mail-client.js +1 -2
- package/mail/clients/nodemailer.mail-client.js.map +1 -1
- package/mail/mail.service.js +2 -3
- package/mail/mail.service.js.map +1 -1
- package/mail/repositories/mongo-mail-log.repository.js +1 -2
- package/mail/repositories/mongo-mail-log.repository.js.map +1 -1
- package/mail/template-providers/file-mail-template.provider.js +1 -2
- package/mail/template-providers/file-mail-template.provider.js.map +1 -1
- package/mail/template-renderers/mjml.mail-template-renderer.js +9 -6
- package/mail/template-renderers/mjml.mail-template-renderer.js.map +1 -1
- package/message-bus/broadcast-channel/broadcast-channel-message-bus.js +1 -2
- package/message-bus/broadcast-channel/broadcast-channel-message-bus.js.map +1 -1
- package/migration/migrator.js +1 -2
- package/migration/migrator.js.map +1 -1
- package/module/modules/old-web-server.module.js +2 -20
- package/module/modules/old-web-server.module.js.map +1 -1
- package/module/modules/web-server.module.js +3 -22
- package/module/modules/web-server.module.js.map +1 -1
- package/object-storage/object-storage.d.ts +5 -0
- package/object-storage/object-storage.js.map +1 -1
- package/object-storage/s3/s3.object-storage.d.ts +1 -0
- package/object-storage/s3/s3.object-storage.js +4 -0
- package/object-storage/s3/s3.object-storage.js.map +1 -1
- package/old-api/http-api.js +11 -24
- package/old-api/http-api.js.map +1 -1
- package/openid-connect/mongo-oidc-state.repository.js +2 -2
- package/openid-connect/mongo-oidc-state.repository.js.map +1 -1
- package/package.json +1 -1
- package/pdf/pdf.service.js +10 -11
- package/pdf/pdf.service.js.map +1 -1
- package/pool/pool.js +1 -2
- package/pool/pool.js.map +1 -1
- package/queue/enqueue-batch.js +1 -1
- package/queue/enqueue-batch.js.map +1 -1
- package/queue/mongo/mongo-job.repository.js +4 -15
- package/queue/mongo/mongo-job.repository.js.map +1 -1
- package/queue/mongo/queue.js +23 -69
- package/queue/mongo/queue.js.map +1 -1
- package/rxjs/intersection-observer.js +1 -12
- package/rxjs/intersection-observer.js.map +1 -1
- package/rxjs/mutation-observer.js +2 -14
- package/rxjs/mutation-observer.js.map +1 -1
- package/rxjs/resize-observer.js +2 -14
- package/rxjs/resize-observer.js.map +1 -1
- package/rxjs/slow-array.js +4 -8
- package/rxjs/slow-array.js.map +1 -1
- package/rxjs/timing.js +2 -2
- package/rxjs/timing.js.map +1 -1
- package/schema/schema.validator.js +4 -7
- package/schema/schema.validator.js.map +1 -1
- package/schema/schemas/any.js +4 -1
- package/schema/schemas/any.js.map +1 -1
- package/schema/schemas/array.js +5 -1
- package/schema/schemas/array.js.map +1 -1
- package/schema/schemas/async-iterable.js +5 -1
- package/schema/schemas/async-iterable.js.map +1 -1
- package/schema/schemas/boolean.js +5 -3
- package/schema/schemas/boolean.js.map +1 -1
- package/schema/schemas/date.js +5 -3
- package/schema/schemas/date.js.map +1 -1
- package/schema/schemas/defaulted.js +6 -1
- package/schema/schemas/defaulted.js.map +1 -1
- package/schema/schemas/enumeration.d.ts +1 -4
- package/schema/schemas/enumeration.js +6 -3
- package/schema/schemas/enumeration.js.map +1 -1
- package/schema/schemas/instance.js +5 -1
- package/schema/schemas/instance.js.map +1 -1
- package/schema/schemas/iterable.js +5 -1
- package/schema/schemas/iterable.js.map +1 -1
- package/schema/schemas/literal.js +5 -1
- package/schema/schemas/literal.js.map +1 -1
- package/schema/schemas/never.js +4 -1
- package/schema/schemas/never.js.map +1 -1
- package/schema/schemas/nullable.js +6 -3
- package/schema/schemas/nullable.js.map +1 -1
- package/schema/schemas/number.js +5 -3
- package/schema/schemas/number.js.map +1 -1
- package/schema/schemas/object.js +8 -4
- package/schema/schemas/object.js.map +1 -1
- package/schema/schemas/optional.js +6 -3
- package/schema/schemas/optional.js.map +1 -1
- package/schema/schemas/preprocess.js +6 -1
- package/schema/schemas/preprocess.js.map +1 -1
- package/schema/schemas/readable-stream.js +4 -1
- package/schema/schemas/readable-stream.js.map +1 -1
- package/schema/schemas/refine.js +6 -1
- package/schema/schemas/refine.js.map +1 -1
- package/schema/schemas/regexp.js +5 -3
- package/schema/schemas/regexp.js.map +1 -1
- package/schema/schemas/string.js +7 -6
- package/schema/schemas/string.js.map +1 -1
- package/schema/schemas/transform.js +6 -1
- package/schema/schemas/transform.js.map +1 -1
- package/schema/schemas/uint8-array.js +5 -3
- package/schema/schemas/uint8-array.js.map +1 -1
- package/schema/schemas/union.js +5 -1
- package/schema/schemas/union.js.map +1 -1
- package/schema/schemas/unknown.js +4 -1
- package/schema/schemas/unknown.js.map +1 -1
- package/search-index/elastic/module.js +2 -3
- package/search-index/elastic/module.js.map +1 -1
- package/search-index/elastic/search-index.js +11 -23
- package/search-index/elastic/search-index.js.map +1 -1
- package/search-index/elastic/sort-converter.js +2 -3
- package/search-index/elastic/sort-converter.js.map +1 -1
- package/search-index/memory/memory-search-index.js +1 -2
- package/search-index/memory/memory-search-index.js.map +1 -1
- package/search-index/search-index.js +8 -34
- package/search-index/search-index.js.map +1 -1
- package/serializer/serializable.js +3 -4
- package/serializer/serializable.js.map +1 -1
- package/serializer/serializer.js +1 -1
- package/serializer/serializer.js.map +1 -1
- package/tailwind/colors.js +1 -2
- package/tailwind/colors.js.map +1 -1
- package/templates/module.js +2 -2
- package/templates/module.js.map +1 -1
- package/templates/providers/file-template.provider.js +1 -2
- package/templates/providers/file-template.provider.js.map +1 -1
- package/templates/renderers/handlebars.template-renderer.js +1 -2
- package/templates/renderers/handlebars.template-renderer.js.map +1 -1
- package/templates/renderers/mjml.template-renderer.js +6 -3
- package/templates/renderers/mjml.template-renderer.js.map +1 -1
- package/tsconfig.json +1 -1
- package/types.d.ts +3 -0
- package/utils/async-iterable-helpers/all.js +6 -24
- package/utils/async-iterable-helpers/all.js.map +1 -1
- package/utils/async-iterable-helpers/any.js +6 -24
- package/utils/async-iterable-helpers/any.js.map +1 -1
- package/utils/async-iterable-helpers/assert.js +18 -52
- package/utils/async-iterable-helpers/assert.js.map +1 -1
- package/utils/async-iterable-helpers/batch.js +22 -56
- package/utils/async-iterable-helpers/batch.js.map +1 -1
- package/utils/async-iterable-helpers/buffer.js +39 -82
- package/utils/async-iterable-helpers/buffer.js.map +1 -1
- package/utils/async-iterable-helpers/concat.js +3 -29
- package/utils/async-iterable-helpers/concat.js.map +1 -1
- package/utils/async-iterable-helpers/default-if-empty.js +9 -41
- package/utils/async-iterable-helpers/default-if-empty.js.map +1 -1
- package/utils/async-iterable-helpers/deferred.js +3 -29
- package/utils/async-iterable-helpers/deferred.js.map +1 -1
- package/utils/async-iterable-helpers/distinct.js +20 -54
- package/utils/async-iterable-helpers/distinct.js.map +1 -1
- package/utils/async-iterable-helpers/drain.js +2 -19
- package/utils/async-iterable-helpers/drain.js.map +1 -1
- package/utils/async-iterable-helpers/filter.js +19 -53
- package/utils/async-iterable-helpers/filter.js.map +1 -1
- package/utils/async-iterable-helpers/first-or-default.js +3 -21
- package/utils/async-iterable-helpers/first-or-default.js.map +1 -1
- package/utils/async-iterable-helpers/first.js +3 -21
- package/utils/async-iterable-helpers/first.js.map +1 -1
- package/utils/async-iterable-helpers/for-each.js +4 -22
- package/utils/async-iterable-helpers/for-each.js.map +1 -1
- package/utils/async-iterable-helpers/group-single.js +2 -28
- package/utils/async-iterable-helpers/group-single.js.map +1 -1
- package/utils/async-iterable-helpers/group-to-map.js +3 -21
- package/utils/async-iterable-helpers/group-to-map.js.map +1 -1
- package/utils/async-iterable-helpers/group-to-single-map.js +5 -23
- package/utils/async-iterable-helpers/group-to-single-map.js.map +1 -1
- package/utils/async-iterable-helpers/group.js +2 -28
- package/utils/async-iterable-helpers/group.js.map +1 -1
- package/utils/async-iterable-helpers/interrupt.js +17 -62
- package/utils/async-iterable-helpers/interrupt.js.map +1 -1
- package/utils/async-iterable-helpers/last-or-default.js +3 -21
- package/utils/async-iterable-helpers/last-or-default.js.map +1 -1
- package/utils/async-iterable-helpers/last.js +3 -21
- package/utils/async-iterable-helpers/last.js.map +1 -1
- package/utils/async-iterable-helpers/map-many.js +16 -55
- package/utils/async-iterable-helpers/map-many.js.map +1 -1
- package/utils/async-iterable-helpers/map.js +16 -50
- package/utils/async-iterable-helpers/map.js.map +1 -1
- package/utils/async-iterable-helpers/materialize.js +4 -32
- package/utils/async-iterable-helpers/materialize.js.map +1 -1
- package/utils/async-iterable-helpers/metadata.js +32 -66
- package/utils/async-iterable-helpers/metadata.js.map +1 -1
- package/utils/async-iterable-helpers/multiplex.js +3 -21
- package/utils/async-iterable-helpers/multiplex.js.map +1 -1
- package/utils/async-iterable-helpers/observable-iterable.js +27 -41
- package/utils/async-iterable-helpers/observable-iterable.js.map +1 -1
- package/utils/async-iterable-helpers/pairwise.js +21 -55
- package/utils/async-iterable-helpers/pairwise.js.map +1 -1
- package/utils/async-iterable-helpers/parallel/feed.js +21 -47
- package/utils/async-iterable-helpers/parallel/feed.js.map +1 -1
- package/utils/async-iterable-helpers/parallel/for-each.js +8 -26
- package/utils/async-iterable-helpers/parallel/for-each.js.map +1 -1
- package/utils/async-iterable-helpers/reduce.js +8 -26
- package/utils/async-iterable-helpers/reduce.js.map +1 -1
- package/utils/async-iterable-helpers/retry.js +38 -72
- package/utils/async-iterable-helpers/retry.js.map +1 -1
- package/utils/async-iterable-helpers/single-or-default.js +10 -28
- package/utils/async-iterable-helpers/single-or-default.js.map +1 -1
- package/utils/async-iterable-helpers/single.js +10 -28
- package/utils/async-iterable-helpers/single.js.map +1 -1
- package/utils/async-iterable-helpers/take-until.js +26 -43
- package/utils/async-iterable-helpers/take-until.js.map +1 -1
- package/utils/async-iterable-helpers/take-while.js +25 -59
- package/utils/async-iterable-helpers/take-while.js.map +1 -1
- package/utils/async-iterable-helpers/take.js +10 -42
- package/utils/async-iterable-helpers/take.js.map +1 -1
- package/utils/async-iterable-helpers/tap.js +16 -50
- package/utils/async-iterable-helpers/tap.js.map +1 -1
- package/utils/async-iterable-helpers/throttle.js +8 -40
- package/utils/async-iterable-helpers/throttle.js.map +1 -1
- package/utils/async-iterable-helpers/to-array.js +2 -20
- package/utils/async-iterable-helpers/to-array.js.map +1 -1
- package/utils/async-iterable-helpers/to-async-iterable-iterator.js +36 -68
- package/utils/async-iterable-helpers/to-async-iterable-iterator.js.map +1 -1
- package/utils/async-iterable-helpers/while.js +21 -55
- package/utils/async-iterable-helpers/while.js.map +1 -1
- package/utils/async-iterator-iterable-iterator.js +20 -34
- package/utils/async-iterator-iterable-iterator.js.map +1 -1
- package/utils/backoff.js +22 -38
- package/utils/backoff.js.map +1 -1
- package/utils/base64.js +2 -2
- package/utils/base64.js.map +1 -1
- package/utils/binary-search.js +2 -3
- package/utils/binary-search.js.map +1 -1
- package/utils/binary.js +1 -1
- package/utils/binary.js.map +1 -1
- package/utils/cancellation-token.js +1 -1
- package/utils/cancellation-token.js.map +1 -1
- package/utils/cryptography.js +8 -9
- package/utils/cryptography.js.map +1 -1
- package/utils/date-time.js +6 -7
- package/utils/date-time.js.map +1 -1
- package/utils/enum.d.ts +5 -4
- package/utils/enum.js +6 -1
- package/utils/enum.js.map +1 -1
- package/utils/equals.js +2 -3
- package/utils/equals.js.map +1 -1
- package/utils/factory-map.js +1 -1
- package/utils/factory-map.js.map +1 -1
- package/utils/feedable-async-iterable.js +8 -40
- package/utils/feedable-async-iterable.js.map +1 -1
- package/utils/helpers.js +8 -20
- package/utils/helpers.js.map +1 -1
- package/utils/image.js +1 -1
- package/utils/image.js.map +1 -1
- package/utils/object/forward-ref.js +5 -6
- package/utils/object/forward-ref.js.map +1 -1
- package/utils/object/lazy-property.js +1 -1
- package/utils/object/lazy-property.js.map +1 -1
- package/utils/object/merge.js +1 -1
- package/utils/object/merge.js.map +1 -1
- package/utils/object/property-name.js +3 -5
- package/utils/object/property-name.js.map +1 -1
- package/utils/patch-worker.js +6 -7
- package/utils/patch-worker.js.map +1 -1
- package/utils/provider-function-iterable.js +12 -26
- package/utils/provider-function-iterable.js.map +1 -1
- package/utils/random.js +1 -1
- package/utils/random.js.map +1 -1
- package/utils/stream/async-iterable-readable.js +2 -3
- package/utils/stream/async-iterable-readable.js.map +1 -1
- package/utils/stream/stream-reader.js +10 -38
- package/utils/stream/stream-reader.js.map +1 -1
- package/utils/type-guards.js +1 -1
- package/utils/type-guards.js.map +1 -1
- package/utils/type-of.js +1 -2
- package/utils/type-of.js.map +1 -1
- package/utils/url-builder.js +1 -13
- package/utils/url-builder.js.map +1 -1
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
import type { JsonPath } from "../../json-path";
|
|
2
|
-
import type {
|
|
2
|
+
import type { Enumeration, EnumerationArray } from "../../types";
|
|
3
3
|
import type { EnumValue } from "../../utils/enum";
|
|
4
4
|
import type { DefinedValidationOptions, ValidationTestResult } from '../schema.validator';
|
|
5
5
|
import { SchemaValidator, test } from '../schema.validator';
|
|
6
6
|
import type { Coercible, SchemaDefinition, SchemaOptions, SchemaOutput } from '../types';
|
|
7
|
-
export declare type EnumerationArray = readonly [string | number, ...(string | number)[]];
|
|
8
|
-
export declare type EnumerationObject = StringMap<string | number>;
|
|
9
|
-
export declare type Enumeration = EnumerationArray | EnumerationObject;
|
|
10
7
|
export declare type EnumerationSchemaOutput<T extends Enumeration> = T extends EnumerationArray ? T[number] : EnumValue<T>;
|
|
11
8
|
export declare type EnumerationSchemaDefinition<T extends Enumeration = Enumeration> = SchemaDefinition<'enumeration', unknown, EnumerationSchemaOutput<T>> & Coercible & {
|
|
12
9
|
values: T;
|
|
@@ -17,11 +17,10 @@ class EnumerationSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
17
17
|
(0, lazy_property_1.lazyProperty)(this, 'valuesCommaSeparated', () => this.values.map((value) => (stringifyEnumerationValue(value))).join(', '));
|
|
18
18
|
}
|
|
19
19
|
[schema_validator_1.test](value, options, path) {
|
|
20
|
-
var _a;
|
|
21
20
|
if (this.valuesSet.has(value)) {
|
|
22
21
|
return { valid: true, value: value };
|
|
23
22
|
}
|
|
24
|
-
if (
|
|
23
|
+
if (this.schema.coerce ?? options.coerce) {
|
|
25
24
|
let coercedValue;
|
|
26
25
|
switch (typeof value) {
|
|
27
26
|
case 'number':
|
|
@@ -43,7 +42,11 @@ class EnumerationSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
43
42
|
}
|
|
44
43
|
exports.EnumerationSchemaValidator = EnumerationSchemaValidator;
|
|
45
44
|
function enumeration(values, options) {
|
|
46
|
-
const schema = (0, types_1.schemaHelper)(
|
|
45
|
+
const schema = (0, types_1.schemaHelper)({
|
|
46
|
+
type: 'enumeration',
|
|
47
|
+
values,
|
|
48
|
+
...options
|
|
49
|
+
});
|
|
47
50
|
return new EnumerationSchemaValidator(values, schema);
|
|
48
51
|
}
|
|
49
52
|
exports.enumeration = enumeration;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enumeration.js","sourceRoot":"","sources":["../../../source/schema/schemas/enumeration.ts"],"names":[],"mappings":";;;AAGA,2CAA0C;AAC1C,oEAA4D;AAC5D,mDAAiD;AACjD,yDAAkE;AAClE,iDAAyC;AACzC,kDAA8C;AAE9C,0DAA4D;AAE5D,oCAAwC;
|
|
1
|
+
{"version":3,"file":"enumeration.js","sourceRoot":"","sources":["../../../source/schema/schemas/enumeration.ts"],"names":[],"mappings":";;;AAGA,2CAA0C;AAC1C,oEAA4D;AAC5D,mDAAiD;AACjD,yDAAkE;AAClE,iDAAyC;AACzC,kDAA8C;AAE9C,0DAA4D;AAE5D,oCAAwC;AAQxC,MAAa,0BAAkD,SAAQ,kCAA+C;IAMpH,YAAY,YAAe,EAAE,MAAsC;QACjE,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,MAAM,GAAG,IAAA,qBAAO,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAgC,CAAC,CAAC,CAAC,IAAA,iBAAU,EAAC,YAAY,CAAC,CAAC;QAClG,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEtC,IAAA,4BAAY,EAAC,IAAqC,EAAE,sBAAsB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/J,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAwB,CAAC,EAAE;YAChD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAmC,EAAE,CAAC;SACpE;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,EAAE;YACxC,IAAI,YAAyC,CAAC;YAE9C,QAAQ,OAAO,KAAK,EAAE;gBACpB,KAAK,QAAQ;oBACX,YAAY,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;oBAChC,MAAM;gBAER,KAAK,QAAQ;oBACX,YAAY,GAAG,wBAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;oBACrE,MAAM;gBAER;oBACE,YAAY,GAAG,SAAS,CAAC;oBACzB,MAAM;aACT;YAED,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAa,CAAC,EAAE;gBACrC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,YAA0C,EAAE,CAAC;aAC3E;SACF;QAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,0BAAW,CAAC,cAAc,CAAC,WAAW,IAAI,CAAC,oBAAoB,GAAG,EAAE,yBAAyB,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;IAC9I,CAAC;CACF;AA5CD,gEA4CC;AAED,SAAgB,WAAW,CAAwB,MAAS,EAAE,OAA8D;IAC1H,MAAM,MAAM,GAAG,IAAA,oBAAY,EAAiC;QAC1D,IAAI,EAAE,aAAa;QACnB,MAAM;QACN,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,0BAA0B,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACxD,CAAC;AARD,kCAQC;AAED,SAAS,yBAAyB,CAAC,KAAU;IAC3C,OAAO,IAAA,sBAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG;QACnC,CAAC,CAAC,IAAA,sBAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE;YAClC,CAAC,CAAC,IAAA,gBAAM,EAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
|
|
@@ -15,7 +15,11 @@ class InstanceSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
15
15
|
}
|
|
16
16
|
exports.InstanceSchemaValidator = InstanceSchemaValidator;
|
|
17
17
|
function instance(constructor, options) {
|
|
18
|
-
const schema = (0, types_1.schemaHelper)(
|
|
18
|
+
const schema = (0, types_1.schemaHelper)({
|
|
19
|
+
type: 'instance',
|
|
20
|
+
constructor,
|
|
21
|
+
...options
|
|
22
|
+
});
|
|
19
23
|
return new InstanceSchemaValidator(schema);
|
|
20
24
|
}
|
|
21
25
|
exports.instance = instance;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance.js","sourceRoot":"","sources":["../../../source/schema/schemas/instance.ts"],"names":[],"mappings":";;;AAEA,iDAAyC;AACzC,kDAA8C;AAE9C,0DAA4D;AAE5D,oCAAwC;AAMxC,MAAa,uBAA2B,SAAQ,kCAA4C;IAC1F,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,QAAkC,EAAE,IAAc;QACvE,IAAI,KAAK,YAAY,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YAC5C,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAU,EAAE,CAAC;SAC3C;QAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,0BAAW,CAAC,cAAc,CAAC,eAAe,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,IAAA,gBAAM,EAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;IACjI,CAAC;CACF;AARD,0DAQC;AAED,SAAgB,QAAQ,CAAI,WAAoB,EAAE,OAAmE;IACnH,MAAM,MAAM,GAAG,IAAA,oBAAY,
|
|
1
|
+
{"version":3,"file":"instance.js","sourceRoot":"","sources":["../../../source/schema/schemas/instance.ts"],"names":[],"mappings":";;;AAEA,iDAAyC;AACzC,kDAA8C;AAE9C,0DAA4D;AAE5D,oCAAwC;AAMxC,MAAa,uBAA2B,SAAQ,kCAA4C;IAC1F,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,QAAkC,EAAE,IAAc;QACvE,IAAI,KAAK,YAAY,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YAC5C,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAU,EAAE,CAAC;SAC3C;QAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,0BAAW,CAAC,cAAc,CAAC,eAAe,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,IAAA,gBAAM,EAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;IACjI,CAAC;CACF;AARD,0DAQC;AAED,SAAgB,QAAQ,CAAI,WAAoB,EAAE,OAAmE;IACnH,MAAM,MAAM,GAAG,IAAA,oBAAY,EAA8B;QACvD,IAAI,EAAE,UAAU;QAChB,WAAW;QACX,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,uBAAuB,CAAC,MAAM,CAAC,CAAC;AAC7C,CAAC;AARD,4BAQC"}
|
|
@@ -29,7 +29,11 @@ class IterableSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
29
29
|
}
|
|
30
30
|
exports.IterableSchemaValidator = IterableSchemaValidator;
|
|
31
31
|
function iterable(schemaValidator, options) {
|
|
32
|
-
const schema = (0, types_1.schemaHelper)(
|
|
32
|
+
const schema = (0, types_1.schemaHelper)({
|
|
33
|
+
type: 'iterable',
|
|
34
|
+
schema: schemaValidator.schema,
|
|
35
|
+
...options
|
|
36
|
+
});
|
|
33
37
|
return new IterableSchemaValidator(schemaValidator, schema);
|
|
34
38
|
}
|
|
35
39
|
exports.iterable = iterable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iterable.js","sourceRoot":"","sources":["../../../source/schema/schemas/iterable.ts"],"names":[],"mappings":";;;AACA,0EAAkE;AAClE,0DAAmD;AACnD,iDAAyC;AACzC,kDAA8C;AAE9C,0DAA4D;AAE5D,oCAAwC;AAMxC,MAAa,uBAAoD,SAAQ,kCAA4C;IAGnH,YAAY,cAAkC,EAAE,MAAmC;QACjF,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,IAAI,CAAC,IAAA,wBAAU,EAAC,KAAK,CAAC,EAAE;YACtB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,0BAAW,CAAC,cAAc,CAAC,UAAU,EAAE,IAAA,gBAAM,EAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;SAC7F;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAE3C,MAAM,iBAAiB,GAAG,IAAA,SAAG,EAAC,KAAkC,EAAE,CAAC,UAAU,EAAE,EAAE;YAC/E,MAAM,UAAU,GAAG,cAAc,CAAC,uBAAI,CAAC,CAAC,UAA4B,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;YAEvG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE;gBACrB,MAAM,UAAU,CAAC,KAAK,CAAC;aACxB;YAED,OAAO,UAAU,CAAC,KAAK,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC;IACnD,CAAC;CACF;AA5BD,0DA4BC;AAED,SAAgB,QAAQ,CAA6B,eAAmC,EAAE,OAA8D;IACtJ,MAAM,MAAM,GAAG,IAAA,oBAAY,
|
|
1
|
+
{"version":3,"file":"iterable.js","sourceRoot":"","sources":["../../../source/schema/schemas/iterable.ts"],"names":[],"mappings":";;;AACA,0EAAkE;AAClE,0DAAmD;AACnD,iDAAyC;AACzC,kDAA8C;AAE9C,0DAA4D;AAE5D,oCAAwC;AAMxC,MAAa,uBAAoD,SAAQ,kCAA4C;IAGnH,YAAY,cAAkC,EAAE,MAAmC;QACjF,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,IAAI,CAAC,IAAA,wBAAU,EAAC,KAAK,CAAC,EAAE;YACtB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,0BAAW,CAAC,cAAc,CAAC,UAAU,EAAE,IAAA,gBAAM,EAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;SAC7F;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAE3C,MAAM,iBAAiB,GAAG,IAAA,SAAG,EAAC,KAAkC,EAAE,CAAC,UAAU,EAAE,EAAE;YAC/E,MAAM,UAAU,GAAG,cAAc,CAAC,uBAAI,CAAC,CAAC,UAA4B,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;YAEvG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE;gBACrB,MAAM,UAAU,CAAC,KAAK,CAAC;aACxB;YAED,OAAO,UAAU,CAAC,KAAK,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC;IACnD,CAAC;CACF;AA5BD,0DA4BC;AAED,SAAgB,QAAQ,CAA6B,eAAmC,EAAE,OAA8D;IACtJ,MAAM,MAAM,GAAG,IAAA,oBAAY,EAA8B;QACvD,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,eAAe,CAAC,MAAM;QAC9B,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,uBAAuB,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;AAC9D,CAAC;AARD,4BAQC"}
|
|
@@ -14,7 +14,11 @@ class LiteralSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
14
14
|
}
|
|
15
15
|
exports.LiteralSchemaValidator = LiteralSchemaValidator;
|
|
16
16
|
function literal(value, options) {
|
|
17
|
-
const schema = (0, types_1.schemaHelper)(
|
|
17
|
+
const schema = (0, types_1.schemaHelper)({
|
|
18
|
+
type: 'literal',
|
|
19
|
+
value,
|
|
20
|
+
...options
|
|
21
|
+
});
|
|
18
22
|
return new LiteralSchemaValidator(schema);
|
|
19
23
|
}
|
|
20
24
|
exports.literal = literal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"literal.js","sourceRoot":"","sources":["../../../source/schema/schemas/literal.ts"],"names":[],"mappings":";;;AACA,kDAA8C;AAE9C,0DAA4D;AAE5D,oCAAwC;AAMxC,MAAa,sBAA0B,SAAQ,kCAA2C;IACxF,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,QAAkC,EAAE,IAAc;QACvE,IAAI,KAAK,KAAK,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YAC/B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAU,EAAE,CAAC;SAC3C;QAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,0BAAW,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;IAC7G,CAAC;CACF;AARD,wDAQC;AAED,SAAgB,OAAO,CAAI,KAAQ,EAAE,OAA4D;IAC/F,MAAM,MAAM,GAAG,IAAA,oBAAY,
|
|
1
|
+
{"version":3,"file":"literal.js","sourceRoot":"","sources":["../../../source/schema/schemas/literal.ts"],"names":[],"mappings":";;;AACA,kDAA8C;AAE9C,0DAA4D;AAE5D,oCAAwC;AAMxC,MAAa,sBAA0B,SAAQ,kCAA2C;IACxF,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,QAAkC,EAAE,IAAc;QACvE,IAAI,KAAK,KAAK,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YAC/B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAU,EAAE,CAAC;SAC3C;QAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,0BAAW,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;IAC7G,CAAC;CACF;AARD,wDAQC;AAED,SAAgB,OAAO,CAAI,KAAQ,EAAE,OAA4D;IAC/F,MAAM,MAAM,GAAG,IAAA,oBAAY,EAA6B;QACtD,IAAI,EAAE,SAAS;QACf,KAAK;QACL,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,sBAAsB,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC;AARD,0BAQC"}
|
package/schema/schemas/never.js
CHANGED
|
@@ -12,7 +12,10 @@ class NeverSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
12
12
|
}
|
|
13
13
|
exports.NeverSchemaValidator = NeverSchemaValidator;
|
|
14
14
|
function never(options) {
|
|
15
|
-
const schema = (0, types_1.schemaHelper)(
|
|
15
|
+
const schema = (0, types_1.schemaHelper)({
|
|
16
|
+
type: 'never',
|
|
17
|
+
...options
|
|
18
|
+
});
|
|
16
19
|
return new NeverSchemaValidator(schema);
|
|
17
20
|
}
|
|
18
21
|
exports.never = never;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"never.js","sourceRoot":"","sources":["../../../source/schema/schemas/never.ts"],"names":[],"mappings":";;;AACA,iDAAyC;AACzC,kDAA8C;AAE9C,0DAA4D;AAE5D,oCAAwC;AAIxC,MAAa,oBAAqB,SAAQ,kCAAsC;IAC9E,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,QAAkC,EAAE,IAAc;QACvE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,0BAAW,CAAC,cAAc,CAAC,OAAO,EAAE,IAAA,gBAAM,EAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;IAC3F,CAAC;CACF;AAJD,oDAIC;AAED,SAAgB,KAAK,CAAC,OAA8C;IAClE,MAAM,MAAM,GAAG,IAAA,oBAAY,
|
|
1
|
+
{"version":3,"file":"never.js","sourceRoot":"","sources":["../../../source/schema/schemas/never.ts"],"names":[],"mappings":";;;AACA,iDAAyC;AACzC,kDAA8C;AAE9C,0DAA4D;AAE5D,oCAAwC;AAIxC,MAAa,oBAAqB,SAAQ,kCAAsC;IAC9E,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,QAAkC,EAAE,IAAc;QACvE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,0BAAW,CAAC,cAAc,CAAC,OAAO,EAAE,IAAA,gBAAM,EAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;IAC3F,CAAC;CACF;AAJD,oDAIC;AAED,SAAgB,KAAK,CAAC,OAA8C;IAClE,MAAM,MAAM,GAAG,IAAA,oBAAY,EAAwB;QACjD,IAAI,EAAE,OAAO;QACb,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,oBAAoB,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC;AAPD,sBAOC"}
|
|
@@ -10,11 +10,10 @@ class NullableSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
10
10
|
this.innerValidator = innerValidator;
|
|
11
11
|
}
|
|
12
12
|
[schema_validator_1.test](value, options, path) {
|
|
13
|
-
var _a;
|
|
14
13
|
if ((0, type_guards_1.isNull)(value)) {
|
|
15
14
|
return { valid: true, value };
|
|
16
15
|
}
|
|
17
|
-
if ((
|
|
16
|
+
if ((this.schema.coerce ?? options.coerce) && (0, type_guards_1.isUndefined)(value)) {
|
|
18
17
|
return { valid: true, value: null };
|
|
19
18
|
}
|
|
20
19
|
return this.innerValidator[schema_validator_1.test](value, options, path);
|
|
@@ -22,7 +21,11 @@ class NullableSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
22
21
|
}
|
|
23
22
|
exports.NullableSchemaValidator = NullableSchemaValidator;
|
|
24
23
|
function nullable(innerValidator, options) {
|
|
25
|
-
const schema = (0, types_1.schemaHelper)(
|
|
24
|
+
const schema = (0, types_1.schemaHelper)({
|
|
25
|
+
type: 'nullable',
|
|
26
|
+
schema: innerValidator.schema,
|
|
27
|
+
...options
|
|
28
|
+
});
|
|
26
29
|
return new NullableSchemaValidator(innerValidator, schema);
|
|
27
30
|
}
|
|
28
31
|
exports.nullable = nullable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nullable.js","sourceRoot":"","sources":["../../../source/schema/schemas/nullable.ts"],"names":[],"mappings":";;;AACA,yDAA0D;AAE1D,0DAA4D;AAE5D,oCAAwC;AAMxC,MAAa,uBAAoD,SAAQ,kCAA4C;IAGnH,YAAY,cAAkC,EAAE,MAAmC;QACjF,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc
|
|
1
|
+
{"version":3,"file":"nullable.js","sourceRoot":"","sources":["../../../source/schema/schemas/nullable.ts"],"names":[],"mappings":";;;AACA,yDAA0D;AAE1D,0DAA4D;AAE5D,oCAAwC;AAMxC,MAAa,uBAAoD,SAAQ,kCAA4C;IAGnH,YAAY,cAAkC,EAAE,MAAmC;QACjF,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,IAAI,IAAA,oBAAM,EAAC,KAAK,CAAC,EAAE;YACjB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;SAC/B;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,IAAA,yBAAW,EAAC,KAAK,CAAC,EAAE;YAChE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;SACrC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,uBAAI,CAAC,CAAC,KAAuB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3E,CAAC;CACF;AApBD,0DAoBC;AAED,SAAgB,QAAQ,CAA6B,cAAkC,EAAE,OAA8D;IACrJ,MAAM,MAAM,GAAG,IAAA,oBAAY,EAA8B;QACvD,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,cAAc,CAAC,MAAM;QAC7B,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,uBAAuB,CAAI,cAAc,EAAE,MAAM,CAAC,CAAC;AAChE,CAAC;AARD,4BAQC"}
|
package/schema/schemas/number.js
CHANGED
|
@@ -26,8 +26,7 @@ const coercerMap = {
|
|
|
26
26
|
};
|
|
27
27
|
class NumberSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
28
28
|
[schema_validator_1.test](value, options, path) {
|
|
29
|
-
|
|
30
|
-
const result = super.ensureType('number', value, path, { coerce: (_a = this.schema.coerce) !== null && _a !== void 0 ? _a : options.coerce }, coercerMap);
|
|
29
|
+
const result = super.ensureType('number', value, path, { coerce: this.schema.coerce ?? options.coerce }, coercerMap);
|
|
31
30
|
if (!result.valid) {
|
|
32
31
|
return result;
|
|
33
32
|
}
|
|
@@ -45,7 +44,10 @@ class NumberSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
45
44
|
}
|
|
46
45
|
exports.NumberSchemaValidator = NumberSchemaValidator;
|
|
47
46
|
function number(options) {
|
|
48
|
-
const schema = (0, types_1.schemaHelper)(
|
|
47
|
+
const schema = (0, types_1.schemaHelper)({
|
|
48
|
+
type: 'number',
|
|
49
|
+
...options
|
|
50
|
+
});
|
|
49
51
|
return new NumberSchemaValidator(schema);
|
|
50
52
|
}
|
|
51
53
|
exports.number = number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"number.js","sourceRoot":"","sources":["../../../source/schema/schemas/number.ts"],"names":[],"mappings":";;;AACA,mDAAiD;AACjD,yDAAgD;AAChD,kDAA2D;AAE3D,0DAA4D;AAE5D,oCAAwC;AAExC,MAAM,UAAU,GAAuB;IACrC,MAAM,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QACvB,MAAM,cAAc,GAAG,wBAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QAEnC,IAAI,CAAC,cAAc,IAAI,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YAChD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,0BAAW,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE,CAAC;SACxG;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAC7C,CAAC;IACD,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;IAC/D,MAAM,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QACvB,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QAEnC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YACjC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,0BAAW,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,qBAAqB,EAAE,IAAI,CAAC,EAAE,CAAC;SAC7G;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAC7C,CAAC;CACF,CAAC;AAaF,MAAa,qBAAsB,SAAQ,kCAAuC;IAChF,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc
|
|
1
|
+
{"version":3,"file":"number.js","sourceRoot":"","sources":["../../../source/schema/schemas/number.ts"],"names":[],"mappings":";;;AACA,mDAAiD;AACjD,yDAAgD;AAChD,kDAA2D;AAE3D,0DAA4D;AAE5D,oCAAwC;AAExC,MAAM,UAAU,GAAuB;IACrC,MAAM,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QACvB,MAAM,cAAc,GAAG,wBAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QAEnC,IAAI,CAAC,cAAc,IAAI,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YAChD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,0BAAW,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE,CAAC;SACxG;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAC7C,CAAC;IACD,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;IAC/D,MAAM,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QACvB,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QAEnC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YACjC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,0BAAW,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,qBAAqB,EAAE,IAAI,CAAC,EAAE,CAAC;SAC7G;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAC7C,CAAC;CACF,CAAC;AAaF,MAAa,qBAAsB,SAAQ,kCAAuC;IAChF,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,UAAU,CAAC,CAAC;QAErH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YACjB,OAAO,MAAM,CAAC;SACf;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;YACpE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAA,0BAAW,EAAC,kBAAkB,EAAE,IAAI,CAAC,EAAE,CAAC;SACvE;QAED,IAAI,IAAA,uBAAS,EAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YAClE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAA,0BAAW,EAAC,0BAA0B,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;SAChG;QAED,IAAI,IAAA,uBAAS,EAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YAClE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAA,0BAAW,EAAC,0BAA0B,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;SAChG;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;IAC9C,CAAC;CACF;AAtBD,sDAsBC;AAED,SAAgB,MAAM,CAAC,OAA+C;IACpE,MAAM,MAAM,GAAG,IAAA,oBAAY,EAAyB;QAClD,IAAI,EAAE,QAAQ;QACd,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,qBAAqB,CAAC,MAAM,CAAC,CAAC;AAC3C,CAAC;AAPD,wBAOC"}
|
package/schema/schemas/object.js
CHANGED
|
@@ -15,7 +15,7 @@ class ObjectSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
15
15
|
const validatorEntries = Object.fromEntries([...a.validatorEntries.entries(), ...b.validatorEntries.entries()]);
|
|
16
16
|
const schema = {
|
|
17
17
|
type: 'object',
|
|
18
|
-
entries:
|
|
18
|
+
entries: { ...a.schema.entries, ...b.schema.entries }
|
|
19
19
|
};
|
|
20
20
|
return new ObjectSchemaValidator(validatorEntries, schema);
|
|
21
21
|
}
|
|
@@ -34,7 +34,7 @@ class ObjectSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
34
34
|
resultObject[key] = innerValueValidationTestResult.value;
|
|
35
35
|
}
|
|
36
36
|
if (this.schema.keepUnknown == true) {
|
|
37
|
-
resultObject =
|
|
37
|
+
resultObject = { ...value, ...resultObject };
|
|
38
38
|
}
|
|
39
39
|
return { valid: true, value: resultObject };
|
|
40
40
|
}
|
|
@@ -53,7 +53,7 @@ class ObjectSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
53
53
|
resultObject[key] = innerValueValidationTestResult.value;
|
|
54
54
|
}
|
|
55
55
|
if (this.schema.keepUnknown == true) {
|
|
56
|
-
resultObject =
|
|
56
|
+
resultObject = { ...value, ...resultObject };
|
|
57
57
|
}
|
|
58
58
|
return { valid: true, value: resultObject };
|
|
59
59
|
}
|
|
@@ -78,7 +78,11 @@ exports.ObjectSchemaValidator = ObjectSchemaValidator;
|
|
|
78
78
|
function object(entries, options) {
|
|
79
79
|
const validatorEntries = Object.entries(entries);
|
|
80
80
|
const mappedValidatorEntries = validatorEntries.map(([key, value]) => [key, value.schema]);
|
|
81
|
-
const schema = (0, types_1.schemaHelper)(
|
|
81
|
+
const schema = (0, types_1.schemaHelper)({
|
|
82
|
+
type: 'object',
|
|
83
|
+
entries: Object.fromEntries(mappedValidatorEntries),
|
|
84
|
+
...options
|
|
85
|
+
});
|
|
82
86
|
return new ObjectSchemaValidator(entries, schema);
|
|
83
87
|
}
|
|
84
88
|
exports.object = object;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../source/schema/schemas/object.ts"],"names":[],"mappings":";;;AAEA,yCAA6C;AAC7C,yDAAgD;AAChD,kDAA2D;AAE3D,0DAAuE;AAEvE,oCAAwC;AAexC,MAAa,qBAA6D,SAAQ,kCAA0C;IAG1H,YAAY,UAA2C,EAAE,MAAiC;QACxF,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,gBAAgB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,CAAC,MAAM,CAA+E,CAA2B,EAAE,CAA2B;QAClJ,MAAM,gBAAgB,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAwC,CAAC;QAEvJ,MAAM,MAAM,GAA+C;YACzD,IAAI,EAAE,QAAQ;YACd,OAAO,
|
|
1
|
+
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../source/schema/schemas/object.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,11 +10,10 @@ class OptionalSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
10
10
|
this.innerValidator = innerValidator;
|
|
11
11
|
}
|
|
12
12
|
[schema_validator_1.test](value, options, path) {
|
|
13
|
-
var _a;
|
|
14
13
|
if ((0, type_guards_1.isUndefined)(value)) {
|
|
15
14
|
return { valid: true, value };
|
|
16
15
|
}
|
|
17
|
-
if ((
|
|
16
|
+
if ((this.schema.coerce ?? options.coerce) && (0, type_guards_1.isNull)(value)) {
|
|
18
17
|
return { valid: true, value: undefined };
|
|
19
18
|
}
|
|
20
19
|
return this.innerValidator[schema_validator_1.test](value, options, path);
|
|
@@ -22,7 +21,11 @@ class OptionalSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
22
21
|
}
|
|
23
22
|
exports.OptionalSchemaValidator = OptionalSchemaValidator;
|
|
24
23
|
function optional(innerValidator, options) {
|
|
25
|
-
const schema = (0, types_1.schemaHelper)(
|
|
24
|
+
const schema = (0, types_1.schemaHelper)({
|
|
25
|
+
type: 'optional',
|
|
26
|
+
schema: innerValidator.schema,
|
|
27
|
+
...options
|
|
28
|
+
});
|
|
26
29
|
return new OptionalSchemaValidator(innerValidator, schema);
|
|
27
30
|
}
|
|
28
31
|
exports.optional = optional;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"optional.js","sourceRoot":"","sources":["../../../source/schema/schemas/optional.ts"],"names":[],"mappings":";;;AACA,yDAA0D;AAE1D,0DAA4D;AAE5D,oCAAwC;AAMxC,MAAa,uBAAoD,SAAQ,kCAA4C;IAGnH,YAAY,cAAkC,EAAE,MAAmC;QACjF,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc
|
|
1
|
+
{"version":3,"file":"optional.js","sourceRoot":"","sources":["../../../source/schema/schemas/optional.ts"],"names":[],"mappings":";;;AACA,yDAA0D;AAE1D,0DAA4D;AAE5D,oCAAwC;AAMxC,MAAa,uBAAoD,SAAQ,kCAA4C;IAGnH,YAAY,cAAkC,EAAE,MAAmC;QACjF,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,IAAI,IAAA,yBAAW,EAAC,KAAK,CAAC,EAAE;YACtB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;SAC/B;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,IAAA,oBAAM,EAAC,KAAK,CAAC,EAAE;YAC3D,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;SAC1C;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,uBAAI,CAAC,CAAC,KAAuB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3E,CAAC;CACF;AApBD,0DAoBC;AAED,SAAgB,QAAQ,CAA6B,cAAkC,EAAE,OAA8D;IACrJ,MAAM,MAAM,GAAG,IAAA,oBAAY,EAA8B;QACvD,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,cAAc,CAAC,MAAM;QAC7B,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,uBAAuB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;AAC7D,CAAC;AARD,4BAQC"}
|
|
@@ -23,7 +23,12 @@ class PreprocessSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
23
23
|
}
|
|
24
24
|
exports.PreprocessSchemaValidator = PreprocessSchemaValidator;
|
|
25
25
|
function preprocess(outputSchemaValidator, preprocessor, options) {
|
|
26
|
-
const schema = (0, types_1.schemaHelper)(
|
|
26
|
+
const schema = (0, types_1.schemaHelper)({
|
|
27
|
+
type: 'preprocess',
|
|
28
|
+
outputSchema: outputSchemaValidator.schema,
|
|
29
|
+
preprocessor,
|
|
30
|
+
...options
|
|
31
|
+
});
|
|
27
32
|
return new PreprocessSchemaValidator(schema, outputSchemaValidator);
|
|
28
33
|
}
|
|
29
34
|
exports.preprocess = preprocess;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preprocess.js","sourceRoot":"","sources":["../../../source/schema/schemas/preprocess.ts"],"names":[],"mappings":";;;AACA,yDAAgD;AAEhD,0DAAuE;AAEvE,oCAAwC;AASxC,MAAa,yBAAqE,SAAQ,kCAAqD;IAG7I,YAAY,MAA4C,EAAE,eAAmC;QAC3F,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAY,EAAE,OAAiC,EAAE,IAAc;QACpE,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAErD,IAAI,IAAA,uBAAS,EAAC,YAAY,CAAC,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,+EAA+E,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;SAC9G;QAED,OAAO,IAAI,CAAC,eAAe,CAAC,uBAAI,CAAC,CAAC,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACjE,CAAC;IAES,KAAK,CAAC,CAAC,4BAAS,CAAC,CAAC,KAAY,EAAE,OAAiC,EAAE,IAAc;QACzF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC,eAAe,CAAC,4BAAS,CAAC,CAAC,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACtE,CAAC;CACF;AAvBD,8DAuBC;AAED,SAAgB,UAAU,CAAoC,qBAAyC,EAAE,YAAoC,EAAE,OAA8F;IAC3O,MAAM,MAAM,GAAG,IAAA,oBAAY,
|
|
1
|
+
{"version":3,"file":"preprocess.js","sourceRoot":"","sources":["../../../source/schema/schemas/preprocess.ts"],"names":[],"mappings":";;;AACA,yDAAgD;AAEhD,0DAAuE;AAEvE,oCAAwC;AASxC,MAAa,yBAAqE,SAAQ,kCAAqD;IAG7I,YAAY,MAA4C,EAAE,eAAmC;QAC3F,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAY,EAAE,OAAiC,EAAE,IAAc;QACpE,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAErD,IAAI,IAAA,uBAAS,EAAC,YAAY,CAAC,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,+EAA+E,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;SAC9G;QAED,OAAO,IAAI,CAAC,eAAe,CAAC,uBAAI,CAAC,CAAC,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACjE,CAAC;IAES,KAAK,CAAC,CAAC,4BAAS,CAAC,CAAC,KAAY,EAAE,OAAiC,EAAE,IAAc;QACzF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC,eAAe,CAAC,4BAAS,CAAC,CAAC,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACtE,CAAC;CACF;AAvBD,8DAuBC;AAED,SAAgB,UAAU,CAAoC,qBAAyC,EAAE,YAAoC,EAAE,OAA8F;IAC3O,MAAM,MAAM,GAAG,IAAA,oBAAY,EAAuC;QAChE,IAAI,EAAE,YAAY;QAClB,YAAY,EAAE,qBAAqB,CAAC,MAAM;QAC1C,YAAY;QACZ,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,yBAAyB,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;AACtE,CAAC;AATD,gCASC"}
|
|
@@ -12,7 +12,10 @@ class ReadableStreamSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
12
12
|
}
|
|
13
13
|
exports.ReadableStreamSchemaValidator = ReadableStreamSchemaValidator;
|
|
14
14
|
function readableStream(options) {
|
|
15
|
-
const schema = (0, types_1.schemaHelper)(
|
|
15
|
+
const schema = (0, types_1.schemaHelper)({
|
|
16
|
+
type: 'readableStream',
|
|
17
|
+
...options
|
|
18
|
+
});
|
|
16
19
|
return new ReadableStreamSchemaValidator(schema);
|
|
17
20
|
}
|
|
18
21
|
exports.readableStream = readableStream;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readable-stream.js","sourceRoot":"","sources":["../../../source/schema/schemas/readable-stream.ts"],"names":[],"mappings":";;;AAEA,0DAA4D;AAE5D,oCAAwC;AACxC,yCAAsC;AAItC,MAAM,4BAA4B,GAAG,CAAC,OAAO,cAAc,IAAI,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,mBAAQ,EAAC,cAAc,CAAC,CAAE,CAAC;AAEnH,MAAa,6BAA8B,SAAQ,kCAA+C;IAChG,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,OAAO,4BAA4B,CAAC,uBAAI,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAClE,CAAC;CACF;AAJD,sEAIC;AAED,SAAgB,cAAc,CAAC,OAAuD;IACpF,MAAM,MAAM,GAAG,IAAA,oBAAY,
|
|
1
|
+
{"version":3,"file":"readable-stream.js","sourceRoot":"","sources":["../../../source/schema/schemas/readable-stream.ts"],"names":[],"mappings":";;;AAEA,0DAA4D;AAE5D,oCAAwC;AACxC,yCAAsC;AAItC,MAAM,4BAA4B,GAAG,CAAC,OAAO,cAAc,IAAI,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,mBAAQ,EAAC,cAAc,CAAC,CAAE,CAAC;AAEnH,MAAa,6BAA8B,SAAQ,kCAA+C;IAChG,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,OAAO,4BAA4B,CAAC,uBAAI,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAClE,CAAC;CACF;AAJD,sEAIC;AAED,SAAgB,cAAc,CAAC,OAAuD;IACpF,MAAM,MAAM,GAAG,IAAA,oBAAY,EAAiC;QAC1D,IAAI,EAAE,gBAAgB;QACtB,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,6BAA6B,CAAC,MAAM,CAAC,CAAC;AACnD,CAAC;AAPD,wCAOC"}
|
package/schema/schemas/refine.js
CHANGED
|
@@ -40,7 +40,12 @@ class RefineSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
40
40
|
}
|
|
41
41
|
exports.RefineSchemaValidator = RefineSchemaValidator;
|
|
42
42
|
function refine(inputSchemaValidator, refiner, options) {
|
|
43
|
-
const schema = (0, types_1.schemaHelper)(
|
|
43
|
+
const schema = (0, types_1.schemaHelper)({
|
|
44
|
+
type: 'refine',
|
|
45
|
+
inputSchema: inputSchemaValidator.schema,
|
|
46
|
+
refiner,
|
|
47
|
+
...options
|
|
48
|
+
});
|
|
44
49
|
return new RefineSchemaValidator(schema, inputSchemaValidator);
|
|
45
50
|
}
|
|
46
51
|
exports.refine = refine;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refine.js","sourceRoot":"","sources":["../../../source/schema/schemas/refine.ts"],"names":[],"mappings":";;;AACA,yDAAgD;AAChD,kDAA8C;AAE9C,0DAAuE;AAEvE,oCAAwC;AAaxC,MAAa,qBAAkD,SAAQ,kCAA0C;IAG/G,YAAY,MAAiC,EAAE,cAAkC;QAC/E,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,uBAAI,CAAC,CAAC,KAAuB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAE1F,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE;YAC1B,OAAO,eAAe,CAAC;SACxB;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAEtE,IAAI,IAAA,uBAAS,EAAC,YAAY,CAAC,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,2EAA2E,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;SAC1G;QAED,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;YACvB,MAAM,KAAK,GAAG,CAAC,YAAY,CAAC,KAAK,YAAY,0BAAW,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,0BAAW,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/H,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;SAChC;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE,CAAC;IACvD,CAAC;IAES,KAAK,CAAC,CAAC,4BAAS,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QAC3F,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,4BAAS,CAAC,CAAC,KAAuB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAErG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE;YAC1B,OAAO,eAAe,CAAC;SACxB;QAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAE5E,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;YACvB,MAAM,KAAK,GAAG,CAAC,YAAY,CAAC,KAAK,YAAY,0BAAW,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,0BAAW,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/H,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;SAChC;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE,CAAC;IACvD,CAAC;CACF;AA9CD,sDA8CC;AAED,SAAgB,MAAM,CAA6B,oBAAwC,EAAE,OAAiC,EAAE,OAA6E;IAC3M,MAAM,MAAM,GAAG,IAAA,oBAAY,
|
|
1
|
+
{"version":3,"file":"refine.js","sourceRoot":"","sources":["../../../source/schema/schemas/refine.ts"],"names":[],"mappings":";;;AACA,yDAAgD;AAChD,kDAA8C;AAE9C,0DAAuE;AAEvE,oCAAwC;AAaxC,MAAa,qBAAkD,SAAQ,kCAA0C;IAG/G,YAAY,MAAiC,EAAE,cAAkC;QAC/E,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,uBAAI,CAAC,CAAC,KAAuB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAE1F,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE;YAC1B,OAAO,eAAe,CAAC;SACxB;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAEtE,IAAI,IAAA,uBAAS,EAAC,YAAY,CAAC,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,2EAA2E,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;SAC1G;QAED,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;YACvB,MAAM,KAAK,GAAG,CAAC,YAAY,CAAC,KAAK,YAAY,0BAAW,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,0BAAW,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/H,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;SAChC;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE,CAAC;IACvD,CAAC;IAES,KAAK,CAAC,CAAC,4BAAS,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QAC3F,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,4BAAS,CAAC,CAAC,KAAuB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAErG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE;YAC1B,OAAO,eAAe,CAAC;SACxB;QAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAE5E,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;YACvB,MAAM,KAAK,GAAG,CAAC,YAAY,CAAC,KAAK,YAAY,0BAAW,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,0BAAW,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/H,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;SAChC;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE,CAAC;IACvD,CAAC;CACF;AA9CD,sDA8CC;AAED,SAAgB,MAAM,CAA6B,oBAAwC,EAAE,OAAiC,EAAE,OAA6E;IAC3M,MAAM,MAAM,GAAG,IAAA,oBAAY,EAA4B;QACrD,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,oBAAoB,CAAC,MAAM;QACxC,OAAO;QACP,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,qBAAqB,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;AACjE,CAAC;AATD,wBASC"}
|
package/schema/schemas/regexp.js
CHANGED
|
@@ -8,9 +8,8 @@ const schema_validator_1 = require("../schema.validator");
|
|
|
8
8
|
const types_1 = require("../types");
|
|
9
9
|
class RegExpSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
10
10
|
[schema_validator_1.test](value, options, path) {
|
|
11
|
-
var _a;
|
|
12
11
|
if (!(0, type_guards_1.isRegExp)(value)) {
|
|
13
|
-
if ((
|
|
12
|
+
if ((this.schema.coerce ?? options.coerce) && (0, type_guards_1.isString)(value)) {
|
|
14
13
|
try {
|
|
15
14
|
return { valid: true, value: RegExp(value, 'u') };
|
|
16
15
|
}
|
|
@@ -25,7 +24,10 @@ class RegExpSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
25
24
|
}
|
|
26
25
|
exports.RegExpSchemaValidator = RegExpSchemaValidator;
|
|
27
26
|
function regexp(options) {
|
|
28
|
-
const schema = (0, types_1.schemaHelper)(
|
|
27
|
+
const schema = (0, types_1.schemaHelper)({
|
|
28
|
+
type: 'regexp',
|
|
29
|
+
...options
|
|
30
|
+
});
|
|
29
31
|
return new RegExpSchemaValidator(schema);
|
|
30
32
|
}
|
|
31
33
|
exports.regexp = regexp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"regexp.js","sourceRoot":"","sources":["../../../source/schema/schemas/regexp.ts"],"names":[],"mappings":";;;AACA,yDAAyD;AACzD,iDAAyC;AACzC,kDAA2D;AAE3D,0DAA4D;AAE5D,oCAAwC;AAIxC,MAAa,qBAAsB,SAAQ,kCAAuC;IAChF,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc
|
|
1
|
+
{"version":3,"file":"regexp.js","sourceRoot":"","sources":["../../../source/schema/schemas/regexp.ts"],"names":[],"mappings":";;;AACA,yDAAyD;AACzD,iDAAyC;AACzC,kDAA2D;AAE3D,0DAA4D;AAE5D,oCAAwC;AAIxC,MAAa,qBAAsB,SAAQ,kCAAuC;IAChF,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,IAAI,CAAC,IAAA,sBAAQ,EAAC,KAAK,CAAC,EAAE;YACpB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,IAAA,sBAAQ,EAAC,KAAK,CAAC,EAAE;gBAC7D,IAAI;oBACF,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;iBACnD;gBACD,OAAO,KAAK,EAAE;oBACZ,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAA,0BAAW,EAAC,2DAA4D,KAAe,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;iBAC1I;aACF;YAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,0BAAW,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAA,gBAAM,EAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;SAC3F;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAChC,CAAC;CACF;AAjBD,sDAiBC;AAED,SAAgB,MAAM,CAAC,OAA+C;IACpE,MAAM,MAAM,GAAG,IAAA,oBAAY,EAAyB;QAClD,IAAI,EAAE,QAAQ;QACd,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,qBAAqB,CAAC,MAAM,CAAC,CAAC;AAC3C,CAAC;AAPD,wBAOC"}
|
package/schema/schemas/string.js
CHANGED
|
@@ -12,15 +12,13 @@ const coercerMap = {
|
|
|
12
12
|
};
|
|
13
13
|
class StringSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
14
14
|
constructor(schema) {
|
|
15
|
-
var _a;
|
|
16
15
|
const pattern = (0, type_guards_1.isRegExp)(schema.pattern) ? schema.pattern.source : schema.pattern;
|
|
17
|
-
const patternFlags = (0, type_guards_1.isRegExp)(schema.pattern) ? (
|
|
18
|
-
super(
|
|
16
|
+
const patternFlags = (0, type_guards_1.isRegExp)(schema.pattern) ? (schema.patternFlags ?? schema.pattern.flags) : schema.patternFlags;
|
|
17
|
+
super({ ...schema, pattern, patternFlags });
|
|
19
18
|
this.regexp = (0, type_guards_1.isDefined)(pattern) ? RegExp(pattern, patternFlags) : undefined;
|
|
20
19
|
}
|
|
21
20
|
[schema_validator_1.test](value, options, path) {
|
|
22
|
-
|
|
23
|
-
const result = super.ensureType('string', value, path, { coerce: (_a = this.schema.coerce) !== null && _a !== void 0 ? _a : options.coerce }, coercerMap);
|
|
21
|
+
const result = super.ensureType('string', value, path, { coerce: this.schema.coerce ?? options.coerce }, coercerMap);
|
|
24
22
|
if (!result.valid) {
|
|
25
23
|
return result;
|
|
26
24
|
}
|
|
@@ -48,7 +46,10 @@ class StringSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
48
46
|
}
|
|
49
47
|
exports.StringSchemaValidator = StringSchemaValidator;
|
|
50
48
|
function string(options) {
|
|
51
|
-
const schema = (0, types_1.schemaHelper)(
|
|
49
|
+
const schema = (0, types_1.schemaHelper)({
|
|
50
|
+
type: 'string',
|
|
51
|
+
...options
|
|
52
|
+
});
|
|
52
53
|
return new StringSchemaValidator(schema);
|
|
53
54
|
}
|
|
54
55
|
exports.string = string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string.js","sourceRoot":"","sources":["../../../source/schema/schemas/string.ts"],"names":[],"mappings":";;;AACA,yDAA0D;AAC1D,kDAA8C;AAE9C,0DAA4D;AAE5D,oCAAwC;AAExC,MAAM,UAAU,GAAuB;IACrC,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;IAC/D,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;IAClE,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;CAChE,CAAC;AAyBF,MAAa,qBAAsB,SAAQ,kCAAuC;IAGhF,YAAY,MAA8B
|
|
1
|
+
{"version":3,"file":"string.js","sourceRoot":"","sources":["../../../source/schema/schemas/string.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,12 @@ class TransformSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
31
31
|
}
|
|
32
32
|
exports.TransformSchemaValidator = TransformSchemaValidator;
|
|
33
33
|
function transform(inputSchemaValidator, transformer, options) {
|
|
34
|
-
const schema = (0, types_1.schemaHelper)(
|
|
34
|
+
const schema = (0, types_1.schemaHelper)({
|
|
35
|
+
type: 'transform',
|
|
36
|
+
inputSchema: inputSchemaValidator.schema,
|
|
37
|
+
transformer,
|
|
38
|
+
...options
|
|
39
|
+
});
|
|
35
40
|
return new TransformSchemaValidator(schema, inputSchemaValidator);
|
|
36
41
|
}
|
|
37
42
|
exports.transform = transform;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../../source/schema/schemas/transform.ts"],"names":[],"mappings":";;;AACA,yDAAgD;AAEhD,0DAAuE;AAEvE,oCAAwC;AASxC,MAAa,wBAA6D,SAAQ,kCAAqD;IAGrI,YAAY,MAA4C,EAAE,cAAkC;QAC1F,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,uBAAI,CAAC,CAAC,KAAuB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAE1F,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE;YAC1B,OAAO,eAAe,CAAC;SACxB;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAEnE,IAAI,IAAA,uBAAS,EAAC,WAAW,CAAC,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,8EAA8E,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;SAC7G;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAC7C,CAAC;IAES,KAAK,CAAC,CAAC,4BAAS,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QAC3F,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,4BAAS,CAAC,CAAC,KAAuB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAErG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE;YAC1B,OAAO,eAAe,CAAC;SACxB;QAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAEzE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAC7C,CAAC;CACF;AApCD,4DAoCC;AAED,SAAgB,SAAS,CAAqC,oBAAwC,EAAE,WAAmC,EAAE,OAA4F;IACvO,MAAM,MAAM,GAAG,IAAA,oBAAY,
|
|
1
|
+
{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../../source/schema/schemas/transform.ts"],"names":[],"mappings":";;;AACA,yDAAgD;AAEhD,0DAAuE;AAEvE,oCAAwC;AASxC,MAAa,wBAA6D,SAAQ,kCAAqD;IAGrI,YAAY,MAA4C,EAAE,cAAkC;QAC1F,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,uBAAI,CAAC,CAAC,KAAuB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAE1F,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE;YAC1B,OAAO,eAAe,CAAC;SACxB;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAEnE,IAAI,IAAA,uBAAS,EAAC,WAAW,CAAC,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,8EAA8E,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;SAC7G;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAC7C,CAAC;IAES,KAAK,CAAC,CAAC,4BAAS,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QAC3F,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,4BAAS,CAAC,CAAC,KAAuB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAErG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE;YAC1B,OAAO,eAAe,CAAC;SACxB;QAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAEzE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAC7C,CAAC;CACF;AApCD,4DAoCC;AAED,SAAgB,SAAS,CAAqC,oBAAwC,EAAE,WAAmC,EAAE,OAA4F;IACvO,MAAM,MAAM,GAAG,IAAA,oBAAY,EAAuC;QAChE,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,oBAAoB,CAAC,MAAM;QACxC,WAAW;QACX,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,wBAAwB,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;AACpE,CAAC;AATD,8BASC"}
|
|
@@ -9,13 +9,12 @@ const instance_1 = require("./instance");
|
|
|
9
9
|
const uint8ArrayInstanceSchema = (0, instance_1.instance)(Uint8Array);
|
|
10
10
|
class Uint8ArraySchemaValidator extends schema_validator_1.SchemaValidator {
|
|
11
11
|
[schema_validator_1.test](value, options, path) {
|
|
12
|
-
var _a;
|
|
13
12
|
const instanceTestResult = uint8ArrayInstanceSchema[schema_validator_1.test](value, options, path);
|
|
14
13
|
let array;
|
|
15
14
|
if (instanceTestResult.valid) {
|
|
16
15
|
array = instanceTestResult.value;
|
|
17
16
|
}
|
|
18
|
-
else if ((
|
|
17
|
+
else if ((this.schema.coerce ?? options.coerce) && (0, type_guards_1.isArray)(value) && value.every((v) => (0, type_guards_1.isNumber)(v) && Number.isInteger(v) && (v >= 0) && (v <= 255))) {
|
|
19
18
|
array = Uint8Array.from(value);
|
|
20
19
|
}
|
|
21
20
|
else {
|
|
@@ -32,7 +31,10 @@ class Uint8ArraySchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
32
31
|
}
|
|
33
32
|
exports.Uint8ArraySchemaValidator = Uint8ArraySchemaValidator;
|
|
34
33
|
function uint8Array(options) {
|
|
35
|
-
const schema = (0, types_1.schemaHelper)(
|
|
34
|
+
const schema = (0, types_1.schemaHelper)({
|
|
35
|
+
type: 'uint8-array',
|
|
36
|
+
...options
|
|
37
|
+
});
|
|
36
38
|
return new Uint8ArraySchemaValidator(schema);
|
|
37
39
|
}
|
|
38
40
|
exports.uint8Array = uint8Array;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uint8-array.js","sourceRoot":"","sources":["../../../source/schema/schemas/uint8-array.ts"],"names":[],"mappings":";;;AACA,yDAAmE;AACnE,kDAA8C;AAE9C,0DAA4D;AAE5D,oCAAwC;AACxC,yCAAsC;AAOtC,MAAM,wBAAwB,GAAG,IAAA,mBAAQ,EAAC,UAAU,CAAC,CAAC;AAEtD,MAAa,yBAA0B,SAAQ,kCAA2C;IACxF,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc
|
|
1
|
+
{"version":3,"file":"uint8-array.js","sourceRoot":"","sources":["../../../source/schema/schemas/uint8-array.ts"],"names":[],"mappings":";;;AACA,yDAAmE;AACnE,kDAA8C;AAE9C,0DAA4D;AAE5D,oCAAwC;AACxC,yCAAsC;AAOtC,MAAM,wBAAwB,GAAG,IAAA,mBAAQ,EAAC,UAAU,CAAC,CAAC;AAEtD,MAAa,yBAA0B,SAAQ,kCAA2C;IACxF,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,uBAAI,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAEhF,IAAI,KAAiB,CAAC;QAEtB,IAAI,kBAAkB,CAAC,KAAK,EAAE;YAC5B,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC;SAClC;aACI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,IAAA,qBAAO,EAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,sBAAQ,EAAC,CAAC,CAAC,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,EAAE;YACrJ,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAChC;aACI;YACH,OAAO,kBAAkB,CAAC;SAC3B;QAED,IAAI,IAAA,uBAAS,EAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YACtE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAA,0BAAW,EAAC,4BAA4B,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;SAClG;QAED,IAAI,IAAA,uBAAS,EAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YACtE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAA,0BAAW,EAAC,4BAA4B,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;SAClG;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IACvC,CAAC;CACF;AA1BD,8DA0BC;AAED,SAAgB,UAAU,CAAC,OAAmD;IAC5E,MAAM,MAAM,GAAG,IAAA,oBAAY,EAA6B;QACtD,IAAI,EAAE,aAAa;QACnB,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,yBAAyB,CAAC,MAAM,CAAC,CAAC;AAC/C,CAAC;AAPD,gCAOC"}
|
package/schema/schemas/union.js
CHANGED
|
@@ -31,7 +31,11 @@ class UnionSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
31
31
|
}
|
|
32
32
|
exports.UnionSchemaValidator = UnionSchemaValidator;
|
|
33
33
|
function union(schemas, options) {
|
|
34
|
-
const schema = (0, types_1.schemaHelper)(
|
|
34
|
+
const schema = (0, types_1.schemaHelper)({
|
|
35
|
+
type: 'union',
|
|
36
|
+
schemas: schemas.map((innerSchema) => innerSchema.schema),
|
|
37
|
+
...options
|
|
38
|
+
});
|
|
35
39
|
return new UnionSchemaValidator(schemas, schema);
|
|
36
40
|
}
|
|
37
41
|
exports.union = union;
|
|
@@ -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;IAI9I,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;AAlCD,oDAkCC;AAED,SAAgB,KAAK,CAAyD,OAAkB,EAAE,OAA6F;IAC7L,MAAM,MAAM,GAAG,IAAA,oBAAY,
|
|
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;IAI9I,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;AAlCD,oDAkCC;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"}
|
|
@@ -10,7 +10,10 @@ class UnknownSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
10
10
|
}
|
|
11
11
|
exports.UnknownSchemaValidator = UnknownSchemaValidator;
|
|
12
12
|
function unknown(options) {
|
|
13
|
-
const schema = (0, types_1.schemaHelper)(
|
|
13
|
+
const schema = (0, types_1.schemaHelper)({
|
|
14
|
+
type: 'unknown',
|
|
15
|
+
...options
|
|
16
|
+
});
|
|
14
17
|
return new UnknownSchemaValidator(schema);
|
|
15
18
|
}
|
|
16
19
|
exports.unknown = unknown;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unknown.js","sourceRoot":"","sources":["../../../source/schema/schemas/unknown.ts"],"names":[],"mappings":";;;AACA,0DAA4D;AAE5D,oCAAwC;AAIxC,MAAa,sBAAuB,SAAQ,kCAAwC;IAClF,CAAC,uBAAI,CAAC,CAAC,KAAc;QACnB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAChC,CAAC;CACF;AAJD,wDAIC;AAED,SAAgB,OAAO,CAAC,OAAgD;IACtE,MAAM,MAAM,GAAG,IAAA,oBAAY,
|
|
1
|
+
{"version":3,"file":"unknown.js","sourceRoot":"","sources":["../../../source/schema/schemas/unknown.ts"],"names":[],"mappings":";;;AACA,0DAA4D;AAE5D,oCAAwC;AAIxC,MAAa,sBAAuB,SAAQ,kCAAwC;IAClF,CAAC,uBAAI,CAAC,CAAC,KAAc;QACnB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAChC,CAAC;CACF;AAJD,wDAIC;AAED,SAAgB,OAAO,CAAC,OAAgD;IACtE,MAAM,MAAM,GAAG,IAAA,oBAAY,EAA0B;QACnD,IAAI,EAAE,SAAS;QACf,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,sBAAsB,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC;AAPD,0BAOC"}
|
|
@@ -13,9 +13,8 @@ exports.elasticsearchModuleConfig = {
|
|
|
13
13
|
};
|
|
14
14
|
exports.ELASTIC_SEARCH_INDEX_CONFIG = (0, container_1.injectionToken)('ELASTIC_SEARCH_INDEX_CONFIG');
|
|
15
15
|
function configureElasticsearch(config = {}) {
|
|
16
|
-
|
|
17
|
-
exports.elasticsearchModuleConfig.
|
|
18
|
-
exports.elasticsearchModuleConfig.logPrefix = (_b = config.logPrefix) !== null && _b !== void 0 ? _b : exports.elasticsearchModuleConfig.logPrefix;
|
|
16
|
+
exports.elasticsearchModuleConfig.defaultOptions = config.defaultOptions ?? exports.elasticsearchModuleConfig.defaultOptions;
|
|
17
|
+
exports.elasticsearchModuleConfig.logPrefix = config.logPrefix ?? exports.elasticsearchModuleConfig.logPrefix;
|
|
19
18
|
}
|
|
20
19
|
exports.configureElasticsearch = configureElasticsearch;
|
|
21
20
|
container_1.container.registerSingleton(elasticsearch_1.Client, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../source/search-index/elastic/module.ts"],"names":[],"mappings":";;;AAAA,+CAAwD;AACxD,qCAA2C;AAE3C,yCAAkC;AAClC,yDAA4D;AAE5D,0DAAgD;AAEhD,qCAAoD;AAOvC,QAAA,yBAAyB,GAA8B;IAClE,cAAc,EAAE,EAAE,IAAI,EAAE,uBAAuB,EAAE;IACjD,SAAS,EAAE,SAAS;CACrB,CAAC;AAEW,QAAA,2BAA2B,GAAG,IAAA,0BAAc,EAA6D,6BAA6B,CAAC,CAAC;AAErJ,SAAgB,sBAAsB,CAAC,SAA6C,EAAE
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../source/search-index/elastic/module.ts"],"names":[],"mappings":";;;AAAA,+CAAwD;AACxD,qCAA2C;AAE3C,yCAAkC;AAClC,yDAA4D;AAE5D,0DAAgD;AAEhD,qCAAoD;AAOvC,QAAA,yBAAyB,GAA8B;IAClE,cAAc,EAAE,EAAE,IAAI,EAAE,uBAAuB,EAAE;IACjD,SAAS,EAAE,SAAS;CACrB,CAAC;AAEW,QAAA,2BAA2B,GAAG,IAAA,0BAAc,EAA6D,6BAA6B,CAAC,CAAC;AAErJ,SAAgB,sBAAsB,CAAC,SAA6C,EAAE;IACpF,iCAAyB,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,iCAAyB,CAAC,cAAc,CAAC;IAC7G,iCAAyB,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,iCAAyB,CAAC,SAAS,CAAC;AAChG,CAAC;AAHD,wDAGC;AAED,qBAAS,CAAC,iBAAiB,CAAwB,sBAAM,EAAE;IACzD,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QAC5B,IAAA,2BAAa,EAAC,OAAO,EAAE,sCAAsC,CAAC,CAAC;QAE/D,MAAM,MAAM,GAAG,MAAM,qBAAS,CAAC,YAAY,CAAC,eAAM,EAAE,iCAAyB,CAAC,SAAS,CAAC,CAAC;QAEzF,MAAM,MAAM,GAAW,IAAI,sBAAM,CAAC,OAAO,CAAC,CAAC;QAE3C,eAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QAE7F,MAAM,IAAA,cAAO,EAAC,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,oBAAM,EAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAEtH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,EAAE,EAAE,uBAAuB,EAAE,GAAG,EAAE,CAAC,iCAAyB,CAAC,cAAc,EAAE,CAAC,CAAC;AAEhF,qBAAS,CAAC,iBAAiB,CAAC,mCAA2B,EAAE;IACvD,UAAU,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,iCAAwB,EAAE,QAAQ,CAAC;CACvF,CAAC,CAAC;AAEH,SAAgB,2BAA2B,CAAmB,SAAiB;IAC7E,OAAO,qBAAS,CAAC,OAAO,CAAC,iCAAwB,EAAE,SAAS,CAAC,CAAC;AAChE,CAAC;AAFD,kEAEC"}
|