@rsdk/common 2.0.0 → 2.4.1-next.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/CHANGELOG.md +8 -0
- package/dist/convert/convert.class.js +1 -1
- package/dist/convert/convert.class.js.map +1 -1
- package/dist/enums/enums.functions.js +1 -0
- package/dist/enums/enums.functions.js.map +1 -1
- package/dist/functions/misc.d.ts +2 -2
- package/dist/functions/misc.js +3 -3
- package/dist/functions/misc.js.map +1 -1
- package/dist/functions/obj-normalization.js +1 -0
- package/dist/functions/obj-normalization.js.map +1 -1
- package/dist/serialization/read-obj-sync.js +4 -4
- package/dist/serialization/read-obj-sync.js.map +1 -1
- package/dist/serialization/read-obj.js +4 -4
- package/dist/serialization/read-obj.js.map +1 -1
- package/dist/serialization/save-obj.js +4 -4
- package/dist/serialization/save-obj.js.map +1 -1
- package/dist/serialization/serializer.class.js +7 -6
- package/dist/serialization/serializer.class.js.map +1 -1
- package/dist/size/size.class.js +1 -1
- package/dist/size/size.class.js.map +1 -1
- package/dist/time/stopwatch.class.js +3 -3
- package/dist/time/stopwatch.class.js.map +1 -1
- package/dist/time/timespan.class.d.ts +2 -0
- package/dist/time/timespan.class.js +19 -11
- package/dist/time/timespan.class.js.map +1 -1
- package/package.json +2 -2
- package/src/convert/convert.class.ts +1 -1
- package/src/enums/enums.functions.ts +1 -0
- package/src/functions/misc.ts +4 -5
- package/src/functions/obj-normalization.ts +1 -0
- package/src/serialization/read-obj-sync.ts +2 -2
- package/src/serialization/read-obj.ts +2 -2
- package/src/serialization/save-obj.ts +2 -2
- package/src/serialization/serializer.class.ts +11 -11
- package/src/size/size.class.ts +4 -4
- package/src/size/size.spec.ts +9 -9
- package/src/time/stopwatch.class.ts +3 -3
- package/src/time/timespan.class.ts +34 -17
- package/src/time/timespan.spec.ts +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [2.4.1-next.0](https://github.com/R-Vision/rsdk/compare/v2.4.0...v2.4.1-next.0) (2023-06-15)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rsdk/common
|
|
9
|
+
|
|
10
|
+
# [2.4.0](https://github.com/R-Vision/rsdk/compare/v2.3.1...v2.4.0) (2023-06-15)
|
|
11
|
+
|
|
12
|
+
**Note:** Version bump only for package @rsdk/common
|
|
13
|
+
|
|
6
14
|
# [2.0.0](https://github.com/R-Vision/rsdk/compare/v1.0.12...v2.0.0) (2023-06-06)
|
|
7
15
|
|
|
8
16
|
### Bug Fixes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.class.js","sourceRoot":"","sources":["../../src/convert/convert.class.ts"],"names":[],"mappings":";AAAA,yCAAyC;AACzC;;GAEG;AACH,uDAAuD;AACvD,sEAAsE;;;AAGtE,oCAAgC;AAEhC;;;;;GAKG;AACH,MAAa,OAAO;IAClB;;;;;;;;;OASG;IACH,MAAM,CAAC,GAAG,CAAC,KAAc;QACvB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC1D,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SAC5B;QAED,IAAI,KAAK,KAAK,EAAE,EAAE;YAChB,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SAC5B;QAED,qDAAqD;QACrD,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC;QAEtB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;YAC7B,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SAC5B;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;;;;;OASG;IACH,MAAM,CAAC,MAAM,CAAC,KAAc;QAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC1D,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SAC/B;QAED,IAAI,KAAK,KAAK,EAAE,EAAE;YAChB,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SAC/B;QAED,+BAA+B;QAC/B,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC;QAEtB,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YACxB,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SAC/B;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;;;;;;OAUG;IACH,MAAM,CAAC,OAAO,CAAC,KAAc;QAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE;YAC3D,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;SAChC;QAED,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE;YAC9B,OAAO,KAAK,CAAC;SACd;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QAE9C,IAAI,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC3C,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;SAChC;QAED,OAAO,UAAU,KAAK,MAAM,CAAC;IAC/B,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,IAAI,CAAI,KAAc,EAAE,CAAW;QACxC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC1D,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SAChC;QAED,KAAK,MAAM,CAAC,IAAI,YAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;YAC9B,MAAM,OAAO,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YAEjE,IAAI,CAAC,KAAK,OAAO,EAAE;gBACjB,OAAO,KAAqB,CAAC;aAC9B;YAED,IACE,OAAO,CAAC,KAAK,QAAQ;gBACrB,OAAO,KAAK,KAAK,QAAQ;gBACzB,CAAC,KAAK,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"convert.class.js","sourceRoot":"","sources":["../../src/convert/convert.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Enum = void 0;
|
|
4
4
|
const enumMembers = (e, get) => {
|
|
5
|
+
// eslint-disable-next-line unicorn/prefer-set-has
|
|
5
6
|
const numeric = Object.values(e)
|
|
6
7
|
.filter((v) => typeof v === 'number')
|
|
7
8
|
.map((n) => `${n}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enums.functions.js","sourceRoot":"","sources":["../../src/enums/enums.functions.ts"],"names":[],"mappings":";;;AAEA,MAAM,WAAW,GAAG,CAClB,CAAW,EACX,GAAsB,EACD,EAAE;IACvB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;SAC7B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;SACpC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEtB,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;SACrB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SACzC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAoB,CAAC,CAAC;AACpE,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAa,IAAI;IACf;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,CAAW;QACrB,OAAO,WAAW,CAAC,CAAC,EAAE,MAAM,CAAa,CAAC;IAC5C,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,MAAM,CAAC,CAAW;QACvB,OAAO,WAAW,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IAClC,CAAC;CACF;AAdD,oBAcC"}
|
|
1
|
+
{"version":3,"file":"enums.functions.js","sourceRoot":"","sources":["../../src/enums/enums.functions.ts"],"names":[],"mappings":";;;AAEA,MAAM,WAAW,GAAG,CAClB,CAAW,EACX,GAAsB,EACD,EAAE;IACvB,kDAAkD;IAClD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;SAC7B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;SACpC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEtB,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;SACrB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SACzC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAoB,CAAC,CAAC;AACpE,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAa,IAAI;IACf;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,CAAW;QACrB,OAAO,WAAW,CAAC,CAAC,EAAE,MAAM,CAAa,CAAC;IAC5C,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,MAAM,CAAC,CAAW;QACvB,OAAO,WAAW,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IAClC,CAAC;CACF;AAdD,oBAcC"}
|
package/dist/functions/misc.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { PathLike } from 'fs';
|
|
2
|
-
import type { Readable } from 'stream';
|
|
1
|
+
import type { PathLike } from 'node:fs';
|
|
2
|
+
import type { Readable } from 'node:stream';
|
|
3
3
|
import type { Constructor } from '../types';
|
|
4
4
|
/**
|
|
5
5
|
* Helps to create multi-line string literals in code. All double spaces and
|
package/dist/functions/misc.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.noop = exports.isOneOf = exports.hasKey = exports.isUndefined = exports.isRecord = exports.streamWriteFile = exports.unreachable = exports.text = void 0;
|
|
4
|
-
const
|
|
4
|
+
const node_fs_1 = require("node:fs");
|
|
5
5
|
/**
|
|
6
6
|
* Helps to create multi-line string literals in code. All double spaces and
|
|
7
7
|
* line breaks will be trimmed to single space (just like HTML)
|
|
@@ -16,7 +16,7 @@ const text = (mainParts, ...intermediateParts) => {
|
|
|
16
16
|
if (!textWithSpaces) {
|
|
17
17
|
return textWithSpaces;
|
|
18
18
|
}
|
|
19
|
-
return textWithSpaces.trim().
|
|
19
|
+
return textWithSpaces.trim().replaceAll(/\s+/g, ' ');
|
|
20
20
|
};
|
|
21
21
|
exports.text = text;
|
|
22
22
|
/**
|
|
@@ -37,7 +37,7 @@ exports.unreachable = unreachable;
|
|
|
37
37
|
*/
|
|
38
38
|
const streamWriteFile = (stream, path) => {
|
|
39
39
|
return new Promise((resolve, reject) => {
|
|
40
|
-
stream.pipe((0,
|
|
40
|
+
stream.pipe((0, node_fs_1.createWriteStream)(path));
|
|
41
41
|
stream.once('error', reject);
|
|
42
42
|
stream.once('end', resolve);
|
|
43
43
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../src/functions/misc.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../src/functions/misc.ts"],"names":[],"mappings":";;;AACA,qCAA4C;AAK5C;;;;;;;;GAQG;AACI,MAAM,IAAI,GAAG,CAClB,SAA+B,EAC/B,GAAG,iBAA4B,EACvB,EAAE;IACV,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,iBAAiB,CAAC,CAAC;IAEnE,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO,cAAc,CAAC;KACvB;IAED,OAAO,cAAc,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AACvD,CAAC,CAAC;AAXW,QAAA,IAAI,QAWf;AAEF;;;;;;;;;GASG;AACH,mGAAmG;AAC5F,MAAM,WAAW,GAAG,CAAC,MAAa,EAAO,EAAE,GAAE,CAAC,CAAC;AAAzC,QAAA,WAAW,eAA8B;AAEtD;;GAEG;AACI,MAAM,eAAe,GAAG,CAC7B,MAAgB,EAChB,IAAc,EACC,EAAE;IACjB,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,CAAC,IAAI,CAAC,IAAA,2BAAiB,EAAC,IAAI,CAAC,CAAC,CAAC;QACrC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AATW,QAAA,eAAe,mBAS1B;AAEK,MAAM,QAAQ,GAAG,CAAC,CAAU,EAAgC,EAAE,CACnE,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;AAD9C,QAAA,QAAQ,YACsC;AAEpD,MAAM,WAAW,GAAG,CAAI,KAAoB,EAAc,EAAE,CACjE,KAAK,KAAK,SAAS,CAAC;AADT,QAAA,WAAW,eACF;AAEf,MAAM,MAAM,GAAG,CAAmB,GAAM,EAAE,GAAY,EAAW,EAAE,CACxE,GAAG,IAAI,GAAG,CAAC;AADA,QAAA,MAAM,UACN;AAEN,MAAM,OAAO,GAAG,CAAC,KAAc,EAAE,KAAoB,EAAW,EAAE,CACvE,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,YAAY,IAAI,CAAC,CAAC;AADjC,QAAA,OAAO,WAC0B;AAE9C,gEAAgE;AACzD,MAAM,IAAI,GAAG,GAAS,EAAE,GAAE,CAAC,CAAC;AAAtB,QAAA,IAAI,QAAkB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"obj-normalization.js","sourceRoot":"","sources":["../../src/functions/obj-normalization.ts"],"names":[],"mappings":";;;AAAA,oCAAuC;AAavC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAE7B;;;;;;;;;;;;GAYG;AACI,MAAM,UAAU,GAAG,GAIZ,EAAE;IACd,MAAM,KAAK,GAAG,IAAI,GAAG,EAAE,CAAC;IAExB,MAAM,SAAS,GAAG,CAChB,CAAU,EACV,OAA0B,EAC1B,KAAK,GAAG,CAAC,EACA,EAAE;QACX,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS,IAAI,IAAA,mBAAW,EAAC,CAAC,CAAC,EAAE;YACnD,OAAO,CAAC,CAAC;SACV;QAED,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAChB,OAAO,YAAY,CAAC;SACrB;aAAM;YACL,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACd;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACpB,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;SAC5C;QAED,IAAI,KAAK,IAAI,CAAC,OAAO,EAAE,QAAQ,IAAI,iBAAiB,CAAC,EAAE;YACrD,OAAO,6BAA6B,CAAC;SACtC;QAED,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAEvC,IAAI,CAAC,YAAY,KAAK,EAAE;YACtB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACpB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACpB,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;SACvB;QAED,MAAM,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;QAEzB,IAAI,OAAO,EAAE,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;YAClD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;SACpC;QAED,MAAM,QAAQ,GAAG,KAAK,GAAG,CAAC,CAAC;QAE3B,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,GAA4B,EAAE,GAAG,EAAE,EAAE;YACvD,IAAI,OAAO,EAAE,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC3D,OAAO,GAAG,CAAC;aACZ;YAED,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAE,CAAS,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAEzD,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"obj-normalization.js","sourceRoot":"","sources":["../../src/functions/obj-normalization.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.readObjSync = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
4
|
+
const node_fs_1 = require("node:fs");
|
|
5
|
+
const node_path_1 = require("node:path");
|
|
6
6
|
const errors_1 = require("./errors");
|
|
7
7
|
const serializer_class_1 = require("./serializer.class");
|
|
8
8
|
/**
|
|
@@ -14,10 +14,10 @@ const serializer_class_1 = require("./serializer.class");
|
|
|
14
14
|
* @returns {any}
|
|
15
15
|
*/
|
|
16
16
|
const readObjSync = (pathToFile) => {
|
|
17
|
-
if (!(0,
|
|
17
|
+
if (!(0, node_path_1.isAbsolute)(pathToFile)) {
|
|
18
18
|
throw new errors_1.NotAbsolutePathError(pathToFile);
|
|
19
19
|
}
|
|
20
|
-
const content = (0,
|
|
20
|
+
const content = (0, node_fs_1.readFileSync)(pathToFile).toString();
|
|
21
21
|
const format = serializer_class_1.Serializer.getFormat(pathToFile);
|
|
22
22
|
return serializer_class_1.Serializer.parse(content, format);
|
|
23
23
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-obj-sync.js","sourceRoot":"","sources":["../../src/serialization/read-obj-sync.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"read-obj-sync.js","sourceRoot":"","sources":["../../src/serialization/read-obj-sync.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AACvC,yCAAuC;AAEvC,qCAAgD;AAChD,yDAAgD;AAEhD;;;;;;;GAOG;AACI,MAAM,WAAW,GAAG,CAAC,UAAkB,EAAW,EAAE;IACzD,IAAI,CAAC,IAAA,sBAAU,EAAC,UAAU,CAAC,EAAE;QAC3B,MAAM,IAAI,6BAAoB,CAAC,UAAU,CAAC,CAAC;KAC5C;IAED,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;IACpD,MAAM,MAAM,GAAG,6BAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAEhD,OAAO,6BAAU,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAC3C,CAAC,CAAC;AATW,QAAA,WAAW,eAStB"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.readObj = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
4
|
+
const node_fs_1 = require("node:fs");
|
|
5
|
+
const node_path_1 = require("node:path");
|
|
6
6
|
const errors_1 = require("./errors");
|
|
7
7
|
const serializer_class_1 = require("./serializer.class");
|
|
8
8
|
/**
|
|
@@ -13,11 +13,11 @@ const serializer_class_1 = require("./serializer.class");
|
|
|
13
13
|
* @returns {any}
|
|
14
14
|
*/
|
|
15
15
|
const readObj = async (pathToFile) => {
|
|
16
|
-
if (!(0,
|
|
16
|
+
if (!(0, node_path_1.isAbsolute)(pathToFile)) {
|
|
17
17
|
throw new errors_1.NotAbsolutePathError(pathToFile);
|
|
18
18
|
}
|
|
19
19
|
const format = serializer_class_1.Serializer.getFormat(pathToFile);
|
|
20
|
-
const content = await
|
|
20
|
+
const content = await node_fs_1.promises.readFile(pathToFile);
|
|
21
21
|
return serializer_class_1.Serializer.parse(content.toString(), format);
|
|
22
22
|
};
|
|
23
23
|
exports.readObj = readObj;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-obj.js","sourceRoot":"","sources":["../../src/serialization/read-obj.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"read-obj.js","sourceRoot":"","sources":["../../src/serialization/read-obj.ts"],"names":[],"mappings":";;;AAAA,qCAAyC;AACzC,yCAAuC;AAEvC,qCAAgD;AAChD,yDAAgD;AAEhD;;;;;;GAMG;AACI,MAAM,OAAO,GAAG,KAAK,EAAE,UAAkB,EAAoB,EAAE;IACpE,IAAI,CAAC,IAAA,sBAAU,EAAC,UAAU,CAAC,EAAE;QAC3B,MAAM,IAAI,6BAAoB,CAAC,UAAU,CAAC,CAAC;KAC5C;IAED,MAAM,MAAM,GAAG,6BAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAE9C,OAAO,6BAAU,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC,CAAC;AATW,QAAA,OAAO,WASlB"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.saveObj = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
4
|
+
const node_fs_1 = require("node:fs");
|
|
5
|
+
const node_path_1 = require("node:path");
|
|
6
6
|
const errors_1 = require("./errors");
|
|
7
7
|
const serializer_class_1 = require("./serializer.class");
|
|
8
8
|
/**
|
|
@@ -15,11 +15,11 @@ const serializer_class_1 = require("./serializer.class");
|
|
|
15
15
|
* to recognize it by file extension.
|
|
16
16
|
*/
|
|
17
17
|
const saveObj = async (obj, filename, format) => {
|
|
18
|
-
if (!(0,
|
|
18
|
+
if (!(0, node_path_1.isAbsolute)(filename)) {
|
|
19
19
|
throw new errors_1.NotAbsolutePathError(filename);
|
|
20
20
|
}
|
|
21
21
|
const text = serializer_class_1.Serializer.stringify(obj, format || serializer_class_1.Serializer.getFormat(filename));
|
|
22
|
-
await
|
|
22
|
+
await node_fs_1.promises.writeFile(filename, `${text}\n`);
|
|
23
23
|
};
|
|
24
24
|
exports.saveObj = saveObj;
|
|
25
25
|
//# sourceMappingURL=save-obj.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"save-obj.js","sourceRoot":"","sources":["../../src/serialization/save-obj.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"save-obj.js","sourceRoot":"","sources":["../../src/serialization/save-obj.ts"],"names":[],"mappings":";;;AAAA,qCAAyC;AACzC,yCAAuC;AAEvC,qCAAgD;AAChD,yDAAgD;AAEhD;;;;;;;;GAQG;AACI,MAAM,OAAO,GAAG,KAAK,EAC1B,GAA4B,EAC5B,QAAgB,EAChB,MAAe,EACA,EAAE;IACjB,IAAI,CAAC,IAAA,sBAAU,EAAC,QAAQ,CAAC,EAAE;QACzB,MAAM,IAAI,6BAAoB,CAAC,QAAQ,CAAC,CAAC;KAC1C;IAED,MAAM,IAAI,GAAG,6BAAU,CAAC,SAAS,CAC/B,GAAG,EACH,MAAM,IAAI,6BAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,CACzC,CAAC;IAEF,MAAM,kBAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC;AAC5C,CAAC,CAAC;AAfW,QAAA,OAAO,WAelB"}
|
|
@@ -4,24 +4,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Serializer = void 0;
|
|
7
|
-
const path_1 = require("path");
|
|
8
7
|
const dotenv_1 = __importDefault(require("dotenv"));
|
|
8
|
+
const node_path_1 = require("node:path");
|
|
9
9
|
const toml_1 = __importDefault(require("toml"));
|
|
10
10
|
const yaml_1 = __importDefault(require("yaml"));
|
|
11
11
|
const errors_1 = require("./errors");
|
|
12
12
|
const INDENT = 2;
|
|
13
|
+
const stringifyEnv = (obj) => Object.entries(obj)
|
|
14
|
+
.map(([key, value]) => `${key}=${typeof value === 'object' ? JSON.stringify(obj) : value}`)
|
|
15
|
+
.join('\n');
|
|
13
16
|
class Serializer {
|
|
14
17
|
static parsers = new Map()
|
|
15
18
|
.set('json', (text) => JSON.parse(text))
|
|
16
19
|
.set('yaml', (text) => yaml_1.default.parse(text))
|
|
17
20
|
.set('toml', (text) => toml_1.default.parse(text))
|
|
18
|
-
.set('env',
|
|
21
|
+
.set('env', dotenv_1.default.parse);
|
|
19
22
|
static stringifiers = new Map()
|
|
20
23
|
.set('json', (obj) => JSON.stringify(obj, null, INDENT))
|
|
21
24
|
.set('yaml', (obj) => yaml_1.default.stringify(obj))
|
|
22
|
-
.set('env',
|
|
23
|
-
.map(([key, value]) => `${key}=${typeof value === 'object' ? JSON.stringify(obj) : value}`)
|
|
24
|
-
.join('\n'));
|
|
25
|
+
.set('env', stringifyEnv);
|
|
25
26
|
static extensions = new Map()
|
|
26
27
|
.set('.json', 'json')
|
|
27
28
|
.set('.yaml', 'yaml')
|
|
@@ -29,7 +30,7 @@ class Serializer {
|
|
|
29
30
|
.set('.toml', 'toml')
|
|
30
31
|
.set('.env', 'env');
|
|
31
32
|
static getFormat(filename) {
|
|
32
|
-
let ext = (0,
|
|
33
|
+
let ext = (0, node_path_1.extname)(filename);
|
|
33
34
|
if (!ext && filename.includes('.env')) {
|
|
34
35
|
ext = '.env';
|
|
35
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializer.class.js","sourceRoot":"","sources":["../../src/serialization/serializer.class.ts"],"names":[],"mappings":";;;;;;AAAA
|
|
1
|
+
{"version":3,"file":"serializer.class.js","sourceRoot":"","sources":["../../src/serialization/serializer.class.ts"],"names":[],"mappings":"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"}
|
package/dist/size/size.class.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"size.class.js","sourceRoot":"","sources":["../../src/size/size.class.ts"],"names":[],"mappings":";;;AAAA,6DAA6D;AAC7D,4CAAoC;AAMpC,MAAM,OAAO,GAAyB;IACpC,CAAC,EAAE,CAAC;IACJ,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"size.class.js","sourceRoot":"","sources":["../../src/size/size.class.ts"],"names":[],"mappings":";;;AAAA,6DAA6D;AAC7D,4CAAoC;AAMpC,MAAM,OAAO,GAAyB;IACpC,CAAC,EAAE,CAAC;IACJ,EAAE,EAAE,IAAK;IACT,EAAE,EAAE,IAAK,GAAG,IAAK;IAEjB,EAAE,EAAE,IAAK,GAAG,IAAK,GAAG,IAAK;CAC1B,CAAC;AAEW,QAAA,mBAAmB,GAAG,4BAA4B,CAAC;AAEhE,MAAM,WAAY,SAAQ,KAAK;IAC7B,YAAY,GAAW;QACrB,KAAK,CAAC,IAAA,gBAAI,EAAA;8BACgB,GAAG;;;;KAI5B,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAa,IAAI;IACE,MAAM,CAAS;IAEhC,YAAY,KAAa,EAAE,CAAmB;QAC5C,MAAM,IAAI,GAAG,CAAC,CAAC,WAAW,EAAU,CAAC;QAErC,IAAI,CAAC,MAAM,GAAG,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,GAAW;QACtB,MAAM,KAAK,GAAG,2BAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE5C,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,WAAW,CAAC,GAAG,CAAC,CAAC;SAC5B;QAED,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC;QAEpC,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAS,EAAE,EAAE,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG,OAAQ,CAAC,WAAW,EAAsB,CAAC;QAExD,OAAO,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC;IAClC,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC;IAClC,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC;IAClC,CAAC;IAED,QAAQ,CAAC,IAAsB,GAAG;QAChC,MAAM,IAAI,GAAG,CAAC,CAAC,WAAW,EAAU,CAAC;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAE1C,OAAO,GAAG,KAAK,GAAG,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF;AA9CD,oBA8CC;AAEM,MAAM,IAAI,GAAG,CAAC,GAAe,EAAQ,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAAlD,QAAA,IAAI,QAA8C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stopwatch.class.js","sourceRoot":"","sources":["../../src/time/stopwatch.class.ts"],"names":[],"mappings":";;;AAEA;;;;;GAKG;AACH,MAAa,SAAS;IACZ,MAAM,
|
|
1
|
+
{"version":3,"file":"stopwatch.class.js","sourceRoot":"","sources":["../../src/time/stopwatch.class.ts"],"names":[],"mappings":";;;AAEA;;;;;GAKG;AACH,MAAa,SAAS;IACZ,MAAM,GAAkB,IAAI,CAAC;IAC7B,QAAQ,GAAkB,IAAI,CAAC;IAC/B,UAAU,GAAG,KAAK,CAAC;IAE3B;;;;;;OAMG;IACH,IAAI,mBAAmB;QACrB,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAED;;;;;;OAMG;IACH,IAAI,OAAO;QACT,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SACf;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;IACvE,CAAC;IAED;;;;;;OAMG;IACH,KAAK;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QAExB,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACH,OAAO;QACL,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,KAAK,EAAE,CAAC;QAEb,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACH,KAAK;QACH,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;SAChC;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QAEvB,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACH,KAAK;QACH,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5C,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;SACzB;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,qBAAqB,CAAC,MAAc;QAC1C,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAChD,MAAM,YAAY,GAAG,WAAW,GAAG,GAAG,CAAC;QAEvC,OAAO,YAAY,CAAC;IACtB,CAAC;CACF;AAnGD,8BAmGC"}
|
|
@@ -43,6 +43,8 @@ export declare class Timespan {
|
|
|
43
43
|
subtract(value: string): Timespan;
|
|
44
44
|
subtract(timespan: Timespan): Timespan;
|
|
45
45
|
toString(u?: Unit | UnitAlias): string;
|
|
46
|
+
private parseAddition;
|
|
47
|
+
private parseSubstraction;
|
|
46
48
|
private isUnit;
|
|
47
49
|
}
|
|
48
50
|
export declare const timespan: (str: TimespanString) => Timespan;
|
|
@@ -50,7 +50,7 @@ class Timespan {
|
|
|
50
50
|
throw new InvalidTimespan(str);
|
|
51
51
|
}
|
|
52
52
|
const [, rawValue, rawUnit] = match;
|
|
53
|
-
const value = parseInt(rawValue, 10);
|
|
53
|
+
const value = Number.parseInt(rawValue, 10);
|
|
54
54
|
const unit = aliasesToUnits[rawUnit.toLowerCase()];
|
|
55
55
|
return new Timespan(value, unit);
|
|
56
56
|
}
|
|
@@ -85,19 +85,11 @@ class Timespan {
|
|
|
85
85
|
return this._millis / factors.days;
|
|
86
86
|
}
|
|
87
87
|
add(value, unit) {
|
|
88
|
-
const addition =
|
|
89
|
-
? value * factors[unit]
|
|
90
|
-
: typeof value === 'string'
|
|
91
|
-
? Timespan.parse(value).millis()
|
|
92
|
-
: value._millis;
|
|
88
|
+
const addition = this.parseAddition(value, unit);
|
|
93
89
|
return new Timespan(this._millis + addition, 'milliseconds');
|
|
94
90
|
}
|
|
95
91
|
subtract(value, unit) {
|
|
96
|
-
const subtraction =
|
|
97
|
-
? value / factors[unit]
|
|
98
|
-
: typeof value === 'string'
|
|
99
|
-
? Timespan.parse(value).millis()
|
|
100
|
-
: value._millis;
|
|
92
|
+
const subtraction = this.parseSubstraction(value, unit);
|
|
101
93
|
return new Timespan(this._millis - subtraction, 'milliseconds');
|
|
102
94
|
}
|
|
103
95
|
toString(u = 's') {
|
|
@@ -106,6 +98,22 @@ class Timespan {
|
|
|
106
98
|
const alias = exports.unitsToAliases[unit];
|
|
107
99
|
return `${value}${alias}`;
|
|
108
100
|
}
|
|
101
|
+
parseAddition(value, unit) {
|
|
102
|
+
if (typeof value === 'number') {
|
|
103
|
+
return value * factors[unit];
|
|
104
|
+
}
|
|
105
|
+
return typeof value === 'string'
|
|
106
|
+
? Timespan.parse(value).millis()
|
|
107
|
+
: value._millis;
|
|
108
|
+
}
|
|
109
|
+
parseSubstraction(value, unit) {
|
|
110
|
+
if (typeof value === 'number') {
|
|
111
|
+
return value / factors[unit];
|
|
112
|
+
}
|
|
113
|
+
return typeof value === 'string'
|
|
114
|
+
? Timespan.parse(value).millis()
|
|
115
|
+
: value._millis;
|
|
116
|
+
}
|
|
109
117
|
isUnit(u) {
|
|
110
118
|
return Object.values(aliasesToUnits).includes(u);
|
|
111
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timespan.class.js","sourceRoot":"","sources":["../../src/time/timespan.class.ts"],"names":[],"mappings":";AAAA,6DAA6D;;;AAE7D,4CAAoC;AAMpC,MAAM,OAAO,GAAyB;IACpC,YAAY,EAAE,CAAC;IACf,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"timespan.class.js","sourceRoot":"","sources":["../../src/time/timespan.class.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/common",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.1-next.0",
|
|
4
4
|
"description": "Useful common classes, functions and types",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -15,5 +15,5 @@
|
|
|
15
15
|
"toml": "^3.0.0",
|
|
16
16
|
"yaml": "^1.10.0"
|
|
17
17
|
},
|
|
18
|
-
"gitHead": "
|
|
18
|
+
"gitHead": "02cbc6be59dcf7d7784b316b315eb746c6d5ac4a"
|
|
19
19
|
}
|
package/src/functions/misc.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
import type {
|
|
4
|
-
import type { Readable } from 'stream';
|
|
1
|
+
import type { PathLike } from 'node:fs';
|
|
2
|
+
import { createWriteStream } from 'node:fs';
|
|
3
|
+
import type { Readable } from 'node:stream';
|
|
5
4
|
|
|
6
5
|
import type { Constructor } from '../types';
|
|
7
6
|
|
|
@@ -24,7 +23,7 @@ export const text = (
|
|
|
24
23
|
return textWithSpaces;
|
|
25
24
|
}
|
|
26
25
|
|
|
27
|
-
return textWithSpaces.trim().
|
|
26
|
+
return textWithSpaces.trim().replaceAll(/\s+/g, ' ');
|
|
28
27
|
};
|
|
29
28
|
|
|
30
29
|
/**
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { extname } from 'path';
|
|
2
|
-
|
|
3
1
|
import dotenv from 'dotenv';
|
|
2
|
+
import { extname } from 'node:path';
|
|
4
3
|
import TOML from 'toml';
|
|
5
4
|
import YAML from 'yaml';
|
|
6
5
|
|
|
@@ -13,24 +12,25 @@ export type Extension = string;
|
|
|
13
12
|
|
|
14
13
|
const INDENT = 2;
|
|
15
14
|
|
|
15
|
+
const stringifyEnv = (obj): string =>
|
|
16
|
+
Object.entries(obj)
|
|
17
|
+
.map(
|
|
18
|
+
([key, value]) =>
|
|
19
|
+
`${key}=${typeof value === 'object' ? JSON.stringify(obj) : value}`,
|
|
20
|
+
)
|
|
21
|
+
.join('\n');
|
|
22
|
+
|
|
16
23
|
export class Serializer {
|
|
17
24
|
private static readonly parsers = new Map<Format, Parser>()
|
|
18
25
|
.set('json', (text) => JSON.parse(text))
|
|
19
26
|
.set('yaml', (text) => YAML.parse(text))
|
|
20
27
|
.set('toml', (text) => TOML.parse(text))
|
|
21
|
-
.set('env',
|
|
28
|
+
.set('env', dotenv.parse);
|
|
22
29
|
|
|
23
30
|
private static readonly stringifiers = new Map<Format, Stringifier>()
|
|
24
31
|
.set('json', (obj) => JSON.stringify(obj, null, INDENT))
|
|
25
32
|
.set('yaml', (obj) => YAML.stringify(obj))
|
|
26
|
-
.set('env',
|
|
27
|
-
Object.entries(obj)
|
|
28
|
-
.map(
|
|
29
|
-
([key, value]) =>
|
|
30
|
-
`${key}=${typeof value === 'object' ? JSON.stringify(obj) : value}`,
|
|
31
|
-
)
|
|
32
|
-
.join('\n'),
|
|
33
|
-
);
|
|
33
|
+
.set('env', stringifyEnv);
|
|
34
34
|
|
|
35
35
|
private static readonly extensions = new Map<Extension, Format>()
|
|
36
36
|
.set('.json', 'json')
|
package/src/size/size.class.ts
CHANGED
|
@@ -7,10 +7,10 @@ type SizeString = `${number}${Unit | UnitAlias}`;
|
|
|
7
7
|
|
|
8
8
|
const factors: Record<Unit, number> = {
|
|
9
9
|
b: 1,
|
|
10
|
-
kb:
|
|
11
|
-
mb:
|
|
10
|
+
kb: 1_024,
|
|
11
|
+
mb: 1_024 * 1_024,
|
|
12
12
|
|
|
13
|
-
gb:
|
|
13
|
+
gb: 1_024 * 1_024 * 1_024,
|
|
14
14
|
};
|
|
15
15
|
|
|
16
16
|
export const SIZE_STRING_PATTERN = /^(\d{1,100})(b|kb|mb|gb)$/i;
|
|
@@ -44,7 +44,7 @@ export class Size {
|
|
|
44
44
|
|
|
45
45
|
const [, rawValue, rawUnit] = match;
|
|
46
46
|
|
|
47
|
-
const value = parseInt(rawValue!, 10);
|
|
47
|
+
const value = Number.parseInt(rawValue!, 10);
|
|
48
48
|
const unit = rawUnit!.toLowerCase() as Unit | UnitAlias;
|
|
49
49
|
|
|
50
50
|
return new Size(value, unit);
|
package/src/size/size.spec.ts
CHANGED
|
@@ -16,20 +16,20 @@ describe('Size', () => {
|
|
|
16
16
|
|
|
17
17
|
const tt: TestCase[] = [
|
|
18
18
|
// GB
|
|
19
|
-
{ name: '1gb', s: new Size(1, 'gb'), gb: 1, mb:
|
|
20
|
-
{ name: '2gb', s: new Size(2, 'gb'), gb: 2, mb:
|
|
19
|
+
{ name: '1gb', s: new Size(1, 'gb'), gb: 1, mb: 1_024, kb: 1_048_576, b: 1_073_741_824 },
|
|
20
|
+
{ name: '2gb', s: new Size(2, 'gb'), gb: 2, mb: 2_048, kb: 2_097_152, b: 2_147_483_648 },
|
|
21
21
|
|
|
22
22
|
// MB
|
|
23
|
-
{ name: '1mb', s: new Size(1, 'mb'), gb: 0.001, mb: 1, kb:
|
|
24
|
-
{ name: '2mb', s: new Size(2, 'mb'), gb: 0.002, mb: 2, kb:
|
|
23
|
+
{ name: '1mb', s: new Size(1, 'mb'), gb: 0.001, mb: 1, kb: 1_024, b: 1_048_576 },
|
|
24
|
+
{ name: '2mb', s: new Size(2, 'mb'), gb: 0.002, mb: 2, kb: 2_048, b: 2_097_152 },
|
|
25
25
|
|
|
26
26
|
// KB
|
|
27
|
-
{ name: '1kb', s: new Size(1, 'kb'), gb: 0
|
|
28
|
-
{ name: '2kb', s: new Size(2, 'kb'), gb: 0
|
|
27
|
+
{ name: '1kb', s: new Size(1, 'kb'), gb: 0, mb: 0.001, kb: 1, b: 1_024 },
|
|
28
|
+
{ name: '2kb', s: new Size(2, 'kb'), gb: 0, mb: 0.002, kb: 2, b: 2_048 },
|
|
29
29
|
|
|
30
30
|
// Bytes
|
|
31
|
-
{ name: '1b', s: new Size(1, 'b'), gb: 0
|
|
32
|
-
{ name: '2b', s: new Size(2, 'b'), gb: 0
|
|
31
|
+
{ name: '1b', s: new Size(1, 'b'), gb: 0, mb: 0, kb: 0.001, b: 1 },
|
|
32
|
+
{ name: '2b', s: new Size(2, 'b'), gb: 0, mb: 0, kb: 0.002, b: 2 },
|
|
33
33
|
];
|
|
34
34
|
|
|
35
35
|
for (const { name, s, b, kb, mb, gb } of tt) {
|
|
@@ -55,7 +55,7 @@ describe('Size', () => {
|
|
|
55
55
|
const tt: TestCase[] = [
|
|
56
56
|
{ str: '1gb', correct: true, bytes: 1_073_741_824 },
|
|
57
57
|
{ str: '1mb', correct: true, bytes: 1_048_576 },
|
|
58
|
-
{ str: '1kb', correct: true, bytes:
|
|
58
|
+
{ str: '1kb', correct: true, bytes: 1_024 },
|
|
59
59
|
{ str: '1b', correct: true, bytes: 1 },
|
|
60
60
|
{ str: '1tb', correct: false, bytes: null },
|
|
61
61
|
{ str: 'Size', correct: false, bytes: null },
|
|
@@ -7,9 +7,9 @@ export type HrTime = [number, number];
|
|
|
7
7
|
* @class Stopwatch
|
|
8
8
|
*/
|
|
9
9
|
export class Stopwatch {
|
|
10
|
-
private _start: HrTime | null;
|
|
11
|
-
private _current: HrTime | null;
|
|
12
|
-
private _isRunning
|
|
10
|
+
private _start: HrTime | null = null;
|
|
11
|
+
private _current: HrTime | null = null;
|
|
12
|
+
private _isRunning = false;
|
|
13
13
|
|
|
14
14
|
/**
|
|
15
15
|
* Number of milliseconds passed from stopwatch started.
|
|
@@ -8,13 +8,13 @@ type TimespanString = `${number}${Unit | UnitAlias}`;
|
|
|
8
8
|
|
|
9
9
|
const factors: Record<Unit, number> = {
|
|
10
10
|
milliseconds: 1,
|
|
11
|
-
seconds:
|
|
11
|
+
seconds: 1_000,
|
|
12
12
|
|
|
13
|
-
minutes:
|
|
13
|
+
minutes: 1_000 * 60,
|
|
14
14
|
|
|
15
|
-
hours:
|
|
15
|
+
hours: 1_000 * 60 * 60,
|
|
16
16
|
|
|
17
|
-
days:
|
|
17
|
+
days: 1_000 * 60 * 60 * 24,
|
|
18
18
|
};
|
|
19
19
|
|
|
20
20
|
const aliasesToUnits: Record<UnitAlias, Unit> = {
|
|
@@ -69,7 +69,7 @@ export class Timespan {
|
|
|
69
69
|
|
|
70
70
|
const [, rawValue, rawUnit] = match;
|
|
71
71
|
|
|
72
|
-
const value = parseInt(rawValue!, 10);
|
|
72
|
+
const value = Number.parseInt(rawValue!, 10);
|
|
73
73
|
const unit = aliasesToUnits[rawUnit!.toLowerCase() as UnitAlias];
|
|
74
74
|
|
|
75
75
|
return new Timespan(value, unit);
|
|
@@ -117,12 +117,7 @@ export class Timespan {
|
|
|
117
117
|
add(value: string): Timespan;
|
|
118
118
|
add(timespan: Timespan): Timespan;
|
|
119
119
|
add(value: number | string | Timespan, unit?: Unit): Timespan {
|
|
120
|
-
const addition =
|
|
121
|
-
typeof value === 'number'
|
|
122
|
-
? value * factors[unit!]
|
|
123
|
-
: typeof value === 'string'
|
|
124
|
-
? Timespan.parse(value).millis()
|
|
125
|
-
: value._millis;
|
|
120
|
+
const addition = this.parseAddition(value, unit);
|
|
126
121
|
|
|
127
122
|
return new Timespan(this._millis + addition, 'milliseconds');
|
|
128
123
|
}
|
|
@@ -131,15 +126,13 @@ export class Timespan {
|
|
|
131
126
|
* Subtract time from timespan
|
|
132
127
|
*/
|
|
133
128
|
subtract(value: number, unit: Unit): Timespan;
|
|
129
|
+
|
|
134
130
|
subtract(value: string): Timespan;
|
|
131
|
+
|
|
135
132
|
subtract(timespan: Timespan): Timespan;
|
|
133
|
+
|
|
136
134
|
subtract(value: number | string | Timespan, unit?: Unit): Timespan {
|
|
137
|
-
const subtraction =
|
|
138
|
-
typeof value === 'number'
|
|
139
|
-
? value / factors[unit!]
|
|
140
|
-
: typeof value === 'string'
|
|
141
|
-
? Timespan.parse(value).millis()
|
|
142
|
-
: value._millis;
|
|
135
|
+
const subtraction = this.parseSubstraction(value, unit);
|
|
143
136
|
|
|
144
137
|
return new Timespan(this._millis - subtraction, 'milliseconds');
|
|
145
138
|
}
|
|
@@ -153,6 +146,30 @@ export class Timespan {
|
|
|
153
146
|
return `${value}${alias}`;
|
|
154
147
|
}
|
|
155
148
|
|
|
149
|
+
private parseAddition(
|
|
150
|
+
value: number | string | Timespan,
|
|
151
|
+
unit: 'milliseconds' | 'seconds' | 'minutes' | 'hours' | 'days' | undefined,
|
|
152
|
+
): number {
|
|
153
|
+
if (typeof value === 'number') {
|
|
154
|
+
return value * factors[unit!];
|
|
155
|
+
}
|
|
156
|
+
return typeof value === 'string'
|
|
157
|
+
? Timespan.parse(value).millis()
|
|
158
|
+
: value._millis;
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
private parseSubstraction(
|
|
162
|
+
value: number | string | Timespan,
|
|
163
|
+
unit: 'milliseconds' | 'seconds' | 'minutes' | 'hours' | 'days' | undefined,
|
|
164
|
+
): number {
|
|
165
|
+
if (typeof value === 'number') {
|
|
166
|
+
return value / factors[unit!];
|
|
167
|
+
}
|
|
168
|
+
return typeof value === 'string'
|
|
169
|
+
? Timespan.parse(value).millis()
|
|
170
|
+
: value._millis;
|
|
171
|
+
}
|
|
172
|
+
|
|
156
173
|
private isUnit(u: Unit | UnitAlias): u is Unit {
|
|
157
174
|
return Object.values(aliasesToUnits).includes(u as Unit);
|
|
158
175
|
}
|
|
@@ -27,14 +27,14 @@ describe('Timespan', () => {
|
|
|
27
27
|
// Minutes
|
|
28
28
|
{ name: '1m', t: new Timespan(1, 'm'), d: 0.001, h: 0.017, m: 1, s: 60, ms: 60_000 },
|
|
29
29
|
{ name: '2m', t: new Timespan(2, 'm'), d: 0.001, h: 0.033, m: 2, s: 120, ms: 120_000 },
|
|
30
|
-
|
|
30
|
+
|
|
31
31
|
// Seconds
|
|
32
|
-
{ name: '1s', t: new Timespan(1, 's'), d: 0
|
|
33
|
-
{ name: '2s', t: new Timespan(2, 's'), d: 0
|
|
32
|
+
{ name: '1s', t: new Timespan(1, 's'), d: 0, h: 0, m: 0.017, s: 1, ms: 1_000 },
|
|
33
|
+
{ name: '2s', t: new Timespan(2, 's'), d: 0, h: 0.001, m: 0.033, s: 2, ms: 2_000 },
|
|
34
34
|
|
|
35
35
|
// Milliseconds
|
|
36
|
-
{ name: '1ms', t: new Timespan(1, 'ms'), d: 0
|
|
37
|
-
{ name: '2ms', t: new Timespan(2, 'ms'), d: 0
|
|
36
|
+
{ name: '1ms', t: new Timespan(1, 'ms'), d: 0, h: 0, m: 0, s: 0.001, ms: 1 },
|
|
37
|
+
{ name: '2ms', t: new Timespan(2, 'ms'), d: 0, h: 0, m: 0, s: 0.002, ms: 2 },
|
|
38
38
|
];
|
|
39
39
|
|
|
40
40
|
for (const { name, t, d, h, m, s, ms } of tt) {
|