@tsdotnet/date-time 1.1.0 → 1.1.2
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/dist/cjs/ClockTime.js +13 -18
- package/dist/cjs/ClockTime.js.map +1 -1
- package/dist/cjs/DateTime.js +9 -96
- package/dist/cjs/DateTime.js.map +1 -1
- package/dist/cjs/TimeQuantity.js +10 -43
- package/dist/cjs/TimeQuantity.js.map +1 -1
- package/dist/cjs/TimeSpan.js +5 -30
- package/dist/cjs/TimeSpan.js.map +1 -1
- package/dist/cjs/TimeStamp.js +1 -6
- package/dist/cjs/TimeStamp.js.map +1 -1
- package/dist/cjs/TimeUnit.js +11 -40
- package/dist/cjs/TimeUnit.js.map +1 -1
- package/dist/cjs/TimeUnitValue.js +0 -4
- package/dist/cjs/TimeUnitValue.js.map +1 -1
- package/dist/cjs/howMany.js +0 -46
- package/dist/cjs/howMany.js.map +1 -1
- package/dist/esm/ClockTime.js +19 -22
- package/dist/esm/ClockTime.js.map +1 -1
- package/dist/esm/DateTime.js +18 -102
- package/dist/esm/DateTime.js.map +1 -1
- package/dist/esm/TimeQuantity.js +19 -49
- package/dist/esm/TimeQuantity.js.map +1 -1
- package/dist/esm/TimeSpan.js +15 -56
- package/dist/esm/TimeSpan.js.map +1 -1
- package/dist/esm/TimeStamp.js +7 -10
- package/dist/esm/TimeStamp.js.map +1 -1
- package/dist/esm/TimeUnit.js +16 -43
- package/dist/esm/TimeUnit.js.map +1 -1
- package/dist/esm/TimeUnitValue.js +7 -8
- package/dist/esm/TimeUnitValue.js.map +1 -1
- package/dist/esm/date-time.js +10 -14
- package/dist/esm/date-time.js.map +1 -1
- package/dist/esm/howMany.js +1 -46
- package/dist/esm/howMany.js.map +1 -1
- package/dist/types/Calendars/Gregorian.d.ts +37 -0
- package/dist/types/DateTime.d.ts +60 -0
- package/dist/types/TimeQuantity.d.ts +19 -0
- package/dist/{TimeSpan.d.ts → types/TimeSpan.d.ts} +0 -40
- package/dist/{TimeStamp.d.ts → types/TimeStamp.d.ts} +0 -3
- package/dist/types/TimeUnit.d.ts +21 -0
- package/dist/{TimeUnitValue.d.ts → types/TimeUnitValue.d.ts} +0 -3
- package/dist/{howMany.d.ts → types/howMany.d.ts} +5 -5
- package/package.json +33 -43
- package/rollup.config.js +37 -0
- package/dist/Calendars/Gregorian.d.ts +0 -30
- package/dist/DateTime.d.ts +0 -154
- package/dist/TimeQuantity.d.ts +0 -50
- package/dist/TimeUnit.d.ts +0 -47
- package/dist/cjs/Calendars/Gregorian.js +0 -7
- package/dist/cjs/Calendars/Gregorian.js.map +0 -1
- package/dist/esm/Calendars/Gregorian.js +0 -6
- package/dist/esm/Calendars/Gregorian.js.map +0 -1
- package/dist/esm/DateTimeKind.js +0 -6
- package/dist/esm/DateTimeKind.js.map +0 -1
- package/dist/umd/Calendars/Gregorian.js +0 -17
- package/dist/umd/Calendars/Gregorian.js.map +0 -1
- package/dist/umd/ClockTime.js +0 -86
- package/dist/umd/ClockTime.js.map +0 -1
- package/dist/umd/DateTime.js +0 -320
- package/dist/umd/DateTime.js.map +0 -1
- package/dist/umd/DateTimeKind.js +0 -17
- package/dist/umd/DateTimeKind.js.map +0 -1
- package/dist/umd/TimeQuantity.js +0 -108
- package/dist/umd/TimeQuantity.js.map +0 -1
- package/dist/umd/TimeSpan.js +0 -148
- package/dist/umd/TimeSpan.js.map +0 -1
- package/dist/umd/TimeStamp.js +0 -65
- package/dist/umd/TimeStamp.js.map +0 -1
- package/dist/umd/TimeUnit.js +0 -111
- package/dist/umd/TimeUnit.js.map +0 -1
- package/dist/umd/TimeUnitValue.js +0 -58
- package/dist/umd/TimeUnitValue.js.map +0 -1
- package/dist/umd/date-time.js +0 -35
- package/dist/umd/date-time.js.map +0 -1
- package/dist/umd/howMany.js +0 -63
- package/dist/umd/howMany.js.map +0 -1
- /package/dist/{CalendarDate.d.ts → types/CalendarDate.d.ts} +0 -0
- /package/dist/{ClockTime.d.ts → types/ClockTime.d.ts} +0 -0
- /package/dist/{ClockTimeValue.d.ts → types/ClockTimeValue.d.ts} +0 -0
- /package/dist/{DateTimeKind.d.ts → types/DateTimeKind.d.ts} +0 -0
- /package/dist/{JsDateConvertible.d.ts → types/JsDateConvertible.d.ts} +0 -0
- /package/dist/{TimeMeasurement.d.ts → types/TimeMeasurement.d.ts} +0 -0
- /package/dist/{TimeStampValue.d.ts → types/TimeStampValue.d.ts} +0 -0
- /package/dist/{date-time.d.ts → types/date-time.d.ts} +0 -0
package/dist/cjs/ClockTime.js
CHANGED
|
@@ -6,9 +6,7 @@
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.ClockTime = void 0;
|
|
8
8
|
const tslib_1 = require("tslib");
|
|
9
|
-
const howMany = tslib_1.__importStar(require("./howMany"));
|
|
10
9
|
const TimeQuantity_1 = tslib_1.__importDefault(require("./TimeQuantity"));
|
|
11
|
-
var msPer = howMany.milliseconds.per;
|
|
12
10
|
class ClockTime extends TimeQuantity_1.default {
|
|
13
11
|
constructor(...args) {
|
|
14
12
|
super(args.length > 1
|
|
@@ -16,34 +14,32 @@ class ClockTime extends TimeQuantity_1.default {
|
|
|
16
14
|
: (args.length > 0 && args[0] || 0));
|
|
17
15
|
const ms = Math.abs(this.getTotalMilliseconds());
|
|
18
16
|
let msi = Math.floor(ms);
|
|
19
|
-
this.tick = (ms - msi) *
|
|
20
|
-
this.day = (msi /
|
|
21
|
-
msi -= this.day *
|
|
22
|
-
this.hour = (msi /
|
|
23
|
-
msi -= this.hour *
|
|
24
|
-
this.minute = (msi /
|
|
25
|
-
msi -= this.minute *
|
|
26
|
-
this.second = (msi /
|
|
27
|
-
msi -= this.second *
|
|
17
|
+
this.tick = (ms - msi) * 10000;
|
|
18
|
+
this.day = (msi / 86400000) | 0;
|
|
19
|
+
msi -= this.day * 86400000;
|
|
20
|
+
this.hour = (msi / 3600000) | 0;
|
|
21
|
+
msi -= this.hour * 3600000;
|
|
22
|
+
this.minute = (msi / 60000) | 0;
|
|
23
|
+
msi -= this.minute * 60000;
|
|
24
|
+
this.second = (msi / 1000) | 0;
|
|
25
|
+
msi -= this.second * 1000;
|
|
28
26
|
this.millisecond = msi;
|
|
29
27
|
Object.freeze(this);
|
|
30
28
|
}
|
|
31
|
-
// Static version for relative consistency. Constructor does allow this format.
|
|
32
29
|
static from(hours, minutes, seconds = 0, milliseconds = 0) {
|
|
33
30
|
return new ClockTime(hours, minutes, seconds, milliseconds);
|
|
34
31
|
}
|
|
35
32
|
static millisecondsFromTime(hours, minutes, seconds = 0, milliseconds = 0) {
|
|
36
33
|
let value = hours;
|
|
37
|
-
value *=
|
|
34
|
+
value *= 60;
|
|
38
35
|
value += minutes;
|
|
39
|
-
value *=
|
|
36
|
+
value *= 60;
|
|
40
37
|
value += seconds;
|
|
41
|
-
value *=
|
|
38
|
+
value *= 1000;
|
|
42
39
|
value += milliseconds;
|
|
43
40
|
return value;
|
|
44
41
|
}
|
|
45
|
-
toString(
|
|
46
|
-
/* INSERT CUSTOM FORMATTING CODE HERE */
|
|
42
|
+
toString() {
|
|
47
43
|
const _ = this;
|
|
48
44
|
const a = [];
|
|
49
45
|
if (_.day)
|
|
@@ -60,7 +56,6 @@ class ClockTime extends TimeQuantity_1.default {
|
|
|
60
56
|
}
|
|
61
57
|
}
|
|
62
58
|
exports.ClockTime = ClockTime;
|
|
63
|
-
// Temporary until the full TimeSpanFormat is available.
|
|
64
59
|
function pluralize(value, label) {
|
|
65
60
|
if (Math.abs(value) !== 1)
|
|
66
61
|
label += 's';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClockTime.js","sourceRoot":"","sources":["../../src/ClockTime.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;
|
|
1
|
+
{"version":3,"file":"ClockTime.js","sourceRoot":"","sources":["../../src/ClockTime.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/DateTime.js
CHANGED
|
@@ -8,19 +8,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
8
8
|
const tslib_1 = require("tslib");
|
|
9
9
|
const exceptions_1 = require("@tsdotnet/exceptions");
|
|
10
10
|
const ClockTime_1 = tslib_1.__importDefault(require("./ClockTime"));
|
|
11
|
-
const howMany_1 = require("./howMany");
|
|
12
11
|
const TimeSpan_1 = tslib_1.__importDefault(require("./TimeSpan"));
|
|
13
12
|
const TimeStamp_1 = tslib_1.__importDefault(require("./TimeStamp"));
|
|
14
13
|
const VOID0 = void 0;
|
|
15
14
|
class DateTime {
|
|
16
|
-
constructor(value = new Date(), kind = 1
|
|
15
|
+
constructor(value = new Date(), kind = 1) {
|
|
17
16
|
this._kind = kind;
|
|
18
17
|
if (value instanceof DateTime) {
|
|
19
18
|
this._value = value.toJsDate();
|
|
20
19
|
if (kind === VOID0)
|
|
21
20
|
this._kind = value._kind;
|
|
22
21
|
}
|
|
23
|
-
else {
|
|
22
|
+
else {
|
|
24
23
|
if (value instanceof Date)
|
|
25
24
|
this._value = new Date(value.getTime());
|
|
26
25
|
else
|
|
@@ -29,24 +28,12 @@ class DateTime {
|
|
|
29
28
|
: new Date(value);
|
|
30
29
|
}
|
|
31
30
|
}
|
|
32
|
-
/**
|
|
33
|
-
* Returns the now local time.
|
|
34
|
-
* @returns {DateTime}
|
|
35
|
-
*/
|
|
36
31
|
static get now() {
|
|
37
32
|
return new DateTime();
|
|
38
33
|
}
|
|
39
|
-
/**
|
|
40
|
-
* The date component for now.
|
|
41
|
-
* @returns {DateTime}
|
|
42
|
-
*/
|
|
43
34
|
static get today() {
|
|
44
35
|
return DateTime.now.date;
|
|
45
36
|
}
|
|
46
|
-
/**
|
|
47
|
-
* Midnight tomorrow.
|
|
48
|
-
* @returns {DateTime}
|
|
49
|
-
*/
|
|
50
37
|
static get tomorrow() {
|
|
51
38
|
const today = DateTime.today;
|
|
52
39
|
return today.addDays(1);
|
|
@@ -57,17 +44,9 @@ class DateTime {
|
|
|
57
44
|
get year() {
|
|
58
45
|
return this._value.getFullYear();
|
|
59
46
|
}
|
|
60
|
-
/**
|
|
61
|
-
* Returns the Gregorian Month (zero indexed).
|
|
62
|
-
* @returns {number}
|
|
63
|
-
*/
|
|
64
47
|
get month() {
|
|
65
48
|
return this._value.getMonth();
|
|
66
49
|
}
|
|
67
|
-
/**
|
|
68
|
-
* Returns the month number (1-12).
|
|
69
|
-
* @returns {number}
|
|
70
|
-
*/
|
|
71
50
|
get calendarMonth() {
|
|
72
51
|
return this._value.getMonth() + 1;
|
|
73
52
|
}
|
|
@@ -78,38 +57,19 @@ class DateTime {
|
|
|
78
57
|
day: this.day
|
|
79
58
|
};
|
|
80
59
|
}
|
|
81
|
-
/**
|
|
82
|
-
* Returns the day of the month. An integer between 1 and 31.
|
|
83
|
-
* @returns {number}
|
|
84
|
-
*/
|
|
85
60
|
get day() {
|
|
86
61
|
return this._value.getDate();
|
|
87
62
|
}
|
|
88
|
-
/**
|
|
89
|
-
* Returns the day of the month indexed starting at zero.
|
|
90
|
-
* @returns {number}
|
|
91
|
-
*/
|
|
92
63
|
get dayIndex() {
|
|
93
64
|
return this._value.getDate() - 1;
|
|
94
65
|
}
|
|
95
|
-
/**
|
|
96
|
-
* Returns the zero indexed day of the week. (Sunday == 0)
|
|
97
|
-
* @returns {number}
|
|
98
|
-
*/
|
|
99
66
|
get dayOfWeek() {
|
|
100
67
|
return this._value.getDay();
|
|
101
68
|
}
|
|
102
|
-
/**
|
|
103
|
-
* Returns a DateTime object for 00:00 of this date.
|
|
104
|
-
*/
|
|
105
69
|
get date() {
|
|
106
70
|
const _ = this;
|
|
107
71
|
return new DateTime(new Date(_.year, _.month, _.day), _._kind);
|
|
108
72
|
}
|
|
109
|
-
/**
|
|
110
|
-
* Returns the time of day represented by a ClockTime object.
|
|
111
|
-
* @returns {ClockTime}
|
|
112
|
-
*/
|
|
113
73
|
get timeOfDay() {
|
|
114
74
|
const _ = this;
|
|
115
75
|
let t = _._time;
|
|
@@ -119,32 +79,14 @@ class DateTime {
|
|
|
119
79
|
}
|
|
120
80
|
return t;
|
|
121
81
|
}
|
|
122
|
-
/**
|
|
123
|
-
* Measures the difference between two dates as a TimeSpan.
|
|
124
|
-
* @param first
|
|
125
|
-
* @param last
|
|
126
|
-
*/
|
|
127
82
|
static between(first, last) {
|
|
128
83
|
const f = first instanceof DateTime ? first._value : first, l = last instanceof DateTime ? last._value : last;
|
|
129
84
|
return TimeSpan_1.default.fromMilliseconds(l.getTime() - f.getTime());
|
|
130
85
|
}
|
|
131
|
-
/**
|
|
132
|
-
* Calculates if the given year is a leap year using the formula:
|
|
133
|
-
* ((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0)
|
|
134
|
-
* @param year
|
|
135
|
-
* @returns {boolean}
|
|
136
|
-
*/
|
|
137
86
|
static isLeapYear(year) {
|
|
138
87
|
return ((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0);
|
|
139
88
|
}
|
|
140
|
-
/**
|
|
141
|
-
* Returns the number of days for the specific year and month.
|
|
142
|
-
* @param year
|
|
143
|
-
* @param month
|
|
144
|
-
* @returns {any}
|
|
145
|
-
*/
|
|
146
89
|
static daysInMonth(year, month) {
|
|
147
|
-
// Basically, add 1 month, subtract a day... What's the date?
|
|
148
90
|
return (new Date(year, month + 1, 0)).getDate();
|
|
149
91
|
}
|
|
150
92
|
static from(yearOrDate, month = 0, day = 1) {
|
|
@@ -172,7 +114,7 @@ class DateTime {
|
|
|
172
114
|
return new DateTime(new Date(year, month - 1, day));
|
|
173
115
|
}
|
|
174
116
|
toJsDate() {
|
|
175
|
-
return new Date(this._value.getTime());
|
|
117
|
+
return new Date(this._value.getTime());
|
|
176
118
|
}
|
|
177
119
|
addMilliseconds(ms) {
|
|
178
120
|
ms = ms || 0;
|
|
@@ -180,19 +122,19 @@ class DateTime {
|
|
|
180
122
|
}
|
|
181
123
|
addSeconds(seconds) {
|
|
182
124
|
seconds = seconds || 0;
|
|
183
|
-
return this.addMilliseconds(seconds *
|
|
125
|
+
return this.addMilliseconds(seconds * 1000);
|
|
184
126
|
}
|
|
185
127
|
addMinutes(minutes) {
|
|
186
128
|
minutes = minutes || 0;
|
|
187
|
-
return this.addMilliseconds(minutes *
|
|
129
|
+
return this.addMilliseconds(minutes * 60000);
|
|
188
130
|
}
|
|
189
131
|
addHours(hours) {
|
|
190
132
|
hours = hours || 0;
|
|
191
|
-
return this.addMilliseconds(hours *
|
|
133
|
+
return this.addMilliseconds(hours * 3600000);
|
|
192
134
|
}
|
|
193
135
|
addDays(days) {
|
|
194
136
|
days = days || 0;
|
|
195
|
-
return this.addMilliseconds(days *
|
|
137
|
+
return this.addMilliseconds(days * 86400000);
|
|
196
138
|
}
|
|
197
139
|
addMonths(months) {
|
|
198
140
|
months = months || 0;
|
|
@@ -206,46 +148,24 @@ class DateTime {
|
|
|
206
148
|
d.setFullYear(d.getFullYear() + years);
|
|
207
149
|
return new DateTime(d, this._kind);
|
|
208
150
|
}
|
|
209
|
-
/**
|
|
210
|
-
* Receives an TimeQuantity value and adds based on the total milliseconds.
|
|
211
|
-
* @param {TimeQuantity} time
|
|
212
|
-
* @returns {DateTime}
|
|
213
|
-
*/
|
|
214
151
|
add(time) {
|
|
215
152
|
return this.addMilliseconds(time.getTotalMilliseconds());
|
|
216
153
|
}
|
|
217
|
-
/**
|
|
218
|
-
* Receives an TimeQuantity value and subtracts based on the total milliseconds.
|
|
219
|
-
* @param {TimeQuantity} time
|
|
220
|
-
* @returns {DateTime}
|
|
221
|
-
*/
|
|
222
154
|
subtract(time) {
|
|
223
155
|
return this.addMilliseconds(-time.getTotalMilliseconds());
|
|
224
156
|
}
|
|
225
|
-
/**
|
|
226
|
-
* Returns a TimeSpan representing the amount of time between two dates.
|
|
227
|
-
* @param previous
|
|
228
|
-
* @returns {TimeSpan}
|
|
229
|
-
*/
|
|
230
157
|
timePassedSince(previous) {
|
|
231
158
|
return DateTime.between(previous, this);
|
|
232
159
|
}
|
|
233
|
-
/**
|
|
234
|
-
* Returns a readonly object which contains all the date and time components.
|
|
235
|
-
*/
|
|
236
160
|
toTimeStamp() {
|
|
237
161
|
return TimeStamp_1.default.from(this);
|
|
238
162
|
}
|
|
239
|
-
/**
|
|
240
|
-
* Returns a UTC version of this date if its kind is local.
|
|
241
|
-
* @returns {DateTime}
|
|
242
|
-
*/
|
|
243
163
|
toUniversalTime() {
|
|
244
164
|
const _ = this;
|
|
245
|
-
if (_._kind != 1
|
|
165
|
+
if (_._kind != 1)
|
|
246
166
|
return new DateTime(_, _._kind);
|
|
247
167
|
const d = _._value;
|
|
248
|
-
return new DateTime(new Date(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate(), d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds(), d.getUTCMilliseconds()), 2
|
|
168
|
+
return new DateTime(new Date(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate(), d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds(), d.getUTCMilliseconds()), 2);
|
|
249
169
|
}
|
|
250
170
|
equals(other, strict = false) {
|
|
251
171
|
if (!other)
|
|
@@ -268,7 +188,6 @@ class DateTime {
|
|
|
268
188
|
return false;
|
|
269
189
|
return this.equals(other.toJsDate());
|
|
270
190
|
}
|
|
271
|
-
// https://msdn.microsoft.com/en-us/library/System.IComparable.CompareTo(v=vs.110).aspx
|
|
272
191
|
compareTo(other) {
|
|
273
192
|
if (!other)
|
|
274
193
|
throw new exceptions_1.ArgumentNullException('other');
|
|
@@ -283,11 +202,6 @@ class DateTime {
|
|
|
283
202
|
}
|
|
284
203
|
return ms - other.toJsDate().getTime();
|
|
285
204
|
}
|
|
286
|
-
/**
|
|
287
|
-
* Returns true if the value is the same UTC time.
|
|
288
|
-
* @param {Date | JsDateConvertible} other
|
|
289
|
-
* @return {boolean}
|
|
290
|
-
*/
|
|
291
205
|
equivalent(other) {
|
|
292
206
|
if (!other)
|
|
293
207
|
return false;
|
|
@@ -295,7 +209,6 @@ class DateTime {
|
|
|
295
209
|
return true;
|
|
296
210
|
if (other instanceof Date) {
|
|
297
211
|
const v = this._value;
|
|
298
|
-
// TODO: What is the best way to handle this when kinds match or don't?
|
|
299
212
|
return v.toUTCString() == other.toUTCString();
|
|
300
213
|
}
|
|
301
214
|
if (this.equals(other, true))
|
package/dist/cjs/DateTime.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateTime.js","sourceRoot":"","sources":["../../src/DateTime.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,qDAA2D;AAG3D,oEAAoC;
|
|
1
|
+
{"version":3,"file":"DateTime.js","sourceRoot":"","sources":["../../src/DateTime.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,qDAA2D;AAG3D,oEAAoC;AAKpC,kEAAkC;AAClC,oEAAoC;AAEpC,MAAM,KAAK,GAAc,KAAK,CAAC,CAAC;AAEhC,MAAqB,QAAQ;IAiB5B,YAAa,QAAa,IAAI,IAAI,EAAE,EAAE,QAAuC;QAE5E,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAG,KAAK,YAAY,QAAQ,EAC5B,CAAC;YACA,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC/B,IAAG,IAAI,KAAG,KAAK;gBAAE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QAC3C,CAAC;aAED,CAAC;YACA,IAAG,KAAK,YAAY,IAAI;gBACvB,IAAI,CAAC,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;;gBAExC,IAAI,CAAC,MAAM,GAAG,KAAK,KAAG,KAAK;oBAC1B,CAAC,CAAC,IAAI,IAAI,EAAE;oBACZ,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;IACF,CAAC;IAMD,MAAM,KAAK,GAAG;QAEb,OAAO,IAAI,QAAQ,EAAE,CAAC;IACvB,CAAC;IAMD,MAAM,KAAK,KAAK;QAEf,OAAO,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC;IAC1B,CAAC;IAMD,MAAM,KAAK,QAAQ;QAElB,MAAM,KAAK,GAAa,QAAQ,CAAC,KAAK,CAAC;QACvC,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,IAAI;QAEP,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;IAED,IAAI,IAAI;QAEP,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC;IAMD,IAAI,KAAK;QAER,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;IAC/B,CAAC;IAMD,IAAI,aAAa;QAEhB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,QAAQ;QAEX,OAAO;YACN,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,KAAK,EAAE,IAAI,CAAC,aAAa;YACzB,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CAAC;IACH,CAAC;IAMD,IAAI,GAAG;QAEN,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;IAMD,IAAI,QAAQ;QAEX,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;IAMD,IAAI,SAAS;QAEZ,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAC7B,CAAC;IAKD,IAAI,IAAI;QAEP,MAAM,CAAC,GAAG,IAAI,CAAC;QACf,OAAO,IAAI,QAAQ,CAClB,IAAI,IAAI,CACP,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,KAAK,EACP,CAAC,CAAC,GAAG,CACL,EACC,CAAC,CAAC,KAAK,CACT,CAAC;IACH,CAAC;IAMD,IAAI,SAAS;QAEZ,MAAM,CAAC,GAAG,IAAI,CAAC;QACf,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;QAChB,IAAG,CAAC,CAAC,EACL,CAAC;YACA,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;YACtB,CAAC,CAAC,KAAK,GAAG,CAAC,GAAG,IAAI,mBAAS,CAC1B,CAAC,CAAC,QAAQ,EAAE,EACZ,CAAC,CAAC,UAAU,EAAE,EACd,CAAC,CAAC,UAAU,EAAE,EACd,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,CAAC,CAAC;IACV,CAAC;IAOD,MAAM,CAAC,OAAO,CAAE,KAAsB,EAAE,IAAqB;QAE5D,MACC,CAAC,GAAS,KAAK,YAAY,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAC1D,CAAC,GAAS,IAAI,YAAY,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;QAEzD,OAAO,kBAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7D,CAAC;IAQD,MAAM,CAAC,UAAU,CAAE,IAAY;QAE9B,OAAO,CAAC,CAAC,IAAI,GAAC,CAAC,IAAE,CAAC,CAAC,IAAI,CAAC,IAAI,GAAC,GAAG,IAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAC,GAAG,IAAE,CAAC,CAAC,CAAC;IACxD,CAAC;IAQD,MAAM,CAAC,WAAW,CAAE,IAAY,EAAE,KAAsB;QAGvD,OAAO,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IACjD,CAAC;IAMD,MAAM,CAAC,IAAI,CACV,UAAiC,EACjC,QAAgB,CAAC,EACjB,MAAgB,CAAC;QAEjB,IAAI,IAAY,CAAC;QACjB,IAAG,OAAO,UAAU,IAAE,QAAQ,EAC9B,CAAC;YACA,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC;YACrB,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;YACzB,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QACxB,CAAC;aAED,CAAC;YACA,IAAI,GAAG,UAAU,CAAC;QACnB,CAAC;QAED,OAAO,IAAI,QAAQ,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAEjD,CAAC;IAMD,MAAM,CAAC,gBAAgB,CACtB,UAAiC,EACjC,QAAgB,CAAC,EACjB,MAAgB,CAAC;QAEjB,IAAI,IAAY,CAAC;QACjB,IAAG,OAAO,UAAU,IAAE,QAAQ,EAC9B,CAAC;YACA,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC;YACrB,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;YACzB,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QACxB,CAAC;aAED,CAAC;YACA,IAAI,GAAG,UAAU,CAAC;QACnB,CAAC;QAED,OAAO,IAAI,QAAQ,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAErD,CAAC;IAED,QAAQ;QAEP,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,eAAe,CAAE,EAAU;QAE1B,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QACb,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7D,CAAC;IAED,UAAU,CAAE,OAAe;QAE1B,OAAO,GAAG,OAAO,IAAI,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,OAAwB,CAAC,CAAC;IAC9D,CAAC;IAED,UAAU,CAAE,OAAe;QAE1B,OAAO,GAAG,OAAO,IAAI,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,QAAwB,CAAC,CAAC;IAC9D,CAAC;IAED,QAAQ,CAAE,KAAa;QAEtB,KAAK,GAAG,KAAK,IAAI,CAAC,CAAC;QACnB,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,UAAsB,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,CAAE,IAAY;QAEpB,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC;QACjB,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,WAAqB,CAAC,CAAC;IACxD,CAAC;IAED,SAAS,CAAE,MAAc;QAExB,MAAM,GAAG,MAAM,IAAI,CAAC,CAAC;QACrB,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC1B,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,CAAC;QAClC,OAAO,IAAI,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,QAAQ,CAAE,KAAa;QAEtB,KAAK,GAAG,KAAK,IAAI,CAAC,CAAC;QACnB,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC1B,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,CAAC;QACvC,OAAO,IAAI,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAOD,GAAG,CAAE,IAAkB;QAEtB,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAC1D,CAAC;IAOD,QAAQ,CAAE,IAAkB;QAE3B,OAAO,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAC3D,CAAC;IAOD,eAAe,CAAE,QAAyB;QAEzC,OAAO,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;IAKD,WAAW;QAEV,OAAO,mBAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAMD,eAAe;QAEd,MAAM,CAAC,GAAG,IAAI,CAAC;QACf,IAAG,CAAC,CAAC,KAAK,KAAoB;YAC7B,OAAO,IAAI,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;QAEjC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;QACnB,OAAO,IAAI,QAAQ,CAClB,IAAI,IAAI,CACP,CAAC,CAAC,cAAc,EAAE,EAClB,CAAC,CAAC,WAAW,EAAE,EACf,CAAC,CAAC,UAAU,EAAE,EACd,CAAC,CAAC,WAAW,EAAE,EACf,CAAC,CAAC,aAAa,EAAE,EACjB,CAAC,CAAC,aAAa,EAAE,EACjB,CAAC,CAAC,kBAAkB,EAAE,CACtB,IAED,CAAC;IACH,CAAC;IAiBD,MAAM,CAAE,KAA+B,EAAE,SAAkB,KAAK;QAE/D,IAAG,CAAC,KAAK;YAAE,OAAO,KAAK,CAAC;QACxB,IAAG,KAAK,IAAE,IAAI;YAAE,OAAO,IAAI,CAAC;QAE5B,IAAG,KAAK,YAAY,IAAI,EACxB,CAAC;YACA,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;YACtB,OAAO,KAAK,IAAE,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,IAAE,CAAC,CAAC,OAAO,EAAE,CAAC;QACjD,CAAC;QAED,IAAG,KAAK,YAAY,QAAQ,EAC5B,CAAC;YACA,IAAG,MAAM,EACT,CAAC;gBACA,MAAM,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC;gBACvB,IAAG,CAAC,EAAE,IAAI,IAAI,CAAC,KAAK,IAAI,EAAE,IAAE,IAAI,CAAC,KAAK;oBAAE,OAAO,KAAK,CAAC;YACtD,CAAC;YAED,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC;aACI,IAAG,MAAM;YACb,OAAO,KAAK,CAAC;QAEd,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEtC,CAAC;IAGD,SAAS,CAAE,KAA+B;QAEzC,IAAG,CAAC,KAAK;YAAE,MAAM,IAAI,kCAAqB,CAAC,OAAO,CAAC,CAAC;QACpD,IAAG,KAAK,IAAE,IAAI;YAAE,OAAO,CAAC,CAAC;QAEzB,IAAG,KAAK,YAAY,QAAQ,EAC5B,CAAC;YACA,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;QACtB,CAAC;QAED,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAEjC,IAAG,KAAK,YAAY,IAAI,EACxB,CAAC;YACA,OAAO,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;QAED,OAAO,EAAE,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC;IACxC,CAAC;IAOD,UAAU,CAAE,KAA+B;QAE1C,IAAG,CAAC,KAAK;YAAE,OAAO,KAAK,CAAC;QACxB,IAAG,KAAK,IAAE,IAAI;YAAE,OAAO,IAAI,CAAC;QAE5B,IAAG,KAAK,YAAY,IAAI,EACxB,CAAC;YACA,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;YAEtB,OAAO,CAAC,CAAC,WAAW,EAAE,IAAE,KAAK,CAAC,WAAW,EAAE,CAAC;QAC7C,CAAC;QAED,IAAG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAEzC,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1C,CAAC;CAED;AAncD,2BAmcC"}
|
package/dist/cjs/TimeQuantity.js
CHANGED
|
@@ -8,74 +8,46 @@ const tslib_1 = require("tslib");
|
|
|
8
8
|
const compare_1 = require("@tsdotnet/compare");
|
|
9
9
|
const exceptions_1 = require("@tsdotnet/exceptions");
|
|
10
10
|
const lazy_1 = require("@tsdotnet/lazy");
|
|
11
|
-
const howMany_1 = require("./howMany");
|
|
12
11
|
const TimeUnit_1 = tslib_1.__importDefault(require("./TimeUnit"));
|
|
13
|
-
/**
|
|
14
|
-
* This class provides a simple means for storing and calculating time quantities.
|
|
15
|
-
*/
|
|
16
12
|
class TimeQuantity {
|
|
17
13
|
constructor(_quantity = 0) {
|
|
18
14
|
this._quantity = _quantity;
|
|
19
15
|
this._total = lazy_1.ResettableLazy.create(() => {
|
|
20
16
|
const ms = this.getTotalMilliseconds();
|
|
21
17
|
return Object.freeze({
|
|
22
|
-
ticks: ms *
|
|
18
|
+
ticks: ms * 10000,
|
|
23
19
|
milliseconds: ms,
|
|
24
|
-
seconds: ms /
|
|
25
|
-
minutes: ms /
|
|
26
|
-
hours: ms /
|
|
27
|
-
days: ms /
|
|
20
|
+
seconds: ms / 1000,
|
|
21
|
+
minutes: ms / 60000,
|
|
22
|
+
hours: ms / 3600000,
|
|
23
|
+
days: ms / 86400000
|
|
28
24
|
});
|
|
29
25
|
});
|
|
30
26
|
}
|
|
31
|
-
/**
|
|
32
|
-
* Combine total values by time unit.
|
|
33
|
-
* @param {Partial<TimeMeasurement>} values
|
|
34
|
-
* @return {number}
|
|
35
|
-
*/
|
|
36
27
|
static getTotalMillisecondsFrom(values) {
|
|
37
28
|
if (!values)
|
|
38
29
|
return 0;
|
|
39
|
-
return (values.days || 0) *
|
|
40
|
-
(values.hours || 0) *
|
|
41
|
-
(values.minutes || 0) *
|
|
42
|
-
(values.seconds || 0) *
|
|
30
|
+
return (values.days || 0) * 86400000 +
|
|
31
|
+
(values.hours || 0) * 3600000 +
|
|
32
|
+
(values.minutes || 0) * 60000 +
|
|
33
|
+
(values.seconds || 0) * 1000 +
|
|
43
34
|
(values.milliseconds || 0) +
|
|
44
|
-
(values.ticks || 0) /
|
|
35
|
+
(values.ticks || 0) / 10000;
|
|
45
36
|
}
|
|
46
|
-
/**
|
|
47
|
-
* +1, 0, or -1 depending on the time direction.
|
|
48
|
-
* @returns {number}
|
|
49
|
-
*/
|
|
50
37
|
get direction() {
|
|
51
38
|
return (0, compare_1.compare)(this.getTotalMilliseconds(), 0);
|
|
52
39
|
}
|
|
53
|
-
/**
|
|
54
|
-
* Returns an object with all units exposed as totals.
|
|
55
|
-
* @returns {TimeMeasurement}
|
|
56
|
-
*/
|
|
57
40
|
get total() {
|
|
58
41
|
return this._total.value;
|
|
59
42
|
}
|
|
60
|
-
// Provides an overridable mechanism for extending this class.
|
|
61
43
|
getTotalMilliseconds() {
|
|
62
44
|
return this._quantity;
|
|
63
45
|
}
|
|
64
|
-
/**
|
|
65
|
-
* Compares this instance against any other time quantity instance and return true if the amount of time is the same.
|
|
66
|
-
* @param other
|
|
67
|
-
* @returns {boolean}
|
|
68
|
-
*/
|
|
69
46
|
equals(other) {
|
|
70
47
|
if (!other || !other.total)
|
|
71
48
|
return false;
|
|
72
49
|
return (0, compare_1.areEqual)(this.getTotalMilliseconds(), other.total.milliseconds);
|
|
73
50
|
}
|
|
74
|
-
/**
|
|
75
|
-
* Compares this instance against any other time quantity instance.
|
|
76
|
-
* @param other
|
|
77
|
-
* @returns {number}
|
|
78
|
-
*/
|
|
79
51
|
compareTo(other) {
|
|
80
52
|
if (!other)
|
|
81
53
|
throw new exceptions_1.ArgumentNullException('other');
|
|
@@ -83,11 +55,6 @@ class TimeQuantity {
|
|
|
83
55
|
throw new exceptions_1.ArgumentNullException('other.total');
|
|
84
56
|
return (0, compare_1.compare)(this.getTotalMilliseconds(), other && other.total && other.total.milliseconds);
|
|
85
57
|
}
|
|
86
|
-
/**
|
|
87
|
-
* Returns the total amount of time measured in the requested TimeUnit.
|
|
88
|
-
* @param units
|
|
89
|
-
* @returns {number}
|
|
90
|
-
*/
|
|
91
58
|
getTotal(units) {
|
|
92
59
|
return TimeUnit_1.default.fromMilliseconds(this.getTotalMilliseconds(), units);
|
|
93
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TimeQuantity.js","sourceRoot":"","sources":["../../src/TimeQuantity.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,+CAAoD;AACpD,qDAA2D;AAC3D,yCAA8C;
|
|
1
|
+
{"version":3,"file":"TimeQuantity.js","sourceRoot":"","sources":["../../src/TimeQuantity.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,+CAAoD;AACpD,qDAA2D;AAC3D,yCAA8C;AAG9C,kEAAkC;AAKlC,MAAqB,YAAY;IAEhC,YAAuB,YAAoB,CAAC;QAArB,cAAS,GAAT,SAAS,CAAY;QAE3C,IAAI,CAAC,MAAM,GAAG,qBAAc,CAAC,MAAM,CAAC,GAAG,EAAE;YACxC,MAAM,EAAE,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAEvC,OAAO,MAAM,CAAC,MAAM,CAAC;gBACpB,KAAK,EAAE,EAAE,QAAsB;gBAC/B,YAAY,EAAE,EAAE;gBAChB,OAAO,EAAE,EAAE,OAAwB;gBACnC,OAAO,EAAE,EAAE,QAAwB;gBACnC,KAAK,EAAE,EAAE,UAAsB;gBAC/B,IAAI,EAAE,EAAE,WAAqB;aAC7B,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;IAOD,MAAM,CAAC,wBAAwB,CAAE,MAAgC;QAEhE,IAAG,CAAC,MAAM;YAAE,OAAO,CAAC,CAAC;QACrB,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,WAAqB;YAC7C,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,UAAsB;YACzC,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC,QAAwB;YAC7C,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC,OAAwB;YAC7C,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,CAAC;YAC1B,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,QAAsB,CAAC;IAC5C,CAAC;IAMD,IAAI,SAAS;QAEZ,OAAO,IAAA,iBAAO,EAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC,CAAC;IAChD,CAAC;IAQD,IAAI,KAAK;QAER,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;IAC1B,CAAC;IAGD,oBAAoB;QAEnB,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAOD,MAAM,CAAE,KAAmB;QAE1B,IAAG,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK;YAAE,OAAO,KAAK,CAAC;QACxC,OAAO,IAAA,kBAAQ,EAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACxE,CAAC;IAOD,SAAS,CAAE,KAAmB;QAE7B,IAAG,CAAC,KAAK;YAAE,MAAM,IAAI,kCAAqB,CAAC,OAAO,CAAC,CAAC;QACpD,IAAG,CAAC,KAAK,CAAC,KAAK;YAAE,MAAM,IAAI,kCAAqB,CAAC,aAAa,CAAC,CAAC;QAChE,OAAO,IAAA,iBAAO,EAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,KAAK,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC/F,CAAC;IAOD,QAAQ,CAAE,KAAwB;QAEjC,OAAO,kBAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,KAAK,CAAC,CAAC;IACtE,CAAC;CACD;AA5FD,+BA4FC"}
|
package/dist/cjs/TimeSpan.js
CHANGED
|
@@ -10,43 +10,29 @@ const tslib_1 = require("tslib");
|
|
|
10
10
|
const lazy_1 = tslib_1.__importDefault(require("@tsdotnet/lazy"));
|
|
11
11
|
const type_1 = tslib_1.__importDefault(require("@tsdotnet/type"));
|
|
12
12
|
const ClockTime_1 = tslib_1.__importDefault(require("./ClockTime"));
|
|
13
|
-
const howMany_1 = require("./howMany");
|
|
14
13
|
const TimeQuantity_1 = tslib_1.__importDefault(require("./TimeQuantity"));
|
|
15
14
|
const TimeUnit_1 = tslib_1.__importDefault(require("./TimeUnit"));
|
|
16
|
-
/**
|
|
17
|
-
* TimeSpan expands on TimeQuantity to provide an class that is similar to .NET's TimeSpan including many useful static methods.
|
|
18
|
-
*/
|
|
19
15
|
class TimeSpan extends TimeQuantity_1.default {
|
|
20
|
-
// In .NET the default type is Ticks, but for JavaScript, we will use Milliseconds.
|
|
21
16
|
constructor(value, units = TimeUnit_1.default.UnitType.Milliseconds) {
|
|
22
17
|
if (isNaN(value))
|
|
23
18
|
throw Error('Cannot construct a TimeSpan from NaN value.');
|
|
24
19
|
const ms = TimeUnit_1.default.toMilliseconds(value, units);
|
|
25
20
|
super(ms);
|
|
26
|
-
this.ticks = ms *
|
|
21
|
+
this.ticks = ms * 10000;
|
|
27
22
|
this.milliseconds = ms;
|
|
28
|
-
this.seconds = ms /
|
|
29
|
-
this.minutes = ms /
|
|
30
|
-
this.hours = ms /
|
|
31
|
-
this.days = ms /
|
|
23
|
+
this.seconds = ms / 1000;
|
|
24
|
+
this.minutes = ms / 60000;
|
|
25
|
+
this.hours = ms / 3600000;
|
|
26
|
+
this.days = ms / 86400000;
|
|
32
27
|
this._time = lazy_1.default.create(() => new ClockTime_1.default(this.getTotalMilliseconds()));
|
|
33
28
|
Object.freeze(this);
|
|
34
29
|
}
|
|
35
30
|
static get zero() {
|
|
36
31
|
return timeSpanZero || (timeSpanZero = new TimeSpan(0));
|
|
37
32
|
}
|
|
38
|
-
/**
|
|
39
|
-
* Provides an standard interface for acquiring the total time.
|
|
40
|
-
* @returns {TimeSpan}
|
|
41
|
-
*/
|
|
42
33
|
get total() {
|
|
43
34
|
return this;
|
|
44
35
|
}
|
|
45
|
-
// Instead of the confusing getTotal versus unit name, expose a 'ClockTime' value which reports the individual components.
|
|
46
|
-
/**
|
|
47
|
-
* The value of this TimeSpan reduced to the clock and calendar.
|
|
48
|
-
* @return {ClockTime}
|
|
49
|
-
*/
|
|
50
36
|
get time() {
|
|
51
37
|
return this._time.value;
|
|
52
38
|
}
|
|
@@ -79,11 +65,6 @@ class TimeSpan extends TimeQuantity_1.default {
|
|
|
79
65
|
static fromTicks(value) {
|
|
80
66
|
return value ? new TimeSpan(value, TimeUnit_1.default.UnitType.Ticks) : TimeSpan.zero;
|
|
81
67
|
}
|
|
82
|
-
/**
|
|
83
|
-
* Sum the value of this TimeSpan with another time quantity.
|
|
84
|
-
* @param {TimeQuantity | Partial<TimeMeasurement>} other
|
|
85
|
-
* @return {TimeSpan}
|
|
86
|
-
*/
|
|
87
68
|
add(other) {
|
|
88
69
|
if (!other)
|
|
89
70
|
return this;
|
|
@@ -95,12 +76,6 @@ class TimeSpan extends TimeQuantity_1.default {
|
|
|
95
76
|
: TimeQuantity_1.default.getTotalMillisecondsFrom(other);
|
|
96
77
|
return new TimeSpan(this.getTotalMilliseconds() + otherMs);
|
|
97
78
|
}
|
|
98
|
-
/**
|
|
99
|
-
* Sum the value of this TimeSpan with another unit value.
|
|
100
|
-
* @param {number} value
|
|
101
|
-
* @param {TimeUnit.UnitType} units
|
|
102
|
-
* @return {TimeSpan}
|
|
103
|
-
*/
|
|
104
79
|
addUnit(value, units = TimeUnit_1.default.UnitType.Milliseconds) {
|
|
105
80
|
return value
|
|
106
81
|
? new TimeSpan(this.getTotalMilliseconds() + TimeUnit_1.default.toMilliseconds(value, units))
|
package/dist/cjs/TimeSpan.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TimeSpan.js","sourceRoot":"","sources":["../../src/TimeSpan.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;AAEH,kEAAkC;AAClC,kEAAkC;AAClC,oEAAoC;
|
|
1
|
+
{"version":3,"file":"TimeSpan.js","sourceRoot":"","sources":["../../src/TimeSpan.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/TimeStamp.js
CHANGED
|
@@ -7,13 +7,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
exports.TimeStamp = void 0;
|
|
8
8
|
const tslib_1 = require("tslib");
|
|
9
9
|
const type_1 = tslib_1.__importDefault(require("@tsdotnet/type"));
|
|
10
|
-
const howMany_1 = require("./howMany");
|
|
11
|
-
/**
|
|
12
|
-
* An alternative to Date or DateTime. Is a model representing the exact date and time.
|
|
13
|
-
*/
|
|
14
10
|
class TimeStamp {
|
|
15
11
|
constructor(year, month, day = 1, hour = 0, minute = 0, second = 0, millisecond = 0, tick = 0) {
|
|
16
|
-
// Add validation or properly carry out of range values?
|
|
17
12
|
this.year = year;
|
|
18
13
|
this.month = month;
|
|
19
14
|
this.day = day;
|
|
@@ -39,7 +34,7 @@ class TimeStamp {
|
|
|
39
34
|
}
|
|
40
35
|
toJsDate() {
|
|
41
36
|
const _ = this;
|
|
42
|
-
return new Date(_.year, _.month, _.day, _.hour, _.minute, _.second, _.millisecond + _.tick /
|
|
37
|
+
return new Date(_.year, _.month, _.day, _.hour, _.minute, _.second, _.millisecond + _.tick / 10000);
|
|
43
38
|
}
|
|
44
39
|
}
|
|
45
40
|
exports.TimeStamp = TimeStamp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TimeStamp.js","sourceRoot":"","sources":["../../src/TimeStamp.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;AAEH,kEAAkC;
|
|
1
|
+
{"version":3,"file":"TimeStamp.js","sourceRoot":"","sources":["../../src/TimeStamp.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;AAEH,kEAAkC;AASlC,MAAa,SAAS;IAIrB,YACiB,IAAY,EACZ,KAAsB,EACtB,MAAsB,CAAC,EACvB,OAAsB,CAAC,EACvB,SAAsB,CAAC,EACvB,SAAsB,CAAC,EACvB,cAAsB,CAAC,EACvB,OAAsB,CAAC;QAPvB,SAAI,GAAJ,IAAI,CAAQ;QACZ,UAAK,GAAL,KAAK,CAAiB;QACtB,QAAG,GAAH,GAAG,CAAoB;QACvB,SAAI,GAAJ,IAAI,CAAmB;QACvB,WAAM,GAAN,MAAM,CAAiB;QACvB,WAAM,GAAN,MAAM,CAAiB;QACvB,gBAAW,GAAX,WAAW,CAAY;QACvB,SAAI,GAAJ,IAAI,CAAmB;QAKvC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,IAAI,CAAE,CAA2B;QAEvC,IAAG,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,IAAI,cAAI,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC;YACvD,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;QAClB,IAAG,CAAC,YAAY,IAAI,EACpB,CAAC;YACA,OAAO,IAAI,SAAS,CACnB,CAAC,CAAC,WAAW,EAAE,EACf,CAAC,CAAC,QAAQ,EAAE,EACZ,CAAC,CAAC,OAAO,EAAE,EACX,CAAC,CAAC,QAAQ,EAAE,EACZ,CAAC,CAAC,UAAU,EAAE,EACd,CAAC,CAAC,UAAU,EAAE,EACd,CAAC,CAAC,eAAe,EAAE,CACnB,CAAC;QACH,CAAC;aAED,CAAC;YACA,MAAM,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACnC,CAAC;IACF,CAAC;IAED,MAAM,CAAC,GAAG;QAET,OAAO,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,QAAQ;QAEP,MAAM,CAAC,GAAG,IAAI,CAAC;QACf,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,IAAI,QAAsB,CAAC,CAAC;IACnH,CAAC;CACD;AApDD,8BAoDC;AAED,kBAAe,SAAS,CAAC"}
|