tspace-mysql 1.9.0-beta.4 → 1.9.0-beta.6

package/dist/lib/core/Abstracts/AbstractDB.d.ts

@@ -1,9 +1,12 @@
 import Builder from '../Builder';
-import type { TPoolConnected, TConnectionOptions, TConnectionTransaction } from '../../types';
+import type { TPoolConnected, TConnectionOptions, TConnectionTransaction, TConnection, TPoolEvent } from '../../types';
 declare abstract class AbstractDB extends Builder {
     abstract beginTransaction(): Promise<TConnectionTransaction>;
+    abstract transaction<T>(handler: (conn: TConnection) => Promise<T>): Promise<T>;
     abstract generateUUID(): string;
     abstract raw(sql: string): string;
+    abstract query(sql: string, parameters: Record<string, any>): Promise<any>;
+    abstract event(event: TPoolEvent, callback: (data: any) => any): Promise<void>;
     abstract escape(sql: string): string;
     abstract escapeXSS(sql: string): string;
     abstract snakeCase(sql: string): string;

package/dist/lib/core/Abstracts/AbstractDB.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractDB.js","sourceRoot":"","sources":["../../../../src/lib/core/Abstracts/AbstractDB.ts"],"names":[],"mappings":";;;;;;AAAA,yDAAmC;AAOnC,MAAe,UAAW,SAAQ,iBAAO;CAcxC;AAEQ,gCAAU;AACnB,kBAAe,UAAU,CAAA"}
+{"version":3,"file":"AbstractDB.js","sourceRoot":"","sources":["../../../../src/lib/core/Abstracts/AbstractDB.ts"],"names":[],"mappings":";;;;;;AAAA,yDAAmC;AASnC,MAAe,UAAW,SAAQ,iBAAO;CAiBxC;AAEQ,gCAAU;AACnB,kBAAe,UAAU,CAAA"}

package/dist/lib/core/Builder.d.ts

@@ -3,7 +3,7 @@ import { DB } from "./DB";
 import { Join } from "./Join";
 import { CONSTANTS } from "../constants";
 import { QueryBuilder } from "./Driver";
-import { TPagination, TConnectionOptions, TPoolConnected, TConnectionTransaction } from "../types";
+import { TPagination, TConnectionOptions, TPoolConnected, TConnectionTransaction, TDriver } from "../types";
 declare class Builder extends AbstractBuilder {
     constructor();
     /**
@@ -14,9 +14,9 @@ declare class Builder extends AbstractBuilder {
     static get instance(): Builder;
     /**
      * The 'driver' method is used to get current driver
-     * @returns {string} driver
+     * @returns {TDriver} driver
      */
-    driver(): string;
+    driver(): TDriver;
     /**
      * The 'database' method is used to get current database
      * @returns {string} database

package/dist/lib/core/Builder.js

@@ -24,7 +24,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     }
     /**
      * The 'driver' method is used to get current driver
-     * @returns {string} driver
+     * @returns {TDriver} driver
      */
     driver() {
         return this.$driver;
@@ -459,8 +459,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             return this.whereObject(column);
         }
         [value, operator] = this.$utils.valueAndOperator(value, operator, arguments.length === 2);
-        value = this.$utils.escape(value);
-        value = this.$utils.transfromBooleanToNumber(value);
         if (value === null) {
             return this.whereNull(column);
         }
@@ -472,7 +470,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             {
                 column: this.bindColumn(String(column)),
                 operator: operator,
-                value: this.$utils.transfromValueHasRaw(value),
+                value: this.$utils.formatQueryValue(value),
             }
         ]);
         return this;
@@ -490,29 +488,18 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      */
     orWhere(column, operator, value) {
         [value, operator] = this.$utils.valueAndOperator(value, operator, arguments.length === 2);
-        value = this.$utils.escape(value);
-        value = this.$utils.transfromBooleanToNumber(value);
         if (value === null) {
             return this.orWhereNull(column);
         }
         if (Array.isArray(value)) {
             return this.orWhereIn(column, value);
         }
-        // this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("OR")}` : "",
-        //     `${this.bindColumn(String(column))}`,
-        //     `${operator}`,
-        //     `${this.$utils.transfromValueHasRaw(value)}`,
-        //   ].join(" "),
-        // ]);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
                 column: this.bindColumn(String(column)),
                 operator: operator,
-                value: this.$utils.transfromValueHasRaw(value),
+                value: this.$utils.formatQueryValue(value),
                 condition: 'OR'
             }
         ]);
@@ -546,21 +533,12 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @returns {this}
      */
     whereMonth(column, month) {
-        // this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("AND")}` : "",
-        //     `MONTH(${this.bindColumn(String(column))})`,
-        //     `=`,
-        //     `'${`00${this.$utils.escape(month)}`.slice(-2)}'`,
-        //   ].join(" "),
-        // ]);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
                 column: `MONTH(${this.bindColumn(String(column))})`,
                 operator: '=',
-                value: `'${`00${this.$utils.escape(month)}`.slice(-2)}'`,
+                value: `'${`00${this.$utils.formatQueryValue(month)}`.slice(-2)}'`,
             }
         ]);
         return this;
@@ -574,21 +552,12 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @returns {this}
      */
     whereYear(column, year) {
-        // this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("AND")}` : "",
-        //     `YEAR(${this.bindColumn(String(column))})`,
-        //     `=`,
-        //     `'${`0000${this.$utils.escape(year)}`.slice(-4)}'`,
-        //   ].join(" "),
-        // ]);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
                 column: `YEAR(${this.bindColumn(String(column))})`,
                 operator: '=',
-                value: `'${`0000${this.$utils.escape(year)}`.slice(-2)}'`,
+                value: `'${`0000${this.$utils.formatQueryValue(year)}`.slice(-2)}'`,
             }
         ]);
         return this;
@@ -710,23 +679,12 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @returns   {this}
      */
     whereJSON(column, { key, value, operator }) {
-        value = this.$utils.escape(value);
-        value = this.$utils.transfromBooleanToNumber(value);
-        // this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("AND")}` : "",
-        //     `${this.bindColumn(column)}->>'$.${key}'`,
-        //     `${operator == null ? "=" : operator.toLocaleUpperCase()}`,
-        //     `${this.$utils.transfromValueHasRaw(value)}`,
-        //   ].join(" "),
-        // ]);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
                 column: `${this.bindColumn(String(column))}->>'$.${key}'`,
                 operator: `${operator == null ? "=" : operator.toLocaleUpperCase()}`,
-                value: `${this.$utils.transfromValueHasRaw(value)}`
+                value: `${this.$utils.formatQueryValue(value)}`
             }
         ]);
         return this;
@@ -754,14 +712,15 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @returns {this}
      */
     whereExists(sql) {
-        // this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("AND")}` : "",
-        //     `${this.$constants("EXISTS")}`,
-        //     `(${sql})`,
-        //   ].join(" "),
-        // ]);
+        if (sql instanceof Builder && !sql.$state.get("SELECT").length) {
+            sql.select1();
+        }
+        this.$state.set("WHERE", [
+            ...this.$state.get("WHERE"),
+            {
+                value: `${this.$constants("EXISTS")} (${sql})`
+            }
+        ]);
         return this;
     }
     /**
@@ -878,11 +837,9 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     whereIn(column, array) {
         if (!Array.isArray(array))
             array = [array];
-        const values = array.length
-            ? `${array
-                .map((value) => this.$utils.transfromValueHasRaw(this.$utils.escape(value)))
-                .join(",")}`
-            : this.$constants(this.$constants("NULL"));
+        if (!array.length) {
+            array = [DB_1.DB.raw(this.$constants("NULL"))];
+        }
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
@@ -890,7 +847,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 operator: `${this.$constants("IN")}`,
                 value: array
                     .map((value) => {
-                    return this.$utils.transfromValueHasRaw(this.$utils.escape(value));
+                    return this.$utils.formatQueryValue(value);
                 })
             }
         ]);
@@ -907,11 +864,9 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     orWhereIn(column, array) {
         if (!Array.isArray(array))
             array = [array];
-        const values = array.length
-            ? `${array
-                .map((value) => this.$utils.transfromValueHasRaw(this.$utils.escape(value)))
-                .join(",")}`
-            : this.$constants(this.$constants("NULL"));
+        if (!array.length) {
+            array = [DB_1.DB.raw(this.$constants("NULL"))];
+        }
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
@@ -920,7 +875,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 condition: 'OR',
                 value: array
                     .map((value) => {
-                    return this.$utils.transfromValueHasRaw(this.$utils.escape(value));
+                    return this.$utils.formatQueryValue(value);
                 })
             }
         ]);
@@ -937,20 +892,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     whereNotIn(column, array) {
         if (!Array.isArray(array))
             array = [array];
-        const values = array.length
-            ? `${array
-                .map((value) => this.$utils.transfromValueHasRaw(this.$utils.escape(value)))
-                .join(",")}`
-            : this.$constants(this.$constants("NULL"));
-        //   this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("AND")}` : "",
-        //     `${this.bindColumn(column)}`,
-        //     `${this.$constants("NOT_IN")}`,
-        //     `(${values})`,
-        //   ].join(" "),
-        // ]);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
@@ -958,7 +899,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 operator: `${this.$constants("NOT_IN")}`,
                 value: array
                     .map((value) => {
-                    return this.$utils.transfromValueHasRaw(this.$utils.escape(value));
+                    return this.$utils.formatQueryValue(value);
                 })
             }
         ]);
@@ -975,20 +916,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     orWhereNotIn(column, array) {
         if (!Array.isArray(array))
             array = [array];
-        const values = array.length
-            ? `${array
-                .map((value) => this.$utils.transfromValueHasRaw(this.$utils.escape(value)))
-                .join(",")}`
-            : this.$constants(this.$constants("NULL"));
-        // this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("OR")}` : "",
-        //     `${this.bindColumn(column)}`,
-        //     `${this.$constants("NOT_IN")}`,
-        //     `(${values})`,
-        //   ].join(" "),
-        // ]);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
@@ -997,7 +924,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 condition: 'OR',
                 value: array
                     .map((value) => {
-                    return this.$utils.transfromValueHasRaw(this.$utils.escape(value));
+                    return this.$utils.formatQueryValue(value);
                 })
             }
         ]);
@@ -1017,15 +944,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         if (subQuery instanceof Builder && !subQuery.$state.get("SELECT").length) {
             subQuery.select("id");
         }
-        // this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("AND")}` : "",
-        //     `${this.bindColumn(column)}`,
-        //     options.operator,
-        //     `(${subQuery})`,
-        //   ].join(" "),
-        // ]);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
@@ -1050,16 +968,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         if (subQuery instanceof Builder && !subQuery.$state.get("SELECT").length) {
             subQuery.select("id");
         }
-        // this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("AND")}` : "",
-        //     `${this.bindColumn(column)}`,
-        //     options.operator,
-        //     ,
-        //     `(${subQuery})`,
-        //   ].join(" "),
-        // ]);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
@@ -1084,15 +992,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         if (subQuery instanceof Builder && !subQuery.$state.get("SELECT").length) {
             subQuery.select("id");
         }
-        // this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("OR")}` : "",
-        //     `${this.bindColumn(column)}`,
-        //     options.operator,
-        //     `(${subQuery})`,
-        //   ].join(" "),
-        // ]);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
@@ -1118,15 +1017,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         if (subQuery instanceof Builder && !subQuery.$state.get("SELECT").length) {
             subQuery.select("id");
         }
-        // this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("OR")}` : "",
-        //     `${this.bindColumn(column)}`,
-        //     options.operator,
-        //     `(${subQuery})`,
-        //   ].join(" "),
-        // ]);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
@@ -1148,29 +1038,18 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      */
     whereBetween(column, array) {
         if (!array.length) {
-            return this.whereBetween(column, ['NULL', 'NULL']);
+            return this.whereBetween(column, [DB_1.DB.raw('NULL'), DB_1.DB.raw('NULL')]);
         }
         const [value1, value2] = array;
-        // this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("AND")}` : "",
-        //     `${this.bindColumn(column)}`,
-        //     `${this.$constants("BETWEEN")}`,
-        //     `${this.$utils.transfromValueHasRaw(this.$utils.escape(value1))}`,
-        //     `${this.$constants("AND")}`,
-        //     `${this.$utils.transfromValueHasRaw(this.$utils.escape(value2))}`,
-        //   ].join(" "),
-        // ]);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
                 column: this.bindColumn(String(column)),
                 operator: `${this.$constants("BETWEEN")}`,
                 value: [
-                    `${this.$utils.transfromValueHasRaw(this.$utils.escape(value1))}`,
+                    `${this.$utils.formatQueryValue(value1)}`,
                     `${this.$constants("AND")}`,
-                    `${this.$utils.transfromValueHasRaw(this.$utils.escape(value2))}`,
+                    `${this.$utils.formatQueryValue(value2)}`,
                 ].join(" ")
             }
         ]);
@@ -1196,9 +1075,9 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 operator: `${this.$constants("BETWEEN")}`,
                 condition: 'OR',
                 value: [
-                    `${this.$utils.transfromValueHasRaw(this.$utils.escape(value1))}`,
+                    `${this.$utils.formatQueryValue(value1)}`,
                     `${this.$constants("AND")}`,
-                    `${this.$utils.transfromValueHasRaw(this.$utils.escape(value2))}`,
+                    `${this.$utils.formatQueryValue(value2)}`,
                 ].join(" ")
             }
         ]);
@@ -1225,9 +1104,9 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 column: this.bindColumn(String(column)),
                 operator: `${this.$constants("NOT_BETWEEN")}`,
                 value: [
-                    `${this.$utils.transfromValueHasRaw(this.$utils.escape(value1))}`,
+                    `${this.$utils.formatQueryValue(value1)}`,
                     `${this.$constants("AND")}`,
-                    `${this.$utils.transfromValueHasRaw(this.$utils.escape(value2))}`,
+                    `${this.$utils.formatQueryValue(value2)}`,
                 ].join(" ")
             }
         ]);
@@ -1255,9 +1134,9 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 operator: `${this.$constants("NOT_BETWEEN")}`,
                 condition: 'OR',
                 value: [
-                    `${this.$utils.transfromValueHasRaw(this.$utils.escape(value1))}`,
+                    `${this.$utils.formatQueryValue(value1)}`,
                     `${this.$constants("AND")}`,
-                    `${this.$utils.transfromValueHasRaw(this.$utils.escape(value2))}`,
+                    `${this.$utils.formatQueryValue(value2)}`,
                 ].join(" ")
             }
         ]);
@@ -1271,14 +1150,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @returns {this}
      */
     whereNull(column) {
-        // this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("AND")}` : "",
-        //     `${this.bindColumn(column)}`,
-        //     `${this.$constants("IS_NULL")}`,
-        //   ].join(" "),
-        // ]);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
@@ -1296,14 +1167,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @returns {this}
      */
     orWhereNull(column) {
-        // this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("OR")}` : "",
-        //     `${this.bindColumn(column)}`,
-        //     `${this.$constants("IS_NULL")}`,
-        //   ].join(" "),
-        // ]);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
@@ -1322,14 +1185,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @returns {this}
      */
     whereNotNull(column) {
-        // this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("AND")}` : "",
-        //     `${this.bindColumn(column)}`,
-        //     `${this.$constants("IS_NOT_NULL")}`,
-        //   ].join(" "),
-        // ]);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
@@ -1347,14 +1202,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @returns {this}
      */
     orWhereNotNull(column) {
-        // this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("OR")}` : "",
-        //     `${this.bindColumn(column)}`,
-        //     `${this.$constants("IS_NOT_NULL")}`,
-        //   ].join(" "),
-        // ]);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
@@ -1377,24 +1224,12 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      */
     whereSensitive(column, operator, value) {
         [value, operator] = this.$utils.valueAndOperator(value, operator, arguments.length === 2);
-        value = this.$utils.escape(value);
-        value = this.$utils.transfromBooleanToNumber(value);
-        // this.$state.set("WHERE", [
-        //   ...this.$state.get("WHERE"),
-        //   [
-        //     this.$state.get("WHERE").length ? `${this.$constants("AND")}` : "",
-        //     `${this.$constants("BINARY")}`,
-        //     `${this.bindColumn(column)}`,
-        //     `${operator}`,
-        //     `${this.$utils.transfromValueHasRaw(this.$utils.escape(value))}`,
-        //   ].join(" "),
-        // ]);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
                 column: `${this.$constants("BINARY")} ${this.bindColumn(String(column))}`,
                 operator: `${this.$constants("IS_NULL")}`,
-                value: `${this.$utils.transfromValueHasRaw(this.$utils.escape(value))}`,
+                value: `${this.$utils.formatQueryValue(value)}`,
             }
         ]);
         return this;
@@ -1426,15 +1261,13 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      */
     orWhereSensitive(column, operator, value) {
         [value, operator] = this.$utils.valueAndOperator(value, operator, arguments.length === 2);
-        value = this.$utils.escape(value);
-        value = this.$utils.transfromBooleanToNumber(value);
         this.$state.set("WHERE", [
             ...this.$state.get("WHERE"),
             {
                 column: `${this.$constants("BINARY")} ${this.bindColumn(String(column))}`,
                 operator,
                 condition: 'OR',
-                value: `${this.$utils.transfromValueHasRaw(this.$utils.escape(value))}`,
+                value: `${this.$utils.formatQueryValue(value)}`,
             }
         ]);
         return this;
@@ -1518,8 +1351,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      */
     whereAny(columns, operator, value) {
         [value, operator] = this.$utils.valueAndOperator(value, operator, arguments.length === 2);
-        value = this.$utils.escape(value);
-        value = this.$utils.transfromBooleanToNumber(value);
         this.whereQuery((query) => {
             for (const index in columns) {
                 const column = columns[index];
@@ -1546,8 +1377,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      */
     whereAll(columns, operator, value) {
         [value, operator] = this.$utils.valueAndOperator(value, operator, arguments.length === 2);
-        value = this.$utils.escape(value);
-        value = this.$utils.transfromBooleanToNumber(value);
         this.whereQuery((query) => {
             for (const column of columns)
                 query.where(column, operator, value);
@@ -1574,18 +1403,17 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 throw new Error(`can't find then condition`);
             return `${this.$constants("WHEN")} ${when} ${this.$constants("THEN")} ${then}`;
         });
-        // const whereClause = [
-        //   this.$state.get("WHERE").length ? this.$constants("AND") : "",
-        //   "(",
-        //   this.$constants("CASE"),
-        //   ...query,
-        //   elseCase != null ? `ELSE ${elseCase}` : "",
-        //   this.$constants("END"),
-        //   ")",
-        // ]
-        //   .filter(Boolean)
-        //   .join(" ");
-        // this.$state.set("WHERE", [...this.$state.get("WHERE"), whereClause]);
+        const whereClause = [
+            "(",
+            this.$constants("CASE"),
+            ...query,
+            elseCase != null ? `ELSE ${elseCase}` : "",
+            this.$constants("END"),
+            ")",
+        ]
+            .filter(Boolean)
+            .join(" ");
+        this.whereRaw(whereClause);
         return this;
     }
     /**
@@ -1608,7 +1436,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             return `${this.$constants("WHEN")} ${when} ${this.$constants("THEN")} ${then}`;
         });
         const whereClause = [
-            this.$state.get("WHERE").length ? this.$constants("OR") : "",
             "(",
             this.$constants("CASE"),
             ...query,
@@ -1618,7 +1445,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         ]
             .filter(Boolean)
             .join(" ");
-        // this.$state.set("WHERE", [...this.$state.get("WHERE"), whereClause]);
+        this.orWhereRaw(whereClause);
         return this;
     }
     whereReference(tableAndLocalKey, tableAndForeignKey) {
@@ -3122,7 +2949,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         const result = await this._queryStatement(sql);
         if (!result.length)
             return {
-                //@ts-ignore
                 meta: {
                     total: 0,
                     limit,
@@ -3131,6 +2957,12 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                     last_page: 0,
                     next_page: 0,
                     prev_page: 0,
+                    page: {
+                        prev: 0,
+                        next: 0,
+                        current: currentPage,
+                        last: 0,
+                    },
                 },
                 data: [],
             };
@@ -3144,7 +2976,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         lastPage = lastPage > 1 ? lastPage : 1;
         const count = result?.length ?? 0;
         return {
-            //@ts-ignore
             meta: {
                 total: total,
                 limit: limit,
@@ -3153,6 +2984,12 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 last_page: lastPage,
                 next_page: nextPage,
                 prev_page: prevPage,
+                page: {
+                    prev: prevPage,
+                    next: nextPage,
+                    current: currentPage,
+                    last: lastPage,
+                },
             },
             data: result ?? [],
         };