@allgemein/schema-api 1.7.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 -23
- 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
package/lib/AbstractRef.js
CHANGED
|
@@ -1,20 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const MetadataRegistry_1 = require("./registry/MetadataRegistry");
|
|
8
|
-
class AbstractRef {
|
|
9
|
-
constructor(type, name, object = null, namespace = Constants_1.DEFAULT_NAMESPACE) {
|
|
1
|
+
import { assign, get, has, isEmpty, keys, set, snakeCase } from '@allgemein/base';
|
|
2
|
+
import { C_INTERNAL_NAME, C_NAME, DEFAULT_NAMESPACE, JS_DATA_TYPES, METATYPE_PROPERTY, METATYPE_SCHEMA, } from './Constants.js';
|
|
3
|
+
import { isClassRef } from '../api/IClassRef.js';
|
|
4
|
+
import { MetadataRegistry } from './registry/MetadataRegistry.js';
|
|
5
|
+
export class AbstractRef {
|
|
6
|
+
constructor(type, name, object = null, namespace = DEFAULT_NAMESPACE) {
|
|
10
7
|
/**
|
|
11
8
|
* Namespace better registry of this entry
|
|
12
9
|
*/
|
|
13
|
-
this.namespace =
|
|
10
|
+
this.namespace = DEFAULT_NAMESPACE;
|
|
14
11
|
this.namespace = namespace;
|
|
15
12
|
this.metaType = type;
|
|
16
13
|
this.name = name;
|
|
17
|
-
if (
|
|
14
|
+
if (isClassRef(object)) {
|
|
18
15
|
this.object = object;
|
|
19
16
|
}
|
|
20
17
|
else {
|
|
@@ -29,29 +26,29 @@ class AbstractRef {
|
|
|
29
26
|
}
|
|
30
27
|
getOptionsEntry() {
|
|
31
28
|
if (!this._cachedOptions) {
|
|
32
|
-
if (this.metaType ===
|
|
33
|
-
this._cachedOptions =
|
|
29
|
+
if (this.metaType === METATYPE_PROPERTY) {
|
|
30
|
+
this._cachedOptions = MetadataRegistry.$().findCached(this.metaType, (x) => x.target === this.getClass(true) &&
|
|
34
31
|
x.propertyName === this.name &&
|
|
35
32
|
x.namespace === this.getNamespace());
|
|
36
33
|
if (!this._cachedOptions) {
|
|
37
34
|
this._cachedOptions = { target: this.getClass(true), propertyName: this.name, namespace: this.getNamespace() };
|
|
38
|
-
|
|
35
|
+
MetadataRegistry.$().addCached(this.metaType, this._cachedOptions);
|
|
39
36
|
}
|
|
40
37
|
}
|
|
41
|
-
else if (this.metaType ===
|
|
42
|
-
this._cachedOptions =
|
|
38
|
+
else if (this.metaType === METATYPE_SCHEMA) {
|
|
39
|
+
this._cachedOptions = MetadataRegistry.$().findCached(this.metaType, (x) => x.name === this.name &&
|
|
43
40
|
x.namespace === this.getNamespace());
|
|
44
41
|
if (!this._cachedOptions) {
|
|
45
42
|
this._cachedOptions = { name: this.name, namespace: this.getNamespace() };
|
|
46
|
-
|
|
43
|
+
MetadataRegistry.$().addCached(this.metaType, this._cachedOptions);
|
|
47
44
|
}
|
|
48
45
|
}
|
|
49
46
|
else {
|
|
50
|
-
this._cachedOptions =
|
|
47
|
+
this._cachedOptions = MetadataRegistry.$().findCached(this.metaType, (x) => x.target === this.getClass(true) &&
|
|
51
48
|
x.namespace === this.getNamespace());
|
|
52
49
|
if (!this._cachedOptions) {
|
|
53
50
|
this._cachedOptions = { target: this.getClass(true), namespace: this.getNamespace() };
|
|
54
|
-
|
|
51
|
+
MetadataRegistry.$().addCached(this.metaType, this._cachedOptions);
|
|
55
52
|
}
|
|
56
53
|
}
|
|
57
54
|
}
|
|
@@ -59,29 +56,29 @@ class AbstractRef {
|
|
|
59
56
|
}
|
|
60
57
|
getOptions(key, defaultValue = null) {
|
|
61
58
|
if (key) {
|
|
62
|
-
return
|
|
59
|
+
return get(this.getOptionsEntry(), key, defaultValue);
|
|
63
60
|
}
|
|
64
61
|
return this.getOptionsEntry();
|
|
65
62
|
}
|
|
66
63
|
setOptions(options) {
|
|
67
|
-
if (options && !
|
|
64
|
+
if (options && !isEmpty(keys(options))) {
|
|
68
65
|
const opts = this.getOptionsEntry();
|
|
69
66
|
// if same object cause taken from MetadataRegistry then ignore setting
|
|
70
67
|
if (opts !== options) {
|
|
71
|
-
for (const k of
|
|
68
|
+
for (const k of keys(opts)) {
|
|
72
69
|
delete opts[k];
|
|
73
70
|
}
|
|
74
|
-
|
|
71
|
+
assign(opts, options);
|
|
75
72
|
}
|
|
76
73
|
}
|
|
77
74
|
}
|
|
78
75
|
setOption(key, value) {
|
|
79
76
|
const opts = this.getOptionsEntry();
|
|
80
|
-
|
|
77
|
+
set(opts, key, value);
|
|
81
78
|
}
|
|
82
79
|
hasOption(key) {
|
|
83
80
|
const opts = this.getOptionsEntry();
|
|
84
|
-
return
|
|
81
|
+
return has(opts, key);
|
|
85
82
|
}
|
|
86
83
|
/**
|
|
87
84
|
* Return class ref
|
|
@@ -116,21 +113,21 @@ class AbstractRef {
|
|
|
116
113
|
* Return name in snake case notation
|
|
117
114
|
*/
|
|
118
115
|
get machineName() {
|
|
119
|
-
return
|
|
116
|
+
return snakeCase(this.name);
|
|
120
117
|
}
|
|
121
118
|
/**
|
|
122
119
|
* Return internal name, check if internalName is set else check if name options is present
|
|
123
120
|
*
|
|
124
121
|
*/
|
|
125
122
|
get storingName() {
|
|
126
|
-
let name = this.getOptions(
|
|
123
|
+
let name = this.getOptions(C_INTERNAL_NAME, null);
|
|
127
124
|
if (name) {
|
|
128
125
|
return name;
|
|
129
126
|
}
|
|
130
|
-
if (this.metaType ===
|
|
131
|
-
name = this.getOptions(
|
|
127
|
+
if (this.metaType === METATYPE_PROPERTY) {
|
|
128
|
+
name = this.getOptions(C_NAME, null);
|
|
132
129
|
if (!name) {
|
|
133
|
-
name =
|
|
130
|
+
name = snakeCase(this.name);
|
|
134
131
|
}
|
|
135
132
|
}
|
|
136
133
|
else {
|
|
@@ -138,7 +135,7 @@ class AbstractRef {
|
|
|
138
135
|
name = this.name;
|
|
139
136
|
}
|
|
140
137
|
else {
|
|
141
|
-
name =
|
|
138
|
+
name = snakeCase(this.name);
|
|
142
139
|
}
|
|
143
140
|
}
|
|
144
141
|
return name;
|
|
@@ -147,8 +144,7 @@ class AbstractRef {
|
|
|
147
144
|
* Return supported primitive data types
|
|
148
145
|
*/
|
|
149
146
|
getSupportedDataTypes() {
|
|
150
|
-
return
|
|
147
|
+
return JS_DATA_TYPES;
|
|
151
148
|
}
|
|
152
149
|
}
|
|
153
|
-
exports.AbstractRef = AbstractRef;
|
|
154
150
|
//# sourceMappingURL=AbstractRef.js.map
|
package/lib/AbstractRef.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractRef.js","sourceRoot":"","sources":["../../../src/lib/AbstractRef.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AbstractRef.js","sourceRoot":"","sources":["../../../src/lib/AbstractRef.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { MERGE_TYPE } from './Constants';
|
|
2
|
-
import { IClassRef } from '../api/IClassRef';
|
|
1
|
+
import { MERGE_TYPE } from './Constants.js';
|
|
2
|
+
import { IClassRef } from '../api/IClassRef.js';
|
|
3
3
|
export declare class AnnotationsHelper {
|
|
4
4
|
static forPropertyOn(object: Function, property: string, options: any, merge?: MERGE_TYPE): void;
|
|
5
5
|
static forEntityOn(object: Function, options: any, merge?: MERGE_TYPE): void;
|
package/lib/AnnotationsHelper.js
CHANGED
|
@@ -1,27 +1,24 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const Constants_1 = require("./Constants");
|
|
7
|
-
const base_1 = require("@allgemein/base");
|
|
8
|
-
class AnnotationsHelper {
|
|
1
|
+
import { assign, defaults, filter, get, isArray, isEmpty, isObjectLike, isUndefined, keys, merge } from '@allgemein/base';
|
|
2
|
+
import { ClassRef } from './ClassRef.js';
|
|
3
|
+
import { METATYPE_ENTITY, METATYPE_PROPERTY, XS_ANNOTATION_OPTIONS_CACHE } from './Constants.js';
|
|
4
|
+
import { ClassUtils, MetadataStorage } from '@allgemein/base';
|
|
5
|
+
export class AnnotationsHelper {
|
|
9
6
|
static forPropertyOn(object, property, options, merge) {
|
|
10
|
-
const source =
|
|
11
|
-
const classRefs =
|
|
7
|
+
const source = ClassUtils.getFunction(object);
|
|
8
|
+
const classRefs = ClassRef.filter(c => c.getClass() === source);
|
|
12
9
|
for (const ref of classRefs) {
|
|
13
10
|
let prop = ref.getPropertyRef(property);
|
|
14
11
|
if (prop) {
|
|
15
12
|
const pOptions = prop.getOptions();
|
|
16
|
-
|
|
13
|
+
defaults(pOptions, options);
|
|
17
14
|
if (ref.hasEntityRef()) {
|
|
18
15
|
const eOptions = ref.getEntityRef().getOptions();
|
|
19
|
-
|
|
16
|
+
defaults(eOptions, options);
|
|
20
17
|
}
|
|
21
18
|
}
|
|
22
19
|
}
|
|
23
|
-
|
|
24
|
-
type:
|
|
20
|
+
MetadataStorage.key(XS_ANNOTATION_OPTIONS_CACHE).push({
|
|
21
|
+
type: METATYPE_PROPERTY,
|
|
25
22
|
object: source,
|
|
26
23
|
property: property,
|
|
27
24
|
options: options,
|
|
@@ -29,20 +26,20 @@ class AnnotationsHelper {
|
|
|
29
26
|
});
|
|
30
27
|
}
|
|
31
28
|
static forEntityOn(object, options, merge) {
|
|
32
|
-
const source =
|
|
33
|
-
const classRefs =
|
|
29
|
+
const source = ClassUtils.getFunction(object);
|
|
30
|
+
const classRefs = ClassRef.filter(c => c.getClass() === source);
|
|
34
31
|
for (const ref of classRefs) {
|
|
35
32
|
if (ref) {
|
|
36
33
|
let pOptions = ref.getOptions();
|
|
37
|
-
|
|
34
|
+
defaults(pOptions, options);
|
|
38
35
|
if (ref.hasEntityRef()) {
|
|
39
36
|
const eOptions = ref.getEntityRef().getOptions();
|
|
40
|
-
|
|
37
|
+
defaults(eOptions, options);
|
|
41
38
|
}
|
|
42
39
|
}
|
|
43
40
|
}
|
|
44
|
-
|
|
45
|
-
type:
|
|
41
|
+
MetadataStorage.key(XS_ANNOTATION_OPTIONS_CACHE).push({
|
|
42
|
+
type: METATYPE_ENTITY,
|
|
46
43
|
object: source,
|
|
47
44
|
options: options,
|
|
48
45
|
merge: merge
|
|
@@ -53,28 +50,28 @@ class AnnotationsHelper {
|
|
|
53
50
|
return;
|
|
54
51
|
}
|
|
55
52
|
const object = classRef.getClass(true);
|
|
56
|
-
const addOns =
|
|
57
|
-
(classRef.isPlaceholder ?
|
|
53
|
+
const addOns = filter(MetadataStorage.key(XS_ANNOTATION_OPTIONS_CACHE), (x) => property ?
|
|
54
|
+
(classRef.isPlaceholder ? ClassUtils.getClassName(x.object) === classRef.name : x.object === object) &&
|
|
58
55
|
x.property === property &&
|
|
59
|
-
x.type ==
|
|
60
|
-
(classRef.isPlaceholder ?
|
|
61
|
-
x.type ==
|
|
56
|
+
x.type == METATYPE_PROPERTY :
|
|
57
|
+
(classRef.isPlaceholder ? ClassUtils.getClassName(x.object) === classRef.name : x.object === object) &&
|
|
58
|
+
x.type == METATYPE_ENTITY);
|
|
62
59
|
if (addOns) {
|
|
63
60
|
addOns.forEach(addOn => {
|
|
64
|
-
const mergeType =
|
|
61
|
+
const mergeType = get(addOn, 'merge', 'default');
|
|
65
62
|
switch (mergeType) {
|
|
66
63
|
case 'merge':
|
|
67
|
-
for (const k of
|
|
68
|
-
if (
|
|
64
|
+
for (const k of keys(addOn.options)) {
|
|
65
|
+
if (isUndefined(options[k]) || isEmpty(options[k])) {
|
|
69
66
|
// create if not present
|
|
70
67
|
options[k] = addOn.options[k];
|
|
71
68
|
}
|
|
72
|
-
else if (
|
|
69
|
+
else if (isArray(options[k])) {
|
|
73
70
|
// add to array
|
|
74
71
|
options[k].push(addOn.options[k]);
|
|
75
72
|
}
|
|
76
|
-
else if (
|
|
77
|
-
|
|
73
|
+
else if (isObjectLike(options[k]) && isObjectLike(addOn.options[k])) {
|
|
74
|
+
merge(options[k], addOn.options[k]);
|
|
78
75
|
}
|
|
79
76
|
else {
|
|
80
77
|
// create array
|
|
@@ -83,14 +80,13 @@ class AnnotationsHelper {
|
|
|
83
80
|
}
|
|
84
81
|
break;
|
|
85
82
|
case 'assign':
|
|
86
|
-
|
|
83
|
+
assign(options, addOn.options);
|
|
87
84
|
break;
|
|
88
85
|
default:
|
|
89
|
-
|
|
86
|
+
defaults(options, addOn.options);
|
|
90
87
|
}
|
|
91
88
|
});
|
|
92
89
|
}
|
|
93
90
|
}
|
|
94
91
|
}
|
|
95
|
-
exports.AnnotationsHelper = AnnotationsHelper;
|
|
96
92
|
//# sourceMappingURL=AnnotationsHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationsHelper.js","sourceRoot":"","sources":["../../../src/lib/AnnotationsHelper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AnnotationsHelper.js","sourceRoot":"","sources":["../../../src/lib/AnnotationsHelper.ts"],"names":[],"mappings":"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"}
|
package/lib/ClassRef.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { METADATA_TYPE } from './Constants';
|
|
2
|
-
import { IClassRef } from '../api/IClassRef';
|
|
3
|
-
import { IEntityRef } from '../api/IEntityRef';
|
|
4
|
-
import { IPropertyRef } from '../api/IPropertyRef';
|
|
5
|
-
import { IBuildOptions } from '../api/IBuildOptions';
|
|
6
|
-
import { AbstractRef } from './AbstractRef';
|
|
1
|
+
import { METADATA_TYPE } from './Constants.js';
|
|
2
|
+
import { IClassRef } from '../api/IClassRef.js';
|
|
3
|
+
import { IEntityRef } from '../api/IEntityRef.js';
|
|
4
|
+
import { IPropertyRef } from '../api/IPropertyRef.js';
|
|
5
|
+
import { IBuildOptions } from '../api/IBuildOptions.js';
|
|
6
|
+
import { AbstractRef } from './AbstractRef.js';
|
|
7
7
|
/**
|
|
8
8
|
* Reflective reference to a class function
|
|
9
9
|
*
|
|
@@ -92,7 +92,7 @@ export declare class ClassRef extends AbstractRef implements IClassRef {
|
|
|
92
92
|
* @param resolve
|
|
93
93
|
*/
|
|
94
94
|
static getGlobal(klass: string | Function, resolve?: boolean): ClassRef;
|
|
95
|
-
getRegistry(): import("
|
|
95
|
+
getRegistry(): import("../browser.js").ILookupRegistry;
|
|
96
96
|
getEntityRef(): IEntityRef;
|
|
97
97
|
hasEntityRef(): boolean;
|
|
98
98
|
create<T>(addinfo?: boolean): T;
|