@stamhoofd/sql 2.1.1 → 2.1.3

package/dist/src/SQLJsonExpressions.js

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLJsonOverlaps = exports.SQLJsonContains = exports.SQLJsonSearch = exports.SQLJsonExtract = void 0;
+const SQLExpression_1 = require("./SQLExpression");
+const SQLExpressions_1 = require("./SQLExpressions");
+/**
+ * Same as target->path, JSON_EXTRACT(target, path)
+ */
+class SQLJsonExtract {
+    constructor(target, path) {
+        this.target = target;
+        this.path = path;
+    }
+    getSQL(options) {
+        return (0, SQLExpression_1.joinSQLQuery)([
+            'JSON_EXTRACT(',
+            this.target.getSQL(options),
+            ',',
+            this.path.getSQL(options),
+            ')'
+        ]);
+    }
+}
+exports.SQLJsonExtract = SQLJsonExtract;
+/**
+ * JSON_SEARCH(json_doc, one_or_all, search_str[, escape_char[, path] ...])
+ */
+class SQLJsonSearch {
+    constructor(target, oneOrAll, searchStr, path = null) {
+        this.target = target;
+        this.oneOrAll = oneOrAll;
+        this.searchStr = searchStr;
+        this.path = path;
+    }
+    getSQL(options) {
+        return (0, SQLExpression_1.joinSQLQuery)([
+            'JSON_SEARCH(',
+            this.target.getSQL(options),
+            ',',
+            new SQLExpressions_1.SQLSafeValue(this.oneOrAll).getSQL(options),
+            ',',
+            this.searchStr.getSQL(options),
+            ...(this.path ? [
+                ',',
+                this.path.getSQL(options)
+            ] : []),
+            ')'
+        ]);
+    }
+}
+exports.SQLJsonSearch = SQLJsonSearch;
+/**
+ * JSON_CONTAINS(target, candidate[, path])
+ */
+class SQLJsonContains {
+    constructor(target, candidate, path = null) {
+        this.target = target;
+        this.candidate = candidate;
+        this.path = path;
+    }
+    getSQL(options) {
+        return (0, SQLExpression_1.joinSQLQuery)([
+            'JSON_CONTAINS(',
+            this.target.getSQL(options),
+            ',',
+            this.candidate.getSQL(options),
+            ...(this.path ? [
+                ',',
+                this.path.getSQL(options)
+            ] : []),
+            ')'
+        ]);
+    }
+}
+exports.SQLJsonContains = SQLJsonContains;
+/**
+ * JSON_CONTAINS(json_doc1, json_doc2)
+ */
+class SQLJsonOverlaps {
+    constructor(jsonDoc1, jsonDoc2) {
+        this.jsonDoc1 = jsonDoc1;
+        this.jsonDoc2 = jsonDoc2;
+    }
+    getSQL(options) {
+        return (0, SQLExpression_1.joinSQLQuery)([
+            'JSON_OVERLAPS(',
+            this.jsonDoc1.getSQL(options),
+            ',',
+            this.jsonDoc2.getSQL(options),
+            ')'
+        ]);
+    }
+}
+exports.SQLJsonOverlaps = SQLJsonOverlaps;
+//# sourceMappingURL=SQLJsonExpressions.js.map

package/dist/src/SQLJsonExpressions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLJsonExpressions.js","sourceRoot":"","sources":["../../src/SQLJsonExpressions.ts"],"names":[],"mappings":";;;AAAA,mDAA8F;AAC9F,qDAAgD;AAEhD;;GAEG;AACH,MAAa,cAAc;IAIvB,YAAY,MAAqB,EAAE,IAAmB;QAClD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,OAA8B;QACjC,OAAO,IAAA,4BAAY,EAAC;YAChB,eAAe;YACX,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;YAC3B,GAAG;YACH,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;YAC7B,GAAG;SACN,CAAC,CAAA;IACN,CAAC;CACJ;AAlBD,wCAkBC;AAED;;GAEG;AACH,MAAa,aAAa;IAMtB,YAAY,MAAqB,EAAE,QAAqB,EAAE,SAAwB,EAAE,OAA2B,IAAI;QAC/G,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,OAA8B;QACjC,OAAO,IAAA,4BAAY,EAAC;YAChB,cAAc;YACV,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;YAC3B,GAAG;YACH,IAAI,6BAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;YAC/C,GAAG;YACH,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC;YAC9B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBACZ,GAAG;gBACH,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;aAC5B,CAAC,CAAC,CAAC,EAAE,CAAC;YACX,GAAG;SACN,CAAC,CAAA;IACN,CAAC;CACJ;AA5BD,sCA4BC;AAED;;GAEG;AACH,MAAa,eAAe;IAKxB,YAAY,MAAqB,EAAE,SAAwB,EAAE,OAA2B,IAAI;QACxF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,OAA8B;QACjC,OAAO,IAAA,4BAAY,EAAC;YAChB,gBAAgB;YACZ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;YAC3B,GAAG;YACH,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC;YAC9B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBACZ,GAAG;gBACH,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;aAC5B,CAAC,CAAC,CAAC,EAAE,CAAC;YACX,GAAG;SACN,CAAC,CAAA;IACN,CAAC;CACJ;AAxBD,0CAwBC;AAGD;;GAEG;AACH,MAAa,eAAe;IAIxB,YAAY,QAAuB,EAAE,QAAuB;QACxD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,OAA8B;QACjC,OAAO,IAAA,4BAAY,EAAC;YAChB,gBAAgB;YACZ,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;YAC7B,GAAG;YACH,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;YACjC,GAAG;SACN,CAAC,CAAA;IACN,CAAC;CACJ;AAlBD,0CAkBC"}

package/dist/src/SQLOrderBy.d.ts

@@ -0,0 +1,28 @@
+import { SQLExpression, SQLExpressionOptions, SQLQuery } from "./SQLExpression";
+type GConstructor<T = {}> = new (...args: any[]) => T;
+type Orderable = GConstructor<{
+    _orderBy: SQLOrderBy | null;
+}>;
+export declare function addOrderByHelpers<TBase extends Orderable>(Base: TBase): {
+    new (...args: any[]): {
+        orderBy(orderBy: SQLOrderBy): any;
+        orderBy(column: SQLExpression, direction?: SQLOrderByDirection): any;
+        _orderBy: SQLOrderBy | null;
+    };
+} & TBase;
+export type SQLOrderByDirection = 'ASC' | 'DESC';
+export declare class SQLOrderBy implements SQLExpression {
+    orderBy: {
+        column: SQLExpression;
+        direction: SQLOrderByDirection;
+    }[];
+    constructor(...orderBy: {
+        column: SQLExpression;
+        direction: SQLOrderByDirection;
+    }[]);
+    static combine(orderBy: SQLOrderBy[]): SQLOrderBy;
+    add(orderBy: SQLOrderBy): void;
+    getSQL(options?: SQLExpressionOptions | undefined): SQLQuery;
+}
+export {};
+//# sourceMappingURL=SQLOrderBy.d.ts.map

package/dist/src/SQLOrderBy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLOrderBy.d.ts","sourceRoot":"","sources":["../../src/SQLOrderBy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,QAAQ,EAAgB,MAAM,iBAAiB,CAAC;AAE9F,KAAK,YAAY,CAAC,CAAC,GAAG,EAAE,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AACtD,KAAK,SAAS,GAAG,YAAY,CAAC;IAAE,QAAQ,EAAE,UAAU,GAAC,IAAI,CAAA;CAAE,CAAC,CAAC;AAE7D,wBAAgB,iBAAiB,CAAC,KAAK,SAAS,SAAS,EAAE,IAAI,EAAE,KAAK;;yBAG7C,UAAU;wBACX,aAAa,cAAc,mBAAmB;;;UAgBrE;AAGD,MAAM,MAAM,mBAAmB,GAAG,KAAK,GAAG,MAAM,CAAC;AACjD,qBAAa,UAAW,YAAW,aAAa;IAC5C,OAAO,EAAE;QAAC,MAAM,EAAE,aAAa,CAAC;QAAC,SAAS,EAAE,mBAAmB,CAAA;KAAC,EAAE,CAAM;gBAE5D,GAAG,OAAO,EAAE;QAAC,MAAM,EAAE,aAAa,CAAC;QAAC,SAAS,EAAE,mBAAmB,CAAA;KAAC,EAAE;IAIjF,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE;IAIpC,GAAG,CAAC,OAAO,EAAE,UAAU;IAIvB,MAAM,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,SAAS,GAAG,QAAQ;CAkB/D"}

package/dist/src/SQLOrderBy.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLOrderBy = exports.addOrderByHelpers = void 0;
+const SQLExpression_1 = require("./SQLExpression");
+function addOrderByHelpers(Base) {
+    return class extends Base {
+        orderBy(columnOrOrderBy, direction) {
+            let o = columnOrOrderBy;
+            if (!(columnOrOrderBy instanceof SQLOrderBy)) {
+                o = new SQLOrderBy({ column: columnOrOrderBy, direction: direction !== null && direction !== void 0 ? direction : 'ASC' });
+            }
+            if (this._orderBy) {
+                this._orderBy.add(o);
+            }
+            else {
+                this._orderBy = o;
+            }
+            return this;
+        }
+    };
+}
+exports.addOrderByHelpers = addOrderByHelpers;
+class SQLOrderBy {
+    constructor(...orderBy) {
+        this.orderBy = [];
+        this.orderBy = orderBy;
+    }
+    static combine(orderBy) {
+        return new SQLOrderBy(...orderBy.flatMap(o => o.orderBy));
+    }
+    add(orderBy) {
+        this.orderBy.push(...orderBy.orderBy);
+    }
+    getSQL(options) {
+        if (this.orderBy.length === 0) {
+            return '';
+        }
+        return (0, SQLExpression_1.joinSQLQuery)([
+            'ORDER BY ',
+            (0, SQLExpression_1.joinSQLQuery)(this.orderBy.map(o => {
+                return (0, SQLExpression_1.joinSQLQuery)([
+                    o.column.getSQL(options),
+                    o.direction
+                ], ' ');
+            }), ', ')
+        ]);
+    }
+}
+exports.SQLOrderBy = SQLOrderBy;
+//# sourceMappingURL=SQLOrderBy.js.map

package/dist/src/SQLOrderBy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLOrderBy.js","sourceRoot":"","sources":["../../src/SQLOrderBy.ts"],"names":[],"mappings":";;;AAAA,mDAA8F;AAK9F,SAAgB,iBAAiB,CAA0B,IAAW;IAClE,OAAO,KAAM,SAAQ,IAAI;QAIrB,OAAO,CAAC,eAA8B,EAAE,SAA+B;YACnE,IAAI,CAAC,GAAG,eAA6B,CAAA;YACrC,IAAI,CAAC,CAAC,eAAe,YAAY,UAAU,CAAC,EAAE,CAAC;gBAC3C,CAAC,GAAG,IAAI,UAAU,CAAC,EAAC,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,KAAK,EAAC,CAAC,CAAA;YAChF,CAAC;YAED,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;YACxB,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;YACtB,CAAC;YAED,OAAO,IAAI,CAAC;QAChB,CAAC;KACJ,CAAA;AACL,CAAC;AApBD,8CAoBC;AAID,MAAa,UAAU;IAGnB,YAAY,GAAG,OAAkE;QAFjF,YAAO,GAA8D,EAAE,CAAC;QAGpE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,OAAqB;QAChC,OAAO,IAAI,UAAU,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;IAC7D,CAAC;IAED,GAAG,CAAC,OAAmB;QACnB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IACzC,CAAC;IAED,MAAM,CAAC,OAA0C;QAC7C,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,EAAE,CAAC;QACd,CAAC;QAED,OAAO,IAAA,4BAAY,EAAC;YAChB,WAAW;YACX,IAAA,4BAAY,EACR,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBACjB,OAAO,IAAA,4BAAY,EAAC;oBAChB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;oBACxB,CAAC,CAAC,SAAS;iBACd,EAAE,GAAG,CAAC,CAAA;YACX,CAAC,CAAC,EACF,IAAI,CACP;SACJ,CAAC,CAAA;IACN,CAAC;CACJ;AAjCD,gCAiCC"}

package/dist/src/SQLSelect.d.ts

@@ -0,0 +1,44 @@
+import { SQLExpression, SQLExpressionOptions, SQLQuery } from "./SQLExpression";
+import { SQLOrderBy } from "./SQLOrderBy";
+import { SQLWhere } from "./SQLWhere";
+import { SQLResultNamespacedRow } from "@simonbackx/simple-database";
+import { SQLJoin } from './SQLJoin';
+declare class SelectBase implements SQLExpression {
+    _columns: SQLExpression[];
+    _from: SQLExpression;
+    _limit: number | null;
+    _offset: number | null;
+    _where: SQLWhere | null;
+    _orderBy: SQLOrderBy | null;
+    _joins: (InstanceType<typeof SQLJoin>)[];
+    constructor(...columns: SQLExpression[]);
+    clone(): this;
+    from(table: SQLExpression): this;
+    join(join: InstanceType<typeof SQLJoin>): this;
+    getSQL(options?: SQLExpressionOptions): SQLQuery;
+    limit(limit: number | null, offset?: number | null): this;
+    fetch(): Promise<SQLResultNamespacedRow[]>;
+    first(required: false): Promise<SQLResultNamespacedRow | null>;
+    first(required: true): Promise<SQLResultNamespacedRow>;
+    count(): Promise<number>;
+}
+export declare const SQLSelect: {
+    new (...args: any[]): {
+        orderBy(orderBy: SQLOrderBy): any;
+        orderBy(column: SQLExpression, direction?: import("./SQLOrderBy").SQLOrderByDirection | undefined): any;
+        _orderBy: SQLOrderBy | null;
+    };
+} & {
+    new (...args: any[]): {
+        parseWhere(...[whereOrColumn, signOrValue, value]: import("./SQLWhere").ParseWhereArguments): SQLWhere;
+        where<T>(this: T, ...args: import("./SQLWhere").ParseWhereArguments): T;
+        andWhere(...args: import("./SQLWhere").ParseWhereArguments): any;
+        orWhere(...args: import("./SQLWhere").ParseWhereArguments): any;
+        whereNot(...args: import("./SQLWhere").ParseWhereArguments): any;
+        andWhereNot(...args: import("./SQLWhere").ParseWhereArguments): any;
+        orWhereNot(...args: import("./SQLWhere").ParseWhereArguments): any;
+        _where: SQLWhere | null;
+    };
+} & typeof SelectBase;
+export {};
+//# sourceMappingURL=SQLSelect.d.ts.map

package/dist/src/SQLSelect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLSelect.d.ts","sourceRoot":"","sources":["../../src/SQLSelect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,QAAQ,EAAmC,MAAM,iBAAiB,CAAC;AACjH,OAAO,EAAE,UAAU,EAAqB,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAmB,MAAM,YAAY,CAAC;AACvD,OAAO,EAAW,sBAAsB,EAAC,MAAM,6BAA6B,CAAA;AAC5E,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AAGjC,cAAM,UAAW,YAAW,aAAa;IACrC,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,KAAK,EAAE,aAAa,CAAC;IAErB,MAAM,EAAE,MAAM,GAAC,IAAI,CAAQ;IAC3B,OAAO,EAAE,MAAM,GAAC,IAAI,CAAQ;IAE5B,MAAM,EAAE,QAAQ,GAAC,IAAI,CAAQ;IAC7B,QAAQ,EAAE,UAAU,GAAC,IAAI,CAAQ;IACjC,MAAM,EAAE,CAAC,YAAY,CAAC,OAAO,OAAO,CAAC,CAAC,EAAE,CAAM;gBAElC,GAAG,OAAO,EAAE,aAAa,EAAE;IAIvC,KAAK,IAAI,IAAI;IAMb,IAAI,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAKhC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,OAAO,OAAO,CAAC,GAAG,IAAI;IAK9C,MAAM,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,QAAQ;IAyChD,KAAK,CAAC,KAAK,EAAE,MAAM,GAAC,IAAI,EAAE,MAAM,GAAE,MAAM,GAAC,IAAW,GAAG,IAAI;IAMrD,KAAK,IAAI,OAAO,CAAC,sBAAsB,EAAE,CAAC;IA0BhD,KAAK,CAAC,QAAQ,EAAE,KAAK,GAAG,OAAO,CAAC,sBAAsB,GAAC,IAAI,CAAC;IAC5D,KAAK,CAAC,QAAQ,EAAE,IAAI,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAYhD,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;CA8BjC;AAED,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;qBAErB,CAAA"}

package/dist/src/SQLSelect.js

@@ -0,0 +1,124 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLSelect = void 0;
+const SQLExpression_1 = require("./SQLExpression");
+const SQLOrderBy_1 = require("./SQLOrderBy");
+const SQLWhere_1 = require("./SQLWhere");
+const simple_database_1 = require("@simonbackx/simple-database");
+const SQLExpressions_1 = require("./SQLExpressions");
+class SelectBase {
+    constructor(...columns) {
+        this._limit = null;
+        this._offset = null;
+        this._where = null;
+        this._orderBy = null;
+        this._joins = [];
+        this._columns = columns;
+    }
+    clone() {
+        const c = new exports.SQLSelect(...this._columns);
+        Object.assign(c, this);
+        return c;
+    }
+    from(table) {
+        this._from = table;
+        return this;
+    }
+    join(join) {
+        this._joins.push(join);
+        return this;
+    }
+    getSQL(options) {
+        var _a, _b;
+        const query = [
+            'SELECT'
+        ];
+        options = options !== null && options !== void 0 ? options : {};
+        options.defaultNamespace = (_b = (_a = this._from.namespace) !== null && _a !== void 0 ? _a : this._from.table) !== null && _b !== void 0 ? _b : undefined;
+        const columns = this._columns.map(c => c.getSQL(options));
+        query.push((0, SQLExpression_1.joinSQLQuery)(columns, ', '));
+        query.push('FROM');
+        query.push(this._from.getSQL(options));
+        query.push(...this._joins.map(j => j.getSQL(options)));
+        if (this._where) {
+            query.push('WHERE');
+            query.push(this._where.getSQL(options));
+        }
+        if (this._orderBy) {
+            query.push(this._orderBy.getSQL(options));
+        }
+        if (this._limit !== null) {
+            query.push('LIMIT ' + this._limit);
+            if (this._offset !== null && this._offset !== 0) {
+                query.push('OFFSET ' + this._offset);
+            }
+        }
+        return (0, SQLExpression_1.joinSQLQuery)(query, ' ');
+    }
+    limit(limit, offset = null) {
+        this._limit = limit;
+        this._offset = offset;
+        return this;
+    }
+    async fetch() {
+        var _a;
+        const { query, params } = (0, SQLExpression_1.normalizeSQLQuery)(this.getSQL());
+        console.log(query, params);
+        const [rows] = await simple_database_1.Database.select(query, params, { nestTables: true });
+        // Now map aggregated queries to the correct namespace
+        for (const row of rows) {
+            if (row['']) {
+                for (const column in row['']) {
+                    const splitted = column.split('__');
+                    if (splitted.length <= 1) {
+                        console.warn('Aggregated column without namespace', column);
+                        continue;
+                    }
+                    const namespace = splitted[0];
+                    const name = splitted[1];
+                    row[namespace] = (_a = row[namespace]) !== null && _a !== void 0 ? _a : {};
+                    row[namespace][name] = row[''][column];
+                }
+                delete row[''];
+            }
+        }
+        return rows;
+    }
+    async first(required = true) {
+        const rows = await this.limit(1).fetch();
+        if (rows.length === 0) {
+            if (required) {
+                throw new Error('Required ' + this._from);
+            }
+            return null;
+        }
+        return rows[0];
+    }
+    async count() {
+        this._columns = [
+            new SQLExpressions_1.SQLSelectAs(new SQLExpressions_1.SQLCount(), new SQLExpressions_1.SQLAlias('c'))
+        ];
+        this._offset = null;
+        this._limit = null;
+        this._orderBy = null;
+        const { query, params } = (0, SQLExpression_1.normalizeSQLQuery)(this.getSQL());
+        console.log(query, params);
+        const [rows] = await simple_database_1.Database.select(query, params, { nestTables: true });
+        if (rows.length === 1) {
+            const row = rows[0];
+            if ('' in row) {
+                const namespaced = row[''];
+                if ('c' in namespaced) {
+                    const value = namespaced['c'];
+                    if (typeof value === 'number' && Number.isInteger(value)) {
+                        return value;
+                    }
+                }
+            }
+        }
+        console.warn('Invalid count SQL response', rows);
+        return 0;
+    }
+}
+exports.SQLSelect = (0, SQLOrderBy_1.addOrderByHelpers)((0, SQLWhere_1.addWhereHelpers)(SelectBase));
+//# sourceMappingURL=SQLSelect.js.map

package/dist/src/SQLSelect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLSelect.js","sourceRoot":"","sources":["../../src/SQLSelect.ts"],"names":[],"mappings":"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"}

package/dist/src/SQLWhere.d.ts

@@ -0,0 +1,92 @@
+import { SQLExpression, SQLExpressionOptions, SQLQuery } from "./SQLExpression";
+import { SQLDynamicExpression } from "./SQLExpressions";
+type GConstructor<T = {}> = new (...args: any[]) => T;
+type Whereable = GConstructor<{
+    _where: SQLWhere | null;
+}>;
+export type ParseWhereArguments = [
+    where: SQLWhere
+] | [
+    whereOrColumn: SQLExpression,
+    sign: SQLWhereSign,
+    value: SQLDynamicExpression
+] | [
+    whereOrColumn: SQLExpression,
+    value: SQLDynamicExpression
+];
+export declare function addWhereHelpers<TBase extends Whereable>(Base: TBase): {
+    new (...args: any[]): {
+        parseWhere(...[whereOrColumn, signOrValue, value]: ParseWhereArguments): SQLWhere;
+        where<T>(this: T, ...args: ParseWhereArguments): T;
+        andWhere(...args: ParseWhereArguments): any;
+        orWhere(...args: ParseWhereArguments): any;
+        whereNot(...args: ParseWhereArguments): any;
+        andWhereNot(...args: ParseWhereArguments): any;
+        orWhereNot(...args: ParseWhereArguments): any;
+        _where: SQLWhere | null;
+    };
+} & TBase;
+export declare abstract class SQLWhere implements SQLExpression {
+    and(...where: SQLWhere[]): SQLWhere;
+    or(...where: SQLWhere[]): SQLWhere;
+    get isSingle(): boolean;
+    abstract getSQL(options?: SQLExpressionOptions): SQLQuery;
+}
+export declare enum SQLWhereSign {
+    Equal = "=",
+    Greater = ">",
+    Less = "<",
+    NotEqual = "!="
+}
+export declare class SQLWhereEqual extends SQLWhere {
+    column: SQLExpression;
+    sign: SQLWhereSign;
+    value: SQLExpression;
+    constructor(column: SQLExpression, sign: SQLWhereSign, value: SQLExpression);
+    constructor(column: SQLExpression, value: SQLExpression);
+    clone(): this;
+    get isSingle(): boolean;
+    inverted(): this;
+    invert(): this;
+    getSQL(options?: SQLExpressionOptions): SQLQuery;
+}
+export declare class SQLWhereLike extends SQLWhere {
+    column: SQLExpression;
+    notLike: boolean;
+    value: SQLExpression;
+    constructor(column: SQLExpression, value: SQLExpression);
+    static escape(str: string): string;
+    clone(): this;
+    get isSingle(): boolean;
+    inverted(): this;
+    invert(): this;
+    getSQL(options?: SQLExpressionOptions): SQLQuery;
+}
+export declare class SQLWhereExists extends SQLWhere {
+    subquery: SQLExpression;
+    notExists: boolean;
+    constructor(subquery: SQLExpression);
+    clone(): this;
+    get isSingle(): boolean;
+    inverted(): this;
+    invert(): this;
+    getSQL(options?: SQLExpressionOptions): SQLQuery;
+}
+export declare class SQLWhereAnd extends SQLWhere {
+    children: SQLWhere[];
+    constructor(children: SQLWhere[]);
+    getSQL(options?: SQLExpressionOptions): SQLQuery;
+}
+export declare class SQLWhereOr extends SQLWhere {
+    children: SQLWhere[];
+    constructor(children: SQLWhere[]);
+    getSQL(options?: SQLExpressionOptions): SQLQuery;
+}
+export declare class SQLWhereNot extends SQLWhere {
+    a: SQLWhere;
+    constructor(a: SQLWhere);
+    get isSingle(): boolean;
+    getSQL(options?: SQLExpressionOptions): SQLQuery;
+}
+export {};
+//# sourceMappingURL=SQLWhere.d.ts.map

package/dist/src/SQLWhere.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLWhere.d.ts","sourceRoot":"","sources":["../../src/SQLWhere.ts"],"names":[],"mappings":"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"}