@spinajs/configuration 2.0.490 → 2.0.494
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/lib/cjs/fp.d.ts.map +1 -1
- package/lib/cjs/fp.js +11 -3
- package/lib/cjs/fp.js.map +1 -1
- package/lib/mjs/fp.d.ts.map +1 -1
- package/lib/mjs/fp.js +12 -4
- package/lib/mjs/fp.js.map +1 -1
- package/lib/tsconfig.cjs.tsbuildinfo +1 -1
- package/lib/tsconfig.mjs.tsbuildinfo +1 -1
- package/package.json +82 -80
package/lib/cjs/fp.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fp.d.ts","sourceRoot":"","sources":["../../src/fp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAqC,MAAM,aAAa,CAAC;AAGvE;;;;;;GAMG;AACH,wBAAgB,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"fp.d.ts","sourceRoot":"","sources":["../../src/fp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAqC,MAAM,aAAa,CAAC;AAGvE;;;;;;GAMG;AACH,wBAAgB,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,aAWrD;AAED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,MAAM,OAAO,CAAC,CAAC,CAAC,CA2BxF"}
|
package/lib/cjs/fp.js
CHANGED
|
@@ -18,7 +18,9 @@ function _cfg(path, defaultValue) {
|
|
|
18
18
|
throw new di_1.ResolveException('Configuration service is not registered in DI container, register it to use _cfg function');
|
|
19
19
|
}
|
|
20
20
|
(0, util_1._check_arg)((0, util_1._non_empty)())(path, 'path');
|
|
21
|
-
|
|
21
|
+
// only null / undefined are invalid config values - empty arrays, empty objects
|
|
22
|
+
// and falsy primitives ( 0, '', false ) are legitimate configuration
|
|
23
|
+
return () => (0, util_1._check_arg)((0, util_1._non_null)(), (0, util_1._non_undefined)())(cfg.get(path, defaultValue), path);
|
|
22
24
|
}
|
|
23
25
|
/**
|
|
24
26
|
* Resolves service from DI container base on path from configuration
|
|
@@ -28,8 +30,14 @@ function _cfg(path, defaultValue) {
|
|
|
28
30
|
* @returns
|
|
29
31
|
*/
|
|
30
32
|
function _service(path, type, options) {
|
|
31
|
-
return () => (0, util_1._chain)(_cfg(path), (0, util_1._catch)(({ service }) => (0, util_1._chain)(() => di_1.DI.getRegisteredTypes(type), (types) =>
|
|
32
|
-
|
|
33
|
+
return () => (0, util_1._chain)(_cfg(path), (0, util_1._catch)(({ service }) => (0, util_1._chain)(() => di_1.DI.getRegisteredTypes(type), (types) => {
|
|
34
|
+
const t = types.find((x) => x.name === service);
|
|
35
|
+
if (!t) {
|
|
36
|
+
throw new di_1.ResolveException(`Service ${service} is not registered for type ${type.name}`);
|
|
37
|
+
}
|
|
38
|
+
return t;
|
|
39
|
+
}, (t) => di_1.DI.resolve(t, options)), (err) => {
|
|
40
|
+
throw new di_1.ResolveException(`Cannot resolve service from ${path}: ${err.message}. Check your configuration file at this path.`, err);
|
|
33
41
|
}));
|
|
34
42
|
}
|
|
35
43
|
//# sourceMappingURL=fp.js.map
|
package/lib/cjs/fp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fp.js","sourceRoot":"","sources":["../../src/fp.ts"],"names":[],"mappings":";;AAWA,
|
|
1
|
+
{"version":3,"file":"fp.js","sourceRoot":"","sources":["../../src/fp.ts"],"names":[],"mappings":";;AAWA,oBAWC;AASD,4BA2BC;AA1DD,wEAA8D;AAC9D,oCAAuE;AACvE,wCAAkG;AAElG;;;;;;GAMG;AACH,SAAgB,IAAI,CAAI,IAAY,EAAE,YAAgB;IACpD,MAAM,GAAG,GAAG,OAAE,CAAC,GAAG,CAAC,oCAAa,CAAC,CAAC;IAClC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,qBAAgB,CAAC,2FAA2F,CAAC,CAAC;IAC1H,CAAC;IAED,IAAA,iBAAU,EAAC,IAAA,iBAAU,GAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEvC,gFAAgF;IAChF,qEAAqE;IACrE,OAAO,GAAG,EAAE,CAAC,IAAA,iBAAU,EAAC,IAAA,gBAAS,GAAE,EAAE,IAAA,qBAAc,GAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAI,IAAI,EAAE,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC;AAC/F,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,QAAQ,CAAI,IAAY,EAAE,IAAc,EAAE,OAAY;IACpE,OAAO,GAAG,EAAE,CACV,IAAA,aAAM,EACJ,IAAI,CAAC,IAAI,CAAC,EACV,IAAA,aAAM,EACJ,CAAC,EAAE,OAAO,EAAuB,EAAE,EAAE,CACnC,IAAA,aAAM,EACJ,GAAG,EAAE,CAAC,OAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,EACjC,CAAC,KAA6B,EAAE,EAAE;QAChC,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;QAEhD,IAAI,CAAC,CAAC,EAAE,CAAC;YACP,MAAM,IAAI,qBAAgB,CAAC,WAAW,OAAO,+BAA+B,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3F,CAAC;QAED,OAAO,CAAC,CAAC;IACX,CAAC,EACD,CAAC,CAAuB,EAAE,EAAE,CAAC,OAAE,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CACpD,EACH,CAAC,GAAU,EAAE,EAAE;QACb,MAAM,IAAI,qBAAgB,CACxB,+BAA+B,IAAI,KAAK,GAAG,CAAC,OAAO,+CAA+C,EAClG,GAAG,CACJ,CAAC;IACJ,CAAC,CACF,CACF,CAAC;AACN,CAAC"}
|
package/lib/mjs/fp.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fp.d.ts","sourceRoot":"","sources":["../../src/fp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAqC,MAAM,aAAa,CAAC;AAGvE;;;;;;GAMG;AACH,wBAAgB,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"fp.d.ts","sourceRoot":"","sources":["../../src/fp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAqC,MAAM,aAAa,CAAC;AAGvE;;;;;;GAMG;AACH,wBAAgB,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,aAWrD;AAED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,MAAM,OAAO,CAAC,CAAC,CAAC,CA2BxF"}
|
package/lib/mjs/fp.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Configuration } from '@spinajs/configuration-common';
|
|
2
2
|
import { DI, ResolveException } from '@spinajs/di';
|
|
3
|
-
import { _catch, _chain, _check_arg, _non_empty,
|
|
3
|
+
import { _catch, _chain, _check_arg, _non_empty, _non_null, _non_undefined } from '@spinajs/util';
|
|
4
4
|
/**
|
|
5
5
|
*
|
|
6
6
|
* Get configuration value from path
|
|
@@ -14,7 +14,9 @@ export function _cfg(path, defaultValue) {
|
|
|
14
14
|
throw new ResolveException('Configuration service is not registered in DI container, register it to use _cfg function');
|
|
15
15
|
}
|
|
16
16
|
_check_arg(_non_empty())(path, 'path');
|
|
17
|
-
|
|
17
|
+
// only null / undefined are invalid config values - empty arrays, empty objects
|
|
18
|
+
// and falsy primitives ( 0, '', false ) are legitimate configuration
|
|
19
|
+
return () => _check_arg(_non_null(), _non_undefined())(cfg.get(path, defaultValue), path);
|
|
18
20
|
}
|
|
19
21
|
/**
|
|
20
22
|
* Resolves service from DI container base on path from configuration
|
|
@@ -24,8 +26,14 @@ export function _cfg(path, defaultValue) {
|
|
|
24
26
|
* @returns
|
|
25
27
|
*/
|
|
26
28
|
export function _service(path, type, options) {
|
|
27
|
-
return () => _chain(_cfg(path), _catch(({ service }) => _chain(() => DI.getRegisteredTypes(type), (types) =>
|
|
28
|
-
|
|
29
|
+
return () => _chain(_cfg(path), _catch(({ service }) => _chain(() => DI.getRegisteredTypes(type), (types) => {
|
|
30
|
+
const t = types.find((x) => x.name === service);
|
|
31
|
+
if (!t) {
|
|
32
|
+
throw new ResolveException(`Service ${service} is not registered for type ${type.name}`);
|
|
33
|
+
}
|
|
34
|
+
return t;
|
|
35
|
+
}, (t) => DI.resolve(t, options)), (err) => {
|
|
36
|
+
throw new ResolveException(`Cannot resolve service from ${path}: ${err.message}. Check your configuration file at this path.`, err);
|
|
29
37
|
}));
|
|
30
38
|
}
|
|
31
39
|
//# sourceMappingURL=fp.js.map
|
package/lib/mjs/fp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fp.js","sourceRoot":"","sources":["../../src/fp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAsB,EAAE,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"fp.js","sourceRoot":"","sources":["../../src/fp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAsB,EAAE,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAElG;;;;;;GAMG;AACH,MAAM,UAAU,IAAI,CAAI,IAAY,EAAE,YAAgB;IACpD,MAAM,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAClC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,gBAAgB,CAAC,2FAA2F,CAAC,CAAC;IAC1H,CAAC;IAED,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEvC,gFAAgF;IAChF,qEAAqE;IACrE,OAAO,GAAG,EAAE,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAI,IAAI,EAAE,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC;AAC/F,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,QAAQ,CAAI,IAAY,EAAE,IAAc,EAAE,OAAY;IACpE,OAAO,GAAG,EAAE,CACV,MAAM,CACJ,IAAI,CAAC,IAAI,CAAC,EACV,MAAM,CACJ,CAAC,EAAE,OAAO,EAAuB,EAAE,EAAE,CACnC,MAAM,CACJ,GAAG,EAAE,CAAC,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,EACjC,CAAC,KAA6B,EAAE,EAAE;QAChC,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;QAEhD,IAAI,CAAC,CAAC,EAAE,CAAC;YACP,MAAM,IAAI,gBAAgB,CAAC,WAAW,OAAO,+BAA+B,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3F,CAAC;QAED,OAAO,CAAC,CAAC;IACX,CAAC,EACD,CAAC,CAAuB,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CACpD,EACH,CAAC,GAAU,EAAE,EAAE;QACb,MAAM,IAAI,gBAAgB,CACxB,+BAA+B,IAAI,KAAK,GAAG,CAAC,OAAO,+CAA+C,EAClG,GAAG,CACJ,CAAC;IACJ,CAAC,CACF,CACF,CAAC;AACN,CAAC"}
|