@allgemein/schema-api 1.6.1 → 1.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +104 -1
- package/api/IBaseRef.d.ts +2 -2
- package/api/IBaseRef.js +1 -2
- package/api/IBuildOptions.d.ts +2 -2
- package/api/IBuildOptions.js +1 -2
- package/api/IClassRef.d.ts +5 -5
- package/api/IClassRef.js +3 -6
- package/api/IClassRef.js.map +1 -1
- package/api/IEntityRef.d.ts +5 -5
- package/api/IEntityRef.js +3 -6
- package/api/IEntityRef.js.map +1 -1
- package/api/IJsonSchema.d.ts +4 -4
- package/api/IJsonSchema.js +3 -8
- package/api/IJsonSchema.js.map +1 -1
- package/api/ILookupRegistry.d.ts +6 -6
- package/api/ILookupRegistry.js +6 -9
- package/api/ILookupRegistry.js.map +1 -1
- package/api/IPropertyExtentions.d.ts +1 -1
- package/api/IPropertyExtentions.js +1 -2
- package/api/IPropertyExtentions.js.map +1 -1
- package/api/IPropertyRef.d.ts +3 -3
- package/api/IPropertyRef.js +3 -6
- package/api/IPropertyRef.js.map +1 -1
- package/api/ISchemaRef.d.ts +2 -2
- package/api/ISchemaRef.js +1 -2
- package/api/ISerializeSupport.d.ts +4 -4
- package/api/ISerializeSupport.js +3 -8
- package/api/ISerializeSupport.js.map +1 -1
- package/browser.d.ts +65 -65
- package/browser.js +43 -112
- package/browser.js.map +1 -1
- package/decorators/Embeddable.d.ts +1 -1
- package/decorators/Embeddable.js +4 -7
- package/decorators/Embeddable.js.map +1 -1
- package/decorators/Entity.d.ts +1 -1
- package/decorators/Entity.js +4 -7
- package/decorators/Entity.js.map +1 -1
- package/decorators/Namespace.js +7 -10
- package/decorators/Namespace.js.map +1 -1
- package/decorators/Property.d.ts +1 -1
- package/decorators/Property.js +19 -22
- package/decorators/Property.js.map +1 -1
- package/decorators/PropertyOf.d.ts +1 -1
- package/decorators/PropertyOf.js +6 -9
- package/decorators/PropertyOf.js.map +1 -1
- package/decorators/Schema.d.ts +1 -1
- package/decorators/Schema.js +4 -7
- package/decorators/Schema.js.map +1 -1
- package/decorators/validate/Hostname.d.ts +1 -1
- package/decorators/validate/Hostname.js +12 -16
- package/decorators/validate/Hostname.js.map +1 -1
- package/decorators/validate/Ip4.d.ts +1 -1
- package/decorators/validate/Ip4.js +11 -15
- package/decorators/validate/Ip4.js.map +1 -1
- package/decorators/validate/Ip6.d.ts +1 -1
- package/decorators/validate/Ip6.js +11 -15
- package/decorators/validate/Ip6.js.map +1 -1
- package/decorators/validate/IsEmail.d.ts +1 -1
- package/decorators/validate/IsEmail.js +10 -14
- package/decorators/validate/IsEmail.js.map +1 -1
- package/decorators/validate/IsNotEmpty.d.ts +1 -1
- package/decorators/validate/IsNotEmpty.js +11 -14
- package/decorators/validate/IsNotEmpty.js.map +1 -1
- package/decorators/validate/MaxLength.d.ts +1 -1
- package/decorators/validate/MaxLength.js +9 -12
- package/decorators/validate/MaxLength.js.map +1 -1
- package/decorators/validate/MinLength.d.ts +1 -1
- package/decorators/validate/MinLength.js +9 -12
- package/decorators/validate/MinLength.js.map +1 -1
- package/decorators/validate/Regex.d.ts +1 -1
- package/decorators/validate/Regex.js +10 -13
- package/decorators/validate/Regex.js.map +1 -1
- package/decorators/validate/Required.d.ts +1 -1
- package/decorators/validate/Required.js +9 -12
- package/decorators/validate/Required.js.map +1 -1
- package/decorators/validate/index.d.ts +8 -8
- package/decorators/validate/index.js +9 -19
- package/decorators/validate/index.js.map +1 -1
- package/index.d.ts +1 -1
- package/index.js +1 -17
- package/index.js.map +1 -1
- package/lib/AbstractRef.d.ts +4 -4
- package/lib/AbstractRef.js +29 -33
- package/lib/AbstractRef.js.map +1 -1
- package/lib/AnnotationsHelper.d.ts +2 -2
- package/lib/AnnotationsHelper.js +30 -34
- package/lib/AnnotationsHelper.js.map +1 -1
- package/lib/ClassRef.d.ts +7 -7
- package/lib/ClassRef.js +62 -66
- package/lib/ClassRef.js.map +1 -1
- package/lib/Constants.js +42 -45
- package/lib/Constants.js.map +1 -1
- package/lib/DataContainer.d.ts +6 -6
- package/lib/DataContainer.js +17 -21
- package/lib/DataContainer.js.map +1 -1
- package/lib/LookupRegistry.js +13 -17
- package/lib/LookupRegistry.js.map +1 -1
- package/lib/SchemaRef.d.ts +7 -7
- package/lib/SchemaRef.js +11 -15
- package/lib/SchemaRef.js.map +1 -1
- package/lib/SchemaUtils.d.ts +3 -3
- package/lib/SchemaUtils.js +19 -24
- package/lib/SchemaUtils.js.map +1 -1
- package/lib/functions.d.ts +2 -2
- package/lib/functions.js +7 -10
- package/lib/functions.js.map +1 -1
- package/lib/json-schema/Constants.js +3 -6
- package/lib/json-schema/Constants.js.map +1 -1
- package/lib/json-schema/IJsonSchemaSerializeOptions.d.ts +4 -4
- package/lib/json-schema/IJsonSchemaSerializeOptions.js +1 -2
- package/lib/json-schema/IJsonSchemaSerializer.d.ts +3 -3
- package/lib/json-schema/IJsonSchemaSerializer.js +1 -2
- package/lib/json-schema/IJsonSchemaUnserializeOptions.d.ts +3 -3
- package/lib/json-schema/IJsonSchemaUnserializeOptions.js +1 -2
- package/lib/json-schema/IJsonSchemaUnserializer.d.ts +1 -1
- package/lib/json-schema/IJsonSchemaUnserializer.js +1 -2
- package/lib/json-schema/IParseOptions.d.ts +2 -2
- package/lib/json-schema/IParseOptions.js +1 -4
- package/lib/json-schema/IParseOptions.js.map +1 -1
- package/lib/json-schema/JsonSchema.d.ts +10 -10
- package/lib/json-schema/JsonSchema.js +26 -30
- package/lib/json-schema/JsonSchema.js.map +1 -1
- package/lib/json-schema/JsonSchema7.d.ts +2 -2
- package/lib/json-schema/JsonSchema7.js +3 -8
- package/lib/json-schema/JsonSchema7.js.map +1 -1
- package/lib/json-schema/JsonSchema7Serializer.d.ts +9 -9
- package/lib/json-schema/JsonSchema7Serializer.js +93 -97
- package/lib/json-schema/JsonSchema7Serializer.js.map +1 -1
- package/lib/json-schema/JsonSchema7Unserializer.d.ts +10 -10
- package/lib/json-schema/JsonSchema7Unserializer.js +99 -103
- package/lib/json-schema/JsonSchema7Unserializer.js.map +1 -1
- package/lib/json-schema/functions.d.ts +2 -2
- package/lib/json-schema/functions.js +8 -12
- package/lib/json-schema/functions.js.map +1 -1
- package/lib/options/IAbstractOptions.d.ts +1 -1
- package/lib/options/IAbstractOptions.js +1 -2
- package/lib/options/IAttributeOptions.d.ts +2 -2
- package/lib/options/IAttributeOptions.js +1 -2
- package/lib/options/IEntityOptions.d.ts +2 -2
- package/lib/options/IEntityOptions.js +1 -2
- package/lib/options/INamedOptions.js +1 -2
- package/lib/options/IObjectOptions.d.ts +2 -2
- package/lib/options/IObjectOptions.js +1 -2
- package/lib/options/IPropertyOptions.d.ts +2 -2
- package/lib/options/IPropertyOptions.js +1 -2
- package/lib/options/ISchemaOptions.d.ts +2 -2
- package/lib/options/ISchemaOptions.js +1 -2
- package/lib/registry/AbstractRegistry.d.ts +8 -8
- package/lib/registry/AbstractRegistry.js +19 -23
- package/lib/registry/AbstractRegistry.js.map +1 -1
- package/lib/registry/Binding.d.ts +1 -1
- package/lib/registry/Binding.js +1 -5
- package/lib/registry/Binding.js.map +1 -1
- package/lib/registry/DefaultEntityRef.d.ts +9 -9
- package/lib/registry/DefaultEntityRef.js +10 -14
- package/lib/registry/DefaultEntityRef.js.map +1 -1
- package/lib/registry/DefaultNamespacedRegistry.d.ts +14 -14
- package/lib/registry/DefaultNamespacedRegistry.js +122 -126
- package/lib/registry/DefaultNamespacedRegistry.js.map +1 -1
- package/lib/registry/DefaultPropertyRef.d.ts +7 -7
- package/lib/registry/DefaultPropertyRef.js +42 -46
- package/lib/registry/DefaultPropertyRef.js.map +1 -1
- package/lib/registry/IRegistryOptions.js +1 -2
- package/lib/registry/MetadataRegistry.d.ts +8 -8
- package/lib/registry/MetadataRegistry.js +29 -33
- package/lib/registry/MetadataRegistry.js.map +1 -1
- package/lib/registry/RegistryFactory.d.ts +3 -3
- package/lib/registry/RegistryFactory.js +19 -23
- package/lib/registry/RegistryFactory.js.map +1 -1
- package/lib/serializer/ISerializeOptions.js +1 -2
- package/lib/serializer/ISerializer.d.ts +2 -2
- package/lib/serializer/ISerializer.js +1 -2
- package/lib/serializer/ISerializerFactory.d.ts +6 -6
- package/lib/serializer/ISerializerFactory.js +1 -2
- package/lib/serializer/IUnserializeOptions.js +1 -2
- package/lib/serializer/IUnserializer.d.ts +2 -2
- package/lib/serializer/IUnserializer.js +1 -2
- package/lib/serializer/SerializerRegistry.d.ts +1 -1
- package/lib/serializer/SerializerRegistry.js +3 -7
- package/lib/serializer/SerializerRegistry.js.map +1 -1
- package/lib/validation/DefaultValidator.d.ts +5 -5
- package/lib/validation/DefaultValidator.js +32 -36
- package/lib/validation/DefaultValidator.js.map +1 -1
- package/lib/validation/IValidateOptions.js +1 -2
- package/lib/validation/IValidationError.js +1 -2
- package/lib/validation/IValidationMessage.js +1 -2
- package/lib/validation/IValidationOptions.d.ts +1 -0
- package/lib/validation/IValidationOptions.js +1 -0
- package/lib/validation/IValidationOptions.js.map +1 -1
- package/lib/validation/IValidationResult.d.ts +1 -1
- package/lib/validation/IValidationResult.js +1 -2
- package/lib/validation/IValidator.d.ts +1 -1
- package/lib/validation/IValidator.js +1 -2
- package/lib/validation/IValidatorEntry.d.ts +1 -1
- package/lib/validation/IValidatorEntry.js +1 -2
- package/lib/validation/IValidatorHandle.js +1 -2
- package/lib/validation/Validator.d.ts +4 -4
- package/lib/validation/Validator.js +7 -11
- package/lib/validation/Validator.js.map +1 -1
- package/package.json +3 -2
|
@@ -1,33 +1,30 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RegistryFactory = void 0;
|
|
4
1
|
/**
|
|
5
2
|
* Schema definitions can be different depending by handled structure.
|
|
6
3
|
* We want use one api for use and accessing objects. The registry handle for a namespace can be
|
|
7
4
|
* registered here.
|
|
8
5
|
*/
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
class RegistryFactory {
|
|
6
|
+
import { has, isRegExp, isString, keys } from '@allgemein/base';
|
|
7
|
+
import { DEFAULT_NAMESPACE, METATYPE_ENTITY } from '../Constants.js';
|
|
8
|
+
import { DefaultNamespacedRegistry } from './DefaultNamespacedRegistry.js';
|
|
9
|
+
import { MetadataRegistry } from './MetadataRegistry.js';
|
|
10
|
+
import { C_DEFAULT } from '@allgemein/base';
|
|
11
|
+
export class RegistryFactory {
|
|
15
12
|
/**
|
|
16
13
|
* Return the registry handling schema/objects of given context or if not exists the generic default namescaped registry
|
|
17
14
|
*
|
|
18
15
|
* @param namespace
|
|
19
16
|
*/
|
|
20
|
-
static get(namespace =
|
|
17
|
+
static get(namespace = DEFAULT_NAMESPACE, options) {
|
|
21
18
|
if (!this.$handles[namespace]) {
|
|
22
19
|
for (const type of this.$types) {
|
|
23
|
-
if (
|
|
20
|
+
if (isString(type.pattern)) {
|
|
24
21
|
if (namespace === type.pattern) {
|
|
25
22
|
this.$handles[namespace] = Reflect.construct(type.registryClass, [namespace, options]);
|
|
26
23
|
break;
|
|
27
24
|
}
|
|
28
25
|
}
|
|
29
26
|
else {
|
|
30
|
-
if (
|
|
27
|
+
if (isRegExp(type.pattern) && type.pattern.test(namespace)) {
|
|
31
28
|
this.$handles[namespace] = Reflect.construct(type.registryClass, [namespace, options]);
|
|
32
29
|
break;
|
|
33
30
|
}
|
|
@@ -35,7 +32,7 @@ class RegistryFactory {
|
|
|
35
32
|
}
|
|
36
33
|
if (!this.$handles[namespace]) {
|
|
37
34
|
// create default as fallback if nothing passes
|
|
38
|
-
this.$handles[namespace] = new
|
|
35
|
+
this.$handles[namespace] = new DefaultNamespacedRegistry(namespace, options);
|
|
39
36
|
}
|
|
40
37
|
if (this.$handles[namespace].prepare) {
|
|
41
38
|
this.$handles[namespace].prepare();
|
|
@@ -49,7 +46,7 @@ class RegistryFactory {
|
|
|
49
46
|
* @param namespace
|
|
50
47
|
*/
|
|
51
48
|
static remove(namespace) {
|
|
52
|
-
if (
|
|
49
|
+
if (has(this.$handles, namespace)) {
|
|
53
50
|
this.get(namespace).reset();
|
|
54
51
|
}
|
|
55
52
|
delete this.$handles[namespace];
|
|
@@ -61,8 +58,8 @@ class RegistryFactory {
|
|
|
61
58
|
* @param registry
|
|
62
59
|
*/
|
|
63
60
|
static register(namespace, registryClass) {
|
|
64
|
-
const existsAlready = this.$types.find(x =>
|
|
65
|
-
|
|
61
|
+
const existsAlready = this.$types.find(x => isString(x.pattern) && isString(namespace) ? x.pattern === namespace :
|
|
62
|
+
isRegExp(x.pattern) && isRegExp(namespace) ? x.pattern.source === namespace.source :
|
|
66
63
|
x.pattern === namespace);
|
|
67
64
|
if (!existsAlready) {
|
|
68
65
|
this.$types.unshift({
|
|
@@ -75,19 +72,19 @@ class RegistryFactory {
|
|
|
75
72
|
* Return active and registered namespaces
|
|
76
73
|
*/
|
|
77
74
|
static getNamespaces() {
|
|
78
|
-
return
|
|
75
|
+
return keys(this.$handles);
|
|
79
76
|
}
|
|
80
77
|
static getTargets() {
|
|
81
|
-
return
|
|
78
|
+
return MetadataRegistry.$().getTargets();
|
|
82
79
|
}
|
|
83
80
|
/**
|
|
84
81
|
* Return all declared namespaces
|
|
85
82
|
*/
|
|
86
83
|
static getDeclaredNamespaces() {
|
|
87
|
-
return [].concat(...
|
|
88
|
-
const entries =
|
|
84
|
+
return [].concat(...MetadataRegistry.$().getTargets().map(x => {
|
|
85
|
+
const entries = MetadataRegistry.$().getByContextAndTarget(METATYPE_ENTITY, x, 'merge');
|
|
89
86
|
return entries.map(x => {
|
|
90
|
-
return { target: x.target, namespace: x.namespace ? x.namespace :
|
|
87
|
+
return { target: x.target, namespace: x.namespace ? x.namespace : C_DEFAULT };
|
|
91
88
|
});
|
|
92
89
|
}));
|
|
93
90
|
}
|
|
@@ -97,11 +94,10 @@ class RegistryFactory {
|
|
|
97
94
|
}
|
|
98
95
|
}
|
|
99
96
|
}
|
|
100
|
-
exports.RegistryFactory = RegistryFactory;
|
|
101
97
|
RegistryFactory.$types = [
|
|
102
98
|
{
|
|
103
99
|
pattern: /.*/,
|
|
104
|
-
registryClass:
|
|
100
|
+
registryClass: DefaultNamespacedRegistry
|
|
105
101
|
}
|
|
106
102
|
];
|
|
107
103
|
RegistryFactory.$handles = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RegistryFactory.js","sourceRoot":"","sources":["../../../../src/lib/registry/RegistryFactory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RegistryFactory.js","sourceRoot":"","sources":["../../../../src/lib/registry/RegistryFactory.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAE9D,OAAO,EAAY,iBAAiB,EAAE,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAC,yBAAyB,EAAC,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAG1C,MAAM,OAAO,eAAe;IAa1B;;;;OAIG;IACH,MAAM,CAAC,GAAG,CAA4B,YAAoB,iBAAiB,EAAE,OAA0B;QACrG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC/B,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC3B,IAAI,SAAS,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC;wBAC/B,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;wBACvF,MAAM;oBACR,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;wBAC3D,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;wBACvF,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9B,+CAA+C;gBAC/C,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,IAAI,yBAAyB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC/E,CAAC;YAED,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;gBACrC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;YACrC,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAM,CAAC;IACvC,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,SAAiB;QAC7B,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC;QAC9B,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;IAGD;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,CAAC,SAA0B,EAAE,aAAyC;QACnF,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CACzC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC;YACpE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,CAAC,CAAC;gBAClF,CAAC,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC;QAC/B,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;gBAClB,OAAO,EAAE,SAAS;gBAClB,aAAa,EAAE,aAAa;aAC7B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,aAAa;QAClB,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,UAAU;QACf,OAAO,gBAAgB,CAAC,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,qBAAqB;QAC1B,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAAC,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAC5D,MAAM,OAAO,GAAG,gBAAgB,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,eAAe,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YACxF,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBACrB,OAAO,EAAC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAAC,CAAC;YAC9E,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC,CAAC;IACN,CAAC;IAGD,MAAM,CAAC,KAAK;QACV,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;;AAxGM,sBAAM,GAA8E;IACzF;QACE,OAAO,EAAE,IAAI;QACb,aAAa,EAAE,yBAAyB;KACzC;CACF,CAAC;AAGK,wBAAQ,GAAuC,EAAE,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { IClassRef } from '../../api/IClassRef';
|
|
2
|
-
import { IEntityRef } from '../../api/IEntityRef';
|
|
1
|
+
import { IClassRef } from '../../api/IClassRef.js';
|
|
2
|
+
import { IEntityRef } from '../../api/IEntityRef.js';
|
|
3
3
|
export interface ISerializer {
|
|
4
4
|
serialize(klass: IClassRef | IEntityRef | Function | object): any | Promise<any>;
|
|
5
5
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { ISerializeOptions } from './ISerializeOptions';
|
|
2
|
-
import { ISerializer } from './ISerializer';
|
|
3
|
-
import { IUnserializeOptions } from './IUnserializeOptions';
|
|
4
|
-
import { IUnserializer } from './IUnserializer';
|
|
5
|
-
import { IClassRef } from '../../api/IClassRef';
|
|
6
|
-
import { IEntityRef } from '../../api/IEntityRef';
|
|
1
|
+
import { ISerializeOptions } from './ISerializeOptions.js';
|
|
2
|
+
import { ISerializer } from './ISerializer.js';
|
|
3
|
+
import { IUnserializeOptions } from './IUnserializeOptions.js';
|
|
4
|
+
import { IUnserializer } from './IUnserializer.js';
|
|
5
|
+
import { IClassRef } from '../../api/IClassRef.js';
|
|
6
|
+
import { IEntityRef } from '../../api/IEntityRef.js';
|
|
7
7
|
export interface ISerializerFactory {
|
|
8
8
|
getName(): string;
|
|
9
9
|
getSerializer(options?: ISerializeOptions): ISerializer;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { IClassRef } from '../../api/IClassRef';
|
|
2
|
-
import { IEntityRef } from '../../api/IEntityRef';
|
|
1
|
+
import { IClassRef } from '../../api/IClassRef.js';
|
|
2
|
+
import { IEntityRef } from '../../api/IEntityRef.js';
|
|
3
3
|
export interface IUnserializer {
|
|
4
4
|
unserialize(data: string): Promise<IClassRef | IEntityRef | (IClassRef | IEntityRef)[]>;
|
|
5
5
|
}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.SerializerRegistry = void 0;
|
|
4
|
-
const JsonSchema_1 = require("../json-schema/JsonSchema");
|
|
5
|
-
class SerializerRegistry {
|
|
1
|
+
import { JsonSchema } from '../json-schema/JsonSchema.js';
|
|
2
|
+
export class SerializerRegistry {
|
|
6
3
|
static register(factory) {
|
|
7
4
|
this.serializer[factory.getName()] = factory;
|
|
8
5
|
}
|
|
@@ -13,7 +10,6 @@ class SerializerRegistry {
|
|
|
13
10
|
return null;
|
|
14
11
|
}
|
|
15
12
|
}
|
|
16
|
-
exports.SerializerRegistry = SerializerRegistry;
|
|
17
13
|
SerializerRegistry.serializer = {};
|
|
18
|
-
SerializerRegistry.register(new
|
|
14
|
+
SerializerRegistry.register(new JsonSchema());
|
|
19
15
|
//# sourceMappingURL=SerializerRegistry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SerializerRegistry.js","sourceRoot":"","sources":["../../../../src/lib/serializer/SerializerRegistry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SerializerRegistry.js","sourceRoot":"","sources":["../../../../src/lib/serializer/SerializerRegistry.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAC;AAExD,MAAM,OAAO,kBAAkB;IAI7B,MAAM,CAAC,QAAQ,CAAC,OAA2B;QACzC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC;IAC/C,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,IAAY;QACrB,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;;AAXM,6BAAU,GAAwC,EAAE,CAAC;AAc9D,kBAAkB,CAAC,QAAQ,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { IClassRef } from '../../api/IClassRef';
|
|
2
|
-
import { IEntityRef } from '../../api/IEntityRef';
|
|
3
|
-
import { IValidationError } from './IValidationError';
|
|
4
|
-
import { IValidator } from './IValidator';
|
|
5
|
-
import { IValidatorEntry } from './IValidatorEntry';
|
|
1
|
+
import { IClassRef } from '../../api/IClassRef.js';
|
|
2
|
+
import { IEntityRef } from '../../api/IEntityRef.js';
|
|
3
|
+
import { IValidationError } from './IValidationError.js';
|
|
4
|
+
import { IValidator } from './IValidator.js';
|
|
5
|
+
import { IValidatorEntry } from './IValidatorEntry.js';
|
|
6
6
|
export declare class DefaultValidator {
|
|
7
7
|
private static validators;
|
|
8
8
|
private static lookupKeys;
|
|
@@ -1,27 +1,24 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
const Constants_1 = require("../Constants");
|
|
10
|
-
const MetadataRegistry_1 = require("../registry/MetadataRegistry");
|
|
11
|
-
class DefaultValidator {
|
|
1
|
+
import { assign, clone, defaults, get, intersection, isArray, isFunction, isObjectLike, keys, merge, set, uniq } from '@allgemein/base';
|
|
2
|
+
import { isClassRef } from '../../api/IClassRef.js';
|
|
3
|
+
import { isEntityRef } from '../../api/IEntityRef.js';
|
|
4
|
+
import { ClassUtils, MetadataStorage, NotYetImplementedError } from '@allgemein/base';
|
|
5
|
+
import { ClassRef } from '../ClassRef.js';
|
|
6
|
+
import { XS_ANNOTATION_OPTIONS_CACHE } from '../Constants.js';
|
|
7
|
+
import { MetadataRegistry } from '../registry/MetadataRegistry.js';
|
|
8
|
+
export class DefaultValidator {
|
|
12
9
|
static define(validator) {
|
|
13
10
|
this.validators.push(validator);
|
|
14
11
|
if (validator.involveOnOptionKey) {
|
|
15
12
|
this.lookupKeys.unshift(validator.involveOnOptionKey);
|
|
16
|
-
this.lookupKeys =
|
|
13
|
+
this.lookupKeys = uniq(this.lookupKeys);
|
|
17
14
|
}
|
|
18
15
|
}
|
|
19
16
|
static async validationInfo(ref) {
|
|
20
17
|
let clazz = null;
|
|
21
|
-
if (
|
|
18
|
+
if (isEntityRef(ref) || isClassRef(ref)) {
|
|
22
19
|
clazz = ref.getClass();
|
|
23
20
|
}
|
|
24
|
-
else if (
|
|
21
|
+
else if (isFunction(ref)) {
|
|
25
22
|
clazz = ref;
|
|
26
23
|
}
|
|
27
24
|
else {
|
|
@@ -32,7 +29,7 @@ class DefaultValidator {
|
|
|
32
29
|
static async validate(instance, ref) {
|
|
33
30
|
let classRef = null;
|
|
34
31
|
if (ref) {
|
|
35
|
-
if (
|
|
32
|
+
if (isEntityRef(ref)) {
|
|
36
33
|
classRef = ref.getClassRef();
|
|
37
34
|
}
|
|
38
35
|
else {
|
|
@@ -40,11 +37,11 @@ class DefaultValidator {
|
|
|
40
37
|
}
|
|
41
38
|
}
|
|
42
39
|
else {
|
|
43
|
-
const target =
|
|
40
|
+
const target = ClassUtils.getFunction(instance);
|
|
44
41
|
if (!target) {
|
|
45
|
-
throw new
|
|
42
|
+
throw new NotYetImplementedError();
|
|
46
43
|
}
|
|
47
|
-
classRef =
|
|
44
|
+
classRef = ClassRef.get(target);
|
|
48
45
|
}
|
|
49
46
|
// const entries:IPropertyExtentions[] = MetadataStorage
|
|
50
47
|
// .key(XS_ANNOTATION_OPTIONS_CACHE)
|
|
@@ -64,12 +61,12 @@ class DefaultValidator {
|
|
|
64
61
|
value = instance;
|
|
65
62
|
}
|
|
66
63
|
// @ts-ignore
|
|
67
|
-
let instanceOptions =
|
|
64
|
+
let instanceOptions = clone(toValidateEntry.options[handle.name]);
|
|
68
65
|
if (isPropertyCheck) {
|
|
69
66
|
instanceOptions.property = toValidateEntry.property;
|
|
70
67
|
}
|
|
71
68
|
if (handle.defaultOptions) {
|
|
72
|
-
|
|
69
|
+
defaults(instanceOptions, handle.defaultOptions);
|
|
73
70
|
}
|
|
74
71
|
if (!(await handle.fn(value, instanceOptions, instance))) {
|
|
75
72
|
const error = {
|
|
@@ -79,12 +76,12 @@ class DefaultValidator {
|
|
|
79
76
|
constraints: {}
|
|
80
77
|
};
|
|
81
78
|
classErrors.push(error);
|
|
82
|
-
let msg =
|
|
79
|
+
let msg = get(instanceOptions, 'message', null);
|
|
83
80
|
if (msg) {
|
|
84
81
|
msg = msg.replace('%propertyName', error.property).replace('%value', value);
|
|
85
|
-
|
|
82
|
+
keys(instanceOptions).forEach(k => {
|
|
86
83
|
let v = instanceOptions[k];
|
|
87
|
-
if (
|
|
84
|
+
if (isObjectLike(v) || isArray(v)) {
|
|
88
85
|
v = JSON.stringify(v);
|
|
89
86
|
}
|
|
90
87
|
msg = msg.replace('%options.' + k, v);
|
|
@@ -128,21 +125,21 @@ class DefaultValidator {
|
|
|
128
125
|
//
|
|
129
126
|
static getValidationHandlesForFn(fn) {
|
|
130
127
|
const entries = [];
|
|
131
|
-
const entriesSecond =
|
|
128
|
+
const entriesSecond = MetadataRegistry.$().getCached().filter(x => x.target === fn && intersection(this.lookupKeys, keys(x)).length > 0);
|
|
132
129
|
for (const e of entriesSecond) {
|
|
133
130
|
const handlesAndOptions = this.extractValidationInfox(e);
|
|
134
131
|
const validationEntry = {
|
|
135
132
|
target: fn,
|
|
136
133
|
};
|
|
137
|
-
|
|
134
|
+
assign(validationEntry, handlesAndOptions);
|
|
138
135
|
if (e.propertyName) {
|
|
139
136
|
validationEntry.property = e.propertyName;
|
|
140
137
|
}
|
|
141
138
|
entries.push(validationEntry);
|
|
142
139
|
}
|
|
143
|
-
const entriesFirst =
|
|
144
|
-
.key(
|
|
145
|
-
.filter((x) => x.object === fn &&
|
|
140
|
+
const entriesFirst = MetadataStorage
|
|
141
|
+
.key(XS_ANNOTATION_OPTIONS_CACHE)
|
|
142
|
+
.filter((x) => x.object === fn && intersection(this.lookupKeys, keys(x.options)).length > 0);
|
|
146
143
|
for (const e of entriesFirst) {
|
|
147
144
|
const alreadyAsProperty = entries.find(x => x.property === e.property);
|
|
148
145
|
const handlesAndOptions = this.extractValidationInfox(e.options);
|
|
@@ -154,14 +151,14 @@ class DefaultValidator {
|
|
|
154
151
|
continue;
|
|
155
152
|
}
|
|
156
153
|
alreadyAsProperty.handles.push(handle);
|
|
157
|
-
|
|
154
|
+
set(alreadyAsProperty.options, handle.name, get(handlesAndOptions.options, handle.name, {}));
|
|
158
155
|
}
|
|
159
156
|
}
|
|
160
157
|
else {
|
|
161
158
|
const validationEntry = {
|
|
162
159
|
target: fn,
|
|
163
160
|
};
|
|
164
|
-
|
|
161
|
+
assign(validationEntry, handlesAndOptions);
|
|
165
162
|
if (e.property) {
|
|
166
163
|
validationEntry.property = e.property;
|
|
167
164
|
}
|
|
@@ -171,28 +168,28 @@ class DefaultValidator {
|
|
|
171
168
|
return entries;
|
|
172
169
|
}
|
|
173
170
|
static extractValidationInfox(entryOptions) {
|
|
174
|
-
const intersect =
|
|
171
|
+
const intersect = intersection(this.lookupKeys, keys(entryOptions));
|
|
175
172
|
const handles = [];
|
|
176
173
|
const options = {};
|
|
177
174
|
for (const k of intersect) {
|
|
178
175
|
const isLookupKey = ['validate', 'format'].includes(k);
|
|
179
|
-
const valueForKey =
|
|
176
|
+
const valueForKey = get(entryOptions, k, null);
|
|
180
177
|
const handle = this.validators.find(x => x.name === valueForKey || x.involveOnOptionKey === k);
|
|
181
178
|
if (handle) {
|
|
182
179
|
const handleAlreadySet = handles.find(x => x.name === handle.name);
|
|
183
180
|
if (!handleAlreadySet) {
|
|
184
181
|
handles.push(handle);
|
|
185
182
|
}
|
|
186
|
-
let v =
|
|
183
|
+
let v = clone(get(entryOptions, 'validateOptions.' + handle.name, {}));
|
|
187
184
|
if (!isLookupKey) {
|
|
188
185
|
// pass additional value
|
|
189
|
-
v[handle.involveOnOptionKey] =
|
|
186
|
+
v[handle.involveOnOptionKey] = get(entryOptions, handle.involveOnOptionKey, null);
|
|
190
187
|
}
|
|
191
188
|
if (v) {
|
|
192
189
|
if (!options[handle.name]) {
|
|
193
190
|
options[handle.name] = {};
|
|
194
191
|
}
|
|
195
|
-
|
|
192
|
+
merge(options[handle.name], v);
|
|
196
193
|
}
|
|
197
194
|
}
|
|
198
195
|
}
|
|
@@ -202,7 +199,6 @@ class DefaultValidator {
|
|
|
202
199
|
};
|
|
203
200
|
}
|
|
204
201
|
}
|
|
205
|
-
exports.DefaultValidator = DefaultValidator;
|
|
206
202
|
DefaultValidator.validators = [];
|
|
207
203
|
DefaultValidator.lookupKeys = ['format', 'validate'];
|
|
208
204
|
//# sourceMappingURL=DefaultValidator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultValidator.js","sourceRoot":"","sources":["../../../../src/lib/validation/DefaultValidator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DefaultValidator.js","sourceRoot":"","sources":["../../../../src/lib/validation/DefaultValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IValidationOptions.js","sourceRoot":"","sources":["../../../../src/lib/validation/IValidationOptions.ts"],"names":[],"mappings":"AAAA,MAAM;AACN,oDAAoD;AACpD,MAAM;AACN,wCAAwC;AACxC,QAAQ;AACR,wFAAwF;AACxF,QAAQ;AACR,oBAAoB;AACpB,QAAQ;AACR,yDAAyD;AACzD,wEAAwE;AACxE,iFAAiF;AACjF,uEAAuE;AACvE,8EAA8E;AAC9E,8EAA8E;AAC9E,QAAQ;AACR,wFAAwF;AACxF,QAAQ;AACR,mDAAmD;AACnD,QAAQ;AACR,uBAAuB;AACvB,QAAQ;AACR,8FAA8F;AAC9F,QAAQ;AACR,sBAAsB;AACtB,mBAAmB;AACnB,IAAI;AACJ,kDAAkD"}
|
|
1
|
+
{"version":3,"file":"IValidationOptions.js","sourceRoot":"","sources":["../../../../src/lib/validation/IValidationOptions.ts"],"names":[],"mappings":";AAAA,MAAM;AACN,oDAAoD;AACpD,MAAM;AACN,wCAAwC;AACxC,QAAQ;AACR,wFAAwF;AACxF,QAAQ;AACR,oBAAoB;AACpB,QAAQ;AACR,yDAAyD;AACzD,wEAAwE;AACxE,iFAAiF;AACjF,uEAAuE;AACvE,8EAA8E;AAC9E,8EAA8E;AAC9E,QAAQ;AACR,wFAAwF;AACxF,QAAQ;AACR,mDAAmD;AACnD,QAAQ;AACR,uBAAuB;AACvB,QAAQ;AACR,8FAA8F;AAC9F,QAAQ;AACR,sBAAsB;AACtB,mBAAmB;AACnB,IAAI;AACJ,kDAAkD"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { IValidationError } from './IValidationError';
|
|
2
|
-
import { IClassRef } from '../../api/IClassRef';
|
|
3
|
-
import { IEntityRef } from '../../api/IEntityRef';
|
|
4
|
-
import { IValidatorEntry } from './IValidatorEntry';
|
|
1
|
+
import { IValidationError } from './IValidationError.js';
|
|
2
|
+
import { IClassRef } from '../../api/IClassRef.js';
|
|
3
|
+
import { IEntityRef } from '../../api/IEntityRef.js';
|
|
4
|
+
import { IValidatorEntry } from './IValidatorEntry.js';
|
|
5
5
|
export type validate_function = (instance: any, ref?: IClassRef | IEntityRef) => Promise<IValidationError[]>;
|
|
6
6
|
export type validate_info_function = (ref?: Function | IClassRef | IEntityRef) => Promise<IValidatorEntry[]>;
|
|
7
7
|
/**
|
|
@@ -1,12 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.Validator = void 0;
|
|
4
|
-
const lodash_1 = require("lodash");
|
|
5
|
-
const DefaultValidator_1 = require("./DefaultValidator");
|
|
1
|
+
import { isEmpty } from '@allgemein/base';
|
|
2
|
+
import { DefaultValidator } from './DefaultValidator.js';
|
|
6
3
|
/**
|
|
7
4
|
* Abstraction for defualt validator functions
|
|
8
5
|
*/
|
|
9
|
-
class Validator {
|
|
6
|
+
export class Validator {
|
|
10
7
|
static add(fn, fnInfo) {
|
|
11
8
|
this.fn.push(fn);
|
|
12
9
|
this.info.push(fnInfo);
|
|
@@ -16,25 +13,24 @@ class Validator {
|
|
|
16
13
|
this.info = [];
|
|
17
14
|
}
|
|
18
15
|
static async getValidationEntries(fn) {
|
|
19
|
-
if (
|
|
16
|
+
if (isEmpty(this.info)) {
|
|
20
17
|
return [];
|
|
21
18
|
}
|
|
22
19
|
const data = await Promise.all(this.info.map(x => x(fn)));
|
|
23
20
|
return [].concat(...data);
|
|
24
21
|
}
|
|
25
22
|
static async validate(instance, ref) {
|
|
26
|
-
if (
|
|
23
|
+
if (isEmpty(this.fn)) {
|
|
27
24
|
return [];
|
|
28
25
|
}
|
|
29
26
|
const data = await Promise.all(this.fn.map(x => x(instance, ref)));
|
|
30
27
|
return [].concat(...data);
|
|
31
28
|
}
|
|
32
29
|
}
|
|
33
|
-
exports.Validator = Validator;
|
|
34
30
|
Validator.fn = [
|
|
35
|
-
|
|
31
|
+
DefaultValidator.validate.bind(DefaultValidator)
|
|
36
32
|
];
|
|
37
33
|
Validator.info = [
|
|
38
|
-
|
|
34
|
+
DefaultValidator.validationInfo.bind(DefaultValidator)
|
|
39
35
|
];
|
|
40
36
|
//# sourceMappingURL=Validator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../../../src/lib/validation/Validator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../../../src/lib/validation/Validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,iBAAiB,CAAC;AAIxC,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAOvD;;GAEG;AACH,MAAM,OAAO,SAAS;IAUpB,MAAM,CAAC,GAAG,CAAC,EAAqB,EAAE,MAA8B;QAC9D,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC;IAED,MAAM,CAAC,KAAK;QACV,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAqC;QACrE,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC1D,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAa,EAAE,GAA4B;QAC/D,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACrB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;QACnE,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5B,CAAC;;AAhCc,YAAE,GAAwB;IACvC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC;CACjD,CAAC;AAEa,cAAI,GAA6B;IAC9C,gBAAgB,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC;CACvD,CAAC"}
|