@kwiz/common 1.0.11 → 1.0.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/dist/helpers/url.js +3 -1
- package/dist/helpers/url.js.map +1 -1
- package/package.json +1 -1
- package/src/helpers/date.test.js +47 -24
- package/src/helpers/url.test.js +4 -0
- package/src/helpers/url.ts +2 -1
package/dist/helpers/url.js
CHANGED
|
@@ -62,7 +62,7 @@ function makeFullUrl(url, baseUrl) {
|
|
|
62
62
|
if (url.indexOf('://') > 0)
|
|
63
63
|
return url;
|
|
64
64
|
else {
|
|
65
|
-
if (url.startsWith('/')) {
|
|
65
|
+
if (url.startsWith('/') || url.startsWith('#')) {
|
|
66
66
|
//server relative
|
|
67
67
|
if ((0, typecheckers_1.isNullOrEmptyString)(baseUrl)) { //no override base
|
|
68
68
|
var xxx = document.createElement("a");
|
|
@@ -71,6 +71,8 @@ function makeFullUrl(url, baseUrl) {
|
|
|
71
71
|
}
|
|
72
72
|
else //have override base
|
|
73
73
|
{
|
|
74
|
+
if (url.startsWith('#'))
|
|
75
|
+
return `${baseUrl.split('#')[0]}${url}`;
|
|
74
76
|
return `${baseUrl.split('/').slice(0, 3).join("/")}${url}`;
|
|
75
77
|
}
|
|
76
78
|
}
|
package/dist/helpers/url.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/helpers/url.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/helpers/url.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/helpers/date.test.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import assert from 'assert/strict';
|
|
2
2
|
import test from 'node:test';
|
|
3
|
-
import {
|
|
3
|
+
import { getDateFromToken, getTotalDaysInMonth, isISODate, isISODateUTC, isNowToken, isStandardDate, isTodayToken, shiftMonths } from "./date";
|
|
4
4
|
|
|
5
5
|
test('isTodayToken', t => {
|
|
6
6
|
assert.strictEqual(isTodayToken(''), false);
|
|
@@ -24,73 +24,96 @@ test('isNowToken', t => {
|
|
|
24
24
|
assert.strictEqual(isNowToken('[now]'), true);
|
|
25
25
|
});
|
|
26
26
|
|
|
27
|
-
test('getDateFromToken', t => {
|
|
27
|
+
test('getDateFromToken', async t => {
|
|
28
28
|
let now = new Date();
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
29
|
+
var result = getDateFromToken('[today]+1', { now: now });
|
|
30
|
+
var expected = new Date(now.getTime());
|
|
31
|
+
expected.setDate(expected.getDate() + 1);
|
|
32
|
+
await t.test('1. [today]+1', () => assert.strictEqual(result.getTime(), expected.getTime()));
|
|
33
|
+
|
|
34
|
+
result = getDateFromToken('[today]-1', { now: now });
|
|
35
|
+
expected = new Date(now.getTime());
|
|
36
|
+
expected.setDate(expected.getDate() - 1);
|
|
37
|
+
await t.test('1. [today]-1', () => assert.strictEqual(result.getTime(), expected.getTime()));
|
|
38
|
+
|
|
39
|
+
result = getDateFromToken('[now]+15', { now: now });
|
|
40
|
+
expected = new Date(now.getTime());
|
|
41
|
+
expected.setMinutes(expected.getMinutes() + 15);
|
|
42
|
+
await t.test('1. [now]+15', () => assert.strictEqual(result.getTime(), expected.getTime()));
|
|
43
|
+
|
|
44
|
+
result = getDateFromToken('[now]-15', { now: now });
|
|
45
|
+
expected = new Date(now.getTime());
|
|
46
|
+
expected.setMinutes(expected.getMinutes() - 15);
|
|
47
|
+
await t.test('1. [now]-15', () => assert.strictEqual(result.getTime(), expected.getTime()));
|
|
33
48
|
|
|
34
49
|
let test = new Date(now.getTime());
|
|
35
50
|
test.setHours(0, 0, 0, 0);
|
|
36
|
-
|
|
37
|
-
|
|
51
|
+
|
|
52
|
+
result = getDateFromToken('[today]+1', { now: now, zeroTimeForToday: true });
|
|
53
|
+
expected = new Date(test.getTime());
|
|
54
|
+
expected.setDate(expected.getDate() + 1);
|
|
55
|
+
await t.test('2. [today]+1', () => assert.strictEqual(result.getTime(), expected.getTime()));
|
|
56
|
+
|
|
57
|
+
result = getDateFromToken('[today]-1', { now: now, zeroTimeForToday: true });
|
|
58
|
+
expected = new Date(test.getTime());
|
|
59
|
+
expected.setDate(expected.getDate() - 1);
|
|
60
|
+
await t.test('2. [today]-1', () => assert.strictEqual(result.getTime(), expected.getTime()));
|
|
38
61
|
|
|
39
62
|
});
|
|
40
63
|
|
|
41
|
-
test('isStandardDate', t => {
|
|
64
|
+
test('isStandardDate', t => {
|
|
42
65
|
assert.strictEqual(isStandardDate(''), false);
|
|
43
66
|
assert.strictEqual(isStandardDate('2023-08-21T15:54:14.954Z'), false);
|
|
44
67
|
assert.strictEqual(isStandardDate('2023-08-21T15:54:14.954'), false);
|
|
45
68
|
assert.strictEqual(isStandardDate('2023-08-21T15:54:14Z'), false);
|
|
46
69
|
assert.strictEqual(isStandardDate('2023-08-21T15:54:14'), false);
|
|
47
|
-
assert.strictEqual(isStandardDate('2023-08-21T15:54'), true);
|
|
70
|
+
assert.strictEqual(isStandardDate('2023-08-21T15:54'), true);
|
|
48
71
|
});
|
|
49
72
|
|
|
50
|
-
test('isISODate', t => {
|
|
73
|
+
test('isISODate', t => {
|
|
51
74
|
assert.strictEqual(isISODate(''), false);
|
|
52
75
|
assert.strictEqual(isISODate('2023-08-21T15:54:14.954Z'), true);
|
|
53
76
|
assert.strictEqual(isISODate('2023-08-21T15:54:14.954'), true);
|
|
54
77
|
assert.strictEqual(isISODate('2023-08-21T15:54:14Z'), true);
|
|
55
78
|
assert.strictEqual(isISODate('2023-08-21T15:54:14'), true);
|
|
56
|
-
assert.strictEqual(isISODate('2023-08-21T15:54'), false);
|
|
79
|
+
assert.strictEqual(isISODate('2023-08-21T15:54'), false);
|
|
57
80
|
});
|
|
58
81
|
|
|
59
|
-
test('isISODateUTC', t => {
|
|
82
|
+
test('isISODateUTC', t => {
|
|
60
83
|
assert.strictEqual(isISODateUTC(''), false);
|
|
61
84
|
assert.strictEqual(isISODateUTC('2023-08-21T15:54:14.954Z'), true);
|
|
62
85
|
assert.strictEqual(isISODateUTC('2023-08-21T15:54:14.954'), false);
|
|
63
86
|
assert.strictEqual(isISODateUTC('2023-08-21T15:54:14Z'), true);
|
|
64
87
|
assert.strictEqual(isISODateUTC('2023-08-21T15:54:14'), false);
|
|
65
|
-
assert.strictEqual(isISODateUTC('2023-08-21T15:54'), false);
|
|
88
|
+
assert.strictEqual(isISODateUTC('2023-08-21T15:54'), false);
|
|
66
89
|
});
|
|
67
90
|
|
|
68
|
-
test('getTotalDaysInMonth', t => {
|
|
69
|
-
var d = new Date("01-01-2023");
|
|
91
|
+
test('getTotalDaysInMonth', t => {
|
|
92
|
+
var d = new Date("01-01-2023");
|
|
70
93
|
assert.strictEqual(getTotalDaysInMonth(d), 31);
|
|
71
|
-
|
|
94
|
+
|
|
72
95
|
d = new Date("09-01-2023");
|
|
73
96
|
assert.strictEqual(getTotalDaysInMonth(d), 30);
|
|
74
|
-
|
|
97
|
+
|
|
75
98
|
d = new Date("02-01-2023");
|
|
76
99
|
assert.strictEqual(getTotalDaysInMonth(d), 28);
|
|
77
|
-
|
|
100
|
+
|
|
78
101
|
d = new Date("02-01-2024"); //leap year
|
|
79
102
|
assert.strictEqual(getTotalDaysInMonth(d), 29);
|
|
80
103
|
});
|
|
81
104
|
|
|
82
|
-
test('shiftMonths', t => {
|
|
83
|
-
var d = new Date("01-31-2023");
|
|
105
|
+
test('shiftMonths', t => {
|
|
106
|
+
var d = new Date("01-31-2023");
|
|
84
107
|
shiftMonths(d, 1)
|
|
85
108
|
assert.strictEqual(d.getMonth() + 1, 2);
|
|
86
109
|
assert.strictEqual(d.getDate(), 28);
|
|
87
|
-
|
|
88
|
-
d = new Date("01-31-2023");
|
|
110
|
+
|
|
111
|
+
d = new Date("01-31-2023");
|
|
89
112
|
shiftMonths(d, 13)
|
|
90
113
|
assert.strictEqual(d.getMonth() + 1, 2);
|
|
91
114
|
assert.strictEqual(d.getDate(), 29); //leap year
|
|
92
115
|
|
|
93
|
-
d = new Date("01-31-2023");
|
|
116
|
+
d = new Date("01-31-2023");
|
|
94
117
|
shiftMonths(d, -11)
|
|
95
118
|
assert.strictEqual(d.getMonth() + 1, 2);
|
|
96
119
|
assert.strictEqual(d.getDate(), 28);
|
package/src/helpers/url.test.js
CHANGED
|
@@ -22,4 +22,8 @@ test('makeFullUrl', t => {
|
|
|
22
22
|
assert.deepEqual(makeFullUrl("http://foo", "http://fii"), "http://foo");
|
|
23
23
|
assert.deepEqual(makeFullUrl("foo/fii", "http://host/folder"), "http://host/folder/foo/fii");
|
|
24
24
|
assert.deepEqual(makeFullUrl("/foo/fii", "http://host"), "http://host/foo/fii");
|
|
25
|
+
//fix # to full URL
|
|
26
|
+
assert.deepEqual(makeFullUrl("#hashnav", "http://foo"), "http://foo#hashnav");
|
|
27
|
+
assert.deepEqual(makeFullUrl("#hashnav2", "http://foo#hashnav"), "http://foo#hashnav2");
|
|
28
|
+
assert.deepEqual(makeFullUrl("#hashnav", "http://foo/page.aspx"), "http://foo/page.aspx#hashnav");
|
|
25
29
|
});
|
package/src/helpers/url.ts
CHANGED
|
@@ -62,7 +62,7 @@ export function makeFullUrl(url: string, baseUrl?: string): string {
|
|
|
62
62
|
|
|
63
63
|
if (url.indexOf('://') > 0) return url;
|
|
64
64
|
else {
|
|
65
|
-
if (url.startsWith('/')) {
|
|
65
|
+
if (url.startsWith('/') || url.startsWith('#')) {
|
|
66
66
|
//server relative
|
|
67
67
|
if (isNullOrEmptyString(baseUrl)) {//no override base
|
|
68
68
|
var xxx = document.createElement("a");
|
|
@@ -71,6 +71,7 @@ export function makeFullUrl(url: string, baseUrl?: string): string {
|
|
|
71
71
|
}
|
|
72
72
|
else//have override base
|
|
73
73
|
{
|
|
74
|
+
if (url.startsWith('#')) return `${baseUrl.split('#')[0]}${url}`;
|
|
74
75
|
return `${baseUrl.split('/').slice(0, 3).join("/")}${url}`;
|
|
75
76
|
}
|
|
76
77
|
}
|