asv-hlps 1.0.44 → 1.0.45
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/lib/cjs/typeorm.d.ts +3 -1
- package/lib/cjs/typeorm.js +9 -0
- package/lib/esm/typeorm.d.ts +3 -1
- package/lib/esm/typeorm.js +9 -0
- package/package.json +1 -1
package/lib/cjs/typeorm.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
declare type opDatesType = "currentDate" | "currentMonth" | "subCurrentMonth" | "currentYear" | "subCurrentYear" | "after16March";
|
|
1
2
|
/**
|
|
2
3
|
*
|
|
3
4
|
* @param qb typeorm queryselectoer
|
|
@@ -5,4 +6,5 @@
|
|
|
5
6
|
* @param opDates
|
|
6
7
|
* @param dates
|
|
7
8
|
*/
|
|
8
|
-
export declare const tormDateParams: (qb: any, propColumn: string, opDates?:
|
|
9
|
+
export declare const tormDateParams: (qb: any, propColumn: string, opDates?: opDatesType, dates?: any) => void;
|
|
10
|
+
export {};
|
package/lib/cjs/typeorm.js
CHANGED
|
@@ -16,9 +16,18 @@ const tormDateParams = (qb, propColumn, opDates, dates) => {
|
|
|
16
16
|
case "currentMonth":
|
|
17
17
|
qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m') = DATE_FORMAT(CURRENT_DATE(), '%Y-%m') `);
|
|
18
18
|
break;
|
|
19
|
+
case "subCurrentMonth":
|
|
20
|
+
qb.andWhere("DATE_FORMAT(b.createdAt, '%Y-%m') < DATE_FORMAT(CURRENT_DATE(), '%Y-%m') ");
|
|
21
|
+
break;
|
|
19
22
|
case "currentYear":
|
|
20
23
|
qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y') = DATE_FORMAT(CURRENT_DATE(), '%Y') `);
|
|
21
24
|
break;
|
|
25
|
+
case "subCurrentYear":
|
|
26
|
+
qb.andWhere("DATE_FORMAT(b.createdAt, '%Y') < DATE_FORMAT(CURRENT_DATE(), '%Y') ");
|
|
27
|
+
break;
|
|
28
|
+
case "after16March":
|
|
29
|
+
qb.andWhere("DATE_FORMAT(b.createdAt, '%Y-%m-%d') > '2020-03-16'");
|
|
30
|
+
break;
|
|
22
31
|
}
|
|
23
32
|
if (dates) {
|
|
24
33
|
qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m-%d') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
|
package/lib/esm/typeorm.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
declare type opDatesType = "currentDate" | "currentMonth" | "subCurrentMonth" | "currentYear" | "subCurrentYear" | "after16March";
|
|
1
2
|
/**
|
|
2
3
|
*
|
|
3
4
|
* @param qb typeorm queryselectoer
|
|
@@ -5,4 +6,5 @@
|
|
|
5
6
|
* @param opDates
|
|
6
7
|
* @param dates
|
|
7
8
|
*/
|
|
8
|
-
export declare const tormDateParams: (qb: any, propColumn: string, opDates?:
|
|
9
|
+
export declare const tormDateParams: (qb: any, propColumn: string, opDates?: opDatesType, dates?: any) => void;
|
|
10
|
+
export {};
|
package/lib/esm/typeorm.js
CHANGED
|
@@ -13,9 +13,18 @@ export const tormDateParams = (qb, propColumn, opDates, dates) => {
|
|
|
13
13
|
case "currentMonth":
|
|
14
14
|
qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m') = DATE_FORMAT(CURRENT_DATE(), '%Y-%m') `);
|
|
15
15
|
break;
|
|
16
|
+
case "subCurrentMonth":
|
|
17
|
+
qb.andWhere("DATE_FORMAT(b.createdAt, '%Y-%m') < DATE_FORMAT(CURRENT_DATE(), '%Y-%m') ");
|
|
18
|
+
break;
|
|
16
19
|
case "currentYear":
|
|
17
20
|
qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y') = DATE_FORMAT(CURRENT_DATE(), '%Y') `);
|
|
18
21
|
break;
|
|
22
|
+
case "subCurrentYear":
|
|
23
|
+
qb.andWhere("DATE_FORMAT(b.createdAt, '%Y') < DATE_FORMAT(CURRENT_DATE(), '%Y') ");
|
|
24
|
+
break;
|
|
25
|
+
case "after16March":
|
|
26
|
+
qb.andWhere("DATE_FORMAT(b.createdAt, '%Y-%m-%d') > '2020-03-16'");
|
|
27
|
+
break;
|
|
19
28
|
}
|
|
20
29
|
if (dates) {
|
|
21
30
|
qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m-%d') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
|