@zajno/common 2.7.6 → 2.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/cjs/functions/disposer.js +7 -0
- package/cjs/functions/disposer.js.map +1 -1
- package/cjs/lazy/lazy.js +8 -2
- package/cjs/lazy/lazy.js.map +1 -1
- package/cjs/lazy/light.js.map +1 -1
- package/cjs/lazy/promise.js +20 -10
- package/cjs/lazy/promise.js.map +1 -1
- package/cjs/lazy/types.js +2 -0
- package/cjs/lazy/types.js.map +1 -1
- package/cjs/logger/buffered/buffered.memory.js +13 -1
- package/cjs/logger/buffered/buffered.memory.js.map +1 -1
- package/cjs/logger/loggable.js +1 -1
- package/cjs/logger/loggable.js.map +1 -1
- package/cjs/math/object/helpers.js +1 -1
- package/cjs/math/object/helpers.js.map +1 -1
- package/cjs/math/object/math.composite.js.map +1 -1
- package/cjs/math/object/math.js +1 -1
- package/cjs/math/object/math.js.map +1 -1
- package/cjs/math/object/ops.composite.js +1 -1
- package/cjs/math/object/ops.composite.js.map +1 -1
- package/cjs/math/object/ops.js +4 -3
- package/cjs/math/object/ops.js.map +1 -1
- package/cjs/models/Loading.js.map +1 -1
- package/cjs/structures/path/builder.helpers.js +5 -5
- package/cjs/structures/path/builder.helpers.js.map +1 -1
- package/cjs/structures/path/builder.js +3 -3
- package/cjs/structures/path/builder.js.map +1 -1
- package/cjs/structures/path/index.js +1 -1
- package/cjs/structures/path/index.js.map +1 -1
- package/cjs/structures/path/{utils.js → utils/combineUrls.js} +3 -16
- package/cjs/structures/path/utils/combineUrls.js.map +1 -0
- package/cjs/structures/path/utils/index.js +7 -0
- package/cjs/structures/path/utils/index.js.map +1 -0
- package/cjs/structures/path/utils/indexTrim.js +17 -0
- package/cjs/structures/path/utils/indexTrim.js.map +1 -0
- package/cjs/structures/path/utils/optionals.js +11 -0
- package/cjs/structures/path/utils/optionals.js.map +1 -0
- package/cjs/structures/promiseCache.js +126 -19
- package/cjs/structures/promiseCache.js.map +1 -1
- package/cjs/structures/promiseProxy.js +2 -5
- package/cjs/structures/promiseProxy.js.map +1 -1
- package/cjs/structures/tempoCache.js.map +1 -1
- package/esm/functions/disposer.js +7 -0
- package/esm/functions/disposer.js.map +1 -1
- package/esm/lazy/lazy.js +8 -2
- package/esm/lazy/lazy.js.map +1 -1
- package/esm/lazy/light.js.map +1 -1
- package/esm/lazy/promise.js +20 -10
- package/esm/lazy/promise.js.map +1 -1
- package/esm/lazy/types.js +2 -0
- package/esm/lazy/types.js.map +1 -1
- package/esm/logger/buffered/buffered.memory.js +13 -1
- package/esm/logger/buffered/buffered.memory.js.map +1 -1
- package/esm/logger/loggable.js +1 -1
- package/esm/logger/loggable.js.map +1 -1
- package/esm/math/object/helpers.js +1 -1
- package/esm/math/object/helpers.js.map +1 -1
- package/esm/math/object/math.composite.js.map +1 -1
- package/esm/math/object/math.js +1 -1
- package/esm/math/object/math.js.map +1 -1
- package/esm/math/object/ops.composite.js +1 -1
- package/esm/math/object/ops.composite.js.map +1 -1
- package/esm/math/object/ops.js +4 -3
- package/esm/math/object/ops.js.map +1 -1
- package/esm/models/Loading.js.map +1 -1
- package/esm/structures/path/builder.helpers.js +1 -1
- package/esm/structures/path/builder.helpers.js.map +1 -1
- package/esm/structures/path/builder.js +1 -1
- package/esm/structures/path/builder.js.map +1 -1
- package/esm/structures/path/index.js +1 -1
- package/esm/structures/path/index.js.map +1 -1
- package/esm/structures/path/{utils.js → utils/combineUrls.js} +2 -14
- package/esm/structures/path/utils/combineUrls.js.map +1 -0
- package/esm/structures/path/utils/index.js +4 -0
- package/esm/structures/path/utils/index.js.map +1 -0
- package/esm/structures/path/utils/indexTrim.js +14 -0
- package/esm/structures/path/utils/indexTrim.js.map +1 -0
- package/esm/structures/path/utils/optionals.js +8 -0
- package/esm/structures/path/utils/optionals.js.map +1 -0
- package/esm/structures/promiseCache.js +126 -19
- package/esm/structures/promiseCache.js.map +1 -1
- package/esm/structures/promiseProxy.js +2 -5
- package/esm/structures/promiseProxy.js.map +1 -1
- package/esm/structures/tempoCache.js.map +1 -1
- package/package.json +7 -1
- package/tsconfig.cjs.tsbuildinfo +1 -1
- package/tsconfig.esm.tsbuildinfo +1 -1
- package/tsconfig.types.tsbuildinfo +1 -1
- package/types/functions/disposer.d.ts +2 -0
- package/types/lazy/lazy.d.ts +3 -1
- package/types/lazy/light.d.ts +3 -1
- package/types/lazy/promise.d.ts +5 -3
- package/types/lazy/types.d.ts +12 -8
- package/types/logger/buffered/buffered.memory.d.ts +2 -0
- package/types/math/object/helpers.d.ts +5 -4
- package/types/math/object/math.composite.d.ts +9 -9
- package/types/math/object/math.d.ts +13 -12
- package/types/math/object/ops.composite.d.ts +6 -6
- package/types/math/object/ops.d.ts +8 -8
- package/types/math/object/types.d.ts +14 -14
- package/types/models/Loading.d.ts +4 -4
- package/types/models/LogicModel.d.ts +1 -1
- package/types/models/Model.d.ts +2 -2
- package/types/models/types.d.ts +1 -1
- package/types/structures/path/index.d.ts +1 -1
- package/types/structures/path/types.d.ts +1 -1
- package/types/structures/path/{utils.d.ts → utils/combineUrls.d.ts} +1 -2
- package/types/structures/path/utils/index.d.ts +3 -0
- package/types/structures/path/utils/indexTrim.d.ts +2 -0
- package/types/structures/path/utils/optionals.d.ts +2 -0
- package/types/structures/promiseCache.d.ts +127 -12
- package/types/structures/promiseProxy.d.ts +10 -6
- package/types/structures/tempoCache.d.ts +3 -2
- package/types/types/misc.d.ts +3 -3
- package/cjs/structures/path/utils.js.map +0 -1
- package/esm/structures/path/utils.js.map +0 -1
|
@@ -39,6 +39,7 @@ class Disposer extends loggable_js_1.Loggable {
|
|
|
39
39
|
}
|
|
40
40
|
d();
|
|
41
41
|
}
|
|
42
|
+
/** Executes stored diposers in reverse order. */
|
|
42
43
|
dispose(log = false) {
|
|
43
44
|
if (log && this.logger) {
|
|
44
45
|
this.logger.log(`Disposing ${this._disposers.length} items including named ones:`, Array.from(this._map.entries()).map(e => e[0]));
|
|
@@ -57,6 +58,12 @@ function combineDisposers(...items) {
|
|
|
57
58
|
class Disposable extends loggable_js_1.Loggable {
|
|
58
59
|
disposer = new Disposer();
|
|
59
60
|
_isDisposed = false;
|
|
61
|
+
constructor(logger) {
|
|
62
|
+
super(logger);
|
|
63
|
+
if (logger) {
|
|
64
|
+
this.disposer.setLogger(logger);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
60
67
|
dispose = () => {
|
|
61
68
|
this._isDisposed = true;
|
|
62
69
|
this.disposer.dispose();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"disposer.js","sourceRoot":"","sources":["../../../src/functions/disposer.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"disposer.js","sourceRoot":"","sources":["../../../src/functions/disposer.ts"],"names":[],"mappings":"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"}
|
package/cjs/lazy/lazy.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Lazy = void 0;
|
|
4
|
+
const disposer_js_1 = require("../functions/disposer.js");
|
|
4
5
|
class Lazy {
|
|
5
6
|
_factory;
|
|
6
7
|
_instance = undefined;
|
|
@@ -58,8 +59,13 @@ class Lazy {
|
|
|
58
59
|
}
|
|
59
60
|
}
|
|
60
61
|
reset() {
|
|
61
|
-
if (this.hasValue && this._instance
|
|
62
|
-
this._disposer
|
|
62
|
+
if (this.hasValue && this._instance) {
|
|
63
|
+
if (this._disposer) {
|
|
64
|
+
this._disposer(this._instance);
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
(0, disposer_js_1.tryDispose)(this._instance);
|
|
68
|
+
}
|
|
63
69
|
}
|
|
64
70
|
this.setInstance(undefined);
|
|
65
71
|
}
|
package/cjs/lazy/lazy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lazy.js","sourceRoot":"","sources":["../../../src/lazy/lazy.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"lazy.js","sourceRoot":"","sources":["../../../src/lazy/lazy.ts"],"names":[],"mappings":";;;AAAA,0DAAwE;AAKxE,MAAa,IAAI;IAMkB;IAJrB,SAAS,GAAkB,SAAS,CAAC;IACvC,cAAc,CAA6B;IAC3C,SAAS,CAAqB;IAEtC,YAA+B,QAAmB;QAAnB,aAAQ,GAAR,QAAQ,CAAW;IAAI,CAAC;IAEvD,IAAI,QAAQ,KAAK,OAAO,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC;IAEvD,IAAI,KAAK;QACL,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC,SAAU,CAAC;IAC3B,CAAC;IAED,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,iEAAiE;IACjE,IAAc,OAAO;QACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC;gBAChC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACb,OAAO,KAAK,CAAC;YACjB,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,YAAY,CAAC,QAA2B;QAC3C,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,UAAU,CAAC,OAAmC;QACjD,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;QAC9B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,cAAc;QAClB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO;QACX,CAAC;QAED,oEAAoE;QACpE,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC5B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO;QACH,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,WAAW,CAAC,QAAuB;QAC/B,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAE1B,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACtD,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;QAClC,CAAC;IACL,CAAC;IAED,KAAK;QACD,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAClC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACjB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACJ,IAAA,wBAAU,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC;QACL,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;CAC9B;AAjFD,oBAiFC"}
|
package/cjs/lazy/light.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"light.js","sourceRoot":"","sources":["../../../src/lazy/light.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"light.js","sourceRoot":"","sources":["../../../src/lazy/light.ts"],"names":[],"mappings":";;AAIA,gCAoBC;AApBD,SAAgB,UAAU,CAAI,OAAgB;IAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC;IACzB,IAAI,SAAS,GAAkB,SAAS,CAAC;IAEzC,MAAM,GAAG,GAA8C;QACnD,IAAI,KAAK;YACL,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC1B,SAAS,GAAG,QAAQ,EAAE,CAAC;YAC3B,CAAC;YACD,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,IAAI,YAAY,KAAK,OAAO,SAAS,CAAC,CAAC,CAAC;QACxC,IAAI,QAAQ,KAAK,OAAO,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC;QAClD,KAAK,EAAE,GAAG,EAAE;YACR,SAAS,GAAG,SAAS,CAAC;QAC1B,CAAC;QACD,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE;KAC7B,CAAC;IAEF,OAAO,GAAG,CAAC;AACf,CAAC"}
|
package/cjs/lazy/promise.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.LazyPromise = void 0;
|
|
4
|
+
const disposer_js_1 = require("../functions/disposer.js");
|
|
4
5
|
class LazyPromise {
|
|
5
6
|
_factory;
|
|
6
7
|
initial;
|
|
7
8
|
_instance = undefined;
|
|
8
|
-
|
|
9
|
+
_isLoading = null;
|
|
9
10
|
_promise;
|
|
10
11
|
_expireTracker;
|
|
11
12
|
constructor(_factory, initial = undefined) {
|
|
@@ -13,8 +14,8 @@ class LazyPromise {
|
|
|
13
14
|
this.initial = initial;
|
|
14
15
|
this._instance = initial;
|
|
15
16
|
}
|
|
16
|
-
get
|
|
17
|
-
get hasValue() { return this.
|
|
17
|
+
get isLoading() { return this._isLoading; }
|
|
18
|
+
get hasValue() { return this._isLoading === false; }
|
|
18
19
|
get promise() {
|
|
19
20
|
this.ensureInstanceLoading();
|
|
20
21
|
return this._promise;
|
|
@@ -32,25 +33,25 @@ class LazyPromise {
|
|
|
32
33
|
return this;
|
|
33
34
|
}
|
|
34
35
|
ensureInstanceLoading() {
|
|
35
|
-
if (this.
|
|
36
|
+
if (this.isLoading === false && this._instance !== undefined && this._expireTracker?.isExpired) {
|
|
36
37
|
// do not reset the instance, just make sure it will be reloaded
|
|
37
|
-
this.
|
|
38
|
+
this._isLoading = null;
|
|
38
39
|
}
|
|
39
|
-
if (this.
|
|
40
|
-
this.
|
|
40
|
+
if (this._isLoading === null) {
|
|
41
|
+
this._isLoading = true;
|
|
41
42
|
this._promise = this._factory().then(this.onResolved.bind(this));
|
|
42
43
|
}
|
|
43
44
|
}
|
|
44
45
|
onResolved(res) {
|
|
45
46
|
// case: during the promise `setInstance` was called
|
|
46
|
-
if (!this.
|
|
47
|
+
if (!this._isLoading && this._instance !== undefined) {
|
|
47
48
|
return this._instance;
|
|
48
49
|
}
|
|
49
50
|
this.setInstance(res);
|
|
50
51
|
return res;
|
|
51
52
|
}
|
|
52
53
|
setInstance(res) {
|
|
53
|
-
this.
|
|
54
|
+
this._isLoading = false;
|
|
54
55
|
// refresh promise so it won't keep old callbacks
|
|
55
56
|
// + make sure it's resolved with the freshest value
|
|
56
57
|
// also do this before setting the instance... just in case :)
|
|
@@ -62,9 +63,18 @@ class LazyPromise {
|
|
|
62
63
|
return res;
|
|
63
64
|
}
|
|
64
65
|
reset() {
|
|
65
|
-
this.
|
|
66
|
+
this._isLoading = null;
|
|
67
|
+
const wasDisposed = (0, disposer_js_1.tryDispose)(this._instance);
|
|
66
68
|
this._instance = this.initial;
|
|
69
|
+
const p = this._promise;
|
|
67
70
|
this._promise = undefined;
|
|
71
|
+
// check if loading is still in progress
|
|
72
|
+
// need to dispose abandoned value
|
|
73
|
+
if (p && !wasDisposed) {
|
|
74
|
+
p.then(value => {
|
|
75
|
+
(0, disposer_js_1.tryDispose)(value);
|
|
76
|
+
});
|
|
77
|
+
}
|
|
68
78
|
}
|
|
69
79
|
dispose() {
|
|
70
80
|
this.reset();
|
package/cjs/lazy/promise.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../../src/lazy/promise.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../../src/lazy/promise.ts"],"names":[],"mappings":"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"}
|
package/cjs/lazy/types.js
CHANGED
package/cjs/lazy/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/lazy/types.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/lazy/types.ts"],"names":[],"mappings":";;AAWC,CAAC;AASD,CAAC"}
|
|
@@ -10,11 +10,16 @@ const Prefixes = {
|
|
|
10
10
|
class BufferedMemoryLogger extends base_js_1.BaseBufferedLogger {
|
|
11
11
|
_memory = [];
|
|
12
12
|
_timestamps = false;
|
|
13
|
+
_maxMemorySize = 0;
|
|
13
14
|
_argFormatter = formatArg;
|
|
14
15
|
_argsJoiner = (args) => args.filter(Boolean).join(' ');
|
|
15
16
|
constructor(name) {
|
|
16
17
|
super(name);
|
|
17
18
|
}
|
|
19
|
+
withMaxMemorySize(size) {
|
|
20
|
+
this._maxMemorySize = size;
|
|
21
|
+
return this;
|
|
22
|
+
}
|
|
18
23
|
setArgsJoiner(joiner) {
|
|
19
24
|
this._argsJoiner = joiner;
|
|
20
25
|
return this;
|
|
@@ -49,7 +54,11 @@ class BufferedMemoryLogger extends base_js_1.BaseBufferedLogger {
|
|
|
49
54
|
}
|
|
50
55
|
doFlush(buffer) {
|
|
51
56
|
for (const [level, args, timestamp] of buffer) {
|
|
52
|
-
this.
|
|
57
|
+
const line = this.combineLine(level, args, timestamp);
|
|
58
|
+
this._memory.push(line);
|
|
59
|
+
}
|
|
60
|
+
if (this._maxMemorySize > 0 && this._memory.length > this._maxMemorySize) {
|
|
61
|
+
this._memory.splice(0, this._memory.length - this._maxMemorySize);
|
|
53
62
|
}
|
|
54
63
|
}
|
|
55
64
|
combineLine(level, args, timestamp) {
|
|
@@ -64,6 +73,9 @@ class BufferedMemoryLogger extends base_js_1.BaseBufferedLogger {
|
|
|
64
73
|
exports.BufferedMemoryLogger = BufferedMemoryLogger;
|
|
65
74
|
function formatArg(arg) {
|
|
66
75
|
if (typeof arg === 'object') {
|
|
76
|
+
if (arg instanceof Error) {
|
|
77
|
+
return `${arg.name}: ${arg.message}\n${arg.stack || ''}`;
|
|
78
|
+
}
|
|
67
79
|
return JSON.stringify(arg);
|
|
68
80
|
}
|
|
69
81
|
return String(arg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buffered.memory.js","sourceRoot":"","sources":["../../../../src/logger/buffered/buffered.memory.ts"],"names":[],"mappings":";;;AACA,uCAA8D;AAE9D,MAAM,QAAQ,GAAmC;IAC7C,CAAC,CAAC,CAAC,EAAE,OAAO;IACZ,CAAC,CAAC,CAAC,EAAE,QAAQ;IACb,CAAC,CAAC,CAAC,EAAE,SAAS;CACjB,CAAC;AAEF,MAAa,oBAAqB,SAAQ,4BAAkB;IAE9C,OAAO,GAAa,EAAE,CAAC;IACzB,WAAW,GAAY,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"buffered.memory.js","sourceRoot":"","sources":["../../../../src/logger/buffered/buffered.memory.ts"],"names":[],"mappings":"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"}
|
package/cjs/logger/loggable.js
CHANGED
|
@@ -8,7 +8,7 @@ class Loggable {
|
|
|
8
8
|
_logger = empty_js_1.EMPTY_LOGGER;
|
|
9
9
|
constructor(logger) {
|
|
10
10
|
if (logger) {
|
|
11
|
-
this.
|
|
11
|
+
this._logger = logger;
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
/** Returns current logger ({@linkcode ILogger}), or {@link EMPTY_LOGGER} if not set via {@linkcode Loggable.setLogger} or {@linkcode Loggable.setLoggerFactory}. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loggable.js","sourceRoot":"","sources":["../../../src/logger/loggable.ts"],"names":[],"mappings":";;;AAAA,kDAA4C;AAE5C,yCAA0C;AAG1C,iEAAiE;AACjE,MAAa,QAAQ;IAET,OAAO,GAAY,uBAAY,CAAC;IAExC,YAAY,MAAgB;QACxB,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"loggable.js","sourceRoot":"","sources":["../../../src/logger/loggable.ts"],"names":[],"mappings":";;;AAAA,kDAA4C;AAE5C,yCAA0C;AAG1C,iEAAiE;AACjE,MAAa,QAAQ;IAET,OAAO,GAAY,uBAAY,CAAC;IAExC,YAAY,MAAgB;QACxB,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QAC1B,CAAC;IACL,CAAC;IAED,oKAAoK;IACpK,IAAc,MAAM,KAAc,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAExD,2CAA2C;IAC3C,IAAc,SAAS,KAAc,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,KAAK,uBAAY,CAAC,CAAC,CAAC;IAEvF,SAAS,CAAC,MAAiC;QAC9C,MAAM,GAAG,GAAG,kBAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,OAAO,GAAG,GAAG,IAAI,uBAAY,CAAC;QAEnC,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,gBAAgB,CAAC,OAA8B,EAAE,GAAG,IAAgC;QACvF,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACjD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAED,+GAA+G;IACrG,aAAa,CAAC,IAAwB;QAC5C,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACnC,CAAC;IAED,qEAAqE;IAC3D,aAAa,CAAC,OAAuB,EAAE,GAAG,IAAgC;QAChF,MAAM,CAAC,YAAY,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;QACrC,OAAO,OAAO,CACV,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,EAChC,GAAG,IAAI,CACV,CAAC;IACN,CAAC;CACJ;AA7CD,4BA6CC"}
|
|
@@ -4,7 +4,7 @@ exports._getValue = _getValue;
|
|
|
4
4
|
exports._getInnerValue = _getInnerValue;
|
|
5
5
|
exports.doOps = doOps;
|
|
6
6
|
function _getValue(o, key) {
|
|
7
|
-
return (!o || !key) ?
|
|
7
|
+
return (!o || !key) ? undefined : o[key];
|
|
8
8
|
}
|
|
9
9
|
function _getInnerValue(o, key) {
|
|
10
10
|
if (typeof o === 'number') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../src/math/object/helpers.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../src/math/object/helpers.ts"],"names":[],"mappings":";;AAIA,8BAEC;AAID,wCASC;AAID,sBAaC;AAhCD,SAAgB,SAAS,CAAuD,CAAmC,EAAE,GAAS;IAC1H,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAE,CAAO,CAAC,GAAG,CAAC,CAAC;AACpD,CAAC;AAID,SAAgB,cAAc,CAAuD,CAAqC,EAAE,GAAS;IACjI,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC;IACb,CAAC;IACD,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;AAClB,CAAC;AAGD,8DAA8D;AAC9D,SAAgB,KAAK,CAEjB,GAA0C,EAC1C,CAA4B,EAC5B,SAA6G;IAE7G,MAAM,GAAG,GAAG,EAAQ,CAAC;IAErB,MAAM,CAAC,GAAG,SAAS,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IACtD,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QACb,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"math.composite.js","sourceRoot":"","sources":["../../../../src/math/object/math.composite.ts"],"names":[],"mappings":";;;AAEA,6CAAqD;AACrD,yDAAwD;AAIxD,MAAa,mBAAyC,SAAQ,qCAAqB;IAC9D,KAAK,CAAgB;IAEtC,YAAY,SAA0B;QAClC,KAAK,CAAC,SAAS,CAAC,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;aACjC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACV,GAAG,EAAE,IAAI,CAAC,CAAC,CAAqB;YAChC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAqC;SACnD,CAAC,CAAC,CAAC;IACZ,CAAC;IAED,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"math.composite.js","sourceRoot":"","sources":["../../../../src/math/object/math.composite.ts"],"names":[],"mappings":"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"}
|
package/cjs/math/object/math.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"math.js","sourceRoot":"","sources":["../../../../src/math/object/math.ts"],"names":[],"mappings":";;;AAEA,6CAAyC;AACzC,qCAAqC;AAKrC,MAAM,MAAM,GAAgB,QAAQ,CAAC;AAErC,MAAa,UAA6B,SAAQ,kBAAY;IAE1D,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"math.js","sourceRoot":"","sources":["../../../../src/math/object/math.ts"],"names":[],"mappings":";;;AAEA,6CAAyC;AACzC,qCAAqC;AAKrC,MAAM,MAAM,GAAgB,QAAQ,CAAC;AAErC,MAAa,UAA6B,SAAQ,kBAAY;IAE1D,QAAQ,CAAC,CAAmC;QACxC,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,IAAI,CAAC,EAAE,CAAC;YACJ,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACpB,MAAM,CAAC,GAAG,IAAA,sBAAS,EAAC,CAAC,EAAE,GAAG,CAAW,CAAC;gBACtC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAED,QAAQ,CAAC,IAA+B,EAAE,MAAiC;QACvE,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACzB,MAAM,OAAO,GAAG,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,CAAW,IAAI,CAAC,CAAC;YACpD,MAAM,SAAS,GAAG,IAAA,sBAAS,EAAC,MAAM,EAAE,GAAG,CAAW,IAAI,CAAC,CAAC;YACxD,OAAO,OAAO,IAAI,SAAS,CAAC;QAChC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,CAA4B;QAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC;IAID,GAAG,CAAC,EAA6B,EAAE,EAAsC;QACrE,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;YACb,OAAO,CAAC,CAAC;QACb,CAAC;QAED,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;YACzB,MAAM,GAAG,GAAG,EAAQ,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBAC1B,MAAM,EAAE,GAAG,GAA4B,CAAC;gBACxC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,CAAW,CAAC;gBAC5B,GAAG,CAAC,EAAa,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAe,CAAC;YAC3D,CAAC,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;QACf,CAAC;QAED,IAAI,GAAG,GAAkB,IAAI,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC1B,MAAM,EAAE,GAAG,GAA4B,CAAC;YACxC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAW,CAAC;YAC3B,IAAI,CAAC,CAAC,EAAE,CAAC;gBACL,OAAO;YACX,CAAC;YAED,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAW,IAAI,CAAC,CAAC;YAChC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5B,IAAI,GAAG,IAAI,IAAI,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;gBACzB,GAAG,GAAG,CAAC,CAAC;YACZ,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,IAAI,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,CAA4B,EAAE,SAAgE;QAClG,IAAI,CAAC,CAAC,EAAE,CAAC;YACL,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAClB,MAAM,OAAO,GAAG,IAAA,sBAAS,EAAC,CAAC,EAAE,CAAC,CAAW,CAAC;YAC1C,MAAM,CAAC,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAChC,IAAI,CAAC,KAAK,MAAM,EAAE,CAAC;gBACf,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC;gBACd,OAAO;YACX,CAAC;YAED,GAAG,CAAC,CAAC,CAAC,GAAG,CAA4B,CAAC,CAAC,SAAS;QACpD,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC;IACf,CAAC;IAED,GAAG,CAAC,CAA4B,EAAE,iBAA6B,KAAK;QAChE,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE;YAC3B,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC;gBAC1B,OAAO,GAAG,CAAC;YACf,CAAC;YAED,IAAI,cAAc,KAAK,QAAQ,EAAE,CAAC;gBAC9B,OAAO,MAAM,CAAC;YAClB,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,CAAC;YACV,IAAI,cAAc,KAAK,MAAM,EAAE,CAAC;gBAC5B,CAAC,GAAG,CAAC,CAAC;YACV,CAAC;iBAAM,CAAC;gBACJ,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;YACjB,CAAC;YACD,OAAO,CAAC,CAAC;QACb,CAAC,CAAC,CAAC;IACP,CAAC;IAGD,KAAK,CAAC,CAA4B,EAAE,SAAuB,OAAO;QAC9D,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE;YAC3B,QAAQ,MAAM,EAAE,CAAC;gBACb,KAAK,OAAO;oBACR,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC3B,KAAK,OAAO;oBACR,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC3B,KAAK,MAAM;oBACP,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC1B;oBACI,OAAO,GAAG,CAAC;YACnB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,IAAI,CAAC,EAA6B,EAAE,EAAsC,EAAE,QAA2C;QACnH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAClB,MAAM,CAAC,GAAG,IAAA,sBAAS,EAAC,EAAE,EAAE,CAAC,CAAW,CAAC;YACrC,MAAM,CAAC,GAAG,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,IAAA,sBAAS,EAAC,EAAE,EAAE,CAAC,CAAY,CAAC;YAGrE,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAY,CAAC;QACpD,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,GAAG,CAAC,EAA6B,EAAE,EAAsC;QACrE,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,QAAQ,CAAC,IAA+B,EAAE,MAA0C;QAChF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,QAAQ,CAAC,EAA6B,EAAE,EAAsC;QAC1E,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAChE,CAAC;CACJ;AAzID,gCAyIC"}
|
|
@@ -20,7 +20,7 @@ class CompositeObjectOps {
|
|
|
20
20
|
return !o || this._ops.every(op => op.ops.isEmpty((0, helpers_js_1._getInnerValue)(o, op.key)));
|
|
21
21
|
}
|
|
22
22
|
getEmpty() {
|
|
23
|
-
return (0, helpers_js_1.doOps)(this._ops,
|
|
23
|
+
return (0, helpers_js_1.doOps)(this._ops, null, ops => ops.getEmpty());
|
|
24
24
|
}
|
|
25
25
|
clone(o) {
|
|
26
26
|
return (0, helpers_js_1.doOps)(this._ops, o);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ops.composite.js","sourceRoot":"","sources":["../../../../src/math/object/ops.composite.ts"],"names":[],"mappings":";;;AAGA,6CAAqD;AAErD,MAAa,kBAAkB;IAClB,KAAK,CAAc;IAEX,IAAI,CAAe;IAEpC,YAAY,QAAwB;QAEhC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;aAC/B,GAAG,CAAC,IAAI,CAAC,EAAE;YACR,MAAM,MAAM,GAAe;gBACvB,GAAG,EAAE,IAAI,CAAC,CAAC,CAAS;gBACpB,GAAG,EAAE,IAAI,CAAC,CAAC,CAAwB;aACtC,CAAC;YACF,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC,CAAC;QAEP,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;IAED,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"ops.composite.js","sourceRoot":"","sources":["../../../../src/math/object/ops.composite.ts"],"names":[],"mappings":";;;AAGA,6CAAqD;AAErD,MAAa,kBAAkB;IAClB,KAAK,CAAc;IAEX,IAAI,CAAe;IAEpC,YAAY,QAAwB;QAEhC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;aAC/B,GAAG,CAAC,IAAI,CAAC,EAAE;YACR,MAAM,MAAM,GAAe;gBACvB,GAAG,EAAE,IAAI,CAAC,CAAC,CAAS;gBACpB,GAAG,EAAE,IAAI,CAAC,CAAC,CAAwB;aACtC,CAAC;YACF,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC,CAAC;QAEP,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;IAED,OAAO,CAAC,CAA4B;QAChC,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAA,2BAAc,EAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAClF,CAAC;IAED,QAAQ;QACJ,OAAO,IAAA,kBAAK,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,CAA4B;QAC9B,OAAO,IAAA,kBAAK,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,CAAC,CAA4B;QAChC,OAAO,CAAC,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAA,2BAAc,EAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACzF,CAAC;IAED,QAAQ,CAAC,CAA4B,EAAE,CAA4B;QAC/D,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACX,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAC5C,IAAA,2BAAc,EAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAC3B,IAAA,2BAAc,EAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAC9B,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,EAAK,EAAE,KAAgC;QAC1C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACrB,MAAM,GAAG,GAAG,IAAA,2BAAc,EAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YAC5C,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACpB,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;YACvB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAxDD,gDAwDC"}
|
package/cjs/math/object/ops.js
CHANGED
|
@@ -28,7 +28,7 @@ class ObjectOps {
|
|
|
28
28
|
this.keys.forEach(key => {
|
|
29
29
|
const kk = key;
|
|
30
30
|
const v = o[kk];
|
|
31
|
-
if (v
|
|
31
|
+
if (v != null) {
|
|
32
32
|
result[key] = v;
|
|
33
33
|
}
|
|
34
34
|
});
|
|
@@ -39,7 +39,7 @@ class ObjectOps {
|
|
|
39
39
|
return !o || this.keys.every(key => !(0, helpers_js_1._getValue)(o, key));
|
|
40
40
|
}
|
|
41
41
|
isValid(o) {
|
|
42
|
-
return o
|
|
42
|
+
return !o ? false : (this._validator ? this._validator(o) : !this.isEmpty(o));
|
|
43
43
|
}
|
|
44
44
|
isEquals(a, b) {
|
|
45
45
|
if (!a && !b) {
|
|
@@ -54,7 +54,7 @@ class ObjectOps {
|
|
|
54
54
|
const res = {};
|
|
55
55
|
this.keys.forEach(key => {
|
|
56
56
|
const val = (0, helpers_js_1._getValue)(v, key);
|
|
57
|
-
if (skip_js_1.SkipCondition.shouldSkip(condition, key, val)) {
|
|
57
|
+
if (val === undefined || skip_js_1.SkipCondition.shouldSkip(condition, key, val)) {
|
|
58
58
|
return;
|
|
59
59
|
}
|
|
60
60
|
const kk = key;
|
|
@@ -86,6 +86,7 @@ class ObjectOps {
|
|
|
86
86
|
to[key] = val;
|
|
87
87
|
}
|
|
88
88
|
});
|
|
89
|
+
return to;
|
|
89
90
|
}
|
|
90
91
|
}
|
|
91
92
|
exports.ObjectOps = ObjectOps;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ops.js","sourceRoot":"","sources":["../../../../src/math/object/ops.ts"],"names":[],"mappings":";;;AAAA,kDAAkE;AAElE,6CAAyC;AAKzC,MAAa,SAAS;IAMG;IAJL,KAAK,CAAc;IAEzB,UAAU,CAAyC;IAE7D,YAAqB,IAAa;QAAb,SAAI,GAAJ,IAAI,CAAS;QAC9B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;IAED,YAAY,CAAC,SAAqC;QAC9C,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,QAAQ;QACJ,MAAM,MAAM,GAAG,EAAO,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACpB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAiB,CAAC;QACpC,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"ops.js","sourceRoot":"","sources":["../../../../src/math/object/ops.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Loading.js","sourceRoot":"","sources":["../../../src/models/Loading.ts"],"names":[],"mappings":";;;AAYA,kCAmBC;AA/BD,yCAAmC;AAY5B,KAAK,UAAU,WAAW,CAAgB,KAA2B,EAAE,EAAoB,EAAE,YAA+B,KAAK;IACpI,IAAI,SAAS,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;YACxB,MAAM,IAAI,qBAAqB,EAAE,CAAC;QACtC,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;IAEnB,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,EAAE,EAAE,CAAC;QACvB,OAAO;YACH,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,GAAG;SACd,CAAC;IACN,CAAC;YAAS,CAAC;QACP,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;IACxB,CAAC;AACL,CAAC;AAED,MAAa,YAAY;IAEF,OAAO,
|
|
1
|
+
{"version":3,"file":"Loading.js","sourceRoot":"","sources":["../../../src/models/Loading.ts"],"names":[],"mappings":";;;AAYA,kCAmBC;AA/BD,yCAAmC;AAY5B,KAAK,UAAU,WAAW,CAAgB,KAA2B,EAAE,EAAoB,EAAE,YAA+B,KAAK;IACpI,IAAI,SAAS,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;YACxB,MAAM,IAAI,qBAAqB,EAAE,CAAC;QACtC,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;IAEnB,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,EAAE,EAAE,CAAC;QACvB,OAAO;YACH,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,GAAG;SACd,CAAC;IACN,CAAC;YAAS,CAAC;QACP,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;IACxB,CAAC;AACL,CAAC;AAED,MAAa,YAAY;IAEF,OAAO,CAAyC;IACzD,UAAU,CAAU;IAE9B;;OAEG;IACH,YAAY,YAAY,GAAG,KAAK;QAC5B,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;IACnD,CAAC;IAED,IAAW,SAAS,KAAK,OAAO,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAEhE,IAAW,KAAK,KAAc,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IAE9D,IAAW,KAAK,CAAC,CAAU;QACvB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;IAEM,UAAU,CAAI,EAAoB,EAAE,YAA+B,KAAK;QAC3E,OAAO,WAAW,CAAC,IAAI,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IAC5C,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAEM,QAAQ,CAAC,SAAkB;QAC9B,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC5B,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;YACxB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC5B,CAAC;IACL,CAAC;IAED,kBAAkB;IACR,gBAAgB;QACtB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAED,kBAAkB;IACR,gBAAgB;QACtB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAED;;0EAEsE;IAC5D,wBAAwB;QAC9B,OAAO,IAAI,gBAAK,CAAS,CAAC,CAAC,CAAC;IAChC,CAAC;CACJ;AAvDD,oCAuDC;AAED,MAAa,qBAAsB,SAAQ,KAAK;IAIxB;IAFpB,YACI,OAAO,GAAG,yEAAyE,EACnE,UAAmB;QAEnC,KAAK,CAAC,OAAO,CAAC,CAAC;QAFC,eAAU,GAAV,UAAU,CAAS;IAGvC,CAAC;CACJ;AARD,sDAQC"}
|
|
@@ -5,13 +5,13 @@ exports.constructStatic = constructStatic;
|
|
|
5
5
|
exports.constructDynamic = constructDynamic;
|
|
6
6
|
exports.guardIsStatic = guardIsStatic;
|
|
7
7
|
exports.normalizeInput = normalizeInput;
|
|
8
|
-
const
|
|
8
|
+
const combineUrls_js_1 = require("./utils/combineUrls.js");
|
|
9
9
|
const staticFactory = (strings) => {
|
|
10
10
|
const parts = strings.slice();
|
|
11
11
|
let defaultOptions = undefined;
|
|
12
12
|
return {
|
|
13
|
-
build: (_, options) => (0,
|
|
14
|
-
template: (_, options) => (0,
|
|
13
|
+
build: (_, options) => (0, combineUrls_js_1.combineUrls)(combineUrls_js_1.CombineOptions.merge(defaultOptions, options), ...parts),
|
|
14
|
+
template: (_, options) => (0, combineUrls_js_1.combineUrls)(combineUrls_js_1.CombineOptions.merge(defaultOptions, options), ...parts),
|
|
15
15
|
args: [],
|
|
16
16
|
as() { return this; },
|
|
17
17
|
withDefaults(defaults) {
|
|
@@ -27,7 +27,7 @@ function constructStatic(input) {
|
|
|
27
27
|
let staticPath = undefined;
|
|
28
28
|
/* istanbul ignore else -- @preserve */
|
|
29
29
|
if (Array.isArray(input)) {
|
|
30
|
-
staticPath = (0,
|
|
30
|
+
staticPath = (0, combineUrls_js_1.combineUrls)(...input);
|
|
31
31
|
}
|
|
32
32
|
else if (typeof input === 'string') {
|
|
33
33
|
staticPath = input;
|
|
@@ -80,7 +80,7 @@ function constructDynamic(strings, ...paramsRaw) {
|
|
|
80
80
|
parts.push(v);
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
|
-
return (0,
|
|
83
|
+
return (0, combineUrls_js_1.combineUrls)(combineUrls_js_1.CombineOptions.merge(defaultOptions, options), ...parts);
|
|
84
84
|
};
|
|
85
85
|
const template = (transform, options) => {
|
|
86
86
|
const baseTransform = templateTransforms
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.helpers.js","sourceRoot":"","sources":["../../../../src/structures/path/builder.helpers.ts"],"names":[],"mappings":";;;AAoCA,0CAaC;AAED,4CAgIC;AAQD,sCAEC;AAED,wCAuCC;AAtND,
|
|
1
|
+
{"version":3,"file":"builder.helpers.js","sourceRoot":"","sources":["../../../../src/structures/path/builder.helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ exports.Empty = void 0;
|
|
|
4
4
|
exports.build = build;
|
|
5
5
|
exports.construct = construct;
|
|
6
6
|
const builder_helpers_js_1 = require("./builder.helpers.js");
|
|
7
|
-
const
|
|
7
|
+
const combineUrls_js_1 = require("./utils/combineUrls.js");
|
|
8
8
|
/** Tagged template literal to create a path builder */
|
|
9
9
|
function build(strings, ...params) {
|
|
10
10
|
return (0, builder_helpers_js_1.constructDynamic)(strings, ...params);
|
|
@@ -59,11 +59,11 @@ function construct(...inputsRaw) {
|
|
|
59
59
|
// in case of object we don't have to split args
|
|
60
60
|
outputResults = outputs.map(o => o.build(args, innerOptions));
|
|
61
61
|
}
|
|
62
|
-
return (0,
|
|
62
|
+
return (0, combineUrls_js_1.combineUrls)(options, ...outputResults);
|
|
63
63
|
},
|
|
64
64
|
template: (prefix, options) => {
|
|
65
65
|
const innerOptions = skipOuterOptions(options);
|
|
66
|
-
return (0,
|
|
66
|
+
return (0, combineUrls_js_1.combineUrls)(options, ...outputs.map(o => o.template(prefix, innerOptions)));
|
|
67
67
|
},
|
|
68
68
|
args,
|
|
69
69
|
as() { return this; },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../src/structures/path/builder.ts"],"names":[],"mappings":";;;AAsBA,sBAQC;AAaD,8BAqEC;AAhHD,6DAI8B;AAY9B,
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../src/structures/path/builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Path = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
tslib_1.__exportStar(require("./utils.js"), exports);
|
|
5
|
+
tslib_1.__exportStar(require("./utils/index.js"), exports);
|
|
6
6
|
exports.Path = tslib_1.__importStar(require("./builder.js"));
|
|
7
7
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/structures/path/index.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/structures/path/index.ts"],"names":[],"mappings":";;;;AAAA,2DAAiC;AACjC,6DAAqC"}
|
|
@@ -1,21 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CombineOptions = void 0;
|
|
4
|
-
exports.indexTrim = indexTrim;
|
|
5
4
|
exports.combineUrls = combineUrls;
|
|
6
|
-
|
|
7
|
-
if (!str || str === ch || !ch) {
|
|
8
|
-
return '';
|
|
9
|
-
}
|
|
10
|
-
let start = 0, end = str.length;
|
|
11
|
-
while (start < end && str[start] === ch)
|
|
12
|
-
++start;
|
|
13
|
-
while (end > start && str[end - 1] === ch)
|
|
14
|
-
--end;
|
|
15
|
-
return (start > 0 || end < str.length)
|
|
16
|
-
? str.substring(start, end)
|
|
17
|
-
: str;
|
|
18
|
-
}
|
|
5
|
+
const indexTrim_js_1 = require("./indexTrim.js");
|
|
19
6
|
var CombineOptions;
|
|
20
7
|
(function (CombineOptions) {
|
|
21
8
|
function merge(...options) {
|
|
@@ -37,7 +24,7 @@ function combineUrls(...parts) {
|
|
|
37
24
|
}
|
|
38
25
|
let part = p;
|
|
39
26
|
if (!noTrim) {
|
|
40
|
-
part = indexTrim(p, trimSymbol);
|
|
27
|
+
part = (0, indexTrim_js_1.indexTrim)(p, trimSymbol);
|
|
41
28
|
}
|
|
42
29
|
if (part) {
|
|
43
30
|
_parts.push(part);
|
|
@@ -62,4 +49,4 @@ function combineUrls(...parts) {
|
|
|
62
49
|
}
|
|
63
50
|
return result;
|
|
64
51
|
}
|
|
65
|
-
//# sourceMappingURL=
|
|
52
|
+
//# sourceMappingURL=combineUrls.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"combineUrls.js","sourceRoot":"","sources":["../../../../../src/structures/path/utils/combineUrls.ts"],"names":[],"mappings":";;;AAqBA,kCAgDC;AApED,iDAA2C;AAW3C,IAAiB,cAAc,CAI9B;AAJD,WAAiB,cAAc;IAC3B,SAAgB,KAAK,CAAC,GAAG,OAAmC;QACxD,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC;IACzC,CAAC;IAFe,oBAAK,QAEpB,CAAA;AACL,CAAC,EAJgB,cAAc,8BAAd,cAAc,QAI9B;AAKD,SAAgB,WAAW,CAAC,GAAG,KAA0C;IACrE,MAAM,OAAO,GAAG,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,QAAQ;QACxC,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,KAAK,CAAC,CAAC,CAA6B,CAAC;IAE3C,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,GAAG,CAAC;IAC5C,MAAM,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,GAAG,CAAC;IAE9C,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,KAAK,CAAC;IACxC,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACpB,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YACxB,SAAS;QACb,CAAC;QAED,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,IAAI,GAAG,IAAA,wBAAS,EAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QACpC,CAAC;QAED,IAAI,IAAI,EAAE,CAAC;YACP,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;IACL,CAAC;IAED,IAAI,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAEpC,oFAAoF;IACpF,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,IAAI,OAAO,EAAE,QAAQ,KAAK,IAAI,CAAC,EAAE,CAAC;QACxE,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,OAAO,EAAE,QAAQ,EAAE,CAAC;QACpB,MAAM,IAAI,GAAG,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ;YAC7C,CAAC,CAAC,OAAO,CAAC,QAAQ;YAClB,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,IAAI,IAAI,CAAC;IACnB,CAAC;IAED,IAAI,OAAO,EAAE,QAAQ,EAAE,CAAC;QACpB,MAAM,IAAI,GAAG,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ;YAC7C,CAAC,CAAC,OAAO,CAAC,QAAQ;YAClB,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,GAAG,IAAI,GAAG,MAAM,CAAC;IAC3B,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
tslib_1.__exportStar(require("./indexTrim.js"), exports);
|
|
5
|
+
tslib_1.__exportStar(require("./combineUrls.js"), exports);
|
|
6
|
+
tslib_1.__exportStar(require("./optionals.js"), exports);
|
|
7
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/structures/path/utils/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,2DAAiC;AACjC,yDAA+B"}
|