@my-devkit/core 1.0.112 → 1.0.114

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.
@@ -2,6 +2,7 @@ export declare class DateHelper {
2
2
  static getUTCTimestamp(): number;
3
3
  static getElapsedTime(startDate: Date, endDate?: Date): number;
4
4
  static getReadableElapsedTime(startDate: Date, endDate?: Date, short?: boolean): string;
5
+ static getReadableDuration(durationInMiliseconds: number, short?: boolean): string;
5
6
  static format(date: Date, format: DateHelper.Format): string;
6
7
  static getFormat(formatedDate: string): DateHelper.Format;
7
8
  static getAverage(...dates: Date[]): Date;
@@ -11,13 +11,22 @@ class DateHelper {
11
11
  return Math.abs(endDate.getTime() - startDate.getTime());
12
12
  }
13
13
  static getReadableElapsedTime(startDate, endDate = new Date(), short = false) {
14
- let elapsedTime = this.getElapsedTime(startDate, endDate);
15
- const hours = Math.floor(elapsedTime / (60 * 60 * 1000));
16
- elapsedTime = elapsedTime - (60 * 60 * 1000) * hours;
17
- const minutes = Math.floor(elapsedTime / (60 * 1000));
18
- elapsedTime = elapsedTime - (60 * 1000) * minutes;
19
- const seconds = Math.floor(elapsedTime / 1000);
20
- const miliseconds = elapsedTime - 1000 * seconds;
14
+ const elapsedTime = this.getElapsedTime(startDate, endDate);
15
+ return this.getReadableDuration(elapsedTime, short);
16
+ }
17
+ static getReadableDuration(durationInMiliseconds, short = false) {
18
+ const days = Math.floor(durationInMiliseconds / (24 * 60 * 60 * 1000));
19
+ durationInMiliseconds -= (24 * 60 * 60 * 1000) * days;
20
+ const hours = Math.floor(durationInMiliseconds / (60 * 60 * 1000));
21
+ durationInMiliseconds -= (60 * 60 * 1000) * hours;
22
+ const minutes = Math.floor(durationInMiliseconds / (60 * 1000));
23
+ durationInMiliseconds -= (60 * 1000) * minutes;
24
+ const seconds = Math.floor(durationInMiliseconds / 1000);
25
+ const miliseconds = durationInMiliseconds - 1000 * seconds;
26
+ const daysUnit = days > 1 ? 'days' : 'day';
27
+ if (days) {
28
+ return short ? `${days} ${daysUnit}` : `${days} ${daysUnit} ${hours} h ${minutes} min ${seconds} sec ${miliseconds} ms`;
29
+ }
21
30
  if (hours) {
22
31
  return short ? `${hours} h` : `${hours} h ${minutes} min ${seconds} sec ${miliseconds} ms`;
23
32
  }
@@ -1 +1 @@
1
- {"version":3,"file":"date-helper.js","sourceRoot":"","sources":["../src/date-helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"date-helper.js","sourceRoot":"","sources":["../src/date-helper.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,8 @@ class TypeHelper {
8
8
  static transform(classType, rawJson) {
9
9
  const serialized = (0, cerialize_1.Serialize)(rawJson, classType);
10
10
  const deserialized = (0, cerialize_1.GenericDeserialize)(serialized, classType);
11
+ if ((new classType())['_type'] === classType.name)
12
+ deserialized['_type'] = classType.name;
11
13
  return deserialized;
12
14
  }
13
15
  static getProperties(type) {
@@ -1 +1 @@
1
- {"version":3,"file":"type-helper.js","sourceRoot":"","sources":["../../src/serialize/type-helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"type-helper.js","sourceRoot":"","sources":["../../src/serialize/type-helper.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- export { chunk as _chunk, cloneDeep as _cloneDeep, compact as _compact, deburr as _deburr, findLastIndex as _findLastIndex, first as _first, flatten as _flatten, flattenDeep as _flattenDeep, get as _get, groupBy as _groupBy, isArray as _isArray, isBoolean as _isBoolean, isDate as _isDate, isEqual as _isEqual, isNil as _isNil, isObjectLike as _isObjectLike, isString as _isString, kebabCase as _kebabCase, keys as _keys, last as _last, lowerFirst as _lowerFirst, maxBy as _maxBy, minBy as _minBy, orderBy as _orderBy, padStart as _padStart, random as _random, round as _round, set as _set, shuffle as _shuffle, sortBy as _sortBy, sum as _sum, sumBy as _sumBy, trim as _trim, trimEnd as _trimEnd, trimStart as _trimStart, uniq as _uniq, uniqBy as _uniqBy, upperFirst as _upperFirst, values as _values, words as _words } from 'lodash';
1
+ export { chunk as _chunk, cloneDeep as _cloneDeep, compact as _compact, deburr as _deburr, findLastIndex as _findLastIndex, first as _first, flatten as _flatten, flattenDeep as _flattenDeep, get as _get, groupBy as _groupBy, isArray as _isArray, isBoolean as _isBoolean, isDate as _isDate, isEqual as _isEqual, isNil as _isNil, isObjectLike as _isObjectLike, isString as _isString, kebabCase as _kebabCase, keys as _keys, last as _last, lowerFirst as _lowerFirst, max as _max, maxBy as _maxBy, minBy as _minBy, orderBy as _orderBy, padStart as _padStart, random as _random, round as _round, set as _set, shuffle as _shuffle, sortBy as _sortBy, sum as _sum, sumBy as _sumBy, trim as _trim, trimEnd as _trimEnd, trimStart as _trimStart, uniq as _uniq, uniqBy as _uniqBy, upperFirst as _upperFirst, values as _values, words as _words } from 'lodash';
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports._words = exports._values = exports._upperFirst = exports._uniqBy = exports._uniq = exports._trimStart = exports._trimEnd = exports._trim = exports._sumBy = exports._sum = exports._sortBy = exports._shuffle = exports._set = exports._round = exports._random = exports._padStart = exports._orderBy = exports._minBy = exports._maxBy = exports._lowerFirst = exports._last = exports._keys = exports._kebabCase = exports._isString = exports._isObjectLike = exports._isNil = exports._isEqual = exports._isDate = exports._isBoolean = exports._isArray = exports._groupBy = exports._get = exports._flattenDeep = exports._flatten = exports._first = exports._findLastIndex = exports._deburr = exports._compact = exports._cloneDeep = exports._chunk = void 0;
3
+ exports._words = exports._values = exports._upperFirst = exports._uniqBy = exports._uniq = exports._trimStart = exports._trimEnd = exports._trim = exports._sumBy = exports._sum = exports._sortBy = exports._shuffle = exports._set = exports._round = exports._random = exports._padStart = exports._orderBy = exports._minBy = exports._maxBy = exports._max = exports._lowerFirst = exports._last = exports._keys = exports._kebabCase = exports._isString = exports._isObjectLike = exports._isNil = exports._isEqual = exports._isDate = exports._isBoolean = exports._isArray = exports._groupBy = exports._get = exports._flattenDeep = exports._flatten = exports._first = exports._findLastIndex = exports._deburr = exports._compact = exports._cloneDeep = exports._chunk = void 0;
4
4
  var lodash_1 = require("lodash");
5
5
  Object.defineProperty(exports, "_chunk", { enumerable: true, get: function () { return lodash_1.chunk; } });
6
6
  Object.defineProperty(exports, "_cloneDeep", { enumerable: true, get: function () { return lodash_1.cloneDeep; } });
@@ -23,6 +23,7 @@ Object.defineProperty(exports, "_kebabCase", { enumerable: true, get: function (
23
23
  Object.defineProperty(exports, "_keys", { enumerable: true, get: function () { return lodash_1.keys; } });
24
24
  Object.defineProperty(exports, "_last", { enumerable: true, get: function () { return lodash_1.last; } });
25
25
  Object.defineProperty(exports, "_lowerFirst", { enumerable: true, get: function () { return lodash_1.lowerFirst; } });
26
+ Object.defineProperty(exports, "_max", { enumerable: true, get: function () { return lodash_1.max; } });
26
27
  Object.defineProperty(exports, "_maxBy", { enumerable: true, get: function () { return lodash_1.maxBy; } });
27
28
  Object.defineProperty(exports, "_minBy", { enumerable: true, get: function () { return lodash_1.minBy; } });
28
29
  Object.defineProperty(exports, "_orderBy", { enumerable: true, get: function () { return lodash_1.orderBy; } });
@@ -1 +1 @@
1
- {"version":3,"file":"lodash.js","sourceRoot":"","sources":["../../src/vendors/lodash.ts"],"names":[],"mappings":";;;AAAA,iCAyCgB;AAxCZ,gGAAA,KAAK,OAAU;AACf,oGAAA,SAAS,OAAc;AACvB,kGAAA,OAAO,OAAY;AACnB,iGAAA,MAAM,OAAW;AACjB,wGAAA,aAAa,OAAkB;AAC/B,gGAAA,KAAK,OAAU;AACf,kGAAA,OAAO,OAAY;AACnB,sGAAA,WAAW,OAAgB;AAC3B,8FAAA,GAAG,OAAQ;AACX,kGAAA,OAAO,OAAY;AACnB,kGAAA,OAAO,OAAY;AACnB,oGAAA,SAAS,OAAc;AACvB,iGAAA,MAAM,OAAW;AACjB,kGAAA,OAAO,OAAY;AACnB,gGAAA,KAAK,OAAU;AACf,uGAAA,YAAY,OAAiB;AAC7B,mGAAA,QAAQ,OAAa;AACrB,oGAAA,SAAS,OAAc;AACvB,+FAAA,IAAI,OAAS;AACb,+FAAA,IAAI,OAAS;AACb,qGAAA,UAAU,OAAe;AACzB,gGAAA,KAAK,OAAU;AACf,gGAAA,KAAK,OAAU;AACf,kGAAA,OAAO,OAAY;AACnB,mGAAA,QAAQ,OAAa;AACrB,iGAAA,MAAM,OAAW;AACjB,gGAAA,KAAK,OAAU;AACf,8FAAA,GAAG,OAAQ;AACX,kGAAA,OAAO,OAAY;AACnB,iGAAA,MAAM,OAAW;AACjB,8FAAA,GAAG,OAAQ;AACX,gGAAA,KAAK,OAAU;AACf,+FAAA,IAAI,OAAS;AACb,kGAAA,OAAO,OAAY;AACnB,oGAAA,SAAS,OAAc;AACvB,+FAAA,IAAI,OAAS;AACb,iGAAA,MAAM,OAAW;AACjB,qGAAA,UAAU,OAAe;AACzB,iGAAA,MAAM,OAAW;AACjB,gGAAA,KAAK,OAAU"}
1
+ {"version":3,"file":"lodash.js","sourceRoot":"","sources":["../../src/vendors/lodash.ts"],"names":[],"mappings":";;;AAAA,iCA0CgB;AAzCZ,gGAAA,KAAK,OAAU;AACf,oGAAA,SAAS,OAAc;AACvB,kGAAA,OAAO,OAAY;AACnB,iGAAA,MAAM,OAAW;AACjB,wGAAA,aAAa,OAAkB;AAC/B,gGAAA,KAAK,OAAU;AACf,kGAAA,OAAO,OAAY;AACnB,sGAAA,WAAW,OAAgB;AAC3B,8FAAA,GAAG,OAAQ;AACX,kGAAA,OAAO,OAAY;AACnB,kGAAA,OAAO,OAAY;AACnB,oGAAA,SAAS,OAAc;AACvB,iGAAA,MAAM,OAAW;AACjB,kGAAA,OAAO,OAAY;AACnB,gGAAA,KAAK,OAAU;AACf,uGAAA,YAAY,OAAiB;AAC7B,mGAAA,QAAQ,OAAa;AACrB,oGAAA,SAAS,OAAc;AACvB,+FAAA,IAAI,OAAS;AACb,+FAAA,IAAI,OAAS;AACb,qGAAA,UAAU,OAAe;AACzB,8FAAA,GAAG,OAAQ;AACX,gGAAA,KAAK,OAAU;AACf,gGAAA,KAAK,OAAU;AACf,kGAAA,OAAO,OAAY;AACnB,mGAAA,QAAQ,OAAa;AACrB,iGAAA,MAAM,OAAW;AACjB,gGAAA,KAAK,OAAU;AACf,8FAAA,GAAG,OAAQ;AACX,kGAAA,OAAO,OAAY;AACnB,iGAAA,MAAM,OAAW;AACjB,8FAAA,GAAG,OAAQ;AACX,gGAAA,KAAK,OAAU;AACf,+FAAA,IAAI,OAAS;AACb,kGAAA,OAAO,OAAY;AACnB,oGAAA,SAAS,OAAc;AACvB,+FAAA,IAAI,OAAS;AACb,iGAAA,MAAM,OAAW;AACjB,qGAAA,UAAU,OAAe;AACzB,iGAAA,MAAM,OAAW;AACjB,gGAAA,KAAK,OAAU"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@my-devkit/core",
3
- "version": "1.0.112",
3
+ "version": "1.0.114",
4
4
  "description": "My Devkit: common tools",
5
5
  "main": "dist/index.js",
6
6
  "typings": "dist/index.d.ts",
@@ -12,14 +12,25 @@ export class DateHelper {
12
12
  }
13
13
 
14
14
  public static getReadableElapsedTime(startDate: Date, endDate = new Date(), short = false): string {
15
- let elapsedTime = this.getElapsedTime(startDate, endDate);
15
+ const elapsedTime = this.getElapsedTime(startDate, endDate);
16
+ return this.getReadableDuration(elapsedTime, short);
17
+ }
18
+
19
+ public static getReadableDuration(durationInMiliseconds: number, short = false): string {
20
+ const days = Math.floor(durationInMiliseconds / (24 * 60 * 60 * 1000));
21
+ durationInMiliseconds -= (24 * 60 * 60 * 1000) * days;
22
+ const hours = Math.floor(durationInMiliseconds / (60 * 60 * 1000));
23
+ durationInMiliseconds -= (60 * 60 * 1000) * hours;
24
+ const minutes = Math.floor(durationInMiliseconds / (60 * 1000));
25
+ durationInMiliseconds -= (60 * 1000) * minutes;
26
+ const seconds = Math.floor(durationInMiliseconds / 1000);
27
+ const miliseconds = durationInMiliseconds - 1000 * seconds;
16
28
 
17
- const hours = Math.floor(elapsedTime / (60 * 60 * 1000));
18
- elapsedTime = elapsedTime - (60 * 60 * 1000) * hours;
19
- const minutes = Math.floor(elapsedTime / (60 * 1000));
20
- elapsedTime = elapsedTime - (60 * 1000) * minutes;
21
- const seconds = Math.floor(elapsedTime / 1000);
22
- const miliseconds = elapsedTime - 1000 * seconds;
29
+ const daysUnit = days > 1 ? 'days' : 'day';
30
+
31
+ if (days) {
32
+ return short ? `${days} ${daysUnit}` : `${days} ${daysUnit} ${hours} h ${minutes} min ${seconds} sec ${miliseconds} ms`;
33
+ }
23
34
 
24
35
  if (hours) {
25
36
  return short ? `${hours} h` : `${hours} h ${minutes} min ${seconds} sec ${miliseconds} ms`;
@@ -32,6 +43,7 @@ export class DateHelper {
32
43
  if (seconds) {
33
44
  return short ? `${seconds} sec` : `${seconds} sec ${miliseconds} ms`;
34
45
  }
46
+
35
47
  return `${miliseconds} ms`;
36
48
  }
37
49
 
@@ -7,6 +7,10 @@ export class TypeHelper {
7
7
  public static transform<T>(classType: new () => T, rawJson: TypeHelper.ClassProperties<T>): T {
8
8
  const serialized = Serialize(rawJson, classType);
9
9
  const deserialized = GenericDeserialize(serialized, classType);
10
+
11
+ if ((new classType())['_type'] === classType.name)
12
+ deserialized['_type'] = classType.name;
13
+
10
14
  return deserialized;
11
15
  }
12
16
 
@@ -20,6 +20,7 @@ export {
20
20
  keys as _keys,
21
21
  last as _last,
22
22
  lowerFirst as _lowerFirst,
23
+ max as _max,
23
24
  maxBy as _maxBy,
24
25
  minBy as _minBy,
25
26
  orderBy as _orderBy,