corexxx 1.0.40 → 1.0.41

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.
Files changed (5) hide show
  1. package/dist/dtime.d.ts +0 -1
  2. package/dist/dtime.js +22 -9
  3. package/dist/dtime.js.map +1 -1
  4. package/package.json +1 -1
  5. package/src/dtime.ts +22 -8
package/dist/dtime.d.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  export declare namespace dtime {
2
2
  function getCurrentDate(): string;
3
3
  function getDataFromString(str: string): void;
4
- function getAgoString(str: string): "sometime" | undefined;
5
4
  function getFormattedDate(str: string): string;
6
5
  function isSameDay(day1: string, day2: string): boolean;
7
6
  function fromNow(str: string): string;
package/dist/dtime.js CHANGED
@@ -6,6 +6,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
6
6
  Object.defineProperty(exports, "__esModule", { value: true });
7
7
  exports.dtime = void 0;
8
8
  const moment_1 = __importDefault(require("moment"));
9
+ const dlog_1 = require("./dlog");
9
10
  var dtime;
10
11
  (function (dtime) {
11
12
  function getCurrentDate() {
@@ -16,15 +17,6 @@ var dtime;
16
17
  new Date(str);
17
18
  }
18
19
  dtime.getDataFromString = getDataFromString;
19
- function getAgoString(str) {
20
- try {
21
- //return timeAgo.format(new Date(str));
22
- }
23
- catch (ee) {
24
- return "sometime";
25
- }
26
- }
27
- dtime.getAgoString = getAgoString;
28
20
  function getFormattedDate(str) {
29
21
  try {
30
22
  let d = new Date(str);
@@ -78,5 +70,26 @@ var dtime;
78
70
  }
79
71
  }
80
72
  dtime.getTimeOnlyFromISO = getTimeOnlyFromISO;
73
+ const intervals = [
74
+ { label: "year", seconds: 31536000 },
75
+ { label: "month", seconds: 2592000 },
76
+ { label: "day", seconds: 86400 },
77
+ { label: "hour", seconds: 3600 },
78
+ { label: "minute", seconds: 60 },
79
+ { label: "second", seconds: 1 },
80
+ ];
81
+ function getAgoString(dateISOString) {
82
+ try {
83
+ let date = new Date(dateISOString);
84
+ const seconds = Math.floor((Date.now() - date.getTime()) / 1000);
85
+ const interval = intervals.find((i) => i.seconds < seconds);
86
+ const count = Math.floor(seconds / interval.seconds);
87
+ return `${count} ${interval.label}${count !== 1 ? "s" : ""} ago`;
88
+ }
89
+ catch (e) {
90
+ dlog_1.dlog.ex(e);
91
+ return "";
92
+ }
93
+ }
81
94
  })(dtime = exports.dtime || (exports.dtime = {}));
82
95
  //# sourceMappingURL=dtime.js.map
package/dist/dtime.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dtime.js","sourceRoot":"","sources":["../src/dtime.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;;;;AAEjD,oDAA4B;AAE5B,IAAiB,KAAK,CA+DrB;AA/DD,WAAiB,KAAK;IACpB,SAAgB,cAAc;QAC5B,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC;IAFe,oBAAc,iBAE7B,CAAA;IAED,SAAgB,iBAAiB,CAAC,GAAW;QAC3C,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;IAFe,uBAAiB,oBAEhC,CAAA;IAED,SAAgB,YAAY,CAAC,GAAW;QACtC,IAAI;YACF,uCAAuC;SACxC;QAAC,OAAO,EAAE,EAAE;YACX,OAAO,UAAU,CAAC;SACnB;IACH,CAAC;IANe,kBAAY,eAM3B,CAAA;IAED,SAAgB,gBAAgB,CAAC,GAAW;QAC1C,IAAI;YACF,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,CAAC,CAAC,cAAc,EAAE,CAAC;SAC3B;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAPe,sBAAgB,mBAO/B,CAAA;IAED,SAAgB,SAAS,CAAC,IAAY,EAAE,IAAY;QAClD,OAAO;QACP,OAAO,KAAK,CAAC;IACf,CAAC;IAHe,eAAS,YAGxB,CAAA;IAED,SAAgB,OAAO,CAAC,GAAW;QACjC,OAAO,gBAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC;IAFe,aAAO,UAEtB,CAAA;IAED,SAAgB,MAAM,CAAC,MAAW,EAAE,KAAK,GAAG,cAAc;QACxD,IAAI,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QACnF,IAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,cAAc,EAAE;YACrC,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;SACxB;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IANe,YAAM,SAMrB,CAAA;IACD,SAAgB,eAAe,CAAC,IAAU,EAAE,KAAK,GAAG,0BAA0B;QAC5E,IAAI,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE;YACzC,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;SACxB;IACH,CAAC;IAJe,qBAAe,kBAI9B,CAAA;IACD,SAAgB,kBAAkB,CAAC,GAAW;QAC5C,IAAI;YACF,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,CAAC,CAAC,kBAAkB,EAAE,CAAC;SAC/B;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,cAAc,CAAC;SACvB;IACH,CAAC;IAPe,wBAAkB,qBAOjC,CAAA;IACD,SAAgB,kBAAkB,CAAC,GAAW;QAC5C,IAAI;YACF,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,CAAC,CAAC,kBAAkB,EAAE,CAAC;SAC/B;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,cAAc,CAAC;SACvB;IACH,CAAC;IAPe,wBAAkB,qBAOjC,CAAA;AACH,CAAC,EA/DgB,KAAK,GAAL,aAAK,KAAL,aAAK,QA+DrB"}
1
+ {"version":3,"file":"dtime.js","sourceRoot":"","sources":["../src/dtime.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "corexxx",
3
- "version": "1.0.40",
3
+ "version": "1.0.41",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/dtime.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  //import en from "javascript-time-ago/locale/en";
2
2
 
3
3
  import moment from "moment";
4
+ import { dlog } from "./dlog";
4
5
 
5
6
  export namespace dtime {
6
7
  export function getCurrentDate() {
@@ -11,14 +12,6 @@ export namespace dtime {
11
12
  new Date(str);
12
13
  }
13
14
 
14
- export function getAgoString(str: string) {
15
- try {
16
- //return timeAgo.format(new Date(str));
17
- } catch (ee) {
18
- return "sometime";
19
- }
20
- }
21
-
22
15
  export function getFormattedDate(str: string) {
23
16
  try {
24
17
  let d = new Date(str);
@@ -65,4 +58,25 @@ export namespace dtime {
65
58
  return "Unknown Time";
66
59
  }
67
60
  }
61
+ const intervals = [
62
+ { label: "year", seconds: 31536000 },
63
+ { label: "month", seconds: 2592000 },
64
+ { label: "day", seconds: 86400 },
65
+ { label: "hour", seconds: 3600 },
66
+ { label: "minute", seconds: 60 },
67
+ { label: "second", seconds: 1 },
68
+ ];
69
+
70
+ function getAgoString(dateISOString: string) {
71
+ try {
72
+ let date = new Date(dateISOString);
73
+ const seconds = Math.floor((Date.now() - date.getTime()) / 1000);
74
+ const interval = intervals.find((i) => i.seconds < seconds);
75
+ const count = Math.floor(seconds / interval!!.seconds);
76
+ return `${count} ${interval!!.label}${count !== 1 ? "s" : ""} ago`;
77
+ } catch (e) {
78
+ dlog.ex(e as Error);
79
+ return "";
80
+ }
81
+ }
68
82
  }