@rsdk/common 2.6.0-next.9 → 3.1.0-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 CHANGED
@@ -3,6 +3,50 @@
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
+ ## [3.1.0-next.0](https://github.com/R-Vision/rsdk/compare/v3.0.2...v3.1.0-next.0) (2023-08-08)
7
+
8
+ ### Features
9
+
10
+ * **kafka:** added option to consume by topic name ([#93](https://github.com/R-Vision/rsdk/issues/93)) ([09b4c1b](https://github.com/R-Vision/rsdk/commit/09b4c1bd515c1c2c3ccda17851fbe79e64ea8ac5))
11
+
12
+ ## [3.0.2](https://github.com/R-Vision/rsdk/compare/v3.0.1...v3.0.2) (2023-08-07)
13
+
14
+ **Note:** Version bump only for package @rsdk/common
15
+
16
+ ## [3.0.0](https://github.com/R-Vision/rsdk/compare/v3.0.0-next.0...v3.0.0) (2023-08-04)
17
+
18
+ **Note:** Version bump only for package @rsdk/common
19
+
20
+ ## [3.0.0-next.0](https://github.com/R-Vision/rsdk/compare/v2.6.0-next.16...v3.0.0-next.0) (2023-08-04)
21
+
22
+ ### ⚠ BREAKING CHANGES
23
+
24
+ * just for bump
25
+
26
+ ### Bug Fixes
27
+
28
+ * just for bump ([6aa5435](https://github.com/R-Vision/rsdk/commit/6aa543537b2c5f8f407761016a44b17f51772646))
29
+
30
+ # [2.6.0-next.15](https://github.com/R-Vision/rsdk/compare/v2.6.0-next.14...v2.6.0-next.15) (2023-08-04)
31
+
32
+ **Note:** Version bump only for package @rsdk/common
33
+
34
+ # [2.6.0-next.13](https://github.com/R-Vision/rsdk/compare/v2.6.0-next.12...v2.6.0-next.13) (2023-08-01)
35
+
36
+ **Note:** Version bump only for package @rsdk/common
37
+
38
+ # [2.6.0-next.12](https://github.com/R-Vision/rsdk/compare/v2.6.0-next.11...v2.6.0-next.12) (2023-07-28)
39
+
40
+ ### Features
41
+
42
+ * **@rsdk/common:** improve Timespan class ([f28a6b6](https://github.com/R-Vision/rsdk/commit/f28a6b68d3dfbf76f4a3f7a7225ef455526ccc0d))
43
+
44
+ # [2.6.0-next.11](https://github.com/R-Vision/rsdk/compare/v2.6.0-next.10...v2.6.0-next.11) (2023-07-26)
45
+
46
+ ### Features
47
+
48
+ * **@rsdk/common:** add support of negative durations in Timespan class ([52ede3c](https://github.com/R-Vision/rsdk/commit/52ede3c69005a4091f591a78264fbd9bc6d0bcd2))
49
+
6
50
  # [2.6.0-next.9](https://github.com/R-Vision/rsdk/compare/v2.6.0-next.8...v2.6.0-next.9) (2023-07-25)
7
51
 
8
52
  **Note:** Version bump only for package @rsdk/common
@@ -37,7 +37,6 @@ export declare class Convert {
37
37
  *
38
38
  * @static
39
39
  * @param {*} value Any input value.
40
- * @param {number} [defaultValue] Value to use if input value is undefined.
41
40
  * @returns {number}
42
41
  * @throws {Error} Throws if conversion is impossible.
43
42
  * @memberof Convert
@@ -69,7 +69,6 @@ class Convert {
69
69
  *
70
70
  * @static
71
71
  * @param {*} value Any input value.
72
- * @param {number} [defaultValue] Value to use if input value is undefined.
73
72
  * @returns {number}
74
73
  * @throws {Error} Throws if conversion is impossible.
75
74
  * @memberof Convert
@@ -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,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,EAChC;gBACA,OAAO,CAAiB,CAAC;aAC1B;SACF;QAED,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;QAExB,IAAI,MAAM,KAAK,SAAS,EAAE;YACxB,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SAChC;QAED,OAAO,MAAsB,CAAC;IAChC,CAAC;IAEO,MAAM,CAAC,WAAW,CAAC,KAAc;QACvC,OAAO,IAAI,KAAK,CAAC,UAAU,KAAK,iCAAiC,CAAC,CAAC;IACrE,CAAC;IAEO,MAAM,CAAC,QAAQ,CAAC,KAAc;QACpC,OAAO,IAAI,KAAK,CAAC,UAAU,KAAK,kCAAkC,CAAC,CAAC;IACtE,CAAC;IAEO,MAAM,CAAC,YAAY,CAAC,KAAc;QACxC,OAAO,IAAI,KAAK,CAAC,UAAU,KAAK,kCAAkC,CAAC,CAAC;IACtE,CAAC;IAEO,MAAM,CAAC,YAAY,CAAC,KAAc;QACxC,OAAO,OAAO,KAAK,KAAK,QAAQ;YAC9B,CAAC,CAAC,IAAI,KAAK,GAAG;YACd,CAAC,CAAC,4DAA4D;gBAC5D,yBAAyB;gBACzB,MAAM,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC;IAEO,MAAM,CAAC,SAAS,CAAC,KAAU,EAAE,CAAW;QAC9C,OAAO,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,YAAY,CACpC,KAAK,CACN,6BAA6B,YAAI,CAAC,MAAM,CAAC,CAAC,CAAC;aACzC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;aACtB,IAAI,CAAC,IAAI,CAAC;KACZ,CAAC,CAAC;IACL,CAAC;CACF;AA3JD,0BA2JC"}
1
+ {"version":3,"file":"convert.class.js","sourceRoot":"","sources":["../../src/convert/convert.class.ts"],"names":[],"mappings":"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"}
@@ -16,8 +16,6 @@ export interface NormalizeOptions {
16
16
  *
17
17
  * NOTE: Function is recursive
18
18
  *
19
- * @param x any value,
20
- * @param options NormalizeOptions
21
19
  * @returns unknown
22
20
  */
23
21
  export declare const normalizer: () => (x: unknown, options?: NormalizeOptions, depth?: number) => unknown;
@@ -12,8 +12,6 @@ const DEFAULT_MAX_DEPTH = 10;
12
12
  *
13
13
  * NOTE: Function is recursive
14
14
  *
15
- * @param x any value,
16
- * @param options NormalizeOptions
17
15
  * @returns unknown
18
16
  */
19
17
  const normalizer = () => {
@@ -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,sDAAsD;QACtD,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;AA3DW,QAAA,UAAU,cA2DrB;AAEF,MAAM,cAAc,GAAG,IAAI,GAAG,EAAkB;KAC7C,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;KAClB,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;KACd,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;KACjB,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;KACjB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;KACf,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;AAEnB;;GAEG;AACU,QAAA,aAAa,GAAa;IACrC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,KAAK;IAChC,MAAM,EAAE,CAAC,CAAS,EAAE,CAAS,EAAU,EAAE,CACvC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACvE,CAAC"}
1
+ {"version":3,"file":"obj-normalization.js","sourceRoot":"","sources":["../../src/functions/obj-normalization.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,23 @@
1
- type Unit = 'milliseconds' | 'seconds' | 'minutes' | 'hours' | 'days';
2
- type UnitAlias = 'd' | 'h' | 'm' | 's' | 'ms';
3
- type TimespanString = `${number}${Unit | UnitAlias}`;
1
+ export type Unit = 'milliseconds' | 'seconds' | 'minutes' | 'hours' | 'days';
2
+ export type UnitAlias = 'd' | 'h' | 'm' | 's' | 'ms';
3
+ export type TimespanString = `${number}${Unit | UnitAlias}`;
4
4
  export declare const unitsToAliases: Record<Unit, UnitAlias>;
5
5
  export declare const TIMESPAN_STRING_PATTERN: RegExp;
6
6
  /**
7
7
  * Represents time period (duration)
8
8
  */
9
9
  export declare class Timespan {
10
+ /**
11
+ * Time in milliseconds
12
+ */
10
13
  private readonly _millis;
14
+ /**
15
+ * Original unit that was passed to
16
+ * constructor
17
+ */
18
+ private readonly _unit;
11
19
  constructor(value: number, u: Unit | UnitAlias);
20
+ static second(value: number): Timespan;
12
21
  static parse(str: string): Timespan;
13
22
  /**
14
23
  * Get value in milliseconds
@@ -42,10 +51,9 @@ export declare class Timespan {
42
51
  subtract(value: number, unit: Unit): Timespan;
43
52
  subtract(value: string): Timespan;
44
53
  subtract(timespan: Timespan): Timespan;
45
- toString(u?: Unit | UnitAlias): string;
54
+ toString(useUnit?: Unit | UnitAlias): string;
46
55
  private parseAddition;
47
56
  private parseSubstraction;
48
57
  private isUnit;
49
58
  }
50
59
  export declare const timespan: (str: TimespanString) => Timespan;
51
- export {};
@@ -2,36 +2,40 @@
2
2
  /* eslint-disable @typescript-eslint/no-non-null-assertion */
3
3
  Object.defineProperty(exports, "__esModule", { value: true });
4
4
  exports.timespan = exports.Timespan = exports.TIMESPAN_STRING_PATTERN = exports.unitsToAliases = void 0;
5
+ const convert_1 = require("../convert");
5
6
  const strings_1 = require("../strings");
6
7
  const factors = {
7
8
  milliseconds: 1,
8
- seconds: 1000,
9
- minutes: 1000 * 60,
10
- hours: 1000 * 60 * 60,
11
- days: 1000 * 60 * 60 * 24,
9
+ seconds: 1 * 1000,
10
+ minutes: 1 * 1000 * 60,
11
+ hours: 1 * 1000 * 60 * 60,
12
+ days: 1 * 1000 * 60 * 60 * 24,
12
13
  };
13
14
  const aliasesToUnits = {
14
- d: 'days',
15
- h: 'hours',
16
- m: 'minutes',
17
- s: 'seconds',
18
15
  ms: 'milliseconds',
16
+ s: 'seconds',
17
+ m: 'minutes',
18
+ h: 'hours',
19
+ d: 'days',
19
20
  };
20
21
  exports.unitsToAliases = {
21
- days: 'd',
22
- hours: 'h',
23
- minutes: 'm',
24
- seconds: 's',
25
22
  milliseconds: 'ms',
23
+ seconds: 's',
24
+ minutes: 'm',
25
+ hours: 'h',
26
+ days: 'd',
26
27
  };
27
- exports.TIMESPAN_STRING_PATTERN = /^(\d{1,10})(h|m|s|ms|d)$/i;
28
+ // Exported pattern should be string to easier serialization
29
+ exports.TIMESPAN_STRING_PATTERN =
30
+ // eslint-disable-next-line unicorn/no-unsafe-regex
31
+ /^(-?\d{1,10}(\.\d{1,10})?)(h|H|m|M|s|S|ms|MS|d|D)$/;
28
32
  class InvalidTimespan extends Error {
29
33
  constructor(str) {
30
34
  super((0, strings_1.text) `
31
35
  Invalid timespan string: <${str}>.
32
36
  Timespan string should contain numeric and unit parts.
33
37
  Acceptable units: D, H, M, S, MS (case doesn't matter).
34
- Ex: "30D, 10H, 2M, 100MS"
38
+ Ex: "30D, 10H, 2M, 100MS, 0.1s, -5d"
35
39
  `);
36
40
  }
37
41
  }
@@ -39,18 +43,31 @@ class InvalidTimespan extends Error {
39
43
  * Represents time period (duration)
40
44
  */
41
45
  class Timespan {
46
+ /**
47
+ * Time in milliseconds
48
+ */
42
49
  _millis;
50
+ /**
51
+ * Original unit that was passed to
52
+ * constructor
53
+ */
54
+ _unit;
43
55
  constructor(value, u) {
44
56
  const unit = this.isUnit(u) ? u : aliasesToUnits[u];
45
57
  this._millis = value * factors[unit];
58
+ this._unit = unit;
59
+ }
60
+ static second(value) {
61
+ return new Timespan(value, 's');
46
62
  }
47
63
  static parse(str) {
48
64
  const match = exports.TIMESPAN_STRING_PATTERN.exec(str);
49
65
  if (!match) {
50
66
  throw new InvalidTimespan(str);
51
67
  }
52
- const [, rawValue, rawUnit] = match;
53
- const value = Number.parseInt(rawValue, 10);
68
+ const rawValue = match[1];
69
+ const rawUnit = match[3] || match[2]; // Will be 3 if value has decimal point
70
+ const value = convert_1.Convert.number(rawValue);
54
71
  const unit = aliasesToUnits[rawUnit.toLowerCase()];
55
72
  return new Timespan(value, unit);
56
73
  }
@@ -92,7 +109,8 @@ class Timespan {
92
109
  const subtraction = this.parseSubstraction(value, unit);
93
110
  return new Timespan(this._millis - subtraction, 'milliseconds');
94
111
  }
95
- toString(u = 's') {
112
+ toString(useUnit) {
113
+ const u = useUnit || this._unit;
96
114
  const unit = this.isUnit(u) ? u : aliasesToUnits[u];
97
115
  const value = this._millis / factors[unit];
98
116
  const alias = exports.unitsToAliases[unit];
@@ -1 +1 @@
1
- {"version":3,"file":"timespan.class.js","sourceRoot":"","sources":["../../src/time/timespan.class.ts"],"names":[],"mappings":"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"}
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.6.0-next.9",
3
+ "version": "3.1.0-next.0",
4
4
  "description": "Useful common classes, functions and types",
5
5
  "license": "Apache License 2.0",
6
6
  "publishConfig": {
@@ -13,5 +13,5 @@
13
13
  "scripts": {
14
14
  "prepublishOnly": "npm run build"
15
15
  },
16
- "gitHead": "6b0189156dc2873f86056e6c608efecbd2024b24"
16
+ "gitHead": "55598931db264fb6d5b5c4787c48298ed86bbc0d"
17
17
  }
@@ -79,7 +79,6 @@ export class Convert {
79
79
  *
80
80
  * @static
81
81
  * @param {*} value Any input value.
82
- * @param {number} [defaultValue] Value to use if input value is undefined.
83
82
  * @returns {number}
84
83
  * @throws {Error} Throws if conversion is impossible.
85
84
  * @memberof Convert
@@ -22,8 +22,6 @@ const DEFAULT_MAX_DEPTH = 10;
22
22
  *
23
23
  * NOTE: Function is recursive
24
24
  *
25
- * @param x any value,
26
- * @param options NormalizeOptions
27
25
  * @returns unknown
28
26
  */
29
27
  export const normalizer = (): ((
@@ -1,41 +1,40 @@
1
1
  /* eslint-disable @typescript-eslint/no-non-null-assertion */
2
2
 
3
+ import { Convert } from '../convert';
3
4
  import { text } from '../strings';
4
5
 
5
- type Unit = 'milliseconds' | 'seconds' | 'minutes' | 'hours' | 'days';
6
- type UnitAlias = 'd' | 'h' | 'm' | 's' | 'ms';
7
- type TimespanString = `${number}${Unit | UnitAlias}`;
6
+ export type Unit = 'milliseconds' | 'seconds' | 'minutes' | 'hours' | 'days';
7
+ export type UnitAlias = 'd' | 'h' | 'm' | 's' | 'ms';
8
+ export type TimespanString = `${number}${Unit | UnitAlias}`;
8
9
 
9
10
  const factors: Record<Unit, number> = {
10
11
  milliseconds: 1,
11
- seconds: 1_000,
12
-
13
- minutes: 1_000 * 60,
14
-
15
- hours: 1_000 * 60 * 60,
16
-
17
- days: 1_000 * 60 * 60 * 24,
12
+ seconds: 1 * 1_000,
13
+ minutes: 1 * 1_000 * 60,
14
+ hours: 1 * 1_000 * 60 * 60,
15
+ days: 1 * 1_000 * 60 * 60 * 24,
18
16
  };
19
17
 
20
18
  const aliasesToUnits: Record<UnitAlias, Unit> = {
21
- d: 'days',
22
- h: 'hours',
23
- m: 'minutes',
24
- s: 'seconds',
25
-
26
19
  ms: 'milliseconds',
20
+ s: 'seconds',
21
+ m: 'minutes',
22
+ h: 'hours',
23
+ d: 'days',
27
24
  };
28
25
 
29
26
  export const unitsToAliases: Record<Unit, UnitAlias> = {
30
- days: 'd',
31
- hours: 'h',
32
- minutes: 'm',
33
- seconds: 's',
34
-
35
27
  milliseconds: 'ms',
28
+ seconds: 's',
29
+ minutes: 'm',
30
+ hours: 'h',
31
+ days: 'd',
36
32
  };
37
33
 
38
- export const TIMESPAN_STRING_PATTERN = /^(\d{1,10})(h|m|s|ms|d)$/i;
34
+ // Exported pattern should be string to easier serialization
35
+ export const TIMESPAN_STRING_PATTERN =
36
+ // eslint-disable-next-line unicorn/no-unsafe-regex
37
+ /^(-?\d{1,10}(\.\d{1,10})?)(h|H|m|M|s|S|ms|MS|d|D)$/;
39
38
 
40
39
  class InvalidTimespan extends Error {
41
40
  constructor(str: string) {
@@ -43,7 +42,7 @@ class InvalidTimespan extends Error {
43
42
  Invalid timespan string: <${str}>.
44
43
  Timespan string should contain numeric and unit parts.
45
44
  Acceptable units: D, H, M, S, MS (case doesn't matter).
46
- Ex: "30D, 10H, 2M, 100MS"
45
+ Ex: "30D, 10H, 2M, 100MS, 0.1s, -5d"
47
46
  `);
48
47
  }
49
48
  }
@@ -52,12 +51,26 @@ class InvalidTimespan extends Error {
52
51
  * Represents time period (duration)
53
52
  */
54
53
  export class Timespan {
54
+ /**
55
+ * Time in milliseconds
56
+ */
55
57
  private readonly _millis: number;
56
58
 
59
+ /**
60
+ * Original unit that was passed to
61
+ * constructor
62
+ */
63
+ private readonly _unit: Unit;
64
+
57
65
  constructor(value: number, u: Unit | UnitAlias) {
58
66
  const unit = this.isUnit(u) ? u : aliasesToUnits[u];
59
67
 
60
68
  this._millis = value * factors[unit];
69
+ this._unit = unit;
70
+ }
71
+
72
+ static second(value: number): Timespan {
73
+ return new Timespan(value, 's');
61
74
  }
62
75
 
63
76
  static parse(str: string): Timespan {
@@ -67,9 +80,10 @@ export class Timespan {
67
80
  throw new InvalidTimespan(str);
68
81
  }
69
82
 
70
- const [, rawValue, rawUnit] = match;
83
+ const rawValue = match[1];
84
+ const rawUnit = match[3] || match[2]; // Will be 3 if value has decimal point
71
85
 
72
- const value = Number.parseInt(rawValue, 10);
86
+ const value = Convert.number(rawValue);
73
87
  const unit = aliasesToUnits[rawUnit.toLowerCase() as UnitAlias];
74
88
 
75
89
  return new Timespan(value, unit);
@@ -126,18 +140,16 @@ export class Timespan {
126
140
  * Subtract time from timespan
127
141
  */
128
142
  subtract(value: number, unit: Unit): Timespan;
129
-
130
143
  subtract(value: string): Timespan;
131
-
132
144
  subtract(timespan: Timespan): Timespan;
133
-
134
145
  subtract(value: number | string | Timespan, unit?: Unit): Timespan {
135
146
  const subtraction = this.parseSubstraction(value, unit);
136
147
 
137
148
  return new Timespan(this._millis - subtraction, 'milliseconds');
138
149
  }
139
150
 
140
- toString(u: Unit | UnitAlias = 's'): string {
151
+ toString(useUnit?: Unit | UnitAlias): string {
152
+ const u = useUnit || this._unit;
141
153
  const unit = this.isUnit(u) ? u : aliasesToUnits[u];
142
154
  const value = this._millis / factors[unit];
143
155
 
@@ -1,6 +1,7 @@
1
1
  /* eslint-disable sort-keys */
2
2
  /* eslint-disable prettier/prettier */
3
3
 
4
+ import type { Unit, UnitAlias } from './timespan.class';
4
5
  import { Timespan } from './timespan.class';
5
6
 
6
7
  describe('Timespan', () => {
@@ -37,18 +38,16 @@ describe('Timespan', () => {
37
38
  { name: '2ms', t: new Timespan(2, 'ms'), d: 0, h: 0, m: 0, s: 0.002, ms: 2 },
38
39
  ];
39
40
 
40
- for (const { name, t, d, h, m, s, ms } of tt) {
41
- it(name, () => {
42
- /**
43
- * Всё округляется до 3-го знака после запятой
44
- */
45
- expect(t.days().toFixed(3)).toEqual(d.toFixed(3));
46
- expect(t.hours().toFixed(3)).toEqual(h.toFixed(3));
47
- expect(t.minutes().toFixed(3)).toEqual(m.toFixed(3));
48
- expect(t.seconds().toFixed(3)).toEqual(s.toFixed(3));
49
- expect(t.millis().toFixed(3)).toEqual(ms.toFixed(3));
50
- });
51
- }
41
+ it.each(tt)('$name', ({ t, d, m, s, ms, h }) => {
42
+ /**
43
+ * Всё округляется до 3-го знака после запятой
44
+ */
45
+ expect(t.days().toFixed(3)).toEqual(d.toFixed(3));
46
+ expect(t.hours().toFixed(3)).toEqual(h.toFixed(3));
47
+ expect(t.minutes().toFixed(3)).toEqual(m.toFixed(3));
48
+ expect(t.seconds().toFixed(3)).toEqual(s.toFixed(3));
49
+ expect(t.millis().toFixed(3)).toEqual(ms.toFixed(3));
50
+ });
52
51
  });
53
52
 
54
53
  describe('Parsing', () => {
@@ -63,19 +62,42 @@ describe('Timespan', () => {
63
62
  { str: '1h', correct: true, ms: 3_600_000 },
64
63
  { str: '1m', correct: true, ms: 60_000 },
65
64
  { str: '1s', correct: true, ms: 1_000 },
65
+ { str: '0.1s', correct: true, ms: 100 },
66
+ { str: '-1h', correct: true, ms: -3_600_000 },
66
67
  { str: '1ms', correct: true, ms: 1 },
67
68
  { str: '1me', correct: false, ms: null },
68
69
  { str: 'Time', correct: false, ms: null },
69
70
  ];
70
71
 
71
- for (const { str, correct, ms } of tt) {
72
- it(str, () => {
73
- if (correct) {
74
- expect(Timespan.parse(str).millis()).toEqual(ms);
75
- } else {
76
- expect(() => Timespan.parse(str)).toThrow();
77
- }
78
- });
72
+ it.each(tt)('$str', ({ correct, str, ms }) => {
73
+ if (correct) {
74
+ expect(Timespan.parse(str).millis()).toEqual(ms);
75
+ } else {
76
+ expect(() => Timespan.parse(str)).toThrow();
77
+ }
78
+ });
79
+ });
80
+
81
+ describe('Serialization', () => {
82
+ interface TestCase {
83
+ timespan: Timespan;
84
+ useUnit: Unit | UnitAlias | undefined;
85
+ expected: string;
79
86
  }
87
+
88
+ const tt: TestCase[] = [
89
+ { timespan: new Timespan(1, 'd'), useUnit: undefined, expected: '1d' },
90
+ { timespan: new Timespan(1, 'h'), useUnit: undefined, expected: '1h', },
91
+ { timespan: new Timespan(1, 'm'), useUnit: undefined, expected: '1m', },
92
+ { timespan: new Timespan(1, 's'), useUnit: undefined, expected: '1s', },
93
+ { timespan: new Timespan(0.1, 's'), useUnit: undefined, expected: '0.1s', },
94
+ { timespan: new Timespan(-1, 'h'), useUnit: undefined, expected: '-1h', },
95
+ { timespan: new Timespan(1, 'ms'), useUnit: undefined, expected: '1ms', },
96
+ { timespan: new Timespan(10, 'ms'), useUnit: 's', expected: '0.01s' },
97
+ ];
98
+
99
+ it.each(tt)('$expected', ({ expected, useUnit, timespan }) => {
100
+ expect(timespan.toString(useUnit)).toBe(expected);
101
+ });
80
102
  });
81
103
  });