@rsdk/common 2.6.0-next.11 → 2.6.0-next.12

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,12 @@
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.6.0-next.12](https://github.com/R-Vision/rsdk/compare/v2.6.0-next.11...v2.6.0-next.12) (2023-07-28)
7
+
8
+ ### Features
9
+
10
+ * **@rsdk/common:** improve Timespan class ([f28a6b6](https://github.com/R-Vision/rsdk/commit/f28a6b68d3dfbf76f4a3f7a7225ef455526ccc0d))
11
+
6
12
  # [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)
7
13
 
8
14
  ### Features
@@ -1,13 +1,21 @@
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);
12
20
  static parse(str: string): Timespan;
13
21
  /**
@@ -42,10 +50,9 @@ export declare class Timespan {
42
50
  subtract(value: number, unit: Unit): Timespan;
43
51
  subtract(value: string): Timespan;
44
52
  subtract(timespan: Timespan): Timespan;
45
- toString(u?: Unit | UnitAlias): string;
53
+ toString(useUnit?: Unit | UnitAlias): string;
46
54
  private parseAddition;
47
55
  private parseSubstraction;
48
56
  private isUnit;
49
57
  }
50
58
  export declare const timespan: (str: TimespanString) => Timespan;
51
- export {};
@@ -2,6 +2,7 @@
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,
@@ -11,28 +12,28 @@ const factors = {
11
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
28
  // Exported pattern should be string to easier serialization
28
- exports.TIMESPAN_STRING_PATTERN = /^(-?\d{1,10})(h|H|m|M|s|S|ms|MS|d|D)$/;
29
+ exports.TIMESPAN_STRING_PATTERN = /^(-?\d{1,10}(\.\d{1,10})?)(h|H|m|M|s|S|ms|MS|d|D)$/;
29
30
  class InvalidTimespan extends Error {
30
31
  constructor(str) {
31
32
  super((0, strings_1.text) `
32
33
  Invalid timespan string: <${str}>.
33
34
  Timespan string should contain numeric and unit parts.
34
35
  Acceptable units: D, H, M, S, MS (case doesn't matter).
35
- Ex: "30D, 10H, 2M, 100MS"
36
+ Ex: "30D, 10H, 2M, 100MS, 0.1s, -5d"
36
37
  `);
37
38
  }
38
39
  }
@@ -40,18 +41,28 @@ class InvalidTimespan extends Error {
40
41
  * Represents time period (duration)
41
42
  */
42
43
  class Timespan {
44
+ /**
45
+ * Time in milliseconds
46
+ */
43
47
  _millis;
48
+ /**
49
+ * Original unit that was passed to
50
+ * constructor
51
+ */
52
+ _unit;
44
53
  constructor(value, u) {
45
54
  const unit = this.isUnit(u) ? u : aliasesToUnits[u];
46
55
  this._millis = value * factors[unit];
56
+ this._unit = unit;
47
57
  }
48
58
  static parse(str) {
49
59
  const match = exports.TIMESPAN_STRING_PATTERN.exec(str);
50
60
  if (!match) {
51
61
  throw new InvalidTimespan(str);
52
62
  }
53
- const [, rawValue, rawUnit] = match;
54
- const value = Number.parseInt(rawValue, 10);
63
+ const rawValue = match[1];
64
+ const rawUnit = match[3] || match[2]; // Will be 3 if value has decimal point
65
+ const value = convert_1.Convert.number(rawValue);
55
66
  const unit = aliasesToUnits[rawUnit.toLowerCase()];
56
67
  return new Timespan(value, unit);
57
68
  }
@@ -93,7 +104,8 @@ class Timespan {
93
104
  const subtraction = this.parseSubstraction(value, unit);
94
105
  return new Timespan(this._millis - subtraction, 'milliseconds');
95
106
  }
96
- toString(u = 's') {
107
+ toString(useUnit) {
108
+ const u = useUnit || this._unit;
97
109
  const unit = this.isUnit(u) ? u : aliasesToUnits[u];
98
110
  const value = this._millis / factors[unit];
99
111
  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.11",
3
+ "version": "2.6.0-next.12",
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": "d2183c898b6e46a7293e5d47eb6d9d6aa56419c5"
16
+ "gitHead": "aab7d53b4eb7873285c36c927c71b0d45d007554"
17
17
  }
@@ -1,10 +1,11 @@
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,
@@ -15,25 +16,23 @@ const factors: Record<Unit, number> = {
15
16
  };
16
17
 
17
18
  const aliasesToUnits: Record<UnitAlias, Unit> = {
18
- d: 'days',
19
- h: 'hours',
20
- m: 'minutes',
21
- s: 'seconds',
22
-
23
19
  ms: 'milliseconds',
20
+ s: 'seconds',
21
+ m: 'minutes',
22
+ h: 'hours',
23
+ d: 'days',
24
24
  };
25
25
 
26
26
  export const unitsToAliases: Record<Unit, UnitAlias> = {
27
- days: 'd',
28
- hours: 'h',
29
- minutes: 'm',
30
- seconds: 's',
31
-
32
27
  milliseconds: 'ms',
28
+ seconds: 's',
29
+ minutes: 'm',
30
+ hours: 'h',
31
+ days: 'd',
33
32
  };
34
33
 
35
34
  // Exported pattern should be string to easier serialization
36
- export const TIMESPAN_STRING_PATTERN = /^(-?\d{1,10})(h|H|m|M|s|S|ms|MS|d|D)$/;
35
+ export const TIMESPAN_STRING_PATTERN = /^(-?\d{1,10}(\.\d{1,10})?)(h|H|m|M|s|S|ms|MS|d|D)$/;
37
36
 
38
37
  class InvalidTimespan extends Error {
39
38
  constructor(str: string) {
@@ -41,7 +40,7 @@ class InvalidTimespan extends Error {
41
40
  Invalid timespan string: <${str}>.
42
41
  Timespan string should contain numeric and unit parts.
43
42
  Acceptable units: D, H, M, S, MS (case doesn't matter).
44
- Ex: "30D, 10H, 2M, 100MS"
43
+ Ex: "30D, 10H, 2M, 100MS, 0.1s, -5d"
45
44
  `);
46
45
  }
47
46
  }
@@ -50,12 +49,22 @@ class InvalidTimespan extends Error {
50
49
  * Represents time period (duration)
51
50
  */
52
51
  export class Timespan {
52
+ /**
53
+ * Time in milliseconds
54
+ */
53
55
  private readonly _millis: number;
54
56
 
57
+ /**
58
+ * Original unit that was passed to
59
+ * constructor
60
+ */
61
+ private readonly _unit: Unit;
62
+
55
63
  constructor(value: number, u: Unit | UnitAlias) {
56
64
  const unit = this.isUnit(u) ? u : aliasesToUnits[u];
57
65
 
58
66
  this._millis = value * factors[unit];
67
+ this._unit = unit;
59
68
  }
60
69
 
61
70
  static parse(str: string): Timespan {
@@ -65,9 +74,10 @@ export class Timespan {
65
74
  throw new InvalidTimespan(str);
66
75
  }
67
76
 
68
- const [, rawValue, rawUnit] = match;
77
+ const rawValue = match[1];
78
+ const rawUnit = match[3] || match[2]; // Will be 3 if value has decimal point
69
79
 
70
- const value = Number.parseInt(rawValue, 10);
80
+ const value = Convert.number(rawValue);
71
81
  const unit = aliasesToUnits[rawUnit.toLowerCase() as UnitAlias];
72
82
 
73
83
  return new Timespan(value, unit);
@@ -124,18 +134,16 @@ export class Timespan {
124
134
  * Subtract time from timespan
125
135
  */
126
136
  subtract(value: number, unit: Unit): Timespan;
127
-
128
137
  subtract(value: string): Timespan;
129
-
130
138
  subtract(timespan: Timespan): Timespan;
131
-
132
139
  subtract(value: number | string | Timespan, unit?: Unit): Timespan {
133
140
  const subtraction = this.parseSubstraction(value, unit);
134
141
 
135
142
  return new Timespan(this._millis - subtraction, 'milliseconds');
136
143
  }
137
144
 
138
- toString(u: Unit | UnitAlias = 's'): string {
145
+ toString(useUnit?: Unit | UnitAlias): string {
146
+ const u = useUnit || this._unit;
139
147
  const unit = this.isUnit(u) ? u : aliasesToUnits[u];
140
148
  const value = this._millis / factors[unit];
141
149
 
@@ -1,7 +1,7 @@
1
1
  /* eslint-disable sort-keys */
2
2
  /* eslint-disable prettier/prettier */
3
3
 
4
- import { Timespan } from './timespan.class';
4
+ import { Timespan, Unit, UnitAlias } from './timespan.class';
5
5
 
6
6
  describe('Timespan', () => {
7
7
  describe('Casting', () => {
@@ -63,6 +63,7 @@ describe('Timespan', () => {
63
63
  { str: '1h', correct: true, ms: 3_600_000 },
64
64
  { str: '1m', correct: true, ms: 60_000 },
65
65
  { str: '1s', correct: true, ms: 1_000 },
66
+ { str: '0.1s', correct: true, ms: 100 },
66
67
  { str: '-1h', correct: true, ms: -3_600_000 },
67
68
  { str: '1ms', correct: true, ms: 1 },
68
69
  { str: '1me', correct: false, ms: null },
@@ -79,4 +80,29 @@ describe('Timespan', () => {
79
80
  });
80
81
  }
81
82
  });
83
+
84
+ describe('Serialization', () => {
85
+ interface TestCase {
86
+ timespan: Timespan;
87
+ useUnit: Unit | UnitAlias | undefined;
88
+ expected: string;
89
+ }
90
+
91
+ const tt: TestCase[] = [
92
+ { timespan: new Timespan(1, 'd'), useUnit: undefined, expected: '1d' },
93
+ { timespan: new Timespan(1, 'h'), useUnit: undefined, expected: '1h', },
94
+ { timespan: new Timespan(1, 'm'), useUnit: undefined, expected: '1m', },
95
+ { timespan: new Timespan(1, 's'), useUnit: undefined, expected: '1s', },
96
+ { timespan: new Timespan(0.1, 's'), useUnit: undefined, expected: '0.1s', },
97
+ { timespan: new Timespan(-1, 'h'), useUnit: undefined, expected: '-1h', },
98
+ { timespan: new Timespan(1, 'ms'), useUnit: undefined, expected: '1ms', },
99
+ { timespan: new Timespan(10, 'ms'), useUnit: 's', expected: '0.01s' },
100
+ ];
101
+
102
+ for (const { timespan, useUnit, expected } of tt) {
103
+ it(expected, () => {
104
+ expect(timespan.toString(useUnit)).toBe(expected);
105
+ });
106
+ }
107
+ })
82
108
  });