asv-hlps 1.4.58 → 1.4.60

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/lib/cjs/queries/hlpQuery.d.ts +8 -7
  2. package/lib/cjs/queries/hlpQuery.js +32 -21
  3. package/lib/esm/queries/hlpQuery.d.ts +8 -7
  4. package/lib/esm/queries/hlpQuery.js +31 -20
  5. package/package.json +1 -1
package/lib/cjs/queries/hlpQuery.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { SelectQueryBuilder } from "typeorm";
2
2
  declare class HlpQuery {
3
- where: <T = any>(qb: SelectQueryBuilder<T>, key: string, prm: any, qOn?: string) => void;
4
- whereBool: <T = any>(qb: SelectQueryBuilder<T>, qKey: string, active: "true" | "false", qOn?: string) => void;
3
+ where: <T = any>(qb: SelectQueryBuilder<T>, column: string, prm: any, qOn?: string) => void;
4
+ whereBool: <T = any>(qb: SelectQueryBuilder<T>, column: string, active: "true" | "false", qOn?: string) => void;
5
5
  whereCat: <T = any>(qb: SelectQueryBuilder<T>, prms: {
6
6
  cat: {
7
7
  id?: number;
@@ -9,15 +9,16 @@ declare class HlpQuery {
9
9
  code?: string;
10
10
  };
11
11
  }) => void;
12
- whereIn: <T = any>(qb: SelectQueryBuilder<T>, key: string, prm: any, qOn?: string) => void;
13
- whereNotIn: <T = any>(qb: SelectQueryBuilder<T>, key: string, prm: any, qOn?: string) => void;
14
- opDate: <T = any>(qb: SelectQueryBuilder<T>, key: string, prm: any) => void;
15
- join: <T = any>(qb: SelectQueryBuilder<T>, key: string, rStr: string, status?: "lj" | "ljs") => void;
12
+ whereIn: <T = any>(qb: SelectQueryBuilder<T>, column: string, prm: any, qOn?: string) => void;
13
+ whereNotIn: <T = any>(qb: SelectQueryBuilder<T>, column: string, prm: any, qOn?: string) => void;
14
+ opDate: <T = any>(qb: SelectQueryBuilder<T>, column: string, prm: any) => void;
15
+ join: <T = any>(qb: SelectQueryBuilder<T>, column: string, rStr: string, status?: "lj" | "ljs") => void;
16
16
  joker: <T = any>(qb: SelectQueryBuilder<T>, joker: {
17
- qKey: string;
17
+ column: string;
18
18
  qProp: string | number;
19
19
  qOn?: any;
20
20
  }) => void;
21
+ search: (qb: any, columns: string[], search: string) => void;
21
22
  }
22
23
  declare const _default: HlpQuery;
23
24
  export default _default;
package/lib/cjs/queries/hlpQuery.js CHANGED
@@ -1,22 +1,23 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- const typeorm_1 = require("../npms/typeorm");
3
+ const typeorm_1 = require("typeorm");
4
+ const typeorm_2 = require("../npms/typeorm");
4
5
  class HlpQuery {
5
6
  constructor() {
6
- this.where = (qb, key, prm, qOn) => {
7
- const qVar = !qOn ? key.substring(key.indexOf(".") + 1) : qOn;
7
+ this.where = (qb, column, prm, qOn) => {
8
+ const qVar = !qOn ? column.substring(column.indexOf(".") + 1) : qOn;
8
9
  if (prm) {
9
- qb.andWhere(`${key} = :${qVar}`, { [qVar]: prm });
10
+ qb.andWhere(`${column} = :${qVar}`, { [qVar]: prm });
10
11
  }
11
12
  };
12
- this.whereBool = (qb, qKey, active, qOn) => {
13
- const qVar = !qOn ? qKey.substring(qKey.indexOf(".") + 1) : qOn;
13
+ this.whereBool = (qb, column, active, qOn) => {
14
+ const qVar = !qOn ? column.substring(column.indexOf(".") + 1) : qOn;
14
15
  if (active) {
15
16
  if (active === "true") {
16
- qb.andWhere(`${qKey} = :${qVar}`, { [qVar]: true });
17
+ qb.andWhere(`${column} = :${qVar}`, { [qVar]: true });
17
18
  }
18
19
  if (active === "false") {
19
- qb.andWhere(`${qKey} = :${qVar}`, { [qVar]: false });
20
+ qb.andWhere(`${column} = :${qVar}`, { [qVar]: false });
20
21
  }
21
22
  }
22
23
  };
@@ -34,37 +35,47 @@ class HlpQuery {
34
35
  }
35
36
  }
36
37
  };
37
- this.whereIn = (qb, key, prm, qOn) => {
38
- const qVar = !qOn ? key.substring(key.indexOf(".") + 1) : qOn;
38
+ this.whereIn = (qb, column, prm, qOn) => {
39
+ const qVar = !qOn ? column.substring(column.indexOf(".") + 1) : qOn;
39
40
  if (prm) {
40
- qb.andWhere(`LOWER(${key}) IN (:...${qVar}) `, { [qVar]: prm });
41
+ qb.andWhere(`LOWER(${column}) IN (:...${qVar}) `, { [qVar]: prm });
41
42
  }
42
43
  };
43
- this.whereNotIn = (qb, key, prm, qOn) => {
44
- const qVar = !qOn ? key.substring(key.indexOf(".") + 1) : qOn;
44
+ this.whereNotIn = (qb, column, prm, qOn) => {
45
+ const qVar = !qOn ? column.substring(column.indexOf(".") + 1) : qOn;
45
46
  if (prm) {
46
- qb.andWhere(`LOWER(${key}) NOT IN (:...${qVar}) `, { [qVar]: prm });
47
+ qb.andWhere(`LOWER(${column}) NOT IN (:...${qVar}) `, { [qVar]: prm });
47
48
  // qb.andWhere("LOWER(role.code) IN (:...roleCodes)", { roleCodes: prms.roleCodes.ins });
48
49
  }
49
50
  };
50
- this.opDate = (qb, key, prm) => {
51
+ this.opDate = (qb, column, prm) => {
51
52
  var _a, _b, _c;
52
53
  if (prm === null || prm === void 0 ? void 0 : prm.opDate) {
53
- (0, typeorm_1.tormDateParams)(qb, `${key}`, (_a = prm === null || prm === void 0 ? void 0 : prm.opDate) === null || _a === void 0 ? void 0 : _a.eDate, (_b = prm === null || prm === void 0 ? void 0 : prm.opDate) === null || _b === void 0 ? void 0 : _b.dates, (_c = prm === null || prm === void 0 ? void 0 : prm.opDate) === null || _c === void 0 ? void 0 : _c.datesBy);
54
+ (0, typeorm_2.tormDateParams)(qb, `${column}`, (_a = prm === null || prm === void 0 ? void 0 : prm.opDate) === null || _a === void 0 ? void 0 : _a.eDate, (_b = prm === null || prm === void 0 ? void 0 : prm.opDate) === null || _b === void 0 ? void 0 : _b.dates, (_c = prm === null || prm === void 0 ? void 0 : prm.opDate) === null || _c === void 0 ? void 0 : _c.datesBy);
54
55
  }
55
56
  };
56
- this.join = (qb, key, rStr, status = "ljs") => {
57
+ this.join = (qb, column, rStr, status = "ljs") => {
57
58
  if (status === "ljs") {
58
- qb.leftJoinAndSelect(`${key}`, `${rStr}`);
59
+ qb.leftJoinAndSelect(`${column}`, `${rStr}`);
59
60
  }
60
61
  else {
61
- qb.leftJoin(`${key}`, `${rStr}`);
62
+ qb.leftJoin(`${column}`, `${rStr}`);
62
63
  }
63
64
  };
64
65
  this.joker = (qb, joker) => {
65
- const qVar = !(joker === null || joker === void 0 ? void 0 : joker.qOn) ? joker.qKey.substring(joker.qKey.indexOf(".") + 1) : joker === null || joker === void 0 ? void 0 : joker.qOn;
66
+ const qVar = !(joker === null || joker === void 0 ? void 0 : joker.qOn) ? joker.column.substring(joker.column.indexOf(".") + 1) : joker === null || joker === void 0 ? void 0 : joker.qOn;
66
67
  if (joker) {
67
- qb.andWhere(`${joker.qKey} = :${qVar}`, { [qVar]: joker["qProp"] });
68
+ qb.andWhere(`${joker.column} = :${qVar}`, { [qVar]: joker["qProp"] });
69
+ }
70
+ };
71
+ this.search = (qb, columns, search) => {
72
+ if (search) {
73
+ qb.andWhere(new typeorm_1.Brackets(qb => {
74
+ for (const column of columns) {
75
+ const columnRef = column.substring(column.indexOf(".") + 1);
76
+ qb.where(`${column} LIKE :${columnRef}`, { [columnRef]: "%" + search + "%" });
77
+ }
78
+ }));
68
79
  }
69
80
  };
70
81
  }
package/lib/esm/queries/hlpQuery.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { SelectQueryBuilder } from "typeorm";
2
2
  declare class HlpQuery {
3
- where: <T = any>(qb: SelectQueryBuilder<T>, key: string, prm: any, qOn?: string) => void;
4
- whereBool: <T = any>(qb: SelectQueryBuilder<T>, qKey: string, active: "true" | "false", qOn?: string) => void;
3
+ where: <T = any>(qb: SelectQueryBuilder<T>, column: string, prm: any, qOn?: string) => void;
4
+ whereBool: <T = any>(qb: SelectQueryBuilder<T>, column: string, active: "true" | "false", qOn?: string) => void;
5
5
  whereCat: <T = any>(qb: SelectQueryBuilder<T>, prms: {
6
6
  cat: {
7
7
  id?: number;
@@ -9,15 +9,16 @@ declare class HlpQuery {
9
9
  code?: string;
10
10
  };
11
11
  }) => void;
12
- whereIn: <T = any>(qb: SelectQueryBuilder<T>, key: string, prm: any, qOn?: string) => void;
13
- whereNotIn: <T = any>(qb: SelectQueryBuilder<T>, key: string, prm: any, qOn?: string) => void;
14
- opDate: <T = any>(qb: SelectQueryBuilder<T>, key: string, prm: any) => void;
15
- join: <T = any>(qb: SelectQueryBuilder<T>, key: string, rStr: string, status?: "lj" | "ljs") => void;
12
+ whereIn: <T = any>(qb: SelectQueryBuilder<T>, column: string, prm: any, qOn?: string) => void;
13
+ whereNotIn: <T = any>(qb: SelectQueryBuilder<T>, column: string, prm: any, qOn?: string) => void;
14
+ opDate: <T = any>(qb: SelectQueryBuilder<T>, column: string, prm: any) => void;
15
+ join: <T = any>(qb: SelectQueryBuilder<T>, column: string, rStr: string, status?: "lj" | "ljs") => void;
16
16
  joker: <T = any>(qb: SelectQueryBuilder<T>, joker: {
17
- qKey: string;
17
+ column: string;
18
18
  qProp: string | number;
19
19
  qOn?: any;
20
20
  }) => void;
21
+ search: (qb: any, columns: string[], search: string) => void;
21
22
  }
22
23
  declare const _default: HlpQuery;
23
24
  export default _default;
package/lib/esm/queries/hlpQuery.js CHANGED
@@ -1,20 +1,21 @@
1
+ import { Brackets } from "typeorm";
1
2
  import { tormDateParams } from "../npms/typeorm";
2
3
  class HlpQuery {
3
4
  constructor() {
4
- this.where = (qb, key, prm, qOn) => {
5
- const qVar = !qOn ? key.substring(key.indexOf(".") + 1) : qOn;
5
+ this.where = (qb, column, prm, qOn) => {
6
+ const qVar = !qOn ? column.substring(column.indexOf(".") + 1) : qOn;
6
7
  if (prm) {
7
- qb.andWhere(`${key} = :${qVar}`, { [qVar]: prm });
8
+ qb.andWhere(`${column} = :${qVar}`, { [qVar]: prm });
8
9
  }
9
10
  };
10
- this.whereBool = (qb, qKey, active, qOn) => {
11
- const qVar = !qOn ? qKey.substring(qKey.indexOf(".") + 1) : qOn;
11
+ this.whereBool = (qb, column, active, qOn) => {
12
+ const qVar = !qOn ? column.substring(column.indexOf(".") + 1) : qOn;
12
13
  if (active) {
13
14
  if (active === "true") {
14
- qb.andWhere(`${qKey} = :${qVar}`, { [qVar]: true });
15
+ qb.andWhere(`${column} = :${qVar}`, { [qVar]: true });
15
16
  }
16
17
  if (active === "false") {
17
- qb.andWhere(`${qKey} = :${qVar}`, { [qVar]: false });
18
+ qb.andWhere(`${column} = :${qVar}`, { [qVar]: false });
18
19
  }
19
20
  }
20
21
  };
@@ -32,37 +33,47 @@ class HlpQuery {
32
33
  }
33
34
  }
34
35
  };
35
- this.whereIn = (qb, key, prm, qOn) => {
36
- const qVar = !qOn ? key.substring(key.indexOf(".") + 1) : qOn;
36
+ this.whereIn = (qb, column, prm, qOn) => {
37
+ const qVar = !qOn ? column.substring(column.indexOf(".") + 1) : qOn;
37
38
  if (prm) {
38
- qb.andWhere(`LOWER(${key}) IN (:...${qVar}) `, { [qVar]: prm });
39
+ qb.andWhere(`LOWER(${column}) IN (:...${qVar}) `, { [qVar]: prm });
39
40
  }
40
41
  };
41
- this.whereNotIn = (qb, key, prm, qOn) => {
42
- const qVar = !qOn ? key.substring(key.indexOf(".") + 1) : qOn;
42
+ this.whereNotIn = (qb, column, prm, qOn) => {
43
+ const qVar = !qOn ? column.substring(column.indexOf(".") + 1) : qOn;
43
44
  if (prm) {
44
- qb.andWhere(`LOWER(${key}) NOT IN (:...${qVar}) `, { [qVar]: prm });
45
+ qb.andWhere(`LOWER(${column}) NOT IN (:...${qVar}) `, { [qVar]: prm });
45
46
  // qb.andWhere("LOWER(role.code) IN (:...roleCodes)", { roleCodes: prms.roleCodes.ins });
46
47
  }
47
48
  };
48
- this.opDate = (qb, key, prm) => {
49
+ this.opDate = (qb, column, prm) => {
49
50
  var _a, _b, _c;
50
51
  if (prm === null || prm === void 0 ? void 0 : prm.opDate) {
51
- tormDateParams(qb, `${key}`, (_a = prm === null || prm === void 0 ? void 0 : prm.opDate) === null || _a === void 0 ? void 0 : _a.eDate, (_b = prm === null || prm === void 0 ? void 0 : prm.opDate) === null || _b === void 0 ? void 0 : _b.dates, (_c = prm === null || prm === void 0 ? void 0 : prm.opDate) === null || _c === void 0 ? void 0 : _c.datesBy);
52
+ tormDateParams(qb, `${column}`, (_a = prm === null || prm === void 0 ? void 0 : prm.opDate) === null || _a === void 0 ? void 0 : _a.eDate, (_b = prm === null || prm === void 0 ? void 0 : prm.opDate) === null || _b === void 0 ? void 0 : _b.dates, (_c = prm === null || prm === void 0 ? void 0 : prm.opDate) === null || _c === void 0 ? void 0 : _c.datesBy);
52
53
  }
53
54
  };
54
- this.join = (qb, key, rStr, status = "ljs") => {
55
+ this.join = (qb, column, rStr, status = "ljs") => {
55
56
  if (status === "ljs") {
56
- qb.leftJoinAndSelect(`${key}`, `${rStr}`);
57
+ qb.leftJoinAndSelect(`${column}`, `${rStr}`);
57
58
  }
58
59
  else {
59
- qb.leftJoin(`${key}`, `${rStr}`);
60
+ qb.leftJoin(`${column}`, `${rStr}`);
60
61
  }
61
62
  };
62
63
  this.joker = (qb, joker) => {
63
- const qVar = !(joker === null || joker === void 0 ? void 0 : joker.qOn) ? joker.qKey.substring(joker.qKey.indexOf(".") + 1) : joker === null || joker === void 0 ? void 0 : joker.qOn;
64
+ const qVar = !(joker === null || joker === void 0 ? void 0 : joker.qOn) ? joker.column.substring(joker.column.indexOf(".") + 1) : joker === null || joker === void 0 ? void 0 : joker.qOn;
64
65
  if (joker) {
65
- qb.andWhere(`${joker.qKey} = :${qVar}`, { [qVar]: joker["qProp"] });
66
+ qb.andWhere(`${joker.column} = :${qVar}`, { [qVar]: joker["qProp"] });
67
+ }
68
+ };
69
+ this.search = (qb, columns, search) => {
70
+ if (search) {
71
+ qb.andWhere(new Brackets(qb => {
72
+ for (const column of columns) {
73
+ const columnRef = column.substring(column.indexOf(".") + 1);
74
+ qb.where(`${column} LIKE :${columnRef}`, { [columnRef]: "%" + search + "%" });
75
+ }
76
+ }));
66
77
  }
67
78
  };
68
79
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "asv-hlps",
3
- "version": "1.4.58",
3
+ "version": "1.4.60",
4
4
  "description": "helpers",
5
5
  "main": "./lib/cjs/index.js",
6
6
  "module": "./lib/esm/index.js",