@wisemen/datewise 0.1.19 → 1.0.1
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/common/typeorm/ends-before-or-at.d.ts +15 -0
- package/dist/common/typeorm/ends-before-or-at.js +35 -0
- package/dist/common/typeorm/ends-before-or-at.js.map +1 -0
- package/dist/common/typeorm/ends-before.d.ts +4 -2
- package/dist/common/typeorm/ends-before.js +23 -2
- package/dist/common/typeorm/ends-before.js.map +1 -1
- package/dist/common/typeorm/index.d.ts +2 -0
- package/dist/common/typeorm/index.js +2 -0
- package/dist/common/typeorm/index.js.map +1 -1
- package/dist/common/typeorm/starts-after-or-at.d.ts +14 -0
- package/dist/common/typeorm/starts-after-or-at.js +34 -0
- package/dist/common/typeorm/starts-after-or-at.js.map +1 -0
- package/dist/common/typeorm/starts-after.d.ts +4 -2
- package/dist/common/typeorm/starts-after.js +23 -2
- package/dist/common/typeorm/starts-after.js.map +1 -1
- package/dist/date-range/date-range.d.ts +17 -2
- package/dist/date-range/date-range.js +9 -4
- package/dist/date-range/date-range.js.map +1 -1
- package/dist/date-range/tests/date-range.unit.test.js +61 -0
- package/dist/date-range/tests/date-range.unit.test.js.map +1 -1
- package/dist/date-range/tests/ends-before-or-at-plain-date.integration.test.d.ts +1 -0
- package/dist/date-range/tests/ends-before-or-at-plain-date.integration.test.js +82 -0
- package/dist/date-range/tests/ends-before-or-at-plain-date.integration.test.js.map +1 -0
- package/dist/date-range/tests/ends-before-plain-date.integration.test.d.ts +1 -0
- package/dist/date-range/tests/ends-before-plain-date.integration.test.js +52 -0
- package/dist/date-range/tests/ends-before-plain-date.integration.test.js.map +1 -0
- package/dist/date-range/tests/sql/datasource.js +1 -1
- package/dist/date-range/tests/starts-after-or-at-plain-date.integration.test.d.ts +1 -0
- package/dist/date-range/tests/starts-after-or-at-plain-date.integration.test.js +82 -0
- package/dist/date-range/tests/starts-after-or-at-plain-date.integration.test.js.map +1 -0
- package/dist/date-range/tests/starts-after-plain-date.integration.test.d.ts +1 -0
- package/dist/date-range/tests/starts-after-plain-date.integration.test.js +52 -0
- package/dist/date-range/tests/starts-after-plain-date.integration.test.js.map +1 -0
- package/dist/date-time-range/date-time-range.d.ts +15 -2
- package/dist/date-time-range/date-time-range.js +7 -4
- package/dist/date-time-range/date-time-range.js.map +1 -1
- package/dist/date-time-range/tests/date-time-range.column.integration.test.js +19 -20
- package/dist/date-time-range/tests/date-time-range.column.integration.test.js.map +1 -1
- package/dist/date-time-range/tests/date-time-range.unit.test.js +82 -4
- package/dist/date-time-range/tests/date-time-range.unit.test.js.map +1 -1
- package/dist/date-time-range/tests/ends-before-or-at-timestamp.integration.test.d.ts +1 -0
- package/dist/date-time-range/tests/ends-before-or-at-timestamp.integration.test.js +67 -0
- package/dist/date-time-range/tests/ends-before-or-at-timestamp.integration.test.js.map +1 -0
- package/dist/date-time-range/tests/ends-before-timestamp.integration.test.d.ts +1 -0
- package/dist/date-time-range/tests/ends-before-timestamp.integration.test.js +52 -0
- package/dist/date-time-range/tests/ends-before-timestamp.integration.test.js.map +1 -0
- package/dist/date-time-range/tests/starts-after-or-at-timestamp.integration.test.d.ts +1 -0
- package/dist/date-time-range/tests/starts-after-or-at-timestamp.integration.test.js +67 -0
- package/dist/date-time-range/tests/starts-after-or-at-timestamp.integration.test.js.map +1 -0
- package/dist/date-time-range/tests/starts-after-timestamp.integration.test.d.ts +1 -0
- package/dist/date-time-range/tests/starts-after-timestamp.integration.test.js +52 -0
- package/dist/date-time-range/tests/starts-after-timestamp.integration.test.js.map +1 -0
- package/dist/plain-date/dayjs-plain-date.d.ts +12 -0
- package/dist/plain-date/dayjs-plain-date.js +16 -0
- package/dist/plain-date/dayjs-plain-date.js.map +1 -1
- package/dist/plain-date/future-infinity-date.d.ts +2 -0
- package/dist/plain-date/future-infinity-date.js +6 -0
- package/dist/plain-date/future-infinity-date.js.map +1 -1
- package/dist/plain-date/is-plain-date.d.ts +2 -0
- package/dist/plain-date/is-plain-date.js +9 -0
- package/dist/plain-date/is-plain-date.js.map +1 -0
- package/dist/plain-date/past-infinity-date.d.ts +2 -0
- package/dist/plain-date/past-infinity-date.js +6 -0
- package/dist/plain-date/past-infinity-date.js.map +1 -1
- package/dist/plain-date/plain-date.d.ts +14 -0
- package/dist/plain-date/tests/plain-date.future-infinity.unit.test.js +19 -0
- package/dist/plain-date/tests/plain-date.future-infinity.unit.test.js.map +1 -1
- package/dist/plain-date/tests/plain-date.manipulation.unit.test.js +53 -0
- package/dist/plain-date/tests/plain-date.manipulation.unit.test.js.map +1 -1
- package/dist/plain-date/tests/plain-date.past-infinity.unit.test.js +19 -0
- package/dist/plain-date/tests/plain-date.past-infinity.unit.test.js.map +1 -1
- package/dist/timestamp/dayjs-timestamp.js +2 -2
- package/dist/timestamp/dayjs-timestamp.js.map +1 -1
- package/dist/timestamp/is-timestamp.d.ts +2 -0
- package/dist/timestamp/is-timestamp.js +9 -0
- package/dist/timestamp/is-timestamp.js.map +1 -0
- package/package.json +5 -2
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { FindOperator } from 'typeorm';
|
|
2
|
+
import { DateTimeRange } from '../../date-time-range/date-time-range.js';
|
|
3
|
+
import { DateRange } from '../../date-range/date-range.js';
|
|
4
|
+
import { PlainDate } from '#src/plain-date/index.js';
|
|
5
|
+
import { Timestamp } from '#src/timestamp/timestamp.js';
|
|
6
|
+
/**
|
|
7
|
+
* Checks if a range ends at or before the given range with the `&<` operator.
|
|
8
|
+
*/
|
|
9
|
+
export declare function EndsBeforeOrAt(date: PlainDate): FindOperator<DateRange>;
|
|
10
|
+
export declare function EndsBeforeOrAt(ts: Timestamp | Date): FindOperator<DateTimeRange>;
|
|
11
|
+
/**
|
|
12
|
+
* Alias for EndsBeforeOrAt when working with PlainDate values.
|
|
13
|
+
* Checks if a range ends on or before the given date with the `&<` operator.
|
|
14
|
+
*/
|
|
15
|
+
export declare function EndsBeforeOrOn(date: PlainDate): FindOperator<DateRange>;
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { randomUUID } from 'crypto';
|
|
2
|
+
import { Raw } from 'typeorm';
|
|
3
|
+
import { DateTimeRange } from '../../date-time-range/date-time-range.js';
|
|
4
|
+
import { DateRange } from '../../date-range/date-range.js';
|
|
5
|
+
import { isPlainDate } from '#src/plain-date/is-plain-date.js';
|
|
6
|
+
import { isTimestamp } from '#src/timestamp/is-timestamp.js';
|
|
7
|
+
export function EndsBeforeOrAt(value) {
|
|
8
|
+
let range;
|
|
9
|
+
if (isPlainDate(value)) {
|
|
10
|
+
range = new DateRange(value, value);
|
|
11
|
+
}
|
|
12
|
+
else if (isTimestamp(value) || value instanceof Date) {
|
|
13
|
+
range = new DateTimeRange(value, value, '[]');
|
|
14
|
+
}
|
|
15
|
+
else {
|
|
16
|
+
throw new Error('invalid argument, expected plain date, timestamp or date');
|
|
17
|
+
}
|
|
18
|
+
const paramName = randomUUID().replaceAll('-', '');
|
|
19
|
+
let cast;
|
|
20
|
+
if (range instanceof DateRange) {
|
|
21
|
+
cast = 'daterange';
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
cast = 'tstzrange3';
|
|
25
|
+
}
|
|
26
|
+
return Raw((alias) => `${alias} &< :${paramName}::${cast}`, { [paramName]: range.toString() });
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Alias for EndsBeforeOrAt when working with PlainDate values.
|
|
30
|
+
* Checks if a range ends on or before the given date with the `&<` operator.
|
|
31
|
+
*/
|
|
32
|
+
export function EndsBeforeOrOn(date) {
|
|
33
|
+
return EndsBeforeOrAt(date);
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=ends-before-or-at.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ends-before-or-at.js","sourceRoot":"","sources":["../../../lib/common/typeorm/ends-before-or-at.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAgB,GAAG,EAAE,MAAM,SAAS,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAA;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAA;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAA;AAQ5D,MAAM,UAAU,cAAc,CAC1B,KAAmC;IAEnC,IAAI,KAAgC,CAAA;IACpC,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,KAAK,GAAG,IAAI,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IACvC,CAAC;SAAM,IAAI,WAAW,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;QACrD,KAAK,GAAG,IAAI,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IACjD,CAAC;SAAM,CAAC;QACJ,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;IAC/E,CAAC;IAGD,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAElD,IAAI,IAAY,CAAA;IAChB,IAAI,KAAK,YAAY,SAAS,EAAE,CAAC;QAC7B,IAAI,GAAG,WAAW,CAAA;IACtB,CAAC;SAAM,CAAC;QACJ,IAAI,GAAG,YAAY,CAAA;IACvB,CAAC;IAED,OAAO,GAAG,CACN,CAAC,KAAa,EAAE,EAAE,CAAC,GAAG,KAAK,QAAQ,SAAS,KAAK,IAAI,EAAE,EACvD,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,CACqB,CAAA;AAC9D,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAE,IAAe;IAC3C,OAAO,cAAc,CAAC,IAAI,CAAC,CAAA;AAC/B,CAAC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { FindOperator } from 'typeorm';
|
|
2
2
|
import { DateTimeRange } from '../../date-time-range/date-time-range.js';
|
|
3
3
|
import { DateRange } from '../../date-range/date-range.js';
|
|
4
|
+
import { PlainDate } from '#src/plain-date/index.js';
|
|
5
|
+
import { Timestamp } from '#src/timestamp/timestamp.js';
|
|
4
6
|
/**
|
|
5
7
|
* Checks if a range ends before the given range with the `<<` operator.
|
|
6
8
|
*/
|
|
7
|
-
export declare function EndsBefore(
|
|
8
|
-
export declare function EndsBefore(
|
|
9
|
+
export declare function EndsBefore(date: PlainDate): FindOperator<DateRange>;
|
|
10
|
+
export declare function EndsBefore(ts: Timestamp | Date): FindOperator<DateTimeRange>;
|
|
@@ -1,7 +1,28 @@
|
|
|
1
1
|
import { randomUUID } from 'crypto';
|
|
2
2
|
import { Raw } from 'typeorm';
|
|
3
|
-
|
|
3
|
+
import { DateTimeRange } from '../../date-time-range/date-time-range.js';
|
|
4
|
+
import { DateRange } from '../../date-range/date-range.js';
|
|
5
|
+
import { isPlainDate } from '#src/plain-date/is-plain-date.js';
|
|
6
|
+
import { isTimestamp } from '#src/timestamp/is-timestamp.js';
|
|
7
|
+
export function EndsBefore(timestamp) {
|
|
8
|
+
let range;
|
|
9
|
+
if (isPlainDate(timestamp)) {
|
|
10
|
+
range = new DateRange(timestamp, timestamp);
|
|
11
|
+
}
|
|
12
|
+
else if (isTimestamp(timestamp) || timestamp instanceof Date) {
|
|
13
|
+
range = new DateTimeRange(timestamp, timestamp, '[]');
|
|
14
|
+
}
|
|
15
|
+
else {
|
|
16
|
+
throw new Error('invalid argument, expected plain date, timestamp or date');
|
|
17
|
+
}
|
|
4
18
|
const paramName = randomUUID().replaceAll('-', '');
|
|
5
|
-
|
|
19
|
+
let cast;
|
|
20
|
+
if (range instanceof DateRange) {
|
|
21
|
+
cast = 'daterange';
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
cast = 'tstzrange3';
|
|
25
|
+
}
|
|
26
|
+
return Raw((alias) => `${alias} << :${paramName}::${cast}`, { [paramName]: range.toString() });
|
|
6
27
|
}
|
|
7
28
|
//# sourceMappingURL=ends-before.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ends-before.js","sourceRoot":"","sources":["../../../lib/common/typeorm/ends-before.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAgB,GAAG,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"ends-before.js","sourceRoot":"","sources":["../../../lib/common/typeorm/ends-before.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAgB,GAAG,EAAE,MAAM,SAAS,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAA;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAA;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAA;AAQ5D,MAAM,UAAU,UAAU,CACxB,SAAuC;IAEvC,IAAI,KAAgC,CAAA;IACpC,IAAI,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,KAAK,GAAG,IAAI,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;IAC7C,CAAC;SAAM,IAAI,WAAW,CAAC,SAAS,CAAC,IAAI,SAAS,YAAY,IAAI,EAAE,CAAC;QAC/D,KAAK,GAAG,IAAI,aAAa,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;IACvD,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;IAC7E,CAAC;IAED,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAElD,IAAI,IAAY,CAAA;IAChB,IAAI,KAAK,YAAY,SAAS,EAAE,CAAC;QAC/B,IAAI,GAAG,WAAW,CAAA;IACpB,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,YAAY,CAAA;IACrB,CAAC;IAED,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE,CAAC,GAAG,KAAK,QAAQ,SAAS,KAAK,IAAI,EAAE,EACvD,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,CACuB,CAAA;AAC5D,CAAC"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
export * from './adjacent-to.js';
|
|
2
2
|
export * from './contained-in.js';
|
|
3
3
|
export * from './ends-before.js';
|
|
4
|
+
export * from './ends-before-or-at.js';
|
|
4
5
|
export * from './is-preceded-by.js';
|
|
5
6
|
export * from './is-succeeded-by.js';
|
|
6
7
|
export * from './overlaps-with.js';
|
|
7
8
|
export * from './precedes.js';
|
|
8
9
|
export * from './starts-after.js';
|
|
10
|
+
export * from './starts-after-or-at.js';
|
|
9
11
|
export * from './strictly-left-of.js';
|
|
10
12
|
export * from './strictly-right-of.js';
|
|
11
13
|
export * from './succeeds.js';
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
export * from './adjacent-to.js';
|
|
2
2
|
export * from './contained-in.js';
|
|
3
3
|
export * from './ends-before.js';
|
|
4
|
+
export * from './ends-before-or-at.js';
|
|
4
5
|
export * from './is-preceded-by.js';
|
|
5
6
|
export * from './is-succeeded-by.js';
|
|
6
7
|
export * from './overlaps-with.js';
|
|
7
8
|
export * from './precedes.js';
|
|
8
9
|
export * from './starts-after.js';
|
|
10
|
+
export * from './starts-after-or-at.js';
|
|
9
11
|
export * from './strictly-left-of.js';
|
|
10
12
|
export * from './strictly-right-of.js';
|
|
11
13
|
export * from './succeeds.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/common/typeorm/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,kBAAkB,CAAA;AAChC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,eAAe,CAAA;AAC7B,cAAc,mBAAmB,CAAA;AACjC,cAAc,uBAAuB,CAAA;AACrC,cAAc,wBAAwB,CAAA;AACtC,cAAc,eAAe,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/common/typeorm/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,kBAAkB,CAAA;AAChC,cAAc,wBAAwB,CAAA;AACtC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,eAAe,CAAA;AAC7B,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,CAAA;AACvC,cAAc,uBAAuB,CAAA;AACrC,cAAc,wBAAwB,CAAA;AACtC,cAAc,eAAe,CAAA"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { FindOperator } from 'typeorm';
|
|
2
|
+
import { DateTimeRange } from '../../date-time-range/date-time-range.js';
|
|
3
|
+
import { DateRange } from '../../date-range/date-range.js';
|
|
4
|
+
import { PlainDate } from '#src/plain-date/index.js';
|
|
5
|
+
import { Timestamp } from '#src/timestamp/timestamp.js';
|
|
6
|
+
/**
|
|
7
|
+
* Checks if a range starts at or after the given range with the `&>` operator.
|
|
8
|
+
*/
|
|
9
|
+
export declare function StartsAfterOrAt(date: PlainDate): FindOperator<DateRange>;
|
|
10
|
+
export declare function StartsAfterOrAt(ts: Timestamp | Date): FindOperator<DateTimeRange>;
|
|
11
|
+
/**
|
|
12
|
+
* Checks if a range starts on or after the given date with the `&>` operator.
|
|
13
|
+
*/
|
|
14
|
+
export declare function StartsAfterOrOn(date: PlainDate): FindOperator<DateRange>;
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { randomUUID } from 'crypto';
|
|
2
|
+
import { Raw } from 'typeorm';
|
|
3
|
+
import { DateTimeRange } from '../../date-time-range/date-time-range.js';
|
|
4
|
+
import { DateRange } from '../../date-range/date-range.js';
|
|
5
|
+
import { isPlainDate } from '#src/plain-date/is-plain-date.js';
|
|
6
|
+
import { isTimestamp } from '#src/timestamp/is-timestamp.js';
|
|
7
|
+
export function StartsAfterOrAt(value) {
|
|
8
|
+
let range;
|
|
9
|
+
if (isPlainDate(value)) {
|
|
10
|
+
range = new DateRange(value, value);
|
|
11
|
+
}
|
|
12
|
+
else if (isTimestamp(value) || value instanceof Date) {
|
|
13
|
+
range = new DateTimeRange(value, value, '[]');
|
|
14
|
+
}
|
|
15
|
+
else {
|
|
16
|
+
throw new Error('invalid argument, expected plain date, timestamp or date');
|
|
17
|
+
}
|
|
18
|
+
const paramName = randomUUID().replaceAll('-', '');
|
|
19
|
+
let cast;
|
|
20
|
+
if (range instanceof DateRange) {
|
|
21
|
+
cast = 'daterange';
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
cast = 'tstzrange3';
|
|
25
|
+
}
|
|
26
|
+
return Raw((alias) => `${alias} &> :${paramName}::${cast}`, { [paramName]: range.toString() });
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Checks if a range starts on or after the given date with the `&>` operator.
|
|
30
|
+
*/
|
|
31
|
+
export function StartsAfterOrOn(date) {
|
|
32
|
+
return StartsAfterOrAt(date);
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=starts-after-or-at.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"starts-after-or-at.js","sourceRoot":"","sources":["../../../lib/common/typeorm/starts-after-or-at.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAgB,GAAG,EAAE,MAAM,SAAS,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAA;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAA;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAA;AAQ5D,MAAM,UAAU,eAAe,CAC3B,KAAmC;IAEnC,IAAI,KAAgC,CAAA;IACpC,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,KAAK,GAAG,IAAI,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IACvC,CAAC;SAAM,IAAI,WAAW,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;QACrD,KAAK,GAAG,IAAI,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IACjD,CAAC;SAAM,CAAC;QACJ,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;IAC/E,CAAC;IAGD,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAElD,IAAI,IAAY,CAAA;IAChB,IAAI,KAAK,YAAY,SAAS,EAAE,CAAC;QAC7B,IAAI,GAAG,WAAW,CAAA;IACtB,CAAC;SAAM,CAAC;QACJ,IAAI,GAAG,YAAY,CAAA;IACvB,CAAC;IAED,OAAO,GAAG,CACN,CAAC,KAAa,EAAE,EAAE,CAAC,GAAG,KAAK,QAAQ,SAAS,KAAK,IAAI,EAAE,EACvD,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,CACqB,CAAA;AAC9D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAE,IAAe;IAC5C,OAAO,eAAe,CAAC,IAAI,CAAC,CAAA;AAChC,CAAC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { FindOperator } from 'typeorm';
|
|
2
2
|
import { DateTimeRange } from '../../date-time-range/date-time-range.js';
|
|
3
3
|
import { DateRange } from '../../date-range/date-range.js';
|
|
4
|
+
import { PlainDate } from '#src/plain-date/index.js';
|
|
5
|
+
import { Timestamp } from '#src/timestamp/timestamp.js';
|
|
4
6
|
/**
|
|
5
7
|
* Checks if a range starts after the given range with the `>>` operator.
|
|
6
8
|
*/
|
|
7
|
-
export declare function StartsAfter(
|
|
8
|
-
export declare function StartsAfter(
|
|
9
|
+
export declare function StartsAfter(date: PlainDate): FindOperator<DateRange>;
|
|
10
|
+
export declare function StartsAfter(ts: Timestamp | Date): FindOperator<DateTimeRange>;
|
|
@@ -1,7 +1,28 @@
|
|
|
1
1
|
import { randomUUID } from 'crypto';
|
|
2
2
|
import { Raw } from 'typeorm';
|
|
3
|
-
|
|
3
|
+
import { DateTimeRange } from '../../date-time-range/date-time-range.js';
|
|
4
|
+
import { DateRange } from '../../date-range/date-range.js';
|
|
5
|
+
import { isPlainDate } from '#src/plain-date/is-plain-date.js';
|
|
6
|
+
import { isTimestamp } from '#src/timestamp/is-timestamp.js';
|
|
7
|
+
export function StartsAfter(value) {
|
|
8
|
+
let range;
|
|
9
|
+
if (isPlainDate(value)) {
|
|
10
|
+
range = new DateRange(value, value);
|
|
11
|
+
}
|
|
12
|
+
else if (isTimestamp(value) || value instanceof Date) {
|
|
13
|
+
range = new DateTimeRange(value, value, '[]');
|
|
14
|
+
}
|
|
15
|
+
else {
|
|
16
|
+
throw new Error('invalid argument, expected plain date, timestamp or date');
|
|
17
|
+
}
|
|
4
18
|
const paramName = randomUUID().replaceAll('-', '');
|
|
5
|
-
|
|
19
|
+
let cast;
|
|
20
|
+
if (range instanceof DateRange) {
|
|
21
|
+
cast = 'daterange';
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
cast = 'tstzrange3';
|
|
25
|
+
}
|
|
26
|
+
return Raw((alias) => `${alias} >> :${paramName}::${cast}`, { [paramName]: range.toString() });
|
|
6
27
|
}
|
|
7
28
|
//# sourceMappingURL=starts-after.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"starts-after.js","sourceRoot":"","sources":["../../../lib/common/typeorm/starts-after.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAgB,GAAG,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"starts-after.js","sourceRoot":"","sources":["../../../lib/common/typeorm/starts-after.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAgB,GAAG,EAAE,MAAM,SAAS,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAA;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAA;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAA;AAQ5D,MAAM,UAAU,WAAW,CACzB,KAAmC;IAEnC,IAAI,KAAgC,CAAA;IACpC,IAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QACtB,KAAK,GAAG,IAAI,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IACrC,CAAC;SAAM,IAAI,WAAW,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;QACvD,KAAK,GAAG,IAAI,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC/C,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;IAC7E,CAAC;IAGD,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAElD,IAAI,IAAY,CAAA;IAChB,IAAG,KAAK,YAAY,SAAS,EAAE,CAAC;QAC9B,IAAI,GAAG,WAAW,CAAA;IACpB,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,YAAY,CAAA;IACrB,CAAC;IAED,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE,CAAC,GAAG,KAAK,QAAQ,SAAS,KAAK,IAAI,EAAE,EACvD,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,CACuB,CAAA;AAC5D,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Inclusivity, InclusivityString } from '../common/inclusivity.js';
|
|
2
2
|
import { PlainDate, PlainDateInput } from '../plain-date/plain-date.js';
|
|
3
3
|
import { DatePeriod } from '../common/date-period.enum.js';
|
|
4
|
+
import { Duration } from '@wisemen/quantity';
|
|
4
5
|
/**
|
|
5
6
|
* DateRange only works with inclusive ranges internally, except for infinities
|
|
6
7
|
* When an exclusive date is given, this date is mapped to the next or previous inclusive date
|
|
@@ -37,10 +38,24 @@ export declare class DateRange {
|
|
|
37
38
|
isFinite(): boolean;
|
|
38
39
|
toString(): string;
|
|
39
40
|
valueOf(): string;
|
|
40
|
-
|
|
41
|
-
|
|
41
|
+
/** Returns a new date range instance with the new end date */
|
|
42
|
+
withEndDate(endDate: PlainDateInput): DateRange;
|
|
43
|
+
/** Returns a new date range instance with the new start date */
|
|
44
|
+
withStartDate(startDate: PlainDateInput): DateRange;
|
|
42
45
|
/** Returns true if this range ends before the other range starts */
|
|
43
46
|
isStrictlyBefore(other: DateRange): boolean;
|
|
47
|
+
/**
|
|
48
|
+
* Returns a new date range with both boundaries expanded \
|
|
49
|
+
* - start date = this.startDate.subtractDuration(duration)
|
|
50
|
+
* - end date = this.endDate.addDuration(duration)
|
|
51
|
+
*/
|
|
52
|
+
expand(duration: Duration): DateRange;
|
|
53
|
+
/**
|
|
54
|
+
* Returns a new date range with both boundaries expanded \
|
|
55
|
+
* - start date = this.startDate.subtractDuration(lower)
|
|
56
|
+
* - end date = this.endDate.addDuration(upper)
|
|
57
|
+
*/
|
|
58
|
+
expand(lower: Duration, upper: Duration): DateRange;
|
|
44
59
|
/** Returns true if this range starts after the other range ends */
|
|
45
60
|
isStrictlyAfter(other: DateRange): boolean;
|
|
46
61
|
precedes(other: DateRange): boolean;
|
|
@@ -130,16 +130,21 @@ export class DateRange {
|
|
|
130
130
|
valueOf() {
|
|
131
131
|
return this.toString();
|
|
132
132
|
}
|
|
133
|
-
|
|
133
|
+
/** Returns a new date range instance with the new end date */
|
|
134
|
+
withEndDate(endDate) {
|
|
134
135
|
return new DateRange(this.startDate, endDate);
|
|
135
136
|
}
|
|
136
|
-
|
|
137
|
+
/** Returns a new date range instance with the new start date */
|
|
138
|
+
withStartDate(startDate) {
|
|
137
139
|
return new DateRange(startDate, this.endDate);
|
|
138
140
|
}
|
|
139
141
|
/** Returns true if this range ends before the other range starts */
|
|
140
142
|
isStrictlyBefore(other) {
|
|
141
143
|
return this.endDate.isBefore(other.startDate);
|
|
142
144
|
}
|
|
145
|
+
expand(duration, upper) {
|
|
146
|
+
return new DateRange(this.startDate.subtractDuration(duration), this.endDate.addDuration(upper ?? duration));
|
|
147
|
+
}
|
|
143
148
|
/** Returns true if this range starts after the other range ends */
|
|
144
149
|
isStrictlyAfter(other) {
|
|
145
150
|
return this.startDate.isAfter(other.endDate);
|
|
@@ -163,10 +168,10 @@ export class DateRange {
|
|
|
163
168
|
}
|
|
164
169
|
merge(withOther) {
|
|
165
170
|
if (this.isPrecededBy(withOther)) {
|
|
166
|
-
return this.
|
|
171
|
+
return this.withStartDate(withOther.startDate);
|
|
167
172
|
}
|
|
168
173
|
else if (this.isSucceededBy(withOther)) {
|
|
169
|
-
return this.
|
|
174
|
+
return this.withEndDate(withOther.endDate);
|
|
170
175
|
}
|
|
171
176
|
else {
|
|
172
177
|
throw new Error('cannot merge non adjacent date ranges');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date-range.js","sourceRoot":"","sources":["../../lib/date-range/date-range.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,gBAAgB,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAExG,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAC1D,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"date-range.js","sourceRoot":"","sources":["../../lib/date-range/date-range.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { describe, it } from 'node:test';
|
|
2
2
|
import { expect } from 'expect';
|
|
3
|
+
import { Duration, DurationUnit } from '@wisemen/quantity';
|
|
3
4
|
import { InvalidDateRangeBounds } from '../date-range-errors.js';
|
|
4
5
|
import { DateRange } from '../date-range.js';
|
|
5
6
|
import { Inclusivity } from '../../common/inclusivity.js';
|
|
@@ -646,5 +647,65 @@ describe('DateRange unit tests', () => {
|
|
|
646
647
|
expect(result).toBe(0);
|
|
647
648
|
});
|
|
648
649
|
});
|
|
650
|
+
describe('expand', () => {
|
|
651
|
+
it('expands both boundaries symmetrically by the given duration', () => {
|
|
652
|
+
const range = new DateRange(plainDate('2024-01-10'), plainDate('2024-01-20'));
|
|
653
|
+
const expanded = range.expand(new Duration(3, DurationUnit.DAYS));
|
|
654
|
+
expect(expanded.startDate.toString()).toBe('2024-01-07');
|
|
655
|
+
expect(expanded.endDate.toString()).toBe('2024-01-23');
|
|
656
|
+
});
|
|
657
|
+
it('expanding by zero days returns an equal range', () => {
|
|
658
|
+
const range = new DateRange(plainDate('2024-01-10'), plainDate('2024-01-20'));
|
|
659
|
+
const expanded = range.expand(new Duration(0, DurationUnit.DAYS));
|
|
660
|
+
expect(expanded.isSame(range)).toBe(true);
|
|
661
|
+
});
|
|
662
|
+
it('expanding by one day moves each boundary by exactly one day', () => {
|
|
663
|
+
const range = new DateRange(plainDate('2024-06-01'), plainDate('2024-06-30'));
|
|
664
|
+
const expanded = range.expand(new Duration(1, DurationUnit.DAYS));
|
|
665
|
+
expect(expanded.startDate.toString()).toBe('2024-05-31');
|
|
666
|
+
expect(expanded.endDate.toString()).toBe('2024-07-01');
|
|
667
|
+
});
|
|
668
|
+
it('expanding preserves the original range unchanged', () => {
|
|
669
|
+
const range = new DateRange(plainDate('2024-01-10'), plainDate('2024-01-20'));
|
|
670
|
+
range.expand(new Duration(5, DurationUnit.DAYS));
|
|
671
|
+
expect(range.startDate.toString()).toBe('2024-01-10');
|
|
672
|
+
expect(range.endDate.toString()).toBe('2024-01-20');
|
|
673
|
+
});
|
|
674
|
+
it('expanding a range with a past-infinity start keeps start as past-infinity', () => {
|
|
675
|
+
const range = new DateRange(new PastInfinityDate(), plainDate('2024-01-20'));
|
|
676
|
+
const expanded = range.expand(new Duration(5, DurationUnit.DAYS));
|
|
677
|
+
expect(expanded.startDate.isPastInfinity()).toBe(true);
|
|
678
|
+
expect(expanded.endDate.toString()).toBe('2024-01-25');
|
|
679
|
+
});
|
|
680
|
+
it('expanding a range with a future-infinity end keeps end as future-infinity', () => {
|
|
681
|
+
const range = new DateRange(plainDate('2024-01-10'), new FutureInfinityDate());
|
|
682
|
+
const expanded = range.expand(new Duration(5, DurationUnit.DAYS));
|
|
683
|
+
expect(expanded.startDate.toString()).toBe('2024-01-05');
|
|
684
|
+
expect(expanded.endDate.isFutureInfinity()).toBe(true);
|
|
685
|
+
});
|
|
686
|
+
it('expands boundaries asymmetrically when two durations are given', () => {
|
|
687
|
+
const range = new DateRange(plainDate('2024-01-10'), plainDate('2024-01-20'));
|
|
688
|
+
const expanded = range.expand(new Duration(2, DurationUnit.DAYS), new Duration(5, DurationUnit.DAYS));
|
|
689
|
+
expect(expanded.startDate.toString()).toBe('2024-01-08');
|
|
690
|
+
expect(expanded.endDate.toString()).toBe('2024-01-25');
|
|
691
|
+
});
|
|
692
|
+
it('expanding with two durations of zero returns an equal range', () => {
|
|
693
|
+
const range = new DateRange(plainDate('2024-01-10'), plainDate('2024-01-20'));
|
|
694
|
+
const expanded = range.expand(new Duration(0, DurationUnit.DAYS), new Duration(0, DurationUnit.DAYS));
|
|
695
|
+
expect(expanded.isSame(range)).toBe(true);
|
|
696
|
+
});
|
|
697
|
+
it('can expand only the start by passing zero for the upper duration', () => {
|
|
698
|
+
const range = new DateRange(plainDate('2024-01-10'), plainDate('2024-01-20'));
|
|
699
|
+
const expanded = range.expand(new Duration(3, DurationUnit.DAYS), new Duration(0, DurationUnit.DAYS));
|
|
700
|
+
expect(expanded.startDate.toString()).toBe('2024-01-07');
|
|
701
|
+
expect(expanded.endDate.toString()).toBe('2024-01-20');
|
|
702
|
+
});
|
|
703
|
+
it('can expand only the end by passing zero for the lower duration', () => {
|
|
704
|
+
const range = new DateRange(plainDate('2024-01-10'), plainDate('2024-01-20'));
|
|
705
|
+
const expanded = range.expand(new Duration(0, DurationUnit.DAYS), new Duration(3, DurationUnit.DAYS));
|
|
706
|
+
expect(expanded.startDate.toString()).toBe('2024-01-10');
|
|
707
|
+
expect(expanded.endDate.toString()).toBe('2024-01-23');
|
|
708
|
+
});
|
|
709
|
+
});
|
|
649
710
|
});
|
|
650
711
|
//# sourceMappingURL=date-range.unit.test.js.map
|