@allgemein/schema-api 1.5.1 → 1.5.5
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/decorators/Property.js +1 -1
- package/decorators/Property.js.map +1 -1
- package/decorators/validate/Regex.js +3 -0
- package/decorators/validate/Regex.js.map +1 -1
- package/lib/AbstractRef.d.ts +5 -1
- package/lib/AbstractRef.js +7 -1
- package/lib/AbstractRef.js.map +1 -1
- package/lib/Constants.d.ts +5 -0
- package/lib/Constants.js +6 -1
- package/lib/Constants.js.map +1 -1
- package/lib/json-schema/IJsonSchemaSerializeOptions.d.ts +5 -0
- package/lib/json-schema/IJsonSchemaSerializeOptions.js.map +1 -1
- package/lib/json-schema/JsonSchema7Serializer.d.ts +1 -0
- package/lib/json-schema/JsonSchema7Serializer.js +15 -2
- package/lib/json-schema/JsonSchema7Serializer.js.map +1 -1
- package/lib/options/IPropertyOptions.d.ts +4 -0
- package/lib/options/IPropertyOptions.js.map +1 -1
- package/lib/registry/AbstractRegistry.d.ts +4 -1
- package/lib/registry/AbstractRegistry.js +5 -1
- package/lib/registry/AbstractRegistry.js.map +1 -1
- package/lib/registry/DefaultNamespacedRegistry.d.ts +2 -0
- package/lib/registry/DefaultNamespacedRegistry.js +28 -20
- package/lib/registry/DefaultNamespacedRegistry.js.map +1 -1
- package/lib/registry/DefaultPropertyRef.d.ts +21 -0
- package/lib/registry/DefaultPropertyRef.js +36 -6
- package/lib/registry/DefaultPropertyRef.js.map +1 -1
- package/lib/registry/IRegistryOptions.d.ts +8 -0
- package/lib/registry/IRegistryOptions.js +4 -0
- package/lib/registry/IRegistryOptions.js.map +1 -0
- package/lib/registry/MetadataRegistry.d.ts +14 -0
- package/lib/registry/MetadataRegistry.js +23 -9
- package/lib/registry/MetadataRegistry.js.map +1 -1
- package/lib/registry/RegistryFactory.d.ts +2 -1
- package/lib/registry/RegistryFactory.js +4 -4
- package/lib/registry/RegistryFactory.js.map +1 -1
- package/package.json +13 -13
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ILookupRegistry } from '../../api/ILookupRegistry';
|
|
2
2
|
import { ClassType } from '../Constants';
|
|
3
|
+
import { IRegistryOptions } from './IRegistryOptions';
|
|
3
4
|
export declare class RegistryFactory {
|
|
4
5
|
static $types: {
|
|
5
6
|
pattern: string | RegExp;
|
|
@@ -13,7 +14,7 @@ export declare class RegistryFactory {
|
|
|
13
14
|
*
|
|
14
15
|
* @param namespace
|
|
15
16
|
*/
|
|
16
|
-
static get<T extends ILookupRegistry>(namespace?: string): T;
|
|
17
|
+
static get<T extends ILookupRegistry>(namespace?: string, options?: IRegistryOptions): T;
|
|
17
18
|
/**
|
|
18
19
|
* Remove registry from handles list
|
|
19
20
|
*
|
|
@@ -17,25 +17,25 @@ class RegistryFactory {
|
|
|
17
17
|
*
|
|
18
18
|
* @param namespace
|
|
19
19
|
*/
|
|
20
|
-
static get(namespace = Constants_1.DEFAULT_NAMESPACE) {
|
|
20
|
+
static get(namespace = Constants_1.DEFAULT_NAMESPACE, options) {
|
|
21
21
|
if (!this.$handles[namespace]) {
|
|
22
22
|
for (const type of this.$types) {
|
|
23
23
|
if ((0, lodash_1.isString)(type.pattern)) {
|
|
24
24
|
if (namespace === type.pattern) {
|
|
25
|
-
this.$handles[namespace] = Reflect.construct(type.registryClass, [namespace]);
|
|
25
|
+
this.$handles[namespace] = Reflect.construct(type.registryClass, [namespace, options]);
|
|
26
26
|
break;
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
else {
|
|
30
30
|
if ((0, lodash_1.isRegExp)(type.pattern) && type.pattern.test(namespace)) {
|
|
31
|
-
this.$handles[namespace] = Reflect.construct(type.registryClass, [namespace]);
|
|
31
|
+
this.$handles[namespace] = Reflect.construct(type.registryClass, [namespace, options]);
|
|
32
32
|
break;
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
if (!this.$handles[namespace]) {
|
|
37
37
|
// create default as fallback if nothing passes
|
|
38
|
-
this.$handles[namespace] = new DefaultNamespacedRegistry_1.DefaultNamespacedRegistry(namespace);
|
|
38
|
+
this.$handles[namespace] = new DefaultNamespacedRegistry_1.DefaultNamespacedRegistry(namespace, options);
|
|
39
39
|
}
|
|
40
40
|
if (this.$handles[namespace].prepare) {
|
|
41
41
|
this.$handles[namespace].prepare();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/lib/registry/RegistryFactory.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,mCAAqD;AAErD,4CAA2E;AAC3E,2EAAsE;AACtE,yDAAoD;AACpD,0CAA0C;
|
|
1
|
+
{"version":3,"sources":["../../../src/lib/registry/RegistryFactory.ts"],"names":[],"mappings":"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","file":"RegistryFactory.js","sourcesContent":["/**\n * Schema definitions can be different depending by handled structure.\n * We want use one api for use and accessing objects. The registry handle for a namespace can be\n * registered here.\n */\nimport {has, isRegExp, isString, keys} from 'lodash';\nimport {ILookupRegistry} from '../../api/ILookupRegistry';\nimport {ClassType, DEFAULT_NAMESPACE, METATYPE_ENTITY} from '../Constants';\nimport {DefaultNamespacedRegistry} from './DefaultNamespacedRegistry';\nimport {MetadataRegistry} from './MetadataRegistry';\nimport {C_DEFAULT} from '@allgemein/base';\nimport {IRegistryOptions} from './IRegistryOptions';\n\nexport class RegistryFactory {\n\n static $types: { pattern: string | RegExp, registryClass: ClassType<ILookupRegistry> }[] = [\n {\n pattern: /.*/,\n registryClass: DefaultNamespacedRegistry\n }\n ];\n\n\n static $handles: { [key: string]: ILookupRegistry } = {};\n\n\n /**\n * Return the registry handling schema/objects of given context or if not exists the generic default namescaped registry\n *\n * @param namespace\n */\n static get<T extends ILookupRegistry>(namespace: string = DEFAULT_NAMESPACE, options?: IRegistryOptions): T {\n if (!this.$handles[namespace]) {\n for (const type of this.$types) {\n if (isString(type.pattern)) {\n if (namespace === type.pattern) {\n this.$handles[namespace] = Reflect.construct(type.registryClass, [namespace, options]);\n break;\n }\n } else {\n if (isRegExp(type.pattern) && type.pattern.test(namespace)) {\n this.$handles[namespace] = Reflect.construct(type.registryClass, [namespace, options]);\n break;\n }\n }\n }\n\n if (!this.$handles[namespace]) {\n // create default as fallback if nothing passes\n this.$handles[namespace] = new DefaultNamespacedRegistry(namespace, options);\n }\n\n if (this.$handles[namespace].prepare) {\n this.$handles[namespace].prepare();\n }\n }\n return this.$handles[namespace] as T;\n }\n\n /**\n * Remove registry from handles list\n *\n * @param namespace\n */\n static remove(namespace: string) {\n if (has(this.$handles, namespace)) {\n this.get(namespace).reset();\n }\n delete this.$handles[namespace];\n }\n\n\n /**\n * Register a special registry for a given namespace or pattern, remove previous if existed\n *\n * @param namespace\n * @param registry\n */\n static register(namespace: string | RegExp, registryClass: ClassType<ILookupRegistry>) {\n const existsAlready = this.$types.find(x =>\n isString(x.pattern) && isString(namespace) ? x.pattern === namespace :\n isRegExp(x.pattern) && isRegExp(namespace) ? x.pattern.source === namespace.source :\n x.pattern === namespace);\n if (!existsAlready) {\n this.$types.unshift({\n pattern: namespace,\n registryClass: registryClass\n });\n }\n }\n\n /**\n * Return active and registered namespaces\n */\n static getNamespaces() {\n return keys(this.$handles);\n }\n\n static getTargets() {\n return MetadataRegistry.$().getTargets();\n }\n\n /**\n * Return all declared namespaces\n */\n static getDeclaredNamespaces(): { target: Function, namespace: string }[] {\n return [].concat(...MetadataRegistry.$().getTargets().map(x => {\n const entries = MetadataRegistry.$().getByContextAndTarget(METATYPE_ENTITY, x, 'merge');\n return entries.map(x => {\n return {target: x.target, namespace: x.namespace ? x.namespace : C_DEFAULT};\n });\n }));\n }\n\n\n static reset() {\n for (const ns of this.getNamespaces()) {\n this.remove(ns);\n }\n }\n\n}\n"],"sourceRoot":"../.."}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@allgemein/schema-api",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.5",
|
|
4
4
|
"description": "Library for schema api",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"private": false,
|
|
@@ -33,22 +33,22 @@
|
|
|
33
33
|
},
|
|
34
34
|
"homepage": "https://github.com/allgemein-node/schema-api#readme",
|
|
35
35
|
"devDependencies": {
|
|
36
|
-
"@allgemein/packaging": "^1.2.
|
|
36
|
+
"@allgemein/packaging": "^1.2.14",
|
|
37
37
|
"@testdeck/mocha": "^0.1.2",
|
|
38
38
|
"@types/chai": "^4.2.22",
|
|
39
|
-
"@types/glob": "^7.
|
|
39
|
+
"@types/glob": "^7.2.0",
|
|
40
40
|
"@types/json-schema": "^7.0.9",
|
|
41
|
-
"@types/lodash": "^4.14.
|
|
41
|
+
"@types/lodash": "^4.14.176",
|
|
42
42
|
"@types/mocha": "^9.0.0",
|
|
43
|
-
"@types/node": "^16.
|
|
44
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
45
|
-
"@typescript-eslint/parser": "^
|
|
43
|
+
"@types/node": "^16.11.2",
|
|
44
|
+
"@typescript-eslint/eslint-plugin": "^5.1.0",
|
|
45
|
+
"@typescript-eslint/parser": "^5.1.0",
|
|
46
46
|
"chai": "^4.3.4",
|
|
47
47
|
"codecov": "^3.8.3",
|
|
48
48
|
"codelyzer": "^6.0.2",
|
|
49
49
|
"del": "6.0.0",
|
|
50
|
-
"eslint": "^
|
|
51
|
-
"eslint-plugin-import": "^2.
|
|
50
|
+
"eslint": "^8.0.1",
|
|
51
|
+
"eslint-plugin-import": "^2.25.2",
|
|
52
52
|
"got": "^11.8.2",
|
|
53
53
|
"gulp": "4.0.2",
|
|
54
54
|
"gulp-bump": "^3.2.0",
|
|
@@ -58,14 +58,14 @@
|
|
|
58
58
|
"gulp-sourcemaps": "3.0.0",
|
|
59
59
|
"gulp-typescript": "5.0.1",
|
|
60
60
|
"merge-stream": "^2.0.0",
|
|
61
|
-
"mocha": "^9.1.
|
|
61
|
+
"mocha": "^9.1.3",
|
|
62
62
|
"nyc": "^15.1.0",
|
|
63
63
|
"reflect-metadata": "^0.1.13",
|
|
64
|
-
"ts-node": "^10.
|
|
65
|
-
"typescript": "4.4.
|
|
64
|
+
"ts-node": "^10.3.1",
|
|
65
|
+
"typescript": "4.4.4"
|
|
66
66
|
},
|
|
67
67
|
"dependencies": {
|
|
68
|
-
"@allgemein/base": "^1.6.
|
|
68
|
+
"@allgemein/base": "^1.6.2"
|
|
69
69
|
},
|
|
70
70
|
"peerDependencies": {
|
|
71
71
|
"reflect-metadata": "^0.1.13"
|