asv-hlps 1.4.55 → 1.4.57

package/lib/cjs/bills/models/BillPayment.d.ts

@@ -12,6 +12,7 @@ export default interface BillPayment {
     restAmount?: number;
     bill?: Bill;
     method?: BillPaymentMethod;
+    mode?: BillPaymentMethod;
     checkNumber?: string;
     checkDate?: string;
     bank?: Bank;

package/lib/cjs/queries/QueryPrms.d.ts

@@ -1,23 +1,13 @@
 import { SelectQueryBuilder } from "typeorm";
 import OpDate from "../shared/models/OpDate";
-import { IQueryPrms } from "./IQueryPrms";
-declare class QueryPrms {
-    query: <T = any>(qb: SelectQueryBuilder<T>, qStr: string, prms: IQueryPrms<T>, opts?: {
-        qDate?: any;
-        qMbrId?: string;
-        qProductId?: string;
-        qSaleId?: string;
-    }) => void;
-    opDate: <T = any>(qb: SelectQueryBuilder<T>, qStr: string, opDate: OpDate, qDate?: string) => void;
-    storeName: <T = any>(qb: SelectQueryBuilder<T>, qStr: string, storeName: string) => void;
-    cat: <T = any>(qb: SelectQueryBuilder<T>, prms: {
-        cat: {
-            id?: number;
-            name?: string;
-            code?: string;
-        };
-    }) => void;
-    active: <T = any>(qb: SelectQueryBuilder<T>, qStr: string, active: "true" | "false") => void;
+export interface QueryPrms<T> {
+    id?: number;
+    sqb?: SelectQueryBuilder<T>;
+    opDate?: OpDate;
+    search?: string;
+    joker?: {
+        qId: string;
+        qProp: string | number | boolean;
+    };
+    only?: boolean;
 }
-declare const _default: QueryPrms;
-export default _default;

package/lib/cjs/queries/QueryPrms.js

@@ -1,59 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const typeorm_1 = require("typeorm");
-const typeorm_2 = require("../npms/typeorm");
-class QueryPrms {
-    constructor() {
-        this.query = (qb, qStr, prms, opts) => {
-            var _a, _b, _c;
-            if (prms === null || prms === void 0 ? void 0 : prms.opDate) {
-                (0, typeorm_2.tormDateParams)(qb, `${(opts === null || opts === void 0 ? void 0 : opts.qDate) || qStr + ".createdAt"}`, (_a = prms === null || prms === void 0 ? void 0 : prms.opDate) === null || _a === void 0 ? void 0 : _a.eDate, (_b = prms === null || prms === void 0 ? void 0 : prms.opDate) === null || _b === void 0 ? void 0 : _b.dates, (_c = prms === null || prms === void 0 ? void 0 : prms.opDate) === null || _c === void 0 ? void 0 : _c.datesBy);
-            }
-            if (prms === null || prms === void 0 ? void 0 : prms.joker) {
-                qb.andWhere(`${prms.joker.qId} = :joker`, { joker: prms.joker["qProp"] });
-            }
-            if (prms === null || prms === void 0 ? void 0 : prms.search) {
-                asyncSearch(qb, prms.search);
-            }
-        };
-        this.opDate = (qb, qStr, opDate, qDate) => {
-            if (opDate) {
-                (0, typeorm_2.tormDateParams)(qb, `${qDate || qStr + ".createdAt"}`, opDate === null || opDate === void 0 ? void 0 : opDate.eDate, opDate === null || opDate === void 0 ? void 0 : opDate.dates, opDate === null || opDate === void 0 ? void 0 : opDate.datesBy);
-            }
-        };
-        this.storeName = (qb, qStr, storeName) => {
-            qb.andWhere(`${qStr}.store = :store`, { store: storeName });
-        };
-        this.cat = (qb, prms) => {
-            var _a, _b, _c;
-            if (prms === null || prms === void 0 ? void 0 : prms.cat) {
-                if ((_a = prms === null || prms === void 0 ? void 0 : prms.cat) === null || _a === void 0 ? void 0 : _a.code) {
-                    qb.andWhere("cat.code = :code", { code: prms.cat.code });
-                }
-                if ((_b = prms === null || prms === void 0 ? void 0 : prms.cat) === null || _b === void 0 ? void 0 : _b.id) {
-                    qb.andWhere("cat.id = :id", { id: prms.cat.id });
-                }
-                if ((_c = prms === null || prms === void 0 ? void 0 : prms.cat) === null || _c === void 0 ? void 0 : _c.name) {
-                    qb.andWhere("cat.name = :name", { id: prms.cat.name });
-                }
-            }
-        };
-        this.active = (qb, qStr, active) => {
-            if (active) {
-                if (active === "true") {
-                    qb.andWhere(`${qStr}.isActive = :isActive`, { isActive: true });
-                }
-                if (active === "false") {
-                    qb.andWhere(`${qStr}.isActive = :isActive`, { isActive: false });
-                }
-            }
-        };
-    }
-}
-const asyncSearch = (qb, search) => {
-    qb.andWhere(new typeorm_1.Brackets((qb) => {
-        qb.where("s.ref LIKE :ref", { ref: "%" + search + "%" });
-        qb.orWhere("e.ref LIKE :entryRef", { entryRef: "%" + search + "%" });
-    }));
-};
-exports.default = new QueryPrms();

package/lib/cjs/queries/hlpQuery.d.ts

@@ -1,13 +1,22 @@
 import { SelectQueryBuilder } from "typeorm";
 declare class HlpQuery {
     where: <T = any>(qb: SelectQueryBuilder<T>, key: string, prm: any, qOn?: string) => void;
+    whereBool: <T = any>(qb: SelectQueryBuilder<T>, qKey: string, active: "true" | "false", qOn?: string) => void;
+    whereCat: <T = any>(qb: SelectQueryBuilder<T>, prms: {
+        cat: {
+            id?: number;
+            name?: string;
+            code?: string;
+        };
+    }) => void;
     whereIn: <T = any>(qb: SelectQueryBuilder<T>, key: string, prm: any, qOn?: string) => void;
     whereNotIn: <T = any>(qb: SelectQueryBuilder<T>, key: string, prm: any, qOn?: string) => void;
     opDate: <T = any>(qb: SelectQueryBuilder<T>, key: string, prm: any) => void;
     join: <T = any>(qb: SelectQueryBuilder<T>, key: string, rStr: string, status?: "lj" | "ljs") => void;
     joker: <T = any>(qb: SelectQueryBuilder<T>, joker: {
-        qId: string;
+        qKey: string;
         qProp: string | number;
+        qOn?: any;
     }) => void;
 }
 declare const _default: HlpQuery;

package/lib/cjs/queries/hlpQuery.js

@@ -9,6 +9,31 @@ class HlpQuery {
                 qb.andWhere(`${key} = :${qVar}`, { [qVar]: prm });
             }
         };
+        this.whereBool = (qb, qKey, active, qOn) => {
+            const qVar = !qOn ? qKey.substring(qKey.indexOf(".") + 1) : qOn;
+            if (active) {
+                if (active === "true") {
+                    qb.andWhere(`${qKey} = :${qVar}`, { [qVar]: true });
+                }
+                if (active === "false") {
+                    qb.andWhere(`${qKey} = :${qVar}`, { [qVar]: false });
+                }
+            }
+        };
+        this.whereCat = (qb, prms) => {
+            var _a, _b, _c;
+            if (prms === null || prms === void 0 ? void 0 : prms.cat) {
+                if ((_a = prms === null || prms === void 0 ? void 0 : prms.cat) === null || _a === void 0 ? void 0 : _a.code) {
+                    qb.andWhere("cat.code = :code", { code: prms.cat.code });
+                }
+                if ((_b = prms === null || prms === void 0 ? void 0 : prms.cat) === null || _b === void 0 ? void 0 : _b.id) {
+                    qb.andWhere("cat.id = :id", { id: prms.cat.id });
+                }
+                if ((_c = prms === null || prms === void 0 ? void 0 : prms.cat) === null || _c === void 0 ? void 0 : _c.name) {
+                    qb.andWhere("cat.name = :name", { id: prms.cat.name });
+                }
+            }
+        };
         this.whereIn = (qb, key, prm, qOn) => {
             const qVar = !qOn ? key.substring(key.indexOf(".") + 1) : qOn;
             if (prm) {
@@ -37,8 +62,9 @@ class HlpQuery {
             }
         };
         this.joker = (qb, joker) => {
+            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;
             if (joker) {
-                qb.andWhere(`${joker.qId} = :joker`, { joker: joker["qProp"] });
+                qb.andWhere(`${joker.qKey} = :${qVar}`, { [qVar]: joker["qProp"] });
             }
         };
     }

package/lib/cjs/queries/index.d.ts

@@ -1,3 +1,2 @@
-import QueryPrms from "./QueryPrms";
-export * from "./IQueryPrms";
+import { QueryPrms } from "./QueryPrms";
 export { QueryPrms };

package/lib/cjs/queries/index.js

@@ -1,23 +1,2 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryPrms = void 0;
-const QueryPrms_1 = __importDefault(require("./QueryPrms"));
-exports.QueryPrms = QueryPrms_1.default;
-__exportStar(require("./IQueryPrms"), exports);

package/lib/cjs/utils.js

@@ -276,7 +276,7 @@ const removeBackSlashOccurences = (text, toChar) => {
 };
 exports.removeBackSlashOccurences = removeBackSlashOccurences;
 const removeAMPM = (ref) => {
-    return ref.indexOf(" ") ? ref.substring(0, ref.indexOf(" ")).trim() : ref;
+    return (ref === null || ref === void 0 ? void 0 : ref.indexOf(" ")) ? ref.substring(0, ref.indexOf(" ")).trim() : ref;
 };
 exports.removeAMPM = removeAMPM;
 const refGenerator = (char = "c", regex = /\/+/gi, toChar = "") => {

package/lib/esm/bills/models/BillPayment.d.ts

@@ -12,6 +12,7 @@ export default interface BillPayment {
     restAmount?: number;
     bill?: Bill;
     method?: BillPaymentMethod;
+    mode?: BillPaymentMethod;
     checkNumber?: string;
     checkDate?: string;
     bank?: Bank;

package/lib/esm/queries/QueryPrms.d.ts

@@ -1,23 +1,13 @@
 import { SelectQueryBuilder } from "typeorm";
 import OpDate from "../shared/models/OpDate";
-import { IQueryPrms } from "./IQueryPrms";
-declare class QueryPrms {
-    query: <T = any>(qb: SelectQueryBuilder<T>, qStr: string, prms: IQueryPrms<T>, opts?: {
-        qDate?: any;
-        qMbrId?: string;
-        qProductId?: string;
-        qSaleId?: string;
-    }) => void;
-    opDate: <T = any>(qb: SelectQueryBuilder<T>, qStr: string, opDate: OpDate, qDate?: string) => void;
-    storeName: <T = any>(qb: SelectQueryBuilder<T>, qStr: string, storeName: string) => void;
-    cat: <T = any>(qb: SelectQueryBuilder<T>, prms: {
-        cat: {
-            id?: number;
-            name?: string;
-            code?: string;
-        };
-    }) => void;
-    active: <T = any>(qb: SelectQueryBuilder<T>, qStr: string, active: "true" | "false") => void;
+export interface QueryPrms<T> {
+    id?: number;
+    sqb?: SelectQueryBuilder<T>;
+    opDate?: OpDate;
+    search?: string;
+    joker?: {
+        qId: string;
+        qProp: string | number | boolean;
+    };
+    only?: boolean;
 }
-declare const _default: QueryPrms;
-export default _default;

package/lib/esm/queries/QueryPrms.js

@@ -1,57 +1 @@
-import { Brackets } from "typeorm";
-import { tormDateParams } from "../npms/typeorm";
-class QueryPrms {
-    constructor() {
-        this.query = (qb, qStr, prms, opts) => {
-            var _a, _b, _c;
-            if (prms === null || prms === void 0 ? void 0 : prms.opDate) {
-                tormDateParams(qb, `${(opts === null || opts === void 0 ? void 0 : opts.qDate) || qStr + ".createdAt"}`, (_a = prms === null || prms === void 0 ? void 0 : prms.opDate) === null || _a === void 0 ? void 0 : _a.eDate, (_b = prms === null || prms === void 0 ? void 0 : prms.opDate) === null || _b === void 0 ? void 0 : _b.dates, (_c = prms === null || prms === void 0 ? void 0 : prms.opDate) === null || _c === void 0 ? void 0 : _c.datesBy);
-            }
-            if (prms === null || prms === void 0 ? void 0 : prms.joker) {
-                qb.andWhere(`${prms.joker.qId} = :joker`, { joker: prms.joker["qProp"] });
-            }
-            if (prms === null || prms === void 0 ? void 0 : prms.search) {
-                asyncSearch(qb, prms.search);
-            }
-        };
-        this.opDate = (qb, qStr, opDate, qDate) => {
-            if (opDate) {
-                tormDateParams(qb, `${qDate || qStr + ".createdAt"}`, opDate === null || opDate === void 0 ? void 0 : opDate.eDate, opDate === null || opDate === void 0 ? void 0 : opDate.dates, opDate === null || opDate === void 0 ? void 0 : opDate.datesBy);
-            }
-        };
-        this.storeName = (qb, qStr, storeName) => {
-            qb.andWhere(`${qStr}.store = :store`, { store: storeName });
-        };
-        this.cat = (qb, prms) => {
-            var _a, _b, _c;
-            if (prms === null || prms === void 0 ? void 0 : prms.cat) {
-                if ((_a = prms === null || prms === void 0 ? void 0 : prms.cat) === null || _a === void 0 ? void 0 : _a.code) {
-                    qb.andWhere("cat.code = :code", { code: prms.cat.code });
-                }
-                if ((_b = prms === null || prms === void 0 ? void 0 : prms.cat) === null || _b === void 0 ? void 0 : _b.id) {
-                    qb.andWhere("cat.id = :id", { id: prms.cat.id });
-                }
-                if ((_c = prms === null || prms === void 0 ? void 0 : prms.cat) === null || _c === void 0 ? void 0 : _c.name) {
-                    qb.andWhere("cat.name = :name", { id: prms.cat.name });
-                }
-            }
-        };
-        this.active = (qb, qStr, active) => {
-            if (active) {
-                if (active === "true") {
-                    qb.andWhere(`${qStr}.isActive = :isActive`, { isActive: true });
-                }
-                if (active === "false") {
-                    qb.andWhere(`${qStr}.isActive = :isActive`, { isActive: false });
-                }
-            }
-        };
-    }
-}
-const asyncSearch = (qb, search) => {
-    qb.andWhere(new Brackets((qb) => {
-        qb.where("s.ref LIKE :ref", { ref: "%" + search + "%" });
-        qb.orWhere("e.ref LIKE :entryRef", { entryRef: "%" + search + "%" });
-    }));
-};
-export default new QueryPrms();
+export {};

package/lib/esm/queries/hlpQuery.d.ts

@@ -1,13 +1,22 @@
 import { SelectQueryBuilder } from "typeorm";
 declare class HlpQuery {
     where: <T = any>(qb: SelectQueryBuilder<T>, key: string, prm: any, qOn?: string) => void;
+    whereBool: <T = any>(qb: SelectQueryBuilder<T>, qKey: string, active: "true" | "false", qOn?: string) => void;
+    whereCat: <T = any>(qb: SelectQueryBuilder<T>, prms: {
+        cat: {
+            id?: number;
+            name?: string;
+            code?: string;
+        };
+    }) => void;
     whereIn: <T = any>(qb: SelectQueryBuilder<T>, key: string, prm: any, qOn?: string) => void;
     whereNotIn: <T = any>(qb: SelectQueryBuilder<T>, key: string, prm: any, qOn?: string) => void;
     opDate: <T = any>(qb: SelectQueryBuilder<T>, key: string, prm: any) => void;
     join: <T = any>(qb: SelectQueryBuilder<T>, key: string, rStr: string, status?: "lj" | "ljs") => void;
     joker: <T = any>(qb: SelectQueryBuilder<T>, joker: {
-        qId: string;
+        qKey: string;
         qProp: string | number;
+        qOn?: any;
     }) => void;
 }
 declare const _default: HlpQuery;

package/lib/esm/queries/hlpQuery.js

@@ -7,6 +7,31 @@ class HlpQuery {
                 qb.andWhere(`${key} = :${qVar}`, { [qVar]: prm });
             }
         };
+        this.whereBool = (qb, qKey, active, qOn) => {
+            const qVar = !qOn ? qKey.substring(qKey.indexOf(".") + 1) : qOn;
+            if (active) {
+                if (active === "true") {
+                    qb.andWhere(`${qKey} = :${qVar}`, { [qVar]: true });
+                }
+                if (active === "false") {
+                    qb.andWhere(`${qKey} = :${qVar}`, { [qVar]: false });
+                }
+            }
+        };
+        this.whereCat = (qb, prms) => {
+            var _a, _b, _c;
+            if (prms === null || prms === void 0 ? void 0 : prms.cat) {
+                if ((_a = prms === null || prms === void 0 ? void 0 : prms.cat) === null || _a === void 0 ? void 0 : _a.code) {
+                    qb.andWhere("cat.code = :code", { code: prms.cat.code });
+                }
+                if ((_b = prms === null || prms === void 0 ? void 0 : prms.cat) === null || _b === void 0 ? void 0 : _b.id) {
+                    qb.andWhere("cat.id = :id", { id: prms.cat.id });
+                }
+                if ((_c = prms === null || prms === void 0 ? void 0 : prms.cat) === null || _c === void 0 ? void 0 : _c.name) {
+                    qb.andWhere("cat.name = :name", { id: prms.cat.name });
+                }
+            }
+        };
         this.whereIn = (qb, key, prm, qOn) => {
             const qVar = !qOn ? key.substring(key.indexOf(".") + 1) : qOn;
             if (prm) {
@@ -35,8 +60,9 @@ class HlpQuery {
             }
         };
         this.joker = (qb, joker) => {
+            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;
             if (joker) {
-                qb.andWhere(`${joker.qId} = :joker`, { joker: joker["qProp"] });
+                qb.andWhere(`${joker.qKey} = :${qVar}`, { [qVar]: joker["qProp"] });
             }
         };
     }

package/lib/esm/queries/index.d.ts

@@ -1,3 +1,2 @@
-import QueryPrms from "./QueryPrms";
-export * from "./IQueryPrms";
+import { QueryPrms } from "./QueryPrms";
 export { QueryPrms };

package/lib/esm/queries/index.js

@@ -1,3 +1 @@
-import QueryPrms from "./QueryPrms";
-export * from "./IQueryPrms";
-export { QueryPrms };
+export {};

package/lib/esm/utils.js

@@ -239,7 +239,7 @@ export const removeBackSlashOccurences = (text, toChar) => {
     return String(text).toLowerCase().replace(regex, toChar) || text;
 };
 export const removeAMPM = (ref) => {
-    return ref.indexOf(" ") ? ref.substring(0, ref.indexOf(" ")).trim() : ref;
+    return (ref === null || ref === void 0 ? void 0 : ref.indexOf(" ")) ? ref.substring(0, ref.indexOf(" ")).trim() : ref;
 };
 export const refGenerator = (char = "c", regex = /\/+/gi, toChar = "") => {
     let date = new Date();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asv-hlps",
-  "version": "1.4.55",
+  "version": "1.4.57",
   "description": "helpers",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",